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

React: Fix issue with react 18 implementation #19125

Merged
merged 4 commits into from
Sep 8, 2022
Merged

React: Fix issue with react 18 implementation #19125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ad2ef7
Fix issue with react 18 implementation
tmeasday Sep 7, 2022
bdf0a82
Update code/renderers/react/src/render.tsx
shilman Sep 7, 2022
4303037
Merge branch 'tom/sb-586-remaining-core-features' into react-18-followup
tmeasday Sep 7, 2022
4283383
Merge branch 'next' into react-18-followup
shilman Sep 8, 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
14 changes: 7 additions & 7 deletions code/lib/store/template/stories/rendering.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ export const ChangeArgs = {
await button.focus();
await expect(button).toHaveFocus();

// // When we change the args to the button, it should not rerender
// await channel.emit('updateStoryArgs', { storyId: id, updatedArgs: { children: 'New Text' } });
// await within(canvasElement).findByText(/New Text/);
// await expect(button).toHaveFocus();
// When we change the args to the button, it should not rerender
await channel.emit('updateStoryArgs', { storyId: id, updatedArgs: { children: 'New Text' } });
await within(canvasElement).findByText(/New Text/);
await expect(button).toHaveFocus();

// await channel.emit('resetStoryArgs', { storyId: id });
// await within(canvasElement).findByText(/Click me/);
// await expect(button).toHaveFocus();
await channel.emit('resetStoryArgs', { storyId: id });
await within(canvasElement).findByText(/Click me/);
await expect(button).toHaveFocus();
},
};
12 changes: 4 additions & 8 deletions code/renderers/react/src/render.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ const WithCallback: FC<{ callback: () => void; children: ReactElement }> = ({
children,
}) => {
// See https://github.com/reactwg/react-18/discussions/5#discussioncomment-2276079
const once = useRef(false);
const once = useRef<() => void>();
useLayoutEffect(() => {
if (once.current) return;
once.current = true;
if (once.current === callback) return;
once.current = callback;
callback();
}, [callback]);

Expand All @@ -55,11 +55,7 @@ const renderElement = async (node: ReactElement, el: Element) => {

return new Promise((resolve) => {
if (root) {
root.render(
<WithCallback key={Math.random()} callback={() => resolve(null)}>
{node}
</WithCallback>
);
root.render(<WithCallback callback={() => resolve(null)}>{node}</WithCallback>);
} else {
ReactDOM.render(node, el, () => resolve(null));
}
Expand Down