@solid2-aria/components 0.0.1 → 0.1.0
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/README.md +6 -0
- package/dist/NOTICE.txt +33 -11
- package/dist/browser/collection-dnd.js +37 -40
- package/dist/browser/collection-dnd.js.map +1 -1
- package/dist/browser/color-field.js +12 -6
- package/dist/browser/color-field.js.map +1 -1
- package/dist/browser/drop-zone.js +6 -3
- package/dist/browser/drop-zone.js.map +1 -1
- package/dist/browser/grid-list.d.ts +2 -2
- package/dist/browser/grid-list.js +8 -7
- package/dist/browser/grid-list.js.map +1 -1
- package/dist/browser/list-box.js +31 -37
- package/dist/browser/list-box.js.map +1 -1
- package/dist/browser/menu.js +16 -19
- package/dist/browser/menu.js.map +1 -1
- package/dist/browser/modal.js +28 -31
- package/dist/browser/modal.js.map +1 -1
- package/dist/browser/number-field.js +5 -4
- package/dist/browser/number-field.js.map +1 -1
- package/dist/browser/popover.js +26 -29
- package/dist/browser/popover.js.map +1 -1
- package/dist/browser/shared-element-transition.js +19 -22
- package/dist/browser/shared-element-transition.js.map +1 -1
- package/dist/browser/sheet.d.ts +1 -1
- package/dist/browser/sheet.js +82 -7
- package/dist/browser/sheet.js.map +1 -1
- package/dist/browser/table.d.ts +2 -2
- package/dist/browser/table.js +5 -2
- package/dist/browser/table.js.map +1 -1
- package/dist/browser/tabs.d.ts +1 -1
- package/dist/browser/tabs.js +65 -26
- package/dist/browser/tabs.js.map +1 -1
- package/dist/browser/toast.js +43 -46
- package/dist/browser/toast.js.map +1 -1
- package/dist/browser/token-field.js +0 -1
- package/dist/browser/token-field.js.map +1 -1
- package/dist/browser/tooltip.js +22 -25
- package/dist/browser/tooltip.js.map +1 -1
- package/dist/browser/tree.js +21 -10
- package/dist/browser/tree.js.map +1 -1
- package/dist/server/calendar.js +3 -1
- package/dist/server/calendar.js.map +1 -1
- package/dist/server/checkbox.js +3 -1
- package/dist/server/checkbox.js.map +1 -1
- package/dist/server/collection-dnd.js +8 -36
- package/dist/server/collection-dnd.js.map +1 -1
- package/dist/server/color-field.js +7 -2
- package/dist/server/color-field.js.map +1 -1
- package/dist/server/color-thumb.js +6 -2
- package/dist/server/color-thumb.js.map +1 -1
- package/dist/server/drop-zone.js +12 -5
- package/dist/server/drop-zone.js.map +1 -1
- package/dist/server/grid-list.js +16 -32
- package/dist/server/grid-list.js.map +1 -1
- package/dist/server/hidden-date-input.js +3 -1
- package/dist/server/hidden-date-input.js.map +1 -1
- package/dist/server/list-box.js +25 -69
- package/dist/server/list-box.js.map +1 -1
- package/dist/server/menu.js +10 -31
- package/dist/server/menu.js.map +1 -1
- package/dist/server/modal.js +35 -67
- package/dist/server/modal.js.map +1 -1
- package/dist/server/popover.js +71 -98
- package/dist/server/popover.js.map +1 -1
- package/dist/server/radio-group.js +3 -1
- package/dist/server/radio-group.js.map +1 -1
- package/dist/server/shared-element-transition.js +13 -42
- package/dist/server/shared-element-transition.js.map +1 -1
- package/dist/server/sheet.js +135 -60
- package/dist/server/sheet.js.map +1 -1
- package/dist/server/slider.js +3 -1
- package/dist/server/slider.js.map +1 -1
- package/dist/server/switch.js +3 -1
- package/dist/server/switch.js.map +1 -1
- package/dist/server/table.js +8 -3
- package/dist/server/table.js.map +1 -1
- package/dist/server/tabs.js +180 -169
- package/dist/server/tabs.js.map +1 -1
- package/dist/server/toast.js +68 -101
- package/dist/server/toast.js.map +1 -1
- package/dist/server/token-field.js +2 -2
- package/dist/server/tooltip.js +34 -61
- package/dist/server/tooltip.js.map +1 -1
- package/dist/server/tree.js +156 -130
- package/dist/server/tree.js.map +1 -1
- package/dist/server/virtualizer.js +3 -1
- package/dist/server/virtualizer.js.map +1 -1
- package/package.json +12 -11
package/dist/server/sheet.js
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
*/
|
|
12
12
|
/*
|
|
13
13
|
* Derived from Adobe React Spectrum: packages/react-aria-components/src/Sheet.tsx.
|
|
14
|
-
* Modified for Solid Aria: adapted components, contexts, refs, and reactive properties for Solid 2; measures rendered CSS snap lengths, tracks page offsets, preserves native scrolling, defers focus until entry, and settles handle gestures on release.
|
|
14
|
+
* Modified for Solid Aria: adapted components, contexts, refs, and reactive properties for Solid 2; measures rendered CSS snap lengths, tracks page offsets, skips offscreen entry travel, preserves native entry scrolling across geometry measurements, defers focus until entry, and settles handle gestures on release.
|
|
15
15
|
* Licensed under Apache-2.0. See LICENSES/Apache-2.0.txt and NOTICE.txt at the repository root.
|
|
16
16
|
*/
|
|
17
17
|
import { assignRef, createRenderProps, createSlottedContext, dom } from "./utils.js";
|
|
@@ -151,7 +151,7 @@ var _d$9 = {
|
|
|
151
151
|
enumerable: true,
|
|
152
152
|
configurable: true
|
|
153
153
|
};
|
|
154
|
-
function _P$5(_p7, _p8, _p9, _p0, _p1, _p10) {
|
|
154
|
+
function _P$5(_p7, _p8, _p9, _p0, _p1, _p10, _p11) {
|
|
155
155
|
this[_m$] = _p7;
|
|
156
156
|
this[_m$2] = _p8;
|
|
157
157
|
Object.defineProperty(this, "isOpen", _d$6);
|
|
@@ -160,8 +160,9 @@ function _P$5(_p7, _p8, _p9, _p0, _p1, _p10) {
|
|
|
160
160
|
Object.defineProperty(this, "isDismissable", _d$8);
|
|
161
161
|
Object.defineProperty(this, "isKeyboardDismissDisabled", _d$9);
|
|
162
162
|
this.UNSTABLE_overrideFocus = _p0;
|
|
163
|
-
this.
|
|
164
|
-
this.
|
|
163
|
+
this.onEnter = _p1;
|
|
164
|
+
this.class = _p10;
|
|
165
|
+
this.style = _p11;
|
|
165
166
|
}
|
|
166
167
|
_P$5.prototype = Object.prototype;
|
|
167
168
|
var _d$10 = {
|
|
@@ -181,10 +182,10 @@ var _d$11 = {
|
|
|
181
182
|
enumerable: true,
|
|
182
183
|
configurable: true
|
|
183
184
|
};
|
|
184
|
-
function _P$6(
|
|
185
|
-
this[_m$] =
|
|
186
|
-
this[_m$2] =
|
|
187
|
-
this[_m$3] =
|
|
185
|
+
function _P$6(_p12, _p13, _p14) {
|
|
186
|
+
this[_m$] = _p12;
|
|
187
|
+
this[_m$2] = _p13;
|
|
188
|
+
this[_m$3] = _p14;
|
|
188
189
|
Object.defineProperty(this, "render", _d$10);
|
|
189
190
|
Object.defineProperty(this, "children", _d$11);
|
|
190
191
|
}
|
|
@@ -203,9 +204,9 @@ var _d$13 = {
|
|
|
203
204
|
enumerable: true,
|
|
204
205
|
configurable: true
|
|
205
206
|
};
|
|
206
|
-
function _P$7(
|
|
207
|
-
this[_m$] =
|
|
208
|
-
this[_m$2] =
|
|
207
|
+
function _P$7(_p15, _p16) {
|
|
208
|
+
this[_m$] = _p15;
|
|
209
|
+
this[_m$2] = _p16;
|
|
209
210
|
Object.defineProperty(this, "values", _d$12);
|
|
210
211
|
Object.defineProperty(this, "children", _d$13);
|
|
211
212
|
}
|
|
@@ -219,10 +220,10 @@ var _d$14 = {
|
|
|
219
220
|
enumerable: true,
|
|
220
221
|
configurable: true
|
|
221
222
|
};
|
|
222
|
-
function _P$8(
|
|
223
|
-
this[_m$] =
|
|
224
|
-
this[_m$2] =
|
|
225
|
-
this.value =
|
|
223
|
+
function _P$8(_p17, _p18, _p19) {
|
|
224
|
+
this[_m$] = _p17;
|
|
225
|
+
this[_m$2] = _p18;
|
|
226
|
+
this.value = _p19;
|
|
226
227
|
Object.defineProperty(this, "children", _d$14);
|
|
227
228
|
}
|
|
228
229
|
_P$8.prototype = Object.prototype;
|
|
@@ -243,10 +244,10 @@ var _d$16 = {
|
|
|
243
244
|
enumerable: true,
|
|
244
245
|
configurable: true
|
|
245
246
|
};
|
|
246
|
-
function _P$9(
|
|
247
|
-
this[_m$] =
|
|
248
|
-
this[_m$2] =
|
|
249
|
-
this.point =
|
|
247
|
+
function _P$9(_p20, _p21, _p22) {
|
|
248
|
+
this[_m$] = _p20;
|
|
249
|
+
this[_m$2] = _p21;
|
|
250
|
+
this.point = _p22;
|
|
250
251
|
Object.defineProperty(this, "align", _d$15);
|
|
251
252
|
Object.defineProperty(this, "axis", _d$16);
|
|
252
253
|
}
|
|
@@ -267,11 +268,11 @@ var _d$18 = {
|
|
|
267
268
|
enumerable: true,
|
|
268
269
|
configurable: true
|
|
269
270
|
};
|
|
270
|
-
function _P$10(
|
|
271
|
-
this[_m$] =
|
|
272
|
-
this[_m$2] =
|
|
271
|
+
function _P$10(_p23, _p24, _p25) {
|
|
272
|
+
this[_m$] = _p23;
|
|
273
|
+
this[_m$2] = _p24;
|
|
273
274
|
Object.defineProperty(this, "point", _d$17);
|
|
274
|
-
this.align =
|
|
275
|
+
this.align = _p25;
|
|
275
276
|
Object.defineProperty(this, "axis", _d$18);
|
|
276
277
|
}
|
|
277
278
|
_P$10.prototype = Object.prototype;
|
|
@@ -282,8 +283,8 @@ var _d$19 = {
|
|
|
282
283
|
enumerable: true,
|
|
283
284
|
configurable: true
|
|
284
285
|
};
|
|
285
|
-
function _P$11(
|
|
286
|
-
this[_m$] =
|
|
286
|
+
function _P$11(_p26) {
|
|
287
|
+
this[_m$] = _p26;
|
|
287
288
|
Object.defineProperty(this, "onDismiss", _d$19);
|
|
288
289
|
}
|
|
289
290
|
_P$11.prototype = Object.prototype;
|
|
@@ -311,10 +312,10 @@ var _d$22 = {
|
|
|
311
312
|
enumerable: true,
|
|
312
313
|
configurable: true
|
|
313
314
|
};
|
|
314
|
-
function _P$12(
|
|
315
|
-
this[_m$] =
|
|
316
|
-
this[_m$2] =
|
|
317
|
-
this.point =
|
|
315
|
+
function _P$12(_p27, _p28, _p29) {
|
|
316
|
+
this[_m$] = _p27;
|
|
317
|
+
this[_m$2] = _p28;
|
|
318
|
+
this.point = _p29;
|
|
318
319
|
Object.defineProperty(this, "axis", _d$20);
|
|
319
320
|
Object.defineProperty(this, "after", _d$21);
|
|
320
321
|
Object.defineProperty(this, "isInitial", _d$22);
|
|
@@ -327,10 +328,10 @@ var _d$23 = {
|
|
|
327
328
|
enumerable: true,
|
|
328
329
|
configurable: true
|
|
329
330
|
};
|
|
330
|
-
function _P$13(
|
|
331
|
-
this[_m$] =
|
|
331
|
+
function _P$13(_p30, _p31) {
|
|
332
|
+
this[_m$] = _p30;
|
|
332
333
|
Object.defineProperty(this, "each", _d$23);
|
|
333
|
-
this.children =
|
|
334
|
+
this.children = _p31;
|
|
334
335
|
}
|
|
335
336
|
_P$13.prototype = Object.prototype;
|
|
336
337
|
var _d$24 = {
|
|
@@ -347,9 +348,9 @@ var _d$25 = {
|
|
|
347
348
|
enumerable: true,
|
|
348
349
|
configurable: true
|
|
349
350
|
};
|
|
350
|
-
function _P$14(
|
|
351
|
-
this[_m$] =
|
|
352
|
-
this[_m$2] =
|
|
351
|
+
function _P$14(_p32, _p33) {
|
|
352
|
+
this[_m$] = _p32;
|
|
353
|
+
this[_m$2] = _p33;
|
|
353
354
|
Object.defineProperty(this, "values", _d$24);
|
|
354
355
|
Object.defineProperty(this, "children", _d$25);
|
|
355
356
|
}
|
|
@@ -361,8 +362,8 @@ var _d$26 = {
|
|
|
361
362
|
enumerable: true,
|
|
362
363
|
configurable: true
|
|
363
364
|
};
|
|
364
|
-
function _P$15(
|
|
365
|
-
this[_m$] =
|
|
365
|
+
function _P$15(_p34) {
|
|
366
|
+
this[_m$] = _p34;
|
|
366
367
|
Object.defineProperty(this, "onDismiss", _d$26);
|
|
367
368
|
}
|
|
368
369
|
_P$15.prototype = Object.prototype;
|
|
@@ -417,15 +418,15 @@ var _d$30 = {
|
|
|
417
418
|
enumerable: true,
|
|
418
419
|
configurable: true
|
|
419
420
|
};
|
|
420
|
-
function _P$16(
|
|
421
|
-
this[_m$] =
|
|
422
|
-
this[_m$2] =
|
|
423
|
-
this[_m$3] =
|
|
424
|
-
this[_m$4] =
|
|
425
|
-
this[_m$5] =
|
|
426
|
-
this[_m$6] =
|
|
427
|
-
this[_m$7] =
|
|
428
|
-
this.ref =
|
|
421
|
+
function _P$16(_p35, _p36, _p37, _p38, _p39, _p40, _p41, _p42) {
|
|
422
|
+
this[_m$] = _p35;
|
|
423
|
+
this[_m$2] = _p36;
|
|
424
|
+
this[_m$3] = _p37;
|
|
425
|
+
this[_m$4] = _p38;
|
|
426
|
+
this[_m$5] = _p39;
|
|
427
|
+
this[_m$6] = _p40;
|
|
428
|
+
this[_m$7] = _p41;
|
|
429
|
+
this.ref = _p42;
|
|
429
430
|
Object.defineProperty(this, "style", _d$27);
|
|
430
431
|
Object.defineProperty(this, "data-swiping", _d$28);
|
|
431
432
|
Object.defineProperty(this, "data-descendants-swiping", _d$29);
|
|
@@ -457,10 +458,10 @@ var _d$33 = {
|
|
|
457
458
|
enumerable: true,
|
|
458
459
|
configurable: true
|
|
459
460
|
};
|
|
460
|
-
function _P$17(
|
|
461
|
-
this[_m$] =
|
|
462
|
-
this[_m$2] =
|
|
463
|
-
this[_m$3] =
|
|
461
|
+
function _P$17(_p43, _p44, _p45) {
|
|
462
|
+
this[_m$] = _p43;
|
|
463
|
+
this[_m$2] = _p44;
|
|
464
|
+
this[_m$3] = _p45;
|
|
464
465
|
Object.defineProperty(this, "point", _d$31);
|
|
465
466
|
Object.defineProperty(this, "align", _d$32);
|
|
466
467
|
Object.defineProperty(this, "axis", _d$33);
|
|
@@ -480,13 +481,13 @@ var _d$35 = {
|
|
|
480
481
|
enumerable: true,
|
|
481
482
|
configurable: true
|
|
482
483
|
};
|
|
483
|
-
function _P$18(
|
|
484
|
-
this[_m$] =
|
|
485
|
-
this[_m$2] =
|
|
484
|
+
function _P$18(_p46, _p47, _p48, _p49) {
|
|
485
|
+
this[_m$] = _p46;
|
|
486
|
+
this[_m$2] = _p47;
|
|
486
487
|
Object.defineProperty(this, "isEntering", _d$34);
|
|
487
|
-
this["data-sheet-content"] =
|
|
488
|
+
this["data-sheet-content"] = _p48;
|
|
488
489
|
Object.defineProperty(this, "class", _d$35);
|
|
489
|
-
this.style =
|
|
490
|
+
this.style = _p49;
|
|
490
491
|
}
|
|
491
492
|
_P$18.prototype = Object.prototype;
|
|
492
493
|
const registries = /* @__PURE__ */ new WeakMap();
|
|
@@ -675,9 +676,55 @@ function SheetOverlay(props) {
|
|
|
675
676
|
values
|
|
676
677
|
};
|
|
677
678
|
const fullValues = (modal) => mergeProps(values, modal);
|
|
679
|
+
let disposeEnter;
|
|
680
|
+
onSettled(() => () => {
|
|
681
|
+
disposeEnter?.();
|
|
682
|
+
});
|
|
683
|
+
createEffect(() => state.isOpen, (open) => {
|
|
684
|
+
if (!open) disposeEnter?.();
|
|
685
|
+
}, { ssrSource: "client" });
|
|
678
686
|
return ModalOverlay(mergeProps$1(() => {
|
|
679
687
|
return omit(props, "children", "class", "style", "render", "position", "swipeDirection", "snapPoints", "preventDismissal");
|
|
680
|
-
}, new _P$5(state, props, void 0, true, (
|
|
688
|
+
}, new _P$5(state, props, void 0, true, (element) => {
|
|
689
|
+
disposeEnter?.();
|
|
690
|
+
const scroller = element.closest("[data-sheet-scroll]");
|
|
691
|
+
if (!scroller) return;
|
|
692
|
+
const { promise, resolve } = Promise.withResolvers();
|
|
693
|
+
const snapType = scroller.style.scrollSnapType;
|
|
694
|
+
let canceled = false;
|
|
695
|
+
let skipped = false;
|
|
696
|
+
let frame;
|
|
697
|
+
const onScrollEnd = () => {
|
|
698
|
+
if (skipped) scroller.style.scrollSnapType = snapType;
|
|
699
|
+
resolve();
|
|
700
|
+
};
|
|
701
|
+
disposeEnter = () => {
|
|
702
|
+
canceled = true;
|
|
703
|
+
if (frame !== void 0) cancelAnimationFrame(frame);
|
|
704
|
+
scroller.removeEventListener("scrollend", onScrollEnd);
|
|
705
|
+
onScrollEnd();
|
|
706
|
+
};
|
|
707
|
+
queueMicrotask(() => {
|
|
708
|
+
if (canceled || !element.isConnected || !untrack(() => state.isOpen)) {
|
|
709
|
+
resolve();
|
|
710
|
+
return;
|
|
711
|
+
}
|
|
712
|
+
const { axis: initialAxis, enteredScroll, maxScroll } = untrack(() => swipeConfig(swipe()));
|
|
713
|
+
const viewport = initialAxis === "y" ? window.innerHeight : window.innerWidth;
|
|
714
|
+
const rest = initialAxis === "y" ? scroller.scrollTop : scroller.scrollLeft;
|
|
715
|
+
const reduced = window.matchMedia("(prefers-reduced-motion: reduce)").matches;
|
|
716
|
+
scrollAlongAxis(scroller, initialAxis, enteredScroll === 0 ? maxScroll / 100 * viewport : 0);
|
|
717
|
+
const content = element.querySelector("[data-sheet-content]");
|
|
718
|
+
skipped = content !== null && !reduced && skipOffscreenTravel(scroller, content, initialAxis, viewport);
|
|
719
|
+
const startEnterScroll = () => {
|
|
720
|
+
scrollAlongAxis(scroller, initialAxis, rest, !reduced);
|
|
721
|
+
scroller.addEventListener("scrollend", onScrollEnd, { once: true });
|
|
722
|
+
};
|
|
723
|
+
if (enteredScroll === 0 || skipped) frame = requestAnimationFrame(startEnterScroll);
|
|
724
|
+
else startEnterScroll();
|
|
725
|
+
});
|
|
726
|
+
return promise;
|
|
727
|
+
}, (modal) => {
|
|
681
728
|
const value = props.class;
|
|
682
729
|
return (typeof value === "function" ? value(mergeProps(fullValues(modal), { defaultClass: "solid2-aria-SheetOverlay" })) : value) ?? "solid2-aria-SheetOverlay";
|
|
683
730
|
}, (modal) => {
|
|
@@ -739,6 +786,28 @@ function sheetData(values) {
|
|
|
739
786
|
function viewTimelineSupported() {
|
|
740
787
|
return typeof CSS !== "undefined" && typeof CSS.supports === "function" && CSS.supports("animation-timeline: view()");
|
|
741
788
|
}
|
|
789
|
+
function scrollAlongAxis(element, axis, value, smooth = false) {
|
|
790
|
+
const behavior = smooth ? "smooth" : "instant";
|
|
791
|
+
element.scrollTo(axis === "y" ? {
|
|
792
|
+
behavior,
|
|
793
|
+
top: value
|
|
794
|
+
} : {
|
|
795
|
+
behavior,
|
|
796
|
+
left: value
|
|
797
|
+
});
|
|
798
|
+
}
|
|
799
|
+
function skipOffscreenTravel(scroller, content, axis, viewport) {
|
|
800
|
+
const rect = content.getBoundingClientRect();
|
|
801
|
+
const start = axis === "y" ? rect.top : rect.left;
|
|
802
|
+
const end = axis === "y" ? rect.bottom : rect.right;
|
|
803
|
+
let delta = Math.min(end, 0);
|
|
804
|
+
if (start > viewport) delta = start - viewport;
|
|
805
|
+
if (delta === 0) return false;
|
|
806
|
+
scroller.style.scrollSnapType = "none";
|
|
807
|
+
if (axis === "y") scroller.scrollTop += delta;
|
|
808
|
+
else scroller.scrollLeft += delta;
|
|
809
|
+
return true;
|
|
810
|
+
}
|
|
742
811
|
function toLength(point) {
|
|
743
812
|
return typeof point === "number" ? `${point}px` : point;
|
|
744
813
|
}
|
|
@@ -819,7 +888,10 @@ function Sheet(props) {
|
|
|
819
888
|
points: [],
|
|
820
889
|
size: 0,
|
|
821
890
|
viewport: 0
|
|
822
|
-
}, {
|
|
891
|
+
}, {
|
|
892
|
+
equals: (previous, next) => previous.size === next.size && previous.viewport === next.viewport && previous.points.length === next.points.length && previous.points.every((point, index) => point === next.points[index]),
|
|
893
|
+
ownedWrite: true
|
|
894
|
+
});
|
|
823
895
|
const [scroll, setScroll] = createSignal(0, { ownedWrite: true });
|
|
824
896
|
const [isDragging, setDragging] = createSignal(false, { ownedWrite: true });
|
|
825
897
|
const config = () => swipeConfig(context.values.swipeDirection);
|
|
@@ -900,6 +972,7 @@ function Sheet(props) {
|
|
|
900
972
|
axis: conf.axis,
|
|
901
973
|
direction: context.values.swipeDirection,
|
|
902
974
|
entered: start,
|
|
975
|
+
entering: context.values.isEntering,
|
|
903
976
|
initial: scrollForPoint(points()[0] ?? size),
|
|
904
977
|
lower: isClamped && dual ? start - 1 : 0,
|
|
905
978
|
points: context.props.snapPoints?.join(" "),
|
|
@@ -911,10 +984,12 @@ function Sheet(props) {
|
|
|
911
984
|
}, (next) => {
|
|
912
985
|
if (!next.size || !next.viewport || true) return;
|
|
913
986
|
const initialKey = `${next.direction}:${next.points ?? ""}`;
|
|
987
|
+
if (initialized && initialKey === lastInitial && next.entering) return;
|
|
988
|
+
const current = next.axis === "y" ? scroller.scrollTop : scroller.scrollLeft;
|
|
914
989
|
const target = !initialized || initialKey !== lastInitial ? next.initial : next.scroll + next.entered - previousEntered;
|
|
915
990
|
const position = Math.max(next.lower, Math.min(next.upper, target));
|
|
916
|
-
if (next.axis === "y") scroller.scrollTop = position;
|
|
917
|
-
else scroller.scrollLeft = position;
|
|
991
|
+
if (next.axis === "y" && current !== position) scroller.scrollTop = position;
|
|
992
|
+
else if (next.axis === "x" && current !== position) scroller.scrollLeft = position;
|
|
918
993
|
setScroll(position);
|
|
919
994
|
initialized = true;
|
|
920
995
|
lastInitial = initialKey;
|
|
@@ -928,7 +1003,7 @@ function Sheet(props) {
|
|
|
928
1003
|
setExpanded(next.size > 0 && next.visible >= next.size - 1);
|
|
929
1004
|
});
|
|
930
1005
|
const finish = () => {
|
|
931
|
-
if (!initialized) return;
|
|
1006
|
+
if (!initialized || context.values.isEntering || context.values.isExiting) return;
|
|
932
1007
|
const { size } = geometry();
|
|
933
1008
|
const amount = visible();
|
|
934
1009
|
const minimum = smallest();
|