Robin Malfait
97cb20806a
This PR improves the performance of the `Combobox` component. This is a similar implementation as: - https://github.com/tailwindlabs/headlessui/pull/3685 - https://github.com/tailwindlabs/headlessui/pull/3688 Before this PR, the `Combobox` component is built in a way where all the state lives in the `Combobox` itself. If state changes, everything re-renders and re-computes the necessary derived state. However, if you have a 1000 items, then every time the active item changes, all 1000 items have to re-render. To solve this, we can move the state outside of the `Combobox` component, and "subscribe" to state changes using the `useSlice` hook introduced in https://github.com/tailwindlabs/headlessui/pull/3684. This will allow us to subscribe to a slice of the state, and only re-render if the computed slice actually changes. If the active item changes, only 3 things will happen: 1. The `ComboboxOptions` will re-render and have an updated `aria-activedescendant` 2. The `ComboboxOption` that _was_ active, will re-render and the `data-focus` attribute wil be removed. 3. The `ComboboxOption` that is now active, will re-render and the `data-focus` attribute wil be added. The `Combobox` component already has a `virtual` option if you want to render many many more items. This is a bit of a different model where all the options are passed in via an array instead of rendering all `ComboboxOption` components immediately. Because of this, I didn't want to batch the registration of the options as part of this PR (similar to what we do in the `Menu` and `Listbox`) because it behaves differently compared to what mode you are using (virtual or not). Since not all components will be rendered, batching the registration until everything is registered doesn't really make sense in the general case. However, it does make sense in non-virtual mode. But because of this difference, I didn't want to implement this as part of this PR and increase the complexity of the PR even more. Instead I will follow up with more PRs with more improvements. But the key improvement of looking at the slice of the data is what makes the biggest impact. This also means that we can do another release once this is merged. Last but not least, recently we fixed a bug where the `Combobox` in `virtual` mode could crash if you search for an item that doesn't exist. To solve it, we implemented a workaround in: - https://github.com/tailwindlabs/headlessui/pull/3678 Which used a double `requestAnimationFrame` to delay the scrolling to the item. While this solved this issue, this also caused visual flicker when holding down your arrow keys. I also fixed it in this PR by introducing `patch-package` and work around the issue in the `@tanstack/virtual-core` package itself. More info: 96f4da70b16d5cf259643 Before: https://github.com/user-attachments/assets/132520d3-b4d6-42f9-9152-57427de20639 After: https://github.com/user-attachments/assets/41f198fe-9326-42d1-a09f-077b60a9f65d ## Test plan 1. All tests still pass 2. Tested this in the browser with a 1000 items. In the videos below the only thing I'm doing is holding down the `ArrowDown` key. Before: https://github.com/user-attachments/assets/945692a3-96e6-4ac7-bee0-36a1fd89172b After: https://github.com/user-attachments/assets/98a151d0-16cc-4823-811c-fcee0019937a
52 lines
2.3 KiB
Diff
52 lines
2.3 KiB
Diff
diff --git a/node_modules/@tanstack/virtual-core/dist/cjs/index.cjs b/node_modules/@tanstack/virtual-core/dist/cjs/index.cjs
|
|
index dd4e77f..127987e 100644
|
|
--- a/node_modules/@tanstack/virtual-core/dist/cjs/index.cjs
|
|
+++ b/node_modules/@tanstack/virtual-core/dist/cjs/index.cjs
|
|
@@ -665,9 +665,9 @@ class Virtualizer {
|
|
this.options.getItemKey(index)
|
|
);
|
|
if (elementInDOM) {
|
|
- const [latestOffset] = utils.notUndefined(
|
|
- this.getOffsetForIndex(index, align)
|
|
- );
|
|
+ const result = this.getOffsetForIndex(index, align)
|
|
+ if (!result) return
|
|
+ const [latestOffset] = result
|
|
if (!utils.approxEqual(latestOffset, this.getScrollOffset())) {
|
|
this.scrollToIndex(index, { align, behavior });
|
|
}
|
|
diff --git a/node_modules/@tanstack/virtual-core/dist/esm/index.js b/node_modules/@tanstack/virtual-core/dist/esm/index.js
|
|
index 8da519d..8c78af8 100644
|
|
--- a/node_modules/@tanstack/virtual-core/dist/esm/index.js
|
|
+++ b/node_modules/@tanstack/virtual-core/dist/esm/index.js
|
|
@@ -663,9 +663,9 @@ class Virtualizer {
|
|
this.options.getItemKey(index)
|
|
);
|
|
if (elementInDOM) {
|
|
- const [latestOffset] = notUndefined(
|
|
- this.getOffsetForIndex(index, align)
|
|
- );
|
|
+ const result = this.getOffsetForIndex(index, align)
|
|
+ if (!result) return
|
|
+ const [latestOffset] = result
|
|
if (!approxEqual(latestOffset, this.getScrollOffset())) {
|
|
this.scrollToIndex(index, { align, behavior });
|
|
}
|
|
diff --git a/node_modules/@tanstack/virtual-core/src/index.ts b/node_modules/@tanstack/virtual-core/src/index.ts
|
|
index 3a0c446..4a9e792 100644
|
|
--- a/node_modules/@tanstack/virtual-core/src/index.ts
|
|
+++ b/node_modules/@tanstack/virtual-core/src/index.ts
|
|
@@ -1003,9 +1003,9 @@ export class Virtualizer<
|
|
)
|
|
|
|
if (elementInDOM) {
|
|
- const [latestOffset] = notUndefined(
|
|
- this.getOffsetForIndex(index, align),
|
|
- )
|
|
+ const result = this.getOffsetForIndex(index, align)
|
|
+ if (!result) return
|
|
+ const [latestOffset] = result
|
|
|
|
if (!approxEqual(latestOffset, this.getScrollOffset())) {
|
|
this.scrollToIndex(index, { align, behavior })
|