Skip to content

Use the location passed in through the custom router if it exists #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Use the location passed in through the custom router if it exists #111

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce86947
use the location passed in through the custom router if it exists to …
Oct 4, 2022
c0506e1
wip
Oct 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion packages/react-shopify-app-bridge/src/Provider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,26 @@ export const Provider = ({
history: History;
};
}) => {
const [location, setLocation] = useState<ProviderLocation | null>(null);
const [_location, setLocation] = useState<ProviderLocation | null>(null);
const routerParamLocation = router?.location
? typeof router.location === "string"
? router.location
: `${router.location.pathname}${router.location.search}`
: "";
const location = useMemo(() => {
if (router) {
const url = typeof router.location === "string" ? new URL(router.location) : router.location;

return {
query: new URLSearchParams(url.search),
asPath: `${url.pathname}${url.search}`,
};
}

return _location;
// don't subscribe to router as the pointer is likely to change on every render
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [routerParamLocation, _location]);
const isReady = !!location;
const { query } = location ?? {};
const host = query?.get("host") ?? undefined;
Expand Down