@react-aria/collections 3.0.0-nightly.5042 → 3.0.0-rc.0

package/dist/BaseCollection.main.js

@@ -35,6 +35,8 @@ $parcel$export(module.exports, "BaseCollection", () => $499e2959ba1abacc$export$
         node.lastChildKey = this.lastChildKey;
         node.props = this.props;
         node.render = this.render;
+        node.colSpan = this.colSpan;
+        node.colIndex = this.colIndex;
         return node;
     }
     constructor(type, key){
@@ -51,6 +53,8 @@ $parcel$export(module.exports, "BaseCollection", () => $499e2959ba1abacc$export$
         this.firstChildKey = null;
         this.lastChildKey = null;
         this.props = {};
+        this.colSpan = null;
+        this.colIndex = null;
         this.type = type;
         this.key = key;
     }
@@ -145,6 +149,91 @@ class $499e2959ba1abacc$export$408d25a4e12db025 {
         this.lastKey = lastKey;
         this.frozen = !isSSR;
     }
+    // TODO: this is pretty specific to menu, will need to check if it is generic enough
+    // Will need to handle varying levels I assume but will revisit after I get searchable menu working for base menu
+    // TODO: an alternative is to simply walk the collection and add all item nodes that match the filter and any sections/separators we encounter
+    // to an array, then walk that new array and fix all the next/Prev keys while adding them to the new collection
+    UNSTABLE_filter(filterFn) {
+        let newCollection = new $499e2959ba1abacc$export$408d25a4e12db025();
+        // This tracks the absolute last node we've visited in the collection when filtering, used for setting up the filteredCollection's lastKey and
+        // for updating the next/prevKey for every non-filtered node.
+        let lastNode = null;
+        for (let node of this){
+            if (node.type === 'section' && node.hasChildNodes) {
+                let clonedSection = node.clone();
+                let lastChildInSection = null;
+                for (let child of this.getChildren(node.key))if ($499e2959ba1abacc$var$shouldKeepNode(child, filterFn, this, newCollection)) {
+                    let clonedChild = child.clone();
+                    // eslint-disable-next-line max-depth
+                    if (lastChildInSection == null) clonedSection.firstChildKey = clonedChild.key;
+                    // eslint-disable-next-line max-depth
+                    if (newCollection.firstKey == null) newCollection.firstKey = clonedSection.key;
+                    // eslint-disable-next-line max-depth
+                    if (lastChildInSection && lastChildInSection.parentKey === clonedChild.parentKey) {
+                        lastChildInSection.nextKey = clonedChild.key;
+                        clonedChild.prevKey = lastChildInSection.key;
+                    } else clonedChild.prevKey = null;
+                    clonedChild.nextKey = null;
+                    newCollection.addNode(clonedChild);
+                    lastChildInSection = clonedChild;
+                }
+                // Add newly filtered section to collection if it has any valid child nodes, otherwise remove it and its header if any
+                if (lastChildInSection) {
+                    if (lastChildInSection.type !== 'header') {
+                        clonedSection.lastChildKey = lastChildInSection.key;
+                        // If the old prev section was filtered out, will need to attach to whatever came before
+                        // eslint-disable-next-line max-depth
+                        if (lastNode == null) clonedSection.prevKey = null;
+                        else if (lastNode.type === 'section' || lastNode.type === 'separator') {
+                            lastNode.nextKey = clonedSection.key;
+                            clonedSection.prevKey = lastNode.key;
+                        }
+                        clonedSection.nextKey = null;
+                        lastNode = clonedSection;
+                        newCollection.addNode(clonedSection);
+                    } else {
+                        if (newCollection.firstKey === clonedSection.key) newCollection.firstKey = null;
+                        newCollection.removeNode(lastChildInSection.key);
+                    }
+                }
+            } else if (node.type === 'separator') {
+                // will need to check if previous section key exists, if it does then we add the separator to the collection.
+                // After the full collection is created we'll need to remove it it is the last node in the section (aka no following section after the separator)
+                let clonedSeparator = node.clone();
+                clonedSeparator.nextKey = null;
+                if ((lastNode === null || lastNode === void 0 ? void 0 : lastNode.type) === 'section') {
+                    lastNode.nextKey = clonedSeparator.key;
+                    clonedSeparator.prevKey = lastNode.key;
+                    lastNode = clonedSeparator;
+                    newCollection.addNode(clonedSeparator);
+                }
+            } else {
+                // At this point, the node is either a subdialogtrigger node or a standard row/item
+                let clonedNode = node.clone();
+                if ($499e2959ba1abacc$var$shouldKeepNode(clonedNode, filterFn, this, newCollection)) {
+                    if (newCollection.firstKey == null) newCollection.firstKey = clonedNode.key;
+                    if (lastNode != null && lastNode.type !== 'section' && lastNode.type !== 'separator' && lastNode.parentKey === clonedNode.parentKey) {
+                        lastNode.nextKey = clonedNode.key;
+                        clonedNode.prevKey = lastNode.key;
+                    } else clonedNode.prevKey = null;
+                    clonedNode.nextKey = null;
+                    newCollection.addNode(clonedNode);
+                    lastNode = clonedNode;
+                }
+            }
+        }
+        if ((lastNode === null || lastNode === void 0 ? void 0 : lastNode.type) === 'separator' && lastNode.nextKey === null) {
+            let lastSection;
+            if (lastNode.prevKey != null) {
+                lastSection = newCollection.getItem(lastNode.prevKey);
+                lastSection.nextKey = null;
+            }
+            newCollection.removeNode(lastNode.key);
+            lastNode = lastSection;
+        }
+        newCollection.lastKey = (lastNode === null || lastNode === void 0 ? void 0 : lastNode.key) || null;
+        return newCollection;
+    }
     constructor(){
         this.keyMap = new Map();
         this.firstKey = null;
@@ -152,6 +241,21 @@ class $499e2959ba1abacc$export$408d25a4e12db025 {
         this.frozen = false;
     }
 }
+function $499e2959ba1abacc$var$shouldKeepNode(node, filterFn, oldCollection, newCollection) {
+    if (node.type === 'subdialogtrigger' || node.type === 'submenutrigger') {
+        // Subdialog wrapper should only have one child, if it passes the filter add it to the new collection since we don't need to
+        // do any extra handling for its first/next key
+        let triggerChild = [
+            ...oldCollection.getChildren(node.key)
+        ][0];
+        if (triggerChild && filterFn(triggerChild.textValue)) {
+            let clonedChild = triggerChild.clone();
+            newCollection.addNode(clonedChild);
+            return true;
+        } else return false;
+    } else if (node.type === 'header') return true;
+    else return filterFn(node.textValue);
+}
 
 
 //# sourceMappingURL=BaseCollection.main.js.map

package/dist/BaseCollection.main.js.map

@@ -1 +1 @@
-{"mappings":"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","sources":["packages/@react-aria/collections/src/BaseCollection.ts"],"sourcesContent":["/*\n * Copyright 2024 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {Collection as ICollection, Key, Node} from '@react-types/shared';\nimport {ReactElement, ReactNode} from 'react';\n\nexport type Mutable<T> = {\n  -readonly[P in keyof T]: T[P]\n}\n\n/** An immutable object representing a Node in a Collection. */\nexport class CollectionNode<T> implements Node<T> {\n  readonly type: string;\n  readonly key: Key;\n  readonly value: T | null = null;\n  readonly level: number = 0;\n  readonly hasChildNodes: boolean = false;\n  readonly rendered: ReactNode = null;\n  readonly textValue: string = '';\n  readonly 'aria-label'?: string = undefined;\n  readonly index: number = 0;\n  readonly parentKey: Key | null = null;\n  readonly prevKey: Key | null = null;\n  readonly nextKey: Key | null = null;\n  readonly firstChildKey: Key | null = null;\n  readonly lastChildKey: Key | null = null;\n  readonly props: any = {};\n  readonly render?: (node: Node<any>) => ReactElement;\n\n  constructor(type: string, key: Key) {\n    this.type = type;\n    this.key = key;\n  }\n\n  get childNodes(): Iterable<Node<T>> {\n    throw new Error('childNodes is not supported');\n  }\n\n  clone(): CollectionNode<T> {\n    let node: Mutable<CollectionNode<T>> = new CollectionNode(this.type, this.key);\n    node.value = this.value;\n    node.level = this.level;\n    node.hasChildNodes = this.hasChildNodes;\n    node.rendered = this.rendered;\n    node.textValue = this.textValue;\n    node['aria-label'] = this['aria-label'];\n    node.index = this.index;\n    node.parentKey = this.parentKey;\n    node.prevKey = this.prevKey;\n    node.nextKey = this.nextKey;\n    node.firstChildKey = this.firstChildKey;\n    node.lastChildKey = this.lastChildKey;\n    node.props = this.props;\n    node.render = this.render;\n    return node;\n  }\n}\n\n/**\n * An immutable Collection implementation. Updates are only allowed\n * when it is not marked as frozen. This can be subclassed to implement\n * custom collection behaviors.\n */\nexport class BaseCollection<T> implements ICollection<Node<T>> {\n  private keyMap: Map<Key, CollectionNode<T>> = new Map();\n  private firstKey: Key | null = null;\n  private lastKey: Key | null = null;\n  private frozen = false;\n\n  get size() {\n    return this.keyMap.size;\n  }\n\n  getKeys() {\n    return this.keyMap.keys();\n  }\n\n  *[Symbol.iterator]() {\n    let node: Node<T> | undefined = this.firstKey != null ? this.keyMap.get(this.firstKey) : undefined;\n    while (node) {\n      yield node;\n      node = node.nextKey != null ? this.keyMap.get(node.nextKey) : undefined;\n    }\n  }\n\n  getChildren(key: Key): Iterable<Node<T>> {\n    let keyMap = this.keyMap;\n    return {\n      *[Symbol.iterator]() {\n        let parent = keyMap.get(key);\n        let node = parent?.firstChildKey != null ? keyMap.get(parent.firstChildKey) : null;\n        while (node) {\n          yield node as Node<T>;\n          node = node.nextKey != null ? keyMap.get(node.nextKey) : undefined;\n        }\n      }\n    };\n  }\n\n  getKeyBefore(key: Key) {\n    let node = this.keyMap.get(key);\n    if (!node) {\n      return null;\n    }\n\n    if (node.prevKey != null) {\n      node = this.keyMap.get(node.prevKey);\n\n      while (node && node.type !== 'item' && node.lastChildKey != null) {\n        node = this.keyMap.get(node.lastChildKey);\n      }\n\n      return node?.key ?? null;\n    }\n\n    return node.parentKey;\n  }\n\n  getKeyAfter(key: Key) {\n    let node = this.keyMap.get(key);\n    if (!node) {\n      return null;\n    }\n\n    if (node.type !== 'item' && node.firstChildKey != null) {\n      return node.firstChildKey;\n    }\n\n    while (node) {\n      if (node.nextKey != null) {\n        return node.nextKey;\n      }\n\n      if (node.parentKey != null) {\n        node = this.keyMap.get(node.parentKey);\n      } else {\n        return null;\n      }\n    }\n\n    return null;\n  }\n\n  getFirstKey() {\n    return this.firstKey;\n  }\n\n  getLastKey() {\n    let node = this.lastKey != null ? this.keyMap.get(this.lastKey) : null;\n    while (node?.lastChildKey != null) {\n      node = this.keyMap.get(node.lastChildKey);\n    }\n\n    return node?.key ?? null;\n  }\n\n  getItem(key: Key): Node<T> | null {\n    return this.keyMap.get(key) ?? null;\n  }\n\n  at(): Node<T> {\n    throw new Error('Not implemented');\n  }\n\n  clone(): this {\n    // We need to clone using this.constructor so that subclasses have the right prototype.\n    // TypeScript isn't happy about this yet.\n    // https://github.com/microsoft/TypeScript/issues/3841\n    let Constructor: any = this.constructor;\n    let collection: this = new Constructor();\n    collection.keyMap = new Map(this.keyMap);\n    collection.firstKey = this.firstKey;\n    collection.lastKey = this.lastKey;\n    return collection;\n  }\n\n  addNode(node: CollectionNode<T>) {\n    if (this.frozen) {\n      throw new Error('Cannot add a node to a frozen collection');\n    }\n\n    this.keyMap.set(node.key, node);\n  }\n\n  removeNode(key: Key) {\n    if (this.frozen) {\n      throw new Error('Cannot remove a node to a frozen collection');\n    }\n\n    this.keyMap.delete(key);\n  }\n\n  commit(firstKey: Key | null, lastKey: Key | null, isSSR = false) {\n    if (this.frozen) {\n      throw new Error('Cannot commit a frozen collection');\n    }\n\n    this.firstKey = firstKey;\n    this.lastKey = lastKey;\n    this.frozen = !isSSR;\n  }\n}\n"],"names":[],"version":3,"file":"BaseCollection.main.js.map"}
+{"mappings":"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","sources":["packages/@react-aria/collections/src/BaseCollection.ts"],"sourcesContent":["/*\n * Copyright 2024 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {Collection as ICollection, Key, Node} from '@react-types/shared';\nimport {ReactElement, ReactNode} from 'react';\n\nexport type Mutable<T> = {\n  -readonly[P in keyof T]: T[P]\n}\n\n/** An immutable object representing a Node in a Collection. */\nexport class CollectionNode<T> implements Node<T> {\n  readonly type: string;\n  readonly key: Key;\n  readonly value: T | null = null;\n  readonly level: number = 0;\n  readonly hasChildNodes: boolean = false;\n  readonly rendered: ReactNode = null;\n  readonly textValue: string = '';\n  readonly 'aria-label'?: string = undefined;\n  readonly index: number = 0;\n  readonly parentKey: Key | null = null;\n  readonly prevKey: Key | null = null;\n  readonly nextKey: Key | null = null;\n  readonly firstChildKey: Key | null = null;\n  readonly lastChildKey: Key | null = null;\n  readonly props: any = {};\n  readonly render?: (node: Node<any>) => ReactElement;\n  readonly colSpan: number | null = null;\n  readonly colIndex: number | null = null;\n\n  constructor(type: string, key: Key) {\n    this.type = type;\n    this.key = key;\n  }\n\n  get childNodes(): Iterable<Node<T>> {\n    throw new Error('childNodes is not supported');\n  }\n\n  clone(): CollectionNode<T> {\n    let node: Mutable<CollectionNode<T>> = new CollectionNode(this.type, this.key);\n    node.value = this.value;\n    node.level = this.level;\n    node.hasChildNodes = this.hasChildNodes;\n    node.rendered = this.rendered;\n    node.textValue = this.textValue;\n    node['aria-label'] = this['aria-label'];\n    node.index = this.index;\n    node.parentKey = this.parentKey;\n    node.prevKey = this.prevKey;\n    node.nextKey = this.nextKey;\n    node.firstChildKey = this.firstChildKey;\n    node.lastChildKey = this.lastChildKey;\n    node.props = this.props;\n    node.render = this.render;\n    node.colSpan = this.colSpan;\n    node.colIndex = this.colIndex;\n    return node;\n  }\n}\n\n/**\n * An immutable Collection implementation. Updates are only allowed\n * when it is not marked as frozen. This can be subclassed to implement\n * custom collection behaviors.\n */\nexport class BaseCollection<T> implements ICollection<Node<T>> {\n  private keyMap: Map<Key, CollectionNode<T>> = new Map();\n  private firstKey: Key | null = null;\n  private lastKey: Key | null = null;\n  private frozen = false;\n\n  get size(): number {\n    return this.keyMap.size;\n  }\n\n  getKeys(): IterableIterator<Key> {\n    return this.keyMap.keys();\n  }\n\n  *[Symbol.iterator](): IterableIterator<Node<T>> {\n    let node: Node<T> | undefined = this.firstKey != null ? this.keyMap.get(this.firstKey) : undefined;\n    while (node) {\n      yield node;\n      node = node.nextKey != null ? this.keyMap.get(node.nextKey) : undefined;\n    }\n  }\n\n  getChildren(key: Key): Iterable<Node<T>> {\n    let keyMap = this.keyMap;\n    return {\n      *[Symbol.iterator]() {\n        let parent = keyMap.get(key);\n        let node = parent?.firstChildKey != null ? keyMap.get(parent.firstChildKey) : null;\n        while (node) {\n          yield node as Node<T>;\n          node = node.nextKey != null ? keyMap.get(node.nextKey) : undefined;\n        }\n      }\n    };\n  }\n\n  getKeyBefore(key: Key): Key | null {\n    let node = this.keyMap.get(key);\n    if (!node) {\n      return null;\n    }\n\n    if (node.prevKey != null) {\n      node = this.keyMap.get(node.prevKey);\n\n      while (node && node.type !== 'item' && node.lastChildKey != null) {\n        node = this.keyMap.get(node.lastChildKey);\n      }\n\n      return node?.key ?? null;\n    }\n\n    return node.parentKey;\n  }\n\n  getKeyAfter(key: Key): Key | null {\n    let node = this.keyMap.get(key);\n    if (!node) {\n      return null;\n    }\n\n    if (node.type !== 'item' && node.firstChildKey != null) {\n      return node.firstChildKey;\n    }\n\n    while (node) {\n      if (node.nextKey != null) {\n        return node.nextKey;\n      }\n\n      if (node.parentKey != null) {\n        node = this.keyMap.get(node.parentKey);\n      } else {\n        return null;\n      }\n    }\n\n    return null;\n  }\n\n  getFirstKey(): Key | null {\n    return this.firstKey;\n  }\n\n  getLastKey(): Key | null {\n    let node = this.lastKey != null ? this.keyMap.get(this.lastKey) : null;\n    while (node?.lastChildKey != null) {\n      node = this.keyMap.get(node.lastChildKey);\n    }\n\n    return node?.key ?? null;\n  }\n\n  getItem(key: Key): Node<T> | null {\n    return this.keyMap.get(key) ?? null;\n  }\n\n  at(): Node<T> {\n    throw new Error('Not implemented');\n  }\n\n  clone(): this {\n    // We need to clone using this.constructor so that subclasses have the right prototype.\n    // TypeScript isn't happy about this yet.\n    // https://github.com/microsoft/TypeScript/issues/3841\n    let Constructor: any = this.constructor;\n    let collection: this = new Constructor();\n    collection.keyMap = new Map(this.keyMap);\n    collection.firstKey = this.firstKey;\n    collection.lastKey = this.lastKey;\n    return collection;\n  }\n\n  addNode(node: CollectionNode<T>): void {\n    if (this.frozen) {\n      throw new Error('Cannot add a node to a frozen collection');\n    }\n\n    this.keyMap.set(node.key, node);\n  }\n\n  removeNode(key: Key): void {\n    if (this.frozen) {\n      throw new Error('Cannot remove a node to a frozen collection');\n    }\n\n    this.keyMap.delete(key);\n  }\n\n  commit(firstKey: Key | null, lastKey: Key | null, isSSR = false): void {\n    if (this.frozen) {\n      throw new Error('Cannot commit a frozen collection');\n    }\n\n    this.firstKey = firstKey;\n    this.lastKey = lastKey;\n    this.frozen = !isSSR;\n  }\n\n  // TODO: this is pretty specific to menu, will need to check if it is generic enough\n  // Will need to handle varying levels I assume but will revisit after I get searchable menu working for base menu\n  // TODO: an alternative is to simply walk the collection and add all item nodes that match the filter and any sections/separators we encounter\n  // to an array, then walk that new array and fix all the next/Prev keys while adding them to the new collection\n  UNSTABLE_filter(filterFn: (nodeValue: string) => boolean): BaseCollection<T> {\n    let newCollection = new BaseCollection<T>();\n    // This tracks the absolute last node we've visited in the collection when filtering, used for setting up the filteredCollection's lastKey and\n    // for updating the next/prevKey for every non-filtered node.\n    let lastNode: Mutable<CollectionNode<T>> | null = null;\n\n    for (let node of this) {\n      if (node.type === 'section' && node.hasChildNodes) {\n        let clonedSection: Mutable<CollectionNode<T>> = (node as CollectionNode<T>).clone();\n        let lastChildInSection: Mutable<CollectionNode<T>> | null = null;\n        for (let child of this.getChildren(node.key)) {\n          if (shouldKeepNode(child, filterFn, this, newCollection)) {\n            let clonedChild: Mutable<CollectionNode<T>> = (child as CollectionNode<T>).clone();\n            // eslint-disable-next-line max-depth\n            if (lastChildInSection == null) {\n              clonedSection.firstChildKey = clonedChild.key;\n            }\n\n            // eslint-disable-next-line max-depth\n            if (newCollection.firstKey == null) {\n              newCollection.firstKey = clonedSection.key;\n            }\n\n            // eslint-disable-next-line max-depth\n            if (lastChildInSection && lastChildInSection.parentKey === clonedChild.parentKey) {\n              lastChildInSection.nextKey = clonedChild.key;\n              clonedChild.prevKey = lastChildInSection.key;\n            } else {\n              clonedChild.prevKey = null;\n            }\n\n            clonedChild.nextKey = null;\n            newCollection.addNode(clonedChild);\n            lastChildInSection = clonedChild;\n          }\n        }\n\n        // Add newly filtered section to collection if it has any valid child nodes, otherwise remove it and its header if any\n        if (lastChildInSection) {\n          if (lastChildInSection.type !== 'header') {\n            clonedSection.lastChildKey = lastChildInSection.key;\n\n            // If the old prev section was filtered out, will need to attach to whatever came before\n            // eslint-disable-next-line max-depth\n            if (lastNode == null) {\n              clonedSection.prevKey = null;\n            } else if (lastNode.type === 'section' || lastNode.type === 'separator') {\n              lastNode.nextKey = clonedSection.key;\n              clonedSection.prevKey = lastNode.key;\n            }\n            clonedSection.nextKey = null;\n            lastNode = clonedSection;\n            newCollection.addNode(clonedSection);\n          } else {\n            if (newCollection.firstKey === clonedSection.key) {\n              newCollection.firstKey = null;\n            }\n            newCollection.removeNode(lastChildInSection.key);\n          }\n        }\n      } else if (node.type === 'separator') {\n        // will need to check if previous section key exists, if it does then we add the separator to the collection.\n        // After the full collection is created we'll need to remove it it is the last node in the section (aka no following section after the separator)\n        let clonedSeparator: Mutable<CollectionNode<T>> = (node as CollectionNode<T>).clone();\n        clonedSeparator.nextKey = null;\n        if (lastNode?.type === 'section') {\n          lastNode.nextKey = clonedSeparator.key;\n          clonedSeparator.prevKey = lastNode.key;\n          lastNode = clonedSeparator;\n          newCollection.addNode(clonedSeparator);\n        }\n      } else {\n        // At this point, the node is either a subdialogtrigger node or a standard row/item\n        let clonedNode: Mutable<CollectionNode<T>> = (node as CollectionNode<T>).clone();\n        if (shouldKeepNode(clonedNode, filterFn, this, newCollection)) {\n          if (newCollection.firstKey == null) {\n            newCollection.firstKey = clonedNode.key;\n          }\n\n          if (lastNode != null && (lastNode.type !== 'section' && lastNode.type !== 'separator') && lastNode.parentKey === clonedNode.parentKey) {\n            lastNode.nextKey = clonedNode.key;\n            clonedNode.prevKey = lastNode.key;\n          } else {\n            clonedNode.prevKey = null;\n          }\n\n          clonedNode.nextKey = null;\n          newCollection.addNode(clonedNode);\n          lastNode = clonedNode;\n        }\n      }\n    }\n\n    if (lastNode?.type === 'separator' && lastNode.nextKey === null) {\n      let lastSection;\n      if (lastNode.prevKey != null) {\n        lastSection = newCollection.getItem(lastNode.prevKey) as Mutable<CollectionNode<T>>;\n        lastSection.nextKey = null;\n      }\n      newCollection.removeNode(lastNode.key);\n      lastNode = lastSection;\n    }\n\n    newCollection.lastKey = lastNode?.key || null;\n\n    return newCollection;\n  }\n}\n\nfunction shouldKeepNode<T>(node: Node<T>, filterFn: (nodeValue: string) => boolean, oldCollection: BaseCollection<T>, newCollection: BaseCollection<T>): boolean {\n  if (node.type === 'subdialogtrigger' || node.type === 'submenutrigger') {\n    // Subdialog wrapper should only have one child, if it passes the filter add it to the new collection since we don't need to\n    // do any extra handling for its first/next key\n    let triggerChild = [...oldCollection.getChildren(node.key)][0];\n    if (triggerChild && filterFn(triggerChild.textValue)) {\n      let clonedChild: Mutable<CollectionNode<T>> = (triggerChild as CollectionNode<T>).clone();\n      newCollection.addNode(clonedChild);\n      return true;\n    } else {\n      return false;\n    }\n  } else if (node.type === 'header') {\n    return true;\n  } else {\n    return filterFn(node.textValue);\n  }\n}\n"],"names":[],"version":3,"file":"BaseCollection.main.js.map"}

package/dist/BaseCollection.mjs

@@ -28,6 +28,8 @@
         node.lastChildKey = this.lastChildKey;
         node.props = this.props;
         node.render = this.render;
+        node.colSpan = this.colSpan;
+        node.colIndex = this.colIndex;
         return node;
     }
     constructor(type, key){
@@ -44,6 +46,8 @@
         this.firstChildKey = null;
         this.lastChildKey = null;
         this.props = {};
+        this.colSpan = null;
+        this.colIndex = null;
         this.type = type;
         this.key = key;
     }
