Jayden/AFFiNE-Mirror
1
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-02-14 05:14:54 +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;

7
packages/frontend/core/src/desktop/pages/workspace/detail-page/detail-page.tsx
View File

@@ -167,10 +167,7 @@ const DetailPageImpl = memo(function DetailPageImpl() {
const onLoad = useCallback(
(editorContainer: AffineEditorContainer) => {
// blocksuite editor host
const editorHost = editorContainer.host;
const std = editorHost?.std;
const std = editorContainer.std;
const disposable = new DisposableGroup();
if (std) {
const refNodeSlots = std.getOptional(RefNodeSlotsProvider);
@@ -179,7 +176,7 @@ const DetailPageImpl = memo(function DetailPageImpl() {
// the event should not be emitted by AffineReference
refNodeSlots.docLinkClicked.on(
({ pageId, params, openMode, event, host }) => {
if (host !== editorHost) {
if (host !== editorContainer.host) {
return;
}
openMode ??=

16
packages/frontend/core/src/mobile/pages/workspace/detail/mobile-detail-page.tsx
View File

@@ -139,9 +139,6 @@ const DetailPageImpl = () => {
const onLoad = useCallback(
(editorContainer: AffineEditorContainer) => {
// blocksuite editor host
const editorHost = editorContainer.host;
// provide image proxy endpoint to blocksuite
const imageProxyUrl = new URL(
BUILD_CONFIG.imageProxyUrl,
@@ -153,14 +150,19 @@ const DetailPageImpl = () => {
server.baseUrl
).toString();
editorHost?.std.clipboard.use(customImageProxyMiddleware(imageProxyUrl));
editorHost?.doc.get(ImageProxyService).setImageProxyURL(imageProxyUrl);
editorContainer.std.clipboard.use(
customImageProxyMiddleware(imageProxyUrl)
);
editorContainer.doc
.get(ImageProxyService)
.setImageProxyURL(imageProxyUrl);
// provide link preview endpoint to blocksuite
editorHost?.doc.get(LinkPreviewerService).setEndpoint(linkPreviewUrl);
editorContainer.doc.get(LinkPreviewerService).setEndpoint(linkPreviewUrl);
// provide page mode and updated date to blocksuite
const refNodeService = editorHost?.std.getOptional(RefNodeSlotsProvider);
const refNodeService =
editorContainer.std.getOptional(RefNodeSlotsProvider);
const disposable = new DisposableGroup();
if (refNodeService) {
disposable.add(

5
packages/frontend/core/src/modules/peek-view/view/doc-preview/doc-peek-view.tsx
View File

@@ -96,12 +96,9 @@ function DocPeekPreviewEditor({
const handleOnEditorReady = useCallback(
(editorContainer: AffineEditorContainer) => {
if (!editorContainer.host) {
return;
}
const disposableGroup = new DisposableGroup();
const refNodeSlots =
editorContainer.host.std.getOptional(RefNodeSlotsProvider);
editorContainer.std.getOptional(RefNodeSlotsProvider);
if (!refNodeSlots) return;
// doc change event inside peek view should be handled by peek view
disposableGroup.add(