Skip to content

Commit c38dfac

Browse files
committed
feat(Drawer): add currentUrl prop and remove roxi
1 parent fba3e6b commit c38dfac

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

components/mdc/Drawer/Drawer.svelte

+2-9
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { MDCList } from '@material/list'
66
import Button from '../Button'
77
import IconButton from '../IconButton/IconButton.svelte'
88
import Tooltip from '../Tooltip/Tooltip.svelte'
9-
import { beforeUrlChange, goto } from '@roxi/routify'
109
import { onMount } from 'svelte'
1110
import TopAppBar from '../TopAppBar'
1211
@@ -21,6 +20,7 @@ export let isFullHeightMenu = false
2120
export let miniMenu = false
2221
export let modal = false
2322
export let toggle = false
23+
export let currentUrl = ''
2424
2525
let mdcDrawer = {}
2626
let mdcList = {}
@@ -50,15 +50,8 @@ const isMenuItemActive = (currentUrl, menuItemUrl, urlPattern) => {
5050
return currentUrl === menuItemUrl || (urlPattern && RegExp(urlPattern).test(currentUrl))
5151
}
5252
53-
$: currentUrl = window.location.pathname
5453
$: toggle, toggleDrawer()
5554
56-
$beforeUrlChange(({ url }) => {
57-
currentUrl = url
58-
59-
return true
60-
})
61-
6255
const showAppropriateThings = () => {
6356
showAppropriateDrawer()
6457
showAppropriateSizeMenu()
@@ -140,7 +133,7 @@ main {
140133
{#if button && isNotMini}
141134
<Button class="m-1" raised prependIcon={icon} {url}>{label}</Button>
142135
{: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} />
144137
{:else if url}
145138
<a
146139
class="mdc-list-item"

0 commit comments

Comments
 (0)