@jvs-milkdown/crepe 1.2.15 → 1.2.17

package/lib/esm/feature/toolbar/index.js

@@ -1,4 +1,4 @@
-import { commandsCtx, editorViewCtx, editorCtx, EditorStatus, editorViewOptionsCtx } from '@jvs-milkdown/kit/core';
+import { commandsCtx, editorViewCtx, schemaCtx, editorCtx, EditorStatus, editorViewOptionsCtx } from '@jvs-milkdown/kit/core';
 import { tooltipFactory, TooltipProvider } from '@jvs-milkdown/kit/plugin/tooltip';
 import { NodeSelection, TextSelection, Plugin, PluginKey, AllSelection } from '@jvs-milkdown/kit/prose/state';
 import { defineComponent, ref, computed, watch, watchEffect, onUnmounted, h, Fragment, onMounted, shallowRef, createApp } from 'vue';
@@ -2571,27 +2571,39 @@ defineComponent({
       let activeTextColor = null;
       let activeBgColor = null;
       if (node && node.nodeSize > 2) {
-        node.descendants((childNode) => {
-          if (childNode.isText) {
-            const tcType = textColorSchema.type(ctx);
-            const bcType = bgColorSchema.type(ctx);
-            if (!activeTextColor) {
-              const tcMark = childNode.marks.find((m) => m.type === tcType);
-              if (tcMark) activeTextColor = tcMark.attrs.color;
-            }
-            if (!activeBgColor) {
-              const bcMark = childNode.marks.find((m) => m.type === bcType);
-              if (bcMark) activeBgColor = bcMark.attrs.color;
+        const schema = ctx.get(schemaCtx);
+        const tcHasMark = schema.marks[textColorSchema.id];
+        const bcHasMark = schema.marks[bgColorSchema.id];
+        if (tcHasMark || bcHasMark) {
+          node.descendants((childNode) => {
+            if (childNode.isText) {
+              if (tcHasMark && !activeTextColor) {
+                const tcType = textColorSchema.type(ctx);
+                const tcMark = childNode.marks.find(
+                  (m) => m.type === tcType
+                );
+                if (tcMark) activeTextColor = tcMark.attrs.color;
+              }
+              if (bcHasMark && !activeBgColor) {
+                const bcType = bgColorSchema.type(ctx);
+                const bcMark = childNode.marks.find(
+                  (m) => m.type === bcType
+                );
+                if (bcMark) activeBgColor = bcMark.attrs.color;
+              }
             }
-          }
-          return false;
-        });
+            return false;
+          });
+        }
       }
       const setBlockColor = (colorValue, isBg) => {
         if (pos === null || pos === void 0) return;
         const { tr } = view.state;
         const targetNode = tr.doc.nodeAt(pos);
         if (!targetNode) return;
+        const schema = ctx.get(schemaCtx);
+        const hasMark = isBg ? schema.marks[bgColorSchema.id] : schema.marks[textColorSchema.id];
+        if (!hasMark) return;
         const markType = isBg ? bgColorSchema.type(ctx) : textColorSchema.type(ctx);
         const start = pos + 1;
         const end = pos + targetNode.nodeSize - 1;
@@ -2610,10 +2622,17 @@ defineComponent({
         const { tr } = view.state;
         const targetNode = tr.doc.nodeAt(pos);
         if (!targetNode) return;
+        const schema = ctx.get(schemaCtx);
+        const tcHasMark = schema.marks[textColorSchema.id];
+        const bcHasMark = schema.marks[bgColorSchema.id];
         const start = pos + 1;
         const end = pos + targetNode.nodeSize - 1;
-        tr.removeMark(start, end, textColorSchema.type(ctx));
-        tr.removeMark(start, end, bgColorSchema.type(ctx));
+        if (tcHasMark) {
+          tr.removeMark(start, end, textColorSchema.type(ctx));
+        }
+        if (bcHasMark) {
+          tr.removeMark(start, end, bgColorSchema.type(ctx));
+        }
         view.dispatch(tr);
         showColorMenu.value = false;
         hide();
@@ -4893,6 +4912,10 @@ const Toolbar = defineComponent({
         return { textColor: null, bgColor: null };
       const view = ctx.get(editorViewCtx);
       const { state } = view;
+      const schema = ctx.get(schemaCtx);
+      const tcHasMark = schema.marks[textColorSchema.id];
+      const bcHasMark = schema.marks[bgColorSchema.id];
+      if (!tcHasMark || !bcHasMark) return { textColor: null, bgColor: null };
       const tcType = textColorSchema.type(ctx);
       const bcType = bgColorSchema.type(ctx);
       const { $cursor, ranges } = state.selection;
@@ -4937,6 +4960,10 @@ const Toolbar = defineComponent({
       const { state, dispatch } = view;
       const { tr } = state;
       const { from, to, empty } = state.selection;
+      const schema = ctx.get(schemaCtx);
+      const tcHasMark = schema.marks[textColorSchema.id];
+      const bcHasMark = schema.marks[bgColorSchema.id];
+      if (!tcHasMark || !bcHasMark) return;
       const textColorType = textColorSchema.type(ctx);
       const bgColorType = bgColorSchema.type(ctx);
       if (empty) {
@@ -4958,6 +4985,10 @@ const Toolbar = defineComponent({
         return { fontFamily: null, fontSize: null };
       const view = ctx.get(editorViewCtx);
       const { state } = view;
+      const schema = ctx.get(schemaCtx);
+      const ffHasMark = schema.marks[fontFamilySchema.id];
+      const fsHasMark = schema.marks[fontSizeSchema.id];
+      if (!ffHasMark || !fsHasMark) return { fontFamily: null, fontSize: null };
       const ffType = fontFamilySchema.type(ctx);
       const fsType = fontSizeSchema.type(ctx);
       const { $cursor, ranges } = state.selection;