@brillout/docpress 0.16.32 → 0.16.34

package/Layout.tsx

@@ -27,7 +27,7 @@ import {
 } from './MenuModal/toggleMenuModal.js'
 import { MenuModal } from './MenuModal.js'
 import { autoScrollNav_SSR } from './autoScrollNav.js'
-import { initializeChoiceGroup_SSR } from './code-blocks/hooks/useSelectedChoice.js'
+import { initializeChoiceGroup_SSR } from './code-blocks/hooks/useCurrentSelection.js'
 import { SearchLink } from './docsearch/SearchLink.js'
 import { navigate } from 'vike/client/router'
 import { css } from './utils/css.js'

package/code-blocks/components/ChoiceGroup.tsx

@@ -1,7 +1,7 @@
 export { ChoiceGroup, CustomSelectsContainer }
 
 import React, { createContext, useContext, useEffect, useState } from 'react'
-import { useSelectedChoice } from '../hooks/useSelectedChoice.js'
+import { useCurrentSelection } from '../hooks/useCurrentSelection.js'
 import { useRestoreScroll } from '../hooks/useRestoreScroll.js'
 import { cls } from '../../utils/cls.js'
 import './ChoiceGroup.css'
@@ -51,7 +51,7 @@ function CustomSelectsContainer({ children }: { children: React.ReactNode }) {
             ...(parentChoiceGroup && {
               parentChoiceGroup: {
                 ...parentChoiceGroup,
-                choices: [parentChoiceGroup.choice],
+                choices: !choiceGroup.hidden ? [parentChoiceGroup.choice] : [],
               },
             }),
           },
@@ -61,7 +61,9 @@ function CustomSelectsContainer({ children }: { children: React.ReactNode }) {
       if (!parentChoiceGroup || !existing.parentChoiceGroup) return prev
 
       const existingChoices = existing.parentChoiceGroup.choices
-      const mergedChoices = new Set([...existingChoices, parentChoiceGroup.choice])
+      if (!choiceGroup.hidden) existing.parentChoiceGroup.choices.push(parentChoiceGroup.choice)
+
+      const mergedChoices = new Set([...existing.parentChoiceGroup.choices])
       if (mergedChoices.size === existingChoices.length) return prev
 
       const next = [...prev]
@@ -91,8 +93,7 @@ type ChoiceGroupProps = {
 
 function ChoiceGroup({ children, choiceGroup, parentChoiceGroup }: ChoiceGroupProps) {
   const { name: groupName, choices, default: defaultChoice, lvl } = choiceGroup
-  // TODO/after-PR-merge rename useSelectedChoice useCurrentSelection
-  const [selectedChoice] = useSelectedChoice(groupName, defaultChoice)
+  const [selectedChoice] = useCurrentSelection(groupName, defaultChoice)
   const { choiceGroupAll, registerChoiceGroup } = useCustomSelectsContext()
 
   useEffect(() => registerChoiceGroup(choiceGroup, parentChoiceGroup), [])
@@ -131,7 +132,7 @@ function CustomSelect({ choiceGroup }: { choiceGroup: ChoiceGroupWithParent }) {
     hidden,
     parentChoiceGroup,
   } = choiceGroup
-  const [selectedChoice, setSelectedChoice] = useSelectedChoice(groupName, defaultChoice)
+  const [selectedChoice, setSelectedChoice] = useCurrentSelection(groupName, defaultChoice)
   const prevPositionRef = useRestoreScroll([selectedChoice])
   const [expanded, setExpanded] = useState(false)
   const selectedIndex = choices.indexOf(selectedChoice)
@@ -151,8 +152,8 @@ function CustomSelect({ choiceGroup }: { choiceGroup: ChoiceGroupWithParent }) {
   }
   function isHidden() {
     if (parentChoiceGroup) {
-      const [parentSelectedChoice] = useSelectedChoice(parentChoiceGroup.name, parentChoiceGroup.default)
-      return !parentChoiceGroup.choices.includes(parentSelectedChoice) || hidden
+      const [parentSelectedChoice] = useCurrentSelection(parentChoiceGroup.name, parentChoiceGroup.default)
+      return !parentChoiceGroup.choices.includes(parentSelectedChoice)
     }
     return hidden
   }

package/code-blocks/hooks/{useSelectedChoice.ts → useCurrentSelection.ts}

@@ -1,4 +1,4 @@
-export { useSelectedChoice }
+export { useCurrentSelection }
 export { initializeChoiceGroup_SSR }
 
 import { useLocalStorage } from './useLocalStorage.js'
@@ -12,7 +12,7 @@ const keyPrefix = 'docpress'
  * @param defaultValue Default choice value.
  * @returns `[selectedChoice, setSelectedChoice]`.
  */
-function useSelectedChoice(choiceGroupName: string, defaultValue: string) {
+function useCurrentSelection(choiceGroupName: string, defaultValue: string) {
   return useLocalStorage(`${keyPrefix}:choice:${choiceGroupName}`, defaultValue)
 }
 

package/icons/index.ts

@@ -1,14 +1,21 @@
 // Playground: https://www.figma.com/design/EFFQgT1aDH5exs2bABaIFJ/Icons?t=y0K2dHfJgpxMIl1e-0
-export { default as iconGear } from './gear.svg'
+export { default as iconBluesky } from './bluesky.svg'
 export { default as iconBooks } from './books.svg'
-export { default as iconSeedling } from './seedling.svg'
-export { default as iconMagnifyingGlass } from './magnifying-glass.svg'
-export { default as iconPencil } from './pencil.svg'
+export { default as iconChangelog } from './changelog.svg'
+export { default as iconCoin } from './coin.svg'
 export { default as iconCompass } from './compass.svg'
-export { default as iconScroll } from './scroll.svg'
+export { default as iconDiscord } from './discord.svg'
+export { default as iconEyes } from './eyes.svg'
+export { default as iconGear } from './gear.svg'
+export { default as iconGithub } from './github.svg'
 export { default as iconGlobe } from './globe.svg'
-export { default as iconPlug } from './plug.svg'
+export { default as iconLanguages } from './languages.svg'
+export { default as iconLinkedin } from './linkedin.svg'
 export { default as iconLoudspeaker } from './loudspeaker.svg'
+export { default as iconMagnifyingGlass } from './magnifying-glass.svg'
 export { default as iconMegaphone } from './megaphone.svg'
-export { default as iconCoin } from './coin.svg'
-export { default as iconEyes } from './eyes.svg'
+export { default as iconPencil } from './pencil.svg'
+export { default as iconPlug } from './plug.svg'
+export { default as iconScroll } from './scroll.svg'
+export { default as iconSeedling } from './seedling.svg'
+export { default as iconTwitter } from './twitter.svg'

package/package.json

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