virtua 0.43.0 → 0.43.2

package/lib/solid/index.jsx

@@ -23,6 +23,18 @@ const microtask = typeof queueMicrotask === "function"
     : (fn) => {
         Promise.resolve().then(fn);
     };
+/**
+ * @internal
+ */
+const createPromise = () => {
+    let resolve;
+    let reject;
+    const promise = new Promise((res, rej) => {
+        resolve = res;
+        reject = rej;
+    });
+    return [promise, resolve, reject];
+};
 /**
  * @internal
  */
@@ -692,16 +704,15 @@ const createScroller = (store, isHorizontal) => {
     let viewportElement;
     let scrollObserver;
     let cancelScroll;
+    const [initialized, resolveInitialized, rejectInitialized] = createPromise();
     const scrollOffsetKey = isHorizontal ? "scrollLeft" : "scrollTop";
     const overflowKey = isHorizontal ? "overflowX" : "overflowY";
     // The given offset will be clamped by browser
     // https://drafts.csswg.org/cssom-view/#dom-element-scrolltop
     const scheduleImperativeScroll = async (getTargetOffset, smooth) => {
-        if (!viewportElement) {
-            // Wait for element assign. The element may be undefined if scrollRef prop is used and scroll is scheduled on mount.
-            microtask(() => scheduleImperativeScroll(getTargetOffset, smooth));
-            return;
-        }
+        // 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;
         if (cancelScroll) {
             // Cancel waiting scrollTo
             cancelScroll();
@@ -709,21 +720,19 @@ 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.
-            let queue;
+            const [promise, resolve, reject] = createPromise();
+            cancelScroll = reject;
+            // 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);
+            }
             return [
-                new Promise((resolve, reject) => {
-                    queue = resolve;
-                    cancelScroll = reject;
-                    // 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);
-                    }
-                }),
+                promise,
                 store.$subscribe(UPDATE_SIZE_EVENT, () => {
-                    queue && queue();
+                    resolve();
                 }),
             ];
         };
@@ -793,9 +802,11 @@ const createScroller = (store, isHorizontal) => {
                     viewport[scrollOffsetKey] += jump;
                 }
             });
+            resolveInitialized();
         },
         $dispose() {
             scrollObserver && scrollObserver._dispose();
+            rejectInitialized();
         },
         $scrollTo(offset) {
             scheduleImperativeScroll(() => offset);
@@ -844,6 +855,7 @@ const createWindowScroller = (store, isHorizontal) => {
     let containerElement;
     let scrollObserver;
     let cancelScroll;
+    const [initialized, resolveInitialized, rejectInitialized] = createPromise();
     const calcOffsetToViewport = (node, viewport, window, isHorizontal, offset = 0) => {
         // TODO calc offset only when it changes (maybe impossible)
         const offsetKey = isHorizontal ? "offsetLeft" : "offsetTop";
@@ -858,26 +870,28 @@ const createWindowScroller = (store, isHorizontal) => {
         return calcOffsetToViewport(parent, viewport, window, isHorizontal, offsetSum);
     };
     const scheduleImperativeScroll = async (getTargetOffset, smooth) => {
-        if (!containerElement) {
-            // Wait for element assign
-            microtask(() => scheduleImperativeScroll(getTargetOffset, smooth));
-            return;
-        }
+        // 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;
         if (cancelScroll) {
             cancelScroll();
         }
         const waitForMeasurement = () => {
-            let queue;
+            // 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;
+            // 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);
+            }
             return [
-                new Promise((resolve, reject) => {
-                    queue = resolve;
-                    cancelScroll = reject;
-                    if (isInitialMeasurementDone(store)) {
-                        timeout(reject, 150);
-                    }
-                }),
+                promise,
                 store.$subscribe(UPDATE_SIZE_EVENT, () => {
-                    queue && queue();
+                    resolve();
                 }),
             ];
         };
@@ -941,10 +955,12 @@ const createWindowScroller = (store, isHorizontal) => {
                     window.scrollBy(isHorizontal ? jump : 0, isHorizontal ? 0 : jump);
                 }
             }, () => calcOffsetToViewport(container, documentBody, window, isHorizontal));
+            resolveInitialized();
         },
         $dispose() {
             scrollObserver && scrollObserver._dispose();
             containerElement = undefined;
+            rejectInitialized();
         },
         $fixScrollJump: () => {
             scrollObserver && scrollObserver._fixScrollJump();