Skip to content

Apply objectLimit across filtered graphics groups #219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
haocyan0723-code wants to merge 1 commit into
base: main
Choose a base branch
from
+53 −9
Open

Apply objectLimit across filtered graphics groups #219

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 53 additions & 9 deletions site/components/InteractiveGraphics/InteractiveGraphics.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ export const InteractiveGraphics = ({
const filtered = objects
.map((obj, index) => ({ ...obj, originalIndex: index }))
.filter(filterFn)
return objectLimit ? filtered.slice(-objectLimit) : filtered
return filtered
}

const filteredLines = useMemo(
Expand Down Expand Up @@ -470,6 +470,50 @@ export const InteractiveGraphics = ({
[graphics.arrows, filterArrows, objectLimit],
)

const applyObjectLimit = <T,>(groups: T[][]): T[][] => {
if (!objectLimit) return groups

let remaining = objectLimit
return groups
.slice()
.reverse()
.map((group) => {
const limitedGroup = remaining > 0 ? group.slice(-remaining) : []
remaining -= limitedGroup.length
return limitedGroup
})
.reverse()
}

const [
visibleArrows,
visibleInfiniteLines,
visibleLines,
visibleRects,
visiblePolygons,
visibleCircles,
visibleTexts,
visiblePoints,
] = applyObjectLimit([
filteredArrows,
filteredInfiniteLines,
filteredLines,
filteredRects,
filteredPolygons,
filteredCircles,
filteredTexts,
filteredPoints,
]) as [
typeof filteredArrows,
typeof filteredInfiniteLines,
typeof filteredLines,
typeof filteredRects,
typeof filteredPolygons,
typeof filteredCircles,
typeof filteredTexts,
typeof filteredPoints,
]

const totalFilteredObjects =
filteredInfiniteLines.length +
filteredLines.length +
Expand Down Expand Up @@ -598,15 +642,15 @@ export const InteractiveGraphics = ({
onContextMenu={handleContextMenu}
>
<DimensionOverlay transform={realToScreen}>
{filteredArrows.map((arrow) => (
{visibleArrows.map((arrow) => (
<Arrow
key={arrow.originalIndex}
arrow={arrow}
index={arrow.originalIndex}
interactiveState={interactiveState}
/>
))}
{filteredInfiniteLines.map((infiniteLine) => (
{visibleInfiniteLines.map((infiniteLine) => (
<InfiniteLine
key={infiniteLine.originalIndex}
infiniteLine={infiniteLine}
Expand All @@ -615,7 +659,7 @@ export const InteractiveGraphics = ({
size={size}
/>
))}
{filteredLines.map((line) => (
{visibleLines.map((line) => (
<Line
key={line.originalIndex}
line={line}
Expand All @@ -625,39 +669,39 @@ export const InteractiveGraphics = ({
mousePosition={mousePosition}
/>
))}
{filteredRects.map((rect) => (
{visibleRects.map((rect) => (
<Rect
key={rect.originalIndex}
rect={rect}
index={rect.originalIndex}
interactiveState={interactiveState}
/>
))}
{filteredPolygons.map((polygon) => (
{visiblePolygons.map((polygon) => (
<Polygon
key={polygon.originalIndex}
polygon={polygon}
index={polygon.originalIndex}
interactiveState={interactiveState}
/>
))}
{filteredCircles.map((circle) => (
{visibleCircles.map((circle) => (
<Circle
key={circle.originalIndex}
circle={circle}
index={circle.originalIndex}
interactiveState={interactiveState}
/>
))}
{filteredTexts.map((txt) => (
{visibleTexts.map((txt) => (
<Text
key={txt.originalIndex}
textObj={txt}
index={txt.originalIndex}
interactiveState={interactiveState}
/>
))}
{filteredPoints.map((point) => (
{visiblePoints.map((point) => (
<Point
key={point.originalIndex}
point={point}
Expand Down