@@ -138,6 +142,91 @@ class $23b9f4fcf0fe224b$export$408d25a4e12db025 {
         this.lastKey = lastKey;
         this.frozen = !isSSR;
     }
+    // TODO: this is pretty specific to menu, will need to check if it is generic enough
+    // Will need to handle varying levels I assume but will revisit after I get searchable menu working for base menu
+    // TODO: an alternative is to simply walk the collection and add all item nodes that match the filter and any sections/separators we encounter
+    // to an array, then walk that new array and fix all the next/Prev keys while adding them to the new collection
+    UNSTABLE_filter(filterFn) {
+        let newCollection = new $23b9f4fcf0fe224b$export$408d25a4e12db025();
+        // This tracks the absolute last node we've visited in the collection when filtering, used for setting up the filteredCollection's lastKey and
+        // for updating the next/prevKey for every non-filtered node.
+        let lastNode = null;
+        for (let node of this){
+            if (node.type === 'section' && node.hasChildNodes) {
+                let clonedSection = node.clone();
+                let lastChildInSection = null;
+                for (let child of this.getChildren(node.key))if ($23b9f4fcf0fe224b$var$shouldKeepNode(child, filterFn, this, newCollection)) {
+                    let clonedChild = child.clone();
+                    // eslint-disable-next-line max-depth
+                    if (lastChildInSection == null) clonedSection.firstChildKey = clonedChild.key;
+                    // eslint-disable-next-line max-depth
+                    if (newCollection.firstKey == null) newCollection.firstKey = clonedSection.key;
+                    // eslint-disable-next-line max-depth
+                    if (lastChildInSection && lastChildInSection.parentKey === clonedChild.parentKey) {
+                        lastChildInSection.nextKey = clonedChild.key;
+                        clonedChild.prevKey = lastChildInSection.key;
+                    } else clonedChild.prevKey = null;
+                    clonedChild.nextKey = null;
+                    newCollection.addNode(clonedChild);
+                    lastChildInSection = clonedChild;
+                }
+                // Add newly filtered section to collection if it has any valid child nodes, otherwise remove it and its header if any
+                if (lastChildInSection) {
+                    if (lastChildInSection.type !== 'header') {
+                        clonedSection.lastChildKey = lastChildInSection.key;
+                        // If the old prev section was filtered out, will need to attach to whatever came before
+                        // eslint-disable-next-line max-depth
+                        if (lastNode == null) clonedSection.prevKey = null;
+                        else if (lastNode.type === 'section' || lastNode.type === 'separator') {
+                            lastNode.nextKey = clonedSection.key;
+                            clonedSection.prevKey = lastNode.key;
+                        }
+                        clonedSection.nextKey = null;
+                        lastNode = clonedSection;
+                        newCollection.addNode(clonedSection);
+                    } else {
+                        if (newCollection.firstKey === clonedSection.key) newCollection.firstKey = null;
+                        newCollection.removeNode(lastChildInSection.key);
+                    }
+                }
+            } else if (node.type === 'separator') {
+                // will need to check if previous section key exists, if it does then we add the separator to the collection.
+                // After the full collection is created we'll need to remove it it is the last node in the section (aka no following section after the separator)
+                let clonedSeparator = node.clone();
+                clonedSeparator.nextKey = null;
+                if ((lastNode === null || lastNode === void 0 ? void 0 : lastNode.type) === 'section') {
+                    lastNode.nextKey = clonedSeparator.key;
+                    clonedSeparator.prevKey = lastNode.key;
+                    lastNode = clonedSeparator;
+                    newCollection.addNode(clonedSeparator);
+                }
+            } else {
+                // At this point, the node is either a subdialogtrigger node or a standard row/item
+                let clonedNode = node.clone();
+                if ($23b9f4fcf0fe224b$var$shouldKeepNode(clonedNode, filterFn, this, newCollection)) {
+                    if (newCollection.firstKey == null) newCollection.firstKey = clonedNode.key;
+                    if (lastNode != null && lastNode.type !== 'section' && lastNode.type !== 'separator' && lastNode.parentKey === clonedNode.parentKey) {
+                        lastNode.nextKey = clonedNode.key;
+                        clonedNode.prevKey = lastNode.key;
+                    } else clonedNode.prevKey = null;
+                    clonedNode.nextKey = null;
+                    newCollection.addNode(clonedNode);
+                    lastNode = clonedNode;
+                }
+            }
+        }
+        if ((lastNode === null || lastNode === void 0 ? void 0 : lastNode.type) === 'separator' && lastNode.nextKey === null) {
+            let lastSection;
+            if (lastNode.prevKey != null) {
+                lastSection = newCollection.getItem(lastNode.prevKey);
+                lastSection.nextKey = null;
+            }
+            newCollection.removeNode(lastNode.key);
+            lastNode = lastSection;
+        }
+        newCollection.lastKey = (lastNode === null || lastNode === void 0 ? void 0 : lastNode.key) || null;
+        return newCollection;
+    }
     constructor(){
         this.keyMap = new Map();
         this.firstKey = null;
@@ -145,6 +234,21 @@ class $23b9f4fcf0fe224b$export$408d25a4e12db025 {
         this.frozen = false;
     }
 }
