@brillout/docpress 0.16.44 → 0.16.45

package/code-blocks/components/ChoiceGroup.tsx

@@ -5,6 +5,7 @@ import React, { useId, useState } from 'react'
 import { usePageContext } from '../../renderer/usePageContext.js'
 import { useCurrentSelection } from '../hooks/useCurrentSelection.js'
 import { useRestoreScroll } from '../hooks/useRestoreScroll.js'
+import { getAvailableChoice } from '../utils/getAvailableChoice.js'
 import { cls } from '../../utils/cls.js'
 import './ChoiceGroup.css'
 
@@ -28,15 +29,17 @@ function ChoiceGroupContainer({
 }
 
 function ChoiceGroup({ children, choiceGroup }: { children: React.ReactNode; choiceGroup: TChoiceGroup }) {
-  const { name: groupName, choices, default: defaultChoice } = choiceGroup
-  const [selectedChoice] = useCurrentSelection(groupName, defaultChoice)
+  const { name: groupName, choices, default: defaultChoice, emptyChoices } = choiceGroup
+  const [selectedChoiceStored] = useCurrentSelection(groupName, defaultChoice)
+  const selectedChoice = getAvailableChoice(selectedChoiceStored, choices, emptyChoices, defaultChoice)
 
   return (
     <div className="choice-group">
       {/* Hidden select used to control choice visibility via CSS */}
       <select data-choice-group={groupName} name={`choicesFor-${groupName}`} value={selectedChoice} hidden disabled>
         {choices.map(({ name: choice }) => (
-          <option key={choice} value={choice}>
+          // data-empty is read by the initializeChoiceGroup SSR script (useCurrentSelection.ts)
+          <option key={choice} value={choice} data-empty={emptyChoices.includes(choice) ? '' : undefined}>
             {choice}
           </option>
         ))}
@@ -51,14 +54,20 @@ function CustomSelect({ choiceGroup }: { choiceGroup: ChoiceGroupWithParent }) {
   const radioId = useId()
   const choicesAll = usePageContext().resolved.choices
   const { name: groupName, emptyChoices, default: defaultChoice, hidden, parentChoiceGroup, isBuiltIn } = choiceGroup
-  const [selectedChoice, setSelectedChoice] = useCurrentSelection(groupName, defaultChoice)
+  const choices = (isBuiltIn ? choiceGroup : choicesAll![groupName]!).choices
+  const [selectedChoiceStored, setSelectedChoice] = useCurrentSelection(groupName, defaultChoice)
+  const selectedChoice = getAvailableChoice(selectedChoiceStored, choices, emptyChoices, defaultChoice)
   const [expanded, setExpanded] = useState(false)
   const [isHovered, setIsHovered] = useState(false)
-  const [parentSelectedChoice] = useCurrentSelection(parentChoiceGroup?.name || '', parentChoiceGroup?.default || '')
+  let [parentSelectedChoice] = useCurrentSelection(parentChoiceGroup?.name || '', parentChoiceGroup?.default || '')
+  let isHidden = hidden
   const setPrevPosition = useRestoreScroll([selectedChoice])
 
-  const choices = (isBuiltIn ? choiceGroup : choicesAll![groupName]!).choices
-  const isHidden = parentChoiceGroup ? !parentChoiceGroup.choices.includes(parentSelectedChoice) : hidden
+  if (parentChoiceGroup) {
+    const { choices, emptyChoices, default: defaultChoice } = parentChoiceGroup
+    parentSelectedChoice = getAvailableChoice(parentSelectedChoice, choices, emptyChoices, defaultChoice)
+    isHidden = !parentChoiceGroup.choices.includes(parentSelectedChoice)
+  }
   const isEmptyChoice = (choice: string) => emptyChoices.includes(choice)
   const filteredChoices = choices.filter((choice) => !isEmptyChoice(choice.name))
   const selectedIndex = filteredChoices.findIndex((choice) => choice.name === selectedChoice)

package/code-blocks/components/Tabs.tsx

@@ -3,6 +3,7 @@ export { Tabs }
 import React, { useId } from 'react'
 import { useCurrentSelection } from '../hooks/useCurrentSelection.js'
 import { useRestoreScroll } from '../hooks/useRestoreScroll.js'
+import { getAvailableChoice } from '../utils/getAvailableChoice.js'
 import { usePageContext } from '../../renderer/usePageContext.js'
 import { assertUsage } from '../../utils/assert.js'
 import './Tabs.css'
@@ -14,7 +15,9 @@ function Tabs({ choice, hide = [] }: { choice: string; hide: string[] }) {
   const choicesAll = pageContext.resolved.choices
   assertUsage(choicesAll && choicesAll[groupName], `${groupName} is unknown`)
   const { choices, default: defaultChoice } = choicesAll[groupName]
-  const [selectedChoice, setSelectedChoice] = useCurrentSelection(groupName, defaultChoice)
+  const [selectedChoiceStored, setSelectedChoice] = useCurrentSelection(groupName, defaultChoice)
+  // A hidden tab can't be shown, so treat `hide` as the unavailable choices (#169)
+  const selectedChoice = getAvailableChoice(selectedChoiceStored, choices, hide, defaultChoice)
   const setPrevPosition = useRestoreScroll([selectedChoice])
   const isHidden = (choice: string) => hide.includes(choice)
 

package/code-blocks/hooks/useCurrentSelection.ts

@@ -32,13 +32,17 @@ function initializeChoiceGroup() {
     switch (groupEl.tagName) {
       case 'SELECT':
         const selectEl = groupEl as HTMLSelectElement
-        const optionExists = [...selectEl.options].some((opt) => opt.value === selectedChoice)
-        if (!optionExists) localStorage.removeItem(storageKey)
-        else selectEl.value = selectedChoice
+        const option = [...selectEl.options].find((opt) => opt.value === selectedChoice)
+        // No option: stale choice removed from the config → forget it.
+        // data-empty: choice exists in the group but has no content on this page → keep the
+        // server-rendered fallback rather than selecting a blank choice (#169).
+        if (!option) localStorage.removeItem(storageKey)
+        else if (!option.hasAttribute('data-empty')) selectEl.value = selectedChoice
         break
       case 'DIV':
         const radioEl = groupEl.querySelector<HTMLInputElement>(`input[type="radio"][value="${selectedChoice}"]`)
         if (radioEl) radioEl.checked = true
+        break
       default:
         break
     }

package/code-blocks/remarkChoiceGroup.ts

@@ -109,6 +109,7 @@ const remarkChoiceGroup: Plugin<[], Root> = (): Transformer<Root> => {
                 name: parentChoiceGroup.name,
                 default: parentChoiceGroup.default,
                 choices: !choiceGroup.hidden ? [parentChoiceGroup.choice] : [],
+                emptyChoices: parentChoiceGroup.emptyChoices,
               },
             }),
           })

package/code-blocks/types.ts

@@ -10,5 +10,5 @@ type ChoiceGroup = Omit<NonNullable<Config['choices']>[string], 'choices'> & {
   lvl: number
   isBuiltIn?: boolean
 }
-type ParentChoiceGroup = { name: string; default: string }
+type ParentChoiceGroup = { name: string; default: string; emptyChoices: string[] }
 type ChoiceGroupWithParent = ChoiceGroup & { parentChoiceGroup?: ParentChoiceGroup & { choices: string[] } }

package/code-blocks/utils/generateChoiceGroupCode.ts

@@ -101,6 +101,7 @@ function generateChoiceGroupCode(choiceNodes: ChoiceNode[], parent: Parent, hide
             name: choiceGroup.name,
             choice: choiceNode.choiceValue,
             default: choiceGroup.default,
+            emptyChoices: choiceGroup.emptyChoices,
             lvl,
           },
         }),

