@react-aria/collections 3.0.0-rc.3 → 3.0.0-rc.5

package/dist/BaseCollection.main.js

@@ -4,6 +4,11 @@ function $parcel$export(e, n, v, s) {
 }
 
 $parcel$export(module.exports, "CollectionNode", () => $499e2959ba1abacc$export$d68d59712b04d9d1);
+$parcel$export(module.exports, "FilterableNode", () => $499e2959ba1abacc$export$b1918e978f1ee46f);
+$parcel$export(module.exports, "HeaderNode", () => $499e2959ba1abacc$export$5ae2504e948afce5);
+$parcel$export(module.exports, "LoaderNode", () => $499e2959ba1abacc$export$8258a0665a675899);
+$parcel$export(module.exports, "ItemNode", () => $499e2959ba1abacc$export$fd11f34e1d07f134);
+$parcel$export(module.exports, "SectionNode", () => $499e2959ba1abacc$export$437f11dc9b403b78);
 $parcel$export(module.exports, "BaseCollection", () => $499e2959ba1abacc$export$408d25a4e12db025);
 /*
  * Copyright 2024 Adobe. All rights reserved.
@@ -20,7 +25,7 @@ $parcel$export(module.exports, "BaseCollection", () => $499e2959ba1abacc$export$
         throw new Error('childNodes is not supported');
     }
     clone() {
-        let node = new $499e2959ba1abacc$export$d68d59712b04d9d1(this.type, this.key);
+        let node = new this.constructor(this.key);
         node.value = this.value;
         node.level = this.level;
         node.hasChildNodes = this.hasChildNodes;
@@ -39,7 +44,13 @@ $parcel$export(module.exports, "BaseCollection", () => $499e2959ba1abacc$export$
         node.colIndex = this.colIndex;
         return node;
     }
-    constructor(type, key){
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    filter(collection, newCollection, filterFn) {
+        let clone = this.clone();
+        newCollection.addDescendants(clone, collection);
+        return clone;
+    }
+    constructor(key){
         this.value = null;
         this.level = 0;
         this.hasChildNodes = false;
@@ -55,13 +66,52 @@ $parcel$export(module.exports, "BaseCollection", () => $499e2959ba1abacc$export$
         this.props = {};
         this.colSpan = null;
         this.colIndex = null;
-        this.type = type;
+        this.type = this.constructor.type;
         this.key = key;
     }
 }
+class $499e2959ba1abacc$export$b1918e978f1ee46f extends $499e2959ba1abacc$export$d68d59712b04d9d1 {
+    filter(collection, newCollection, filterFn) {
+        let [firstKey, lastKey] = $499e2959ba1abacc$var$filterChildren(collection, newCollection, this.firstChildKey, filterFn);
+        let newNode = this.clone();
+        newNode.firstChildKey = firstKey;
+        newNode.lastChildKey = lastKey;
+        return newNode;
+    }
+}
+class $499e2959ba1abacc$export$5ae2504e948afce5 extends $499e2959ba1abacc$export$d68d59712b04d9d1 {
+}
+$499e2959ba1abacc$export$5ae2504e948afce5.type = 'header';
+class $499e2959ba1abacc$export$8258a0665a675899 extends $499e2959ba1abacc$export$d68d59712b04d9d1 {
+}
+$499e2959ba1abacc$export$8258a0665a675899.type = 'loader';
+class $499e2959ba1abacc$export$fd11f34e1d07f134 extends $499e2959ba1abacc$export$b1918e978f1ee46f {
+    filter(collection, newCollection, filterFn) {
+        if (filterFn(this.textValue, this)) {
+            let clone = this.clone();
+            newCollection.addDescendants(clone, collection);
+            return clone;
+        }
+        return null;
+    }
+}
+$499e2959ba1abacc$export$fd11f34e1d07f134.type = 'item';
+class $499e2959ba1abacc$export$437f11dc9b403b78 extends $499e2959ba1abacc$export$b1918e978f1ee46f {
+    filter(collection, newCollection, filterFn) {
+        let filteredSection = super.filter(collection, newCollection, filterFn);
+        if (filteredSection) {
+            if (filteredSection.lastChildKey !== null) {
+                let lastChild = collection.getItem(filteredSection.lastChildKey);
+                if (lastChild && lastChild.type !== 'header') return filteredSection;
+            }
+        }
+        return null;
+    }
+}
+$499e2959ba1abacc$export$437f11dc9b403b78.type = 'section';
 class $499e2959ba1abacc$export$408d25a4e12db025 {
     get size() {
-        return this.keyMap.size;
+        return this.itemCount;
     }
     getKeys() {
         return this.keyMap.keys();
@@ -133,14 +183,24 @@ class $499e2959ba1abacc$export$408d25a4e12db025 {
         collection.keyMap = new Map(this.keyMap);
         collection.firstKey = this.firstKey;
         collection.lastKey = this.lastKey;
+        collection.itemCount = this.itemCount;
         return collection;
     }
     addNode(node) {
         if (this.frozen) throw new Error('Cannot add a node to a frozen collection');
+        if (node.type === 'item' && this.keyMap.get(node.key) == null) this.itemCount++;
         this.keyMap.set(node.key, node);
     }
+    // Deeply add a node and its children to the collection from another collection, primarily used when filtering a collection
+    addDescendants(node, oldCollection) {
+        this.addNode(node);
+        let children = oldCollection.getChildren(node.key);
+        for (let child of children)this.addDescendants(child, oldCollection);
+    }
     removeNode(key) {
         if (this.frozen) throw new Error('Cannot remove a node to a frozen collection');
+        let node = this.keyMap.get(key);
+        if (node != null && node.type === 'item') this.itemCount--;
         this.keyMap.delete(key);
     }
     commit(firstKey, lastKey, isSSR = false) {
@@ -149,89 +209,10 @@ 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;
+    filter(filterFn) {
+        let newCollection = new this.constructor();
+        let [firstKey, lastKey] = $499e2959ba1abacc$var$filterChildren(this, newCollection, this.firstKey, filterFn);
+        newCollection === null || newCollection === void 0 ? void 0 : newCollection.commit(firstKey, lastKey);
         return newCollection;
     }
     constructor(){
@@ -239,22 +220,52 @@ class $499e2959ba1abacc$export$408d25a4e12db025 {
         this.firstKey = null;
         this.lastKey = null;
         this.frozen = false;
+        this.itemCount = 0;
+        this.isComplete = true;
     }
 }
-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);
+function $499e2959ba1abacc$var$filterChildren(collection, newCollection, firstChildKey, filterFn) {
+    // loop over the siblings for firstChildKey
+    // create new nodes based on calling node.filter for each child
+    // if it returns null then don't include it, otherwise update its prev/next keys
+    // add them to the newCollection
+    if (firstChildKey == null) return [
+        null,
+        null
+    ];
+    let firstNode = null;
+    let lastNode = null;
+    let currentNode = collection.getItem(firstChildKey);
+    while(currentNode != null){
+        let newNode = currentNode.filter(collection, newCollection, filterFn);
+        if (newNode != null) {
+            newNode.nextKey = null;
+            if (lastNode) {
+                newNode.prevKey = lastNode.key;
+                lastNode.nextKey = newNode.key;
+            }
+            if (firstNode == null) firstNode = newNode;
+            newCollection.addNode(newNode);
+            lastNode = newNode;
+        }
+        currentNode = currentNode.nextKey ? collection.getItem(currentNode.nextKey) : null;
+    }
+    // TODO: this is pretty specific to dividers but doesn't feel like there is a good way to get around it since we only can know
+    // to filter the last separator in a collection only after performing a filter for the rest of the contents after it
+    // Its gross that it needs to live here, might be nice if somehow we could have this live in the separator code
+    if (lastNode && lastNode.type === 'separator') {
+        let prevKey = lastNode.prevKey;
+        newCollection.removeNode(lastNode.key);
+        if (prevKey) {
+            lastNode = newCollection.getItem(prevKey);
+            lastNode.nextKey = null;
+        } else lastNode = null;
+    }
+    var _firstNode_key, _lastNode_key;
+    return [
+        (_firstNode_key = firstNode === null || firstNode === void 0 ? void 0 : firstNode.key) !== null && _firstNode_key !== void 0 ? _firstNode_key : null,
+        (_lastNode_key = lastNode === null || lastNode === void 0 ? void 0 : lastNode.key) !== null && _lastNode_key !== void 0 ? _lastNode_key : null
+    ];
 }
 
 

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  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"}
+{"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\ntype FilterFn<T> = (textValue: string, node: Node<T>) => boolean;\n\n/** An immutable object representing a Node in a Collection. */\nexport class CollectionNode<T> implements Node<T> {\n  static readonly type: string;\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(key: Key) {\n    this.type = (this.constructor as typeof CollectionNode).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(): this {\n    let node: Mutable<this> = new (this.constructor as any)(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  // eslint-disable-next-line @typescript-eslint/no-unused-vars\n  filter(collection: BaseCollection<T>, newCollection: BaseCollection<T>, filterFn: FilterFn<T>): CollectionNode<T> | null {\n    let clone = this.clone();\n    newCollection.addDescendants(clone, collection);\n    return clone;\n  }\n}\n\nexport class FilterableNode<T> extends CollectionNode<T> {\n  filter(collection: BaseCollection<T>, newCollection: BaseCollection<T>, filterFn: FilterFn<T>): CollectionNode<T> | null {\n    let [firstKey, lastKey] = filterChildren(collection, newCollection, this.firstChildKey, filterFn);\n    let newNode: Mutable<CollectionNode<T>> = this.clone();\n    newNode.firstChildKey = firstKey;\n    newNode.lastChildKey = lastKey;\n    return newNode;\n  }\n}\n\nexport class HeaderNode extends CollectionNode<unknown> {\n  static readonly type = 'header';\n}\n\nexport class LoaderNode extends CollectionNode<unknown> {\n  static readonly type = 'loader';\n}\n\nexport class ItemNode<T> extends FilterableNode<T> {\n  static readonly type = 'item';\n\n  filter(collection: BaseCollection<T>, newCollection: BaseCollection<T>, filterFn: FilterFn<T>): ItemNode<T> | null {\n    if (filterFn(this.textValue, this)) {\n      let clone = this.clone();\n      newCollection.addDescendants(clone, collection);\n      return clone;\n    }\n\n    return null;\n  }\n}\n\nexport class SectionNode<T> extends FilterableNode<T> {\n  static readonly type = 'section';\n\n  filter(collection: BaseCollection<T>, newCollection: BaseCollection<T>, filterFn: FilterFn<T>): SectionNode<T> | null {\n    let filteredSection = super.filter(collection, newCollection, filterFn);\n    if (filteredSection) {\n      if (filteredSection.lastChildKey !== null) {\n        let lastChild = collection.getItem(filteredSection.lastChildKey);\n        if (lastChild && lastChild.type !== 'header') {\n          return filteredSection;\n        }\n      }\n    }\n\n    return null;\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  private itemCount: number = 0;\n  isComplete = true;\n\n  get size(): number {\n    return this.itemCount;\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    collection.itemCount = this.itemCount;\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    if (node.type === 'item' && this.keyMap.get(node.key) == null) {\n      this.itemCount++;\n    }\n\n    this.keyMap.set(node.key, node);\n  }\n\n  // Deeply add a node and its children to the collection from another collection, primarily used when filtering a collection\n  addDescendants(node: CollectionNode<T>, oldCollection: BaseCollection<T>): void {\n    this.addNode(node);\n    let children = oldCollection.getChildren(node.key);\n    for (let child of children) {\n      this.addDescendants(child as CollectionNode<T>, oldCollection);\n    }\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    let node = this.keyMap.get(key);\n    if (node != null && node.type === 'item') {\n      this.itemCount--;\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  filter(filterFn: FilterFn<T>): this {\n    let newCollection = new (this.constructor as any)();\n    let [firstKey, lastKey] = filterChildren(this, newCollection, this.firstKey, filterFn);\n    newCollection?.commit(firstKey, lastKey);\n    return newCollection;\n  }\n}\n\nfunction filterChildren<T>(collection: BaseCollection<T>, newCollection: BaseCollection<T>, firstChildKey: Key | null, filterFn: FilterFn<T>): [Key | null, Key | null] {\n  // loop over the siblings for firstChildKey\n  // create new nodes based on calling node.filter for each child\n  // if it returns null then don't include it, otherwise update its prev/next keys\n  // add them to the newCollection\n  if (firstChildKey == null) {\n    return [null, null];\n  }\n\n  let firstNode: Node<T> | null = null;\n  let lastNode: Node<T> | null = null;\n  let currentNode = collection.getItem(firstChildKey);\n\n  while (currentNode != null) {\n    let newNode: Mutable<CollectionNode<T>> | null = (currentNode as CollectionNode<T>).filter(collection, newCollection, filterFn);\n    if (newNode != null) {\n      newNode.nextKey = null;\n      if (lastNode) {\n        newNode.prevKey = lastNode.key;\n        lastNode.nextKey = newNode.key;\n      }\n\n      if (firstNode == null) {\n        firstNode = newNode;\n      }\n\n      newCollection.addNode(newNode);\n      lastNode = newNode;\n    }\n\n    currentNode = currentNode.nextKey ? collection.getItem(currentNode.nextKey) : null;\n  }\n\n  // TODO: this is pretty specific to dividers but doesn't feel like there is a good way to get around it since we only can know\n  // to filter the last separator in a collection only after performing a filter for the rest of the contents after it\n  // Its gross that it needs to live here, might be nice if somehow we could have this live in the separator code\n  if (lastNode && lastNode.type === 'separator') {\n    let prevKey = lastNode.prevKey;\n    newCollection.removeNode(lastNode.key);\n\n    if (prevKey) {\n      lastNode = newCollection.getItem(prevKey) as Mutable<CollectionNode<T>>;\n      lastNode.nextKey = null;\n    } else {\n      lastNode = null;\n    }\n  }\n\n  return [firstNode?.key ?? null, lastNode?.key ?? null];\n}\n"],"names":[],"version":3,"file":"BaseCollection.main.js.map"}

package/dist/BaseCollection.mjs

@@ -13,7 +13,7 @@
         throw new Error('childNodes is not supported');
     }
     clone() {
-        let node = new $23b9f4fcf0fe224b$export$d68d59712b04d9d1(this.type, this.key);
+        let node = new this.constructor(this.key);
         node.value = this.value;
         node.level = this.level;
         node.hasChildNodes = this.hasChildNodes;
@@ -32,7 +32,13 @@
         node.colIndex = this.colIndex;
         return node;
     }
-    constructor(type, key){
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    filter(collection, newCollection, filterFn) {
+        let clone = this.clone();
+        newCollection.addDescendants(clone, collection);
+        return clone;
+    }
+    constructor(key){
         this.value = null;
         this.level = 0;
         this.hasChildNodes = false;
@@ -48,13 +54,52 @@
         this.props = {};
         this.colSpan = null;
         this.colIndex = null;
-        this.type = type;
+        this.type = this.constructor.type;
         this.key = key;
     }
 }
+class $23b9f4fcf0fe224b$export$b1918e978f1ee46f extends $23b9f4fcf0fe224b$export$d68d59712b04d9d1 {
+    filter(collection, newCollection, filterFn) {
+        let [firstKey, lastKey] = $23b9f4fcf0fe224b$var$filterChildren(collection, newCollection, this.firstChildKey, filterFn);
+        let newNode = this.clone();
+        newNode.firstChildKey = firstKey;
+        newNode.lastChildKey = lastKey;
+        return newNode;
+    }
+}
+class $23b9f4fcf0fe224b$export$5ae2504e948afce5 extends $23b9f4fcf0fe224b$export$d68d59712b04d9d1 {
+}
+$23b9f4fcf0fe224b$export$5ae2504e948afce5.type = 'header';
+class $23b9f4fcf0fe224b$export$8258a0665a675899 extends $23b9f4fcf0fe224b$export$d68d59712b04d9d1 {
+}
+$23b9f4fcf0fe224b$export$8258a0665a675899.type = 'loader';
+class $23b9f4fcf0fe224b$export$fd11f34e1d07f134 extends $23b9f4fcf0fe224b$export$b1918e978f1ee46f {
+    filter(collection, newCollection, filterFn) {
+        if (filterFn(this.textValue, this)) {
+            let clone = this.clone();
+            newCollection.addDescendants(clone, collection);
+            return clone;
+        }
+        return null;
+    }
+}
+$23b9f4fcf0fe224b$export$fd11f34e1d07f134.type = 'item';
+class $23b9f4fcf0fe224b$export$437f11dc9b403b78 extends $23b9f4fcf0fe224b$export$b1918e978f1ee46f {
+    filter(collection, newCollection, filterFn) {
+        let filteredSection = super.filter(collection, newCollection, filterFn);
+        if (filteredSection) {
+            if (filteredSection.lastChildKey !== null) {
+                let lastChild = collection.getItem(filteredSection.lastChildKey);
+                if (lastChild && lastChild.type !== 'header') return filteredSection;
+            }
+        }
+        return null;
+    }
+}
+$23b9f4fcf0fe224b$export$437f11dc9b403b78.type = 'section';
 class $23b9f4fcf0fe224b$export$408d25a4e12db025 {
     get size() {
-        return this.keyMap.size;
+        return this.itemCount;
     }
     getKeys() {
         return this.keyMap.keys();
@@ -126,14 +171,24 @@ class $23b9f4fcf0fe224b$export$408d25a4e12db025 {
         collection.keyMap = new Map(this.keyMap);
         collection.firstKey = this.firstKey;
         collection.lastKey = this.lastKey;
+        collection.itemCount = this.itemCount;
         return collection;
     }
     addNode(node) {
         if (this.frozen) throw new Error('Cannot add a node to a frozen collection');
+        if (node.type === 'item' && this.keyMap.get(node.key) == null) this.itemCount++;
         this.keyMap.set(node.key, node);
     }
+    // Deeply add a node and its children to the collection from another collection, primarily used when filtering a collection
+    addDescendants(node, oldCollection) {
+        this.addNode(node);
+        let children = oldCollection.getChildren(node.key);
+        for (let child of children)this.addDescendants(child, oldCollection);
+    }
     removeNode(key) {
         if (this.frozen) throw new Error('Cannot remove a node to a frozen collection');
+        let node = this.keyMap.get(key);
+        if (node != null && node.type === 'item') this.itemCount--;
         this.keyMap.delete(key);
     }
     commit(firstKey, lastKey, isSSR = false) {
@@ -142,89 +197,10 @@ 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;
+    filter(filterFn) {
+        let newCollection = new this.constructor();
+        let [firstKey, lastKey] = $23b9f4fcf0fe224b$var$filterChildren(this, newCollection, this.firstKey, filterFn);
+        newCollection === null || newCollection === void 0 ? void 0 : newCollection.commit(firstKey, lastKey);
         return newCollection;
     }
     constructor(){
@@ -232,24 +208,54 @@ class $23b9f4fcf0fe224b$export$408d25a4e12db025 {
         this.firstKey = null;
         this.lastKey = null;
         this.frozen = false;
+        this.itemCount = 0;
+        this.isComplete = true;
     }
 }
-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);
+function $23b9f4fcf0fe224b$var$filterChildren(collection, newCollection, firstChildKey, filterFn) {
+    // loop over the siblings for firstChildKey
+    // create new nodes based on calling node.filter for each child
+    // if it returns null then don't include it, otherwise update its prev/next keys
+    // add them to the newCollection
+    if (firstChildKey == null) return [
+        null,
+        null
+    ];
+    let firstNode = null;
+    let lastNode = null;
+    let currentNode = collection.getItem(firstChildKey);
+    while(currentNode != null){
+        let newNode = currentNode.filter(collection, newCollection, filterFn);
+        if (newNode != null) {
+            newNode.nextKey = null;
+            if (lastNode) {
+                newNode.prevKey = lastNode.key;
+                lastNode.nextKey = newNode.key;
+            }
+            if (firstNode == null) firstNode = newNode;
+            newCollection.addNode(newNode);
+            lastNode = newNode;
+        }
+        currentNode = currentNode.nextKey ? collection.getItem(currentNode.nextKey) : null;
+    }
+    // TODO: this is pretty specific to dividers but doesn't feel like there is a good way to get around it since we only can know
+    // to filter the last separator in a collection only after performing a filter for the rest of the contents after it
+    // Its gross that it needs to live here, might be nice if somehow we could have this live in the separator code
+    if (lastNode && lastNode.type === 'separator') {
+        let prevKey = lastNode.prevKey;
+        newCollection.removeNode(lastNode.key);
+        if (prevKey) {
+            lastNode = newCollection.getItem(prevKey);
+            lastNode.nextKey = null;
+        } else lastNode = null;
+    }
+    var _firstNode_key, _lastNode_key;
+    return [
+        (_firstNode_key = firstNode === null || firstNode === void 0 ? void 0 : firstNode.key) !== null && _firstNode_key !== void 0 ? _firstNode_key : null,
+        (_lastNode_key = lastNode === null || lastNode === void 0 ? void 0 : lastNode.key) !== null && _lastNode_key !== void 0 ? _lastNode_key : null
+    ];
 }
 
 
-export {$23b9f4fcf0fe224b$export$d68d59712b04d9d1 as CollectionNode, $23b9f4fcf0fe224b$export$408d25a4e12db025 as BaseCollection};
+export {$23b9f4fcf0fe224b$export$d68d59712b04d9d1 as CollectionNode, $23b9f4fcf0fe224b$export$b1918e978f1ee46f as FilterableNode, $23b9f4fcf0fe224b$export$5ae2504e948afce5 as HeaderNode, $23b9f4fcf0fe224b$export$8258a0665a675899 as LoaderNode, $23b9f4fcf0fe224b$export$fd11f34e1d07f134 as ItemNode, $23b9f4fcf0fe224b$export$437f11dc9b403b78 as SectionNode, $23b9f4fcf0fe224b$export$408d25a4e12db025 as BaseCollection};
 //# sourceMappingURL=BaseCollection.module.js.map