@fluentui/react-tree 9.0.0-beta.10 → 9.0.0-beta.12

package/lib-commonjs/utils/createFlatTreeItems.js

@@ -1,7 +1,4 @@
-/**
- * creates a list of flat tree items
- * and provides a map to access each item by id
- */ "use strict";
+"use strict";
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
@@ -16,9 +13,11 @@ _export(exports, {
     flatTreeRootId: ()=>flatTreeRootId,
     VisibleFlatTreeItemGenerator: ()=>VisibleFlatTreeItemGenerator
 });
+const _interopRequireWildcard = require("@swc/helpers/lib/_interop_require_wildcard.js").default;
+const _react = /*#__PURE__*/ _interopRequireWildcard(require("react"));
 function createFlatTreeItems(flatTreeItemProps) {
     const root = createFlatTreeRootItem();
-    const itemsPerId = new Map([
+    const itemsPerValue = new Map([
         [
             flatTreeRootId,
             root
@@ -26,9 +25,9 @@ function createFlatTreeItems(flatTreeItemProps) {
     ]);
     const items = [];
     for(let index = 0; index < flatTreeItemProps.length; index++){
-        const { parentId =flatTreeRootId , ...treeItemProps } = flatTreeItemProps[index];
+        const { parentValue =flatTreeRootId , ...treeItemProps } = flatTreeItemProps[index];
         const nextItemProps = flatTreeItemProps[index + 1];
-        const currentParent = itemsPerId.get(parentId);
+        const currentParent = itemsPerValue.get(parentValue);
         if (!currentParent) {
             if (process.env.NODE_ENV === 'development') {
                 // eslint-disable-next-line no-console
@@ -36,46 +35,53 @@ function createFlatTreeItems(flatTreeItemProps) {
             }
             break;
         }
-        const isLeaf = (nextItemProps === null || nextItemProps === void 0 ? void 0 : nextItemProps.parentId) !== treeItemProps.id;
+        const isLeaf = (nextItemProps === null || nextItemProps === void 0 ? void 0 : nextItemProps.parentValue) !== treeItemProps.value;
         var _currentParent_level;
         const currentLevel = ((_currentParent_level = currentParent.level) !== null && _currentParent_level !== void 0 ? _currentParent_level : 0) + 1;
         const currentChildrenSize = ++currentParent.childrenSize;
+        const ref = /*#__PURE__*/ _react.createRef();
         const flatTreeItem = {
-            id: treeItemProps.id,
+            value: treeItemProps.value,
             getTreeItemProps: ()=>({
                     ...treeItemProps,
                     'aria-level': currentLevel,
                     'aria-posinset': currentChildrenSize,
                     'aria-setsize': currentParent.childrenSize,
-                    leaf: isLeaf
+                    leaf: isLeaf,
+                    // a reference to every parent element is necessary to ensure navigation
+                    ref: flatTreeItem.childrenSize > 0 ? ref : undefined
                 }),
+            ref,
             level: currentLevel,
-            parentId,
+            parentValue,
             childrenSize: 0,
             index: -1
         };
-        itemsPerId.set(flatTreeItem.id, flatTreeItem);
+        itemsPerValue.set(flatTreeItem.value, flatTreeItem);
         items.push(flatTreeItem);
     }
     return {
         root,
         size: items.length,
         getByIndex: (index)=>items[index],
-        get: (id)=>itemsPerId.get(id),
-        set: (id, value)=>itemsPerId.set(id, value)
+        get: (id)=>itemsPerValue.get(id),
+        set: (id, value)=>itemsPerValue.set(id, value)
     };
 }
 const flatTreeRootId = '__fuiFlatTreeRoot';
 function createFlatTreeRootItem() {
     return {
-        id: flatTreeRootId,
+        ref: {
+            current: null
+        },
+        value: flatTreeRootId,
         getTreeItemProps: ()=>{
             if (process.env.NODE_ENV !== 'production') {
                 // eslint-disable-next-line no-console
                 console.error('useFlatTree: internal error, trying to access treeitem props from invalid root element');
             }
             return {
-                id: flatTreeRootId,
+                value: flatTreeRootId,
                 'aria-setsize': -1,
                 'aria-level': -1,
                 'aria-posinset': -1,
@@ -97,7 +103,7 @@ function* VisibleFlatTreeItemGenerator(openItems, flatTreeItems) {
     for(let index = 0, visibleIndex = 0; index < flatTreeItems.size; index++){
         const item = flatTreeItems.getByIndex(index);
         var _flatTreeItems_get;
-        const parent = item.parentId ? (_flatTreeItems_get = flatTreeItems.get(item.parentId)) !== null && _flatTreeItems_get !== void 0 ? _flatTreeItems_get : flatTreeItems.root : flatTreeItems.root;
+        const parent = item.parentValue ? (_flatTreeItems_get = flatTreeItems.get(item.parentValue)) !== null && _flatTreeItems_get !== void 0 ? _flatTreeItems_get : flatTreeItems.root : flatTreeItems.root;
         if (isItemVisible(item, openItems, flatTreeItems)) {
             item.index = visibleIndex++;
             yield item;
@@ -110,11 +116,11 @@ function isItemVisible(item, openItems, flatTreeItems) {
     if (item.level === 1) {
         return true;
     }
-    while(item.parentId && item.parentId !== flatTreeItems.root.id){
-        if (!openItems.has(item.parentId)) {
+    while(item.parentValue && item.parentValue !== flatTreeItems.root.value){
+        if (!openItems.has(item.parentValue)) {
             return false;
         }
-        const parent = flatTreeItems.get(item.parentId);
+        const parent = flatTreeItems.get(item.parentValue);
         if (!parent) {
             return false;
         }

package/lib-commonjs/utils/createFlatTreeItems.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../lib/utils/createFlatTreeItems.js"],"sourcesContent":["/**\n * creates a list of flat tree items\n * and provides a map to access each item by id\n */export function createFlatTreeItems(flatTreeItemProps) {\n  const root = createFlatTreeRootItem();\n  const itemsPerId = new Map([[flatTreeRootId, root]]);\n  const items = [];\n  for (let index = 0; index < flatTreeItemProps.length; index++) {\n    const {\n      parentId = flatTreeRootId,\n      ...treeItemProps\n    } = flatTreeItemProps[index];\n    const nextItemProps = flatTreeItemProps[index + 1];\n    const currentParent = itemsPerId.get(parentId);\n    if (!currentParent) {\n      if (process.env.NODE_ENV === 'development') {\n        // eslint-disable-next-line no-console\n        console.error(`useFlatTree: item ${flatTreeItemProps[index].id} is wrongly positioned, did you properly ordered provided item props? make sure provided items are organized`);\n      }\n      break;\n    }\n    const isLeaf = (nextItemProps === null || nextItemProps === void 0 ? void 0 : nextItemProps.parentId) !== treeItemProps.id;\n    var _currentParent_level;\n    const currentLevel = ((_currentParent_level = currentParent.level) !== null && _currentParent_level !== void 0 ? _currentParent_level : 0) + 1;\n    const currentChildrenSize = ++currentParent.childrenSize;\n    const flatTreeItem = {\n      id: treeItemProps.id,\n      getTreeItemProps: () => ({\n        ...treeItemProps,\n        'aria-level': currentLevel,\n        'aria-posinset': currentChildrenSize,\n        'aria-setsize': currentParent.childrenSize,\n        leaf: isLeaf\n      }),\n      level: currentLevel,\n      parentId,\n      childrenSize: 0,\n      index: -1\n    };\n    itemsPerId.set(flatTreeItem.id, flatTreeItem);\n    items.push(flatTreeItem);\n  }\n  return {\n    root,\n    size: items.length,\n    getByIndex: index => items[index],\n    get: id => itemsPerId.get(id),\n    set: (id, value) => itemsPerId.set(id, value)\n  };\n}\nexport const flatTreeRootId = '__fuiFlatTreeRoot';\nfunction createFlatTreeRootItem() {\n  return {\n    id: flatTreeRootId,\n    getTreeItemProps: () => {\n      if (process.env.NODE_ENV !== 'production') {\n        // eslint-disable-next-line no-console\n        console.error('useFlatTree: internal error, trying to access treeitem props from invalid root element');\n      }\n      return {\n        id: flatTreeRootId,\n        'aria-setsize': -1,\n        'aria-level': -1,\n        'aria-posinset': -1,\n        leaf: true\n      };\n    },\n    childrenSize: 0,\n    get index() {\n      if (process.env.NODE_ENV !== 'production') {\n        // eslint-disable-next-line no-console\n        console.error('useFlatTree: internal error, trying to access treeitem props from invalid root element');\n      }\n      return -1;\n    },\n    level: 0\n  };\n}\n// eslint-disable-next-line @typescript-eslint/naming-convention\nexport function* VisibleFlatTreeItemGenerator(openItems, flatTreeItems) {\n  for (let index = 0, visibleIndex = 0; index < flatTreeItems.size; index++) {\n    const item = flatTreeItems.getByIndex(index);\n    var _flatTreeItems_get;\n    const parent = item.parentId ? (_flatTreeItems_get = flatTreeItems.get(item.parentId)) !== null && _flatTreeItems_get !== void 0 ? _flatTreeItems_get : flatTreeItems.root : flatTreeItems.root;\n    if (isItemVisible(item, openItems, flatTreeItems)) {\n      item.index = visibleIndex++;\n      yield item;\n    } else {\n      index += parent.childrenSize - 1 + item.childrenSize;\n    }\n  }\n}\nfunction isItemVisible(item, openItems, flatTreeItems) {\n  if (item.level === 1) {\n    return true;\n  }\n  while (item.parentId && item.parentId !== flatTreeItems.root.id) {\n    if (!openItems.has(item.parentId)) {\n      return false;\n    }\n    const parent = flatTreeItems.get(item.parentId);\n    if (!parent) {\n      return false;\n    }\n    item = parent;\n  }\n  return true;\n}\n//# sourceMappingURL=createFlatTreeItems.js.map"],"names":["createFlatTreeItems","flatTreeRootId","VisibleFlatTreeItemGenerator","flatTreeItemProps","root","createFlatTreeRootItem","itemsPerId","Map","items","index","length","parentId","treeItemProps","nextItemProps","currentParent","get","process","env","NODE_ENV","console","error","id","isLeaf","_currentParent_level","currentLevel","level","currentChildrenSize","childrenSize","flatTreeItem","getTreeItemProps","leaf","set","push","size","getByIndex","value","openItems","flatTreeItems","visibleIndex","item","_flatTreeItems_get","parent","isItemVisible","has"],"mappings":"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"}
+{"version":3,"sources":["../../lib/utils/createFlatTreeItems.js"],"sourcesContent":["import * as React from 'react';\n/**\n * creates a list of flat tree items\n * and provides a map to access each item by id\n */\nexport function createFlatTreeItems(flatTreeItemProps) {\n  const root = createFlatTreeRootItem();\n  const itemsPerValue = new Map([[flatTreeRootId, root]]);\n  const items = [];\n  for (let index = 0; index < flatTreeItemProps.length; index++) {\n    const {\n      parentValue = flatTreeRootId,\n      ...treeItemProps\n    } = flatTreeItemProps[index];\n    const nextItemProps = flatTreeItemProps[index + 1];\n    const currentParent = itemsPerValue.get(parentValue);\n    if (!currentParent) {\n      if (process.env.NODE_ENV === 'development') {\n        // eslint-disable-next-line no-console\n        console.error(`useFlatTree: item ${flatTreeItemProps[index].id} is wrongly positioned, did you properly ordered provided item props? make sure provided items are organized`);\n      }\n      break;\n    }\n    const isLeaf = (nextItemProps === null || nextItemProps === void 0 ? void 0 : nextItemProps.parentValue) !== treeItemProps.value;\n    var _currentParent_level;\n    const currentLevel = ((_currentParent_level = currentParent.level) !== null && _currentParent_level !== void 0 ? _currentParent_level : 0) + 1;\n    const currentChildrenSize = ++currentParent.childrenSize;\n    const ref = /*#__PURE__*/React.createRef();\n    const flatTreeItem = {\n      value: treeItemProps.value,\n      getTreeItemProps: () => ({\n        ...treeItemProps,\n        'aria-level': currentLevel,\n        'aria-posinset': currentChildrenSize,\n        'aria-setsize': currentParent.childrenSize,\n        leaf: isLeaf,\n        // a reference to every parent element is necessary to ensure navigation\n        ref: flatTreeItem.childrenSize > 0 ? ref : undefined\n      }),\n      ref,\n      level: currentLevel,\n      parentValue,\n      childrenSize: 0,\n      index: -1\n    };\n    itemsPerValue.set(flatTreeItem.value, flatTreeItem);\n    items.push(flatTreeItem);\n  }\n  return {\n    root,\n    size: items.length,\n    getByIndex: index => items[index],\n    get: id => itemsPerValue.get(id),\n    set: (id, value) => itemsPerValue.set(id, value)\n  };\n}\nexport const flatTreeRootId = '__fuiFlatTreeRoot';\nfunction createFlatTreeRootItem() {\n  return {\n    ref: {\n      current: null\n    },\n    value: flatTreeRootId,\n    getTreeItemProps: () => {\n      if (process.env.NODE_ENV !== 'production') {\n        // eslint-disable-next-line no-console\n        console.error('useFlatTree: internal error, trying to access treeitem props from invalid root element');\n      }\n      return {\n        value: flatTreeRootId,\n        'aria-setsize': -1,\n        'aria-level': -1,\n        'aria-posinset': -1,\n        leaf: true\n      };\n    },\n    childrenSize: 0,\n    get index() {\n      if (process.env.NODE_ENV !== 'production') {\n        // eslint-disable-next-line no-console\n        console.error('useFlatTree: internal error, trying to access treeitem props from invalid root element');\n      }\n      return -1;\n    },\n    level: 0\n  };\n}\n// eslint-disable-next-line @typescript-eslint/naming-convention\nexport function* VisibleFlatTreeItemGenerator(openItems, flatTreeItems) {\n  for (let index = 0, visibleIndex = 0; index < flatTreeItems.size; index++) {\n    const item = flatTreeItems.getByIndex(index);\n    var _flatTreeItems_get;\n    const parent = item.parentValue ? (_flatTreeItems_get = flatTreeItems.get(item.parentValue)) !== null && _flatTreeItems_get !== void 0 ? _flatTreeItems_get : flatTreeItems.root : flatTreeItems.root;\n    if (isItemVisible(item, openItems, flatTreeItems)) {\n      item.index = visibleIndex++;\n      yield item;\n    } else {\n      index += parent.childrenSize - 1 + item.childrenSize;\n    }\n  }\n}\nfunction isItemVisible(item, openItems, flatTreeItems) {\n  if (item.level === 1) {\n    return true;\n  }\n  while (item.parentValue && item.parentValue !== flatTreeItems.root.value) {\n    if (!openItems.has(item.parentValue)) {\n      return false;\n    }\n    const parent = flatTreeItems.get(item.parentValue);\n    if (!parent) {\n      return false;\n    }\n    item = parent;\n  }\n  return true;\n}\n//# sourceMappingURL=createFlatTreeItems.js.map"],"names":["createFlatTreeItems","flatTreeRootId","VisibleFlatTreeItemGenerator","flatTreeItemProps","root","createFlatTreeRootItem","itemsPerValue","Map","items","index","length","parentValue","treeItemProps","nextItemProps","currentParent","get","process","env","NODE_ENV","console","error","id","isLeaf","value","_currentParent_level","currentLevel","level","currentChildrenSize","childrenSize","ref","React","createRef","flatTreeItem","getTreeItemProps","leaf","undefined","set","push","size","getByIndex","current","openItems","flatTreeItems","visibleIndex","item","_flatTreeItems_get","parent","isItemVisible","has"],"mappings":"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"}

package/lib-commonjs/utils/flattenTree.js

@@ -18,12 +18,14 @@ let count = 1;
 function flattenTreeRecursive(items, parent, level = 1) {
     return items.reduce((acc, { subtree , ...item }, index)=>{
         var _item_id;
+        const id = (_item_id = item.id) !== null && _item_id !== void 0 ? _item_id : `fui-FlatTreeItem-${count++}`;
+        var _item_value;
         const flatTreeItem = {
             'aria-level': level,
             'aria-posinset': index + 1,
             'aria-setsize': items.length,
-            parentId: parent === null || parent === void 0 ? void 0 : parent.id,
-            id: (_item_id = item.id) !== null && _item_id !== void 0 ? _item_id : `fui-FlatTreeItem-${count++}`,
+            parentValue: parent === null || parent === void 0 ? void 0 : parent.value,
+            value: (_item_value = item.value) !== null && _item_value !== void 0 ? _item_value : id,
             leaf: subtree === undefined,
             ...item
         };
@@ -40,12 +42,14 @@ const flattenTreeFromElement = (root, parent, level = 1)=>{
     return children.reduce((acc, curr, index)=>{
         const [content, subtree] = _react.Children.toArray(curr.props.children);
         var _curr_props_id;
+        const id = (_curr_props_id = curr.props.id) !== null && _curr_props_id !== void 0 ? _curr_props_id : `fui-FlatTreeItem-${count++}`;
+        var _curr_props_value;
         const flatTreeItem = {
             'aria-level': level,
             'aria-posinset': index + 1,
             'aria-setsize': children.length,
-            parentId: parent === null || parent === void 0 ? void 0 : parent.id,
-            id: (_curr_props_id = curr.props.id) !== null && _curr_props_id !== void 0 ? _curr_props_id : `fui-FlatTreeItem-${count++}`,
+            parentValue: parent === null || parent === void 0 ? void 0 : parent.value,
+            value: (_curr_props_value = curr.props.value) !== null && _curr_props_value !== void 0 ? _curr_props_value : id,
             leaf: subtree === undefined,
             ...curr.props,
             children: content

package/lib-commonjs/utils/flattenTree.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../lib/utils/flattenTree.js"],"sourcesContent":["import * as React from 'react';\nlet count = 1;\nfunction flattenTreeRecursive(items, parent, level = 1) {\n  return items.reduce((acc, {\n    subtree,\n    ...item\n  }, index) => {\n    var _item_id;\n    const flatTreeItem = {\n      'aria-level': level,\n      'aria-posinset': index + 1,\n      'aria-setsize': items.length,\n      parentId: parent === null || parent === void 0 ? void 0 : parent.id,\n      id: (_item_id = item.id) !== null && _item_id !== void 0 ? _item_id : `fui-FlatTreeItem-${count++}`,\n      leaf: subtree === undefined,\n      ...item\n    };\n    acc.push(flatTreeItem);\n    if (subtree !== undefined) {\n      acc.push(...flattenTreeRecursive(subtree, flatTreeItem, level + 1));\n    }\n    return acc;\n  }, []);\n}\n/**\n * Converts a nested structure to a flat one which can be consumed by `useFlatTreeItems`\n * @example\n * ```tsx\n * const defaultItems = flattenTree_unstable([\n *  {\n *    children: <TreeItemLayout>level 1, item 1</TreeItemLayout>,\n *    subtree: [\n *      {\n *        children: <TreeItemLayout>level 2, item 1</TreeItemLayout>,\n *      },\n *      {\n *        children: <TreeItemLayout>level 2, item 2</TreeItemLayout>,\n *      },\n *      {\n *        children: <TreeItemLayout>level 2, item 3</TreeItemLayout>,\n *      },\n *    ],\n *  },\n *  {\n *    children: <TreeItemLayout>level 1, item 2</TreeItemLayout>,\n *    subtree: [\n *      {\n *        children: <TreeItemLayout>level 2, item 1</TreeItemLayout>,\n *        subtree: [\n *          {\n *            children: <TreeItemLayout>level 3, item 1</TreeItemLayout>,\n *            subtree: [\n *              {\n *                children: <TreeItemLayout>level 4, item 1</TreeItemLayout>,\n *              },\n *            ],\n *          },\n *        ],\n *      },\n *    ],\n *  },\n * ]);\n * ```\n */ // eslint-disable-next-line @typescript-eslint/naming-convention\nexport const flattenTree_unstable = items => flattenTreeRecursive(items);\n/**\n * @internal\n */\nexport const flattenTreeFromElement = (root, parent, level = 1) => {\n  const children = React.Children.toArray(root.props.children);\n  return children.reduce((acc, curr, index) => {\n    const [content, subtree] = React.Children.toArray(curr.props.children);\n    var _curr_props_id;\n    const flatTreeItem = {\n      'aria-level': level,\n      'aria-posinset': index + 1,\n      'aria-setsize': children.length,\n      parentId: parent === null || parent === void 0 ? void 0 : parent.id,\n      id: (_curr_props_id = curr.props.id) !== null && _curr_props_id !== void 0 ? _curr_props_id : `fui-FlatTreeItem-${count++}`,\n      leaf: subtree === undefined,\n      ...curr.props,\n      children: content\n    };\n    acc.push(flatTreeItem);\n    if (subtree !== undefined) {\n      acc.push(...flattenTreeFromElement(subtree, flatTreeItem, level + 1));\n    }\n    return acc;\n  }, []);\n};\n//# sourceMappingURL=flattenTree.js.map"],"names":["flattenTree_unstable","flattenTreeFromElement","count","flattenTreeRecursive","items","parent","level","reduce","acc","subtree","item","index","_item_id","flatTreeItem","length","parentId","id","leaf","undefined","push","root","children","React","Children","toArray","props","curr","content","_curr_props_id"],"mappings":";;;;;;;;;;;IAgEaA,oBAAoB,MAApBA;IAIAC,sBAAsB,MAAtBA;;;6DApEU;AACvB,IAAIC,QAAQ;AACZ,SAASC,qBAAqBC,KAAK,EAAEC,MAAM,EAAEC,QAAQ,CAAC,EAAE;IACtD,OAAOF,MAAMG,MAAM,CAAC,CAACC,KAAK,EACxBC,QAAO,EACP,GAAGC,MACJ,EAAEC,QAAU;QACX,IAAIC;QACJ,MAAMC,eAAe;YACnB,cAAcP;YACd,iBAAiBK,QAAQ;YACzB,gBAAgBP,MAAMU,MAAM;YAC5BC,UAAUV,WAAW,IAAI,IAAIA,WAAW,KAAK,IAAI,KAAK,IAAIA,OAAOW,EAAE;YACnEA,IAAI,AAACJ,CAAAA,WAAWF,KAAKM,EAAE,AAAD,MAAO,IAAI,IAAIJ,aAAa,KAAK,IAAIA,WAAW,CAAC,iBAAiB,EAAEV,QAAQ,CAAC;YACnGe,MAAMR,YAAYS;YAClB,GAAGR,IAAI;QACT;QACAF,IAAIW,IAAI,CAACN;QACT,IAAIJ,YAAYS,WAAW;YACzBV,IAAIW,IAAI,IAAIhB,qBAAqBM,SAASI,cAAcP,QAAQ;QAClE,CAAC;QACD,OAAOE;IACT,GAAG,EAAE;AACP;AAyCO,MAAMR,uBAAuBI,CAAAA,QAASD,qBAAqBC;AAI3D,MAAMH,yBAAyB,CAACmB,MAAMf,QAAQC,QAAQ,CAAC,GAAK;IACjE,MAAMe,WAAWC,OAAMC,QAAQ,CAACC,OAAO,CAACJ,KAAKK,KAAK,CAACJ,QAAQ;IAC3D,OAAOA,SAASd,MAAM,CAAC,CAACC,KAAKkB,MAAMf,QAAU;QAC3C,MAAM,CAACgB,SAASlB,QAAQ,GAAGa,OAAMC,QAAQ,CAACC,OAAO,CAACE,KAAKD,KAAK,CAACJ,QAAQ;QACrE,IAAIO;QACJ,MAAMf,eAAe;YACnB,cAAcP;YACd,iBAAiBK,QAAQ;YACzB,gBAAgBU,SAASP,MAAM;YAC/BC,UAAUV,WAAW,IAAI,IAAIA,WAAW,KAAK,IAAI,KAAK,IAAIA,OAAOW,EAAE;YACnEA,IAAI,AAACY,CAAAA,iBAAiBF,KAAKD,KAAK,CAACT,EAAE,AAAD,MAAO,IAAI,IAAIY,mBAAmB,KAAK,IAAIA,iBAAiB,CAAC,iBAAiB,EAAE1B,QAAQ,CAAC;YAC3He,MAAMR,YAAYS;YAClB,GAAGQ,KAAKD,KAAK;YACbJ,UAAUM;QACZ;QACAnB,IAAIW,IAAI,CAACN;QACT,IAAIJ,YAAYS,WAAW;YACzBV,IAAIW,IAAI,IAAIlB,uBAAuBQ,SAASI,cAAcP,QAAQ;QACpE,CAAC;QACD,OAAOE;IACT,GAAG,EAAE;AACP,GACA,uCAAuC"}
+{"version":3,"sources":["../../lib/utils/flattenTree.js"],"sourcesContent":["import * as React from 'react';\nlet count = 1;\nfunction flattenTreeRecursive(items, parent, level = 1) {\n  return items.reduce((acc, {\n    subtree,\n    ...item\n  }, index) => {\n    var _item_id;\n    const id = (_item_id = item.id) !== null && _item_id !== void 0 ? _item_id : `fui-FlatTreeItem-${count++}`;\n    var _item_value;\n    const flatTreeItem = {\n      'aria-level': level,\n      'aria-posinset': index + 1,\n      'aria-setsize': items.length,\n      parentValue: parent === null || parent === void 0 ? void 0 : parent.value,\n      value: (_item_value = item.value) !== null && _item_value !== void 0 ? _item_value : id,\n      leaf: subtree === undefined,\n      ...item\n    };\n    acc.push(flatTreeItem);\n    if (subtree !== undefined) {\n      acc.push(...flattenTreeRecursive(subtree, flatTreeItem, level + 1));\n    }\n    return acc;\n  }, []);\n}\n/**\n * Converts a nested structure to a flat one which can be consumed by `useFlatTreeItems`\n * @example\n * ```tsx\n * const defaultItems = flattenTree_unstable([\n *  {\n *    children: <TreeItemLayout>level 1, item 1</TreeItemLayout>,\n *    subtree: [\n *      {\n *        children: <TreeItemLayout>level 2, item 1</TreeItemLayout>,\n *      },\n *      {\n *        children: <TreeItemLayout>level 2, item 2</TreeItemLayout>,\n *      },\n *      {\n *        children: <TreeItemLayout>level 2, item 3</TreeItemLayout>,\n *      },\n *    ],\n *  },\n *  {\n *    children: <TreeItemLayout>level 1, item 2</TreeItemLayout>,\n *    subtree: [\n *      {\n *        children: <TreeItemLayout>level 2, item 1</TreeItemLayout>,\n *        subtree: [\n *          {\n *            children: <TreeItemLayout>level 3, item 1</TreeItemLayout>,\n *            subtree: [\n *              {\n *                children: <TreeItemLayout>level 4, item 1</TreeItemLayout>,\n *              },\n *            ],\n *          },\n *        ],\n *      },\n *    ],\n *  },\n * ]);\n * ```\n */ // eslint-disable-next-line @typescript-eslint/naming-convention\nexport const flattenTree_unstable = items => flattenTreeRecursive(items);\n/**\n * @internal\n */\nexport const flattenTreeFromElement = (root, parent, level = 1) => {\n  const children = React.Children.toArray(root.props.children);\n  return children.reduce((acc, curr, index) => {\n    const [content, subtree] = React.Children.toArray(curr.props.children);\n    var _curr_props_id;\n    const id = (_curr_props_id = curr.props.id) !== null && _curr_props_id !== void 0 ? _curr_props_id : `fui-FlatTreeItem-${count++}`;\n    var _curr_props_value;\n    const flatTreeItem = {\n      'aria-level': level,\n      'aria-posinset': index + 1,\n      'aria-setsize': children.length,\n      parentValue: parent === null || parent === void 0 ? void 0 : parent.value,\n      value: (_curr_props_value = curr.props.value) !== null && _curr_props_value !== void 0 ? _curr_props_value : id,\n      leaf: subtree === undefined,\n      ...curr.props,\n      children: content\n    };\n    acc.push(flatTreeItem);\n    if (subtree !== undefined) {\n      acc.push(...flattenTreeFromElement(subtree, flatTreeItem, level + 1));\n    }\n    return acc;\n  }, []);\n};\n//# sourceMappingURL=flattenTree.js.map"],"names":["flattenTree_unstable","flattenTreeFromElement","count","flattenTreeRecursive","items","parent","level","reduce","acc","subtree","item","index","_item_id","id","_item_value","flatTreeItem","length","parentValue","value","leaf","undefined","push","root","children","React","Children","toArray","props","curr","content","_curr_props_id","_curr_props_value"],"mappings":";;;;;;;;;;;IAkEaA,oBAAoB,MAApBA;IAIAC,sBAAsB,MAAtBA;;;6DAtEU;AACvB,IAAIC,QAAQ;AACZ,SAASC,qBAAqBC,KAAK,EAAEC,MAAM,EAAEC,QAAQ,CAAC,EAAE;IACtD,OAAOF,MAAMG,MAAM,CAAC,CAACC,KAAK,EACxBC,QAAO,EACP,GAAGC,MACJ,EAAEC,QAAU;QACX,IAAIC;QACJ,MAAMC,KAAK,AAACD,CAAAA,WAAWF,KAAKG,EAAE,AAAD,MAAO,IAAI,IAAID,aAAa,KAAK,IAAIA,WAAW,CAAC,iBAAiB,EAAEV,QAAQ,CAAC;QAC1G,IAAIY;QACJ,MAAMC,eAAe;YACnB,cAAcT;YACd,iBAAiBK,QAAQ;YACzB,gBAAgBP,MAAMY,MAAM;YAC5BC,aAAaZ,WAAW,IAAI,IAAIA,WAAW,KAAK,IAAI,KAAK,IAAIA,OAAOa,KAAK;YACzEA,OAAO,AAACJ,CAAAA,cAAcJ,KAAKQ,KAAK,AAAD,MAAO,IAAI,IAAIJ,gBAAgB,KAAK,IAAIA,cAAcD,EAAE;YACvFM,MAAMV,YAAYW;YAClB,GAAGV,IAAI;QACT;QACAF,IAAIa,IAAI,CAACN;QACT,IAAIN,YAAYW,WAAW;YACzBZ,IAAIa,IAAI,IAAIlB,qBAAqBM,SAASM,cAAcT,QAAQ;QAClE,CAAC;QACD,OAAOE;IACT,GAAG,EAAE;AACP;AAyCO,MAAMR,uBAAuBI,CAAAA,QAASD,qBAAqBC;AAI3D,MAAMH,yBAAyB,CAACqB,MAAMjB,QAAQC,QAAQ,CAAC,GAAK;IACjE,MAAMiB,WAAWC,OAAMC,QAAQ,CAACC,OAAO,CAACJ,KAAKK,KAAK,CAACJ,QAAQ;IAC3D,OAAOA,SAAShB,MAAM,CAAC,CAACC,KAAKoB,MAAMjB,QAAU;QAC3C,MAAM,CAACkB,SAASpB,QAAQ,GAAGe,OAAMC,QAAQ,CAACC,OAAO,CAACE,KAAKD,KAAK,CAACJ,QAAQ;QACrE,IAAIO;QACJ,MAAMjB,KAAK,AAACiB,CAAAA,iBAAiBF,KAAKD,KAAK,CAACd,EAAE,AAAD,MAAO,IAAI,IAAIiB,mBAAmB,KAAK,IAAIA,iBAAiB,CAAC,iBAAiB,EAAE5B,QAAQ,CAAC;QAClI,IAAI6B;QACJ,MAAMhB,eAAe;YACnB,cAAcT;YACd,iBAAiBK,QAAQ;YACzB,gBAAgBY,SAASP,MAAM;YAC/BC,aAAaZ,WAAW,IAAI,IAAIA,WAAW,KAAK,IAAI,KAAK,IAAIA,OAAOa,KAAK;YACzEA,OAAO,AAACa,CAAAA,oBAAoBH,KAAKD,KAAK,CAACT,KAAK,AAAD,MAAO,IAAI,IAAIa,sBAAsB,KAAK,IAAIA,oBAAoBlB,EAAE;YAC/GM,MAAMV,YAAYW;YAClB,GAAGQ,KAAKD,KAAK;YACbJ,UAAUM;QACZ;QACArB,IAAIa,IAAI,CAACN;QACT,IAAIN,YAAYW,WAAW;YACzBZ,IAAIa,IAAI,IAAIpB,uBAAuBQ,SAASM,cAAcT,QAAQ;QACpE,CAAC;QACD,OAAOE;IACT,GAAG,EAAE;AACP,GACA,uCAAuC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluentui/react-tree",
-  "version": "9.0.0-beta.10",
+  "version": "9.0.0-beta.12",
   "description": "React components for building web experiences",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
@@ -36,16 +36,17 @@
   },
   "dependencies": {
     "@fluentui/keyboard-keys": "^9.0.2",
-    "@fluentui/react-aria": "^9.3.17",
-    "@fluentui/react-avatar": "^9.4.8",
-    "@fluentui/react-button": "^9.3.8",
-    "@fluentui/react-context-selector": "^9.1.17",
+    "@fluentui/react-aria": "^9.3.18",
+    "@fluentui/react-avatar": "^9.4.10",
+    "@fluentui/react-button": "^9.3.10",
+    "@fluentui/react-context-selector": "^9.1.18",
     "@fluentui/react-icons": "^2.0.196",
-    "@fluentui/react-portal": "^9.2.5",
+    "@fluentui/react-portal": "^9.2.6",
     "@fluentui/react-shared-contexts": "^9.3.3",
-    "@fluentui/react-tabster": "^9.6.4",
+    "@fluentui/react-tabster": "^9.6.5",
     "@fluentui/react-theme": "^9.1.7",
-    "@fluentui/react-utilities": "^9.7.4",
+    "@fluentui/react-utilities": "^9.8.0",
+    "@fluentui/react-jsx-runtime": "9.0.0-alpha.2",
     "@griffel/react": "^1.5.2",
     "@swc/helpers": "^0.4.14"
   },