Skip to content
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

Jump to bottom

fix: style prop no longer passed to React.Fragment #601

Merged
merged 2 commits into from
Oct 4, 2022
Merged

fix: style prop no longer passed to React.Fragment #601

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
090a5ae
fix: style prop no longer passed to React.Fragment
CTNicholas Oct 2, 2022
c9418a1
fix: Better performance
CTNicholas Oct 4, 2022
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
Next Next commit
fix: style prop no longer passed to React.Fragment
  • Loading branch information
@CTNicholas
CTNicholas committed Oct 2, 2022
commit 090a5ae2888666c5c05c1568c657bfed0e4a2255
10 changes: 8 additions & 2 deletions sandpack-react/src/presets/Sandpack.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ export const Sandpack: SandpackInternal = (props) => {

const hasRightColumn =
props.options?.showConsole || props.options?.showConsoleButton;
const RightColumn = hasRightColumn ? SandpackStack : React.Fragment;

const rightColumnStyle = {
flexGrow: previewPart,
Expand All @@ -93,6 +92,13 @@ export const Sandpack: SandpackInternal = (props) => {
height: props.options?.editorHeight, // use the original editor height
};

const RightColumn: React.FC<{ children: React.ReactNode }> = ({ children }) =>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hummm... I'm afraid that this will remount everything and its children on every render.

What about conditionally passing the props to the RightColumn? Something like this:

const rightColumnProps = useMemo(() => hasRightColumn ? { style } : {}, [hasRightColumn])

<RightColumn {...rightColumnProps}>

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow yep, I wasn't thinking, haha. Updated 👍

hasRightColumn ? (
<SandpackStack style={rightColumnStyle}>{children}</SandpackStack>
) : (
<React.Fragment>{children}</React.Fragment>
);

/* eslint-disable-next-line @typescript-eslint/no-non-null-assertion */
const templateFiles = SANDBOX_TEMPLATES[props.template!] ?? {};
const mode = "mode" in templateFiles ? templateFiles.mode : "preview";
Expand Down Expand Up @@ -128,7 +134,7 @@ export const Sandpack: SandpackInternal = (props) => {
/>

{/* @ts-ignore */}
<RightColumn style={rightColumnStyle}>
<RightColumn>
{mode === "preview" && (
<SandpackPreview
actionsChildren={actionsChildren}
Expand Down