Skip to content

Commit

Permalink
refactor(react): simply render implementations
Browse files Browse the repository at this point in the history
  • Loading branch information
fwouts committed Aug 26, 2023
1 parent be1a6e8 commit 0c5bac8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 22 deletions.
11 changes: 6 additions & 5 deletions framework-plugins/react/preview/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,12 @@ export const loadRenderer: RendererLoader = async ({
return;
}
await render(
Renderer,
getProps({
presetGlobalProps: previewableModule.default?.args || {},
presetProps: Previewable.args || {},
})
<Renderer
{...getProps({
presetGlobalProps: previewableModule.default?.args || {},
presetProps: Previewable.args || {},
})}
/>
);
if (shouldAbortRender()) {
return;
Expand Down
9 changes: 2 additions & 7 deletions framework-plugins/react/preview/render-16.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
import React from "react";
import ReactDOM from "react-dom";
import { rootContainer } from "./root";

export function render(Renderer: React.ComponentType, props: any) {
if (!Renderer) {
ReactDOM.unmountComponentAtNode(rootContainer);
return;
}
ReactDOM.render(<Renderer {...props} />, rootContainer);
export function render(node: JSX.Element) {
ReactDOM.render(node, rootContainer);
}
12 changes: 2 additions & 10 deletions framework-plugins/react/preview/render-18.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
import React from "react";
import type { Root } from "react-dom/client";
import { createRoot } from "react-dom/client";
import { rootContainer } from "./root";

let root: Root | null = null;
export function render(Renderer: React.ComponentType, props: any) {
if (!Renderer) {
if (root) {
root.unmount();
root = null;
}
return;
}
export function render(node: JSX.Element) {
if (!root) {
root = createRoot(rootContainer);
}
root.render(<Renderer {...props} />);
root.render(node);
}

0 comments on commit 0c5bac8

Please sign in to comment.