Skip to content

DOP-6197: preserve hash when hash not within composable #1566

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

Closed
wants to merge 1 commit into from
Closed

DOP-6197: preserve hash when hash not within composable #1566

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 13 additions & 5 deletions src/components/ComposableTutorial/ComposableTutorial.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,15 @@ const ComposableTutorialInternal = ({ nodeData, ...rest }: ComposableProps) => {
}, [composableOptions, location.search]);

const navigatePreservingExternalQueryParams = useCallback(
(queryString: string, preserveScroll = false, hash = '') => {
({
queryString,
preserveScroll = false,
hash = '',
}: {
queryString: string;
preserveScroll?: boolean;
hash?: string;
}) => {
navigate(
`${queryString.startsWith('?') ? '' : '?'}${queryString}${
queryString.length > 0 && externalQueryParamsString.length > 0 ? '&' : ''
Expand Down Expand Up @@ -251,7 +259,7 @@ const ComposableTutorialInternal = ({ nodeData, ...rest }: ComposableProps) => {
setCurrentSelections(selection);
const queryString = new URLSearchParams(selection).toString();
isNavigatingRef.current = true;
return navigatePreservingExternalQueryParams(`?${queryString}`, false, hash);
return navigatePreservingExternalQueryParams({ queryString: `?${queryString}`, preserveScroll: false, hash });
}
}

Expand All @@ -275,7 +283,7 @@ const ComposableTutorialInternal = ({ nodeData, ...rest }: ComposableProps) => {
const localStorage: Record<string, string> = getLocalValue(LOCAL_STORAGE_KEY) ?? {};
const [defaultParams] = filterValidQueryParams(localStorage, composableOptions, validSelections, true);
const queryString = new URLSearchParams(defaultParams).toString();
navigatePreservingExternalQueryParams(`?${queryString}`);
navigatePreservingExternalQueryParams({ queryString: `?${queryString}`, hash });
}, [
composableOptions,
location.pathname,
Expand All @@ -296,7 +304,7 @@ const ComposableTutorialInternal = ({ nodeData, ...rest }: ComposableProps) => {
if (validSelections.has(joinKeyValuesAsString(correctedParams))) {
setCurrentSelections(correctedParams);
const queryString = new URLSearchParams(correctedParams).toString();
return navigatePreservingExternalQueryParams(`?${queryString}`, true);
return navigatePreservingExternalQueryParams({ queryString: `?${queryString}`, preserveScroll: true });
}

// need to correct preceding options
Expand All @@ -314,7 +322,7 @@ const ComposableTutorialInternal = ({ nodeData, ...rest }: ComposableProps) => {

const [defaultParams] = filterValidQueryParams(persistSelections, composableOptions, validSelections, true);
const queryString = new URLSearchParams(defaultParams).toString();
return navigatePreservingExternalQueryParams(`?${queryString}`);
return navigatePreservingExternalQueryParams({ queryString: `?${queryString}` });
},
[composableOptions, currentSelections, validSelections, setCurrentSelections, navigatePreservingExternalQueryParams]
);
Expand Down