@fluentui-copilot/react-prompt-listbox 0.0.4 → 0.2.0

package/lib/components/utils/usePromptListboxFunctionality.js

@@ -1,12 +1,10 @@
 import * as React from 'react';
 import { useActiveDescendant } from '@fluentui/react-aria';
-import { mergeCallbacks, useControllableState, useEventCallback, useMergedRefs } from '@fluentui/react-utilities';
-import { getDropdownActionFromKey } from './dropdownKeyActions';
-import { TextCursorPositionPlugin } from '../../plugins/TextCursorPositionPlugin';
+import { useControllableState, useMergedRefs } from '@fluentui/react-utilities';
+import { CursorPositionPlugin } from '../../plugins/CursorPositionPlugin';
 import { useOptionCollection } from './useOptionCollection';
 import { useSelection } from './useSelection';
-import { ArrowDown, ArrowLeft, ArrowRight, ArrowUp } from '@fluentui/keyboard-keys';
-import { useComboboxPositioning } from './useComboboxPositioning';
+import { useListboxPositioning } from './useListboxPositioning';
 import { useTriggerKeydown } from './useTriggerKeyDown';
 import { PromptListbox } from '../PromptListbox';
 import { promptOptionClassNames } from '../PromptOption';
@@ -16,7 +14,8 @@ export function usePromptListboxFunctionality(params) {
     onOpenChange,
     onSelectionModeChange,
     listboxProps,
-    fluid = false
+    fluid = false,
+    allowArrowUpNavigation = false
   } = params;
   const {
     listboxRef: activeDescendantListboxRef,
@@ -35,13 +34,23 @@ export function usePromptListboxFunctionality(params) {
   const {
     getOptionById
   } = optionCollection;
-  const [isInLastPosition, setIsInLastPosition] = React.useState(true);
+  const [cursorPosition, setCursorPosition] = React.useState('end');
   const [isInSelectionMode, setIsInSelectionMode] = React.useState(false);
   const [open, setOpen] = useControllableState({
     state: params.open,
     defaultState: params.defaultOpen,
     initialState: false
   });
+  const setSelectionMode = React.useCallback(selectionMode => {
+    if (selectionMode === false) {
+      activeDescendantController.blur();
+      setHideActiveDescendant(true);
+    } else {
+      setHideActiveDescendant(false);
+    }
+    setIsInSelectionMode(selectionMode);
+    onSelectionModeChange === null || onSelectionModeChange === void 0 ? void 0 : onSelectionModeChange(selectionMode);
+  }, [activeDescendantController, onSelectionModeChange]);
   const onBlur = event => {
     setOpen(false);
     onOpenChange === null || onOpenChange === void 0 ? void 0 : onOpenChange(event, {
@@ -49,6 +58,7 @@ export function usePromptListboxFunctionality(params) {
       type: 'focus',
       open: false
     });
+    setSelectionMode(false);
   };
   const onFocus = event => {
     if (event.target === event.currentTarget) {
@@ -60,49 +70,31 @@ export function usePromptListboxFunctionality(params) {
       });
     }
   };
-  const cursorPositionPlugin = /*#__PURE__*/React.createElement(TextCursorPositionPlugin, {
-    setIsInLastPosition: setIsInLastPosition
+  const cursorPositionPlugin = /*#__PURE__*/React.createElement(CursorPositionPlugin, {
+    setCursorPosition: setCursorPosition
   });
   const onListboxBlur = React.useCallback(() => {
-    setIsInSelectionMode(false);
+    setSelectionMode(false);
     onSelectionModeChange === null || onSelectionModeChange === void 0 ? void 0 : onSelectionModeChange(false);
-  }, [onSelectionModeChange]);
+  }, [onSelectionModeChange, setSelectionMode]);
   // handle combobox keyboard interaction
   const onKeyDown = useTriggerKeydown({
     ...optionCollection,
+    allowArrowUpNavigation,
     activeDescendantController,
     getOptionById,
     onBlur: onListboxBlur,
     selectOption,
-    isInLastPosition,
+    cursorPosition,
     open,
-    multiselect: false
+    multiselect: false,
+    isInSelectionMode,
+    setSelectionMode
   });
   // NVDA and JAWS have bugs that suppress reading the input value text when aria-activedescendant is set
   // To prevent this, we clear the HTML attribute (but save the state) when a user presses left/right arrows
   // ref: https://github.com/microsoft/fluentui/issues/26359#issuecomment-1397759888
   const [hideActiveDescendant, setHideActiveDescendant] = React.useState(false);
-  /**
-  * Freeform combobox should not select
-  */
-  const onInputTriggerKeyDown = useEventCallback(event => {
-    // update typing state to true if the user is typing
-    const action = getDropdownActionFromKey(event, {
-      open,
-      multiselect: false,
-      isInLastPosition
-    });
-    if (event.key === ArrowLeft || event.key === ArrowRight || !isInLastPosition && (event.key === ArrowDown || event.key === ArrowUp) || action === 'Type' && isInLastPosition || action === 'Type') {
-      activeDescendantController.blur();
-      setHideActiveDescendant(true);
-      setIsInSelectionMode(false);
-      onSelectionModeChange === null || onSelectionModeChange === void 0 ? void 0 : onSelectionModeChange(false);
-    } else if (action === 'Next' || action === 'Previous' || action === 'First' || action === 'Last' || action === 'PageUp' || action === 'PageDown') {
-      setHideActiveDescendant(false);
-      setIsInSelectionMode(true);
-      onSelectionModeChange === null || onSelectionModeChange === void 0 ? void 0 : onSelectionModeChange(true);
-    }
-  });
   React.useEffect(() => {
     if (hideActiveDescendant) {
       var _triggerRef_current;
@@ -114,7 +106,7 @@ export function usePromptListboxFunctionality(params) {
     // eslint-disable-next-line react-compiler/react-compiler
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [hideActiveDescendant]);
-  const [comboboxPopupRef, comboboxTargetRef] = useComboboxPositioning({
+  const [comboboxPopupRef, comboboxTargetRef] = useListboxPositioning({
     positioning,
     fluid
   });
@@ -135,7 +127,7 @@ export function usePromptListboxFunctionality(params) {
       ref: triggerRef,
       onBlur,
       onFocus,
-      onKeyDown: useEventCallback(mergeCallbacks(onKeyDown, onInputTriggerKeyDown)),
+      onKeyDown,
       isInSelectionMode
     },
     containerRef: comboboxTargetRef,

package/lib/components/utils/usePromptListboxFunctionality.js.map

@@ -1 +1 @@
-{"version":3,"sources":["usePromptListboxFunctionality.tsx"],"sourcesContent":["import * as React from 'react';\nimport { useActiveDescendant } from '@fluentui/react-aria';\nimport { mergeCallbacks, useControllableState, useEventCallback, useMergedRefs } from '@fluentui/react-utilities';\nimport { getDropdownActionFromKey } from './dropdownKeyActions';\nimport { TextCursorPositionPlugin } from '../../plugins/TextCursorPositionPlugin';\nimport { useOptionCollection } from './useOptionCollection';\nimport { useSelection } from './useSelection';\nimport { ArrowDown, ArrowLeft, ArrowRight, ArrowUp } from '@fluentui/keyboard-keys';\nimport { useComboboxPositioning } from './useComboboxPositioning';\nimport { useTriggerKeydown } from './useTriggerKeyDown';\nimport { PromptListbox } from '../PromptListbox';\nimport { promptOptionClassNames } from '../PromptOption';\nimport type { EditorInputProps } from '@fluentui-copilot/react-editor-input';\nimport type {\n  UsePromptListboxFunctionalityParams,\n  UsePromptListboxFunctionality,\n} from './PromptListboxFunctionality.types';\n\nexport function usePromptListboxFunctionality(\n  params: UsePromptListboxFunctionalityParams,\n): UsePromptListboxFunctionality {\n  const { positioning, onOpenChange, onSelectionModeChange, listboxProps, fluid = false } = params;\n  const {\n    listboxRef: activeDescendantListboxRef,\n    activeParentRef,\n    controller: activeDescendantController,\n  } = useActiveDescendant<HTMLSpanElement, HTMLDivElement>({\n    matchOption: el => el.classList.contains(promptOptionClassNames.root),\n  });\n  // useMergedRefs to normalize the ref into a React.RefObject type\n  const triggerRef = useMergedRefs(activeParentRef);\n  const selectionState = useSelection(listboxProps ?? {});\n  const { selectOption } = selectionState;\n  const optionCollection = useOptionCollection();\n  const { getOptionById } = optionCollection;\n  const [isInLastPosition, setIsInLastPosition] = React.useState(true);\n  const [isInSelectionMode, setIsInSelectionMode] = React.useState(false);\n  const [open, setOpen] = useControllableState({\n    state: params.open,\n    defaultState: params.defaultOpen,\n    initialState: false,\n  });\n\n  const onBlur = (event: React.FocusEvent<HTMLSpanElement>) => {\n    setOpen(false);\n    onOpenChange?.(event, { event, type: 'focus', open: false });\n  };\n\n  const onFocus = (event: React.FocusEvent<HTMLSpanElement>) => {\n    if (event.target === event.currentTarget) {\n      setOpen(true);\n      onOpenChange?.(event, { event, type: 'focus', open: true });\n    }\n  };\n\n  const cursorPositionPlugin = <TextCursorPositionPlugin setIsInLastPosition={setIsInLastPosition} />;\n\n  const onListboxBlur = React.useCallback(() => {\n    setIsInSelectionMode(false);\n    onSelectionModeChange?.(false);\n  }, [onSelectionModeChange]);\n\n  // handle combobox keyboard interaction\n  const onKeyDown = useTriggerKeydown({\n    ...optionCollection,\n    activeDescendantController,\n    getOptionById,\n    onBlur: onListboxBlur,\n    selectOption,\n    isInLastPosition,\n    open,\n    multiselect: false,\n  });\n\n  // NVDA and JAWS have bugs that suppress reading the input value text when aria-activedescendant is set\n  // To prevent this, we clear the HTML attribute (but save the state) when a user presses left/right arrows\n  // ref: https://github.com/microsoft/fluentui/issues/26359#issuecomment-1397759888\n  const [hideActiveDescendant, setHideActiveDescendant] = React.useState(false);\n\n  /**\n   * Freeform combobox should not select\n   */\n  const onInputTriggerKeyDown: EditorInputProps['onKeyDown'] = useEventCallback(event => {\n    // update typing state to true if the user is typing\n    const action = getDropdownActionFromKey(event, { open, multiselect: false, isInLastPosition });\n    if (\n      event.key === ArrowLeft ||\n      event.key === ArrowRight ||\n      (!isInLastPosition && (event.key === ArrowDown || event.key === ArrowUp)) ||\n      (action === 'Type' && isInLastPosition) ||\n      action === 'Type'\n    ) {\n      activeDescendantController.blur();\n      setHideActiveDescendant(true);\n      setIsInSelectionMode(false);\n      onSelectionModeChange?.(false);\n    } else if (\n      action === 'Next' ||\n      action === 'Previous' ||\n      action === 'First' ||\n      action === 'Last' ||\n      action === 'PageUp' ||\n      action === 'PageDown'\n    ) {\n      setHideActiveDescendant(false);\n      setIsInSelectionMode(true);\n      onSelectionModeChange?.(true);\n    }\n  });\n\n  React.useEffect(() => {\n    if (hideActiveDescendant) {\n      triggerRef.current?.removeAttribute('aria-activedescendant');\n    }\n    // We only want to run this when the hideActiveDescendant changes, if the triggerRef\n    // is undefined, there's no need to remove theAttribute and we shouldn't be adding\n    // refs as dependencies since it can blow up the number of runs.\n    // eslint-disable-next-line react-compiler/react-compiler\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [hideActiveDescendant]);\n\n  const [comboboxPopupRef, comboboxTargetRef] = useComboboxPositioning({ positioning, fluid });\n\n  const listboxMergedRef = useMergedRefs(comboboxPopupRef, activeDescendantListboxRef, listboxProps?.ref);\n  const listbox = React.useMemo(() => {\n    return (\n      <PromptListbox\n        open={open}\n        {...listboxProps}\n        {...optionCollection}\n        {...selectionState}\n        ref={listboxMergedRef}\n        activeDescendantController={activeDescendantController}\n      />\n    );\n  }, [activeDescendantController, listboxMergedRef, listboxProps, open, optionCollection, selectionState]);\n\n  return {\n    promptListbox: listbox,\n    triggerProps: {\n      ref: triggerRef,\n      onBlur,\n      onFocus,\n      onKeyDown: useEventCallback(mergeCallbacks(onKeyDown, onInputTriggerKeyDown)),\n      isInSelectionMode,\n    },\n    containerRef: comboboxTargetRef,\n    cursorPositionPlugin,\n  };\n}\n"],"names":["React","useActiveDescendant","mergeCallbacks","useControllableState","useEventCallback","useMergedRefs","getDropdownActionFromKey","TextCursorPositionPlugin","useOptionCollection","useSelection","ArrowDown","ArrowLeft","ArrowRight","ArrowUp","useComboboxPositioning","useTriggerKeydown","PromptListbox","promptOptionClassNames","usePromptListboxFunctionality","params","positioning","onOpenChange","onSelectionModeChange","listboxProps","fluid","listboxRef","activeDescendantListboxRef","activeParentRef","controller","activeDescendantController","matchOption","el","classList","contains","root","triggerRef","selectionState","selectOption","optionCollection","getOptionById","isInLastPosition","setIsInLastPosition","useState","isInSelectionMode","setIsInSelectionMode","open","setOpen","state","defaultState","defaultOpen","initialState","onBlur","event","type","onFocus","target","currentTarget","cursorPositionPlugin","onListboxBlur","useCallback","onKeyDown","multiselect","hideActiveDescendant","setHideActiveDescendant","onInputTriggerKeyDown","action","key","blur","useEffect","current","removeAttribute","comboboxPopupRef","comboboxTargetRef","listboxMergedRef","ref","listbox","useMemo","promptListbox","triggerProps","containerRef"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"version":3,"sources":["usePromptListboxFunctionality.tsx"],"sourcesContent":["import * as React from 'react';\nimport { useActiveDescendant } from '@fluentui/react-aria';\nimport { useControllableState, useMergedRefs } from '@fluentui/react-utilities';\nimport { CursorPositionPlugin } from '../../plugins/CursorPositionPlugin';\nimport { useOptionCollection } from './useOptionCollection';\nimport { useSelection } from './useSelection';\nimport { useListboxPositioning } from './useListboxPositioning';\nimport { useTriggerKeydown } from './useTriggerKeyDown';\nimport { PromptListbox } from '../PromptListbox';\nimport { promptOptionClassNames } from '../PromptOption';\nimport type { CursorPosition } from '../../plugins/CursorPositionPlugin';\nimport type {\n  UsePromptListboxFunctionalityParams,\n  UsePromptListboxFunctionality,\n} from './PromptListboxFunctionality.types';\n\nexport function usePromptListboxFunctionality(\n  params: UsePromptListboxFunctionalityParams,\n): UsePromptListboxFunctionality {\n  const {\n    positioning,\n    onOpenChange,\n    onSelectionModeChange,\n    listboxProps,\n    fluid = false,\n    allowArrowUpNavigation = false,\n  } = params;\n  const {\n    listboxRef: activeDescendantListboxRef,\n    activeParentRef,\n    controller: activeDescendantController,\n  } = useActiveDescendant<HTMLSpanElement, HTMLDivElement>({\n    matchOption: el => el.classList.contains(promptOptionClassNames.root),\n  });\n  // useMergedRefs to normalize the ref into a React.RefObject type\n  const triggerRef = useMergedRefs(activeParentRef);\n  const selectionState = useSelection(listboxProps ?? {});\n  const { selectOption } = selectionState;\n  const optionCollection = useOptionCollection();\n  const { getOptionById } = optionCollection;\n  const [cursorPosition, setCursorPosition] = React.useState<CursorPosition>('end');\n  const [isInSelectionMode, setIsInSelectionMode] = React.useState(false);\n  const [open, setOpen] = useControllableState({\n    state: params.open,\n    defaultState: params.defaultOpen,\n    initialState: false,\n  });\n\n  const setSelectionMode = React.useCallback(\n    (selectionMode: boolean) => {\n      if (selectionMode === false) {\n        activeDescendantController.blur();\n        setHideActiveDescendant(true);\n      } else {\n        setHideActiveDescendant(false);\n      }\n\n      setIsInSelectionMode(selectionMode);\n      onSelectionModeChange?.(selectionMode);\n    },\n    [activeDescendantController, onSelectionModeChange],\n  );\n\n  const onBlur = (event: React.FocusEvent<HTMLSpanElement>) => {\n    setOpen(false);\n    onOpenChange?.(event, { event, type: 'focus', open: false });\n    setSelectionMode(false);\n  };\n\n  const onFocus = (event: React.FocusEvent<HTMLSpanElement>) => {\n    if (event.target === event.currentTarget) {\n      setOpen(true);\n      onOpenChange?.(event, { event, type: 'focus', open: true });\n    }\n  };\n\n  const cursorPositionPlugin = <CursorPositionPlugin setCursorPosition={setCursorPosition} />;\n\n  const onListboxBlur = React.useCallback(() => {\n    setSelectionMode(false);\n    onSelectionModeChange?.(false);\n  }, [onSelectionModeChange, setSelectionMode]);\n\n  // handle combobox keyboard interaction\n  const onKeyDown = useTriggerKeydown({\n    ...optionCollection,\n    allowArrowUpNavigation,\n    activeDescendantController,\n    getOptionById,\n    onBlur: onListboxBlur,\n    selectOption,\n    cursorPosition,\n    open,\n    multiselect: false,\n    isInSelectionMode,\n    setSelectionMode,\n  });\n\n  // NVDA and JAWS have bugs that suppress reading the input value text when aria-activedescendant is set\n  // To prevent this, we clear the HTML attribute (but save the state) when a user presses left/right arrows\n  // ref: https://github.com/microsoft/fluentui/issues/26359#issuecomment-1397759888\n  const [hideActiveDescendant, setHideActiveDescendant] = React.useState(false);\n\n  React.useEffect(() => {\n    if (hideActiveDescendant) {\n      triggerRef.current?.removeAttribute('aria-activedescendant');\n    }\n    // We only want to run this when the hideActiveDescendant changes, if the triggerRef\n    // is undefined, there's no need to remove theAttribute and we shouldn't be adding\n    // refs as dependencies since it can blow up the number of runs.\n    // eslint-disable-next-line react-compiler/react-compiler\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [hideActiveDescendant]);\n\n  const [comboboxPopupRef, comboboxTargetRef] = useListboxPositioning({ positioning, fluid });\n\n  const listboxMergedRef = useMergedRefs(comboboxPopupRef, activeDescendantListboxRef, listboxProps?.ref);\n  const listbox = React.useMemo(() => {\n    return (\n      <PromptListbox\n        open={open}\n        {...listboxProps}\n        {...optionCollection}\n        {...selectionState}\n        ref={listboxMergedRef}\n        activeDescendantController={activeDescendantController}\n      />\n    );\n  }, [activeDescendantController, listboxMergedRef, listboxProps, open, optionCollection, selectionState]);\n\n  return {\n    promptListbox: listbox,\n    triggerProps: {\n      ref: triggerRef,\n      onBlur,\n      onFocus,\n      onKeyDown,\n      isInSelectionMode,\n    },\n    containerRef: comboboxTargetRef,\n    cursorPositionPlugin,\n  };\n}\n"],"names":["React","useActiveDescendant","useControllableState","useMergedRefs","CursorPositionPlugin","useOptionCollection","useSelection","useListboxPositioning","useTriggerKeydown","PromptListbox","promptOptionClassNames","usePromptListboxFunctionality","params","positioning","onOpenChange","onSelectionModeChange","listboxProps","fluid","allowArrowUpNavigation","listboxRef","activeDescendantListboxRef","activeParentRef","controller","activeDescendantController","matchOption","el","classList","contains","root","triggerRef","selectionState","selectOption","optionCollection","getOptionById","cursorPosition","setCursorPosition","useState","isInSelectionMode","setIsInSelectionMode","open","setOpen","state","defaultState","defaultOpen","initialState","setSelectionMode","useCallback","selectionMode","blur","setHideActiveDescendant","onBlur","event","type","onFocus","target","currentTarget","cursorPositionPlugin","onListboxBlur","onKeyDown","multiselect","hideActiveDescendant","useEffect","current","removeAttribute","comboboxPopupRef","comboboxTargetRef","listboxMergedRef","ref","listbox","useMemo","promptListbox","triggerProps","containerRef"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}

package/lib/components/utils/useTriggerKeyDown.js

@@ -6,6 +6,7 @@
 import { useSetKeyboardNavigation } from '@fluentui/react-tabster';
 import { useEventCallback } from '@fluentui/react-utilities';
 import { getDropdownActionFromKey } from './dropdownKeyActions';
+import { ArrowLeft, ArrowRight } from '@fluentui/keyboard-keys';
 export function useTriggerKeydown(options) {
   const {
     activeDescendantController,
@@ -13,8 +14,11 @@ export function useTriggerKeydown(options) {
     selectOption,
     multiselect,
     open,
-    isInLastPosition,
-    onBlur
+    cursorPosition,
+    onBlur,
+    allowArrowUpNavigation,
+    isInSelectionMode,
+    setSelectionMode
   } = options;
   const getActiveOption = React.useCallback(() => {
     const activeOptionId = activeDescendantController.active();
@@ -59,12 +63,19 @@ export function useTriggerKeydown(options) {
     const action = getDropdownActionFromKey(e, {
       open,
       multiselect,
-      isInLastPosition
+      cursorPosition,
+      allowArrowUpNavigation,
+      isInSelectionMode
     });
     const activeOption = getActiveOption();
     const firstOption = activeDescendantController.first({
       passive: true
     });
+    if (e.key === ArrowLeft || e.key === ArrowRight || action === 'Type') {
+      setSelectionMode(false);
+    } else if (action === 'Next' || action === 'Previous' || action === 'First' || action === 'Last' || action === 'PageUp' || action === 'PageDown') {
+      setSelectionMode(true);
+    }
     switch (action) {
       case 'Last':
       case 'First':
@@ -75,14 +86,7 @@ export function useTriggerKeydown(options) {
         e.preventDefault();
         break;
       case 'Previous':
-        // when active option is the first option and the action was "Previous",
-        // this means we were in the first option and we are "leaving" the listbox
-        if ((activeOption === null || activeOption === void 0 ? void 0 : activeOption.id) === firstOption) {
-          blur();
-          e.preventDefault();
-        } else if (activeOption) {
-          e.preventDefault();
-        }
+        e.preventDefault();
         break;
       case 'Next':
         e.preventDefault();
@@ -92,18 +96,33 @@ export function useTriggerKeydown(options) {
     switch (action) {
       case 'First':
         first();
+        if (!isInSelectionMode) {
+          setSelectionMode(true);
+        }
         break;
       case 'Last':
         last();
+        if (!isInSelectionMode) {
+          setSelectionMode(true);
+        }
         break;
       case 'Next':
         next(activeOption);
+        if (!isInSelectionMode) {
+          setSelectionMode(true);
+        }
         break;
       case 'Previous':
+        // when active option is the first option and the action was "Previous",
+        // this means we were in the first option and we are "leaving" the listbox
         if (activeOption && activeOption.id !== firstOption) {
           previous(activeOption);
+          if (!isInSelectionMode) {
+            setSelectionMode(true);
+          }
         } else {
           blur();
+          setSelectionMode(false);
         }
         break;
       case 'PageDown':
@@ -115,6 +134,7 @@ export function useTriggerKeydown(options) {
       case 'CloseSelect':
         if (!multiselect && !(activeOption === null || activeOption === void 0 ? void 0 : activeOption.disabled)) {
           blur();
+          setSelectionMode(false);
         }
       // fallthrough
       case 'Select':

package/lib/components/utils/useTriggerKeyDown.js.map

@@ -1 +1 @@
-{"version":3,"sources":["useTriggerKeyDown.ts"],"sourcesContent":["/**\n * Note, this is mainly brought from Fluent UI, only removed the closing and\n * opening logic since that's not needed for this use case and added the bluring\n * functionality.\n */\n\nimport * as React from 'react';\nimport { useSetKeyboardNavigation } from '@fluentui/react-tabster';\nimport { useEventCallback } from '@fluentui/react-utilities';\nimport { getDropdownActionFromKey } from './dropdownKeyActions';\nimport type { ActiveDescendantImperativeRef } from '@fluentui/react-aria';\nimport type { OptionCollectionState, OptionValue } from './OptionCollection.types';\nimport type { SelectionProps, SelectionState } from './Selection.types';\n\nexport function useTriggerKeydown(\n  options: {\n    activeDescendantController: ActiveDescendantImperativeRef;\n    isInLastPosition: boolean;\n    open: boolean;\n    onBlur: () => void;\n  } & OptionCollectionState &\n    Pick<SelectionProps, 'multiselect'> &\n    Pick<SelectionState, 'selectOption'>,\n) {\n  const { activeDescendantController, getOptionById, selectOption, multiselect, open, isInLastPosition, onBlur } =\n    options;\n\n  const getActiveOption = React.useCallback(() => {\n    const activeOptionId = activeDescendantController.active();\n    return activeOptionId ? getOptionById(activeOptionId) : undefined;\n  }, [activeDescendantController, getOptionById]);\n\n  const first = () => {\n    activeDescendantController.first();\n  };\n\n  const last = () => {\n    activeDescendantController.last();\n  };\n\n  const blur = () => {\n    activeDescendantController.blur();\n    onBlur();\n  };\n\n  const next = (activeOption: OptionValue | undefined) => {\n    if (activeOption) {\n      activeDescendantController.next();\n    } else {\n      activeDescendantController.first();\n    }\n  };\n\n  const previous = (activeOption: OptionValue | undefined) => {\n    if (activeOption) {\n      activeDescendantController.prev();\n    } else {\n      activeDescendantController.first();\n    }\n  };\n\n  const pageUp = () => {\n    for (let i = 0; i < 10; i++) {\n      activeDescendantController.prev();\n    }\n  };\n\n  const pageDown = () => {\n    for (let i = 0; i < 10; i++) {\n      activeDescendantController.next();\n    }\n  };\n\n  const setKeyboardNavigation = useSetKeyboardNavigation();\n  return useEventCallback((e: React.KeyboardEvent<HTMLSpanElement>) => {\n    const action = getDropdownActionFromKey(e, { open, multiselect, isInLastPosition });\n    const activeOption = getActiveOption();\n    const firstOption = activeDescendantController.first({ passive: true });\n\n    switch (action) {\n      case 'Last':\n      case 'First':\n      case 'PageDown':\n      case 'PageUp':\n      case 'CloseSelect':\n      case 'Select':\n        e.preventDefault();\n        break;\n      case 'Previous':\n        // when active option is the first option and the action was \"Previous\",\n        // this means we were in the first option and we are \"leaving\" the listbox\n        if (activeOption?.id === firstOption) {\n          blur();\n          e.preventDefault();\n        } else if (activeOption) {\n          e.preventDefault();\n        }\n        break;\n      case 'Next':\n        e.preventDefault();\n        break;\n    }\n\n    setKeyboardNavigation(true);\n\n    switch (action) {\n      case 'First':\n        first();\n        break;\n      case 'Last':\n        last();\n        break;\n      case 'Next':\n        next(activeOption);\n        break;\n      case 'Previous':\n        if (activeOption && activeOption.id !== firstOption) {\n          previous(activeOption);\n        } else {\n          blur();\n        }\n        break;\n      case 'PageDown':\n        pageDown();\n        break;\n      case 'PageUp':\n        pageUp();\n        break;\n      case 'CloseSelect':\n        if (!multiselect && !activeOption?.disabled) {\n          blur();\n        }\n      // fallthrough\n      case 'Select':\n        activeOption && selectOption(e, activeOption);\n        break;\n      case 'Tab':\n        !multiselect && activeOption && selectOption(e, activeOption);\n        break;\n    }\n  });\n}\n"],"names":["React","useSetKeyboardNavigation","useEventCallback","getDropdownActionFromKey","useTriggerKeydown","options","activeDescendantController","getOptionById","selectOption","multiselect","open","isInLastPosition","onBlur","getActiveOption","useCallback","activeOptionId","active","undefined","first","last","blur","next","activeOption","previous","prev","pageUp","i","pageDown","setKeyboardNavigation","e","action","firstOption","passive","preventDefault","id","disabled"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA;;;;CAIC,GAED,YAAYA,WAAW,QAAQ;AAC/B,SAASC,wBAAwB,QAAQ,0BAA0B;AACnE,SAASC,gBAAgB,QAAQ,4BAA4B;AAC7D,SAASC,wBAAwB,QAAQ,uBAAuB;AAKhE,OAAO,SAASC,kBACdC,OAOsC;IAEtC,MAAM,EAAEC,0BAA0B,EAAEC,aAAa,EAAEC,YAAY,EAAEC,WAAW,EAAEC,IAAI,EAAEC,gBAAgB,EAAEC,MAAM,EAAE,GAC5GP;IAEF,MAAMQ,kBAAkBb,MAAMc,WAAW,CAAC;QACxC,MAAMC,iBAAiBT,2BAA2BU,MAAM;QACxD,OAAOD,iBAAiBR,cAAcQ,kBAAkBE;IAC1D,GAAG;QAACX;QAA4BC;KAAc;IAE9C,MAAMW,QAAQ;QACZZ,2BAA2BY,KAAK;IAClC;IAEA,MAAMC,OAAO;QACXb,2BAA2Ba,IAAI;IACjC;IAEA,MAAMC,OAAO;QACXd,2BAA2Bc,IAAI;QAC/BR;IACF;IAEA,MAAMS,OAAO,CAACC;QACZ,IAAIA,cAAc;YAChBhB,2BAA2Be,IAAI;QACjC,OAAO;YACLf,2BAA2BY,KAAK;QAClC;IACF;IAEA,MAAMK,WAAW,CAACD;QAChB,IAAIA,cAAc;YAChBhB,2BAA2BkB,IAAI;QACjC,OAAO;YACLlB,2BAA2BY,KAAK;QAClC;IACF;IAEA,MAAMO,SAAS;QACb,IAAK,IAAIC,IAAI,GAAGA,IAAI,IAAIA,IAAK;YAC3BpB,2BAA2BkB,IAAI;QACjC;IACF;IAEA,MAAMG,WAAW;QACf,IAAK,IAAID,IAAI,GAAGA,IAAI,IAAIA,IAAK;YAC3BpB,2BAA2Be,IAAI;QACjC;IACF;IAEA,MAAMO,wBAAwB3B;IAC9B,OAAOC,iBAAiB,CAAC2B;QACvB,MAAMC,SAAS3B,yBAAyB0B,GAAG;YAAEnB;YAAMD;YAAaE;QAAiB;QACjF,MAAMW,eAAeT;QACrB,MAAMkB,cAAczB,2BAA2BY,KAAK,CAAC;YAAEc,SAAS;QAAK;QAErE,OAAQF;YACN,KAAK;YACL,KAAK;YACL,KAAK;YACL,KAAK;YACL,KAAK;YACL,KAAK;gBACHD,EAAEI,cAAc;gBAChB;YACF,KAAK;gBACH,wEAAwE;gBACxE,0EAA0E;gBAC1E,IAAIX,CAAAA,yBAAAA,mCAAAA,aAAcY,EAAE,MAAKH,aAAa;oBACpCX;oBACAS,EAAEI,cAAc;gBAClB,OAAO,IAAIX,cAAc;oBACvBO,EAAEI,cAAc;gBAClB;gBACA;YACF,KAAK;gBACHJ,EAAEI,cAAc;gBAChB;QACJ;QAEAL,sBAAsB;QAEtB,OAAQE;YACN,KAAK;gBACHZ;gBACA;YACF,KAAK;gBACHC;gBACA;YACF,KAAK;gBACHE,KAAKC;gBACL;YACF,KAAK;gBACH,IAAIA,gBAAgBA,aAAaY,EAAE,KAAKH,aAAa;oBACnDR,SAASD;gBACX,OAAO;oBACLF;gBACF;gBACA;YACF,KAAK;gBACHO;gBACA;YACF,KAAK;gBACHF;gBACA;YACF,KAAK;gBACH,IAAI,CAAChB,eAAe,EAACa,yBAAAA,mCAAAA,aAAca,QAAQ,GAAE;oBAC3Cf;gBACF;YACF,cAAc;YACd,KAAK;gBACHE,gBAAgBd,aAAaqB,GAAGP;gBAChC;YACF,KAAK;gBACH,CAACb,eAAea,gBAAgBd,aAAaqB,GAAGP;gBAChD;QACJ;IACF;AACF"}
+{"version":3,"sources":["useTriggerKeyDown.ts"],"sourcesContent":["/**\n * Note, this is mainly brought from Fluent UI, only removed the closing and\n * opening logic since that's not needed for this use case and added the bluring\n * functionality.\n */\n\nimport * as React from 'react';\nimport { useSetKeyboardNavigation } from '@fluentui/react-tabster';\nimport { useEventCallback } from '@fluentui/react-utilities';\nimport { getDropdownActionFromKey } from './dropdownKeyActions';\nimport { ArrowLeft, ArrowRight } from '@fluentui/keyboard-keys';\nimport type { ActiveDescendantImperativeRef } from '@fluentui/react-aria';\nimport type { OptionCollectionState, OptionValue } from './OptionCollection.types';\nimport type { SelectionProps, SelectionState } from './Selection.types';\nimport type { CursorPosition } from '../../plugins/CursorPositionPlugin';\n\nexport function useTriggerKeydown(\n  options: {\n    activeDescendantController: ActiveDescendantImperativeRef;\n    cursorPosition: CursorPosition;\n    open: boolean;\n    onBlur: () => void;\n    allowArrowUpNavigation: boolean;\n    isInSelectionMode: boolean;\n    setSelectionMode: (selectionMode: boolean) => void;\n  } & OptionCollectionState &\n    Pick<SelectionProps, 'multiselect'> &\n    Pick<SelectionState, 'selectOption'>,\n) {\n  const {\n    activeDescendantController,\n    getOptionById,\n    selectOption,\n    multiselect,\n    open,\n    cursorPosition,\n    onBlur,\n    allowArrowUpNavigation,\n    isInSelectionMode,\n    setSelectionMode,\n  } = options;\n\n  const getActiveOption = React.useCallback(() => {\n    const activeOptionId = activeDescendantController.active();\n    return activeOptionId ? getOptionById(activeOptionId) : undefined;\n  }, [activeDescendantController, getOptionById]);\n\n  const first = () => {\n    activeDescendantController.first();\n  };\n\n  const last = () => {\n    activeDescendantController.last();\n  };\n\n  const blur = () => {\n    activeDescendantController.blur();\n    onBlur();\n  };\n\n  const next = (activeOption: OptionValue | undefined) => {\n    if (activeOption) {\n      activeDescendantController.next();\n    } else {\n      activeDescendantController.first();\n    }\n  };\n\n  const previous = (activeOption: OptionValue | undefined) => {\n    if (activeOption) {\n      activeDescendantController.prev();\n    } else {\n      activeDescendantController.first();\n    }\n  };\n\n  const pageUp = () => {\n    for (let i = 0; i < 10; i++) {\n      activeDescendantController.prev();\n    }\n  };\n\n  const pageDown = () => {\n    for (let i = 0; i < 10; i++) {\n      activeDescendantController.next();\n    }\n  };\n\n  const setKeyboardNavigation = useSetKeyboardNavigation();\n  return useEventCallback((e: React.KeyboardEvent<HTMLSpanElement>) => {\n    const action = getDropdownActionFromKey(e, {\n      open,\n      multiselect,\n      cursorPosition,\n      allowArrowUpNavigation,\n      isInSelectionMode,\n    });\n    const activeOption = getActiveOption();\n    const firstOption = activeDescendantController.first({ passive: true });\n\n    if (e.key === ArrowLeft || e.key === ArrowRight || action === 'Type') {\n      setSelectionMode(false);\n    } else if (\n      action === 'Next' ||\n      action === 'Previous' ||\n      action === 'First' ||\n      action === 'Last' ||\n      action === 'PageUp' ||\n      action === 'PageDown'\n    ) {\n      setSelectionMode(true);\n    }\n\n    switch (action) {\n      case 'Last':\n      case 'First':\n      case 'PageDown':\n      case 'PageUp':\n      case 'CloseSelect':\n      case 'Select':\n        e.preventDefault();\n        break;\n      case 'Previous':\n        e.preventDefault();\n        break;\n      case 'Next':\n        e.preventDefault();\n        break;\n    }\n\n    setKeyboardNavigation(true);\n\n    switch (action) {\n      case 'First':\n        first();\n        if (!isInSelectionMode) {\n          setSelectionMode(true);\n        }\n        break;\n      case 'Last':\n        last();\n        if (!isInSelectionMode) {\n          setSelectionMode(true);\n        }\n        break;\n      case 'Next':\n        next(activeOption);\n        if (!isInSelectionMode) {\n          setSelectionMode(true);\n        }\n        break;\n      case 'Previous':\n        // when active option is the first option and the action was \"Previous\",\n        // this means we were in the first option and we are \"leaving\" the listbox\n        if (activeOption && activeOption.id !== firstOption) {\n          previous(activeOption);\n          if (!isInSelectionMode) {\n            setSelectionMode(true);\n          }\n        } else {\n          blur();\n          setSelectionMode(false);\n        }\n        break;\n      case 'PageDown':\n        pageDown();\n        break;\n      case 'PageUp':\n        pageUp();\n        break;\n      case 'CloseSelect':\n        if (!multiselect && !activeOption?.disabled) {\n          blur();\n          setSelectionMode(false);\n        }\n      // fallthrough\n      case 'Select':\n        activeOption && selectOption(e, activeOption);\n        break;\n      case 'Tab':\n        !multiselect && activeOption && selectOption(e, activeOption);\n        break;\n    }\n  });\n}\n"],"names":["React","useSetKeyboardNavigation","useEventCallback","getDropdownActionFromKey","ArrowLeft","ArrowRight","useTriggerKeydown","options","activeDescendantController","getOptionById","selectOption","multiselect","open","cursorPosition","onBlur","allowArrowUpNavigation","isInSelectionMode","setSelectionMode","getActiveOption","useCallback","activeOptionId","active","undefined","first","last","blur","next","activeOption","previous","prev","pageUp","i","pageDown","setKeyboardNavigation","e","action","firstOption","passive","key","preventDefault","id","disabled"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}

package/lib/index.js

@@ -1,5 +1,4 @@
 export { PromptListbox, promptListboxClassNames, renderPromptListbox_unstable, usePromptListboxStyles_unstable, usePromptListbox_unstable } from './PromptListbox';
 export { usePromptListboxFunctionality } from './components/utils/usePromptListboxFunctionality';
-export { TextCursorPositionPlugin } from './plugins/TextCursorPositionPlugin';
 export { PromptOption, promptOptionClassNames, renderPromptOption_unstable, usePromptOptionStyles_unstable, usePromptOption_unstable } from './PromptOption';
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["index.ts"],"sourcesContent":["export type { PromptListboxProps, PromptListboxSlots, PromptListboxState } from './PromptListbox';\nexport {\n  PromptListbox,\n  promptListboxClassNames,\n  renderPromptListbox_unstable,\n  usePromptListboxStyles_unstable,\n  usePromptListbox_unstable,\n} from './PromptListbox';\n\nexport { usePromptListboxFunctionality } from './components/utils/usePromptListboxFunctionality';\nexport type {\n  OnOpenChangeData,\n  ProcessedPromptListboxProps,\n  UsePromptListboxFunctionality,\n  UsePromptListboxFunctionalityParams,\n} from './components/utils/PromptListboxFunctionality.types';\n\nexport type { TextCursorPositionPluginProps } from './plugins/TextCursorPositionPlugin';\nexport { TextCursorPositionPlugin } from './plugins/TextCursorPositionPlugin';\n\nexport type { PromptOptionProps, PromptOptionSlots, PromptOptionState } from './PromptOption';\nexport {\n  PromptOption,\n  promptOptionClassNames,\n  renderPromptOption_unstable,\n  usePromptOptionStyles_unstable,\n  usePromptOption_unstable,\n} from './PromptOption';\n"],"names":["PromptListbox","promptListboxClassNames","renderPromptListbox_unstable","usePromptListboxStyles_unstable","usePromptListbox_unstable","usePromptListboxFunctionality","TextCursorPositionPlugin","PromptOption","promptOptionClassNames","renderPromptOption_unstable","usePromptOptionStyles_unstable","usePromptOption_unstable"],"rangeMappings":";;;","mappings":"AACA,SACEA,aAAa,EACbC,uBAAuB,EACvBC,4BAA4B,EAC5BC,+BAA+B,EAC/BC,yBAAyB,QACpB,kBAAkB;AAEzB,SAASC,6BAA6B,QAAQ,mDAAmD;AASjG,SAASC,wBAAwB,QAAQ,qCAAqC;AAG9E,SACEC,YAAY,EACZC,sBAAsB,EACtBC,2BAA2B,EAC3BC,8BAA8B,EAC9BC,wBAAwB,QACnB,iBAAiB"}
+{"version":3,"sources":["index.ts"],"sourcesContent":["export type { PromptListboxProps, PromptListboxSlots, PromptListboxState } from './PromptListbox';\nexport {\n  PromptListbox,\n  promptListboxClassNames,\n  renderPromptListbox_unstable,\n  usePromptListboxStyles_unstable,\n  usePromptListbox_unstable,\n} from './PromptListbox';\n\nexport { usePromptListboxFunctionality } from './components/utils/usePromptListboxFunctionality';\nexport type {\n  OnOpenChangeData,\n  ProcessedPromptListboxProps,\n  UsePromptListboxFunctionality,\n  UsePromptListboxFunctionalityParams,\n} from './components/utils/PromptListboxFunctionality.types';\n\nexport type { PromptOptionProps, PromptOptionSlots, PromptOptionState } from './PromptOption';\nexport {\n  PromptOption,\n  promptOptionClassNames,\n  renderPromptOption_unstable,\n  usePromptOptionStyles_unstable,\n  usePromptOption_unstable,\n} from './PromptOption';\n"],"names":["PromptListbox","promptListboxClassNames","renderPromptListbox_unstable","usePromptListboxStyles_unstable","usePromptListbox_unstable","usePromptListboxFunctionality","PromptOption","promptOptionClassNames","renderPromptOption_unstable","usePromptOptionStyles_unstable","usePromptOption_unstable"],"rangeMappings":";;","mappings":"AACA,SACEA,aAAa,EACbC,uBAAuB,EACvBC,4BAA4B,EAC5BC,+BAA+B,EAC/BC,yBAAyB,QACpB,kBAAkB;AAEzB,SAASC,6BAA6B,QAAQ,mDAAmD;AASjG,SACEC,YAAY,EACZC,sBAAsB,EACtBC,2BAA2B,EAC3BC,8BAA8B,EAC9BC,wBAAwB,QACnB,iBAAiB"}

package/lib/plugins/CursorPositionPlugin.js

@@ -0,0 +1,43 @@
+import { $isSentinelNode } from '@fluentui-copilot/chat-input-plugins';
+import { SELECTION_CHANGE_COMMAND, $getSelection, useLexicalComposerContext, $isRangeSelection, $isElementNode, COMMAND_PRIORITY_HIGH } from '@fluentui-copilot/react-text-editor';
+import * as React from 'react';
+export const CursorPositionPlugin = ({
+  setCursorPosition
+}) => {
+  const [editor] = useLexicalComposerContext();
+  React.useEffect(() => {
+    const $selectionChangeHandler = () => {
+      const selection = $getSelection();
+      // If selection is null, the cursor is not active in the editor and we should just noop
+      if (selection === null || !$isRangeSelection(selection) || !selection.isCollapsed()) {
+        setCursorPosition('between-text');
+        return false;
+      }
+      // Should only be one node in the selection because the selection is collapsed
+      const selectedNode = selection.getNodes().at(0);
+      // If there's no selected node, focus isn't in the editor
+      if (!selectedNode) {
+        return false;
+      }
+      // If there are no leaf nodes, the paragraph node will be selected
+      if ($isElementNode(selectedNode)) {
+        setCursorPosition('start-end');
+        return false;
+      } else if ($isSentinelNode(selectedNode) && !selectedNode.getNextSibling()) {
+        setCursorPosition('end');
+        return false;
+      } else if ($isSentinelNode(selectedNode.getNextSibling()) && selection.focus.offset === selectedNode.getTextContentSize()) {
+        setCursorPosition('end');
+        return false;
+      } else if (selectedNode.getPreviousSibling() === null && selection.focus.offset === 0) {
+        setCursorPosition('start');
+        return false;
+      }
+      setCursorPosition('between-text');
+      return false;
+    };
+    return editor.registerCommand(SELECTION_CHANGE_COMMAND, $selectionChangeHandler, COMMAND_PRIORITY_HIGH);
+  }, [editor, setCursorPosition]);
+  return null;
+};
+//# sourceMappingURL=CursorPositionPlugin.js.map

package/lib/plugins/CursorPositionPlugin.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["CursorPositionPlugin.ts"],"sourcesContent":["import { $isSentinelNode } from '@fluentui-copilot/chat-input-plugins';\nimport {\n  SELECTION_CHANGE_COMMAND,\n  $getSelection,\n  useLexicalComposerContext,\n  $isRangeSelection,\n  $isElementNode,\n  COMMAND_PRIORITY_HIGH,\n} from '@fluentui-copilot/react-text-editor';\nimport * as React from 'react';\n\n/**\n * Position the cursor is in based on it's content. The goal\n * is to track whether the cursor is at the end of the input\n * or between text.\n */\nexport type CursorPosition = 'start' | 'between-text' | 'end' | 'start-end';\n\nexport type CursorPositionPluginProps = {\n  setCursorPosition: (position: CursorPosition) => void;\n};\n\nexport const CursorPositionPlugin: React.FunctionComponent<CursorPositionPluginProps> = ({ setCursorPosition }) => {\n  const [editor] = useLexicalComposerContext();\n\n  React.useEffect(() => {\n    const $selectionChangeHandler = () => {\n      const selection = $getSelection();\n      // If selection is null, the cursor is not active in the editor and we should just noop\n      if (selection === null || !$isRangeSelection(selection) || !selection.isCollapsed()) {\n        setCursorPosition('between-text');\n        return false;\n      }\n\n      // Should only be one node in the selection because the selection is collapsed\n      const selectedNode = selection.getNodes().at(0);\n      // If there's no selected node, focus isn't in the editor\n      if (!selectedNode) {\n        return false;\n      }\n\n      // If there are no leaf nodes, the paragraph node will be selected\n      if ($isElementNode(selectedNode)) {\n        setCursorPosition('start-end');\n        return false;\n      }\n\n      // if the selection node is a sentinel and it matches the sentinel at the end\n      else if ($isSentinelNode(selectedNode) && !selectedNode.getNextSibling()) {\n        setCursorPosition('end');\n        return false;\n      }\n\n      // else if the selection node is not a sentinel, check that the next sibling node is a sentinel\n      // and check if the focus offset is in the last position of the node.\n      else if (\n        $isSentinelNode(selectedNode.getNextSibling()) &&\n        selection.focus.offset === selectedNode.getTextContentSize()\n      ) {\n        setCursorPosition('end');\n        return false;\n      }\n\n      // else if the selection node is not at the end and is not a sentinel, check if there's a previous\n      // sibling and that we are at the start. If that's the case we are at the start.\n      else if (selectedNode.getPreviousSibling() === null && selection.focus.offset === 0) {\n        setCursorPosition('start');\n        return false;\n      }\n\n      setCursorPosition('between-text');\n      return false;\n    };\n\n    return editor.registerCommand(SELECTION_CHANGE_COMMAND, $selectionChangeHandler, COMMAND_PRIORITY_HIGH);\n  }, [editor, setCursorPosition]);\n\n  return null;\n};\n"],"names":["$isSentinelNode","SELECTION_CHANGE_COMMAND","$getSelection","useLexicalComposerContext","$isRangeSelection","$isElementNode","COMMAND_PRIORITY_HIGH","React","CursorPositionPlugin","setCursorPosition","editor","useEffect","$selectionChangeHandler","selection","isCollapsed","selectedNode","getNodes","at","getNextSibling","focus","offset","getTextContentSize","getPreviousSibling","registerCommand"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA,SAASA,eAAe,QAAQ,uCAAuC;AACvE,SACEC,wBAAwB,EACxBC,aAAa,EACbC,yBAAyB,EACzBC,iBAAiB,EACjBC,cAAc,EACdC,qBAAqB,QAChB,sCAAsC;AAC7C,YAAYC,WAAW,QAAQ;AAa/B,OAAO,MAAMC,uBAA2E,CAAC,EAAEC,iBAAiB,EAAE;IAC5G,MAAM,CAACC,OAAO,GAAGP;IAEjBI,MAAMI,SAAS,CAAC;QACd,MAAMC,0BAA0B;YAC9B,MAAMC,YAAYX;YAClB,uFAAuF;YACvF,IAAIW,cAAc,QAAQ,CAACT,kBAAkBS,cAAc,CAACA,UAAUC,WAAW,IAAI;gBACnFL,kBAAkB;gBAClB,OAAO;YACT;YAEA,8EAA8E;YAC9E,MAAMM,eAAeF,UAAUG,QAAQ,GAAGC,EAAE,CAAC;YAC7C,yDAAyD;YACzD,IAAI,CAACF,cAAc;gBACjB,OAAO;YACT;YAEA,kEAAkE;YAClE,IAAIV,eAAeU,eAAe;gBAChCN,kBAAkB;gBAClB,OAAO;YACT,OAGK,IAAIT,gBAAgBe,iBAAiB,CAACA,aAAaG,cAAc,IAAI;gBACxET,kBAAkB;gBAClB,OAAO;YACT,OAIK,IACHT,gBAAgBe,aAAaG,cAAc,OAC3CL,UAAUM,KAAK,CAACC,MAAM,KAAKL,aAAaM,kBAAkB,IAC1D;gBACAZ,kBAAkB;gBAClB,OAAO;YACT,OAIK,IAAIM,aAAaO,kBAAkB,OAAO,QAAQT,UAAUM,KAAK,CAACC,MAAM,KAAK,GAAG;gBACnFX,kBAAkB;gBAClB,OAAO;YACT;YAEAA,kBAAkB;YAClB,OAAO;QACT;QAEA,OAAOC,OAAOa,eAAe,CAACtB,0BAA0BW,yBAAyBN;IACnF,GAAG;QAACI;QAAQD;KAAkB;IAE9B,OAAO;AACT,EAAE"}

package/lib-commonjs/components/PromptListbox/usePromptListboxStyles.styles.js

@@ -25,22 +25,11 @@ const promptListboxClassNames = {
  */ const useStyles = (0, _reactcomponents.__styles)({
     listbox: {
         E5pizo: "f1hg901r",
-        Bbmb7ep: [
-            "f1aa9q02",
-            "f16jpd5f"
-        ],
-        Beyfa6y: [
-            "f16jpd5f",
-            "f1aa9q02"
-        ],
-        B7oj6ja: [
-            "f1jar5jt",
-            "fyu767a"
-        ],
-        Btl43ni: [
-            "fyu767a",
-            "f1jar5jt"
-        ],
+        Beyfa6y: 0,
+        Bbmb7ep: 0,
+        Btl43ni: 0,
+        B7oj6ja: 0,
+        Dimara: "ft85np5",
         Bxyxcbc: "fmmk62d",
         B7ck84d: "f1ewtqcl"
     },
@@ -53,10 +42,12 @@ const promptListboxClassNames = {
 }, {
     d: [
         ".f1hg901r{box-shadow:var(--shadow16);}",
-        ".f1aa9q02{border-bottom-right-radius:var(--borderRadiusMedium);}",
-        ".f16jpd5f{border-bottom-left-radius:var(--borderRadiusMedium);}",
-        ".f1jar5jt{border-top-right-radius:var(--borderRadiusMedium);}",
-        ".fyu767a{border-top-left-radius:var(--borderRadiusMedium);}",
+        [
+            ".ft85np5{border-radius:var(--borderRadiusMedium);}",
+            {
+                p: -1
+            }
+        ],
         ".fmmk62d{max-height:80vh;}",
         ".f1ewtqcl{box-sizing:border-box;}",
         ".fjseox{display:none;}",

package/lib-commonjs/components/PromptListbox/usePromptListboxStyles.styles.js.map

@@ -1 +1 @@
-{"version":3,"sources":["usePromptListboxStyles.styles.ts"],"sourcesContent":["import { makeStyles, mergeClasses, shorthands, tokens } from '@fluentui/react-components';\nimport type { PromptListboxSlots, PromptListboxState } from './PromptListbox.types';\nimport type { SlotClassNames } from '@fluentui/react-components';\n\nexport const promptListboxClassNames: SlotClassNames<PromptListboxSlots> = {\n  root: 'fai-PromptListbox',\n};\n\n/**\n * Styles for the root slot\n */\nconst useStyles = makeStyles({\n  listbox: {\n    boxShadow: tokens.shadow16,\n    ...shorthands.borderRadius(tokens.borderRadiusMedium),\n    maxHeight: '80vh',\n    boxSizing: 'border-box',\n  },\n\n  listboxCollapsed: {\n    display: 'none',\n  },\n\n  // When rendering inline, the popupSurface will be rendered under relatively positioned elements such as Input.\n  // This is due to the surface being positioned as absolute, therefore zIndex: 1 ensures that won't happen.\n  inlineListbox: {\n    zIndex: 1,\n  },\n});\n\n/**\n * Apply styling to the PromptListbox slots based on the state\n */\nexport const usePromptListboxStyles_unstable = (state: PromptListboxState): PromptListboxState => {\n  'use no memo';\n\n  const styles = useStyles();\n  state.root.className = mergeClasses(\n    promptListboxClassNames.root,\n    styles.listbox,\n    state.inlinePopup && styles.inlineListbox,\n    !state.open && styles.listboxCollapsed,\n    state.root.className,\n  );\n\n  return state;\n};\n"],"names":["promptListboxClassNames","usePromptListboxStyles_unstable","root","listbox","__styles","boxShadow","shorthands","maxHeight","boxSizing","B7oj6ja","listboxCollapsed","display","B7ck84d","inlineListbox","Bj3rh1h","d","state"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";;;;;;;;;;;IAIaA,uBAAAA;eAAAA;;IA0CXC,+BAAA;eAAAA;;;iCA9CmD;AAI9C,MAAMD,0BAA8D;UACzEE;AACF;AAEA;;CAEC,SAECC,YAASC,IAAAA,yBAAA,EAAA;aACPC;gBACGC;iBACHC;YAAAA;YAAW;SAAA;iBACXC;YAAAA;YAAW;SAAA;QACbC,SAAA;YAAA;YAAA;SAAA;QAEAC,SAAAA;YAAAA;YAAkB;SAAA;iBAChBC;QACFC,SAAA;;sBAGA;QACAC,QAAAA;;mBAEA;QACFC,SAAA;IAEA;;IAECC,GACD;QAAA;QAAad;QAAmCe;QAAAA;QAAAA;QAAAA;QAAAA;QAAAA;QAAAA;KAAAA;;AAa9C,MAAAf,kCAAAe,CAAAA"}
+{"version":3,"sources":["usePromptListboxStyles.styles.ts"],"sourcesContent":["import { makeStyles, mergeClasses, tokens } from '@fluentui/react-components';\nimport type { PromptListboxSlots, PromptListboxState } from './PromptListbox.types';\nimport type { SlotClassNames } from '@fluentui/react-components';\n\nexport const promptListboxClassNames: SlotClassNames<PromptListboxSlots> = {\n  root: 'fai-PromptListbox',\n};\n\n/**\n * Styles for the root slot\n */\nconst useStyles = makeStyles({\n  listbox: {\n    boxShadow: tokens.shadow16,\n    borderRadius: tokens.borderRadiusMedium,\n    maxHeight: '80vh',\n    boxSizing: 'border-box',\n  },\n\n  listboxCollapsed: {\n    display: 'none',\n  },\n\n  // When rendering inline, the popupSurface will be rendered under relatively positioned elements such as Input.\n  // This is due to the surface being positioned as absolute, therefore zIndex: 1 ensures that won't happen.\n  inlineListbox: {\n    zIndex: 1,\n  },\n});\n\n/**\n * Apply styling to the PromptListbox slots based on the state\n */\nexport const usePromptListboxStyles_unstable = (state: PromptListboxState): PromptListboxState => {\n  'use no memo';\n\n  const styles = useStyles();\n  state.root.className = mergeClasses(\n    promptListboxClassNames.root,\n    styles.listbox,\n    state.inlinePopup && styles.inlineListbox,\n    !state.open && styles.listboxCollapsed,\n    state.root.className,\n  );\n\n  return state;\n};\n"],"names":["promptListboxClassNames","root","listbox","__styles","boxShadow","borderRadius","maxHeight","boxSizing","Btl43ni","listboxCollapsed","display","Bxyxcbc","B7ck84d","zIndex","inlineListbox","Bj3rh1h","p","state","mergeClasses","styles","inlinePopup"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";;;;;;;;;;;IAIaA,uBAAAA;eAAAA;;;;;;iCAJ4B;AAIlC,MAAMA,0BAA8D;UACzEC;AACF;AAEA;;CAEC,SAECC,YAASC,IAAAA,yBAAA,EAAA;aACPC;gBACAC;iBACAC;iBACAC;QACFC,SAAA;QAEAC,SAAAA;gBACEC;QACFC,SAAA;QAEAC,SAAA;;sBAEe;gBACbC;;IAEJC,eAAA;QAEAC,SAAA;;GAEC;OAEC;QAAA;QAAA;YAAA;YAAA;gBAEAC,GAAA,CAAA;;SACAC;QAAAA;QAAuBC;QAErBC;QACMC;KAAsBN"}

package/lib-commonjs/components/PromptOption/usePromptOption.js

@@ -12,7 +12,6 @@ const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildc
 const _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
 const _reactcomponents = require("@fluentui/react-components");
 const _reactcombobox = require("@fluentui/react-combobox");
-const _reactaria = require("@fluentui/react-aria");
 const usePromptOption_unstable = (props, ref)=>{
     const { children, disabled, text, value } = props;
     const optionRef = _react.useRef(null);
@@ -33,7 +32,6 @@ const usePromptOption_unstable = (props, ref)=>{
         optionValue
     ]);
     // context values
-    const { controller: activeDescendantController } = (0, _reactaria.useActiveDescendantContext)();
     const registerOption = (0, _reactcombobox.useListboxContext_unstable)((ctx)=>ctx.registerOption);
     const selected = (0, _reactcombobox.useListboxContext_unstable)((ctx)=>{
         const selectedOptions = ctx.selectedOptions;
@@ -47,7 +45,6 @@ const usePromptOption_unstable = (props, ref)=>{
             event.preventDefault();
             return;
         }
-        activeDescendantController.focus(id);
         // handle selection change
         selectOption(event, optionData);
         onOptionClick(event);

package/lib-commonjs/components/PromptOption/usePromptOption.js.map

@@ -1 +1 @@
-{"version":3,"sources":["usePromptOption.tsx"],"sourcesContent":["import * as React from 'react';\nimport { getIntrinsicElementProps, slot, useId, useMergedRefs } from '@fluentui/react-components';\nimport { useListboxContext_unstable } from '@fluentui/react-combobox';\nimport { useActiveDescendantContext } from '@fluentui/react-aria';\nimport type { PromptOptionProps, PromptOptionState } from './PromptOption.types';\nimport type { OptionValue } from '../utils/OptionCollection.types';\n\n// If you add JSX to this file, be sure to change the file type to .tsx\n\n/**\n * Create the state required to render PromptOption.\n *\n * The returned state can be modified with hooks such as usePromptOptionStyles_unstable,\n * before being passed to renderPromptOption_unstable.\n *\n * @param props - props from this instance of PromptOption\n * @param ref - reference to root HTMLElement of PromptOption\n */\nexport const usePromptOption_unstable = (\n  props: PromptOptionProps,\n  ref: React.Ref<HTMLDivElement>,\n): PromptOptionState => {\n  const { children, disabled, text, value } = props;\n  const optionRef = React.useRef<HTMLDivElement>(null);\n  const optionText = getTextString(text, children);\n  const optionValue = value ?? optionText;\n\n  // use the id if provided, otherwise use a generated id\n  const id = useId('fluent-option', props.id);\n\n  // data used for context registration & events\n  const optionData = React.useMemo<OptionValue>(\n    () => ({ id, disabled, text: optionText, value: optionValue }),\n    [id, disabled, optionText, optionValue],\n  );\n\n  // context values\n  const { controller: activeDescendantController } = useActiveDescendantContext();\n  const registerOption = useListboxContext_unstable(ctx => ctx.registerOption);\n  const selected = useListboxContext_unstable(ctx => {\n    const selectedOptions = ctx.selectedOptions;\n\n    return optionValue !== undefined && selectedOptions.find(o => o === optionValue) !== undefined;\n  });\n  const selectOption = useListboxContext_unstable(ctx => ctx.selectOption);\n  const onOptionClick = useListboxContext_unstable(ctx => ctx.onOptionClick);\n\n  const onClick = (event: React.MouseEvent<HTMLDivElement>) => {\n    if (disabled) {\n      event.preventDefault();\n      return;\n    }\n\n    activeDescendantController.focus(id);\n\n    // handle selection change\n    selectOption(event, optionData);\n\n    onOptionClick(event);\n    props.onClick?.(event);\n  };\n\n  // register option data with context\n  React.useEffect(() => {\n    if (id && optionRef.current) {\n      return registerOption(optionData, optionRef.current);\n    }\n  }, [id, optionData, registerOption]);\n\n  return {\n    components: {\n      root: 'div',\n    },\n    root: slot.always(\n      getIntrinsicElementProps('div', {\n        ref: useMergedRefs(ref, optionRef),\n        'aria-disabled': disabled ? true : undefined,\n        id,\n        role: 'menuitem',\n        ...props,\n        onClick,\n      }),\n      { elementType: 'div' },\n    ),\n    disabled,\n    selected,\n  };\n};\n\nfunction getTextString(text: string | undefined, children: React.ReactNode) {\n  if (text !== undefined) {\n    return text;\n  }\n\n  let textString = '';\n  let hasNonStringChild = false;\n  React.Children.forEach(children, child => {\n    if (typeof child === 'string') {\n      textString += child;\n    } else {\n      hasNonStringChild = true;\n    }\n  });\n\n  // warn if an Option has non-string children and no text prop\n  if (hasNonStringChild) {\n    // eslint-disable-next-line no-console\n    console.warn('Provide a `text` prop to Option components when they contain non-string children.');\n  }\n\n  return textString;\n}\n"],"names":["children","value","props","optionText","disabled","optionValue","text","optionRef","optionData","React","useMemo","id","controller","selected","useListboxContext_unstable","ctx","registerOption","selectedOptions","find","selectOption","onOptionClick","undefined","preventDefault","activeDescendantController","event","onClick","_props_onClick","call","useEffect","current","components","slot","always","getIntrinsicElementProps","root","ref","useMergedRefs","role","getTextString","textString","hasNonStringChild","child","Children","forEach","warn"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";;;;+BAsBUA;;;eAAAA;;;;iEAtBa;iCAC8C;+BAC1B;2BACA;AAmBzC,MAAQA,2BAA0BC,CAAAA,OAAUC;UAC5C,EACAF,QAAMG,EACNC,QAAMC,EAENC,IAAA,EACAL,KAAA,KAEAC;UACAK,YAAMC,OAAaC,MAAMC,CAAAA;uBACdC,cAAAA,MAAAA;wBAAIP,UAAAA,QAAAA,UAAAA,KAAAA,IAAAA,QAAAA;2DAAgBD;eAAYF,IAAAA,sBAAAA,EAAOI,iBAAAA,MAAAA,EAAAA;kDAChD;UAACM,aAAAA,OAAAA,OAAAA,CAAAA,IAAAA,CAAAA;;;kBAA0BN;mBAAYA;YAGzC;QAAAM;QAAAP;QAAiBD;QAAAE;KAAA;qBACTO;UACR,EACAA,YAAMC,0BAAWC,8CACSC;UAExBC,iBAAOX,IAAAA,yCAA6BY,EAAAA,CAAAA,MAAAA,IAAgBC,cAAgBb;UACtEQ,WAAAC,IAAAA,yCAAA,EAAAC,CAAAA;QACA,MAAMI,kBAAeL,IAAAA,eAAAA;QACrB,OAAMM,gBAAgBN,aAAAA,gBAA2BC,IAAOA,CAAAA,CAAAA,IAAIK,MAAAA,iBAAaC;;yBAcvEnB,IAAAA,yCAAAA,EAAAA,CAAAA,MAAAA,IAAAA,YAAAA;UAXAkB,gBAAcN,IAAAA,yCAAA,EAAAC,CAAAA,MAAAA,IAAAK,aAAA;oBACNE,CAAAA;;YAERlB,UAAA;kBAEAmB,cAAAA;;;mCAKcC,KAAAA,CAAAA;kCACdtB;QACFiB,aAAAK,OAAAhB;QAEAY,cAAAI;QACAf,CAAAA,iBAAgBP,MAAAuB,OAAA,MAAA,QAAAC,mBAAA,KAAA,IAAA,KAAA,IAAAA,eAAAC,IAAA,CAAAzB,OAAAsB;;wCAEUhB;WACxBoB,SAAA,CAAA;QACF,IAAGjB,MAAAJ,UAAAsB,OAAA,EAAA;mBAAClB,eAAAA,YAAAA,UAAAA,OAAAA;;;;QAAgBK;QAAAA;KAAAA;WAAe;QAEnCc,YAAO;kBACLA;;cAEAC,qBAAA,CAAAC,MAAA,CAAAC,IAAAA,yCAAA,EAAA,OAAA;iBACAC,IAAAA,8BAAWF,EAAMG,KACfF;6BACOG,WAAcD,OAAK5B;;kBAExBI;oBACA0B;;;yBAIF;;;;;;AAKN,SAAEC,cAAAhC,IAAA,EAAAN,QAAA;IAEF,IAAAM,SAASgC,WAAchC;QACrB,OAAIA;;QAEJiC,aAAA;QAEAC,oBAAiB;WACbA,QAAAA,CAAAA,OAAAA,CAAAA,UAAoBC,CAAAA;QACxBhC,IAAAA,OAAMiC,UAASC,UAAQ3C;0BACVyC;;gCAEJ;;;iEAGT;QAEAD,mBAAA;QACA,sCAAuB;gBACrBI,IAAA,CAAA;;WAEFL;EAGF,2CAAA"}
+{"version":3,"sources":["usePromptOption.tsx"],"sourcesContent":["import * as React from 'react';\nimport { getIntrinsicElementProps, slot, useId, useMergedRefs } from '@fluentui/react-components';\nimport { useListboxContext_unstable } from '@fluentui/react-combobox';\nimport type { PromptOptionProps, PromptOptionState } from './PromptOption.types';\nimport type { OptionValue } from '../utils/OptionCollection.types';\n\n// If you add JSX to this file, be sure to change the file type to .tsx\n\n/**\n * Create the state required to render PromptOption.\n *\n * The returned state can be modified with hooks such as usePromptOptionStyles_unstable,\n * before being passed to renderPromptOption_unstable.\n *\n * @param props - props from this instance of PromptOption\n * @param ref - reference to root HTMLElement of PromptOption\n */\nexport const usePromptOption_unstable = (\n  props: PromptOptionProps,\n  ref: React.Ref<HTMLDivElement>,\n): PromptOptionState => {\n  const { children, disabled, text, value } = props;\n  const optionRef = React.useRef<HTMLDivElement>(null);\n  const optionText = getTextString(text, children);\n  const optionValue = value ?? optionText;\n\n  // use the id if provided, otherwise use a generated id\n  const id = useId('fluent-option', props.id);\n\n  // data used for context registration & events\n  const optionData = React.useMemo<OptionValue>(\n    () => ({ id, disabled, text: optionText, value: optionValue }),\n    [id, disabled, optionText, optionValue],\n  );\n\n  // context values\n  const registerOption = useListboxContext_unstable(ctx => ctx.registerOption);\n  const selected = useListboxContext_unstable(ctx => {\n    const selectedOptions = ctx.selectedOptions;\n\n    return optionValue !== undefined && selectedOptions.find(o => o === optionValue) !== undefined;\n  });\n  const selectOption = useListboxContext_unstable(ctx => ctx.selectOption);\n  const onOptionClick = useListboxContext_unstable(ctx => ctx.onOptionClick);\n\n  const onClick = (event: React.MouseEvent<HTMLDivElement>) => {\n    if (disabled) {\n      event.preventDefault();\n      return;\n    }\n\n    // handle selection change\n    selectOption(event, optionData);\n\n    onOptionClick(event);\n    props.onClick?.(event);\n  };\n\n  // register option data with context\n  React.useEffect(() => {\n    if (id && optionRef.current) {\n      return registerOption(optionData, optionRef.current);\n    }\n  }, [id, optionData, registerOption]);\n\n  return {\n    components: {\n      root: 'div',\n    },\n    root: slot.always(\n      getIntrinsicElementProps('div', {\n        ref: useMergedRefs(ref, optionRef),\n        'aria-disabled': disabled ? true : undefined,\n        id,\n        role: 'menuitem',\n        ...props,\n        onClick,\n      }),\n      { elementType: 'div' },\n    ),\n    disabled,\n    selected,\n  };\n};\n\nfunction getTextString(text: string | undefined, children: React.ReactNode) {\n  if (text !== undefined) {\n    return text;\n  }\n\n  let textString = '';\n  let hasNonStringChild = false;\n  React.Children.forEach(children, child => {\n    if (typeof child === 'string') {\n      textString += child;\n    } else {\n      hasNonStringChild = true;\n    }\n  });\n\n  // warn if an Option has non-string children and no text prop\n  if (hasNonStringChild) {\n    // eslint-disable-next-line no-console\n    console.warn('Provide a `text` prop to Option components when they contain non-string children.');\n  }\n\n  return textString;\n}\n"],"names":["children","value","props","optionText","disabled","optionValue","text","optionRef","optionData","React","useMemo","id","registerOption","useListboxContext_unstable","ctx","selected","selectedOptions","undefined","find","o","selectOption","onOptionClick","event","_props_onClick","preventDefault","onClick","call","useEffect","current","root","components","getIntrinsicElementProps","ref","textString","Children","forEach","child","hasNonStringChild","console","warn"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":";;;;+BAqBUA;;;eAAAA;;;;iEArBa;iCAC8C;+BAC1B;AAmBzC,MAAQA,2BAA0BC,CAAAA,OAAUC;UAC5C,EACAF,QAAMG,EACNC,QAAMC,EAENC,IAAA,EACAL,KAAA,KAEAC;UACAK,YAAMC,OAAaC,MAAMC,CAAAA;uBACdC,cAAAA,MAAAA;wBAAIP,UAAAA,QAAAA,UAAAA,KAAAA,IAAAA,QAAAA;2DAAgBD;eAAYF,IAAAA,sBAAAA,EAAOI,iBAAAA,MAAAA,EAAAA;kDAChD;UAACM,aAAAA,OAAAA,OAAAA,CAAAA,IAAAA,CAAAA;;;kBAA0BN;mBAAYA;YAGzC;QAAAM;QAAAP;QAAiBD;QAAAE;KAAA;qBACXO;UACNA,iBAAiBC,IAAAA,yCAA2BC,EAAAA,CAAAA,MAAAA,IAAAA,cAAAA;UAC1CC,WAAMC,IAAAA,yCAAsBA,EAAAA,CAAAA;cAE5BA,kBAAOX,IAAgBY,eAAaD;QACtC,OAAAX,gBAAAY,aAAAD,gBAAAE,IAAA,CAAAC,CAAAA,IAAAA,MAAAd,iBAAAY;;UAEAG,eAAMC,IAAAA,yCAAgBR,EAAAA,CAAAA,MAA2BC,IAAOA,YAAIO;UAE5DA,gBAAiBC,IAAAA,yCAAAA,EAAAA,CAAAA,MAAAA,IAAAA,aAAAA;oBAUfpB,CAAAA;YATAqB;sBACQC;kBACNA,cAAA;;;kCAIkBhB;qBAEpBa,OAAcC;sBACdpB;QACFqB,CAAAA,iBAAArB,MAAAuB,OAAA,MAAA,QAAAF,mBAAA,KAAA,IAAA,KAAA,IAAAA,eAAAG,IAAA,CAAAxB,OAAAoB;;wCAGgB;WACdK,SAAIhB,CAAMJ;kBACRA,UAAOK,OAAAA,EAAAA;mBACTA,eAAAJ,YAAAD,UAAAqB,OAAA;QACF;;;QAAIjB;QAAAA;KAAAA;WAAIH;oBAAYI;YAAeiB,MAAA;QAEnC;cACEC,qBAAAA,CAAAA,MAAY,CAAAC,IAAAA,yCAAA,EAAA,OAAA;mDACJ,EAAAC,KAAAzB;6BACRH,WAAA,OAAAa;;kBAGIe;oBACA;;;yBAGG9B;;;;;;SAMPa,cAAAA,IAAAA,EAAAA,QAAAA;QACFT,SAAAW,WAAA;QACA,OAAAX;IAEF;QACE2B,aAAahB;4BACJX;WACT4B,QAAA,CAAAC,OAAA,CAAAnC,UAAAoC,CAAAA;QAEA,IAAIH,OAAAA,UAAa,UAAA;YACjBA,cAAII;QACJ5B,OAAMyB;gCACOE;;;iEAGW;2BACtB;QACF,sCAAA;QAEAE,QAAAC,IAAA,CAAA;;WAEEN;6CAEF"}