From 4d59cf59be59ebb47a021a7e4c14b074ca13d0b5 Mon Sep 17 00:00:00 2001
From: Joost De Cock <joost@joost.at>
Date: Sun, 15 May 2022 14:46:03 +0200
Subject: [PATCH] fix(lab): Be explicit about closing navigation on gist
 updates

---
 .../components/workbench/menu/view.js         | 20 +++++++++----------
 .../components/wrappers/workbench.js          |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/freesewing.shared/components/workbench/menu/view.js b/packages/freesewing.shared/components/workbench/menu/view.js
index 72dd4d6deca..e83938b38c7 100644
--- a/packages/freesewing.shared/components/workbench/menu/view.js
+++ b/packages/freesewing.shared/components/workbench/menu/view.js
@@ -8,54 +8,54 @@ const View = props => {
     {
       name: 'measurements',
       title: t('measurements'),
-      onClick: () => props.updateGist(['_state', 'view'], 'measurements')
+      onClick: () => props.updateGist(['_state', 'view'], 'measurements', true)
     },
     {
       name: 'draft',
       title: t('draftPattern', { pattern: props.pattern.config.name }),
-      onClick: () => props.updateGist(['_state', 'view'], 'draft')
+      onClick: () => props.updateGist(['_state', 'view'], 'draft', true)
     },
     {
       name: 'test',
       title: t('testPattern', { pattern: props.pattern.config.name }),
-      onClick: () => props.updateGist(['_state', 'view'], 'test')
+      onClick: () => props.updateGist(['_state', 'view'], 'test', true)
     },
     {
       name: 'printingLayout',
       title: t('layoutThing', { thing: props.pattern.config.name })
        + ': ' + t('forPrinting'),
-      onClick: () => props.updateGist(['_state', 'view'], 'printingLayout')
+      onClick: () => props.updateGist(['_state', 'view'], 'printingLayout', true)
     },
     {
       name: 'cuttingLayout',
       title: t('layoutThing', { thing: props.pattern.config.name })
        + ': ' + t('forCutting'),
-      onClick: () => props.updateGist(['_state', 'view'], 'cuttingLayout')
+      onClick: () => props.updateGist(['_state', 'view'], 'cuttingLayout', true)
     },
     {
       name: 'export',
       title: t('exportThing', { thing: props.pattern.config.name }),
-      onClick: () => props.updateGist(['_state', 'view'], 'export')
+      onClick: () => props.updateGist(['_state', 'view'], 'export', true)
     },
     {
       name: 'events',
       title: t('events'),
-      onClick: () => props.updateGist(['_state', 'view'], 'events')
+      onClick: () => props.updateGist(['_state', 'view'], 'events', true)
     },
     {
       name: 'yaml',
       title: t('YAML'),
-      onClick: () => props.updateGist(['_state', 'view'], 'yaml')
+      onClick: () => props.updateGist(['_state', 'view'], 'yaml', true)
     },
     {
       name: 'json',
       title: t('JSON'),
-      onClick: () => props.updateGist(['_state', 'view'], 'json')
+      onClick: () => props.updateGist(['_state', 'view'], 'json', true)
     },
     {
       name: 'edit',
       title: t('editThing', { thing: 'YAML' }),
-      onClick: () => props.updateGist(['_state', 'view'], 'edit')
+      onClick: () => props.updateGist(['_state', 'view'], 'edit', true)
     },
     {
       name: 'clear',
diff --git a/packages/freesewing.shared/components/wrappers/workbench.js b/packages/freesewing.shared/components/wrappers/workbench.js
index 0550e293c23..204a65ec6a9 100644
--- a/packages/freesewing.shared/components/wrappers/workbench.js
+++ b/packages/freesewing.shared/components/wrappers/workbench.js
@@ -82,12 +82,12 @@ const WorkbenchWrapper = ({ app, pattern, preload=false, from=false, layout=fals
   }, [preload, from])
 
   // Helper methods to manage the gist state
-  const updateGist = (path, content) => {
+  const updateGist = (path, content, closeNav=false) => {
     const newGist = {...gist}
     set(newGist, path, content)
     setGist(newGist)
     // Force close of menu on mobile if it is open
-    if (app.primaryMenu) app.setPrimaryMenu(false)
+    if (closeNav && app.primaryMenu) app.setPrimaryMenu(false)
   }
   const unsetGist = (path) => {
     const newGist = {...gist}