@@ -6,7 +6,6 @@ import { MDCList } from '@material/list'
6
6
import Button from ' ../Button'
7
7
import IconButton from ' ../IconButton/IconButton.svelte'
8
8
import Tooltip from ' ../Tooltip/Tooltip.svelte'
9
- import { beforeUrlChange , goto } from ' @roxi/routify'
10
9
import { onMount } from ' svelte'
11
10
import TopAppBar from ' ../TopAppBar'
12
11
@@ -21,6 +20,7 @@ export let isFullHeightMenu = false
21
20
export let miniMenu = false
22
21
export let modal = false
23
22
export let toggle = false
23
+ export let currentUrl = ' '
24
24
25
25
let mdcDrawer = {}
26
26
let mdcList = {}
@@ -50,15 +50,8 @@ const isMenuItemActive = (currentUrl, menuItemUrl, urlPattern) => {
50
50
return currentUrl === menuItemUrl || (urlPattern && RegExp (urlPattern).test (currentUrl))
51
51
}
52
52
53
- $: currentUrl = window .location .pathname
54
53
$: toggle, toggleDrawer ()
55
54
56
- $beforeUrlChange (({ url }) => {
57
- currentUrl = url
58
-
59
- return true
60
- })
61
-
62
55
const showAppropriateThings = () => {
63
56
showAppropriateDrawer ()
64
57
showAppropriateSizeMenu ()
@@ -140,7 +133,7 @@ main {
140
133
{#if button && isNotMini }
141
134
<Button class ="m-1" raised prependIcon ={icon } {url }>{label }</Button >
142
135
{:else if button }
143
- <IconButton class ="mdc-theme--primary pl-1" {icon } ariaLabel ={label } on:click ={() => $goto ( url ) } />
136
+ <IconButton class ="mdc-theme--primary pl-1" {icon } ariaLabel ={label } { url } />
144
137
{:else if url }
145
138
<a
146
139
class =" mdc-list-item"
0 commit comments