A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
editor: fix font family not reflected in toolbar
Abdullah Atta8500c971eb81
diff --git a/packages/editor/src/toolbar/tools/font.tsx b/packages/editor/src/toolbar/tools/font.tsxindex 4377f6edf..86a8e4350 100644--- a/packages/editor/src/toolbar/tools/font.tsx+++ b/packages/editor/src/toolbar/tools/font.tsx@@ -25,7 +25,7 @@ import { useCallback, useMemo } from "react";import { Counter } from "../components/counter.js";import { useRefValue } from "../../hooks/use-ref-value.js";import { useToolbarStore } from "../stores/toolbar-store.js";-import { getFontById, getFontIds, getFonts } from "../../utils/font.js";+import { getFont, getFontById, getFonts } from "../../utils/font.js";import { CodeBlock } from "../../extensions/code-block/index.js";import { strings } from "@notesnook/intl";@@ -66,10 +66,10 @@ export function FontSize(props: ToolProps) {export function FontFamily(props: ToolProps) {const { editor } = props;const defaultFontFamily = useToolbarStore((store) => store.fontFamily);- const currentFontFamily =- getFontIds().find((id) =>- editor.isActive("textStyle", { fontFamily: id })- ) || defaultFontFamily;+ const currentFontFamily = editor.getAttributes("textStyle").fontFamily;+ const selectedFont = currentFontFamily+ ? getFont(currentFontFamily)+ : getFontById(defaultFontFamily);const items = useMemo(() => toMenuItems(editor, currentFontFamily),@@ -81,7 +81,7 @@ export function FontFamily(props: ToolProps) {<Dropdownid="fontFamily"group="font"- selectedItem={getFontById(currentFontFamily)?.title || defaultFontFamily}+ selectedItem={selectedFont?.title || defaultFontFamily}items={items}menuWidth={130}disabled={editor.isActive(CodeBlock.name)}diff --git a/packages/editor/src/utils/font.ts b/packages/editor/src/utils/font.tsindex 32c4dbb25..12dee0ec4 100644--- a/packages/editor/src/utils/font.ts+++ b/packages/editor/src/utils/font.ts@@ -45,6 +45,20 @@ export function getFontById(id: string) {return FONTS.find((a) => a.id === id);}+export function getFont(font: string) {+ return FONTS.find(+ (a) => normalizeFontFamily(a.font) === normalizeFontFamily(font)+ );+}+export function getFontIds() {return FONTS.map((a) => a.id);}++function normalizeFontFamily(fontFamily: string) {+ return fontFamily+ .replace(/['"]+/g, "")+ .replaceAll(", ", ",")+ .replaceAll(",", "")+ .replace(/\s+/g, "");+}