package/code-blocks/utils/getAvailableChoice.ts

@@ -0,0 +1,20 @@
+export { getAvailableChoice }
+
+import type { ChoiceItem } from '../../types/Config.js'
+import { resolveChoice } from './resolveChoices.js'
+
+// A page may include only some of a group's choices, so a choice selected elsewhere (and persisted in
+// localStorage) can be absent here — which would otherwise render nothing (#169). Resolve to a choice
+// that exists on the current page.
+function getAvailableChoice(
+  selectedChoice: string,
+  choices: (string | ChoiceItem)[],
+  emptyChoices: string[],
+  defaultChoice: string,
+): string {
+  const isAvailable = (choiceName: string) => !emptyChoices.includes(choiceName)
+  if (isAvailable(selectedChoice)) return selectedChoice
+  if (isAvailable(defaultChoice)) return defaultChoice
+  const choicesResolved = choices.map(resolveChoice)
+  return choicesResolved.find((choice) => isAvailable(choice.name))?.name ?? selectedChoice
+}

package/code-blocks/utils/resolveChoices.ts

@@ -1,4 +1,4 @@
-export { resolveChoices }
+export { resolveChoices, resolveChoice }
 export type { ResolvedChoices }
 
 import type { Choice, ChoiceItem } from '../../types/Config.js'
