Skip to content

Collapse stack frames that are too close to each other #2142

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

Closed
wants to merge 1 commit into from
Closed

Collapse stack frames that are too close to each other #2142

Show file tree
Hide file tree
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
31 changes: 25 additions & 6 deletions packages/react-error-overlay/src/components/frame.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,20 @@ function createFrame(
functionName = '(anonymous function)';
}

let isTooClose = false;
if (
omits.lastFileName != null &&
sourceFileName === omits.lastFileName &&
omits.lastLineNumber != null &&
sourceLineNumber != null &&
Math.abs(sourceLineNumber - omits.lastLineNumber) < 3
) {
isTooClose = true;
} else {
omits.lastFileName = sourceFileName;
omits.lastLineNumber = sourceLineNumber;
}

let url;
if (!compiled && sourceFileName && sourceLineNumber) {
// Remove everything up to the first /src/
Expand All @@ -168,13 +182,18 @@ function createFrame(
}

let needsHidden = false;
const internalUrl = isInternalFile(url, sourceFileName);
if (internalUrl) {
let internalUrl = isInternalFile(url, sourceFileName);

let shouldCollapse = internalUrl || isTooClose;
let shouldSkipCode = internalUrl;

if (shouldCollapse) {
++omits.value;
needsHidden = true;
}

let collapseElement = null;
if (!internalUrl || lastElement) {
if (!shouldCollapse || lastElement) {
if (omits.value > 0) {
const capV = omits.value;
const omittedFrames = getGroupToggle(document, capV, omitBundle);
Expand All @@ -187,7 +206,7 @@ function createFrame(
omittedFrames
);
});
if (lastElement && internalUrl) {
if (lastElement && shouldCollapse) {
collapseElement = omittedFrames;
} else {
parentContainer.appendChild(omittedFrames);
Expand All @@ -197,14 +216,14 @@ function createFrame(
omits.value = 0;
}

const elem = frameDiv(document, functionName, url, internalUrl);
const elem = frameDiv(document, functionName, url, shouldCollapse);
if (needsHidden) {
applyStyles(elem, hiddenStyle);
elem.setAttribute('name', 'bundle-' + omitBundle);
}

let hasSource = false;
if (!internalUrl) {
if (!shouldSkipCode) {
if (
compiled && scriptLines && scriptLines.length !== 0 && lineNumber != null
) {
Expand Down
16 changes: 13 additions & 3 deletions packages/react-error-overlay/src/components/frames.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@ import { traceStyle, toggleStyle } from '../styles';
import { enableTabClick } from '../utils/dom/enableTabClick';
import { createFrame } from './frame';

type OmitsObject = { value: number, bundle: number };
type OmitsObject = {
value: number,
bundle: number,
lastFileName: ?string,
lastLineNumber: ?number,
};
type FrameSetting = { compiled: boolean };
export type { OmitsObject, FrameSetting };

Expand Down Expand Up @@ -54,7 +59,7 @@ function createFrameWrapper(
}
});
compiledDiv.appendChild(compiledText);
elemWrapper.appendChild(compiledDiv);
elem.appendChild(compiledDiv);
}

if (collapseElement != null) {
Expand All @@ -80,7 +85,12 @@ function createFrames(

let index = 0;
let critical = true;
const omits: OmitsObject = { value: 0, bundle: 1 };
const omits: OmitsObject = {
value: 0,
bundle: 1,
lastFileName: null,
lastLineNumber: null,
};
resolvedFrames.forEach(function(frame) {
const lIndex = index++;
const elem = createFrameWrapper(
Expand Down