Merge pull request #41 from zaewc/develop

develop to master

Author: zaewc

package.json

@@ -1,6 +1,6 @@
 {
   "name": "scrolloop",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/976520/scrolloop.git"

packages/core/src/virtualizer/Virtualizer.ts

@@ -11,16 +11,16 @@ export class Virtualizer {
   #count: number;
   readonly #overscan: number;
   #plugins: Plugin[];
-  readonly #onChange?: (state: VirtualizerState) => void;
+  readonly #onChange: ((state: VirtualizerState) => void) | undefined;
 
   readonly #layoutStrategy: LayoutStrategy;
   readonly #scrollSource: ScrollSource;
 
   #state: VirtualizerState;
-  readonly #unsubscribe?: () => void;
+  readonly #unsubscribe: (() => void) | undefined;
 
-  #prevRenderRange?: { startIndex: number; endIndex: number };
-  #prevVirtualItems?: VirtualItem[];
+  #prevRenderRange: { startIndex: number; endIndex: number } | undefined;
+  #prevVirtualItems: VirtualItem[] | undefined;
 
   constructor(
     layoutStrategy: LayoutStrategy,

packages/core/tsconfig.json

@@ -4,7 +4,10 @@
     "outDir": "./dist",
     "declaration": true,
     "declarationMap": true,
-    "types": ["vitest/globals"]
+    "types": ["vitest/globals"],
+    "noUncheckedIndexedAccess": true,
+    "exactOptionalPropertyTypes": true,
+    "noImplicitOverride": true
   },
   "include": ["src/**/*", "tsup.config.ts"],
   "exclude": ["node_modules", "dist", "**/*.test.ts"]

packages/react-native/src/components/InfiniteList.tsx

@@ -57,19 +57,20 @@ function InfiniteListInner<T>(props: InfiniteListProps<T>) {
   ]);
 
   const handleRangeChange = (range: Range) => {
-    const prefetchStart = Math.max(
-      0,
-      Math.floor(range.startIndex / pageSize) -
-        Math.floor(range.endIndex / pageSize)
-    );
+    const prefetchStart = Math.floor(range.startIndex / pageSize);
     const prefetchEnd =
       Math.floor(range.endIndex / pageSize) +
       prefetchThreshold +
       Math.ceil(overscan / pageSize);
 
-    findMissingPages(prefetchStart, prefetchEnd, pages, loadingPages);
+    const missingPages = findMissingPages(
+      prefetchStart,
+      prefetchEnd,
+      pages,
+      loadingPages
+    );
 
-    for (let page = prefetchStart; page <= prefetchEnd; page++) {
+    for (const page of missingPages) {
       loadPage(page);
     }
   };

packages/react/src/components/InfiniteList.tsx

@@ -130,16 +130,13 @@ function InfiniteListInner<T>(props: InfiniteListProps<T>) {
         scrollTopRef.current = containerRef.current?.scrollTop ?? 0;
         return;
       }
-      const ps = Math.max(
-        0,
-        ((range.startIndex / pageSize) | 0) - ((range.endIndex / pageSize) | 0)
-      );
+      const ps = (range.startIndex / pageSize) | 0;
       const pe =
         ((range.endIndex / pageSize) | 0) +
         prefetchThreshold +
         Math.ceil(overscan / pageSize);
-      findMissingPages(ps, pe, mergedPages, loadingPages);
-      for (let p = ps; p <= pe; p++) loadPage(p);
+      const missingPages = findMissingPages(ps, pe, mergedPages, loadingPages);
+      for (const p of missingPages) loadPage(p);
     },
     [
       isServerSide,

packages/react/src/hooks/useInfinitePages.ts

@@ -34,6 +34,9 @@
     "react": ">=18.0.0"
   },
   "devDependencies": {
+    "@testing-library/jest-dom": "^6.9.1",
+    "@testing-library/react": "^14.3.1",
+    "jsdom": "^24.1.3",
     "react": "^18.2.0",
     "tsup": "^8.0.0",
     "typescript": "^5.0.0",