From bd570780db07d3718417bc38151611c45815d7a8 Mon Sep 17 00:00:00 2001
From: jqlio18 <jqlio18@gmail.com>
Date: Sun, 18 Dec 2022 23:17:56 -0500
Subject: [PATCH] Fix `persistentHamburgerMenu` offset behavior.

---
 src/UIShell/Content.svelte | 9 +++++++--
 src/UIShell/Header.svelte  | 6 +++++-
 src/UIShell/navStore.js    | 2 ++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/UIShell/Content.svelte b/src/UIShell/Content.svelte
index 150fea14..4e727d6f 100644
--- a/src/UIShell/Content.svelte
+++ b/src/UIShell/Content.svelte
@@ -3,7 +3,10 @@
   export let id = "main-content";
 
   import { Grid, Row, Column } from "../Grid";
-  import { shouldRenderHamburgerMenu } from "./navStore";
+  import {
+    shouldRenderHamburgerMenu,
+    isPersistentHamburgerMenu,
+  } from "./navStore";
 </script>
 
 <div
@@ -19,7 +22,9 @@
       <Grid>
         <Row>
           <Column
-            lg="{$shouldRenderHamburgerMenu ? { span: 13, offset: 3 } : {}}"
+            lg="{$shouldRenderHamburgerMenu && !$isPersistentHamburgerMenu
+              ? { span: 13, offset: 3 }
+              : {}}"
           >
             <slot />
           </Column>
diff --git a/src/UIShell/Header.svelte b/src/UIShell/Header.svelte
index ca4aca4c..8b76914f 100644
--- a/src/UIShell/Header.svelte
+++ b/src/UIShell/Header.svelte
@@ -62,11 +62,15 @@
 
   import Close from "../icons/Close.svelte";
   import Menu from "../icons/Menu.svelte";
-  import { shouldRenderHamburgerMenu } from "./navStore";
+  import {
+    shouldRenderHamburgerMenu,
+    isPersistentHamburgerMenu,
+  } from "./navStore";
   import HamburgerMenu from "./HamburgerMenu.svelte";
 
   let winWidth = undefined;
 
+  $: $isPersistentHamburgerMenu = persistentHamburgerMenu;
   $: isSideNavOpen =
     expandedByDefault &&
     winWidth >= expansionBreakpoint &&
diff --git a/src/UIShell/navStore.js b/src/UIShell/navStore.js
index 358127be..8df9706c 100644
--- a/src/UIShell/navStore.js
+++ b/src/UIShell/navStore.js
@@ -1,3 +1,5 @@
 import { writable } from "svelte/store";
 
 export const shouldRenderHamburgerMenu = writable(false);
+
+export const isPersistentHamburgerMenu = writable(false);