Unverified Commit 7e7ddeb1 authored by Sebastian "Sebbie" Silbermann's avatar Sebastian "Sebbie" Silbermann Committed by GitHub

[dev-overlay] Stop grouping callstack frames into ignored vs. not ignored (#76861)

parent 66c42c47
...@@ -62,6 +62,7 @@ export const MultipleFrames: Story = { ...@@ -62,6 +62,7 @@ export const MultipleFrames: Story = {
lineNumber: 5, lineNumber: 5,
}, },
}, },
...Array(5).fill(ignoredFrame),
{ {
...frame, ...frame,
originalStackFrame: { originalStackFrame: {
......
...@@ -11,24 +11,8 @@ export function CallStack({ frames, dialogResizerRef }: CallStackProps) { ...@@ -11,24 +11,8 @@ export function CallStack({ frames, dialogResizerRef }: CallStackProps) {
const initialDialogHeight = useRef<number>(NaN) const initialDialogHeight = useRef<number>(NaN)
const [isIgnoreListOpen, setIsIgnoreListOpen] = useState(false) const [isIgnoreListOpen, setIsIgnoreListOpen] = useState(false)
const { visibleFrames, ignoredFrames, ignoreListLength } = useMemo(() => { const ignoredFramesTally = useMemo(() => {
const visible: OriginalStackFrame[] = [] return frames.reduce((tally, frame) => tally + (frame.ignored ? 1 : 0), 0)
const ignored: OriginalStackFrame[] = []
for (const frame of frames) {
if (!frame.ignored) {
visible.push(frame)
}
if (frame.ignored) {
ignored.push(frame)
}
}
return {
visibleFrames: visible,
ignoredFrames: ignored,
ignoreListLength: ignored.length,
}
}, [frames]) }, [frames])
function onToggleIgnoreList() { function onToggleIgnoreList() {
...@@ -65,36 +49,22 @@ export function CallStack({ frames, dialogResizerRef }: CallStackProps) { ...@@ -65,36 +49,22 @@ export function CallStack({ frames, dialogResizerRef }: CallStackProps) {
{frames.length} {frames.length}
</span> </span>
</p> </p>
{ignoreListLength > 0 && ( {ignoredFramesTally > 0 && (
<button <button
data-expand-ignore-button={isIgnoreListOpen} data-expand-ignore-button={isIgnoreListOpen}
className="error-overlay-call-stack-ignored-list-toggle-button" className="error-overlay-call-stack-ignored-list-toggle-button"
onClick={onToggleIgnoreList} onClick={onToggleIgnoreList}
> >
{`${isIgnoreListOpen ? 'Hide' : 'Show'} ${ignoreListLength} ignore-listed frames`} {`${isIgnoreListOpen ? 'Hide' : 'Show'} ${ignoredFramesTally} ignore-listed frame(s)`}
<ChevronUpDown /> <ChevronUpDown />
</button> </button>
)} )}
</div> </div>
{visibleFrames.map((frame, frameIndex) => ( {frames.map((frame, frameIndex) => {
<CallStackFrame return !frame.ignored || isIgnoreListOpen ? (
key={`call-stack-leading-${frameIndex}`} <CallStackFrame key={frameIndex} frame={frame} index={frameIndex} />
frame={frame} ) : null
index={frameIndex} })}
/>
))}
{isIgnoreListOpen && (
<>
{ignoredFrames.map((frame, frameIndex) => (
<CallStackFrame
key={`call-stack-ignored-${frameIndex}`}
frame={frame}
index={frameIndex}
/>
))}
</>
)}
</div> </div>
) )
} }
......
...@@ -99,15 +99,15 @@ describe('error-ignored-frames', () => { ...@@ -99,15 +99,15 @@ describe('error-ignored-frames', () => {
if (isTurbopack) { if (isTurbopack) {
expect(expendedStack).toMatchInlineSnapshot(` expect(expendedStack).toMatchInlineSnapshot(`
"at <unknown> (app/interleaved/page.tsx (7:11)) "at <unknown> (app/interleaved/page.tsx (7:11))
at Page (app/interleaved/page.tsx (6:35))
at invokeCallback () at invokeCallback ()
at Page (app/interleaved/page.tsx (6:35))
at ClientPageRoot ()" at ClientPageRoot ()"
`) `)
} else { } else {
expect(expendedStack).toMatchInlineSnapshot(` expect(expendedStack).toMatchInlineSnapshot(`
"at eval (app/interleaved/page.tsx (7:11)) "at eval (app/interleaved/page.tsx (7:11))
at Page (app/interleaved/page.tsx (6:36))
at invokeCallback (node_modules/interleave/index.js (2:1)) at invokeCallback (node_modules/interleave/index.js (2:1))
at Page (app/interleaved/page.tsx (6:36))
at ClientPageRoot (../src/client/components/client-page.tsx (60:12))" at ClientPageRoot (../src/client/components/client-page.tsx (60:12))"
`) `)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment