Does anyone have a fix for the bug with RoutePropagator and ResourceItem from Polaris?

Issue summary

When going to a page via ResourceItem, the default return button of the browser needs to be clicked a few times in order to return to previous page. These ResourceItems each have their own URL to go to the detail page.

We are using the Route Propegator from app-bridge-react like this, see screenshots:


We upgraded al our packages etc but it still is not fixed.

Expected behavior

When using the default browser return button on a page the browser should still return to the previous page. While using the URL of the ResourceItem.

Actual behavior

You need to click the browser return button 3 à 4 times in order to return to previous page. To fix this issue you need to use the Link component from react-router-dom instead of the URL prop on the ResourceItem.

Specifications

  System:
    OS: macOS 10.15.7
    CPU: (4) x64 Intel(R) Core(TM) i5-6500 CPU @ 3.20GHz
    Memory: 703.34 MB / 16.00 GB
    Shell: 3.2.57 - /bin/bash
  Binaries:
    Node: 14.18.1 - ~/.nvm/versions/node/v14.18.1/bin/node
    npm: 6.14.15 - ~/.nvm/versions/node/v14.18.1/bin/npm
  Browsers:
    Chrome: 97.0.4692.99
    Firefox: 91.0
    Safari: 14.0
  npmPackages:
    @shopify/polaris: ^8.0.0 => 8.0.0 
    react: 16.14.0 => 16.14.0 
    react-dom: 16.14.0 => 16.14.0   

Anyone who has had this issue before and knows a fix?