virtua 0.43.4 → 0.43.6

package/lib/solid/index.jsx

@@ -28,12 +28,10 @@ const microtask = typeof queueMicrotask === "function"
  */
 const createPromise = () => {
     let resolve;
-    let reject;
-    const promise = new Promise((res, rej) => {
+    const promise = new Promise((res) => {
         resolve = res;
-        reject = rej;
     });
-    return [promise, resolve, reject];
+    return [promise, resolve];
 };
 /**
  * @internal
@@ -704,7 +702,7 @@ const createScroller = (store, isHorizontal) => {
     let viewportElement;
     let scrollObserver;
     let cancelScroll;
-    const [initialized, resolveInitialized, rejectInitialized] = createPromise();
+    let initialized = createPromise();
     const scrollOffsetKey = isHorizontal ? "scrollLeft" : "scrollTop";
     const overflowKey = isHorizontal ? "overflowX" : "overflowY";
     // The given offset will be clamped by browser
@@ -712,7 +710,10 @@ const createScroller = (store, isHorizontal) => {
     const scheduleImperativeScroll = async (getTargetOffset, smooth) => {
         // Wait for element assign. The element may be undefined if scrollRef prop is used and scroll is scheduled on mount.
         // https://github.com/inokawa/virtua/pull/733
-        await initialized;
+        // https://github.com/inokawa/virtua/pull/750
+        if (!(await initialized[0])) {
+            return;
+        }
         if (cancelScroll) {
             // Cancel waiting scrollTo
             cancelScroll();
@@ -720,19 +721,21 @@ const createScroller = (store, isHorizontal) => {
         const waitForMeasurement = () => {
             // Wait for the scroll destination items to be measured.
             // The measurement will be done asynchronously and the timing is not predictable so we use promise.
-            const [promise, resolve, reject] = createPromise();
-            cancelScroll = reject;
+            const [promise, resolve] = createPromise();
+            cancelScroll = () => {
+                resolve(false);
+            };
             // Resize event may not happen when the window/tab is not visible, or during browser back in Safari.
             // We have to wait for the initial measurement to avoid failing imperative scroll on mount.
             // https://github.com/inokawa/virtua/issues/450
             if (isInitialMeasurementDone(store)) {
-                // Reject when items around scroll destination completely measured
-                timeout(reject, 150);
+                // Cancel when items around scroll destination completely measured
+                timeout(cancelScroll, 150);
             }
             return [
                 promise,
                 store.$subscribe(UPDATE_SIZE_EVENT, () => {
-                    resolve();
+                    resolve(true);
                 }),
             ];
         };
@@ -744,11 +747,10 @@ const createScroller = (store, isHorizontal) => {
                 }
                 const [promise, unsubscribe] = waitForMeasurement();
                 try {
-                    await promise;
-                }
-                catch (e) {
-                    // canceled
-                    return;
+                    if (!(await promise)) {
+                        // canceled
+                        return;
+                    }
                 }
                 finally {
                     unsubscribe();
@@ -765,11 +767,10 @@ const createScroller = (store, isHorizontal) => {
                 try {
                     viewportElement[scrollOffsetKey] = normalizeOffset(getTargetOffset(), isHorizontal);
                     store.$update(ACTION_MANUAL_SCROLL);
-                    await promise;
-                }
-                catch (e) {
-                    // canceled or finished
-                    return;
+                    if (!(await promise)) {
+                        // canceled or finished
+                        return;
+                    }
                 }
                 finally {
                     unsubscribe();
@@ -802,11 +803,13 @@ const createScroller = (store, isHorizontal) => {
                     viewport[scrollOffsetKey] += jump;
                 }
             });
-            resolveInitialized();
+            initialized[1](true);
         },
         $dispose() {
             scrollObserver && scrollObserver._dispose();
-            rejectInitialized();
+            initialized[1](false);
+            // https://github.com/inokawa/virtua/pull/765
+            initialized = createPromise();
         },
         $scrollTo(offset) {
             scheduleImperativeScroll(() => offset);
@@ -855,7 +858,7 @@ const createWindowScroller = (store, isHorizontal) => {
     let containerElement;
     let scrollObserver;
     let cancelScroll;
-    const [initialized, resolveInitialized, rejectInitialized] = createPromise();
+    let initialized = createPromise();
     const calcOffsetToViewport = (node, viewport, window, isHorizontal, offset = 0) => {
         // TODO calc offset only when it changes (maybe impossible)
         const offsetKey = isHorizontal ? "offsetLeft" : "offsetTop";
@@ -872,26 +875,31 @@ const createWindowScroller = (store, isHorizontal) => {
     const scheduleImperativeScroll = async (getTargetOffset, smooth) => {
         // Wait for element assign. The element may be undefined if scrollRef prop is used and scroll is scheduled on mount.
         // https://github.com/inokawa/virtua/pull/733
-        await initialized;
+        // https://github.com/inokawa/virtua/pull/750
+        if (!(await initialized[0])) {
+            return;
+        }
         if (cancelScroll) {
             cancelScroll();
         }
         const waitForMeasurement = () => {
             // Wait for the scroll destination items to be measured.
             // The measurement will be done asynchronously and the timing is not predictable so we use promise.
-            const [promise, resolve, reject] = createPromise();
-            cancelScroll = reject;
+            const [promise, resolve] = createPromise();
+            cancelScroll = () => {
+                resolve(false);
+            };
             // Resize event may not happen when the window/tab is not visible, or during browser back in Safari.
             // We have to wait for the initial measurement to avoid failing imperative scroll on mount.
             // https://github.com/inokawa/virtua/issues/450
             if (isInitialMeasurementDone(store)) {
-                // Reject when items around scroll destination completely measured
-                timeout(reject, 150);
+                // Cancel when items around scroll destination completely measured
+                timeout(cancelScroll, 150);
             }
             return [
                 promise,
                 store.$subscribe(UPDATE_SIZE_EVENT, () => {
-                    resolve();
+                    resolve(true);
                 }),
             ];
         };
@@ -904,10 +912,9 @@ const createWindowScroller = (store, isHorizontal) => {
                 }
                 const [promise, unsubscribe] = waitForMeasurement();
                 try {
-                    await promise;
-                }
-                catch (e) {
-                    return;
+                    if (!(await promise)) {
+                        return;
+                    }
                 }
                 finally {
                     unsubscribe();
@@ -926,10 +933,9 @@ const createWindowScroller = (store, isHorizontal) => {
                         [isHorizontal ? "left" : "top"]: normalizeOffset(getTargetOffset(), isHorizontal),
                     });
                     store.$update(ACTION_MANUAL_SCROLL);
-                    await promise;
-                }
-                catch (e) {
-                    return;
+                    if (!(await promise)) {
+                        return;
+                    }
                 }
                 finally {
                     unsubscribe();
@@ -955,12 +961,14 @@ const createWindowScroller = (store, isHorizontal) => {
                     window.scrollBy(isHorizontal ? jump : 0, isHorizontal ? 0 : jump);
                 }
             }, () => calcOffsetToViewport(container, documentBody, window, isHorizontal));
-            resolveInitialized();
+            initialized[1](true);
         },
         $dispose() {
             scrollObserver && scrollObserver._dispose();
             containerElement = undefined;
-            rejectInitialized();
+            initialized[1](false);
+            // https://github.com/inokawa/virtua/pull/765
+            initialized = createPromise();
         },
         $fixScrollJump: () => {
             scrollObserver && scrollObserver._fixScrollJump();