@@ -7,7 +7,10 @@ type ResolvedChoices = Record<string, Omit<Choice, 'choices'> & { choices: Choic
 
 function resolveChoices(choicesConfig: Record<string, Choice>): ResolvedChoices {
   return Object.fromEntries(
-    Object.entries(choicesConfig).map(([name, group]) => [name, { ...group, choices: group.choices.map(resolveChoice) }]),
+    Object.entries(choicesConfig).map(([name, group]) => [
+      name,
+      { ...group, choices: group.choices.map(resolveChoice) },
+    ]),
   )
 }
 function resolveChoice(choice: string | ChoiceItem): ChoiceItem {

package/dist/code-blocks/components/Tabs.js

@@ -2,6 +2,7 @@ export { Tabs };
 import React, { useId } from 'react';
 import { useCurrentSelection } from '../hooks/useCurrentSelection.js';
 import { useRestoreScroll } from '../hooks/useRestoreScroll.js';
+import { getAvailableChoice } from '../utils/getAvailableChoice.js';
 import { usePageContext } from '../../renderer/usePageContext.js';
 import { assertUsage } from '../../utils/assert.js';
 import './Tabs.css';
@@ -12,7 +13,9 @@ function Tabs({ choice, hide = [] }) {
     const choicesAll = pageContext.resolved.choices;
     assertUsage(choicesAll && choicesAll[groupName], `${groupName} is unknown`);
     const { choices, default: defaultChoice } = choicesAll[groupName];
-    const [selectedChoice, setSelectedChoice] = useCurrentSelection(groupName, defaultChoice);
+    const [selectedChoiceStored, setSelectedChoice] = useCurrentSelection(groupName, defaultChoice);
+    // A hidden tab can't be shown, so treat `hide` as the unavailable choices (#169)
+    const selectedChoice = getAvailableChoice(selectedChoiceStored, choices, hide, defaultChoice);
     const setPrevPosition = useRestoreScroll([selectedChoice]);
     const isHidden = (choice) => hide.includes(choice);
     return (React.createElement("div", { className: "choice-tabs" },

package/dist/code-blocks/hooks/useCurrentSelection.js

@@ -30,16 +30,20 @@ function initializeChoiceGroup() {
         switch (groupEl.tagName) {
             case 'SELECT':
                 const selectEl = groupEl;
-                const optionExists = [...selectEl.options].some((opt) => opt.value === selectedChoice);
-                if (!optionExists)
+                const option = [...selectEl.options].find((opt) => opt.value === selectedChoice);
+                // No option: stale choice removed from the config → forget it.
+                // data-empty: choice exists in the group but has no content on this page → keep the
+                // server-rendered fallback rather than selecting a blank choice (#169).
+                if (!option)
                     localStorage.removeItem(storageKey);
-                else
+                else if (!option.hasAttribute('data-empty'))
                     selectEl.value = selectedChoice;
                 break;
             case 'DIV':
                 const radioEl = groupEl.querySelector(`input[type="radio"][value="${selectedChoice}"]`);
                 if (radioEl)
                     radioEl.checked = true;
+                break;
             default:
                 break;
         }

package/dist/code-blocks/remarkChoiceGroup.js

@@ -90,6 +90,7 @@ const remarkChoiceGroup = () => {
                                 name: parentChoiceGroup.name,
                                 default: parentChoiceGroup.default,
                                 choices: !choiceGroup.hidden ? [parentChoiceGroup.choice] : [],
+                                emptyChoices: parentChoiceGroup.emptyChoices,
                             },
                         }),
                     });

package/dist/code-blocks/types.d.ts

@@ -11,6 +11,7 @@ type ChoiceGroup = Omit<NonNullable<Config['choices']>[string], 'choices'> & {
 type ParentChoiceGroup = {
     name: string;
     default: string;
+    emptyChoices: string[];
 };
 type ChoiceGroupWithParent = ChoiceGroup & {
     parentChoiceGroup?: ParentChoiceGroup & {

package/dist/code-blocks/utils/generateChoiceGroupCode.js

@@ -82,6 +82,7 @@ function generateChoiceGroupCode(choiceNodes, parent, hide = false) {
                         name: choiceGroup.name,
                         choice: choiceNode.choiceValue,
                         default: choiceGroup.default,
+                        emptyChoices: choiceGroup.emptyChoices,
                         lvl,
                     },
                 }),

package/dist/code-blocks/utils/getAvailableChoice.d.ts

@@ -0,0 +1,3 @@
+export { getAvailableChoice };
+import type { ChoiceItem } from '../../types/Config.js';
+declare function getAvailableChoice(selectedChoice: string, choices: (string | ChoiceItem)[], emptyChoices: string[], defaultChoice: string): string;

package/dist/code-blocks/utils/getAvailableChoice.js

@@ -0,0 +1,14 @@
+export { getAvailableChoice };
+import { resolveChoice } from './resolveChoices.js';
+// A page may include only some of a group's choices, so a choice selected elsewhere (and persisted in
+// localStorage) can be absent here — which would otherwise render nothing (#169). Resolve to a choice
+// that exists on the current page.
+function getAvailableChoice(selectedChoice, choices, emptyChoices, defaultChoice) {
+    const isAvailable = (choiceName) => !emptyChoices.includes(choiceName);
+    if (isAvailable(selectedChoice))
+        return selectedChoice;
+    if (isAvailable(defaultChoice))
+        return defaultChoice;
+    const choicesResolved = choices.map(resolveChoice);
+    return choicesResolved.find((choice) => isAvailable(choice.name))?.name ?? selectedChoice;
+}

package/dist/code-blocks/utils/resolveChoices.d.ts

@@ -1,7 +1,8 @@
-export { resolveChoices };
+export { resolveChoices, resolveChoice };
 export type { ResolvedChoices };
 import type { Choice, ChoiceItem } from '../../types/Config.js';
 type ResolvedChoices = Record<string, Omit<Choice, 'choices'> & {
     choices: ChoiceItem[];
 }>;
 declare function resolveChoices(choicesConfig: Record<string, Choice>): ResolvedChoices;
+declare function resolveChoice(choice: string | ChoiceItem): ChoiceItem;

package/dist/code-blocks/utils/resolveChoices.js

@@ -1,6 +1,9 @@
-export { resolveChoices };
+export { resolveChoices, resolveChoice };
 function resolveChoices(choicesConfig) {
-    return Object.fromEntries(Object.entries(choicesConfig).map(([name, group]) => [name, { ...group, choices: group.choices.map(resolveChoice) }]));
+    return Object.fromEntries(Object.entries(choicesConfig).map(([name, group]) => [
+        name,
+        { ...group, choices: group.choices.map(resolveChoice) },
+    ]));
 }
 function resolveChoice(choice) {
     return typeof choice === 'string' ? { name: choice } : choice;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brillout/docpress",
-  "version": "0.16.44",
+  "version": "0.16.45",
   "type": "module",
   "dependencies": {
     "@brillout/picocolors": "^1.0.10",