Jayden/AFFiNE-Mirror
1
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-02-21 08:17:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(editor): view recorded in storage may not exist (#9788)

Browse Source 
fix: BS-2415
This commit is contained in:
zzj3720
2025-01-20 05:36:42 +00:00
parent 1a18aeb22e
commit 66b6fd8b74
5 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
blocksuite/affine/data-view/src/core/data-source/base.ts
View File

@@ -84,7 +84,7 @@ export interface DataSource {
viewMetaGet(type: string): ViewMeta;
viewMetaGet$(type: string): ReadonlySignal<ViewMeta | undefined>;
viewMetaGetById(viewId: string): ViewMeta;
viewMetaGetById(viewId: string): ViewMeta | undefined;
viewMetaGetById$(viewId: string): ReadonlySignal<ViewMeta | undefined>;
}
@@ -217,7 +217,7 @@ export abstract class DataSourceBase implements DataSource {
abstract viewDataDuplicate(id: string): string;
abstract viewDataGet(viewId: string): DataViewDataType;
abstract viewDataGet(viewId: string): DataViewDataType | undefined;
viewDataGet$(viewId: string): ReadonlySignal<DataViewDataType | undefined> {
return computed(() => this.viewDataGet(viewId));
@@ -236,7 +236,7 @@ export abstract class DataSourceBase implements DataSource {
return computed(() => this.viewMetaGet(type));
}
abstract viewMetaGetById(viewId: string): ViewMeta;
abstract viewMetaGetById(viewId: string): ViewMeta | undefined;
viewMetaGetById$(viewId: string): ReadonlySignal<ViewMeta | undefined> {
return computed(() => this.viewMetaGetById(viewId));

7
blocksuite/affine/data-view/src/core/view-manager/view-manager.ts
View File

@@ -22,7 +22,7 @@ export interface ViewManager {
views$: ReadonlySignal<string[]>;
viewGet(id: string): SingleView;
viewGet(id: string): SingleView | undefined;
viewAdd(type: DataViewMode): string;
@@ -86,7 +86,7 @@ export class ViewManagerBase implements ViewManager {
}
viewChangeType(id: string, type: string): void {
const from = this.viewGet(id).type;
const from = this.viewGet(id)?.type;
const meta = this.dataSource.viewMetaGet(type);
this.dataSource.viewDataUpdate(id, old => {
let data = {
@@ -122,8 +122,9 @@ export class ViewManagerBase implements ViewManager {
this.setCurrentView(newId);
}
viewGet(id: string): SingleView {
viewGet(id: string): SingleView | undefined {
const meta = this.dataSource.viewMetaGetById(id);
if (!meta) return;
return new meta.model.dataViewManager(this, id);
}
}

11
blocksuite/affine/data-view/src/widget-presets/views-bar/views-view.ts
View File

@@ -96,7 +96,7 @@ export class DataViewHeaderViews extends WidgetBase {
popupTargetFromElement(event.currentTarget as HTMLElement),
[
menu.group({
items: views.map(id => {
items: views.flatMap(id => {
const openViewOption = (event: MouseEvent) => {
event.stopPropagation();
this.openViewOption(
@@ -105,9 +105,12 @@ export class DataViewHeaderViews extends WidgetBase {
);
};
const view = this.viewManager.viewGet(id);
if (!view) {
return [];
}
return menu.action({
prefix: html`<uni-lit
.uni=${this.getRenderer(id).icon}
.uni=${this.getRenderer(id)?.icon}
></uni-lit>`,
name: view.name$.value ?? '',
label: () => html`${view.name$.value}`,
@@ -262,7 +265,7 @@ export class DataViewHeaderViews extends WidgetBase {
style="margin-right: 4px;"
@click="${(event: MouseEvent) => this._clickView(event, id)}"
>
<uni-lit class="icon" .uni="${this.getRenderer(id).icon}"></uni-lit>
<uni-lit class="icon" .uni="${this.getRenderer(id)?.icon}"></uni-lit>
<div class="name">${view?.name}</div>
</div>
`;
@@ -274,7 +277,7 @@ export class DataViewHeaderViews extends WidgetBase {
}
private getRenderer(viewId: string) {
return this.dataSource.viewMetaGetById(viewId).renderer;
return this.dataSource.viewMetaGetById(viewId)?.renderer;
}
_clickView(event: MouseEvent, id: string) {