From 64a0f27f06f2d8f02972e2198308f795f5d76aa2 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@JF-BJ>
Date: Thu, 14 May 2026 06:46:04 +0800
Subject: [PATCH] fix: apply objectLimit globally

Closes #42
---
 .../InteractiveGraphics.tsx                   | 120 ++++++++++--------
 site/utils/applyObjectLimit.ts                |  39 ++++++
 tests/apply-object-limit.test.ts              |  48 +++++++
 3 files changed, 157 insertions(+), 50 deletions(-)
 create mode 100644 site/utils/applyObjectLimit.ts
 create mode 100644 tests/apply-object-limit.test.ts

diff --git a/site/components/InteractiveGraphics/InteractiveGraphics.tsx b/site/components/InteractiveGraphics/InteractiveGraphics.tsx
index de014e1..e7d84a4 100644
--- a/site/components/InteractiveGraphics/InteractiveGraphics.tsx
+++ b/site/components/InteractiveGraphics/InteractiveGraphics.tsx
@@ -1,6 +1,7 @@
 import useResizeObserver from "@react-hook/resize-observer"
 import { useCallback, useEffect, useMemo, useState } from "react"
 import { SuperGrid } from "react-supergrid"
+import { applyObjectLimit } from "site/utils/applyObjectLimit"
 import { getGraphicsBounds } from "site/utils/getGraphicsBounds"
 import { getMaxStep } from "site/utils/getMaxStep"
 import { sortRectsByArea } from "site/utils/sortRectsByArea"
@@ -421,65 +422,78 @@ export const InteractiveGraphics = ({
     filterLayerAndStep,
   })
 
-  const filterAndLimit = <T,>(
+  const filterObjects = <T,>(
     objects: T[] | undefined,
     filterFn: (obj: T) => boolean,
   ): (T & { originalIndex: number })[] => {
     if (!objects) return []
-    const filtered = objects
+    return objects
       .map((obj, index) => ({ ...obj, originalIndex: index }))
       .filter(filterFn)
-    return objectLimit ? filtered.slice(-objectLimit) : filtered
   }
 
-  const filteredLines = useMemo(
-    () =>
-      filterAndLimit(graphics.lines, filterLines).sort(
-        (a, b) =>
-          (a.zIndex ?? 0) - (b.zIndex ?? 0) ||
-          a.originalIndex - b.originalIndex,
-      ),
-    [graphics.lines, filterLines, objectLimit],
-  )
-  const filteredInfiniteLines = useMemo(
-    () => filterAndLimit(graphics.infiniteLines, filterLayerAndStep),
-    [graphics.infiniteLines, filterLayerAndStep, objectLimit],
-  )
-  const filteredRects = useMemo(
-    () => sortRectsByArea(filterAndLimit(graphics.rects, filterRects)),
-    [graphics.rects, filterRects, objectLimit],
-  )
-  const filteredPolygons = useMemo(
-    () => filterAndLimit(graphics.polygons, filterPolygons),
-    [graphics.polygons, filterPolygons, objectLimit],
-  )
-  const filteredPoints = useMemo(
-    () => filterAndLimit(graphics.points, filterPoints),
-    [graphics.points, filterPoints, objectLimit],
-  )
-  const filteredCircles = useMemo(
-    () => filterAndLimit(graphics.circles, filterCircles),
-    [graphics.circles, filterCircles, objectLimit],
-  )
-  const filteredTexts = useMemo(
-    () => filterAndLimit(graphics.texts, filterTexts),
-    [graphics.texts, filterTexts, objectLimit],
-  )
-  const filteredArrows = useMemo(
-    () => filterAndLimit(graphics.arrows, filterArrows),
-    [graphics.arrows, filterArrows, objectLimit],
-  )
+  const visibleObjects = useMemo(() => {
+    const lines = filterObjects(graphics.lines, filterLines).sort(
+      (a, b) =>
+        (a.zIndex ?? 0) - (b.zIndex ?? 0) || a.originalIndex - b.originalIndex,
+    )
+    const infiniteLines = filterObjects(
+      graphics.infiniteLines,
+      filterLayerAndStep,
+    )
+    const rects = sortRectsByArea(filterObjects(graphics.rects, filterRects))
+    const polygons = filterObjects(graphics.polygons, filterPolygons)
+    const points = filterObjects(graphics.points, filterPoints)
+    const circles = filterObjects(graphics.circles, filterCircles)
+    const texts = filterObjects(graphics.texts, filterTexts)
+    const arrows = filterObjects(graphics.arrows, filterArrows)
+
+    return applyObjectLimit(
+      {
+        arrows,
+        infiniteLines,
+        lines,
+        rects,
+        polygons,
+        circles,
+        texts,
+        points,
+      },
+      objectLimit,
+    )
+  }, [
+    graphics.lines,
+    graphics.infiniteLines,
+    graphics.rects,
+    graphics.polygons,
+    graphics.points,
+    graphics.circles,
+    graphics.texts,
+    graphics.arrows,
+    filterLines,
+    filterLayerAndStep,
+    filterRects,
+    filterPolygons,
+    filterPoints,
+    filterCircles,
+    filterTexts,
+    filterArrows,
+    objectLimit,
+  ])
 
-  const totalFilteredObjects =
-    filteredInfiniteLines.length +
-    filteredLines.length +
-    filteredRects.length +
-    filteredPolygons.length +
-    filteredPoints.length +
-    filteredCircles.length +
-    filteredTexts.length +
-    filteredArrows.length
-  const isLimitReached = objectLimit && totalFilteredObjects > objectLimit
+  const {
+    arrows: filteredArrows,
+    infiniteLines: filteredInfiniteLines,
+    lines: filteredLines,
+    rects: filteredRects,
+    polygons: filteredPolygons,
+    circles: filteredCircles,
+    texts: filteredTexts,
+    points: filteredPoints,
+  } = visibleObjects.limitedGroups
+
+  const totalFilteredObjects = visibleObjects.totalObjectCount
+  const isLimitReached = visibleObjects.isLimited
 
   return (
     <div>
@@ -560,6 +574,12 @@ export const InteractiveGraphics = ({
               )}
             </div>
           )}
