Jayden/AFFiNE-Mirror
1
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-02-13 04:48:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): blocksuite editor runtime configs in correct timing (#10344)

Browse Source
This commit is contained in:
Peng Xiao
2025-02-21 17:16:53 +08:00
committed by GitHub
parent 09cc5c392b
commit dff68b9aae
5 changed files with 37 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/frontend/core/src/components/blocksuite/block-suite-editor/blocksuite-editor-container.tsx
View File

@@ -42,7 +42,7 @@ export interface AffineEditorContainer extends HTMLElement {
page: Store;
doc: Store;
docTitle: DocTitle;
host: EditorHost;
host?: EditorHost;
model: RootBlockModel | null;
updateComplete: Promise<boolean>;
mode: DocMode;

56
packages/frontend/core/src/components/blocksuite/block-suite-editor/blocksuite-editor.tsx
View File

@@ -67,46 +67,38 @@ const BlockSuiteEditorImpl = ({
let canceled = false;
const disposableGroup = new DisposableGroup();
if (onEditorReady) {
// Invoke onLoad once the editor has been mounted to the DOM.
editor.updateComplete
.then(() => {
if (canceled) {
return;
}
// host should be ready
// Invoke onLoad once the editor has been mounted to the DOM.
if (canceled) {
return;
}
// provide image proxy endpoint to blocksuite
const imageProxyUrl = new URL(
BUILD_CONFIG.imageProxyUrl,
server.baseUrl
).toString();
const linkPreviewUrl = new URL(
BUILD_CONFIG.linkPreviewUrl,
server.baseUrl
).toString();
// provide image proxy endpoint to blocksuite
const imageProxyUrl = new URL(
BUILD_CONFIG.imageProxyUrl,
server.baseUrl
).toString();
editor.host?.std.clipboard.use(
customImageProxyMiddleware(imageProxyUrl)
);
const linkPreviewUrl = new URL(
BUILD_CONFIG.linkPreviewUrl,
server.baseUrl
).toString();
page.get(LinkPreviewerService).setEndpoint(linkPreviewUrl);
editor.std.clipboard.use(customImageProxyMiddleware(imageProxyUrl));
page.get(LinkPreviewerService).setEndpoint(linkPreviewUrl);
page.get(ImageProxyService).setImageProxyURL(imageProxyUrl);
page.get(ImageProxyService).setImageProxyURL(imageProxyUrl);
return editor.host?.updateComplete;
})
.then(() => {
if (canceled) {
return;
}
editor.updateComplete
.then(() => {
if (onEditorReady) {
const dispose = onEditorReady(editor);
if (dispose) {
disposableGroup.add(dispose);
}
})
.catch(console.error);
}
}
})
.catch(error => {
console.error('Error updating editor', error);
});
return () => {
canceled = true;