+function $23b9f4fcf0fe224b$var$shouldKeepNode(node, filterFn, oldCollection, newCollection) {
+    if (node.type === 'subdialogtrigger' || node.type === 'submenutrigger') {
+        // Subdialog wrapper should only have one child, if it passes the filter add it to the new collection since we don't need to
+        // do any extra handling for its first/next key
+        let triggerChild = [
+            ...oldCollection.getChildren(node.key)
+        ][0];
+        if (triggerChild && filterFn(triggerChild.textValue)) {
+            let clonedChild = triggerChild.clone();
+            newCollection.addNode(clonedChild);
+            return true;
+        } else return false;
+    } else if (node.type === 'header') return true;
+    else return filterFn(node.textValue);
+}
 
 
 export {$23b9f4fcf0fe224b$export$d68d59712b04d9d1 as CollectionNode, $23b9f4fcf0fe224b$export$408d25a4e12db025 as BaseCollection};

package/dist/BaseCollection.module.js

@@ -28,6 +28,8 @@
         node.lastChildKey = this.lastChildKey;
         node.props = this.props;
         node.render = this.render;
+        node.colSpan = this.colSpan;
+        node.colIndex = this.colIndex;
         return node;
     }
     constructor(type, key){
@@ -44,6 +46,8 @@
         this.firstChildKey = null;
         this.lastChildKey = null;
         this.props = {};
+        this.colSpan = null;
+        this.colIndex = null;
         this.type = type;
         this.key = key;
     }
