mcp/carbon-components-svelte
1
0
Fork 0
mirror of https://github.com/carbon-design-system/carbon-components-svelte.git synced 2025-09-16 10:51:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into rewrite-tyepscript-definitions

Browse source
This commit is contained in:
Eric Liu 2020-11-19 06:16:50 -08:00 • committed by GitHub
commit 56718c633d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 81 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/ComposedModal/ComposedModal.svelte
View file

@ -51,6 +51,9 @@
});
function focus(element) {
if(selectorPrimaryFocus == null) {
return
}
const node =
(element || innerModal).querySelector(selectorPrimaryFocus) || buttonRef;
if (node != null) node.focus();

8
src/UIShell/GlobalHeader/Header.svelte
View file

@ -29,6 +29,9 @@
*/
export let platformName = "";
/** Set to `true` to persist the hamburger menu */
export let persistentHamburgerMenu = false;
/** Obtain a reference to the HTML anchor element */
export let ref = null;
@ -36,7 +39,8 @@
let winWidth = undefined;
$: isSideNavOpen = expandedByDefault && winWidth >= 1056;
$: isSideNavOpen =
expandedByDefault && winWidth >= 1056 && !persistentHamburgerMenu;
$: ariaLabel = company
? `${company} `
: "" + (uiShellAriaLabel || $$props["aria-label"] || platformName);
@ -46,7 +50,7 @@
<header role="banner" aria-label="{ariaLabel}" class:bx--header="{true}">
<slot name="skip-to-content" />
{#if winWidth < 1056}
{#if winWidth < 1056 || persistentHamburgerMenu}
<HamburgerMenu bind:isOpen="{isSideNavOpen}" />
{/if}
<a

2
src/UIShell/SideNav/SideNav.svelte
View file

@ -27,7 +27,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="{!isOpen}"
{...$$restProps}
>
<slot />