Merge pull request #182 from silinternational/feature/remove-window

feat(Menu): remove window & add currentUrl to props
silinternational · Feb 8, 2023 · a655d39 · a655d39
2 parents e4b0b03 + b0aca32
commit a655d39
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/components/mdc/Menu/Menu.svelte b/components/mdc/Menu/Menu.svelte
@@ -10,8 +10,6 @@ export let currentUrl = ''
 let menu = {}
 let element = {}
 
-//don't use window for ssr
-$: currentUrl = window?.location?.pathname || currentUrl
 $: menu.open = menuOpen
 
 onMount(() => {

diff --git a/index.d.ts b/index.d.ts
@@ -161,6 +161,7 @@ declare module '@silintl/ui-components' {
   interface MenuProps extends svelte.JSX.HTMLAttributes<HTMLElementTagNameMap['div']> {
     menuItems?: MenuItem[]
     menuOpen?: boolean
+    currentUrl?: string
   }
   export class Menu extends SvelteComponentTyped<MenuProps> {}
 

diff --git a/stories/Menu.stories.svelte b/stories/Menu.stories.svelte
@@ -7,6 +7,7 @@ let content = 'Menu Button'
 const args = {
   class: 'dib relative opacity1', //for some reason the menu isn't behaving in storybook
   menuOpen: true,
+  currentUrl: '/?path=/story/atoms-menu--primary',
   menuItems: [
     {
       subtitle: 'Alerts',
@@ -15,16 +16,17 @@ const args = {
       icon: 'notifications',
       label: 'Alerts',
       action: () => alert('Hello!'),
+      url: '/?path=/story/atoms-menu--primary',
     },
     {
       icon: 'settings',
       label: 'User settings',
-      url: '/household/settings',
+      url: '/',
     },
     {
       icon: 'logout',
       label: 'Sign out',
-      url: '/logout',
+      url: '/',
     },
   ],
   toggleMenu() {