@@ -138,6 +142,91 @@ class $23b9f4fcf0fe224b$export$408d25a4e12db025 {
         this.lastKey = lastKey;
         this.frozen = !isSSR;
     }
+    // TODO: this is pretty specific to menu, will need to check if it is generic enough
+    // Will need to handle varying levels I assume but will revisit after I get searchable menu working for base menu
+    // TODO: an alternative is to simply walk the collection and add all item nodes that match the filter and any sections/separators we encounter
+    // to an array, then walk that new array and fix all the next/Prev keys while adding them to the new collection
+    UNSTABLE_filter(filterFn) {
+        let newCollection = new $23b9f4fcf0fe224b$export$408d25a4e12db025();
+        // This tracks the absolute last node we've visited in the collection when filtering, used for setting up the filteredCollection's lastKey and
+        // for updating the next/prevKey for every non-filtered node.
+        let lastNode = null;
+        for (let node of this){
+            if (node.type === 'section' && node.hasChildNodes) {
+                let clonedSection = node.clone();
+                let lastChildInSection = null;
+                for (let child of this.getChildren(node.key))if ($23b9f4fcf0fe224b$var$shouldKeepNode(child, filterFn, this, newCollection)) {
+                    let clonedChild = child.clone();
+                    // eslint-disable-next-line max-depth
+                    if (lastChildInSection == null) clonedSection.firstChildKey = clonedChild.key;
+                    // eslint-disable-next-line max-depth
+                    if (newCollection.firstKey == null) newCollection.firstKey = clonedSection.key;
+                    // eslint-disable-next-line max-depth
+                    if (lastChildInSection && lastChildInSection.parentKey === clonedChild.parentKey) {
+                        lastChildInSection.nextKey = clonedChild.key;
+                        clonedChild.prevKey = lastChildInSection.key;
+                    } else clonedChild.prevKey = null;
+                    clonedChild.nextKey = null;
+                    newCollection.addNode(clonedChild);
+                    lastChildInSection = clonedChild;
+                }
+                // Add newly filtered section to collection if it has any valid child nodes, otherwise remove it and its header if any
+                if (lastChildInSection) {
+                    if (lastChildInSection.type !== 'header') {
+                        clonedSection.lastChildKey = lastChildInSection.key;
+                        // If the old prev section was filtered out, will need to attach to whatever came before
+                        // eslint-disable-next-line max-depth
+                        if (lastNode == null) clonedSection.prevKey = null;
+                        else if (lastNode.type === 'section' || lastNode.type === 'separator') {
+                            lastNode.nextKey = clonedSection.key;
+                            clonedSection.prevKey = lastNode.key;
+                        }
+                        clonedSection.nextKey = null;
+                        lastNode = clonedSection;
+                        newCollection.addNode(clonedSection);
+                    } else {
+                        if (newCollection.firstKey === clonedSection.key) newCollection.firstKey = null;
+                        newCollection.removeNode(lastChildInSection.key);
+                    }
+                }
+            } else if (node.type === 'separator') {
+                // will need to check if previous section key exists, if it does then we add the separator to the collection.
+                // After the full collection is created we'll need to remove it it is the last node in the section (aka no following section after the separator)
+                let clonedSeparator = node.clone();
+                clonedSeparator.nextKey = null;
+                if ((lastNode === null || lastNode === void 0 ? void 0 : lastNode.type) === 'section') {
+                    lastNode.nextKey = clonedSeparator.key;
+                    clonedSeparator.prevKey = lastNode.key;
+                    lastNode = clonedSeparator;
+                    newCollection.addNode(clonedSeparator);
+                }
+            } else {
+                // At this point, the node is either a subdialogtrigger node or a standard row/item
+                let clonedNode = node.clone();
+                if ($23b9f4fcf0fe224b$var$shouldKeepNode(clonedNode, filterFn, this, newCollection)) {
+                    if (newCollection.firstKey == null) newCollection.firstKey = clonedNode.key;
+                    if (lastNode != null && lastNode.type !== 'section' && lastNode.type !== 'separator' && lastNode.parentKey === clonedNode.parentKey) {
+                        lastNode.nextKey = clonedNode.key;
+                        clonedNode.prevKey = lastNode.key;
+                    } else clonedNode.prevKey = null;
+                    clonedNode.nextKey = null;
+                    newCollection.addNode(clonedNode);
+                    lastNode = clonedNode;
+                }
+            }
+        }
+        if ((lastNode === null || lastNode === void 0 ? void 0 : lastNode.type) === 'separator' && lastNode.nextKey === null) {
+            let lastSection;
+            if (lastNode.prevKey != null) {
+                lastSection = newCollection.getItem(lastNode.prevKey);
+                lastSection.nextKey = null;
+            }
+            newCollection.removeNode(lastNode.key);
+            lastNode = lastSection;
+        }
+        newCollection.lastKey = (lastNode === null || lastNode === void 0 ? void 0 : lastNode.key) || null;
+        return newCollection;
+    }
     constructor(){
         this.keyMap = new Map();
         this.firstKey = null;
@@ -145,6 +234,21 @@ class $23b9f4fcf0fe224b$export$408d25a4e12db025 {
         this.frozen = false;
     }
 }
