virtua 0.43.5 → 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] = createPromise();
+    let initialized = createPromise();
     const scrollOffsetKey = isHorizontal ? "scrollLeft" : "scrollTop";
     const overflowKey = isHorizontal ? "overflowX" : "overflowY";
     // The given offset will be clamped by browser
@@ -713,8 +711,7 @@ const createScroller = (store, isHorizontal) => {
         // 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
         // https://github.com/inokawa/virtua/pull/750
-        const ok = await initialized;
-        if (!ok) {
+        if (!(await initialized[0])) {
             return;
         }
         if (cancelScroll) {
@@ -806,11 +803,13 @@ const createScroller = (store, isHorizontal) => {
                     viewport[scrollOffsetKey] += jump;
                 }
             });
-            resolveInitialized(true);
+            initialized[1](true);
         },
         $dispose() {
             scrollObserver && scrollObserver._dispose();
-            resolveInitialized(false);
+            initialized[1](false);
+            // https://github.com/inokawa/virtua/pull/765
+            initialized = createPromise();
         },
         $scrollTo(offset) {
             scheduleImperativeScroll(() => offset);
@@ -859,7 +858,7 @@ const createWindowScroller = (store, isHorizontal) => {
     let containerElement;
     let scrollObserver;
     let cancelScroll;
-    const [initialized, resolveInitialized] = 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";
@@ -877,8 +876,7 @@ const createWindowScroller = (store, isHorizontal) => {
         // 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
         // https://github.com/inokawa/virtua/pull/750
-        const ok = await initialized;
-        if (!ok) {
+        if (!(await initialized[0])) {
             return;
         }
         if (cancelScroll) {
@@ -963,12 +961,14 @@ const createWindowScroller = (store, isHorizontal) => {
                     window.scrollBy(isHorizontal ? jump : 0, isHorizontal ? 0 : jump);
                 }
             }, () => calcOffsetToViewport(container, documentBody, window, isHorizontal));
-            resolveInitialized(true);
+            initialized[1](true);
         },
         $dispose() {
             scrollObserver && scrollObserver._dispose();
             containerElement = undefined;
-            resolveInitialized(false);
+            initialized[1](false);
+            // https://github.com/inokawa/virtua/pull/765
+            initialized = createPromise();
         },
         $fixScrollJump: () => {
             scrollObserver && scrollObserver._fixScrollJump();