refactor: cleanup

src/lib/VirtualList2.svelte → src/lib/new/VirtualList2.svelte

@@ -38,7 +38,7 @@
     type AfterScrollEvent,
     type VirtualListModel,
     type VirtualRangeEvent
-  } from '.';
+  } from '..';
 
   import { binarySearch } from './jshelper';
   import clsx from 'clsx';

src/lib/new/jshelper.ts

@@ -0,0 +1,76 @@
+
+type BinarySearchReturn<T> = {
+  index: number;
+  value: T;
+  count: number;
+  hit: boolean;
+  greater?: boolean;
+} | null;
+
+interface BinarySearchOptions {
+  start?: number;
+  end?: number;
+  returnNearestIfNoHit?: boolean;
+  maxTimes?: number;
+}
+/**
+ * binarySearch, 二分查找
+ * @param arr
+ * @param callback return `mid - your_value` for ascending array
+ * @param opt
+ * @returns
+ */
+export function binarySearch<T>(
+  arr: T[],
+  callback: (mid: T, index: number, count: number) => number,
+  opt: BinarySearchOptions = {}
+): BinarySearchReturn<T> {
+  opt = {
+    start: 0,
+    end: arr.length - 1,
+    maxTimes: 1000,
+    ...opt
+  };
+  let start = opt.start as number;
+  let end = opt.end as number;
+  const returnNearestIfNoHit = opt.returnNearestIfNoHit;
+  const maxTimes = opt.maxTimes as number;
+  // let { start, end } = opt;
+  //  const { returnNearestIfNoHit, maxTimes } = opt;
+  let midNum: number;
+  let mid: T;
+  if (!start) {
+    start = 0;
+    end = arr.length - 1;
+  }
+  let i = 0;
+  let r = 0;
+  while (start >= 0 && start <= end) {
+    if (i >= maxTimes) {
+      throw Error(`binarySearch: loop times is over ${maxTimes}, you can increase the limit.`);
+    }
+    midNum = Math.floor((end - start) / 2 + start);
+    mid = arr[midNum];
+    const count = i + 1;
+    r = callback(mid, midNum, count);
+    if (r > 0) {
+      end = midNum - 1;
+    } else if (r < 0) {
+      start = midNum + 1;
+    } else {
+      return { index: midNum as number, value: mid as T, count, hit: true };
+    }
+    i++;
+  }
+  return returnNearestIfNoHit
+    ? {
+        //@ts-expect-error used before being assigned
+        index: midNum as number,
+        //@ts-expect-error used before being assigned
+        value: mid as T,
+        count: i + 1,
+        hit: false,
+        greater: r > 0
+      }
+    : null;
+}

src/routes/+layout.svelte

@@ -29,7 +29,7 @@
         { title: 'Table', path: '/examples/table' },
         { title: 'Variable Sizing', path: '/examples/variablesizing' },
         { title: 'Positioning', path: '/examples/positioning' },
-        { title: 'OLDPositioning', path: '/examples/positioning2' },
+        { title: 'OLDPositioning', path: '/examples/positioningOLD' },
         { title: 'Partial Loader', path: '/examples/partialloader' },
         { title: 'Events', path: '/examples/events' }
       ]

src/routes/examples/horizontal/code.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import VirtualList from '$lib/VirtualList2.svelte';
+  import VirtualList from 'svelte-virtuallists/new/VirtualList2.svelte';
 
   const myModel = new Array(10000).fill(1).map((v, i) => {
     return { text: 'ITEM ' + i + ' - Item ' + i };

src/routes/examples/positioning/code.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import { ALIGNMENT, SCROLL_BEHAVIOR, type VirtualListModel } from '$lib';
-  import VirtualList from '$lib/VirtualList2.svelte';
+  import VirtualList from 'svelte-virtuallists/new/VirtualList2.svelte';
 
   const myModel = new Array(10000).fill(1).map((v, i) => {
     return { text: 'Item ' + i + ' item ' + i, lineHeight: 20 + (i % 30) + 'px' };

src/routes/examples/positioning2/code.svelte → src/routes/examples/positioningOLD/code.svelte

@@ -2,8 +2,7 @@
   import {
     VirtualList,
     ALIGNMENT,
-    SCROLL_BEHAVIOR,
-    type VirtualListModel
+    SCROLL_BEHAVIOR
   } from 'svelte-virtuallists';
 
   let virtualList;

src/routes/examples/table/code.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import VirtualList from '$lib/VirtualList2.svelte';
+  import VirtualList from 'svelte-virtuallists/new/VirtualList2.svelte';
 
   const myModel = new Array(10000).fill(1).map((v, i) => {
     return { text: 'ITEM ' + i + ' - Item ' + i };

src/routes/examples/variablesizing/code.svelte

@@ -1,10 +1,14 @@
 <script lang="ts">
-  import VirtualList from '$lib/VirtualList2.svelte';
+  import VirtualList from 'svelte-virtuallists/new/VirtualList2.svelte';
 
   const myModel = new Array(10000).fill(1).map((v, i) => {
-    return { text: 'Item ' + i + ' item ' + i, lineHeight: 20 + (i % 30) + 'px' };
+    return {
+      text: 'Item ' + i + ' item ' + i,
+      lineHeight: 20 + (i % 30) + 'px',
+      width: 20 + (i % 30) + 'px'
+    };
   });
-
+  
   let rowHeights = (item: any, index: number) => 25;
 
   function randomize() {

src/routes/examples/vertical/code.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import VirtualList from '$lib/VirtualList2.svelte';
+  import VirtualList from 'svelte-virtuallists/new/VirtualList2.svelte';
 
   const myModel = new Array(10000).fill(1).map((v, i) => {
     return { text: 'ITEM ' + i + ' - Item ' + i };