+function $23b9f4fcf0fe224b$var$shouldKeepNode(node, filterFn, oldCollection, newCollection) {
+    if (node.type === 'subdialogtrigger' || node.type === 'submenutrigger') {
+        // Subdialog wrapper should only have one child, if it passes the filter add it to the new collection since we don't need to
+        // do any extra handling for its first/next key
+        let triggerChild = [
+            ...oldCollection.getChildren(node.key)
+        ][0];
+        if (triggerChild && filterFn(triggerChild.textValue)) {
+            let clonedChild = triggerChild.clone();
+            newCollection.addNode(clonedChild);
+            return true;
+        } else return false;
+    } else if (node.type === 'header') return true;
+    else return filterFn(node.textValue);
+}
 
 
 export {$23b9f4fcf0fe224b$export$d68d59712b04d9d1 as CollectionNode, $23b9f4fcf0fe224b$export$408d25a4e12db025 as BaseCollection};

package/dist/BaseCollection.module.js.map

@@ -1 +1 @@
-{"mappings":"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","sources":["packages/@react-aria/collections/src/BaseCollection.ts"],"sourcesContent":["/*\n * Copyright 2024 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {Collection as ICollection, Key, Node} from '@react-types/shared';\nimport {ReactElement, ReactNode} from 'react';\n\nexport type Mutable<T> = {\n  -readonly[P in keyof T]: T[P]\n}\n\n/** An immutable object representing a Node in a Collection. */\nexport class CollectionNode<T> implements Node<T> {\n  readonly type: string;\n  readonly key: Key;\n  readonly value: T | null = null;\n  readonly level: number = 0;\n  readonly hasChildNodes: boolean = false;\n  readonly rendered: ReactNode = null;\n  readonly textValue: string = '';\n  readonly 'aria-label'?: string = undefined;\n  readonly index: number = 0;\n  readonly parentKey: Key | null = null;\n  readonly prevKey: Key | null = null;\n  readonly nextKey: Key | null = null;\n  readonly firstChildKey: Key | null = null;\n  readonly lastChildKey: Key | null = null;\n  readonly props: any = {};\n  readonly render?: (node: Node<any>) => ReactElement;\n\n  constructor(type: string, key: Key) {\n    this.type = type;\n    this.key = key;\n  }\n\n  get childNodes(): Iterable<Node<T>> {\n    throw new Error('childNodes is not supported');\n  }\n\n  clone(): CollectionNode<T> {\n    let node: Mutable<CollectionNode<T>> = new CollectionNode(this.type, this.key);\n    node.value = this.value;\n    node.level = this.level;\n    node.hasChildNodes = this.hasChildNodes;\n    node.rendered = this.rendered;\n    node.textValue = this.textValue;\n    node['aria-label'] = this['aria-label'];\n    node.index = this.index;\n    node.parentKey = this.parentKey;\n    node.prevKey = this.prevKey;\n    node.nextKey = this.nextKey;\n    node.firstChildKey = this.firstChildKey;\n    node.lastChildKey = this.lastChildKey;\n    node.props = this.props;\n    node.render = this.render;\n    return node;\n  }\n}\n\n/**\n * An immutable Collection implementation. Updates are only allowed\n * when it is not marked as frozen. This can be subclassed to implement\n * custom collection behaviors.\n */\nexport class BaseCollection<T> implements ICollection<Node<T>> {\n  private keyMap: Map<Key, CollectionNode<T>> = new Map();\n  private firstKey: Key | null = null;\n  private lastKey: Key | null = null;\n  private frozen = false;\n\n  get size() {\n    return this.keyMap.size;\n  }\n\n  getKeys() {\n    return this.keyMap.keys();\n  }\n\n  *[Symbol.iterator]() {\n    let node: Node<T> | undefined = this.firstKey != null ? this.keyMap.get(this.firstKey) : undefined;\n    while (node) {\n      yield node;\n      node = node.nextKey != null ? this.keyMap.get(node.nextKey) : undefined;\n    }\n  }\n\n  getChildren(key: Key): Iterable<Node<T>> {\n    let keyMap = this.keyMap;\n    return {\n      *[Symbol.iterator]() {\n        let parent = keyMap.get(key);\n        let node = parent?.firstChildKey != null ? keyMap.get(parent.firstChildKey) : null;\n        while (node) {\n          yield node as Node<T>;\n          node = node.nextKey != null ? keyMap.get(node.nextKey) : undefined;\n        }\n      }\n    };\n  }\n\n  getKeyBefore(key: Key) {\n    let node = this.keyMap.get(key);\n    if (!node) {\n      return null;\n    }\n\n    if (node.prevKey != null) {\n      node = this.keyMap.get(node.prevKey);\n\n      while (node && node.type !== 'item' && node.lastChildKey != null) {\n        node = this.keyMap.get(node.lastChildKey);\n      }\n\n      return node?.key ?? null;\n    }\n\n    return node.parentKey;\n  }\n\n  getKeyAfter(key: Key) {\n    let node = this.keyMap.get(key);\n    if (!node) {\n      return null;\n    }\n\n    if (node.type !== 'item' && node.firstChildKey != null) {\n      return node.firstChildKey;\n    }\n\n    while (node) {\n      if (node.nextKey != null) {\n        return node.nextKey;\n      }\n\n      if (node.parentKey != null) {\n        node = this.keyMap.get(node.parentKey);\n      } else {\n        return null;\n      }\n    }\n\n    return null;\n  }\n\n  getFirstKey() {\n    return this.firstKey;\n  }\n\n  getLastKey() {\n    let node = this.lastKey != null ? this.keyMap.get(this.lastKey) : null;\n    while (node?.lastChildKey != null) {\n      node = this.keyMap.get(node.lastChildKey);\n    }\n\n    return node?.key ?? null;\n  }\n\n  getItem(key: Key): Node<T> | null {\n    return this.keyMap.get(key) ?? null;\n  }\n\n  at(): Node<T> {\n    throw new Error('Not implemented');\n  }\n\n  clone(): this {\n    // We need to clone using this.constructor so that subclasses have the right prototype.\n    // TypeScript isn't happy about this yet.\n    // https://github.com/microsoft/TypeScript/issues/3841\n    let Constructor: any = this.constructor;\n    let collection: this = new Constructor();\n    collection.keyMap = new Map(this.keyMap);\n    collection.firstKey = this.firstKey;\n    collection.lastKey = this.lastKey;\n    return collection;\n  }\n\n  addNode(node: CollectionNode<T>) {\n    if (this.frozen) {\n      throw new Error('Cannot add a node to a frozen collection');\n    }\n\n    this.keyMap.set(node.key, node);\n  }\n\n  removeNode(key: Key) {\n    if (this.frozen) {\n      throw new Error('Cannot remove a node to a frozen collection');\n    }\n\n    this.keyMap.delete(key);\n  }\n\n  commit(firstKey: Key | null, lastKey: Key | null, isSSR = false) {\n    if (this.frozen) {\n      throw new Error('Cannot commit a frozen collection');\n    }\n\n    this.firstKey = firstKey;\n    this.lastKey = lastKey;\n    this.frozen = !isSSR;\n  }\n}\n"],"names":[],"version":3,"file":"BaseCollection.module.js.map"}
+{"mappings":"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","sources":["packages/@react-aria/collections/src/BaseCollection.ts"],"sourcesContent":["/*\n * Copyright 2024 Adobe. All rights reserved.\n * This file is licensed to you under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License. You may obtain a copy\n * of the License at http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software distributed under\n * the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\n * OF ANY KIND, either express or implied. See the License for the specific language\n * governing permissions and limitations under the License.\n */\n\nimport {Collection as ICollection, Key, Node} from '@react-types/shared';\nimport {ReactElement, ReactNode} from 'react';\n\nexport type Mutable<T> = {\n  -readonly[P in keyof T]: T[P]\n}\n\n/** An immutable object representing a Node in a Collection. */\nexport class CollectionNode<T> implements Node<T> {\n  readonly type: string;\n  readonly key: Key;\n  readonly value: T | null = null;\n  readonly level: number = 0;\n  readonly hasChildNodes: boolean = false;\n  readonly rendered: ReactNode = null;\n  readonly textValue: string = '';\n  readonly 'aria-label'?: string = undefined;\n  readonly index: number = 0;\n  readonly parentKey: Key | null = null;\n  readonly prevKey: Key | null = null;\n  readonly nextKey: Key | null = null;\n  readonly firstChildKey: Key | null = null;\n  readonly lastChildKey: Key | null = null;\n  readonly props: any = {};\n  readonly render?: (node: Node<any>) => ReactElement;\n  readonly colSpan: number | null = null;\n  readonly colIndex: number | null = null;\n\n  constructor(type: string, key: Key) {\n    this.type = type;\n    this.key = key;\n  }\n\n  get childNodes(): Iterable<Node<T>> {\n    throw new Error('childNodes is not supported');\n  }\n\n  clone(): CollectionNode<T> {\n    let node: Mutable<CollectionNode<T>> = new CollectionNode(this.type, this.key);\n    node.value = this.value;\n    node.level = this.level;\n    node.hasChildNodes = this.hasChildNodes;\n    node.rendered = this.rendered;\n    node.textValue = this.textValue;\n    node['aria-label'] = this['aria-label'];\n    node.index = this.index;\n    node.parentKey = this.parentKey;\n    node.prevKey = this.prevKey;\n    node.nextKey = this.nextKey;\n    node.firstChildKey = this.firstChildKey;\n    node.lastChildKey = this.lastChildKey;\n    node.props = this.props;\n    node.render = this.render;\n    node.colSpan = this.colSpan;\n    node.colIndex = this.colIndex;\n    return node;\n  }\n}\n\n/**\n * An immutable Collection implementation. Updates are only allowed\n * when it is not marked as frozen. This can be subclassed to implement\n * custom collection behaviors.\n */\nexport class BaseCollection<T> implements ICollection<Node<T>> {\n  private keyMap: Map<Key, CollectionNode<T>> = new Map();\n  private firstKey: Key | null = null;\n  private lastKey: Key | null = null;\n  private frozen = false;\n\n  get size(): number {\n    return this.keyMap.size;\n  }\n\n  getKeys(): IterableIterator<Key> {\n    return this.keyMap.keys();\n  }\n\n  *[Symbol.iterator](): IterableIterator<Node<T>> {\n    let node: Node<T> | undefined = this.firstKey != null ? this.keyMap.get(this.firstKey) : undefined;\n    while (node) {\n      yield node;\n      node = node.nextKey != null ? this.keyMap.get(node.nextKey) : undefined;\n    }\n  }\n\n  getChildren(key: Key): Iterable<Node<T>> {\n    let keyMap = this.keyMap;\n    return {\n      *[Symbol.iterator]() {\n        let parent = keyMap.get(key);\n        let node = parent?.firstChildKey != null ? keyMap.get(parent.firstChildKey) : null;\n        while (node) {\n          yield node as Node<T>;\n          node = node.nextKey != null ? keyMap.get(node.nextKey) : undefined;\n        }\n      }\n    };\n  }\n\n  getKeyBefore(key: Key): Key | null {\n    let node = this.keyMap.get(key);\n    if (!node) {\n      return null;\n    }\n\n    if (node.prevKey != null) {\n      node = this.keyMap.get(node.prevKey);\n\n      while (node && node.type !== 'item' && node.lastChildKey != null) {\n        node = this.keyMap.get(node.lastChildKey);\n      }\n\n      return node?.key ?? null;\n    }\n\n    return node.parentKey;\n  }\n\n  getKeyAfter(key: Key): Key | null {\n    let node = this.keyMap.get(key);\n    if (!node) {\n      return null;\n    }\n\n    if (node.type !== 'item' && node.firstChildKey != null) {\n      return node.firstChildKey;\n    }\n\n    while (node) {\n      if (node.nextKey != null) {\n        return node.nextKey;\n      }\n\n      if (node.parentKey != null) {\n        node = this.keyMap.get(node.parentKey);\n      } else {\n        return null;\n      }\n    }\n\n    return null;\n  }\n\n  getFirstKey(): Key | null {\n    return this.firstKey;\n  }\n\n  getLastKey(): Key | null {\n    let node = this.lastKey != null ? this.keyMap.get(this.lastKey) : null;\n    while (node?.lastChildKey != null) {\n      node = this.keyMap.get(node.lastChildKey);\n    }\n\n    return node?.key ?? null;\n  }\n\n  getItem(key: Key): Node<T> | null {\n    return this.keyMap.get(key) ?? null;\n  }\n\n  at(): Node<T> {\n    throw new Error('Not implemented');\n  }\n\n  clone(): this {\n    // We need to clone using this.constructor so that subclasses have the right prototype.\n    // TypeScript isn't happy about this yet.\n    // https://github.com/microsoft/TypeScript/issues/3841\n    let Constructor: any = this.constructor;\n    let collection: this = new Constructor();\n    collection.keyMap = new Map(this.keyMap);\n    collection.firstKey = this.firstKey;\n    collection.lastKey = this.lastKey;\n    return collection;\n  }\n\n  addNode(node: CollectionNode<T>): void {\n    if (this.frozen) {\n      throw new Error('Cannot add a node to a frozen collection');\n    }\n\n    this.keyMap.set(node.key, node);\n  }\n\n  removeNode(key: Key): void {\n    if (this.frozen) {\n      throw new Error('Cannot remove a node to a frozen collection');\n    }\n\n    this.keyMap.delete(key);\n  }\n\n  commit(firstKey: Key | null, lastKey: Key | null, isSSR = false): void {\n    if (this.frozen) {\n      throw new Error('Cannot commit a frozen collection');\n    }\n\n    this.firstKey = firstKey;\n    this.lastKey = lastKey;\n    this.frozen = !isSSR;\n  }\n\n  // TODO: this is pretty specific to menu, will need to check if it is generic enough\n  // Will need to handle varying levels I assume but will revisit after I get searchable menu working for base menu\n  // TODO: an alternative is to simply walk the collection and add all item nodes that match the filter and any sections/separators we encounter\n  // to an array, then walk that new array and fix all the next/Prev keys while adding them to the new collection\n  UNSTABLE_filter(filterFn: (nodeValue: string) => boolean): BaseCollection<T> {\n    let newCollection = new BaseCollection<T>();\n    // This tracks the absolute last node we've visited in the collection when filtering, used for setting up the filteredCollection's lastKey and\n    // for updating the next/prevKey for every non-filtered node.\n    let lastNode: Mutable<CollectionNode<T>> | null = null;\n\n    for (let node of this) {\n      if (node.type === 'section' && node.hasChildNodes) {\n        let clonedSection: Mutable<CollectionNode<T>> = (node as CollectionNode<T>).clone();\n        let lastChildInSection: Mutable<CollectionNode<T>> | null = null;\n        for (let child of this.getChildren(node.key)) {\n          if (shouldKeepNode(child, filterFn, this, newCollection)) {\n            let clonedChild: Mutable<CollectionNode<T>> = (child as CollectionNode<T>).clone();\n            // eslint-disable-next-line max-depth\n            if (lastChildInSection == null) {\n              clonedSection.firstChildKey = clonedChild.key;\n            }\n\n            // eslint-disable-next-line max-depth\n            if (newCollection.firstKey == null) {\n              newCollection.firstKey = clonedSection.key;\n            }\n\n            // eslint-disable-next-line max-depth\n            if (lastChildInSection && lastChildInSection.parentKey === clonedChild.parentKey) {\n              lastChildInSection.nextKey = clonedChild.key;\n              clonedChild.prevKey = lastChildInSection.key;\n            } else {\n              clonedChild.prevKey = null;\n            }\n\n            clonedChild.nextKey = null;\n            newCollection.addNode(clonedChild);\n            lastChildInSection = clonedChild;\n          }\n        }\n\n        // Add newly filtered section to collection if it has any valid child nodes, otherwise remove it and its header if any\n        if (lastChildInSection) {\n          if (lastChildInSection.type !== 'header') {\n            clonedSection.lastChildKey = lastChildInSection.key;\n\n            // If the old prev section was filtered out, will need to attach to whatever came before\n            // eslint-disable-next-line max-depth\n            if (lastNode == null) {\n              clonedSection.prevKey = null;\n            } else if (lastNode.type === 'section' || lastNode.type === 'separator') {\n              lastNode.nextKey = clonedSection.key;\n              clonedSection.prevKey = lastNode.key;\n            }\n            clonedSection.nextKey = null;\n            lastNode = clonedSection;\n            newCollection.addNode(clonedSection);\n          } else {\n            if (newCollection.firstKey === clonedSection.key) {\n              newCollection.firstKey = null;\n            }\n            newCollection.removeNode(lastChildInSection.key);\n          }\n        }\n      } else if (node.type === 'separator') {\n        // will need to check if previous section key exists, if it does then we add the separator to the collection.\n        // After the full collection is created we'll need to remove it it is the last node in the section (aka no following section after the separator)\n        let clonedSeparator: Mutable<CollectionNode<T>> = (node as CollectionNode<T>).clone();\n        clonedSeparator.nextKey = null;\n        if (lastNode?.type === 'section') {\n          lastNode.nextKey = clonedSeparator.key;\n          clonedSeparator.prevKey = lastNode.key;\n          lastNode = clonedSeparator;\n          newCollection.addNode(clonedSeparator);\n        }\n      } else {\n        // At this point, the node is either a subdialogtrigger node or a standard row/item\n        let clonedNode: Mutable<CollectionNode<T>> = (node as CollectionNode<T>).clone();\n        if (shouldKeepNode(clonedNode, filterFn, this, newCollection)) {\n          if (newCollection.firstKey == null) {\n            newCollection.firstKey = clonedNode.key;\n          }\n\n          if (lastNode != null && (lastNode.type !== 'section' && lastNode.type !== 'separator') && lastNode.parentKey === clonedNode.parentKey) {\n            lastNode.nextKey = clonedNode.key;\n            clonedNode.prevKey = lastNode.key;\n          } else {\n            clonedNode.prevKey = null;\n          }\n\n          clonedNode.nextKey = null;\n          newCollection.addNode(clonedNode);\n          lastNode = clonedNode;\n        }\n      }\n    }\n\n    if (lastNode?.type === 'separator' && lastNode.nextKey === null) {\n      let lastSection;\n      if (lastNode.prevKey != null) {\n        lastSection = newCollection.getItem(lastNode.prevKey) as Mutable<CollectionNode<T>>;\n        lastSection.nextKey = null;\n      }\n      newCollection.removeNode(lastNode.key);\n      lastNode = lastSection;\n    }\n\n    newCollection.lastKey = lastNode?.key || null;\n\n    return newCollection;\n  }\n}\n\nfunction shouldKeepNode<T>(node: Node<T>, filterFn: (nodeValue: string) => boolean, oldCollection: BaseCollection<T>, newCollection: BaseCollection<T>): boolean {\n  if (node.type === 'subdialogtrigger' || node.type === 'submenutrigger') {\n    // Subdialog wrapper should only have one child, if it passes the filter add it to the new collection since we don't need to\n    // do any extra handling for its first/next key\n    let triggerChild = [...oldCollection.getChildren(node.key)][0];\n    if (triggerChild && filterFn(triggerChild.textValue)) {\n      let clonedChild: Mutable<CollectionNode<T>> = (triggerChild as CollectionNode<T>).clone();\n      newCollection.addNode(clonedChild);\n      return true;\n    } else {\n      return false;\n    }\n  } else if (node.type === 'header') {\n    return true;\n  } else {\n    return filterFn(node.textValue);\n  }\n}\n"],"names":[],"version":3,"file":"BaseCollection.module.js.map"}

