There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.
TypeScript appcrdteditorelectronknowledge-basemarkdownmironotesnotionnotion-alternativerustrust-langrust-languagetabletableviewwhiteboardwikiworkspace
fix(editor): should directly return the sub-action content if it exists (#10778)
fundon5ed8541cb15c
diff --git a/blocksuite/affine/widgets/widget-toolbar/src/utils.ts b/blocksuite/affine/widgets/widget-toolbar/src/utils.tsindex 9978e9dc00..b99f59fa44 100644--- a/blocksuite/affine/widgets/widget-toolbar/src/utils.ts+++ b/blocksuite/affine/widgets/widget-toolbar/src/utils.ts@@ -240,11 +240,11 @@ function renderActions(return actions.map(action => {let content: TemplateResult | null = null;- if ('content' in action && action.content) {+ if ('content' in action) {if (typeof action.content === 'function') {content = action.content(context);} else {- content = action.content;+ content = action.content ?? null;}return content;}@@ -254,12 +254,21 @@ function renderActions(if (!combined.length) return content;- const ordered = orderBy(combined, ['score', 'id'], ['asc', 'asc']);+ const ordered = orderBy(combined, ['id', 'score'], ['asc', 'asc']);return repeat(ordered,- b => b.id,- b => render(b, context)+ a => a.id,+ a => {+ if ('content' in a) {+ if (typeof a.content === 'function') {+ return a.content(context);+ } else {+ return a.content ?? null;+ }+ }+ return render(a, context);+ });}