Skip to content

Commit

Permalink
fix(sidebar-nav): set initial collapsible state (#839)
Browse files Browse the repository at this point in the history
  • Loading branch information
nowseemee authored Feb 2, 2022
1 parent ccb1753 commit fad731e
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,14 @@ exports[`SidebarNav should handle click 1`] = `
`;

exports[`SidebarNav should handle scale-sidebar-nav-collapsuible child 1`] = `
<scale-sidebar-nav>
<scale-sidebar-nav collapsible="">
<mock:shadow-root>
<div class="sidebar-nav" part="sidebar-nav">
<nav part="nav">
<div class="sidebar-nav sidebar-nav--collapsible" part="sidebar-nav collapsible">
<button aria-expanded="false" class="sidebar-nav__toggle-button" part="toggle-button">
Menu
<scale-icon-navigation-collapse-down class="sidebar-nav__icon" part="icon" size="16"></scale-icon-navigation-collapse-down>
</button>
<nav hidden="" part="nav">
<ul class="sidebar-nav__list" part="list" role="list">
<slot></slot>
</ul>
Expand All @@ -35,10 +39,14 @@ exports[`SidebarNav should handle scale-sidebar-nav-collapsuible child 1`] = `
`;

exports[`SidebarNav should handle scale-sidebar-nav-collapsuible child level 1 1`] = `
<scale-sidebar-nav>
<scale-sidebar-nav collapsible="">
<mock:shadow-root>
<div class="sidebar-nav" part="sidebar-nav">
<nav part="nav">
<div class="sidebar-nav sidebar-nav--collapsible" part="sidebar-nav collapsible">
<button aria-expanded="false" class="sidebar-nav__toggle-button" part="toggle-button">
Menu
<scale-icon-navigation-collapse-down class="sidebar-nav__icon" part="icon" size="16"></scale-icon-navigation-collapse-down>
</button>
<nav hidden="" part="nav">
<ul class="sidebar-nav__list" part="list" role="list">
<slot></slot>
</ul>
Expand All @@ -52,10 +60,14 @@ exports[`SidebarNav should handle scale-sidebar-nav-collapsuible child level 1 1
`;

exports[`SidebarNav should handle scale-sidebar-nav-collapsuible child level 2 1`] = `
<scale-sidebar-nav>
<scale-sidebar-nav collapsible="">
<mock:shadow-root>
<div class="sidebar-nav" part="sidebar-nav">
<nav part="nav">
<div class="sidebar-nav sidebar-nav--collapsible" part="sidebar-nav collapsible">
<button aria-expanded="false" class="sidebar-nav__toggle-button" part="toggle-button">
Menu
<scale-icon-navigation-collapse-down class="sidebar-nav__icon" part="icon" size="16"></scale-icon-navigation-collapse-down>
</button>
<nav hidden="" part="nav">
<ul class="sidebar-nav__list" part="list" role="list">
<slot></slot>
</ul>
Expand All @@ -71,10 +83,14 @@ exports[`SidebarNav should handle scale-sidebar-nav-collapsuible child level 2 1
`;

exports[`SidebarNav should handle scale-sidebar-nav-collapsuible child level 2 2`] = `
<scale-sidebar-nav>
<scale-sidebar-nav collapsible="">
<mock:shadow-root>
<div class="sidebar-nav" part="sidebar-nav">
<nav part="nav">
<div class="sidebar-nav sidebar-nav--collapsible" part="sidebar-nav collapsible">
<button aria-expanded="false" class="sidebar-nav__toggle-button" part="toggle-button">
Menu
<scale-icon-navigation-collapse-down class="sidebar-nav__icon" part="icon" size="16"></scale-icon-navigation-collapse-down>
</button>
<nav hidden="" part="nav">
<ul class="sidebar-nav__list" part="list" role="list">
<slot></slot>
</ul>
Expand All @@ -91,10 +107,14 @@ exports[`SidebarNav should handle scale-sidebar-nav-collapsuible child level 2 2
`;

exports[`SidebarNav should handle scale-sidebar-nav-item child 1`] = `
<scale-sidebar-nav>
<scale-sidebar-nav collapsible="">
<mock:shadow-root>
<div class="sidebar-nav" part="sidebar-nav">
<nav part="nav">
<div class="sidebar-nav sidebar-nav--collapsible" part="sidebar-nav collapsible">
<button aria-expanded="false" class="sidebar-nav__toggle-button" part="toggle-button">
Menu
<scale-icon-navigation-collapse-down class="sidebar-nav__icon" part="icon" size="16"></scale-icon-navigation-collapse-down>
</button>
<nav hidden="" part="nav">
<ul class="sidebar-nav__list" part="list" role="list">
<slot></slot>
</ul>
Expand All @@ -106,10 +126,14 @@ exports[`SidebarNav should handle scale-sidebar-nav-item child 1`] = `
`;

exports[`SidebarNav should match snapshot 1`] = `
<scale-sidebar-nav>
<scale-sidebar-nav collapsible="">
<mock:shadow-root>
<div class="sidebar-nav" part="sidebar-nav">
<nav part="nav">
<div class="sidebar-nav sidebar-nav--collapsible" part="sidebar-nav collapsible">
<button aria-expanded="false" class="sidebar-nav__toggle-button" part="toggle-button">
Menu
<scale-icon-navigation-collapse-down class="sidebar-nav__icon" part="icon" size="16"></scale-icon-navigation-collapse-down>
</button>
<nav hidden="" part="nav">
<ul class="sidebar-nav__list" part="list" role="list">
<slot></slot>
</ul>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ describe('SidebarNav', () => {
Object.defineProperty(window, 'matchMedia', {
writable: true,
value: jest.fn().mockImplementation((query) => ({
matches: false,
matches: true,
media: query,
onchange: null,
addListener: jest.fn(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ export class SidebarNav {
// Recent versions of Safari throw with `addEventListener`
// https://developer.mozilla.org/en-US/docs/Web/API/MediaQueryList/addListener
this.mq.addListener(this.handleMediaQueryChange);
this.collapsible = this.mq.matches;
}
}

Expand Down

0 comments on commit fad731e

Please sign in to comment.