+          {maxStep <= 0 && isLimitReached && (
+            <span style={{ color: "red", fontSize: "12px" }}>
+              Display limited to {objectLimit} objects. Received:{" "}
+              {totalFilteredObjects}.
+            </span>
+          )}
 
           <label>
             <input
diff --git a/site/utils/applyObjectLimit.ts b/site/utils/applyObjectLimit.ts
new file mode 100644
index 0000000..8924085
--- /dev/null
+++ b/site/utils/applyObjectLimit.ts
@@ -0,0 +1,39 @@
+type ObjectGroups = Record<string, unknown[]>
+
+export function applyObjectLimit<TGroups extends ObjectGroups>(
+  groups: TGroups,
+  objectLimit?: number,
+): {
+  limitedGroups: TGroups
+  totalObjectCount: number
+  isLimited: boolean
+} {
+  const totalObjectCount = Object.values(groups).reduce(
+    (total, objects) => total + objects.length,
+    0,
+  )
+  const shouldLimit = objectLimit !== undefined && objectLimit >= 0
+
+  if (!shouldLimit || totalObjectCount <= objectLimit) {
+    return {
+      limitedGroups: groups,
+      totalObjectCount,
+      isLimited: false,
+    }
+  }
+
+  let remainingObjects = objectLimit
+  const limitedGroups = {} as TGroups
+
+  for (const [key, objects] of Object.entries(groups)) {
+    const objectCount = Math.min(objects.length, remainingObjects)
+    ;(limitedGroups as ObjectGroups)[key] = objects.slice(0, objectCount)
+    remainingObjects -= objectCount
+  }
+
+  return {
+    limitedGroups,
+    totalObjectCount,
+    isLimited: true,
+  }
+}
diff --git a/tests/apply-object-limit.test.ts b/tests/apply-object-limit.test.ts
new file mode 100644
index 0000000..2a5c28c
--- /dev/null
+++ b/tests/apply-object-limit.test.ts
@@ -0,0 +1,48 @@
+import { describe, expect, test } from "bun:test"
+import { applyObjectLimit } from "../site/utils/applyObjectLimit"
+
+describe("applyObjectLimit", () => {
+  test("does not limit when objectLimit is undefined", () => {
+    const result = applyObjectLimit({
+      lines: [1, 2],
+      points: [3, 4],
+    })
+
+    expect(result.totalObjectCount).toBe(4)
+    expect(result.isLimited).toBe(false)
+    expect(result.limitedGroups.lines).toEqual([1, 2])
+    expect(result.limitedGroups.points).toEqual([3, 4])
+  })
+
+  test("applies a global limit across object groups", () => {
+    const result = applyObjectLimit(
+      {
+        lines: ["line-1", "line-2"],
+        points: ["point-1", "point-2"],
+        rects: ["rect-1"],
+      },
+      3,
+    )
+
+    expect(result.totalObjectCount).toBe(5)
+    expect(result.isLimited).toBe(true)
+    expect(result.limitedGroups.lines).toEqual(["line-1", "line-2"])
+    expect(result.limitedGroups.points).toEqual(["point-1"])
+    expect(result.limitedGroups.rects).toEqual([])
+  })
+
+  test("supports an objectLimit of zero", () => {
+    const result = applyObjectLimit(
+      {
+        lines: ["line-1"],
+        points: ["point-1"],
+      },
+      0,
+    )
+
+    expect(result.totalObjectCount).toBe(2)
+    expect(result.isLimited).toBe(true)
+    expect(result.limitedGroups.lines).toEqual([])
+    expect(result.limitedGroups.points).toEqual([])
+  })
+})