@brillout/docpress 0.16.50 → 0.17.1

package/code-blocks/components/ChoiceGroup.tsx

@@ -1,7 +1,7 @@
 export { ChoiceGroup, ChoiceGroupContainer }
 
 import type { ChoiceGroup as TChoiceGroup, ChoiceGroupWithParent } from '../types.js'
-import React, { useId, useState } from 'react'
+import React, { useId, useRef, useState } from 'react'
 import { usePageContext } from '../../renderer/usePageContext.js'
 import { useCurrentSelection } from '../hooks/useCurrentSelection.js'
 import { useRestoreScroll } from '../hooks/useRestoreScroll.js'
@@ -59,6 +59,8 @@ function CustomSelect({ choiceGroup }: { choiceGroup: ChoiceGroupWithParent }) {
   const selectedChoice = getAvailableChoice(selectedChoiceStored, choices, emptyChoices, defaultChoice)
   const [expanded, setExpanded] = useState(false)
   const [isHovered, setIsHovered] = useState(false)
+  const lastPointerType = useRef<React.PointerEvent['pointerType']>('mouse')
+
   let [parentSelectedChoice] = useCurrentSelection(parentChoiceGroup?.name || '', parentChoiceGroup?.default || '')
   let isHidden = hidden
   const setPrevPosition = useRestoreScroll([selectedChoice])
@@ -83,7 +85,10 @@ function CustomSelect({ choiceGroup }: { choiceGroup: ChoiceGroupWithParent }) {
         isHovered && 'hovered',
       ])}
       style={{ '--option-height': `${OPTION_HEIGHT}px`, '--choice-count': filteredChoices.length }}
-      onMouseEnter={() => {
+      onPointerDownCapture={(e) => (lastPointerType.current = e.pointerType)}
+      onPointerEnter={(e) => {
+        lastPointerType.current = e.pointerType
+        if (lastPointerType.current !== 'mouse') return
         setExpanded(true)
         setIsHovered(true)
       }}
@@ -92,11 +97,10 @@ function CustomSelect({ choiceGroup }: { choiceGroup: ChoiceGroupWithParent }) {
         if (!expanded) setIsHovered(false)
       }}
       onClick={() => {
-        if (!expanded) next()
+        if (lastPointerType.current === 'mouse' && !expanded) next()
       }}
       data-choice-group={groupName}
     >
-      <div className="choice-select__border" />
       {filteredChoices.map(({ name: choice, icon, iconStyle, iconStyleDropdown }) => (
         <label
           id={`choice-${choice}`}
@@ -118,6 +122,7 @@ function CustomSelect({ choiceGroup }: { choiceGroup: ChoiceGroupWithParent }) {
             </span>
             <span className="choice-select__option-label">{choice}</span>
           </span>
+          <div className="choice-select__border" />
         </label>
       ))}
     </div>
@@ -129,6 +134,13 @@ function CustomSelect({ choiceGroup }: { choiceGroup: ChoiceGroupWithParent }) {
   }
   function handleOnClick(e: React.MouseEvent<HTMLLabelElement, MouseEvent>, choice: string) {
     e.preventDefault()
+
+    if (!expanded) {
+      setExpanded(true)
+      setIsHovered(true)
+      return
+    }
+
     const el = e.currentTarget
     setPrevPosition(el)
     const isSame = selectedChoice === choice

package/components/Link.tsx

@@ -30,9 +30,11 @@ function Link({
     href.startsWith('/') || href.startsWith('#'),
     `<Link href /> prop \`href==='${href}'\` but should start with '/' or '#'`,
   )
-  assertUsage(!text || !children, 'Cannot use both `text` or `children`')
-  // assertWarning(!text, 'prop `text` is deprecated')
-  text = text ?? children
+  assertUsage(
+    !text,
+    'The `text` prop of `<Link>` is deprecated, use `<Link>...</Link>` instead of `<Link text="..." />`',
+  )
+  text = children
 
   const linkTextData = getLinkTextData({ href, pageContext, doNotInferSectionTitle, noWarning })
   if (!text) {

package/dist/components/Link.js

@@ -7,9 +7,8 @@ import pc from '@brillout/picocolors';
 function Link({ href, text, noBreadcrumb, doNotInferSectionTitle, noWarning, children, ...props }) {
     const pageContext = usePageContext();
     assertUsage(href.startsWith('/') || href.startsWith('#'), `<Link href /> prop \`href==='${href}'\` but should start with '/' or '#'`);
-    assertUsage(!text || !children, 'Cannot use both `text` or `children`');
-    // assertWarning(!text, 'prop `text` is deprecated')
-    text = text ?? children;
+    assertUsage(!text, 'The `text` prop of `<Link>` is deprecated, use `<Link>...</Link>` instead of `<Link text="..." />`');
+    text = children;
     const linkTextData = getLinkTextData({ href, pageContext, doNotInferSectionTitle, noWarning });
     if (!text) {
         if (linkTextData) {

package/package.json

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