@shopify/flash-list 2.0.0-alpha.8 → 2.0.0-rc.1

package/src/recyclerview/layout-managers/GridLayoutManager.ts

@@ -78,12 +78,10 @@ export class RVGridLayoutManagerImpl extends RVLayoutManager {
    */
   getLayoutSize(): RVDimension {
     if (this.layouts.length === 0) return { width: 0, height: 0 };
-    const lastRowTallestItem = this.processAndReturnTallestItemInRow(
-      this.layouts.length - 1
-    );
+    const totalHeight = this.computeTotalHeight(this.layouts.length - 1);
     return {
       width: this.boundedSize,
-      height: lastRowTallestItem.y + lastRowTallestItem.height,
+      height: totalHeight,
     };
   }
 
@@ -93,7 +91,9 @@ export class RVGridLayoutManagerImpl extends RVLayoutManager {
    * @param endIndex Ending index of items to recompute
    */
   recomputeLayouts(startIndex: number, endIndex: number): void {
-    const newStartIndex = this.locateFirstNeighbourIndex(startIndex);
+    const newStartIndex = this.locateFirstNeighbourIndex(
+      Math.max(0, startIndex - 1)
+    );
     const startVal = this.getLayout(newStartIndex);
 
     let startX = startVal.x;
@@ -102,7 +102,7 @@ export class RVGridLayoutManagerImpl extends RVLayoutManager {
     for (let i = newStartIndex; i <= endIndex; i++) {
       const layout = this.getLayout(i);
       if (!this.checkBounds(startX, layout.width)) {
-        const tallestItem = this.processAndReturnTallestItemInRow(i);
+        const tallestItem = this.processAndReturnTallestItemInRow(i - 1);
         startY = tallestItem.y + tallestItem.height;
         startX = 0;
       }
@@ -111,6 +111,9 @@ export class RVGridLayoutManagerImpl extends RVLayoutManager {
       layout.y = startY;
       startX += layout.width;
     }
+    if (endIndex === this.layouts.length - 1) {
+      this.processAndReturnTallestItemInRow(endIndex);
+    }
   }
 
   /**
@@ -182,6 +185,26 @@ export class RVGridLayoutManagerImpl extends RVLayoutManager {
     return tallestItem;
   }
 
+  /**
+   * Computes the total height of the layout.
+   * @param index Index of the last item in the layout
+   * @returns Total height of the layout
+   */
+  private computeTotalHeight(index: number): number {
+    const startIndex = this.locateFirstNeighbourIndex(index);
+    const y = this.layouts[startIndex].y;
+    let maxHeight = 0;
+    let i = startIndex;
+    while (Math.ceil(this.layouts[i].y) === Math.ceil(y)) {
+      maxHeight = Math.max(maxHeight, this.layouts[i].height);
+      i++;
+      if (i >= this.layouts.length) {
+        break;
+      }
+    }
+    return y + maxHeight;
+  }
+
   /**
    * Checks if an item can fit within the bounded width.
    * @param itemX Starting X position of the item
@@ -201,7 +224,7 @@ export class RVGridLayoutManagerImpl extends RVLayoutManager {
     if (startIndex === 0) {
       return 0;
     }
-    let i = startIndex - 1;
+    let i = startIndex;
     for (; i >= 0; i--) {
       if (this.layouts[i].x === 0) {
         break;

package/src/recyclerview/layout-managers/LayoutManager.ts

@@ -24,8 +24,6 @@ export abstract class RVLayoutManager {
   protected spanSizeInfo: SpanSizeInfo = {};
   /** Maximum number of columns in the layout */
   protected maxColumns: number;
-  /** Optional callback to override default item layout */
-  protected overrideItemLayout?: (index: number, layout: SpanSizeInfo) => void;
 
   /** Whether to optimize item placement for better space utilization */
   protected optimizeItemArrangement: boolean;
@@ -33,8 +31,10 @@ export abstract class RVLayoutManager {
   /** Flag indicating if the layout requires repainting */
   public requiresRepaint = false;
 
+  /** Optional callback to override default item layout */
+  private overrideItemLayout: (index: number, layout: SpanSizeInfo) => void;
   /** Optional function to determine item type */
-  private _getItemType?: (index: number) => string | number;
+  private getItemType: (index: number) => string;
   /** Window for tracking average heights by item type */
   private heightAverageWindow: MultiTypeAverageWindow;
   /** Window for tracking average widths by item type */
@@ -45,7 +45,7 @@ export abstract class RVLayoutManager {
   constructor(params: LayoutParams, previousLayoutManager?: RVLayoutManager) {
     this.heightAverageWindow = new MultiTypeAverageWindow(5, 200);
     this.widthAverageWindow = new MultiTypeAverageWindow(5, 200);
-    this._getItemType = params.getItemType;
+    this.getItemType = params.getItemType;
     this.overrideItemLayout = params.overrideItemLayout;
     this.layouts = previousLayoutManager?.layouts ?? [];
     if (previousLayoutManager) {
@@ -57,15 +57,6 @@ export abstract class RVLayoutManager {
     }
   }
 
-  /**
-   * Gets the type of an item at the given index.
-   * @param index Index of the item
-   * @returns Item type or "default" if not specified
-   */
-  private getItemType(index: number): string | number {
-    return this._getItemType?.(index) ?? "default";
-  }
-
   /**
    * Gets the estimated width for an item based on its type.
    * @param index Index of the item
@@ -114,8 +105,8 @@ export abstract class RVLayoutManager {
   /**
    * Gets indices of items currently visible in the viewport.
    * Uses binary search for efficient lookup.
-   * @param unboundDimensionStart Start position of viewport
-   * @param unboundDimensionEnd End position of viewport
+   * @param unboundDimensionStart Start position of viewport (start X or start Y)
+   * @param unboundDimensionEnd End position of viewport (end X or end Y)
    * @returns ConsecutiveNumbers containing visible indices
    */
   getVisibleLayouts(
@@ -275,7 +266,7 @@ export abstract class RVLayoutManager {
    */
   protected getSpanSizeInfo(index: number): SpanSizeInfo {
     this.spanSizeInfo.span = undefined;
-    this.overrideItemLayout?.(index, this.spanSizeInfo);
+    this.overrideItemLayout(index, this.spanSizeInfo);
     return this.spanSizeInfo;
   }
 
@@ -348,31 +339,31 @@ export interface LayoutParams {
    * Determines if the list scrolls horizontally (true) or vertically (false)
    * Affects how items are positioned and which dimension is used for scrolling
    */
-  horizontal?: boolean;
+  horizontal: boolean;
 
   /**
    * Maximum number of columns in a grid layout
    * Controls how many items can be placed side by side
    */
-  maxColumns?: number;
+  maxColumns: number;
 
   /**
    * When true, attempts to optimize item placement for better space utilization
    * May affect the ordering of items to minimize empty space
    */
-  optimizeItemArrangement?: boolean;
+  optimizeItemArrangement: boolean;
 
   /**
    * Callback to manually override layout properties for specific items
    * Allows custom control over span and size for individual items
    */
-  overrideItemLayout?: (index: number, layout: SpanSizeInfo) => void;
+  overrideItemLayout: (index: number, layout: SpanSizeInfo) => void;
 
   /**
    * Function to determine the type of an item at a specific index
    * Used for size estimation and optimization based on item types
    */
-  getItemType?: (index: number) => string | number;
+  getItemType: (index: number) => string;
 }
 
 /**

package/src/recyclerview/layout-managers/MasonryLayoutManager.ts

@@ -23,7 +23,7 @@ export class RVMasonryLayoutManagerImpl extends RVLayoutManager {
     super(params, previousLayoutManager);
     this.boundedSize = params.windowSize.width;
     this.optimizeItemArrangement = params.optimizeItemArrangement ?? false;
-    this.columnHeights = Array(this.maxColumns).fill(0);
+    this.columnHeights = this.columnHeights ?? Array(this.maxColumns).fill(0);
   }
 
   /**

package/src/recyclerview/utils/measureLayout.ts

@@ -15,7 +15,7 @@ interface Layout {
  * @param view - The React Native View component to measure
  * @returns An object containing x, y, width, and height measurements
  */
-export function measureLayout(view: View, oldLayout: Layout | undefined) {
+function measureLayout(view: View, oldLayout: Layout | undefined) {
   // const layout = view.unstable_getBoundingClientRect();
   // layout.width = roundOffPixel(layout.width);
   // layout.height = roundOffPixel(layout.height);
@@ -31,7 +31,7 @@ export function measureLayout(view: View, oldLayout: Layout | undefined) {
  * @param relativeTo - The reference view to measure against
  * @returns An object containing x, y, width, and height measurements
  */
-export function measureLayoutRelative(
+function measureLayoutRelative(
   view: View,
   relativeTo: View,
   oldLayout: Layout | undefined
@@ -106,7 +106,7 @@ export function measureParentSize(view: View): Layout {
  * @param parentView
  * @returns
  */
-export function measureChildContainerLayout(
+export function measureFirstChildLayout(
   childContainerView: View,
   parentView: View
 ): Layout {

package/src/recyclerview/utils/measureLayout.web.ts

@@ -0,0 +1,104 @@
+interface Layout {
+  x: number;
+  y: number;
+  width: number;
+  height: number;
+}
+
+/**
+ * Gets scroll offsets from up to 3 parent elements
+ */
+function getScrollOffsets(element: Element, stopAt: Element) {
+  let scrollX = 0;
+  let scrollY = 0;
+  let currentElement: Element | null = element;
+  let depth = 0;
+
+  // Only check up to 3 parent elements
+  while (currentElement && currentElement !== stopAt && depth < 3) {
+    const htmlElement = currentElement as HTMLElement;
+    scrollX += htmlElement.scrollLeft ?? 0;
+    scrollY += htmlElement.scrollTop ?? 0;
+    currentElement = currentElement.parentElement;
+    depth++;
+  }
+
+  return { scrollX, scrollY };
+}
+
+/**
+ * Checks if two dimension values are not equal, with a small tolerance.
+ */
+export function areDimensionsNotEqual(value1: number, value2: number): boolean {
+  return !areDimensionsEqual(value1, value2);
+}
+
+/**
+ * Checks if two dimension values are equal, with a small tolerance.
+ */
+export function areDimensionsEqual(value1: number, value2: number): boolean {
+  return Math.abs(value1 - value2) <= 1;
+}
+
+export function roundOffPixel(value: number): number {
+  return value;
+}
+
+/**
+ * Measures the layout of parent of RecyclerView
+ */
+export function measureParentSize(view: Element): Layout {
+  return {
+    x: 0,
+    y: 0,
+    width: view.clientWidth,
+    height: view.clientHeight,
+  };
+}
+
+/**
+ * Measures the layout of child container of RecyclerView
+ */
+export function measureFirstChildLayout(
+  childContainerView: Element,
+  parentView: Element
+): Layout {
+  const childRect = childContainerView.getBoundingClientRect();
+  const parentRect = parentView.getBoundingClientRect();
+
+  // Get scroll offsets for child container (max 3 parents)
+  const scrollOffsets = getScrollOffsets(childContainerView, parentView);
+
+  return {
+    x: childRect.left - parentRect.left + scrollOffsets.scrollX,
+    y: childRect.top - parentRect.top + scrollOffsets.scrollY,
+    width: roundOffPixel(childRect.width),
+    height: roundOffPixel(childRect.height),
+  };
+}
+
+/**
+ * Measures the layout of items of RecyclerView
+ */
+export function measureItemLayout(
+  item: Element,
+  oldLayout: Layout | undefined
+): Layout {
+  const layout = {
+    x: 0,
+    y: 0,
+    width: item.clientWidth,
+    height: item.clientHeight,
+  };
+
+  if (oldLayout) {
+    if (areDimensionsEqual(layout.width, oldLayout.width)) {
+      layout.width = oldLayout.width;
+    }
+    if (areDimensionsEqual(layout.height, oldLayout.height)) {
+      layout.height = oldLayout.height;
+    }
+  }
+
+  return layout;
+}

package/src/viewability/ViewToken.ts

@@ -1,5 +1,5 @@
-export default interface ViewToken {
-  item: any; // TODO: fix this type
+export default interface ViewToken<T> {
+  item: T;
   key: string;
   index: number | null;
   isViewable: boolean;

package/src/viewability/ViewabilityHelper.ts

@@ -89,8 +89,8 @@ class ViewabilityHelper {
       const timeoutId = setTimeout(() => {
         this.timers.delete(timeoutId);
         this.checkViewableIndicesChanges(newViewableIndices);
-        this.timers.add(timeoutId);
       }, minimumViewTime);
+      this.timers.add(timeoutId);
     } else {
       this.checkViewableIndicesChanges(newViewableIndices);
     }

package/src/viewability/ViewabilityManager.ts

@@ -102,15 +102,18 @@ export default class ViewabilityManager<T> {
   private createViewabilityHelper = (
     viewabilityConfig: ViewabilityConfig | null | undefined,
     onViewableItemsChanged:
-      | ((info: { viewableItems: ViewToken[]; changed: ViewToken[] }) => void)
+      | ((info: {
+          viewableItems: ViewToken<T>[];
+          changed: ViewToken<T>[];
+        }) => void)
       | null
       | undefined
   ) => {
-    const mapViewToken: (index: number, isViewable: boolean) => ViewToken = (
+    const mapViewToken: (index: number, isViewable: boolean) => ViewToken<T> = (
       index: number,
       isViewable: boolean
     ) => {
-      const item = this.flashListRef.props.data?.[index];
+      const item = this.flashListRef.props.data![index];
       const key =
         item === undefined || this.flashListRef.props.keyExtractor === undefined
           ? index.toString()

package/dist/__tests__/RecycleKeyManager.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=RecycleKeyManager.test.d.ts.map

package/dist/__tests__/RecycleKeyManager.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"RecycleKeyManager.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/RecycleKeyManager.test.ts"],"names":[],"mappings":""}

package/dist/__tests__/RecycleKeyManager.test.js

@@ -1,210 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var RecycleKeyManager_1 = require("../recyclerview/RecycleKeyManager");
-describe("RecycleKeyManagerImpl", function () {
-    var keyManager;
-    beforeEach(function () {
-        // Initialize a new manager before each test
-        keyManager = new RecycleKeyManager_1.RecycleKeyManagerImpl();
-    });
-    describe("constructor", function () {
-        it("should initialize with default maxItems", function () {
-            // Test default maxItems value (implicitly tested via other methods)
-            // We can potentially expose maxItems for testing or test its effect
-            expect(keyManager).toBeDefined(); // Basic check
-        });
-        it("should initialize with specified maxItems", function () {
-            var specificMaxItems = 10;
-            keyManager = new RecycleKeyManager_1.RecycleKeyManagerImpl(specificMaxItems);
-            // Test the effect of maxItems limit later in getKey tests
-            expect(keyManager).toBeDefined(); // Basic check
-        });
-    });
-    describe("getKey", function () {
-        it("should generate a new key for a new item type without stableId", function () {
-            var key = keyManager.getKey("typeA", "item1");
-            expect(key).toBeDefined();
-            expect(typeof key).toBe("string");
-            expect(keyManager.hasKeyInPool(key)).toBe(false);
-        });
-        it("should generate a different key for a different item type", function () {
-            var keyA = keyManager.getKey("typeA", "item1");
-            var keyB = keyManager.getKey("typeB", "item2");
-            expect(keyA).not.toEqual(keyB);
-            expect(keyManager.hasKeyInPool(keyA)).toBe(false);
-            expect(keyManager.hasKeyInPool(keyB)).toBe(false);
-        });
-        it("should generate sequential keys when pool is empty", function () {
-            var key1 = keyManager.getKey("typeA", "item1");
-            var key2 = keyManager.getKey("typeA", "item2");
-            expect(parseInt(key2, 10)).toBe(parseInt(key1, 10) + 1);
-        });
-        it("should return the existing key for a known stableId", function () {
-            var stableId = "stable1";
-            var key1 = keyManager.getKey("typeA", stableId);
-            var key2 = keyManager.getKey("typeA", stableId);
-            var key3 = keyManager.getKey("typeB", stableId); // Different type, same stableId
-            expect(key2).toEqual(key1);
-            expect(key3).toEqual(key1); // Should still return the key associated with the stableId
-            expect(keyManager.hasKeyInPool(key1)).toBe(false);
-        });
-        it("should reuse a key from the pool for the same item type", function () {
-            var key1 = keyManager.getKey("typeA", "item1");
-            keyManager.recycleKey(key1);
-            var key2 = keyManager.getKey("typeA", "item2");
-            expect(key2).toEqual(key1); // Should reuse the recycled key
-            expect(keyManager.hasKeyInPool(key1)).toBe(false);
-        });
-        it("should reuse the specified currentKey if it exists in the pool", function () {
-            var key1 = keyManager.getKey("typeA", "item1");
-            var key2 = keyManager.getKey("typeA", "item2");
-            keyManager.recycleKey(key1);
-            keyManager.recycleKey(key2);
-            var reusedKey = keyManager.getKey("typeA", "item3", key1);
-            expect(reusedKey).toEqual(key1);
-            expect(keyManager.hasKeyInPool(key1)).toBe(false);
-            // key2 should still be in the pool
-            expect(keyManager.hasKeyInPool(key2)).toBe(true);
-        });
-        it("should reuse any key from the pool if currentKey does not exist", function () {
-            var key1 = keyManager.getKey("typeA", "item1");
-            var key2 = keyManager.getKey("typeA", "item2");
-            keyManager.recycleKey(key1);
-            keyManager.recycleKey(key2);
-            var nonExistentKey = "nonExistentKey";
-            var reusedKey = keyManager.getKey("typeA", "item3", nonExistentKey);
-            // It should have reused either key1 or key2
-            expect([key1, key2]).toContain(reusedKey);
-            expect(keyManager.hasKeyInPool(reusedKey)).toBe(false);
-        });
-        it("should prioritize stableId over pool reuse", function () {
-            var stableId = "stable1";
-            var key1 = keyManager.getKey("typeA", stableId); // Assign key1 to stable1
-            var key2 = keyManager.getKey("typeA", "item2");
-            keyManager.recycleKey(key2); // Put key2 in the pool
-            // Request key for stable1 again
-            var key3 = keyManager.getKey("typeA", stableId);
-            expect(key3).toEqual(key1); // Should return key1 associated with stableId
-            expect(keyManager.hasKeyInPool(key1)).toBe(false);
-            // key2 should still be in the pool
-            expect(keyManager.hasKeyInPool(key2)).toBe(true);
-        });
-        it("should assign stableId to a reused key", function () {
-            var key1 = keyManager.getKey("typeA", "item1");
-            keyManager.recycleKey(key1);
-            var stableId = "stableReuse";
-            var reusedKey = keyManager.getKey("typeA", stableId); // Reuse key1 and assign stableId
-            expect(reusedKey).toEqual(key1);
-            // Verify stableId mapping
-            var keyForStableId = keyManager.getKey("typeA", stableId);
-            expect(keyForStableId).toEqual(key1);
-        });
-        it("should handle ensurePoolSize when maxItems is exceeded", function () {
-            var maxItems = 2;
-            keyManager = new RecycleKeyManager_1.RecycleKeyManagerImpl(maxItems);
-            var key1 = keyManager.getKey("typeA", "item1"); // Active: {key1}
-            var key2 = keyManager.getKey("typeA", "item2"); // Active: {key1, key2}
-            expect(keyManager.hasKeyInPool(key1)).toBe(false);
-            expect(keyManager.hasKeyInPool(key2)).toBe(false);
-            // This should trigger ensurePoolSize and recycle key1 (oldest)
-            var key3 = keyManager.getKey("typeA", "item3"); // Active: {key2, key3}
-            expect(keyManager.hasKeyInPool(key1)).toBe(true); // key1 should be recycled
-            expect(keyManager.hasKeyInPool(key2)).toBe(false);
-            expect(keyManager.hasKeyInPool(key3)).toBe(false);
-            // This should trigger ensurePoolSize and recycle key2
-            var key4 = keyManager.getKey("typeA", "item4"); // Active: {key3, key4}
-            expect(keyManager.hasKeyInPool(key2)).toBe(true); // key2 should be recycled
-            expect(keyManager.hasKeyInPool(key3)).toBe(false);
-            expect(keyManager.hasKeyInPool(key4)).toBe(false);
-        });
-    });
-    describe("recycleKey", function () {
-        it("should add the key back to the correct pool", function () {
-            var keyA = keyManager.getKey("typeA", "item1");
-            var keyB = keyManager.getKey("typeB", "item2");
-            expect(keyManager.hasKeyInPool(keyA)).toBe(false);
-            expect(keyManager.hasKeyInPool(keyB)).toBe(false);
-            keyManager.recycleKey(keyA);
-            expect(keyManager.hasKeyInPool(keyA)).toBe(true);
-            expect(keyManager.hasKeyInPool(keyB)).toBe(false); // keyB should remain active
-            // Verify reuse from correct pool
-            var reusedKeyA = keyManager.getKey("typeA", "item3");
-            expect(reusedKeyA).toEqual(keyA);
-        });
-        it("should do nothing if the key does not exist or is already recycled", function () {
-            var key = keyManager.getKey("typeA", "item1");
-            keyManager.recycleKey(key); // Recycle it once
-            // Get current state (how many keys active, how many in pool)
-            // We need internal access or specific methods to check pool size directly.
-            // Let's assume internal state is correct after first recycle.
-            keyManager.recycleKey(key); // Try recycling again
-            keyManager.recycleKey("nonExistentKey"); // Try recycling non-existent key
-            // Verify state hasn't changed unexpectedly
-            expect(keyManager.hasKeyInPool(key)).toBe(true); // Still in pool
-            var newKey = keyManager.getKey("typeA", "item2");
-            expect(newKey).toEqual(key); // Should still reuse the original key
-        });
-    });
-    describe("hasKeyInPool", function () {
-        it("should return false for an active key", function () {
-            var key = keyManager.getKey("typeA", "item1");
-            expect(keyManager.hasKeyInPool(key)).toBe(false);
-        });
-        it("should return true for a recycled key", function () {
-            var key = keyManager.getKey("typeA", "item1");
-            keyManager.recycleKey(key);
-            expect(keyManager.hasKeyInPool(key)).toBe(true);
-        });
-        it("should return true for a key that was never generated", function () {
-            expect(keyManager.hasKeyInPool("nonExistentKey")).toBe(true);
-        });
-    });
-    describe("clearPool", function () {
-        it("should clear all keys from all pools", function () {
-            var keyA1 = keyManager.getKey("typeA", "item1");
-            var keyA2 = keyManager.getKey("typeA", "item2");
-            var keyB1 = keyManager.getKey("typeB", "item3");
-            keyManager.recycleKey(keyA1);
-            keyManager.recycleKey(keyB1);
-            expect(keyManager.hasKeyInPool(keyA1)).toBe(true);
-            expect(keyManager.hasKeyInPool(keyA2)).toBe(false); // Still active
-            expect(keyManager.hasKeyInPool(keyB1)).toBe(true);
-            keyManager.clearPool();
-            expect(keyManager.hasKeyInPool(keyA1)).toBe(true); // Still not active
-            expect(keyManager.hasKeyInPool(keyB1)).toBe(true); // Still not active
-            expect(keyManager.hasKeyInPool(keyA2)).toBe(false); // Active keys remain
-            // Getting new keys should generate new ones, not reuse cleared ones
-            var newKeyA = keyManager.getKey("typeA", "item4");
-            var newKeyB = keyManager.getKey("typeB", "item5");
-            expect(newKeyA).not.toEqual(keyA1);
-            expect(newKeyB).not.toEqual(keyB1);
-            // Depending on implementation, newKeyA might be keyA1 if keyCounter wasn't reset
-            // Check if key reuse happens after clearPool -> it shouldn't reuse from the *pool*
-            var keyA3 = keyManager.getKey("typeA", "item5"); // Generate another A key
-            keyManager.recycleKey(keyA3); // Recycle it
-            keyManager.clearPool(); // Clear pools again
-            keyManager.getKey("typeA", "item6"); // Get a new key
-            expect(keyManager.hasKeyInPool(keyA3)).toBe(true); // keyA3 is not active
-            // keyA4 should be newly generated, not reused from the cleared pool
-            // Note: Due to sequential key generation, it *might* match a previous key numerically
-            // but the crucial part is it wasn't reused *from the pool*.
-        });
-        it("should not affect active keys or stableId mappings", function () {
-            var stableId = "stableClear";
-            var keyA = keyManager.getKey("typeA", stableId);
-            var keyB = keyManager.getKey("typeB", "item2");
-            keyManager.recycleKey(keyB); // Put keyB in pool
-            expect(keyManager.hasKeyInPool(keyA)).toBe(false);
-            expect(keyManager.hasKeyInPool(keyB)).toBe(true);
-            expect(keyManager.getKey("typeA", stableId)).toEqual(keyA); // Check stableId mapping
-            keyManager.clearPool();
-            expect(keyManager.hasKeyInPool(keyA)).toBe(false); // keyA still active
-            expect(keyManager.hasKeyInPool(keyB)).toBe(true); // keyB still considered "in pool" (i.e., not active)
-            expect(keyManager.getKey("typeA", stableId)).toEqual(keyA); // StableId mapping persists
-            // Trying to get a key of type B should generate a new one
-            var newKeyB = keyManager.getKey("typeB", "item3");
-            expect(newKeyB).not.toEqual(keyB); // Because pool was cleared
-        });
-    });
-});
-//# sourceMappingURL=RecycleKeyManager.test.js.map

package/dist/__tests__/RecycleKeyManager.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"RecycleKeyManager.test.js","sourceRoot":"","sources":["../../src/__tests__/RecycleKeyManager.test.ts"],"names":[],"mappings":"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"}