@react-aria/collections 3.0.0-nightly-e67726023-250709 → 3.0.0-nightly-94f057575-250711
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/BaseCollection.main.js +6 -1
- package/dist/BaseCollection.main.js.map +1 -1
- package/dist/BaseCollection.mjs +6 -1
- package/dist/BaseCollection.module.js +6 -1
- package/dist/BaseCollection.module.js.map +1 -1
- package/dist/types.d.ts.map +1 -1
- package/package.json +5 -5
- package/src/BaseCollection.ts +12 -1
|
@@ -61,7 +61,7 @@ $parcel$export(module.exports, "BaseCollection", () => $499e2959ba1abacc$export$
|
|
|
61
61
|
}
|
|
62
62
|
class $499e2959ba1abacc$export$408d25a4e12db025 {
|
|
63
63
|
get size() {
|
|
64
|
-
return this.
|
|
64
|
+
return this.itemCount;
|
|
65
65
|
}
|
|
66
66
|
getKeys() {
|
|
67
67
|
return this.keyMap.keys();
|
|
@@ -133,14 +133,18 @@ class $499e2959ba1abacc$export$408d25a4e12db025 {
|
|
|
133
133
|
collection.keyMap = new Map(this.keyMap);
|
|
134
134
|
collection.firstKey = this.firstKey;
|
|
135
135
|
collection.lastKey = this.lastKey;
|
|
136
|
+
collection.itemCount = this.itemCount;
|
|
136
137
|
return collection;
|
|
137
138
|
}
|
|
138
139
|
addNode(node) {
|
|
139
140
|
if (this.frozen) throw new Error('Cannot add a node to a frozen collection');
|
|
141
|
+
if (node.type === 'item' && this.keyMap.get(node.key) == null) this.itemCount++;
|
|
140
142
|
this.keyMap.set(node.key, node);
|
|
141
143
|
}
|
|
142
144
|
removeNode(key) {
|
|
143
145
|
if (this.frozen) throw new Error('Cannot remove a node to a frozen collection');
|
|
146
|
+
let node = this.keyMap.get(key);
|
|
147
|
+
if (node != null && node.type === 'item') this.itemCount--;
|
|
144
148
|
this.keyMap.delete(key);
|
|
145
149
|
}
|
|
146
150
|
commit(firstKey, lastKey, isSSR = false) {
|
|
@@ -239,6 +243,7 @@ class $499e2959ba1abacc$export$408d25a4e12db025 {
|
|
|
239
243
|
this.firstKey = null;
|
|
240
244
|
this.lastKey = null;
|
|
241
245
|
this.frozen = false;
|
|
246
|
+
this.itemCount = 0;
|
|
242
247
|
}
|
|
243
248
|
}
|
|
244
249
|
function $499e2959ba1abacc$var$shouldKeepNode(node, filterFn, oldCollection, newCollection) {
|
|
@@ -1 +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"}
|
|
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 private itemCount: number = 0;\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 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 // 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
CHANGED
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
}
|
|
55
55
|
class $23b9f4fcf0fe224b$export$408d25a4e12db025 {
|
|
56
56
|
get size() {
|
|
57
|
-
return this.
|
|
57
|
+
return this.itemCount;
|
|
58
58
|
}
|
|
59
59
|
getKeys() {
|
|
60
60
|
return this.keyMap.keys();
|
|
@@ -126,14 +126,18 @@ class $23b9f4fcf0fe224b$export$408d25a4e12db025 {
|
|
|
126
126
|
collection.keyMap = new Map(this.keyMap);
|
|
127
127
|
collection.firstKey = this.firstKey;
|
|
128
128
|
collection.lastKey = this.lastKey;
|
|
129
|
+
collection.itemCount = this.itemCount;
|
|
129
130
|
return collection;
|
|
130
131
|
}
|
|
131
132
|
addNode(node) {
|
|
132
133
|
if (this.frozen) throw new Error('Cannot add a node to a frozen collection');
|
|
134
|
+
if (node.type === 'item' && this.keyMap.get(node.key) == null) this.itemCount++;
|
|
133
135
|
this.keyMap.set(node.key, node);
|
|
134
136
|
}
|
|
135
137
|
removeNode(key) {
|
|
136
138
|
if (this.frozen) throw new Error('Cannot remove a node to a frozen collection');
|
|
139
|
+
let node = this.keyMap.get(key);
|
|
140
|
+
if (node != null && node.type === 'item') this.itemCount--;
|
|
137
141
|
this.keyMap.delete(key);
|
|
138
142
|
}
|
|
139
143
|
commit(firstKey, lastKey, isSSR = false) {
|
|
@@ -232,6 +236,7 @@ class $23b9f4fcf0fe224b$export$408d25a4e12db025 {
|
|
|
232
236
|
this.firstKey = null;
|
|
233
237
|
this.lastKey = null;
|
|
234
238
|
this.frozen = false;
|
|
239
|
+
this.itemCount = 0;
|
|
235
240
|
}
|
|
236
241
|
}
|
|
237
242
|
function $23b9f4fcf0fe224b$var$shouldKeepNode(node, filterFn, oldCollection, newCollection) {
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
}
|
|
55
55
|
class $23b9f4fcf0fe224b$export$408d25a4e12db025 {
|
|
56
56
|
get size() {
|
|
57
|
-
return this.
|
|
57
|
+
return this.itemCount;
|
|
58
58
|
}
|
|
59
59
|
getKeys() {
|
|
60
60
|
return this.keyMap.keys();
|
|
@@ -126,14 +126,18 @@ class $23b9f4fcf0fe224b$export$408d25a4e12db025 {
|
|
|
126
126
|
collection.keyMap = new Map(this.keyMap);
|
|
127
127
|
collection.firstKey = this.firstKey;
|
|
128
128
|
collection.lastKey = this.lastKey;
|
|
129
|
+
collection.itemCount = this.itemCount;
|
|
129
130
|
return collection;
|
|
130
131
|
}
|
|
131
132
|
addNode(node) {
|
|
132
133
|
if (this.frozen) throw new Error('Cannot add a node to a frozen collection');
|
|
134
|
+
if (node.type === 'item' && this.keyMap.get(node.key) == null) this.itemCount++;
|
|
133
135
|
this.keyMap.set(node.key, node);
|
|
134
136
|
}
|
|
135
137
|
removeNode(key) {
|
|
136
138
|
if (this.frozen) throw new Error('Cannot remove a node to a frozen collection');
|
|
139
|
+
let node = this.keyMap.get(key);
|
|
140
|
+
if (node != null && node.type === 'item') this.itemCount--;
|
|
137
141
|
this.keyMap.delete(key);
|
|
138
142
|
}
|
|
139
143
|
commit(firstKey, lastKey, isSSR = false) {
|
|
@@ -232,6 +236,7 @@ class $23b9f4fcf0fe224b$export$408d25a4e12db025 {
|
|
|
232
236
|
this.firstKey = null;
|
|
233
237
|
this.lastKey = null;
|
|
234
238
|
this.frozen = false;
|
|
239
|
+
this.itemCount = 0;
|
|
235
240
|
}
|
|
236
241
|
}
|
|
237
242
|
function $23b9f4fcf0fe224b$var$shouldKeepNode(node, filterFn, oldCollection, newCollection) {
|
|
@@ -1 +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.module.js.map"}
|
|
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 private itemCount: number = 0;\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 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 // 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/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"mappings":";;AAmBA,+DAA+D;AAC/D,4BAA4B,CAAC,CAAE,YAAW,KAAK,CAAC,CAAC;IAC/C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAClB,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,CAAQ;IAChC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAK;IAC3B,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAS;IACxC,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAQ;IACpC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAM;IAChC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAa;IAC3C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAK;IAC3B,QAAQ,CAAC,SAAS,EAAE,GAAG,GAAG,IAAI,CAAQ;IACtC,QAAQ,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,CAAQ;IACpC,QAAQ,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI,CAAQ;IACpC,QAAQ,CAAC,aAAa,EAAE,GAAG,GAAG,IAAI,CAAQ;IAC1C,QAAQ,CAAC,YAAY,EAAE,GAAG,GAAG,IAAI,CAAQ;IACzC,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAM;IACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,KAAK,YAAY,CAAC;IACpD,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAQ;IACvC,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAQ;gBAE5B,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG;IAKlC,IAAI,UAAU,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAElC;IAED,KAAK,IAAI,eAAe,CAAC,CAAC;CAoB3B;AAED;;;;GAIG;AACH,4BAA4B,CAAC,CAAE,YAAW,aAAY,KAAK,CAAC,CAAC,CAAC;
|
|
1
|
+
{"mappings":"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","sources":["packages/@react-aria/collections/src/packages/@react-aria/collections/src/BaseCollection.ts","packages/@react-aria/collections/src/packages/@react-aria/collections/src/Document.ts","packages/@react-aria/collections/src/packages/@react-aria/collections/src/useCachedChildren.ts","packages/@react-aria/collections/src/packages/@react-aria/collections/src/Hidden.tsx","packages/@react-aria/collections/src/packages/@react-aria/collections/src/CollectionBuilder.tsx","packages/@react-aria/collections/src/packages/@react-aria/collections/src/index.ts","packages/@react-aria/collections/src/index.ts"],"sourcesContent":[null,null,null,null,null,null,"/*\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\nexport {CollectionBuilder, Collection, createLeafComponent, createBranchComponent} from './CollectionBuilder';\nexport {createHideableComponent, useIsHidden} from './Hidden';\nexport {useCachedChildren} from './useCachedChildren';\nexport {BaseCollection, CollectionNode} from './BaseCollection';\n\nexport type {CollectionBuilderProps, CollectionProps} from './CollectionBuilder';\nexport type {CachedChildrenOptions} from './useCachedChildren';\n"],"names":[],"version":3,"file":"types.d.ts.map"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@react-aria/collections",
|
|
3
|
-
"version": "3.0.0-nightly-
|
|
3
|
+
"version": "3.0.0-nightly-94f057575-250711",
|
|
4
4
|
"description": "Spectrum UI components in React",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"main": "dist/main.js",
|
|
@@ -26,10 +26,10 @@
|
|
|
26
26
|
"url": "https://github.com/adobe/react-spectrum"
|
|
27
27
|
},
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@react-aria/interactions": "3.0.0-nightly-
|
|
30
|
-
"@react-aria/ssr": "3.0.0-nightly-
|
|
31
|
-
"@react-aria/utils": "3.0.0-nightly-
|
|
32
|
-
"@react-types/shared": "3.0.0-nightly-
|
|
29
|
+
"@react-aria/interactions": "3.0.0-nightly-94f057575-250711",
|
|
30
|
+
"@react-aria/ssr": "3.0.0-nightly-94f057575-250711",
|
|
31
|
+
"@react-aria/utils": "3.0.0-nightly-94f057575-250711",
|
|
32
|
+
"@react-types/shared": "3.0.0-nightly-94f057575-250711",
|
|
33
33
|
"@swc/helpers": "^0.5.0",
|
|
34
34
|
"use-sync-external-store": "^1.4.0"
|
|
35
35
|
},
|
package/src/BaseCollection.ts
CHANGED
|
@@ -79,9 +79,10 @@ export class BaseCollection<T> implements ICollection<Node<T>> {
|
|
|
79
79
|
private firstKey: Key | null = null;
|
|
80
80
|
private lastKey: Key | null = null;
|
|
81
81
|
private frozen = false;
|
|
82
|
+
private itemCount: number = 0;
|
|
82
83
|
|
|
83
84
|
get size(): number {
|
|
84
|
-
return this.
|
|
85
|
+
return this.itemCount;
|
|
85
86
|
}
|
|
86
87
|
|
|
87
88
|
getKeys(): IterableIterator<Key> {
|
|
@@ -184,6 +185,7 @@ export class BaseCollection<T> implements ICollection<Node<T>> {
|
|
|
184
185
|
collection.keyMap = new Map(this.keyMap);
|
|
185
186
|
collection.firstKey = this.firstKey;
|
|
186
187
|
collection.lastKey = this.lastKey;
|
|
188
|
+
collection.itemCount = this.itemCount;
|
|
187
189
|
return collection;
|
|
188
190
|
}
|
|
189
191
|
|
|
@@ -192,6 +194,10 @@ export class BaseCollection<T> implements ICollection<Node<T>> {
|
|
|
192
194
|
throw new Error('Cannot add a node to a frozen collection');
|
|
193
195
|
}
|
|
194
196
|
|
|
197
|
+
if (node.type === 'item' && this.keyMap.get(node.key) == null) {
|
|
198
|
+
this.itemCount++;
|
|
199
|
+
}
|
|
200
|
+
|
|
195
201
|
this.keyMap.set(node.key, node);
|
|
196
202
|
}
|
|
197
203
|
|
|
@@ -200,6 +206,11 @@ export class BaseCollection<T> implements ICollection<Node<T>> {
|
|
|
200
206
|
throw new Error('Cannot remove a node to a frozen collection');
|
|
201
207
|
}
|
|
202
208
|
|
|
209
|
+
let node = this.keyMap.get(key);
|
|
210
|
+
if (node != null && node.type === 'item') {
|
|
211
|
+
this.itemCount--;
|
|
212
|
+
}
|
|
213
|
+
|
|
203
214
|
this.keyMap.delete(key);
|
|
204
215
|
}
|
|
205
216
|
|