From 6b69c9ddd2bd3d3d44203ad0dd1d69d6532681d8 Mon Sep 17 00:00:00 2001 From: George Mamadashvili Date: Wed, 26 Jul 2023 20:01:27 +0400 Subject: [PATCH 1/2] Site Editor: Fix canvas mode sync with URL --- .../sync-state-with-url/use-sync-canvas-mode-with-url.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/edit-site/src/components/sync-state-with-url/use-sync-canvas-mode-with-url.js b/packages/edit-site/src/components/sync-state-with-url/use-sync-canvas-mode-with-url.js index 735c80cdb531c6..bf60b5769c0a28 100644 --- a/packages/edit-site/src/components/sync-state-with-url/use-sync-canvas-mode-with-url.js +++ b/packages/edit-site/src/components/sync-state-with-url/use-sync-canvas-mode-with-url.js @@ -59,7 +59,7 @@ export default function useSyncCanvasModeWithURL() { useEffect( () => { currentCanvasInUrl.current = canvasInUrl; if ( - canvasInUrl === undefined && + ( canvasInUrl === undefined || canvasInUrl === 'view' ) && currentCanvasMode.current !== 'view' ) { setCanvasMode( 'view' ); From 8a3b56eabe3728ec99495db930f1b28cd7caaa23 Mon Sep 17 00:00:00 2001 From: George Mamadashvili Date: Thu, 27 Jul 2023 10:14:10 +0400 Subject: [PATCH 2/2] Simplify the check --- .../sync-state-with-url/use-sync-canvas-mode-with-url.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/edit-site/src/components/sync-state-with-url/use-sync-canvas-mode-with-url.js b/packages/edit-site/src/components/sync-state-with-url/use-sync-canvas-mode-with-url.js index bf60b5769c0a28..9f0c8dd9a0e11f 100644 --- a/packages/edit-site/src/components/sync-state-with-url/use-sync-canvas-mode-with-url.js +++ b/packages/edit-site/src/components/sync-state-with-url/use-sync-canvas-mode-with-url.js @@ -58,10 +58,7 @@ export default function useSyncCanvasModeWithURL() { useEffect( () => { currentCanvasInUrl.current = canvasInUrl; - if ( - ( canvasInUrl === undefined || canvasInUrl === 'view' ) && - currentCanvasMode.current !== 'view' - ) { + if ( canvasInUrl !== 'edit' && currentCanvasMode.current !== 'view' ) { setCanvasMode( 'view' ); } else if ( canvasInUrl === 'edit' &&