Skip to content

fix(web): model picker no longer jumps at the end of its open animation #19506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Claudesaul wants to merge 4 commits into
base: main
Choose a base branch
from
+32 −12
Open

fix(web): model picker no longer jumps at the end of its open animation #19506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
68d433f
fix(web): model picker no longer jumps at the end of its open animation
Claudesaul Oct 14, 2026
f3c1879
fix(web): shorten the model picker measurement fix
Claudesaul Oct 14, 2026
b35427f
fix(web): measure picker rows with offset sizes
Claudesaul Oct 14, 2026
b350759
Merge remote-tracking branch 'origin/main' into fix/model-picker-open…
juliusmarminge Oct 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 28 additions & 8 deletions patches/@legendapp__list@3.3.5.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1447,7 +1447,7 @@ index 95465f2..d7cbe1c 100644
}
}
diff --git a/react.js b/react.js
index 914d2da..0c2917d 100644
index 914d2da..86dbd9a 100644
--- a/react.js
+++ b/react.js
@@ -4702,7 +4702,8 @@ function maybeUpdateAnchoredEndSpace(ctx) {
Expand All @@ -1473,7 +1473,17 @@ index 914d2da..0c2917d 100644
}
return nextSize;
}
@@ -5651,6 +5658,18 @@ var ContainerSlot = typedMemo(function ContainerSlot2(props) {
@@ -4956,7 +4963,8 @@ function measureContainersInLayoutEffect(ctx, targetContainerIds = null) {
const itemKey = peek$(ctx, `containerItemKey${containerId}`);
const element = viewRef == null ? void 0 : viewRef.current;
if (itemKey !== void 0 && element) {
- const rect = element.getBoundingClientRect();
+ // Unlike getBoundingClientRect, offset sizes ignore ancestor transforms (e.g. a popup's zoom-in), like ResizeObserver.
+ const rect = { height: element.offsetHeight, width: element.offsetWidth };
Comment thread
coderabbitai[bot] marked this conversation as resolved.
setContainerLayoutBaseline(element, rect);
measurements.push({
containerId,
@@ -5651,6 +5659,18 @@ var ContainerSlot = typedMemo(function ContainerSlot2(props) {
});

// src/utils/reordering.ts
Expand All @@ -1492,7 +1502,7 @@ index 914d2da..0c2917d 100644
function sortDOMElements(container, indexByElement) {
const elements = Array.from(container.children);
if (elements.length <= 1) return elements;
@@ -5690,9 +5709,9 @@ function sortDOMElements(container, indexByElement) {
@@ -5690,9 +5710,9 @@ function sortDOMElements(container, indexByElement) {
}
}
if (nextStableElement) {
Expand All @@ -1504,7 +1514,7 @@ index 914d2da..0c2917d 100644
}
}
}
@@ -6446,8 +6465,8 @@ function ScrollAdjust() {
@@ -6446,8 +6466,8 @@ function ScrollAdjust() {
window.getComputedStyle(contentNode)[axis.paddingEndProp]
);
const temporaryPaddingEnd = `${(currentPaddingEnd || 0) + pad}px`;
Expand All @@ -1515,7 +1525,7 @@ index 914d2da..0c2917d 100644
scrollBy();
if (resetPaddingRafRef.current !== void 0) {
diff --git a/react.mjs b/react.mjs
index 95465f2..b73bfdf 100644
index 95465f2..cff49dc 100644
--- a/react.mjs
+++ b/react.mjs
@@ -4681,7 +4681,8 @@ function maybeUpdateAnchoredEndSpace(ctx) {
Expand All @@ -1541,7 +1551,17 @@ index 95465f2..b73bfdf 100644
}
return nextSize;
}
@@ -5630,6 +5637,18 @@ var ContainerSlot = typedMemo(function ContainerSlot2(props) {
@@ -4935,7 +4942,8 @@ function measureContainersInLayoutEffect(ctx, targetContainerIds = null) {
const itemKey = peek$(ctx, `containerItemKey${containerId}`);
const element = viewRef == null ? void 0 : viewRef.current;
if (itemKey !== void 0 && element) {
- const rect = element.getBoundingClientRect();
+ // Unlike getBoundingClientRect, offset sizes ignore ancestor transforms (e.g. a popup's zoom-in), like ResizeObserver.
+ const rect = { height: element.offsetHeight, width: element.offsetWidth };
setContainerLayoutBaseline(element, rect);
measurements.push({
containerId,
@@ -5630,6 +5638,18 @@ var ContainerSlot = typedMemo(function ContainerSlot2(props) {
});

// src/utils/reordering.ts
Expand All @@ -1560,7 +1580,7 @@ index 95465f2..b73bfdf 100644
function sortDOMElements(container, indexByElement) {
const elements = Array.from(container.children);
if (elements.length <= 1) return elements;
@@ -5669,9 +5688,9 @@ function sortDOMElements(container, indexByElement) {
@@ -5669,9 +5689,9 @@ function sortDOMElements(container, indexByElement) {
}
}
if (nextStableElement) {
Expand All @@ -1572,7 +1592,7 @@ index 95465f2..b73bfdf 100644
}
}
}
@@ -6425,8 +6444,8 @@ function ScrollAdjust() {
@@ -6425,8 +6445,8 @@ function ScrollAdjust() {
window.getComputedStyle(contentNode)[axis.paddingEndProp]
);
const temporaryPaddingEnd = `${(currentPaddingEnd || 0) + pad}px`;
Expand Down
8 changes: 4 additions & 4 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading