@k2b/ui 0.39.0 → 0.41.0

package/dist/browser/layout/SettingsModal.js

@@ -10,7 +10,7 @@ import { getNextMarker as _$getNextMarker } from "solid-js/web";
 import { insert as _$insert } from "solid-js/web";
 import { createComponent as _$createComponent } from "solid-js/web";
 import { use as _$use } from "solid-js/web";
-var _tmpl$ = /*#__PURE__*/_$template(`<button type=button role=tab><!$><!/><span class=k2b-truncate-fade>`),
+var _tmpl$ = /*#__PURE__*/_$template(`<button type=button role=tab><!$><!/><span class=k2b-truncate-fade-lines>`),
   _tmpl$2 = /*#__PURE__*/_$template(`<i aria-hidden=true>`),
   _tmpl$3 = /*#__PURE__*/_$template(`<i class="ti ti-x"aria-hidden=true>`),
   _tmpl$4 = /*#__PURE__*/_$template(`<div role=region><!$><!/><aside class=k2b-settings__rail><nav class=k2b-settings__tabs role=tablist data-scroll-fade-mode=both data-scroll-fade-axis=horizontal></nav></aside><div class=k2b-settings__content><!$><!/><!$><!/>`),
@@ -32,7 +32,7 @@ const isGroupDefinition = value => !!value && typeof value === "object" && value
 const isFooterDefinition = value => !!value && typeof value === "object" && value.kind === SETTINGS_MODAL_FOOTER;
 const collectTabs = value => {
   if (Array.isArray(value)) return value.flatMap(collectTabs);
-  if (isGroupDefinition(value)) return collectTabs(value.props.children);
+  if (isGroupDefinition(value)) return collectTabs(value.resolved());
   return isTabDefinition(value) ? [value] : [];
 };
 const collectRailEntries = value => {
@@ -65,9 +65,13 @@ function SettingsModalTab(props) {
   };
 }
 function SettingsModalGroup(props) {
+  // The modal's own `children()` does not reach into a group. Resolving here keeps the other tabs of a group the same
+  // objects when a conditional tab comes or goes, so the open panel and its unsaved input stay in place.
+  const resolved = children(() => props.children);
   return {
     kind: SETTINGS_MODAL_GROUP,
-    props
+    props,
+    resolved
   };
 }
 function SettingsModalFooter(props) {
@@ -103,7 +107,8 @@ const SettingsModal = props => {
       inline: "nearest"
     }));
   });