package/dist/CollectionBuilder.main.js

@@ -3,6 +3,7 @@ var $c20afee375f3b2d6$exports = require("./Document.main.js");
 var $245f3f827bea6653$exports = require("./useCachedChildren.main.js");
 var $eaaf60978b89fc58$exports = require("./Hidden.main.js");
 var $4ftIM$reactdom = require("react-dom");
+var $4ftIM$reactariainteractions = require("@react-aria/interactions");
 var $4ftIM$react = require("react");
 var $4ftIM$reactariassr = require("@react-aria/ssr");
 var $4ftIM$reactariautils = require("@react-aria/utils");
@@ -40,6 +41,7 @@ $parcel$export(module.exports, "Collection", () => $f20386e2aa690b4a$export$fb80
 
 
 
+
 const $f20386e2aa690b4a$var$ShallowRenderContext = /*#__PURE__*/ (0, $4ftIM$react.createContext)(false);
 const $f20386e2aa690b4a$var$CollectionDocumentContext = /*#__PURE__*/ (0, $4ftIM$react.createContext)(null);
 function $f20386e2aa690b4a$export$bf788dd355e3a401(props) {
@@ -112,7 +114,7 @@ function $f20386e2aa690b4a$var$useCollectionDocument(createCollection) {
     (0, $4ftIM$reactariautils.useLayoutEffect)(()=>{
         document.isMounted = true;
         return ()=>{
-            // Mark unmounted so we can skip all of the collection updates caused by 
+            // Mark unmounted so we can skip all of the collection updates caused by
             // React calling removeChild on every item in the collection.
             document.isMounted = false;
         };
@@ -162,14 +164,18 @@ function $f20386e2aa690b4a$var$useSSRCollectionNode(Type, props, ref, rendered,
 function $f20386e2aa690b4a$export$18af5c7a9e9b3664(type, render) {
     let Component = ({ node: node })=>render(node.props, node.props.ref, node);
     let Result = (0, $4ftIM$react.forwardRef)((props, ref)=>{
+        let focusableProps = (0, $4ftIM$react.useContext)((0, $4ftIM$reactariainteractions.FocusableContext));
         let isShallow = (0, $4ftIM$react.useContext)($f20386e2aa690b4a$var$ShallowRenderContext);
         if (!isShallow) {
             if (render.length >= 3) throw new Error(render.name + ' cannot be rendered outside a collection.');
             return render(props, ref);
         }
-        return $f20386e2aa690b4a$var$useSSRCollectionNode(type, props, ref, 'children' in props ? props.children : null, null, (node)=>/*#__PURE__*/ (0, ($parcel$interopDefault($4ftIM$react))).createElement(Component, {
+        return $f20386e2aa690b4a$var$useSSRCollectionNode(type, props, ref, 'children' in props ? props.children : null, null, (node)=>// Forward FocusableContext to real DOM tree so tooltips work.
+            /*#__PURE__*/ (0, ($parcel$interopDefault($4ftIM$react))).createElement((0, $4ftIM$reactariainteractions.FocusableContext).Provider, {
+                value: focusableProps
+            }, /*#__PURE__*/ (0, ($parcel$interopDefault($4ftIM$react))).createElement(Component, {
                 node: node
-            }));
+            })));
     });
     // @ts-ignore
     Result.displayName = render.name;