Skip to content

refactor: hoist static values outside render loop #109

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
TrevorBurnham wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: hoist static values outside render loop #109

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: 17 additions & 14 deletions src/code-view/internal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ import styles from "./styles.css.js";

const ACE_CLASSES = { light: "ace-cloud_editor", dark: "ace-cloud_editor_dark" };

// Static style objects hoisted outside component to avoid recreation on every render.
const COL_STYLE_SHRINK = { width: 1 };
const COL_STYLE_AUTO = { width: "auto" };

// Static class name for line numbers (doesn't depend on props).
const lineNumberClassName = clsx(styles["line-number"], styles.unselectable);

type InternalCodeViewProps = CodeViewProps & InternalBaseComponentProps;

// Breaks down the input code for non-highlighted code-view into React
Expand Down Expand Up @@ -56,6 +63,12 @@ export function InternalCodeView({
const codeElementWrapper: ReactElement = createElement(Fragment, null, code);
const codeElement = Children.only(codeElementWrapper.props.children);

// Compute class name for code lines once, outside the render loop.
const codeLineSpanClassName = clsx(
codeElement.props.className,
wrapLines ? styles["code-line-wrap"] : styles["code-line-nowrap"],
);

return (
<div
className={clsx(darkMode ? ACE_CLASSES.dark : ACE_CLASSES.light, styles.root)}
Expand All @@ -76,8 +89,8 @@ export function InternalCodeView({
)}
>
<colgroup>
<col style={{ width: 1 } /* shrink to fit content */} />
<col style={{ width: "auto" }} />
<col style={COL_STYLE_SHRINK} />
<col style={COL_STYLE_AUTO} />
</colgroup>
{accessibleLineNumbers && (
<thead className={styles["screenreader-only"]}>
Expand All @@ -92,25 +105,15 @@ export function InternalCodeView({
return (
<tr key={index}>
{lineNumbers && (
<td
className={clsx(styles["line-number"], styles.unselectable)}
aria-hidden={!accessibleLineNumbers}
>
<td className={lineNumberClassName} aria-hidden={!accessibleLineNumbers}>
<Box variant="code" color="text-status-inactive" fontSize="body-m">
{index + 1}
</Box>
</td>
)}
<td className={styles["code-line"]}>
<Box variant="code" fontSize="body-m">
<span
className={clsx(
codeElement.props.className,
wrapLines ? styles["code-line-wrap"] : styles["code-line-nowrap"],
)}
>
{child}
</span>
<span className={codeLineSpanClassName}>{child}</span>
</Box>
</td>
</tr>
Expand Down