gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-10 16:39:02 +01:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

fix(client): ribbon adapter not working

Browse Source
This commit is contained in:
Elian Doran 2025-11-09 21:14:28 +02:00
parent 8e697d0578
commit b9b5c13d9c
No known key found for this signature in database
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/client/src/widgets/ribbon/Ribbon.tsx
View File

@ -146,7 +146,7 @@ function RibbonTab({ icon, title, active, onClick, toggleCommand }: { icon: stri
) )
} }
async function shouldShowTab(showConfig: boolean | ((context: TitleContext) => Promise<boolean | null | undefined> | boolean | null | undefined), context: TitleContext) { export async function shouldShowTab(showConfig: boolean | ((context: TitleContext) => Promise<boolean | null | undefined> | boolean | null | undefined), context: TitleContext) {
if (showConfig === null || showConfig === undefined) return true; if (showConfig === null || showConfig === undefined) return true;
if (typeof showConfig === "boolean") return showConfig; if (typeof showConfig === "boolean") return showConfig;
if ("then" in showConfig) return await showConfig(context); if ("then" in showConfig) return await showConfig(context);

14
apps/client/src/widgets/ribbon/components/StandaloneRibbonAdapter.tsx
View File

@ -1,8 +1,9 @@
import { ComponentChildren } from "preact"; import { ComponentChildren } from "preact";
import { useNoteContext } from "../../react/hooks"; import { useNoteContext } from "../../react/hooks";
import { TabContext, TitleContext } from "../ribbon-interface"; import { TabContext } from "../ribbon-interface";
import { useEffect, useMemo, useState } from "preact/hooks"; import { useEffect, useMemo, useState } from "preact/hooks";
import { RIBBON_TAB_DEFINITIONS } from "../RibbonDefinition"; import { RIBBON_TAB_DEFINITIONS } from "../RibbonDefinition";
import { shouldShowTab } from "../Ribbon";
interface StandaloneRibbonAdapterProps { interface StandaloneRibbonAdapterProps {
component: (props: TabContext) => ComponentChildren; component: (props: TabContext) => ComponentChildren;
@ -16,10 +17,11 @@ export default function StandaloneRibbonAdapter({ component }: StandaloneRibbonA
const Component = component; const Component = component;
const { note, ntxId, hoistedNoteId, notePath, noteContext, componentId } = useNoteContext(); const { note, ntxId, hoistedNoteId, notePath, noteContext, componentId } = useNoteContext();
const definition = useMemo(() => RIBBON_TAB_DEFINITIONS.find(def => def.content === component), [ component ]); const definition = useMemo(() => RIBBON_TAB_DEFINITIONS.find(def => def.content === component), [ component ]);
const [ shown, setShown ] = useState(unwrapShown(definition?.show, { note })); const [ shown, setShown ] = useState<boolean | null | undefined>(false);
useEffect(() => { useEffect(() => {
setShown(unwrapShown(definition?.show, { note })); if (!definition) return;
shouldShowTab(definition.show, { note, noteContext }).then(setShown);
}, [ note ]); }, [ note ]);
return ( return (
@ -35,9 +37,3 @@ export default function StandaloneRibbonAdapter({ component }: StandaloneRibbonA
/> />
); );
} }
function unwrapShown(value: boolean | ((context: TitleContext) => boolean | null | undefined) | undefined, context: TitleContext) {
if (!value) return true;
if (typeof value === "boolean") return value;
return !!value(context);
}