fix(core): should display date as original title of journal (#11375)

Closes: [BS-2991](https://linear.app/affine-design/issue/BS-2991/linked-journal添加alias后,toolbar上获取不到标题)
This commit is contained in:
fundon
2025-04-02 01:24:43 +00:00
parent 8d9f5327a1
commit d9fade8045
5 changed files with 97 additions and 20 deletions

View File

@@ -11,6 +11,7 @@ import {
} from '@blocksuite/affine-shared/consts';
import {
ActionPlacement,
DocDisplayMetaProvider,
type LinkEventType,
type OpenDocMode,
type ToolbarAction,
@@ -76,11 +77,13 @@ const docTitleAction = {
if (!model.props.title) return null;
const originalTitle =
ctx.workspace.getDoc(model.props.pageId)?.meta?.title || 'Untitled';
ctx.std.get(DocDisplayMetaProvider).title(model.props.pageId).value ||
'Untitled';
const open = (event: MouseEvent) => block.open({ event });
return html`<affine-linked-doc-title
.title=${originalTitle}
.open=${(event: MouseEvent) => block.open({ event })}
.open=${open}
></affine-linked-doc-title>`;
},
} as const satisfies ToolbarAction;

View File

@@ -1,6 +1,7 @@
import { notifyLinkedDocSwitchedToEmbed } from '@blocksuite/affine-components/notification';
import {
ActionPlacement,
DocDisplayMetaProvider,
type ToolbarAction,
type ToolbarActionGroup,
type ToolbarModuleConfig,
@@ -34,9 +35,14 @@ export const builtinInlineReferenceToolbarConfig = {
if (!(target instanceof AffineReference)) return null;
if (!target.referenceInfo.title) return null;
const originalTitle =
ctx.std.get(DocDisplayMetaProvider).title(target.referenceInfo.pageId)
.value || 'Untitled';
const open = (event: MouseEvent) => target.open({ event });
return html`<affine-linked-doc-title
.title=${target.docTitle}
.open=${(event: MouseEvent) => target.open({ event })}
.title=${originalTitle}
.open=${open}
></affine-linked-doc-title>`;
},
},

View File

@@ -15,7 +15,12 @@ import {
} from '@blocksuite/icons/lit';
import { LifeCycleWatcher, StdIdentifier } from '@blocksuite/std';
import type { Store } from '@blocksuite/store';
import { computed, type Signal, signal } from '@preact/signals-core';
import {
computed,
type ReadonlySignal,
type Signal,
signal,
} from '@preact/signals-core';
import type { TemplateResult } from 'lit';
import { referenceToNode } from '../utils/reference.js';
@@ -44,11 +49,11 @@ export interface DocDisplayMetaExtension {
icon: (
docId: string,
referenceInfo?: DocDisplayMetaParams
) => Signal<TemplateResult>;
) => ReadonlySignal<TemplateResult>;
title: (
docId: string,
referenceInfo?: DocDisplayMetaParams
) => Signal<string>;
) => ReadonlySignal<string>;
}
export const DocDisplayMetaProvider = createIdentifier<DocDisplayMetaExtension>(
@@ -93,11 +98,11 @@ export class DocDisplayMetaService
icon(
pageId: string,
{ params, title, referenced }: DocDisplayMetaParams = {}
): Signal<TemplateResult> {
): ReadonlySignal<TemplateResult> {
const doc = this.std.workspace.getDoc(pageId);
if (!doc) {
return signal(DocDisplayMetaService.icons.deleted);
return computed(() => DocDisplayMetaService.icons.deleted);
}
const store = doc.getStore();
@@ -160,11 +165,14 @@ export class DocDisplayMetaService
});
}
title(pageId: string, { title }: DocDisplayMetaParams = {}): Signal<string> {
title(
pageId: string,
{ title }: DocDisplayMetaParams = {}
): ReadonlySignal<string> {
const doc = this.std.workspace.getDoc(pageId);
if (!doc) {
return signal(title || 'Deleted doc');
return computed(() => title || 'Deleted doc');
}
const store = doc.getStore();