From 328f81e46aab4b0b7c0877d4350f1a2389435f98 Mon Sep 17 00:00:00 2001
From: Dinq <iamdinq@gmail.com>
Date: Tue, 18 Apr 2023 23:51:52 +0800
Subject: [PATCH] fix: fix cm font (#376)

---
 src/components/ui/CodeMirror.tsx | 57 +++++++++++---------------------
 src/hooks/useCodemirrorTheme.ts  |  7 ++--
 2 files changed, 22 insertions(+), 42 deletions(-)

diff --git a/src/components/ui/CodeMirror.tsx b/src/components/ui/CodeMirror.tsx
index d952eaa4..67c7a779 100644
--- a/src/components/ui/CodeMirror.tsx
+++ b/src/components/ui/CodeMirror.tsx
@@ -4,7 +4,6 @@ import { Annotation } from "@codemirror/state"
 import { HighlightStyle } from "@codemirror/language"
 import { EditorView, KeyBinding, ViewUpdate } from "@codemirror/view"
 import { tags } from "@lezer/highlight"
-import type { Tag } from "@lezer/highlight"
 import {
   Suspense,
   forwardRef,
@@ -15,6 +14,7 @@ import {
 } from "react"
 import { useTranslation } from "react-i18next"
 import {
+  monospaceFonts,
   useCodeMirrorAutoToggleTheme,
   useCodeMirrorStyle,
 } from "~/hooks/useCodemirrorTheme"
@@ -247,41 +247,21 @@ const LazyCodeMirrorEditor = forwardRef<
 
 LazyCodeMirrorEditor.displayName = "LazyCodeMirrorEditor"
 
-const monoSpaceTags: Tag[] = [
-  tags.bracket,
-  tags.angleBracket,
-  tags.squareBracket,
-  tags.paren,
-  tags.brace,
-  tags.float,
-  tags.monospace,
-  tags.keyword,
-  tags.character,
-  tags.propertyName,
-  tags.macroName,
-  tags.function(tags.variableName),
-  tags.labelName,
-  tags.definition(tags.name),
-  tags.typeName,
-  tags.annotation,
-  tags.modifier,
-  tags.self,
-  tags.namespace,
-  tags.comment,
-  tags.bool,
-  /*@__PURE__*/ tags.special(tags.variableName),
-  tags.className,
-  tags.number,
-  tags.changed,
-  tags.operator,
-  tags.operatorKeyword,
-  tags.escape,
-  tags.regexp,
-  /*@__PURE__*/ tags.special(tags.string),
-  tags.name,
+const markdownTags = [
+  tags.heading1,
+  tags.heading2,
+  tags.heading3,
+  tags.heading4,
+  tags.heading5,
+  tags.heading6,
+  tags.strong,
+  tags.emphasis,
   tags.deleted,
-  tags.character,
+  tags.content,
+  tags.url,
+  tags.link,
 ]
+
 const codeMirrorMarkdownSyntax = HighlightStyle.define([
   {
     tag: tags.heading1,
@@ -316,8 +296,9 @@ const codeMirrorMarkdownSyntax = HighlightStyle.define([
   { tag: tags.strong, fontWeight: "bold" },
   { tag: tags.emphasis, fontStyle: "italic" },
   { tag: tags.deleted, textDecoration: "line-through" },
-  ...monoSpaceTags.map((tag) => ({
-    tag,
-    fontFamily: `"OperatorMonoSSmLig Nerd Font","Cascadia Code PL","FantasqueSansMono Nerd Font","operator mono","Fira code Retina","Fira code","Consolas", Monaco, "Hannotate SC", monospace, -apple-system`,
-  })),
+  { tag: tags.monospace, fontFamily: monospaceFonts },
+  {
+    tag: markdownTags,
+    fontFamily: "var(--font-fans)",
+  },
 ])
diff --git a/src/hooks/useCodemirrorTheme.ts b/src/hooks/useCodemirrorTheme.ts
index 83b9fd73..7027bcf8 100644
--- a/src/hooks/useCodemirrorTheme.ts
+++ b/src/hooks/useCodemirrorTheme.ts
@@ -3,6 +3,8 @@ import { Compartment } from "@codemirror/state"
 import { EditorView } from "@codemirror/view"
 import { useEffect, useRef } from "react"
 
+export const monospaceFonts = `"OperatorMonoSSmLig Nerd Font","Cascadia Code PL","FantasqueSansMono Nerd Font","operator mono","Fira code Retina","Fira code","Consolas", Monaco, "Hannotate SC", monospace, -apple-system`
+
 import { oneDark } from "@codemirror/theme-one-dark"
 import { githubLight } from "@ddietr/codemirror-themes/theme/github-light"
 import { useIsUnmounted } from "./useLifecycle"
@@ -43,7 +45,7 @@ export const useCodeMirrorStyle = (view: EditorView | null) => {
   const getStyle = () => {
     return {
       ".cm-scroller": {
-        fontFamily: "var(--font-sans)",
+        fontFamily: monospaceFonts,
         fontSize: "1rem",
         overflow: "auto",
         height: "100%",
@@ -59,9 +61,6 @@ export const useCodeMirrorStyle = (view: EditorView | null) => {
         height: "100%",
         backgroundColor: "transparent",
       },
-      ".cm-s-markdown .cm-string": {
-        fontFamily: '"Fira Code", monospace',
-      },
     }
   }