@fluentui/react-tree 9.16.10 → 9.17.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +11 -2
- package/dist/index.d.cts +83 -6
- package/dist/index.d.ts +83 -6
- package/lib/Tree.js +1 -1
- package/lib/Tree.js.map +1 -1
- package/lib/TreeItemLayout.js +1 -1
- package/lib/TreeItemLayout.js.map +1 -1
- package/lib/components/FlatTree/useFlatTree.js +28 -3
- package/lib/components/FlatTree/useFlatTree.js.map +1 -1
- package/lib/components/Tree/Tree.types.js +1 -1
- package/lib/components/Tree/Tree.types.js.map +1 -1
- package/lib/components/Tree/index.js +1 -1
- package/lib/components/Tree/index.js.map +1 -1
- package/lib/components/Tree/renderTree.js +6 -2
- package/lib/components/Tree/renderTree.js.map +1 -1
- package/lib/components/Tree/useTree.js +75 -6
- package/lib/components/Tree/useTree.js.map +1 -1
- package/lib/components/Tree/useTreeContextValues.js +4 -1
- package/lib/components/Tree/useTreeContextValues.js.map +1 -1
- package/lib/components/TreeItemLayout/TreeItemLayout.types.js +1 -1
- package/lib/components/TreeItemLayout/TreeItemLayout.types.js.map +1 -1
- package/lib/components/TreeItemLayout/index.js +1 -1
- package/lib/components/TreeItemLayout/index.js.map +1 -1
- package/lib/components/TreeItemLayout/renderTreeItemLayout.js +13 -7
- package/lib/components/TreeItemLayout/renderTreeItemLayout.js.map +1 -1
- package/lib/components/TreeItemLayout/useTreeItemLayout.js +201 -30
- package/lib/components/TreeItemLayout/useTreeItemLayout.js.map +1 -1
- package/lib/hooks/useFlatTreeNavigation.js +3 -4
- package/lib/hooks/useFlatTreeNavigation.js.map +1 -1
- package/lib/hooks/useRootTree.js +3 -8
- package/lib/hooks/useRootTree.js.map +1 -1
- package/lib/hooks/useRovingTabIndexBase.js +108 -0
- package/lib/hooks/useRovingTabIndexBase.js.map +1 -0
- package/lib/hooks/useRovingTabIndexes.js +2 -61
- package/lib/hooks/useRovingTabIndexes.js.map +1 -1
- package/lib/hooks/useSubtree.js +1 -11
- package/lib/hooks/useSubtree.js.map +1 -1
- package/lib/hooks/useTreeNavigation.js +6 -84
- package/lib/hooks/useTreeNavigation.js.map +1 -1
- package/lib/hooks/useTreeNavigationBase.js +131 -0
- package/lib/hooks/useTreeNavigationBase.js.map +1 -0
- package/lib/index.js +2 -2
- package/lib/index.js.map +1 -1
- package/lib/utils/queryTreeItemActions.js +29 -0
- package/lib/utils/queryTreeItemActions.js.map +1 -0
- package/lib-commonjs/Tree.cjs +3 -0
- package/lib-commonjs/Tree.cjs.map +1 -1
- package/lib-commonjs/TreeItemLayout.cjs +3 -0
- package/lib-commonjs/TreeItemLayout.cjs.map +1 -1
- package/lib-commonjs/components/FlatTree/useFlatTree.cjs +28 -3
- package/lib-commonjs/components/FlatTree/useFlatTree.cjs.map +1 -1
- package/lib-commonjs/components/Tree/Tree.types.cjs +1 -1
- package/lib-commonjs/components/Tree/Tree.types.cjs.map +1 -1
- package/lib-commonjs/components/Tree/index.cjs +3 -0
- package/lib-commonjs/components/Tree/index.cjs.map +1 -1
- package/lib-commonjs/components/Tree/renderTree.cjs +1 -1
- package/lib-commonjs/components/Tree/renderTree.cjs.map +1 -1
- package/lib-commonjs/components/Tree/useTree.cjs +68 -8
- package/lib-commonjs/components/Tree/useTree.cjs.map +1 -1
- package/lib-commonjs/components/Tree/useTreeContextValues.cjs +4 -1
- package/lib-commonjs/components/Tree/useTreeContextValues.cjs.map +1 -1
- package/lib-commonjs/components/TreeItemLayout/TreeItemLayout.types.cjs +1 -1
- package/lib-commonjs/components/TreeItemLayout/TreeItemLayout.types.cjs.map +1 -1
- package/lib-commonjs/components/TreeItemLayout/index.cjs +3 -0
- package/lib-commonjs/components/TreeItemLayout/index.cjs.map +1 -1
- package/lib-commonjs/components/TreeItemLayout/renderTreeItemLayout.cjs +9 -6
- package/lib-commonjs/components/TreeItemLayout/renderTreeItemLayout.cjs.map +1 -1
- package/lib-commonjs/components/TreeItemLayout/useTreeItemLayout.cjs +200 -32
- package/lib-commonjs/components/TreeItemLayout/useTreeItemLayout.cjs.map +1 -1
- package/lib-commonjs/hooks/useFlatTreeNavigation.cjs +3 -4
- package/lib-commonjs/hooks/useFlatTreeNavigation.cjs.map +1 -1
- package/lib-commonjs/hooks/useRootTree.cjs +3 -8
- package/lib-commonjs/hooks/useRootTree.cjs.map +1 -1
- package/lib-commonjs/hooks/useRovingTabIndexBase.cjs +116 -0
- package/lib-commonjs/hooks/useRovingTabIndexBase.cjs.map +1 -0
- package/lib-commonjs/hooks/useRovingTabIndexes.cjs +2 -62
- package/lib-commonjs/hooks/useRovingTabIndexes.cjs.map +1 -1
- package/lib-commonjs/hooks/useSubtree.cjs +1 -11
- package/lib-commonjs/hooks/useSubtree.cjs.map +1 -1
- package/lib-commonjs/hooks/useTreeNavigation.cjs +5 -84
- package/lib-commonjs/hooks/useTreeNavigation.cjs.map +1 -1
- package/lib-commonjs/hooks/useTreeNavigationBase.cjs +140 -0
- package/lib-commonjs/hooks/useTreeNavigationBase.cjs.map +1 -0
- package/lib-commonjs/index.cjs +6 -0
- package/lib-commonjs/index.cjs.map +1 -1
- package/lib-commonjs/utils/queryTreeItemActions.cjs +38 -0
- package/lib-commonjs/utils/queryTreeItemActions.cjs.map +1 -0
- package/package.json +1 -1
|
@@ -7,7 +7,7 @@ import { dataTreeItemValueAttrName } from "../utils/getTreeItemValueFromElement.
|
|
|
7
7
|
import * as React from "react";
|
|
8
8
|
import { useHTMLElementWalkerRef } from "./useHTMLElementWalkerRef.js";
|
|
9
9
|
import { useFocusFinders } from "@fluentui/react-tabster";
|
|
10
|
-
import {
|
|
10
|
+
import { queryTreeItemActions } from "../utils/queryTreeItemActions.js";
|
|
11
11
|
export function useFlatTreeNavigation(navigationMode = 'tree') {
|
|
12
12
|
'use no memo'; // justified: compiler would optimize useFlatTreeNavigation — manual opt-out to preserve runtime behavior
|
|
13
13
|
const { walkerRef, rootRef: walkerRootRef } = useHTMLElementWalkerRef();
|
|
@@ -33,7 +33,7 @@ export function useFlatTreeNavigation(navigationMode = 'tree') {
|
|
|
33
33
|
return nextTypeAheadElement(walkerRef.current, data.event.key);
|
|
34
34
|
case treeDataTypes.ArrowLeft:
|
|
35
35
|
{
|
|
36
|
-
const actions =
|
|
36
|
+
const actions = queryTreeItemActions(data.target);
|
|
37
37
|
if (navigationMode === 'treegrid' && (actions === null || actions === void 0 ? void 0 : actions.contains(data.target.ownerDocument.activeElement))) {
|
|
38
38
|
return data.target;
|
|
39
39
|
}
|
|
@@ -49,7 +49,7 @@ No parent element found for the current element:`, data.target);
|
|
|
49
49
|
case treeDataTypes.ArrowRight:
|
|
50
50
|
{
|
|
51
51
|
if (navigationMode === 'treegrid') {
|
|
52
|
-
const actions =
|
|
52
|
+
const actions = queryTreeItemActions(data.target);
|
|
53
53
|
if (actions) {
|
|
54
54
|
var _findFirstFocusable;
|
|
55
55
|
(_findFirstFocusable = findFirstFocusable(actions)) === null || _findFirstFocusable === void 0 ? void 0 : _findFirstFocusable.focus();
|
|
@@ -113,4 +113,3 @@ function parentElement(parentValue, treeWalker) {
|
|
|
113
113
|
}
|
|
114
114
|
return treeWalker.root.querySelector(`[${dataTreeItemValueAttrName}="${parentValue}"]`);
|
|
115
115
|
}
|
|
116
|
-
const queryActions = (target)=>target.querySelector(`:scope > .${treeItemLayoutClassNames.root} > .${treeItemLayoutClassNames.actions}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/hooks/useFlatTreeNavigation.ts"],"sourcesContent":["'use client';\n\nimport { useEventCallback, useMergedRefs } from '@fluentui/react-utilities';\nimport type { TreeNavigationData_unstable } from '../Tree';\nimport { nextTypeAheadElement } from '../utils/nextTypeAheadElement';\nimport { treeDataTypes } from '../utils/tokens';\nimport { useRovingTabIndex } from './useRovingTabIndexes';\nimport type { HTMLElementWalker } from '../utils/createHTMLElementWalker';\nimport type { TreeItemValue } from '../TreeItem';\nimport { dataTreeItemValueAttrName } from '../utils/getTreeItemValueFromElement';\nimport * as React from 'react';\nimport { useHTMLElementWalkerRef } from './useHTMLElementWalkerRef';\nimport type { TreeNavigationMode } from '../components/Tree/Tree.types';\nimport { useFocusFinders } from '@fluentui/react-tabster';\nimport {
|
|
1
|
+
{"version":3,"sources":["../../src/hooks/useFlatTreeNavigation.ts"],"sourcesContent":["'use client';\n\nimport { useEventCallback, useMergedRefs } from '@fluentui/react-utilities';\nimport type { TreeNavigationData_unstable } from '../Tree';\nimport { nextTypeAheadElement } from '../utils/nextTypeAheadElement';\nimport { treeDataTypes } from '../utils/tokens';\nimport { useRovingTabIndex } from './useRovingTabIndexes';\nimport type { HTMLElementWalker } from '../utils/createHTMLElementWalker';\nimport type { TreeItemValue } from '../TreeItem';\nimport { dataTreeItemValueAttrName } from '../utils/getTreeItemValueFromElement';\nimport * as React from 'react';\nimport { useHTMLElementWalkerRef } from './useHTMLElementWalkerRef';\nimport type { TreeNavigationMode } from '../components/Tree/Tree.types';\nimport { useFocusFinders } from '@fluentui/react-tabster';\nimport { queryTreeItemActions } from '../utils/queryTreeItemActions';\n\nexport function useFlatTreeNavigation(navigationMode: TreeNavigationMode = 'tree'): {\n navigate: (data: TreeNavigationData_unstable) => void;\n rootRef: React.RefCallback<HTMLElement>;\n forceUpdateRovingTabIndex: () => void;\n} {\n 'use no memo'; // justified: compiler would optimize useFlatTreeNavigation — manual opt-out to preserve runtime behavior\n\n const { walkerRef, rootRef: walkerRootRef } = useHTMLElementWalkerRef();\n const { rove, forceUpdate: forceUpdateRovingTabIndex, initialize: initializeRovingTabIndex } = useRovingTabIndex();\n const { findFirstFocusable } = useFocusFinders();\n\n const rootRefCallback: React.RefCallback<HTMLElement> = React.useCallback(\n root => {\n if (walkerRef.current && root) {\n initializeRovingTabIndex(walkerRef.current);\n }\n },\n [initializeRovingTabIndex, walkerRef],\n );\n\n function getNextElement(data: TreeNavigationData_unstable) {\n if (!walkerRef.current) {\n return null;\n }\n switch (data.type) {\n case treeDataTypes.Click:\n return data.target;\n case treeDataTypes.TypeAhead:\n walkerRef.current.currentElement = data.target;\n return nextTypeAheadElement(walkerRef.current, data.event.key);\n case treeDataTypes.ArrowLeft: {\n const actions = queryTreeItemActions(data.target);\n if (navigationMode === 'treegrid' && actions?.contains(data.target.ownerDocument.activeElement)) {\n return data.target;\n }\n const nextElement = parentElement(data.parentValue, walkerRef.current);\n if (!nextElement && process.env.NODE_ENV !== 'production') {\n // eslint-disable-next-line no-console\n console.warn(\n /* #__DE-INDENT__ */ `\n @fluentui/react-tree [useFlatTreeNavigation]:\n \\'ArrowLeft\\' navigation was not possible.\n No parent element found for the current element:\n `,\n data.target,\n );\n }\n return nextElement;\n }\n case treeDataTypes.ArrowRight: {\n if (navigationMode === 'treegrid') {\n const actions = queryTreeItemActions(data.target);\n if (actions) {\n findFirstFocusable(actions)?.focus();\n }\n return null;\n }\n walkerRef.current.currentElement = data.target;\n const nextElement = firstChild(data.target, walkerRef.current);\n if (!nextElement && process.env.NODE_ENV !== 'production') {\n const ariaLevel = Number(data.target.getAttribute('aria-level'));\n // eslint-disable-next-line no-console\n console.warn(\n /* #__DE-INDENT__ */ `\n @fluentui/react-tree [useFlatTreeNavigation]:\n \\'ArrowRight\\' navigation was not possible.\n No element with \"aria-posinset=1\" and \"aria-level=${ariaLevel + 1}\"\n was found after the current element!\n `,\n data.target,\n );\n }\n return nextElement;\n }\n case treeDataTypes.End:\n walkerRef.current.currentElement = walkerRef.current.root;\n return walkerRef.current.lastChild();\n case treeDataTypes.Home:\n walkerRef.current.currentElement = walkerRef.current.root;\n return walkerRef.current.firstChild();\n case treeDataTypes.ArrowDown:\n walkerRef.current.currentElement = data.target;\n return walkerRef.current.nextElement();\n case treeDataTypes.ArrowUp:\n walkerRef.current.currentElement = data.target;\n return walkerRef.current.previousElement();\n }\n }\n const navigate = useEventCallback((data: TreeNavigationData_unstable) => {\n const nextElement = getNextElement(data);\n if (nextElement) {\n rove(nextElement);\n }\n });\n return {\n navigate,\n rootRef: useMergedRefs<HTMLElement>(walkerRootRef, rootRefCallback),\n forceUpdateRovingTabIndex,\n } as const;\n}\n\nfunction firstChild(target: HTMLElement, treeWalker: HTMLElementWalker): HTMLElement | null {\n const nextElement = treeWalker.nextElement();\n if (!nextElement) {\n return null;\n }\n const nextElementAriaPosInSet = nextElement.getAttribute('aria-posinset');\n const nextElementAriaLevel = nextElement.getAttribute('aria-level');\n const targetAriaLevel = target.getAttribute('aria-level');\n if (nextElementAriaPosInSet === '1' && Number(nextElementAriaLevel) === Number(targetAriaLevel) + 1) {\n return nextElement;\n }\n return null;\n}\n\nfunction parentElement(parentValue: TreeItemValue | undefined, treeWalker: HTMLElementWalker) {\n if (parentValue === undefined) {\n return null;\n }\n return treeWalker.root.querySelector<HTMLElement>(`[${dataTreeItemValueAttrName}=\"${parentValue}\"]`);\n}\n"],"names":["useEventCallback","useMergedRefs","nextTypeAheadElement","treeDataTypes","useRovingTabIndex","dataTreeItemValueAttrName","React","useHTMLElementWalkerRef","useFocusFinders","queryTreeItemActions","useFlatTreeNavigation","navigationMode","walkerRef","rootRef","walkerRootRef","rove","forceUpdate","forceUpdateRovingTabIndex","initialize","initializeRovingTabIndex","findFirstFocusable","rootRefCallback","useCallback","root","current","getNextElement","data","type","Click","target","TypeAhead","currentElement","event","key","ArrowLeft","actions","contains","ownerDocument","activeElement","nextElement","parentElement","parentValue","process","env","NODE_ENV","console","warn","ArrowRight","focus","firstChild","ariaLevel","Number","getAttribute","End","lastChild","Home","ArrowDown","ArrowUp","previousElement","navigate","treeWalker","nextElementAriaPosInSet","nextElementAriaLevel","targetAriaLevel","undefined","querySelector"],"mappings":"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"}
|
package/lib/hooks/useRootTree.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
'use client';
|
|
2
2
|
import { getIntrinsicElementProps, useEventCallback, slot } from "@fluentui/react-utilities";
|
|
3
3
|
import * as React from "react";
|
|
4
|
-
import { Collapse } from "@fluentui/react-motion-components-preview";
|
|
5
4
|
import { createCheckedItems } from "../utils/createCheckedItems.js";
|
|
6
5
|
import { treeDataTypes } from "../utils/tokens.js";
|
|
7
6
|
import { createNextOpenItems } from "./useControllableOpenItems.js";
|
|
@@ -15,7 +14,7 @@ import { ImmutableMap } from "../utils/ImmutableMap.js";
|
|
|
15
14
|
*/ export function useRootTree(props, ref) {
|
|
16
15
|
var _props_navigationMode;
|
|
17
16
|
warnIfNoProperPropsRootTree(props);
|
|
18
|
-
const {
|
|
17
|
+
const { selectionMode = 'none' } = props;
|
|
19
18
|
const openItems = React.useMemo(()=>ImmutableSet.from(props.openItems), [
|
|
20
19
|
props.openItems
|
|
21
20
|
]);
|
|
@@ -72,15 +71,12 @@ import { ImmutableMap } from "../utils/ImmutableMap.js";
|
|
|
72
71
|
});
|
|
73
72
|
return {
|
|
74
73
|
components: {
|
|
75
|
-
root: 'div'
|
|
76
|
-
collapseMotion: Collapse
|
|
74
|
+
root: 'div'
|
|
77
75
|
},
|
|
78
76
|
contextType: 'root',
|
|
79
77
|
selectionMode,
|
|
80
78
|
navigationMode: (_props_navigationMode = props.navigationMode) !== null && _props_navigationMode !== void 0 ? _props_navigationMode : 'tree',
|
|
81
79
|
open: true,
|
|
82
|
-
appearance,
|
|
83
|
-
size,
|
|
84
80
|
level: 1,
|
|
85
81
|
openItems,
|
|
86
82
|
checkedItems,
|
|
@@ -98,8 +94,7 @@ import { ImmutableMap } from "../utils/ImmutableMap.js";
|
|
|
98
94
|
...props
|
|
99
95
|
}), {
|
|
100
96
|
elementType: 'div'
|
|
101
|
-
})
|
|
102
|
-
collapseMotion: undefined
|
|
97
|
+
})
|
|
103
98
|
};
|
|
104
99
|
}
|
|
105
100
|
function warnIfNoProperPropsRootTree(props) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/hooks/useRootTree.ts"],"sourcesContent":["'use client';\n\nimport { getIntrinsicElementProps, useEventCallback, slot } from '@fluentui/react-utilities';\nimport type {
|
|
1
|
+
{"version":3,"sources":["../../src/hooks/useRootTree.ts"],"sourcesContent":["'use client';\n\nimport { getIntrinsicElementProps, useEventCallback, slot } from '@fluentui/react-utilities';\nimport type { TreeBaseProps, TreeBaseState, TreeCheckedChangeData } from '../components/Tree/Tree.types';\nimport * as React from 'react';\nimport type { TreeContextValue, TreeItemRequest } from '../contexts/treeContext';\nimport { createCheckedItems } from '../utils/createCheckedItems';\nimport { treeDataTypes } from '../utils/tokens';\nimport { createNextOpenItems } from './useControllableOpenItems';\nimport { ImmutableSet } from '../utils/ImmutableSet';\nimport { ImmutableMap } from '../utils/ImmutableMap';\n\n/**\n * Create the state required to render the root level tree.\n *\n * @param props - props from this instance of tree\n * @param ref - reference to root HTMLElement of tree\n */\nexport function useRootTree(\n props: TreeBaseProps,\n ref: React.Ref<HTMLElement>,\n): Omit<TreeBaseState & Omit<TreeContextValue, 'appearance' | 'size'>, 'treeType'> {\n warnIfNoProperPropsRootTree(props);\n\n const { selectionMode = 'none' } = props;\n\n const openItems = React.useMemo(() => ImmutableSet.from(props.openItems), [props.openItems]);\n const checkedItems = React.useMemo(() => createCheckedItems(props.checkedItems), [props.checkedItems]);\n\n const requestOpenChange = (request: Extract<TreeItemRequest, { requestType: 'open' }>) => {\n props.onOpenChange?.(request.event, {\n ...request,\n openItems: ImmutableSet.dangerouslyGetInternalSet(createNextOpenItems(request, openItems)),\n });\n };\n\n const requestCheckedChange = (request: Extract<TreeItemRequest, { requestType: 'selection' }>) => {\n if (selectionMode === 'none') {\n return;\n }\n props.onCheckedChange?.(request.event, {\n ...request,\n selectionMode,\n checkedItems: ImmutableMap.dangerouslyGetInternalMap(checkedItems),\n // Casting is required here due to selection | multiselection spreading the union problem\n } as TreeCheckedChangeData);\n };\n\n const requestNavigation = (request: Extract<TreeItemRequest, { requestType: 'navigate' }>) => {\n let isScrollPrevented = false;\n props.onNavigation?.(request.event, {\n ...request,\n preventScroll: () => {\n isScrollPrevented = true;\n },\n isScrollPrevented: () => isScrollPrevented,\n });\n switch (request.type) {\n case treeDataTypes.ArrowDown:\n case treeDataTypes.ArrowUp:\n case treeDataTypes.Home:\n case treeDataTypes.End:\n // stop the default behavior of the event\n // which is to scroll the page\n request.event.preventDefault();\n }\n };\n\n const requestTreeResponse = useEventCallback((request: TreeItemRequest) => {\n switch (request.requestType) {\n case 'navigate':\n return requestNavigation(request);\n case 'open':\n return requestOpenChange(request);\n case 'selection':\n return requestCheckedChange(request);\n }\n });\n\n return {\n components: {\n root: 'div',\n },\n contextType: 'root',\n selectionMode,\n navigationMode: props.navigationMode ?? 'tree',\n open: true,\n level: 1,\n openItems,\n checkedItems,\n requestTreeResponse,\n forceUpdateRovingTabIndex: () => {\n // noop\n },\n root: slot.always(\n getIntrinsicElementProps('div', {\n // FIXME:\n // `ref` is wrongly assigned to be `HTMLElement` instead of `HTMLDivElement`\n // but since it would be a breaking change to fix it, we are casting ref to it's proper type\n ref: ref as React.Ref<HTMLDivElement>,\n role: 'tree',\n 'aria-multiselectable': selectionMode === 'multiselect' ? true : undefined,\n ...props,\n }),\n { elementType: 'div' },\n ),\n };\n}\n\nfunction warnIfNoProperPropsRootTree(props: Pick<TreeBaseProps, 'aria-label' | 'aria-labelledby'>) {\n if (process.env.NODE_ENV === 'development') {\n if (!props['aria-label'] && !props['aria-labelledby']) {\n // eslint-disable-next-line no-console\n console.warn(/* #__DE-INDENT__ */ `\n @fluentui/react-tree [useRootTree]:\n Tree must have either a \\`aria-label\\` or \\`aria-labelledby\\` property defined\n `);\n }\n }\n}\n"],"names":["getIntrinsicElementProps","useEventCallback","slot","React","createCheckedItems","treeDataTypes","createNextOpenItems","ImmutableSet","ImmutableMap","useRootTree","props","ref","warnIfNoProperPropsRootTree","selectionMode","openItems","useMemo","from","checkedItems","requestOpenChange","request","onOpenChange","event","dangerouslyGetInternalSet","requestCheckedChange","onCheckedChange","dangerouslyGetInternalMap","requestNavigation","isScrollPrevented","onNavigation","preventScroll","type","ArrowDown","ArrowUp","Home","End","preventDefault","requestTreeResponse","requestType","components","root","contextType","navigationMode","open","level","forceUpdateRovingTabIndex","always","role","undefined","elementType","process","env","NODE_ENV","console","warn"],"mappings":"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"}
|
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
'use client';
|
|
2
|
+
import * as React from "react";
|
|
3
|
+
import { useFluent_unstable as useFluent } from "@fluentui/react-shared-contexts";
|
|
4
|
+
import { isHTMLElement } from "@fluentui/react-utilities";
|
|
5
|
+
const findTreeItemRoot = (element)=>{
|
|
6
|
+
let parent = element.parentElement;
|
|
7
|
+
while(parent && parent.getAttribute('role') !== 'tree'){
|
|
8
|
+
parent = parent.parentElement;
|
|
9
|
+
}
|
|
10
|
+
return parent;
|
|
11
|
+
};
|
|
12
|
+
/**
|
|
13
|
+
* Plain DOM implementation of `UseFocusedElementChange`, free of any focus management runtime.
|
|
14
|
+
*
|
|
15
|
+
* @internal
|
|
16
|
+
*/ export const useDOMFocusedElementChange = (callback)=>{
|
|
17
|
+
const { targetDocument } = useFluent();
|
|
18
|
+
const callbackRef = React.useRef(callback);
|
|
19
|
+
React.useEffect(()=>{
|
|
20
|
+
callbackRef.current = callback;
|
|
21
|
+
});
|
|
22
|
+
React.useEffect(()=>{
|
|
23
|
+
var _activeElement_shadowRoot;
|
|
24
|
+
if (!targetDocument) {
|
|
25
|
+
return;
|
|
26
|
+
}
|
|
27
|
+
const listener = (event)=>{
|
|
28
|
+
var _event_composedPath_;
|
|
29
|
+
// The target is retargeted to the shadow host when focus moves within a shadow root
|
|
30
|
+
const target = (_event_composedPath_ = event.composedPath()[0]) !== null && _event_composedPath_ !== void 0 ? _event_composedPath_ : event.target;
|
|
31
|
+
callbackRef.current(isHTMLElement(target) ? target : undefined);
|
|
32
|
+
};
|
|
33
|
+
// Capture phase, so that consumers stopping the propagation of focus events do not desync the roving tab index
|
|
34
|
+
targetDocument.addEventListener('focusin', listener, true);
|
|
35
|
+
// Focus may have moved before the listener was attached, e.g. from a parent layout effect
|
|
36
|
+
let activeElement = targetDocument.activeElement;
|
|
37
|
+
while(activeElement === null || activeElement === void 0 ? void 0 : (_activeElement_shadowRoot = activeElement.shadowRoot) === null || _activeElement_shadowRoot === void 0 ? void 0 : _activeElement_shadowRoot.activeElement){
|
|
38
|
+
activeElement = activeElement.shadowRoot.activeElement;
|
|
39
|
+
}
|
|
40
|
+
if (isHTMLElement(activeElement)) {
|
|
41
|
+
callbackRef.current(activeElement);
|
|
42
|
+
}
|
|
43
|
+
return ()=>targetDocument.removeEventListener('focusin', listener, true);
|
|
44
|
+
}, [
|
|
45
|
+
targetDocument
|
|
46
|
+
]);
|
|
47
|
+
};
|
|
48
|
+
/**
|
|
49
|
+
* https://www.w3.org/WAI/ARIA/apg/practices/keyboard-interface/#kbd_roving_tabindex
|
|
50
|
+
*
|
|
51
|
+
* The focused element tracking is provided by the caller, so that the roving tab index can be
|
|
52
|
+
* driven either by a focus management runtime or by plain DOM events.
|
|
53
|
+
*
|
|
54
|
+
* @internal
|
|
55
|
+
*/ export function useRovingTabIndexBase(useFocusedElementChange) {
|
|
56
|
+
const currentElementRef = React.useRef(null);
|
|
57
|
+
const walkerRef = React.useRef(null);
|
|
58
|
+
const { targetDocument } = useFluent();
|
|
59
|
+
// The callback only runs on focus changes, never during render.
|
|
60
|
+
// eslint-disable-next-line react-hooks/refs
|
|
61
|
+
useFocusedElementChange((element)=>{
|
|
62
|
+
if ((element === null || element === void 0 ? void 0 : element.getAttribute('role')) === 'treeitem' && walkerRef.current && walkerRef.current.root.contains(element)) {
|
|
63
|
+
const treeitemRoot = findTreeItemRoot(element);
|
|
64
|
+
if (walkerRef.current.root !== treeitemRoot) {
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
rove(element);
|
|
68
|
+
}
|
|
69
|
+
});
|
|
70
|
+
const initialize = React.useCallback((walker)=>{
|
|
71
|
+
walkerRef.current = walker;
|
|
72
|
+
walker.currentElement = walker.root;
|
|
73
|
+
let tabbableChild = walker.firstChild((element)=>element.tabIndex === 0 ? NodeFilter.FILTER_ACCEPT : NodeFilter.FILTER_SKIP);
|
|
74
|
+
walker.currentElement = walker.root;
|
|
75
|
+
tabbableChild !== null && tabbableChild !== void 0 ? tabbableChild : tabbableChild = walker.firstChild();
|
|
76
|
+
if (!tabbableChild) {
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
tabbableChild.tabIndex = 0;
|
|
80
|
+
currentElementRef.current = tabbableChild;
|
|
81
|
+
let nextElement = null;
|
|
82
|
+
while((nextElement = walker.nextElement()) && nextElement !== tabbableChild){
|
|
83
|
+
nextElement.tabIndex = -1;
|
|
84
|
+
}
|
|
85
|
+
}, []);
|
|
86
|
+
const rove = React.useCallback((nextElement, focusOptions)=>{
|
|
87
|
+
if (!currentElementRef.current) {
|
|
88
|
+
return;
|
|
89
|
+
}
|
|
90
|
+
currentElementRef.current.tabIndex = -1;
|
|
91
|
+
nextElement.tabIndex = 0;
|
|
92
|
+
nextElement.focus(focusOptions);
|
|
93
|
+
currentElementRef.current = nextElement;
|
|
94
|
+
}, []);
|
|
95
|
+
const forceUpdate = React.useCallback(()=>{
|
|
96
|
+
if ((currentElementRef.current === null || !(targetDocument === null || targetDocument === void 0 ? void 0 : targetDocument.body.contains(currentElementRef.current))) && walkerRef.current) {
|
|
97
|
+
initialize(walkerRef.current);
|
|
98
|
+
}
|
|
99
|
+
}, [
|
|
100
|
+
targetDocument,
|
|
101
|
+
initialize
|
|
102
|
+
]);
|
|
103
|
+
return {
|
|
104
|
+
rove,
|
|
105
|
+
initialize,
|
|
106
|
+
forceUpdate
|
|
107
|
+
};
|
|
108
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../../src/hooks/useRovingTabIndexBase.ts"],"sourcesContent":["'use client';\n\nimport * as React from 'react';\nimport { useFluent_unstable as useFluent } from '@fluentui/react-shared-contexts';\nimport { isHTMLElement } from '@fluentui/react-utilities';\nimport type { HTMLElementWalker } from '../utils/createHTMLElementWalker';\n\n/**\n * Subscribes to focused element changes, invoking the callback with the newly focused element.\n *\n * @internal\n */\nexport type UseFocusedElementChange = (callback: (element: HTMLElement | undefined) => void) => void;\n\nconst findTreeItemRoot = (element: HTMLElement) => {\n let parent = element.parentElement;\n while (parent && parent.getAttribute('role') !== 'tree') {\n parent = parent.parentElement;\n }\n return parent;\n};\n\n/**\n * Plain DOM implementation of `UseFocusedElementChange`, free of any focus management runtime.\n *\n * @internal\n */\nexport const useDOMFocusedElementChange: UseFocusedElementChange = callback => {\n const { targetDocument } = useFluent();\n const callbackRef = React.useRef(callback);\n\n React.useEffect(() => {\n callbackRef.current = callback;\n });\n\n React.useEffect(() => {\n if (!targetDocument) {\n return;\n }\n const listener = (event: FocusEvent) => {\n // The target is retargeted to the shadow host when focus moves within a shadow root\n const target = event.composedPath()[0] ?? event.target;\n callbackRef.current(isHTMLElement(target) ? target : undefined);\n };\n // Capture phase, so that consumers stopping the propagation of focus events do not desync the roving tab index\n targetDocument.addEventListener('focusin', listener, true);\n\n // Focus may have moved before the listener was attached, e.g. from a parent layout effect\n let activeElement = targetDocument.activeElement;\n while (activeElement?.shadowRoot?.activeElement) {\n activeElement = activeElement.shadowRoot.activeElement;\n }\n if (isHTMLElement(activeElement)) {\n callbackRef.current(activeElement);\n }\n\n return () => targetDocument.removeEventListener('focusin', listener, true);\n }, [targetDocument]);\n};\n\n/**\n * https://www.w3.org/WAI/ARIA/apg/practices/keyboard-interface/#kbd_roving_tabindex\n *\n * The focused element tracking is provided by the caller, so that the roving tab index can be\n * driven either by a focus management runtime or by plain DOM events.\n *\n * @internal\n */\nexport function useRovingTabIndexBase(useFocusedElementChange: UseFocusedElementChange): {\n rove: (nextElement: HTMLElement, focusOptions?: FocusOptions) => void;\n initialize: (walker: HTMLElementWalker) => void;\n forceUpdate: () => void;\n} {\n const currentElementRef = React.useRef<HTMLElement | null>(null);\n const walkerRef = React.useRef<HTMLElementWalker | null>(null);\n const { targetDocument } = useFluent();\n\n // The callback only runs on focus changes, never during render.\n // eslint-disable-next-line react-hooks/refs\n useFocusedElementChange(element => {\n if (element?.getAttribute('role') === 'treeitem' && walkerRef.current && walkerRef.current.root.contains(element)) {\n const treeitemRoot = findTreeItemRoot(element);\n if (walkerRef.current.root !== treeitemRoot) {\n return;\n }\n rove(element);\n }\n });\n\n const initialize = React.useCallback((walker: HTMLElementWalker) => {\n walkerRef.current = walker;\n walker.currentElement = walker.root;\n let tabbableChild = walker.firstChild(element =>\n element.tabIndex === 0 ? NodeFilter.FILTER_ACCEPT : NodeFilter.FILTER_SKIP,\n );\n walker.currentElement = walker.root;\n tabbableChild ??= walker.firstChild();\n if (!tabbableChild) {\n return;\n }\n tabbableChild.tabIndex = 0;\n currentElementRef.current = tabbableChild;\n let nextElement: HTMLElement | null = null;\n while ((nextElement = walker.nextElement()) && nextElement !== tabbableChild) {\n nextElement.tabIndex = -1;\n }\n }, []);\n const rove = React.useCallback((nextElement: HTMLElement, focusOptions?: FocusOptions) => {\n if (!currentElementRef.current) {\n return;\n }\n currentElementRef.current.tabIndex = -1;\n nextElement.tabIndex = 0;\n nextElement.focus(focusOptions);\n currentElementRef.current = nextElement;\n }, []);\n\n const forceUpdate = React.useCallback(() => {\n if (\n (currentElementRef.current === null || !targetDocument?.body.contains(currentElementRef.current)) &&\n walkerRef.current\n ) {\n initialize(walkerRef.current);\n }\n }, [targetDocument, initialize]);\n\n return {\n rove,\n initialize,\n forceUpdate,\n };\n}\n"],"names":["React","useFluent_unstable","useFluent","isHTMLElement","findTreeItemRoot","element","parent","parentElement","getAttribute","useDOMFocusedElementChange","callback","targetDocument","callbackRef","useRef","useEffect","current","activeElement","listener","event","target","composedPath","undefined","addEventListener","shadowRoot","removeEventListener","useRovingTabIndexBase","useFocusedElementChange","currentElementRef","walkerRef","root","contains","treeitemRoot","rove","initialize","useCallback","walker","currentElement","tabbableChild","firstChild","tabIndex","NodeFilter","FILTER_ACCEPT","FILTER_SKIP","nextElement","focusOptions","focus","forceUpdate","body"],"mappings":"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"}
|
|
@@ -1,69 +1,10 @@
|
|
|
1
1
|
'use client';
|
|
2
|
-
import * as React from "react";
|
|
3
|
-
import { useFluent_unstable as useFluent } from "@fluentui/react-shared-contexts";
|
|
4
2
|
import { useFocusedElementChange } from "@fluentui/react-tabster";
|
|
5
|
-
|
|
6
|
-
let parent = element.parentElement;
|
|
7
|
-
while(parent && parent.getAttribute('role') !== 'tree'){
|
|
8
|
-
parent = parent.parentElement;
|
|
9
|
-
}
|
|
10
|
-
return parent;
|
|
11
|
-
};
|
|
3
|
+
import { useRovingTabIndexBase } from "./useRovingTabIndexBase.js";
|
|
12
4
|
/**
|
|
13
5
|
* https://www.w3.org/WAI/ARIA/apg/practices/keyboard-interface/#kbd_roving_tabindex
|
|
14
6
|
*
|
|
15
7
|
* @internal
|
|
16
8
|
*/ export function useRovingTabIndex() {
|
|
17
|
-
|
|
18
|
-
const walkerRef = React.useRef(null);
|
|
19
|
-
const { targetDocument } = useFluent();
|
|
20
|
-
useFocusedElementChange((element)=>{
|
|
21
|
-
if ((element === null || element === void 0 ? void 0 : element.getAttribute('role')) === 'treeitem' && walkerRef.current && walkerRef.current.root.contains(element)) {
|
|
22
|
-
const treeitemRoot = findTreeItemRoot(element);
|
|
23
|
-
if (walkerRef.current.root !== treeitemRoot) {
|
|
24
|
-
return;
|
|
25
|
-
}
|
|
26
|
-
// eslint-disable-next-line react-hooks/immutability, react-hooks/preserve-manual-memoization
|
|
27
|
-
rove(element);
|
|
28
|
-
}
|
|
29
|
-
});
|
|
30
|
-
const initialize = React.useCallback((walker)=>{
|
|
31
|
-
walkerRef.current = walker;
|
|
32
|
-
walker.currentElement = walker.root;
|
|
33
|
-
let tabbableChild = walker.firstChild((element)=>element.tabIndex === 0 ? NodeFilter.FILTER_ACCEPT : NodeFilter.FILTER_SKIP);
|
|
34
|
-
walker.currentElement = walker.root;
|
|
35
|
-
tabbableChild !== null && tabbableChild !== void 0 ? tabbableChild : tabbableChild = walker.firstChild();
|
|
36
|
-
if (!tabbableChild) {
|
|
37
|
-
return;
|
|
38
|
-
}
|
|
39
|
-
tabbableChild.tabIndex = 0;
|
|
40
|
-
currentElementRef.current = tabbableChild;
|
|
41
|
-
let nextElement = null;
|
|
42
|
-
while((nextElement = walker.nextElement()) && nextElement !== tabbableChild){
|
|
43
|
-
nextElement.tabIndex = -1;
|
|
44
|
-
}
|
|
45
|
-
}, []);
|
|
46
|
-
// eslint-disable-next-line react-hooks/preserve-manual-memoization
|
|
47
|
-
const rove = React.useCallback((nextElement, focusOptions)=>{
|
|
48
|
-
if (!currentElementRef.current) {
|
|
49
|
-
return;
|
|
50
|
-
}
|
|
51
|
-
currentElementRef.current.tabIndex = -1;
|
|
52
|
-
nextElement.tabIndex = 0;
|
|
53
|
-
nextElement.focus(focusOptions);
|
|
54
|
-
currentElementRef.current = nextElement;
|
|
55
|
-
}, []);
|
|
56
|
-
const forceUpdate = React.useCallback(()=>{
|
|
57
|
-
if ((currentElementRef.current === null || !(targetDocument === null || targetDocument === void 0 ? void 0 : targetDocument.body.contains(currentElementRef.current))) && walkerRef.current) {
|
|
58
|
-
initialize(walkerRef.current);
|
|
59
|
-
}
|
|
60
|
-
}, [
|
|
61
|
-
targetDocument,
|
|
62
|
-
initialize
|
|
63
|
-
]);
|
|
64
|
-
return {
|
|
65
|
-
rove,
|
|
66
|
-
initialize,
|
|
67
|
-
forceUpdate
|
|
68
|
-
};
|
|
9
|
+
return useRovingTabIndexBase(useFocusedElementChange);
|
|
69
10
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/hooks/useRovingTabIndexes.ts"],"sourcesContent":["'use client';\n\nimport
|
|
1
|
+
{"version":3,"sources":["../../src/hooks/useRovingTabIndexes.ts"],"sourcesContent":["'use client';\n\nimport { useFocusedElementChange } from '@fluentui/react-tabster';\nimport type { HTMLElementWalker } from '../utils/createHTMLElementWalker';\nimport { useRovingTabIndexBase } from './useRovingTabIndexBase';\n\n/**\n * https://www.w3.org/WAI/ARIA/apg/practices/keyboard-interface/#kbd_roving_tabindex\n *\n * @internal\n */\nexport function useRovingTabIndex(): {\n rove: (nextElement: HTMLElement, focusOptions?: FocusOptions) => void;\n initialize: (walker: HTMLElementWalker) => void;\n forceUpdate: () => void;\n} {\n return useRovingTabIndexBase(useFocusedElementChange);\n}\n"],"names":["useFocusedElementChange","useRovingTabIndexBase","useRovingTabIndex"],"mappings":"AAAA;AAEA,SAASA,uBAAuB,QAAQ,0BAA0B;AAElE,SAASC,qBAAqB,QAAQ,6BAA0B;AAEhE;;;;CAIC,GACD,OAAO,SAASC;IAKd,OAAOD,sBAAsBD;AAC/B"}
|
package/lib/hooks/useSubtree.js
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
'use client';
|
|
2
2
|
import { useSubtreeContext_unstable, useTreeItemContext_unstable } from "../contexts/index.js";
|
|
3
3
|
import { getIntrinsicElementProps, useMergedRefs, slot } from "@fluentui/react-utilities";
|
|
4
|
-
import { Collapse } from "@fluentui/react-motion-components-preview";
|
|
5
|
-
import { presenceMotionSlot } from "@fluentui/react-motion";
|
|
6
4
|
/**
|
|
7
5
|
* Create the state required to render a sub-level tree.
|
|
8
6
|
*
|
|
@@ -16,8 +14,7 @@ import { presenceMotionSlot } from "@fluentui/react-motion";
|
|
|
16
14
|
contextType: 'subtree',
|
|
17
15
|
open,
|
|
18
16
|
components: {
|
|
19
|
-
root: 'div'
|
|
20
|
-
collapseMotion: Collapse
|
|
17
|
+
root: 'div'
|
|
21
18
|
},
|
|
22
19
|
level: parentLevel + 1,
|
|
23
20
|
root: slot.always(getIntrinsicElementProps('div', {
|
|
@@ -29,13 +26,6 @@ import { presenceMotionSlot } from "@fluentui/react-motion";
|
|
|
29
26
|
...props
|
|
30
27
|
}), {
|
|
31
28
|
elementType: 'div'
|
|
32
|
-
}),
|
|
33
|
-
collapseMotion: presenceMotionSlot(props.collapseMotion, {
|
|
34
|
-
elementType: Collapse,
|
|
35
|
-
defaultProps: {
|
|
36
|
-
visible: open,
|
|
37
|
-
unmountOnExit: true
|
|
38
|
-
}
|
|
39
29
|
})
|
|
40
30
|
};
|
|
41
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/hooks/useSubtree.ts"],"sourcesContent":["'use client';\n\nimport type * as React from 'react';\nimport type {
|
|
1
|
+
{"version":3,"sources":["../../src/hooks/useSubtree.ts"],"sourcesContent":["'use client';\n\nimport type * as React from 'react';\nimport type { TreeBaseProps, TreeBaseState } from '../components/Tree/Tree.types';\nimport type { SubtreeContextValue } from '../contexts/index';\nimport { useSubtreeContext_unstable, useTreeItemContext_unstable } from '../contexts/index';\nimport { getIntrinsicElementProps, useMergedRefs, slot } from '@fluentui/react-utilities';\n\n/**\n * Create the state required to render a sub-level tree.\n *\n * @param props - props from this instance of tree\n * @param ref - reference to root HTMLElement of tree\n */\nexport function useSubtree(\n props: TreeBaseProps,\n ref: React.Ref<HTMLElement>,\n): Omit<TreeBaseState & SubtreeContextValue, 'treeType'> {\n const subtreeRef = useTreeItemContext_unstable(ctx => ctx.subtreeRef);\n\n const { level: parentLevel } = useSubtreeContext_unstable();\n\n const open = useTreeItemContext_unstable(ctx => ctx.open);\n\n return {\n contextType: 'subtree',\n open,\n components: {\n root: 'div',\n },\n level: parentLevel + 1,\n root: slot.always(\n getIntrinsicElementProps('div', {\n // FIXME:\n // `ref` is wrongly assigned to be `HTMLElement` instead of `HTMLDivElement`\n // but since it would be a breaking change to fix it, we are casting ref to it's proper type\n ref: useMergedRefs(ref, subtreeRef) as React.Ref<HTMLDivElement>,\n role: 'group',\n ...props,\n }),\n { elementType: 'div' },\n ),\n };\n}\n"],"names":["useSubtreeContext_unstable","useTreeItemContext_unstable","getIntrinsicElementProps","useMergedRefs","slot","useSubtree","props","ref","subtreeRef","ctx","level","parentLevel","open","contextType","components","root","always","role","elementType"],"mappings":"AAAA;AAKA,SAASA,0BAA0B,EAAEC,2BAA2B,QAAQ,uBAAoB;AAC5F,SAASC,wBAAwB,EAAEC,aAAa,EAAEC,IAAI,QAAQ,4BAA4B;AAE1F;;;;;CAKC,GACD,OAAO,SAASC,WACdC,KAAoB,EACpBC,GAA2B;IAE3B,MAAMC,aAAaP,4BAA4BQ,CAAAA,MAAOA,IAAID,UAAU;IAEpE,MAAM,EAAEE,OAAOC,WAAW,EAAE,GAAGX;IAE/B,MAAMY,OAAOX,4BAA4BQ,CAAAA,MAAOA,IAAIG,IAAI;IAExD,OAAO;QACLC,aAAa;QACbD;QACAE,YAAY;YACVC,MAAM;QACR;QACAL,OAAOC,cAAc;QACrBI,MAAMX,KAAKY,MAAM,CACfd,yBAAyB,OAAO;YAC9B,SAAS;YACT,4EAA4E;YAC5E,4FAA4F;YAC5FK,KAAKJ,cAAcI,KAAKC;YACxBS,MAAM;YACN,GAAGX,KAAK;QACV,IACA;YAAEY,aAAa;QAAM;IAEzB;AACF"}
|
|
@@ -1,92 +1,14 @@
|
|
|
1
1
|
'use client';
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
import { useRovingTabIndex } from "./useRovingTabIndexes.js";
|
|
5
|
-
import * as React from "react";
|
|
6
|
-
import { useHTMLElementWalkerRef } from "./useHTMLElementWalkerRef.js";
|
|
7
|
-
import { useMergedRefs } from "@fluentui/react-utilities";
|
|
8
|
-
import { treeItemLayoutClassNames } from "../TreeItemLayout.js";
|
|
9
|
-
import { useFocusFinders } from "@fluentui/react-tabster";
|
|
2
|
+
import { useFocusFinders, useFocusedElementChange } from "@fluentui/react-tabster";
|
|
3
|
+
import { useTreeNavigationBase } from "./useTreeNavigationBase.js";
|
|
10
4
|
/***
|
|
11
5
|
* Hook used to manage navigation in the tree.
|
|
12
6
|
*
|
|
13
7
|
* @param navigationMode - the navigation mode of the tree, 'tree' (default) or 'treegrid'
|
|
14
8
|
*/ export function useTreeNavigation(navigationMode = 'tree') {
|
|
15
|
-
'use no memo'; // justified: compiler would optimize useTreeNavigation — manual opt-out to preserve runtime behavior
|
|
16
|
-
const { rove, initialize: initializeRovingTabIndex, forceUpdate: forceUpdateRovingTabIndex } = useRovingTabIndex();
|
|
17
9
|
const { findFirstFocusable } = useFocusFinders();
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
}
|
|
23
|
-
}, [
|
|
24
|
-
walkerRef,
|
|
25
|
-
initializeRovingTabIndex
|
|
26
|
-
]);
|
|
27
|
-
const getNextElement = (data)=>{
|
|
28
|
-
if (!walkerRef.current) {
|
|
29
|
-
return null;
|
|
30
|
-
}
|
|
31
|
-
switch(data.type){
|
|
32
|
-
case treeDataTypes.Click:
|
|
33
|
-
return data.target;
|
|
34
|
-
case treeDataTypes.TypeAhead:
|
|
35
|
-
walkerRef.current.currentElement = data.target;
|
|
36
|
-
return nextTypeAheadElement(walkerRef.current, data.event.key);
|
|
37
|
-
case treeDataTypes.ArrowLeft:
|
|
38
|
-
{
|
|
39
|
-
const actions = queryActions(data.target);
|
|
40
|
-
if (navigationMode === 'treegrid' && (actions === null || actions === void 0 ? void 0 : actions.contains(data.target.ownerDocument.activeElement))) {
|
|
41
|
-
return data.target;
|
|
42
|
-
}
|
|
43
|
-
walkerRef.current.currentElement = data.target;
|
|
44
|
-
return walkerRef.current.parentElement();
|
|
45
|
-
}
|
|
46
|
-
case treeDataTypes.ArrowRight:
|
|
47
|
-
if (navigationMode === 'treegrid') {
|
|
48
|
-
const actions = queryActions(data.target);
|
|
49
|
-
if (actions) {
|
|
50
|
-
var _findFirstFocusable;
|
|
51
|
-
(_findFirstFocusable = findFirstFocusable(actions)) === null || _findFirstFocusable === void 0 ? void 0 : _findFirstFocusable.focus();
|
|
52
|
-
}
|
|
53
|
-
return null;
|
|
54
|
-
}
|
|
55
|
-
walkerRef.current.currentElement = data.target;
|
|
56
|
-
return walkerRef.current.firstChild();
|
|
57
|
-
case treeDataTypes.End:
|
|
58
|
-
walkerRef.current.currentElement = walkerRef.current.root;
|
|
59
|
-
return lastChildRecursive(walkerRef.current);
|
|
60
|
-
case treeDataTypes.Home:
|
|
61
|
-
walkerRef.current.currentElement = walkerRef.current.root;
|
|
62
|
-
return walkerRef.current.firstChild();
|
|
63
|
-
case treeDataTypes.ArrowDown:
|
|
64
|
-
walkerRef.current.currentElement = data.target;
|
|
65
|
-
return walkerRef.current.nextElement();
|
|
66
|
-
case treeDataTypes.ArrowUp:
|
|
67
|
-
walkerRef.current.currentElement = data.target;
|
|
68
|
-
return walkerRef.current.previousElement();
|
|
69
|
-
}
|
|
70
|
-
};
|
|
71
|
-
function navigate(data, focusOptions) {
|
|
72
|
-
const nextElement = getNextElement(data);
|
|
73
|
-
if (nextElement) {
|
|
74
|
-
rove(nextElement, focusOptions);
|
|
75
|
-
}
|
|
76
|
-
return nextElement;
|
|
77
|
-
}
|
|
78
|
-
return {
|
|
79
|
-
navigate,
|
|
80
|
-
treeRef: useMergedRefs(walkerRootRef, rootRefCallback),
|
|
81
|
-
forceUpdateRovingTabIndex
|
|
82
|
-
};
|
|
10
|
+
return useTreeNavigationBase(navigationMode, {
|
|
11
|
+
findFirstFocusable,
|
|
12
|
+
useFocusedElementChange
|
|
13
|
+
});
|
|
83
14
|
}
|
|
84
|
-
function lastChildRecursive(walker) {
|
|
85
|
-
let lastElement = null;
|
|
86
|
-
let nextElement = null;
|
|
87
|
-
while(nextElement = walker.lastChild()){
|
|
88
|
-
lastElement = nextElement;
|
|
89
|
-
}
|
|
90
|
-
return lastElement;
|
|
91
|
-
}
|
|
92
|
-
const queryActions = (target)=>target.querySelector(`:scope > .${treeItemLayoutClassNames.root} > .${treeItemLayoutClassNames.actions}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/hooks/useTreeNavigation.ts"],"sourcesContent":["'use client';\n\nimport type
|
|
1
|
+
{"version":3,"sources":["../../src/hooks/useTreeNavigation.ts"],"sourcesContent":["'use client';\n\nimport type * as React from 'react';\nimport { useFocusFinders, useFocusedElementChange } from '@fluentui/react-tabster';\nimport type { TreeNavigationData_unstable, TreeNavigationMode } from '../components/Tree/Tree.types';\nimport { useTreeNavigationBase } from './useTreeNavigationBase';\n\n/***\n * Hook used to manage navigation in the tree.\n *\n * @param navigationMode - the navigation mode of the tree, 'tree' (default) or 'treegrid'\n */\nexport function useTreeNavigation(navigationMode: TreeNavigationMode = 'tree'): {\n navigate: (data: TreeNavigationData_unstable, focusOptions?: FocusOptions) => HTMLElement | null;\n treeRef: React.RefCallback<HTMLElement>;\n forceUpdateRovingTabIndex: () => void;\n} {\n const { findFirstFocusable } = useFocusFinders();\n\n return useTreeNavigationBase(navigationMode, { findFirstFocusable, useFocusedElementChange });\n}\n"],"names":["useFocusFinders","useFocusedElementChange","useTreeNavigationBase","useTreeNavigation","navigationMode","findFirstFocusable"],"mappings":"AAAA;AAGA,SAASA,eAAe,EAAEC,uBAAuB,QAAQ,0BAA0B;AAEnF,SAASC,qBAAqB,QAAQ,6BAA0B;AAEhE;;;;CAIC,GACD,OAAO,SAASC,kBAAkBC,iBAAqC,MAAM;IAK3E,MAAM,EAAEC,kBAAkB,EAAE,GAAGL;IAE/B,OAAOE,sBAAsBE,gBAAgB;QAAEC;QAAoBJ;IAAwB;AAC7F"}
|