Merge branch 'trunk' into pr-preview

WordPress · Oct 31, 2024 · cece255 · cece255
2 parents a33d69d + 1e51248
commit cece255
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/...ound/website/src/components/ensure-playground-site/ensure-playground-site-is-selected.tsx b/...ound/website/src/components/ensure-playground-site/ensure-playground-site-is-selected.tsx
@@ -8,6 +8,7 @@ import {
 	setTemporarySiteSpec,
 } from '../../lib/state/redux/slice-sites';
 import {
+	selectActiveSite,
 	setActiveSite,
 	useAppDispatch,
 	useAppSelector,
@@ -33,6 +34,7 @@ export function EnsurePlaygroundSiteIsSelected({
 	const siteListingStatus = useAppSelector(
 		(state) => state.sites.loadingState
 	);
+	const activeSite = useAppSelector((state) => selectActiveSite(state));
 	const dispatch = useAppDispatch();
 	const url = useCurrentUrl();
 	const requestedSiteSlug = url.searchParams.get('site-slug');
@@ -90,7 +92,9 @@ export function EnsurePlaygroundSiteIsSelected({
 			const newParams = new URLSearchParams(url?.search);
 			oldParams.delete(notRefreshingParam);
 			newParams.delete(notRefreshingParam);
-			if (oldParams.toString() === newParams.toString()) {
+			const avoidUnnecessaryTempSiteReload =
+				activeSite && oldParams.toString() === newParams.toString();
+			if (avoidUnnecessaryTempSiteReload) {
 				return;
 			}
 

diff --git a/packages/playground/website/src/github/github-import-form/modal.tsx b/packages/playground/website/src/github/github-import-form/modal.tsx
@@ -11,7 +11,10 @@ interface GithubImportModalProps {
 	defaultOpen?: boolean;
 	onImported?: GitHubImportFormProps['onImported'];
 }
-export function GithubImportModal({ defaultOpen, onImported }: GithubImportModalProps) {
+export function GithubImportModal({
+	defaultOpen,
+	onImported,
+}: GithubImportModalProps) {
 	const dispatch: PlaygroundDispatch = useDispatch();
 	const playground = usePlaygroundClient();
 
@@ -20,10 +23,9 @@ export function GithubImportModal({ defaultOpen, onImported }: GithubImportModal
 		url.searchParams.set('modal', 'github-import');
 		window.history.replaceState({}, '', url.href);
 	}, []);
-
 	const closeModal = () => {
 		dispatch(setActiveModal(null));
-	}
+	};
 	return (
 		<Modal
 			title={'Import from GitHub'}