Skip to content

move yjs observers to provider.once("synced") #543

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

Merged
merged 1 commit into from
Sep 13, 2023
Merged

move yjs observers to provider.once("synced") #543

Show file tree
Hide file tree
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
25 changes: 0 additions & 25 deletions packages/ui/src/components/Canvas.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,36 +324,11 @@ export function useCopyPaste() {
}, [handleCopy, handlePaste, rfDomNode]);
}

function useYjsObserver() {
const store = useContext(RepoContext);
if (!store) throw new Error("Missing BearContext.Provider in the tree");
const nodesMap = useStore(store, (state) => state.getNodesMap());
const updateView = useStore(store, (state) => state.updateView);
const resetSelection = useStore(store, (state) => state.resetSelection);

useEffect(() => {
const observer = (YMapEvent: Y.YEvent<any>, transaction: Y.Transaction) => {
if (transaction.local) return;
updateView();
};

// FIXME need to observe edgesMap as well
// FIXME need to observe resultMap as well
nodesMap.observe(observer);

return () => {
nodesMap.unobserve(observer);
resetSelection();
};
}, [nodesMap, resetSelection, updateView]);
}

/**
* The ReactFlow instance keeps re-rendering when nodes change. Thus, we're
* using this wrapper component to load the useXXX functions only once.
*/
function CanvasImplWrap() {
useYjsObserver();
useCopyPaste();
useJump();
return (
Expand Down
15 changes: 15 additions & 0 deletions packages/ui/src/lib/store/yjsSlice.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,21 @@ export const createYjsSlice: StateCreator<MyState, [], [], YjsSlice> = (
});
}
);
const nodesMap = get().getNodesMap();
// FIXME do I need to unobserve it when disconnecting?
nodesMap.observe(
(YMapEvent: Y.YEvent<any>, transaction: Y.Transaction) => {
if (transaction.local) return;
get().updateView();
}
);
const edgesMap = get().getEdgesMap();
edgesMap.observe(
(YMapEvent: Y.YEvent<any>, transaction: Y.Transaction) => {
if (transaction.local) return;
get().updateView();
}
);
// Set active runtime to the first one.
const runtimeMap = get().getRuntimeMap();
if (runtimeMap.size > 0) {
Expand Down