-  const activeTab = () => tabs().find(tab => tab.props.id === resolvedActiveTabId()) ?? null;
+  // A memo, so a change elsewhere in the tab list does not create the open panel again.
+  const activeTab = createMemo(() => tabs().find(tab => tab.props.id === resolvedActiveTabId()) ?? null);
   const resolvedPanelChildren = children(() => activeTab()?.props.children);
   const panelChildren = createMemo(() => splitPanelChildren(resolvedPanelChildren()));
   const selectTab = id => {
@@ -221,7 +226,7 @@ const SettingsModal = props => {
         _$insert(_el$16, () => entry.props.title);
         _$insert(_el$15, _$createComponent(For, {
           get each() {
-            return collectTabs(entry.props.children);
+            return collectTabs(entry.resolved());
           },
           children: tab => TabButton(tab)
         }), _el$18, _co$5);

package/dist/browser/layout/SettingsModal.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"sources":["layout/SettingsModal.tsx"],"sourcesContent":["import { children, createEffect, createMemo, createSignal, createUniqueId, For, type JSX, Show } from \"solid-js\";\nimport { IconButton } from \"../actions/Button\";\nimport { useUiMessages } from \"../intl/messages\";\nimport { createScrollFade } from \"./scroll-fade\";\nimport { useSettingsMessages } from \"./settings-messages\";\nimport { assertUniqueStableUiIds } from \"./stable-id\";\n\nconst SETTINGS_MODAL_TAB = Symbol(\"SettingsModal.Tab\");\nconst SETTINGS_MODAL_GROUP = Symbol(\"SettingsModal.Group\");\nconst SETTINGS_MODAL_FOOTER = Symbol(\"SettingsModal.Footer\");\n\nexport type SettingsModalTabTone = \"default\" | \"danger\";\n\nexport type SettingsModalTabProps = {\n  id: string;\n  title: string;\n  description?: string;\n  icon?: string;\n  tone?: SettingsModalTabTone;\n  children: JSX.Element;\n};\n\nexport type SettingsModalGroupProps = {\n  title: string;\n  children: JSX.Element;\n};\n\nexport type SettingsModalFooterProps = {\n  children: JSX.Element;\n};\n\ntype SettingsModalTabDefinition = {\n  readonly kind: typeof SETTINGS_MODAL_TAB;\n  readonly props: SettingsModalTabProps;\n};\n\ntype SettingsModalGroupDefinition = {\n  readonly kind: typeof SETTINGS_MODAL_GROUP;\n  readonly props: SettingsModalGroupProps;\n};\n\ntype SettingsModalFooterDefinition = {\n  readonly kind: typeof SETTINGS_MODAL_FOOTER;\n  readonly props: SettingsModalFooterProps;\n};\n\nexport type SettingsModalProps = {\n  /** Accessible name for the settings surface. */\n  title: string;\n  /** @deprecated Retained for source compatibility; tab descriptions carry the visible context. */\n  subtitle?: string;\n  /** @deprecated Retained for source compatibility; tab icons identify the rail entries. */\n  icon?: string;\n  defaultTab?: string;\n  activeTab?: string;\n  onTabChange?: (id: string) => void;\n  onClose?: () => void;\n  closeLabel?: string;\n  class?: string;\n  children: JSX.Element;\n};\n\ntype SettingsModalComponent = ((props: SettingsModalProps) => JSX.Element) & {\n  Tab: (props: SettingsModalTabProps) => JSX.Element;\n  Group: (props: SettingsModalGroupProps) => JSX.Element;\n  Footer: (props: SettingsModalFooterProps) => JSX.Element;\n};\n\nconst isTabDefinition = (value: unknown): value is SettingsModalTabDefinition =>\n  !!value && typeof value === \"object\" && (value as { kind?: unknown }).kind === SETTINGS_MODAL_TAB;\n\nconst isGroupDefinition = (value: unknown): value is SettingsModalGroupDefinition =>\n  !!value && typeof value === \"object\" && (value as { kind?: unknown }).kind === SETTINGS_MODAL_GROUP;\n\nconst isFooterDefinition = (value: unknown): value is SettingsModalFooterDefinition =>\n  !!value && typeof value === \"object\" && (value as { kind?: unknown }).kind === SETTINGS_MODAL_FOOTER;\n\nconst collectTabs = (value: unknown): SettingsModalTabDefinition[] => {\n  if (Array.isArray(value)) return value.flatMap(collectTabs);\n  if (isGroupDefinition(value)) return collectTabs(value.props.children);\n  return isTabDefinition(value) ? [value] : [];\n};\n\nconst collectRailEntries = (value: unknown): (SettingsModalGroupDefinition | SettingsModalTabDefinition)[] => {\n  if (Array.isArray(value)) return value.flatMap(collectRailEntries);\n  if (isGroupDefinition(value) || isTabDefinition(value)) return [value];\n  return [];\n};\n\nconst splitPanelChildren = (value: unknown): { content: JSX.Element[]; footer?: SettingsModalFooterDefinition } => {\n  if (Array.isArray(value)) {\n    return value.reduce<{ content: JSX.Element[]; footer?: SettingsModalFooterDefinition }>(\n      (result, entry) => {\n        const next = splitPanelChildren(entry);\n        result.content.push(...next.content);\n        if (next.footer) result.footer = next.footer;\n        return result;\n      },\n      { content: [] },\n    );\n  }\n  return isFooterDefinition(value) ? { content: [], footer: value } : { content: [value as JSX.Element] };\n};\n\nfunction SettingsModalTab(props: SettingsModalTabProps): JSX.Element {\n  return { kind: SETTINGS_MODAL_TAB, props } satisfies SettingsModalTabDefinition as unknown as JSX.Element;\n}\n\nfunction SettingsModalGroup(props: SettingsModalGroupProps): JSX.Element {\n  return { kind: SETTINGS_MODAL_GROUP, props } satisfies SettingsModalGroupDefinition as unknown as JSX.Element;\n}\n\nfunction SettingsModalFooter(props: SettingsModalFooterProps): JSX.Element {\n  return { kind: SETTINGS_MODAL_FOOTER, props } satisfies SettingsModalFooterDefinition as unknown as JSX.Element;\n}\n\nconst SettingsModal = ((props: SettingsModalProps): JSX.Element => {\n  const messages = useUiMessages();\n  const settingsMessages = useSettingsMessages();\n  const resolved = children(() => props.children);\n  const railEntries = createMemo(() => collectRailEntries(resolved()));\n  const tabs = createMemo(() => {\n    const collected = collectTabs(resolved());\n    assertUniqueStableUiIds(\n      collected.map((tab) => tab.props.id),\n      \"SettingsModal.Tab id\",\n    );\n    return collected;\n  });\n  const instanceId = `k2b-settings-${createUniqueId()}`;\n  const tabRefs = new Map<string, HTMLButtonElement>();\n  let tabList: HTMLElement | undefined;\n  // Narrow surfaces show the categories as one scrolling row; the fade tells that more follow.\n  createScrollFade(\n    () => tabList,\n    () => true,\n  );\n  const firstTabId = () => tabs()[0]?.props.id ?? \"\";\n  const [localActiveTab, setLocalActiveTab] = createSignal(props.defaultTab ?? firstTabId());\n  const requestedActiveTabId = () => props.activeTab ?? (localActiveTab() || firstTabId());\n  const resolvedActiveTabId = createMemo(() =>\n    tabs().some((tab) => tab.props.id === requestedActiveTabId()) ? requestedActiveTabId() : firstTabId(),\n  );\n  // `defaultTab`, `activeTab` and clicks can select a category past the edge of the scrolling row or rail.\n  createEffect(() => {\n    const id = resolvedActiveTabId();\n    queueMicrotask(() => tabRefs.get(id)?.scrollIntoView?.({ block: \"nearest\", inline: \"nearest\" }));\n  });\n  const activeTab = () => tabs().find((tab) => tab.props.id === resolvedActiveTabId()) ?? null;\n  const resolvedPanelChildren = children(() => activeTab()?.props.children);\n  const panelChildren = createMemo(() => splitPanelChildren(resolvedPanelChildren()));\n\n  const selectTab = (id: string) => {\n    if (props.activeTab === undefined) setLocalActiveTab(id);\n    props.onTabChange?.(id);\n  };\n\n  const moveTabFocus = (event: KeyboardEvent, currentId: string) => {\n    const currentIndex = tabs().findIndex((tab) => tab.props.id === currentId);\n    if (currentIndex < 0 || tabs().length === 0) return;\n    let nextIndex: number | null = null;\n    if (event.key === \"ArrowRight\" || event.key === \"ArrowDown\") nextIndex = (currentIndex + 1) % tabs().length;\n    if (event.key === \"ArrowLeft\" || event.key === \"ArrowUp\") nextIndex = (currentIndex - 1 + tabs().length) % tabs().length;\n    if (event.key === \"Home\") nextIndex = 0;\n    if (event.key === \"End\") nextIndex = tabs().length - 1;\n    if (nextIndex === null) return;\n    event.preventDefault();\n    const nextTab = tabs()[nextIndex];\n    if (!nextTab) return;\n    selectTab(nextTab.props.id);\n    tabRefs.get(nextTab.props.id)?.focus();\n  };\n\n  const tabId = (id: string) => `${instanceId}-tab-${id}`;\n  const panelId = (id: string) => `${instanceId}-panel-${id}`;\n\n  const TabButton = (tab: SettingsModalTabDefinition): JSX.Element => {\n    const active = () => resolvedActiveTabId() === tab.props.id;\n    return (\n      <button\n        ref={(element) => tabRefs.set(tab.props.id, element)}\n        id={tabId(tab.props.id)}\n        type=\"button\"\n        role=\"tab\"\n        aria-selected={active()}\n        aria-controls={active() ? panelId(tab.props.id) : undefined}\n        tabIndex={active() ? 0 : -1}\n        data-state={active() ? \"active\" : \"idle\"}\n        data-active={active() ? \"true\" : undefined}\n        data-tone={tab.props.tone ?? \"default\"}\n        onClick={() => selectTab(tab.props.id)}\n        onKeyDown={(event) => moveTabFocus(event, tab.props.id)}\n      >\n        <Show when={tab.props.icon}>{(icon) => <i class={icon()} aria-hidden=\"true\" />}</Show>\n        <span class=\"k2b-truncate-fade\">{tab.props.title}</span>\n      </button>\n    );\n  };\n\n  return (\n    <div class={`k2b-settings ${props.class ?? \"\"}`} role=\"region\" aria-label={props.title}>\n      <Show when={props.onClose}>\n        <IconButton class=\"k2b-settings__close\" label={props.closeLabel ?? messages().close} onClick={props.onClose}>\n          <i class=\"ti ti-x\" aria-hidden=\"true\" />\n        </IconButton>\n      </Show>\n      <aside class=\"k2b-settings__rail\">\n        <nav\n          ref={tabList}\n          class=\"k2b-settings__tabs\"\n          aria-label={settingsMessages().sectionsLabel({ title: props.title })}\n          role=\"tablist\"\n          data-scroll-fade-mode=\"both\"\n          data-scroll-fade-axis=\"horizontal\"\n        >\n          <For each={railEntries()}>\n            {(entry) =>\n              isGroupDefinition(entry) ? (\n                <div class=\"k2b-settings__tab-group\" role=\"presentation\">\n                  <span class=\"k2b-settings__tab-group-label k2b-truncate-fade\" aria-hidden=\"true\">\n                    {entry.props.title}\n                  </span>\n                  <For each={collectTabs(entry.props.children)}>{(tab) => TabButton(tab)}</For>\n                </div>\n              ) : (\n                TabButton(entry)\n              )\n            }\n          </For>\n        </nav>\n      </aside>\n      <div class=\"k2b-settings__content\">\n        <Show when={activeTab()}>\n          {(tab) => (\n            <section\n              id={panelId(tab().props.id)}\n              class=\"k2b-settings__body\"\n              role=\"tabpanel\"\n              aria-labelledby={tabId(tab().props.id)}\n              tabIndex={0}\n              data-tone={tab().props.tone ?? \"default\"}\n            >\n              <div class=\"k2b-settings__section\">\n                <div class=\"k2b-settings__section-heading\">\n                  <h2>{tab().props.title}</h2>\n                  <Show when={tab().props.description}>{(description) => <p>{description()}</p>}</Show>\n                </div>\n                {panelChildren().content}\n              </div>\n            </section>\n          )}\n        </Show>\n        <Show when={panelChildren().footer}>{(footer) => <footer class=\"k2b-settings__footer\">{footer().props.children}</footer>}</Show>\n      </div>\n    </div>\n  );\n}) as SettingsModalComponent;\n\nSettingsModal.Tab = SettingsModalTab;\nSettingsModal.Group = SettingsModalGroup;\nSettingsModal.Footer = SettingsModalFooter;\n\nexport default SettingsModal;\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,SAAS,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,cAAc,EAAE,GAAG,EAAY,IAAI,QAAQ,UAAU;AAChH,SAAS,UAAU,QAAQ,mBAAmB;AAC9C,SAAS,aAAa,QAAQ,kBAAkB;AAChD,SAAS,gBAAgB,QAAQ,eAAe;AAChD,SAAS,mBAAmB,QAAQ,qBAAqB;AACzD,SAAS,uBAAuB,QAAQ,aAAa;AAErD,MAAM,kBAAkB,GAAG,MAAM,CAAC,mBAAmB,CAAC;AACtD,MAAM,oBAAoB,GAAG,MAAM,CAAC,qBAAqB,CAAC;AAC1D,MAAM,qBAAqB,GAAG,MAAM,CAAC,sBAAsB,CAAC;AA2D5D,MAAM,eAAe,GAAI,KAAc,IACrC,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAK,KAAK,CAAwB,IAAI,KAAK,kBAAkB;AAEnG,MAAM,iBAAiB,GAAI,KAAc,IACvC,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAK,KAAK,CAAwB,IAAI,KAAK,oBAAoB;AAErG,MAAM,kBAAkB,GAAI,KAAc,IACxC,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAK,KAAK,CAAwB,IAAI,KAAK,qBAAqB;AAEtG,MAAM,WAAW,GAAI,KAAc,IAAmC;EACpE,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC;EAC3D,IAAI,iBAAiB,CAAC,KAAK,CAAC,EAAE,OAAO,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC;EACtE,OAAO,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE;AAC9C,CAAC;AAED,MAAM,kBAAkB,GAAI,KAAc,IAAoE;EAC5G,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC;EAClE,IAAI,iBAAiB,CAAC,KAAK,CAAC,IAAI,eAAe,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC;EACtE,OAAO,EAAE;AACX,CAAC;AAED,MAAM,kBAAkB,GAAI,KAAc,IAAyE;EACjH,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;IACxB,OAAO,KAAK,CAAC,MAAM,CACjB,CAAC,MAAM,EAAE,KAAK,KAAK;MACjB,MAAM,IAAI,GAAG,kBAAkB,CAAC,KAAK,CAAC;MACtC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC;MACpC,IAAI,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM;MAC5C,OAAO,MAAM;IACf,CAAC,EACD;MAAE,OAAO,EAAE;IAAG,CAChB,CAAC;EACH;EACA,OAAO,kBAAkB,CAAC,KAAK,CAAC,GAAG;IAAE,OAAO,EAAE,EAAE;IAAE,MAAM,EAAE;EAAM,CAAC,GAAG;IAAE,OAAO,EAAE,CAAC,KAAK;EAAiB,CAAC;AACzG,CAAC;AAED,SAAS,gBAAgB,CAAC,KAA4B,EAAe;EACnE,OAAO;IAAE,IAAI,EAAE,kBAAkB;IAAE;EAAM,CAAC;AAC5C;AAEA,SAAS,kBAAkB,CAAC,KAA8B,EAAe;EACvE,OAAO;IAAE,IAAI,EAAE,oBAAoB;IAAE;EAAM,CAAC;AAC9C;AAEA,SAAS,mBAAmB,CAAC,KAA+B,EAAe;EACzE,OAAO;IAAE,IAAI,EAAE,qBAAqB;IAAE;EAAM,CAAC;AAC/C;AAEA,MAAM,aAAa,GAAK,KAAyB,IAAkB;EACjE,MAAM,QAAQ,GAAG,aAAa,CAAC,CAAC;EAChC,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,CAAC;EAC9C,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,KAAK,CAAC,QAAQ,CAAC;EAC/C,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,kBAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;EACpE,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM;IAC5B,MAAM,SAAS,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC;IACzC,uBAAuB,CACrB,SAAS,CAAC,GAAG,CAAE,GAAG,IAAK,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,EACpC,sBACF,CAAC;IACD,OAAO,SAAS;EAClB,CAAC,CAAC;EACF,MAAM,UAAU,GAAG,gBAAgB,cAAc,CAAC,CAAC,EAAE;EACrD,MAAM,OAAO,GAAG,IAAI,GAAG,CAA4B,CAAC;EACpD,IAAI,OAAgC;EACpC;EACA,gBAAgB,CACd,MAAM,OAAO,EACb,MAAM,IACR,CAAC;EACD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE;EAClD,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,UAAU,IAAI,UAAU,CAAC,CAAC,CAAC;EAC1F,MAAM,oBAAoB,GAAG,MAAM,KAAK,CAAC,SAAS,KAAK,cAAc,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC;EACxF,MAAM,mBAAmB,GAAG,UAAU,CAAC,MACrC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAE,GAAG,IAAK,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,oBAAoB,CAAC,CAAC,CAAC,GAAG,oBAAoB,CAAC,CAAC,GAAG,UAAU,CAAC,CACtG,CAAC;EACD;EACA,YAAY,CAAC,MAAM;IACjB,MAAM,EAAE,GAAG,mBAAmB,CAAC,CAAC;IAChC,cAAc,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,cAAc,GAAG;MAAE,KAAK,EAAE,SAAS;MAAE,MAAM,EAAE;IAAU,CAAC,CAAC,CAAC;EAClG,CAAC,CAAC;EACF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,CAAC,CAAC,IAAI,CAAE,GAAG,IAAK,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,mBAAmB,CAAC,CAAC,CAAC,IAAI,IAAI;EAC5F,MAAM,qBAAqB,GAAG,QAAQ,CAAC,MAAM,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC;EACzE,MAAM,aAAa,GAAG,UAAU,CAAC,MAAM,kBAAkB,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;EAEnF,MAAM,SAAS,GAAI,EAAU,IAAK;IAChC,IAAI,KAAK,CAAC,SAAS,KAAK,SAAS,EAAE,iBAAiB,CAAC,EAAE,CAAC;IACxD,KAAK,CAAC,WAAW,GAAG,EAAE,CAAC;EACzB,CAAC;EAED,MAAM,YAAY,GAAG,CAAC,KAAoB,EAAE,SAAiB,KAAK;IAChE,MAAM,YAAY,GAAG,IAAI,CAAC,CAAC,CAAC,SAAS,CAAE,GAAG,IAAK,GAAG,CAAC,KAAK,CAAC,EAAE,KAAK,SAAS,CAAC;IAC1E,IAAI,YAAY,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;IAC7C,IAAI,SAAwB,GAAG,IAAI;IACnC,IAAI,KAAK,CAAC,GAAG,KAAK,YAAY,IAAI,KAAK,CAAC,GAAG,KAAK,WAAW,EAAE,SAAS,GAAG,CAAC,YAAY,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM;IAC3G,IAAI,KAAK,CAAC,GAAG,KAAK,WAAW,IAAI,KAAK,CAAC,GAAG,KAAK,SAAS,EAAE,SAAS,GAAG,CAAC,YAAY,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM;IACxH,IAAI,KAAK,CAAC,GAAG,KAAK,MAAM,EAAE,SAAS,GAAG,CAAC;IACvC,IAAI,KAAK,CAAC,GAAG,KAAK,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC;IACtD,IAAI,SAAS,KAAK,IAAI,EAAE;IACxB,KAAK,CAAC,cAAc,CAAC,CAAC;IACtB,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IACjC,IAAI,CAAC,OAAO,EAAE;IACd,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;IAC3B,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;EACxC,CAAC;EAED,MAAM,KAAK,GAAI,EAAU,IAAK,GAAG,UAAU,QAAQ,EAAE,EAAE;EACvD,MAAM,OAAO,GAAI,EAAU,IAAK,GAAG,UAAU,UAAU,EAAE,EAAE;EAE3D,MAAM,SAAS,GAAI,GAA+B,IAAkB;IAClE,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,CAAC,KAAK,GAAG,CAAC,KAAK,CAAC,EAAE;IAC3D;MAAA;QAAA;QAAA;QAAA;MAAA,iBAagB,KAAK,IAAK,YAAY,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;MAAA,eAD9C,MAAM,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;MAAA,MAVhC,OAAO,IAAK,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,OAAO,CAAC;MAAA,iCAanD,IAAI;QAAA,IAAC,IAAI;UAAA,OAAE,GAAG,CAAC,KAAK,CAAC,IAAI;QAAA;QAAA,UAAI,IAAI;UAAA;UAAA,kCAAe,IAAI,CAAC,CAAC;UAAA;QAAA;MAAuB;MAAA,sBAC7C,GAAG,CAAC,KAAK,CAAC,KAAK;MAAA;QAAA,UAb5C,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;UAAA,OAGR,MAAM,CAAC,CAAC;UAAA,OACR,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,SAAS;UAAA,OACjD,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;UAAA,OACf,MAAM,CAAC,CAAC,GAAG,QAAQ,GAAG,MAAM;UAAA,OAC3B,MAAM,CAAC,CAAC,GAAG,MAAM,GAAG,SAAS;UAAA,OAC/B,GAAG,CAAC,KAAK,CAAC,IAAI,IAAI,SAAS;QAAA;QAAA;QAAA;QAAA;QAAA;QAAA;QAAA;QAAA;MAAA;QAAA;QAAA;QAAA;QAAA;QAAA;QAAA;QAAA;MAAA;MAAA;MAAA;IAAA;EAQ5C,CAAC;EAED;IAAA;MAAA;MAAA;MAAA;MAAA;MAAA;MAAA;MAAA;MAAA;MAAA;IAAA,kCAEK,IAAI;MAAA,IAAC,IAAI;QAAA,OAAE,KAAK,CAAC,OAAO;MAAA;MAAA;QAAA,yBACtB,UAAU;UAAA;UAAA,IAA6B,KAAK;YAAA,OAAE,KAAK,CAAC,UAAU,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK;UAAA;UAAA,IAAE,OAAO;YAAA,OAAE,KAAK,CAAC,OAAO;UAAA;UAAA;YAAA;UAAA;QAAA;MAAA;IAAA;IAAA,YAMpG,OAAO;IAAA,oDAAP,OAAO;IAAA,kCAOX,GAAG;MAAA,IAAC,IAAI;QAAA,OAAE,WAAW,CAAC,CAAC;MAAA;MAAA,UACpB,KAAK,IACL,iBAAiB,CAAC,KAAK,CAAC;QAAA;UAAA;UAAA;UAAA;QAAA,uBAGjB,KAAK,CAAC,KAAK,CAAC,KAAK;QAAA,mCAEnB,GAAG;UAAA,IAAC,IAAI;YAAA,OAAE,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC;UAAA;UAAA,UAAI,GAAG,IAAK,SAAS,CAAC,GAAG;QAAC;QAAA;MAAA,OAGxE,SAAS,CAAC,KAAK;IAChB;IAAA,kCAMN,IAAI;MAAA,IAAC,IAAI;QAAA,OAAE,SAAS,CAAC,CAAC;MAAA;MAAA,UACnB,GAAG;QAAA;UAAA;UAAA;UAAA;UAAA;UAAA;UAAA;UAAA;QAAA,uBAWQ,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK;QAAA,mCACrB,IAAI;UAAA,IAAC,IAAI;YAAA,OAAE,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW;UAAA;UAAA,UAAI,WAAW;YAAA;YAAA,iBAAS,WAAW;YAAA;UAAA;QAAO;QAAA,uBAE9E,aAAa,CAAC,CAAC,CAAC,OAAO;QAAA;UAAA,WAZtB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;YAAA,QAGV,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;YAAA,QAE3B,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,IAAI,SAAS;UAAA;UAAA;UAAA;UAAA;QAAA;UAAA;UAAA;UAAA;QAAA;QAAA;MAAA;IAU3C;IAAA,kCAEF,IAAI;MAAA,IAAC,IAAI;QAAA,OAAE,aAAa,CAAC,CAAC,CAAC,MAAM;MAAA;MAAA,UAAI,MAAM;QAAA;QAAA,uBAA2C,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ;QAAA;MAAA;IAAU;IAAA;MAAA,WApDhH,gBAAgB,KAAK,CAAC,KAAK,IAAI,EAAE,EAAE;QAAA,OAA4B,KAAK,CAAC,KAAK;QAAA,OAUpE,gBAAgB,CAAC,CAAC,CAAC,aAAa,CAAC;UAAE,KAAK,EAAE,KAAK,CAAC;QAAM,CAAC,CAAC;MAAA;MAAA;MAAA;MAAA;IAAA;MAAA;MAAA;MAAA;IAAA;IAAA;EAAA;AA8C9E,CAA4B;AAE5B,aAAa,CAAC,GAAG,GAAG,gBAAgB;AACpC,aAAa,CAAC,KAAK,GAAG,kBAAkB;AACxC,aAAa,CAAC,MAAM,GAAG,mBAAmB;AAE1C,eAAe,aAAa;AAAC","ignoreList":[]}
+{"version":3,"names":[],"sources":["layout/SettingsModal.tsx"],"sourcesContent":["import { type Accessor, children, createEffect, createMemo, createSignal, createUniqueId, For, type JSX, Show } from \"solid-js\";\nimport { IconButton } from \"../actions/Button\";\nimport { useUiMessages } from \"../intl/messages\";\nimport { createScrollFade } from \"./scroll-fade\";\nimport { useSettingsMessages } from \"./settings-messages\";\nimport { assertUniqueStableUiIds } from \"./stable-id\";\n\nconst SETTINGS_MODAL_TAB = Symbol(\"SettingsModal.Tab\");\nconst SETTINGS_MODAL_GROUP = Symbol(\"SettingsModal.Group\");\nconst SETTINGS_MODAL_FOOTER = Symbol(\"SettingsModal.Footer\");\n\nexport type SettingsModalTabTone = \"default\" | \"danger\";\n\nexport type SettingsModalTabProps = {\n  id: string;\n  title: string;\n  description?: string;\n  icon?: string;\n  tone?: SettingsModalTabTone;\n  children: JSX.Element;\n};\n\nexport type SettingsModalGroupProps = {\n  title: string;\n  children: JSX.Element;\n};\n\nexport type SettingsModalFooterProps = {\n  children: JSX.Element;\n};\n\ntype SettingsModalTabDefinition = {\n  readonly kind: typeof SETTINGS_MODAL_TAB;\n  readonly props: SettingsModalTabProps;\n};\n\ntype SettingsModalGroupDefinition = {\n  readonly kind: typeof SETTINGS_MODAL_GROUP;\n  readonly props: SettingsModalGroupProps;\n  /** The group's children, created once and resolved like `children()`, so a `<Show>` tab follows its condition. */\n  readonly resolved: Accessor<unknown>;\n};\n\ntype SettingsModalFooterDefinition = {\n  readonly kind: typeof SETTINGS_MODAL_FOOTER;\n  readonly props: SettingsModalFooterProps;\n};\n\nexport type SettingsModalProps = {\n  /** Accessible name for the settings surface. */\n  title: string;\n  /** @deprecated Retained for source compatibility; tab descriptions carry the visible context. */\n  subtitle?: string;\n  /** @deprecated Retained for source compatibility; tab icons identify the rail entries. */\n  icon?: string;\n  defaultTab?: string;\n  activeTab?: string;\n  onTabChange?: (id: string) => void;\n  onClose?: () => void;\n  closeLabel?: string;\n  class?: string;\n  children: JSX.Element;\n};\n\ntype SettingsModalComponent = ((props: SettingsModalProps) => JSX.Element) & {\n  Tab: (props: SettingsModalTabProps) => JSX.Element;\n  Group: (props: SettingsModalGroupProps) => JSX.Element;\n  Footer: (props: SettingsModalFooterProps) => JSX.Element;\n};\n\nconst isTabDefinition = (value: unknown): value is SettingsModalTabDefinition =>\n  !!value && typeof value === \"object\" && (value as { kind?: unknown }).kind === SETTINGS_MODAL_TAB;\n\nconst isGroupDefinition = (value: unknown): value is SettingsModalGroupDefinition =>\n  !!value && typeof value === \"object\" && (value as { kind?: unknown }).kind === SETTINGS_MODAL_GROUP;\n\nconst isFooterDefinition = (value: unknown): value is SettingsModalFooterDefinition =>\n  !!value && typeof value === \"object\" && (value as { kind?: unknown }).kind === SETTINGS_MODAL_FOOTER;\n\nconst collectTabs = (value: unknown): SettingsModalTabDefinition[] => {\n  if (Array.isArray(value)) return value.flatMap(collectTabs);\n  if (isGroupDefinition(value)) return collectTabs(value.resolved());\n  return isTabDefinition(value) ? [value] : [];\n};\n\nconst collectRailEntries = (value: unknown): (SettingsModalGroupDefinition | SettingsModalTabDefinition)[] => {\n  if (Array.isArray(value)) return value.flatMap(collectRailEntries);\n  if (isGroupDefinition(value) || isTabDefinition(value)) return [value];\n  return [];\n};\n\nconst splitPanelChildren = (value: unknown): { content: JSX.Element[]; footer?: SettingsModalFooterDefinition } => {\n  if (Array.isArray(value)) {\n    return value.reduce<{ content: JSX.Element[]; footer?: SettingsModalFooterDefinition }>(\n      (result, entry) => {\n        const next = splitPanelChildren(entry);\n        result.content.push(...next.content);\n        if (next.footer) result.footer = next.footer;\n        return result;\n      },\n      { content: [] },\n    );\n  }\n  return isFooterDefinition(value) ? { content: [], footer: value } : { content: [value as JSX.Element] };\n};\n\nfunction SettingsModalTab(props: SettingsModalTabProps): JSX.Element {\n  return { kind: SETTINGS_MODAL_TAB, props } satisfies SettingsModalTabDefinition as unknown as JSX.Element;\n}\n\nfunction SettingsModalGroup(props: SettingsModalGroupProps): JSX.Element {\n  // The modal's own `children()` does not reach into a group. Resolving here keeps the other tabs of a group the same\n  // objects when a conditional tab comes or goes, so the open panel and its unsaved input stay in place.\n  const resolved = children(() => props.children);\n  return { kind: SETTINGS_MODAL_GROUP, props, resolved } satisfies SettingsModalGroupDefinition as unknown as JSX.Element;\n}\n\nfunction SettingsModalFooter(props: SettingsModalFooterProps): JSX.Element {\n  return { kind: SETTINGS_MODAL_FOOTER, props } satisfies SettingsModalFooterDefinition as unknown as JSX.Element;\n}\n\nconst SettingsModal = ((props: SettingsModalProps): JSX.Element => {\n  const messages = useUiMessages();\n  const settingsMessages = useSettingsMessages();\n  const resolved = children(() => props.children);\n  const railEntries = createMemo(() => collectRailEntries(resolved()));\n  const tabs = createMemo(() => {\n    const collected = collectTabs(resolved());\n    assertUniqueStableUiIds(\n      collected.map((tab) => tab.props.id),\n      \"SettingsModal.Tab id\",\n    );\n    return collected;\n  });\n  const instanceId = `k2b-settings-${createUniqueId()}`;\n  const tabRefs = new Map<string, HTMLButtonElement>();\n  let tabList: HTMLElement | undefined;\n  // Narrow surfaces show the categories as one scrolling row; the fade tells that more follow.\n  createScrollFade(\n    () => tabList,\n    () => true,\n  );\n  const firstTabId = () => tabs()[0]?.props.id ?? \"\";\n  const [localActiveTab, setLocalActiveTab] = createSignal(props.defaultTab ?? firstTabId());\n  const requestedActiveTabId = () => props.activeTab ?? (localActiveTab() || firstTabId());\n  const resolvedActiveTabId = createMemo(() =>\n    tabs().some((tab) => tab.props.id === requestedActiveTabId()) ? requestedActiveTabId() : firstTabId(),\n  );\n  // `defaultTab`, `activeTab` and clicks can select a category past the edge of the scrolling row or rail.\n  createEffect(() => {\n    const id = resolvedActiveTabId();\n    queueMicrotask(() => tabRefs.get(id)?.scrollIntoView?.({ block: \"nearest\", inline: \"nearest\" }));\n  });\n  // A memo, so a change elsewhere in the tab list does not create the open panel again.\n  const activeTab = createMemo(() => tabs().find((tab) => tab.props.id === resolvedActiveTabId()) ?? null);\n  const resolvedPanelChildren = children(() => activeTab()?.props.children);\n  const panelChildren = createMemo(() => splitPanelChildren(resolvedPanelChildren()));\n\n  const selectTab = (id: string) => {\n    if (props.activeTab === undefined) setLocalActiveTab(id);\n    props.onTabChange?.(id);\n  };\n\n  const moveTabFocus = (event: KeyboardEvent, currentId: string) => {\n    const currentIndex = tabs().findIndex((tab) => tab.props.id === currentId);\n    if (currentIndex < 0 || tabs().length === 0) return;\n    let nextIndex: number | null = null;\n    if (event.key === \"ArrowRight\" || event.key === \"ArrowDown\") nextIndex = (currentIndex + 1) % tabs().length;\n    if (event.key === \"ArrowLeft\" || event.key === \"ArrowUp\") nextIndex = (currentIndex - 1 + tabs().length) % tabs().length;\n    if (event.key === \"Home\") nextIndex = 0;\n    if (event.key === \"End\") nextIndex = tabs().length - 1;\n    if (nextIndex === null) return;\n    event.preventDefault();\n    const nextTab = tabs()[nextIndex];\n    if (!nextTab) return;\n    selectTab(nextTab.props.id);\n    tabRefs.get(nextTab.props.id)?.focus();\n  };\n\n  const tabId = (id: string) => `${instanceId}-tab-${id}`;\n  const panelId = (id: string) => `${instanceId}-panel-${id}`;\n\n  const TabButton = (tab: SettingsModalTabDefinition): JSX.Element => {\n    const active = () => resolvedActiveTabId() === tab.props.id;\n    return (\n      <button\n        ref={(element) => tabRefs.set(tab.props.id, element)}\n        id={tabId(tab.props.id)}\n        type=\"button\"\n        role=\"tab\"\n        aria-selected={active()}\n        aria-controls={active() ? panelId(tab.props.id) : undefined}\n        tabIndex={active() ? 0 : -1}\n        data-state={active() ? \"active\" : \"idle\"}\n        data-active={active() ? \"true\" : undefined}\n        data-tone={tab.props.tone ?? \"default\"}\n        onClick={() => selectTab(tab.props.id)}\n        onKeyDown={(event) => moveTabFocus(event, tab.props.id)}\n      >\n        <Show when={tab.props.icon}>{(icon) => <i class={icon()} aria-hidden=\"true\" />}</Show>\n        <span class=\"k2b-truncate-fade-lines\">{tab.props.title}</span>\n      </button>\n    );\n  };\n\n  return (\n    <div class={`k2b-settings ${props.class ?? \"\"}`} role=\"region\" aria-label={props.title}>\n      <Show when={props.onClose}>\n        <IconButton class=\"k2b-settings__close\" label={props.closeLabel ?? messages().close} onClick={props.onClose}>\n          <i class=\"ti ti-x\" aria-hidden=\"true\" />\n        </IconButton>\n      </Show>\n      <aside class=\"k2b-settings__rail\">\n        <nav\n          ref={tabList}\n          class=\"k2b-settings__tabs\"\n          aria-label={settingsMessages().sectionsLabel({ title: props.title })}\n          role=\"tablist\"\n          data-scroll-fade-mode=\"both\"\n          data-scroll-fade-axis=\"horizontal\"\n        >\n          <For each={railEntries()}>\n            {(entry) =>\n              isGroupDefinition(entry) ? (\n                <div class=\"k2b-settings__tab-group\" role=\"presentation\">\n                  <span class=\"k2b-settings__tab-group-label k2b-truncate-fade\" aria-hidden=\"true\">\n                    {entry.props.title}\n                  </span>\n                  <For each={collectTabs(entry.resolved())}>{(tab) => TabButton(tab)}</For>\n                </div>\n              ) : (\n                TabButton(entry)\n              )\n            }\n          </For>\n        </nav>\n      </aside>\n      <div class=\"k2b-settings__content\">\n        <Show when={activeTab()}>\n          {(tab) => (\n            <section\n              id={panelId(tab().props.id)}\n              class=\"k2b-settings__body\"\n              role=\"tabpanel\"\n              aria-labelledby={tabId(tab().props.id)}\n              tabIndex={0}\n              data-tone={tab().props.tone ?? \"default\"}\n            >\n              <div class=\"k2b-settings__section\">\n                <div class=\"k2b-settings__section-heading\">\n                  <h2>{tab().props.title}</h2>\n                  <Show when={tab().props.description}>{(description) => <p>{description()}</p>}</Show>\n                </div>\n                {panelChildren().content}\n              </div>\n            </section>\n          )}\n        </Show>\n        <Show when={panelChildren().footer}>{(footer) => <footer class=\"k2b-settings__footer\">{footer().props.children}</footer>}</Show>\n      </div>\n    </div>\n  );\n}) as SettingsModalComponent;\n\nSettingsModal.Tab = SettingsModalTab;\nSettingsModal.Group = SettingsModalGroup;\nSettingsModal.Footer = SettingsModalFooter;\n\nexport default SettingsModal;\n"],"mappings":"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","ignoreList":[]}

package/dist/browser/layout/app-workspace-controller.js

@@ -66,6 +66,8 @@ const sidebarHideable = root => sidebarElement(root)?.dataset.workspaceHideable
  * stays application state, so the controller only requests the change.
  */
 export const APP_WORKSPACE_SIDEBAR_HIDE_EVENT = "k2b-app-workspace-sidebar-hide";
+/** Asks the owning `AppWorkspace.Sidebar` to show again; its `onHiddenChange` decides. */
+export const APP_WORKSPACE_SIDEBAR_SHOW_EVENT = "k2b-app-workspace-sidebar-show";
 /** Asks the owning Detail to reopen its current available object. */
 export const APP_WORKSPACE_DETAIL_OPEN_EVENT = "k2b-app-workspace-detail-open";
 /** Asks the owning `AppWorkspace.Detail` to close; its `onClose` decides. */
@@ -303,6 +305,12 @@ const overlayTarget = toggle => {
   };
 };
 const overlayRegions = (root, sidebar) => Array.from(root.children).flatMap(child => child instanceof HTMLElement && (child.localName === "solid-island" || child.localName === "solid-client") ? Array.from(child.children) : [child]).filter(child => child instanceof HTMLElement && child !== sidebar && !child.contains(sidebar));
+
+/**
+ * A sidebar button tells whether its sidebar shows: as an open overlay where the sidebar is one, otherwise as a
+ * column that is not hidden.
+ */
+const sidebarShown = (root, sidebar) => sidebarForm(root) === "overlay" ? root.dataset.sidebarOverlay === "open" : !sidebar.hidden;
 export const installAppWorkspaceController = (options = {}) => {
   const eventRoot = options.root ?? document;
   // A document has no owner document; an element root listens on its own.
@@ -311,6 +319,17 @@ export const installAppWorkspaceController = (options = {}) => {
   let overlay = null;
   // A server-rendered head names the sidebar before the sidebar renders; the button learns its real id now.
   for (const toggle of eventRoot.querySelectorAll(TOGGLE_SELECTOR)) overlayTarget(toggle);
+  /** Every sidebar button, the workspace head's and an application's own, states whether its sidebar shows. */
+  const syncSidebarToggles = () => {
+    for (const toggle of eventRoot.querySelectorAll(TOGGLE_SELECTOR)) {
+      const root = workspaceRoot(toggle);
+      const sidebar = root ? sidebarElement(root) : null;
+      if (!root || !sidebar) continue;
+      // The head's button only opens the overlay; an application's button also shows and hides the column.
+      const expanded = String(toggle.closest(".k2b-app-workspace__head") ? root.dataset.sidebarOverlay === "open" : sidebarShown(root, sidebar));
+      if (toggle.getAttribute("aria-expanded") !== expanded) toggle.setAttribute("aria-expanded", expanded);
+    }
+  };
   const openOverlay = target => {
     if (overlay) closeOverlay("none");
     const inerted = overlayRegions(target.root, target.sidebar).filter(region => !region.hasAttribute("inert"));
@@ -320,6 +339,7 @@ export const installAppWorkspaceController = (options = {}) => {
     };
     target.root.dataset.sidebarOverlay = "open";
     target.toggle.setAttribute("aria-expanded", "true");
+    syncSidebarToggles();
     inerted.forEach(region => region.setAttribute("inert", ""));
     // Focus starts on the current destination, so the reader knows where they
     // are: on its own tab stop, or on the tree item around it.
@@ -342,6 +362,8 @@ export const installAppWorkspaceController = (options = {}) => {
     overlay = null;
     delete closing.root.dataset.sidebarOverlay;
     closing.toggle.setAttribute("aria-expanded", "false");
+    // Escape, the scrim or a chosen destination also close it: every sidebar button of the workspace says so.
+    syncSidebarToggles();
     closing.inerted.forEach(region => region.removeAttribute("inert"));
     if (focus === "none") return;
     const active = document.activeElement;
@@ -377,10 +399,27 @@ export const installAppWorkspaceController = (options = {}) => {
     }
     const toggle = target?.closest(TOGGLE_SELECTOR);
     if (toggle) {
+      if (claimedToggleClicks.has(event)) return;
+      const root = workspaceRoot(toggle);
+      const sidebar = root ? sidebarElement(root) : null;
+      // A sidebar the person hid comes back first; where it is an overlay, it then opens.
+      if (root && sidebar?.hidden && sidebarHideable(root)) {
+        claimedToggleClicks.add(event);
+        sidebar.dispatchEvent(new CustomEvent(APP_WORKSPACE_SIDEBAR_SHOW_EVENT));
+        ownerWindow.requestAnimationFrame(() => {
+          const next = !sidebar.hidden && sidebarForm(root) === "overlay" ? overlayTarget(toggle) : null;
+          if (next) openOverlay(next);
+          syncSidebarToggles();
+        });
+        return;
+      }
       const next = overlayTarget(toggle);
-      if (!next || claimedToggleClicks.has(event)) return;
+      if (!next) return;
       claimedToggleClicks.add(event);
       if (overlay?.sidebar === next.sidebar) closeOverlay("button");else if (sidebarForm(next.root) === "overlay") openOverlay(next);
+      // A column: an application's own button hides a sidebar it lets people hide.
+      else if (sidebarHideable(next.root)) next.sidebar.dispatchEvent(new CustomEvent(APP_WORKSPACE_SIDEBAR_HIDE_EVENT));
+      syncSidebarToggles();
       return;
     }
     if (!overlay || !target) return;
@@ -466,7 +505,8 @@ export const installAppWorkspaceController = (options = {}) => {
     for (const root of allRoots()) {
       for (const aside of rootElements(root, detailSelector)) {
         const toggle = detailToggle(aside);
-        if (toggle?.dataset.workspaceDetailReopen !== "true") continue;
+        // The panel decides whether it reopens; its button may be the workspace's own or an application's.
+        if (!toggle || aside.dataset.workspaceDetailReopen !== "true") continue;
         const expanded = !aside.hidden && (!wide?.matches || !detailWaiting(aside) || detailDrawer(aside));
         const value = String(expanded);
         if (toggle.getAttribute("aria-expanded") !== value) toggle.setAttribute("aria-expanded", value);
@@ -581,7 +621,7 @@ export const installAppWorkspaceController = (options = {}) => {
       return;
     }
     const shared = detailToggle(aside);
-    if (shared?.dataset.workspaceDetailReopen === "true" && phone?.matches && phonePage(aside) && !aside.hidden && !aside.contains(control)) {
+    if (shared && aside.dataset.workspaceDetailReopen === "true" && phone?.matches && phonePage(aside) && !aside.hidden && !aside.contains(control)) {
       // WebKit can update matchMedia after resize has already focused the now
       // visible application control. Move into the page before Main becomes inert.
       detailControlFocus = null;
@@ -590,7 +630,7 @@ export const installAppWorkspaceController = (options = {}) => {
     }
     if (detailControlVisible(control)) return;
     detailControlFocus = null;
-    if (shared?.dataset.workspaceDetailReopen !== "true") {
+    if (!shared || aside.dataset.workspaceDetailReopen !== "true") {
       // Selection-only details keep their existing returning-column title target.
       if (control === shared && !aside.hidden && !detailWaiting(aside)) requestTitle(aside);
       return;
@@ -602,6 +642,7 @@ export const installAppWorkspaceController = (options = {}) => {
     });
   };
   const syncHostState = () => {
+    syncSidebarToggles();
     rescueDetailControlFocus();
     if (pendingDetail && !canOpenPendingDetail(pendingDetail.aside)) cancelPendingDetail();
     if (overlay && sidebarForm(overlay.root) !== "overlay") closeOverlay("none");
@@ -1055,7 +1096,7 @@ export const installAppWorkspaceController = (options = {}) => {
       const focused = ownerDocument.activeElement;
       const toggle = detailToggle(aside);
       const returnControl = detailReturnControl(aside);
-      if (toggle?.dataset.workspaceDetailReopen === "true" && returnControl && (aside.contains(focused) || focused === ownerDocument.body && aside.contains(lastFocus.get(root) ?? null))) {
+      if (toggle && aside.dataset.workspaceDetailReopen === "true" && returnControl && (aside.contains(focused) || focused === ownerDocument.body && aside.contains(lastFocus.get(root) ?? null))) {
         returnControl.focus({
           preventScroll: true
         });
@@ -1795,6 +1836,8 @@ export const installAppWorkspaceController = (options = {}) => {
   const layoutNode = node => node instanceof Element && (node.matches(LAYOUT_REGION_SELECTOR) || Boolean(node.querySelector(LAYOUT_REGION_SELECTOR)));
   const mutationObserver = typeof MutationObserver === "undefined" ? null : new MutationObserver(records => {
     if (records.some(record => record.type === "childList" || ["hidden", "aria-controls", "aria-expanded", "data-workspace-detail-drawer"].includes(record.attributeName ?? ""))) syncDetailRequestControls();
+    // A sidebar shown or hidden, or a sidebar button added: the buttons state it.
+    if (records.some(record => record.type === "attributes" && record.attributeName === "hidden" && record.target instanceof Element && record.target.matches(".k2b-app-workspace__sidebar") || [...record.addedNodes].some(node => node instanceof Element && (node.matches(TOGGLE_SELECTOR) || node.querySelector(TOGGLE_SELECTOR))))) syncSidebarToggles();
     syncPhonePages();
     if (pendingTitle && (pendingTitle.aside.hidden || !pendingTitle.aside.isConnected)) cancelTitle();
     if (pendingDetail && (!canOpenPendingDetail(pendingDetail.aside) || !pendingDetail.snapshot.chosen || !pendingDetail.snapshot.item.isConnected)) cancelPendingDetail();
@@ -1850,6 +1893,7 @@ export const installAppWorkspaceController = (options = {}) => {
   syncPhonePages();
   syncObservedRoots();
   syncDetailRequestControls();
+  syncSidebarToggles();
   mutationObserver?.observe(eventRoot, {
     attributes: true,
     attributeOldValue: true,