Skip to content

Commit

Permalink
[TreeView] Fix hydration error (#15002)
Browse files Browse the repository at this point in the history
Signed-off-by: Flavien DELANGLE <[email protected]>
Co-authored-by: Lukas Tyla <[email protected]>
  • Loading branch information
flaviendelangle and LukasTy authored Oct 17, 2024
1 parent fc6cc5f commit 7b8d976
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,9 @@ export const useTreeViewId: TreeViewPlugin<UseTreeViewIdSignature> = ({
state,
setState,
}) => {
const treeId = state.id.treeId;

React.useEffect(() => {
setState((prevState) => {
if (prevState.id.treeId === params.id) {
if (prevState.id.treeId === params.id && prevState.id.treeId !== undefined) {
return prevState;
}

Expand All @@ -23,6 +21,8 @@ export const useTreeViewId: TreeViewPlugin<UseTreeViewIdSignature> = ({
});
}, [setState, params.id]);

const treeId = params.id ?? state.id.treeId;

return {
getRootProps: () => ({
id: treeId,
Expand All @@ -37,4 +37,4 @@ useTreeViewId.params = {
id: true,
};

useTreeViewId.getInitialState = ({ id }) => ({ id: { treeId: id ?? createTreeViewDefaultId() } });
useTreeViewId.getInitialState = ({ id }) => ({ id: { treeId: id ?? undefined } });
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export type UseTreeViewIdDefaultizedParameters = UseTreeViewIdParameters;

export interface UseTreeViewIdState {
id: {
treeId: string;
treeId: string | undefined;
};
}

Expand Down

0 comments on commit 7b8d976

Please sign in to comment.