fix: store rooms in map
This commit is contained in:
parent
2fbabbd403
commit
0a21cb2637
@ -104,6 +104,16 @@ export default function CodeEditor({
|
|||||||
const room = useRoom()
|
const room = useRoom()
|
||||||
const [provider, setProvider] = useState<TypedLiveblocksProvider>()
|
const [provider, setProvider] = useState<TypedLiveblocksProvider>()
|
||||||
const userInfo = useSelf((me) => me.info)
|
const userInfo = useSelf((me) => me.info)
|
||||||
|
|
||||||
|
// Liveblocks providers map to prevent reinitializing providers
|
||||||
|
type ProviderData = {
|
||||||
|
provider: LiveblocksProvider<never, never, never, never>;
|
||||||
|
yDoc: Y.Doc;
|
||||||
|
yText: Y.Text;
|
||||||
|
binding?: MonacoBinding;
|
||||||
|
onSync: (isSynced: boolean) => void;
|
||||||
|
};
|
||||||
|
const providersMap = useRef(new Map<string, ProviderData>());
|
||||||
|
|
||||||
// Refs for libraries / features
|
// Refs for libraries / features
|
||||||
const editorContainerRef = useRef<HTMLDivElement>(null)
|
const editorContainerRef = useRef<HTMLDivElement>(null)
|
||||||
@ -332,43 +342,77 @@ export default function CodeEditor({
|
|||||||
|
|
||||||
if (!editorRef || !tab || !model) return
|
if (!editorRef || !tab || !model) return
|
||||||
|
|
||||||
const yDoc = new Y.Doc()
|
let providerData: ProviderData;
|
||||||
const yText = yDoc.getText(tab.id)
|
|
||||||
const yProvider: any = new LiveblocksProvider(room, yDoc)
|
// When a file is opened for the first time, create a new provider and store in providersMap.
|
||||||
|
if (!providersMap.current.has(tab.id)) {
|
||||||
|
const yDoc = new Y.Doc();
|
||||||
|
const yText = yDoc.getText(tab.id);
|
||||||
|
const yProvider = new LiveblocksProvider(room, yDoc);
|
||||||
|
|
||||||
const onSync = (isSynced: boolean) => {
|
// Inserts the file content into the editor once when the tab is changed.
|
||||||
if (isSynced) {
|
const onSync = (isSynced: boolean) => {
|
||||||
const text = yText.toString()
|
if (isSynced) {
|
||||||
if (text === "") {
|
const text = yText.toString()
|
||||||
if (activeFileContent) {
|
if (text === "") {
|
||||||
yText.insert(0, activeFileContent)
|
if (activeFileContent) {
|
||||||
} else {
|
yText.insert(0, activeFileContent)
|
||||||
setTimeout(() => {
|
} else {
|
||||||
yText.insert(0, editorRef.getValue())
|
setTimeout(() => {
|
||||||
}, 0)
|
yText.insert(0, editorRef.getValue())
|
||||||
|
}, 0)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
yProvider.on("sync", onSync)
|
||||||
|
|
||||||
|
// Save the provider to the map.
|
||||||
|
providerData = { provider: yProvider, yDoc, yText, onSync };
|
||||||
|
providersMap.current.set(tab.id, providerData);
|
||||||
|
|
||||||
|
} else {
|
||||||
|
// When a tab is opened that has been open before, reuse the existing provider.
|
||||||
|
providerData = providersMap.current.get(tab.id)!;
|
||||||
}
|
}
|
||||||
|
|
||||||
yProvider.on("sync", onSync)
|
|
||||||
|
|
||||||
setProvider(yProvider)
|
|
||||||
|
|
||||||
const binding = new MonacoBinding(
|
const binding = new MonacoBinding(
|
||||||
yText,
|
providerData.yText,
|
||||||
model,
|
model,
|
||||||
new Set([editorRef]),
|
new Set([editorRef]),
|
||||||
yProvider.awareness as Awareness
|
providerData.provider.awareness as unknown as Awareness
|
||||||
)
|
);
|
||||||
|
|
||||||
|
providerData.binding = binding;
|
||||||
|
|
||||||
|
setProvider(providerData.provider);
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
yDoc.destroy()
|
// Cleanup logic
|
||||||
yProvider.destroy()
|
if (binding) {
|
||||||
binding.destroy()
|
binding.destroy();
|
||||||
yProvider.off("sync", onSync)
|
}
|
||||||
}
|
if (providerData.binding) {
|
||||||
}, [editorRef, room, activeFileContent])
|
providerData.binding = undefined;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}, [editorRef, room, activeFileContent, activeFileId, tabs]);
|
||||||
|
|
||||||
|
// Added this effect to clean up when the component unmounts
|
||||||
|
useEffect(() => {
|
||||||
|
return () => {
|
||||||
|
// Clean up all providers when the component unmounts
|
||||||
|
providersMap.current.forEach((data) => {
|
||||||
|
if (data.binding) {
|
||||||
|
data.binding.destroy();
|
||||||
|
}
|
||||||
|
data.provider.disconnect();
|
||||||
|
data.yDoc.destroy();
|
||||||
|
});
|
||||||
|
providersMap.current.clear();
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
// Connection/disconnection effect
|
// Connection/disconnection effect
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user