From 9cd1533a8aaa974706918d3e6b3d1b3e2f92e9da Mon Sep 17 00:00:00 2001 From: albert Date: Sat, 7 Nov 2020 21:09:53 +0100 Subject: [PATCH 1/9] docs: add line replace method for code tags --- docs/src/components/ComponentApi.svelte | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/src/components/ComponentApi.svelte b/docs/src/components/ComponentApi.svelte index da2daf26..37bbcf06 100644 --- a/docs/src/components/ComponentApi.svelte +++ b/docs/src/components/ComponentApi.svelte @@ -112,7 +112,9 @@ {#each prop[1].description.split('\n') as line} -
{line}.
+
+ {@html line.replace(/`(.*?)`/g, '$1')}. +
{/each} From b754e0cf7994112f21655471d62364f55b3da39c Mon Sep 17 00:00:00 2001 From: weaseldotro <1822852+weaseldotro@users.noreply.github.com> Date: Mon, 9 Nov 2020 11:14:56 +0200 Subject: [PATCH 2/9] feat(ComposedModal): allow using null for selectorPrimaryFocus to disable auto focus --- src/ComposedModal/ComposedModal.svelte | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ComposedModal/ComposedModal.svelte b/src/ComposedModal/ComposedModal.svelte index f0ea91a2..14203f4d 100644 --- a/src/ComposedModal/ComposedModal.svelte +++ b/src/ComposedModal/ComposedModal.svelte @@ -69,6 +69,9 @@ }); function focus(element) { + if(selectorPrimaryFocus === null) { + return + } const node = (element || innerModal).querySelector(selectorPrimaryFocus) || buttonRef; if (node != null) node.focus(); From 9d0a0b00b7ca88443985bf21fc4631bac3d2718c Mon Sep 17 00:00:00 2001 From: josefaidt Date: Thu, 12 Nov 2020 08:03:20 -0600 Subject: [PATCH 3/9] feat(UIShell): add persistentHamburgerMenu prop to header --- src/UIShell/GlobalHeader/Header.svelte | 11 +++++++++-- src/UIShell/SideNav/SideNav.svelte | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/UIShell/GlobalHeader/Header.svelte b/src/UIShell/GlobalHeader/Header.svelte index 6c27ad17..8f465e90 100644 --- a/src/UIShell/GlobalHeader/Header.svelte +++ b/src/UIShell/GlobalHeader/Header.svelte @@ -36,6 +36,12 @@ */ export let platformName = ""; + /** + * Specify Hamburger Menu persistance + * @type {boolean} [persistentHamburgerMenu=false] + */ + export let persistentHamburgerMenu = false; + /** * Obtain a reference to the HTML anchor element * @type {null | HTMLAnchorElement} [ref=null] @@ -46,7 +52,8 @@ let winWidth = undefined; - $: isSideNavOpen = expandedByDefault && winWidth >= 1056; + $: isSideNavOpen = + expandedByDefault && winWidth >= 1056 && persistentHamburgerMenu !== true; $: ariaLabel = company ? `${company} ` : "" + (uiShellAriaLabel || $$props["aria-label"] || platformName); @@ -56,7 +63,7 @@
- {#if winWidth < 1056} + {#if winWidth < 1056 || persistentHamburgerMenu === true} {/if} From 4e88bcc5b82a4c11032f90c572fa6d1c0d3b94f6 Mon Sep 17 00:00:00 2001 From: josefaidt Date: Thu, 12 Nov 2020 08:07:28 -0600 Subject: [PATCH 4/9] refactor(SideNav): collapse logic should differ from fixed variants --- src/UIShell/SideNav/SideNav.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/UIShell/SideNav/SideNav.svelte b/src/UIShell/SideNav/SideNav.svelte index 4f1e0b02..ce2649ba 100644 --- a/src/UIShell/SideNav/SideNav.svelte +++ b/src/UIShell/SideNav/SideNav.svelte @@ -33,7 +33,7 @@ class:bx--side-nav="{true}" class:bx--side-nav--ux="{true}" class:bx--side-nav--expanded="{isOpen}" - class:bx--side-nav--collapsed="{!isOpen && !fixed}" + class:bx--side-nav--collapsed="{fixed ? !isOpen && fixed : !isOpen}" {...$$restProps} > From 3049d2318c457a111999184b1d7a1be75936634f Mon Sep 17 00:00:00 2001 From: josefaidt Date: Thu, 12 Nov 2020 09:05:24 -0600 Subject: [PATCH 5/9] refactor boolean comparison --- docs/src/pages/framed/UIShell/HeaderNav.svelte | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/src/pages/framed/UIShell/HeaderNav.svelte b/docs/src/pages/framed/UIShell/HeaderNav.svelte index 1e229526..5a8ce687 100644 --- a/docs/src/pages/framed/UIShell/HeaderNav.svelte +++ b/docs/src/pages/framed/UIShell/HeaderNav.svelte @@ -19,7 +19,12 @@ let isSideNavOpen = false; -
+
From 07ce05e3445614edb840d624234677523f7e355c Mon Sep 17 00:00:00 2001 From: josefaidt Date: Fri, 13 Nov 2020 12:43:10 -0600 Subject: [PATCH 6/9] refactor(SideNav): simplify collapsed logic --- src/UIShell/GlobalHeader/Header.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/UIShell/GlobalHeader/Header.svelte b/src/UIShell/GlobalHeader/Header.svelte index 8f465e90..311f9725 100644 --- a/src/UIShell/GlobalHeader/Header.svelte +++ b/src/UIShell/GlobalHeader/Header.svelte @@ -53,7 +53,7 @@ let winWidth = undefined; $: isSideNavOpen = - expandedByDefault && winWidth >= 1056 && persistentHamburgerMenu !== true; + expandedByDefault && winWidth >= 1056 && !persistentHamburgerMenu; $: ariaLabel = company ? `${company} ` : "" + (uiShellAriaLabel || $$props["aria-label"] || platformName); @@ -63,7 +63,7 @@
- {#if winWidth < 1056 || persistentHamburgerMenu === true} + {#if winWidth < 1056 || persistentHamburgerMenu} {/if} Date: Tue, 17 Nov 2020 09:28:53 +0200 Subject: [PATCH 7/9] Use loose equal in ComposedModal Co-authored-by: Eric Liu --- src/ComposedModal/ComposedModal.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ComposedModal/ComposedModal.svelte b/src/ComposedModal/ComposedModal.svelte index 14203f4d..42d041c5 100644 --- a/src/ComposedModal/ComposedModal.svelte +++ b/src/ComposedModal/ComposedModal.svelte @@ -69,7 +69,7 @@ }); function focus(element) { - if(selectorPrimaryFocus === null) { + if(selectorPrimaryFocus == null) { return } const node = From fd56f67705fef6cd1e58886966af57ff2699d713 Mon Sep 17 00:00:00 2001 From: josefaidt Date: Wed, 18 Nov 2020 08:42:37 -0600 Subject: [PATCH 8/9] refactor(SideNav): simplify collapsed logic --- src/UIShell/SideNav/SideNav.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/UIShell/SideNav/SideNav.svelte b/src/UIShell/SideNav/SideNav.svelte index ce2649ba..5132c6bd 100644 --- a/src/UIShell/SideNav/SideNav.svelte +++ b/src/UIShell/SideNav/SideNav.svelte @@ -33,7 +33,7 @@ class:bx--side-nav="{true}" class:bx--side-nav--ux="{true}" class:bx--side-nav--expanded="{isOpen}" - class:bx--side-nav--collapsed="{fixed ? !isOpen && fixed : !isOpen}" + class:bx--side-nav--collapsed="{!isOpen}" {...$$restProps} > From a417cee48139c6d6fb36fe9a4901b45a2c8dbc88 Mon Sep 17 00:00:00 2001 From: josefaidt Date: Wed, 18 Nov 2020 08:53:55 -0600 Subject: [PATCH 9/9] docs(UIShell): add example for persisted hamburger menu --- docs/src/pages/components/UIShell.svx | 6 +- .../src/pages/framed/UIShell/HeaderNav.svelte | 7 +- .../UIShell/PersistedHamburgerMenu.svelte | 65 +++++++++++++++++++ 3 files changed, 71 insertions(+), 7 deletions(-) create mode 100644 docs/src/pages/framed/UIShell/PersistedHamburgerMenu.svelte diff --git a/docs/src/pages/components/UIShell.svx b/docs/src/pages/components/UIShell.svx index b4f2050e..46eea0ee 100644 --- a/docs/src/pages/components/UIShell.svx +++ b/docs/src/pages/components/UIShell.svx @@ -36,4 +36,8 @@ components: ["Header", ### Header with utilities - \ No newline at end of file + + +### Header with persisted hamburger menu + + \ No newline at end of file diff --git a/docs/src/pages/framed/UIShell/HeaderNav.svelte b/docs/src/pages/framed/UIShell/HeaderNav.svelte index 5a8ce687..1e229526 100644 --- a/docs/src/pages/framed/UIShell/HeaderNav.svelte +++ b/docs/src/pages/framed/UIShell/HeaderNav.svelte @@ -19,12 +19,7 @@ let isSideNavOpen = false; -
+
diff --git a/docs/src/pages/framed/UIShell/PersistedHamburgerMenu.svelte b/docs/src/pages/framed/UIShell/PersistedHamburgerMenu.svelte new file mode 100644 index 00000000..5a8ce687 --- /dev/null +++ b/docs/src/pages/framed/UIShell/PersistedHamburgerMenu.svelte @@ -0,0 +1,65 @@ + + +
+
+ +
+ + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + +

Welcome

+ + + +