@jvs-milkdown/crepe 1.2.28 → 1.2.30

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

@@ -377,6 +377,29 @@ var CrepeFeature = /* @__PURE__ */ ((CrepeFeature2) => {
   return CrepeFeature2;
 })(CrepeFeature || {});
 
+const listeners = /* @__PURE__ */ new Set();
+let _popupCount = 0;
+function getIsAnyPopupOpen() {
+  return _popupCount > 0;
+}
+function addPopupChangeListener(fn) {
+  listeners.add(fn);
+  return () => listeners.delete(fn);
+}
+function incrementPopupCount() {
+  const wasZero = _popupCount === 0;
+  _popupCount++;
+  if (wasZero) {
+    listeners.forEach((fn) => fn());
+  }
+}
+function decrementPopupCount() {
+  _popupCount = Math.max(0, _popupCount - 1);
+  if (_popupCount === 0) {
+    listeners.forEach((fn) => fn());
+  }
+}
+
 const remarkTextColorPlugin = $remark(
   "remarkTextColor",
   () => function() {
@@ -1034,29 +1057,6 @@ const formatPainterIcon = `
     </svg>
 `;
 
-const listeners = /* @__PURE__ */ new Set();
-let _popupCount = 0;
-function getIsAnyPopupOpen() {
-  return _popupCount > 0;
-}
-function addPopupChangeListener(fn) {
-  listeners.add(fn);
-  return () => listeners.delete(fn);
-}
-function incrementPopupCount() {
-  const wasZero = _popupCount === 0;
-  _popupCount++;
-  if (wasZero) {
-    listeners.forEach((fn) => fn());
-  }
-}
-function decrementPopupCount() {
-  _popupCount = Math.max(0, _popupCount - 1);
-  if (_popupCount === 0) {
-    listeners.forEach((fn) => fn());
-  }
-}
-
 function keepAlive(..._args) {
 }
 
@@ -4163,7 +4163,7 @@ const Toolbar = defineComponent({
     ctx: { type: Object, required: true },
     hide: { type: Function, required: true },
     show: { type: Object, required: true },
-    selection: { type: Object, required: true },
+    state: { type: Object, required: true },
     config: { type: Object, required: false },
     isFixed: { type: Boolean, required: false }
   },
@@ -4765,17 +4765,17 @@ const Toolbar = defineComponent({
       if (ctx) fn(ctx);
     };
     function checkActive(checker) {
-      var _a;
-      keepAlive(props.selection.value);
-      const status = (_a = ctx == null ? void 0 : ctx.get(editorCtx)) == null ? void 0 : _a.status;
+      var _a, _b;
+      keepAlive(props.state, (_a = props.state) == null ? void 0 : _a.value);
+      const status = (_b = ctx == null ? void 0 : ctx.get(editorCtx)) == null ? void 0 : _b.status;
       if (status !== EditorStatus.Created) return false;
       return checker(ctx);
     }
     const blockGroups = computed(() => getGroups$1("", void 0, ctx));
     const activeBlockItem = computed(() => {
-      var _a;
-      keepAlive(props.selection.value);
-      const status = (_a = ctx == null ? void 0 : ctx.get(editorCtx)) == null ? void 0 : _a.status;
+      var _a, _b;
+      keepAlive(props.state, (_a = props.state) == null ? void 0 : _a.value);
+      const status = (_b = ctx == null ? void 0 : ctx.get(editorCtx)) == null ? void 0 : _b.status;
       if (status !== EditorStatus.Created) return null;
       const view = ctx.get(editorViewCtx);
       const { $from } = view.state.selection;
@@ -4813,9 +4813,9 @@ const Toolbar = defineComponent({
       return targetIcon;
     });
     const currentAlignIndent = computed(() => {
-      var _a;
-      keepAlive(props.selection.value);
-      const status = (_a = ctx == null ? void 0 : ctx.get(editorCtx)) == null ? void 0 : _a.status;
+      var _a, _b;
+      keepAlive(props.state, (_a = props.state) == null ? void 0 : _a.value);
+      const status = (_b = ctx == null ? void 0 : ctx.get(editorCtx)) == null ? void 0 : _b.status;
       if (status !== EditorStatus.Created) return { align: "left", indent: 0 };
       const view = ctx.get(editorViewCtx);
       let align = "left";
@@ -4885,13 +4885,15 @@ const Toolbar = defineComponent({
       }
     };
     const canMerge = computed(() => {
-      keepAlive(props.selection.value);
+      var _a;
+      keepAlive(props.state, (_a = props.state) == null ? void 0 : _a.value);
       const view = ctx == null ? void 0 : ctx.get(editorViewCtx);
       if (!view) return false;
       return mergeCells(view.state);
     });
     const canSplit = computed(() => {
-      keepAlive(props.selection.value);
+      var _a;
+      keepAlive(props.state, (_a = props.state) == null ? void 0 : _a.value);
       const view = ctx == null ? void 0 : ctx.get(editorViewCtx);
       if (!view) return false;
       return splitCell(view.state);
@@ -4951,16 +4953,16 @@ const Toolbar = defineComponent({
       showAlignMenu.value = false;
     };
     const currentColorState = computed(() => {
-      var _a;
-      keepAlive(props.selection.value);
-      const status = (_a = ctx == null ? void 0 : ctx.get(editorCtx)) == null ? void 0 : _a.status;
+      var _a, _b;
+      keepAlive(props.state, (_a = props.state) == null ? void 0 : _a.value);
+      const status = (_b = ctx == null ? void 0 : ctx.get(editorCtx)) == null ? void 0 : _b.status;
       if (status !== EditorStatus.Created)
         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];
+      const tcHasMark = schema.marks["textColor"];
+      const bcHasMark = schema.marks["bgColor"];
       if (!tcHasMark || !bcHasMark) return { textColor: null, bgColor: null };
       const tcType = textColorSchema.type(ctx);
       const bcType = bgColorSchema.type(ctx);
@@ -5007,8 +5009,8 @@ const Toolbar = defineComponent({
       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];
+      const tcHasMark = schema.marks["textColor"];
+      const bcHasMark = schema.marks["bgColor"];
       if (!tcHasMark || !bcHasMark) return;
       const textColorType = textColorSchema.type(ctx);
       const bgColorType = bgColorSchema.type(ctx);
@@ -5024,29 +5026,37 @@ const Toolbar = defineComponent({
       showColorMenu.value = false;
     };
     const currentFontState = computed(() => {
-      var _a;
-      keepAlive(props.selection.value);
-      const status = (_a = ctx == null ? void 0 : ctx.get(editorCtx)) == null ? void 0 : _a.status;
+      var _a, _b;
+      keepAlive(props.state, (_a = props.state) == null ? void 0 : _a.value);
+      const status = (_b = ctx == null ? void 0 : ctx.get(editorCtx)) == null ? void 0 : _b.status;
       if (status !== EditorStatus.Created)
         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 ffHasMark = schema.marks["fontFamily"];
+      const fsHasMark = schema.marks["fontSize"];
+      if (!ffHasMark || !fsHasMark) {
+        return { fontFamily: null, fontSize: null };
+      }
       const ffType = fontFamilySchema.type(ctx);
       const fsType = fontSizeSchema.type(ctx);
       const { $cursor, ranges } = state.selection;
+      let result = {
+        fontFamily: null,
+        fontSize: null
+      };
       if ($cursor) {
         let fontFamily = null;
         let fontSize = null;
         const marks = state.storedMarks || $cursor.marks();
         for (const mark of marks) {
-          if (mark.type === ffType) fontFamily = mark.attrs.fontFamily;
-          if (mark.type === fsType) fontSize = mark.attrs.fontSize;
+          if (mark.type === ffType)
+            fontFamily = mark.attrs.fontFamily || null;
+          if (mark.type === fsType)
+            fontSize = mark.attrs.fontSize || null;
         }
-        return { fontFamily, fontSize };
+        result = { fontFamily, fontSize };
       } else {
         const fontFamilies = /* @__PURE__ */ new Set();
         const fontSizes = /* @__PURE__ */ new Set();
@@ -5056,15 +5066,20 @@ const Toolbar = defineComponent({
             if (node.isText) {
               const ffMark = ffType.isInSet(node.marks);
               const fsMark = fsType.isInSet(node.marks);
-              fontFamilies.add(ffMark ? ffMark.attrs.fontFamily : null);
-              fontSizes.add(fsMark ? fsMark.attrs.fontSize : null);
+              fontFamilies.add(
+                ffMark ? ffMark.attrs.fontFamily : null
+              );
+              fontSizes.add(
+                fsMark ? fsMark.attrs.fontSize : null
+              );
             }
           });
         }
         const fontFamily = fontFamilies.size === 1 ? Array.from(fontFamilies)[0] : "mixed";
         const fontSize = fontSizes.size === 1 ? Array.from(fontSizes)[0] : "mixed";
-        return { fontFamily, fontSize };
+        result = { fontFamily, fontSize };
       }
+      return result;
     });
     const setFontFamily = (fontFamily) => {
       const commands = ctx.get(commandsCtx);
@@ -5295,7 +5310,11 @@ const Toolbar = defineComponent({
                 color: "#363B4C"
               }
             },
-            currentFontState.value.fontFamily && currentFontState.value.fontFamily !== "mixed" ? currentFontState.value.fontFamily.split(",")[0].replace(/['"]/g, "") || (ctx ? i18n(ctx, "customMenu.fontDefault") : "\u9ED8\u8BA4") : ctx ? i18n(ctx, "customMenu.fontDefault") : "\u9ED8\u8BA4"
+            (() => {
+              const fontState = currentFontState.value;
+              const fontFamily = fontState == null ? void 0 : fontState.fontFamily;
+              return fontFamily && fontFamily !== "mixed" ? fontFamily.split(",")[0].replace(/['"]/g, "") || (ctx ? i18n(ctx, "customMenu.fontDefault") : "\u9ED8\u8BA4") : ctx ? i18n(ctx, "customMenu.fontDefault") : "\u9ED8\u8BA4";
+            })()
           ),
           /* @__PURE__ */ h(
             "span",
@@ -5325,7 +5344,10 @@ const Toolbar = defineComponent({
               flexShrink: 0
             }
           },
-          /* @__PURE__ */ h("span", { style: { fontSize: "13px", color: "#363B4C" } }, currentFontState.value.fontSize && currentFontState.value.fontSize !== "mixed" ? currentFontState.value.fontSize : "16px"),
+          /* @__PURE__ */ h("span", { style: { fontSize: "13px", color: "#363B4C" } }, (() => {
+            const fs = currentFontState.value.fontSize;
+            return fs && fs !== "mixed" ? fs : "16px";
+          })()),
           /* @__PURE__ */ h(
             "span",
             {
@@ -6429,21 +6451,21 @@ var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot
 var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
 var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), member.set(obj, value), value);
-var _tooltipProvider, _content, _app, _selection, _show, _mousePressed, _removePopupListener, _onDocumentMouseUp;
+var _tooltipProvider, _content, _app, _state, _show, _mousePressed, _removePopupListener, _onDocumentMouseUp;
 const toolbarTooltip = tooltipFactory("CREPE_TOOLBAR");
 class ToolbarView {
   constructor(ctx, view, config) {
     __privateAdd(this, _tooltipProvider);
     __privateAdd(this, _content);
     __privateAdd(this, _app);
-    __privateAdd(this, _selection);
+    __privateAdd(this, _state);
     __privateAdd(this, _show, ref(false));
     __privateAdd(this, _mousePressed, false);
     __privateAdd(this, _removePopupListener);
     __privateAdd(this, _onDocumentMouseUp);
     this.update = (view, prevState) => {
       __privateGet(this, _tooltipProvider).update(view, prevState);
-      __privateGet(this, _selection).value = view.state.selection;
+      __privateGet(this, _state).value = view.state;
     };
     this.destroy = () => {
       var _a;
@@ -6460,12 +6482,12 @@ class ToolbarView {
     };
     const content = document.createElement("div");
     content.className = "milkdown-toolbar";
-    __privateSet(this, _selection, shallowRef(view.state.selection));
+    __privateSet(this, _state, shallowRef(view.state));
     const app = createApp(Toolbar, {
       ctx,
       hide: this.hide,
       config,
-      selection: __privateGet(this, _selection),
+      state: __privateGet(this, _state),
       show: __privateGet(this, _show)
     });
     app.mount(content);
@@ -6529,7 +6551,7 @@ class ToolbarView {
 _tooltipProvider = new WeakMap();
 _content = new WeakMap();
 _app = new WeakMap();
-_selection = new WeakMap();
+_state = new WeakMap();
 _show = new WeakMap();
 _mousePressed = new WeakMap();
 _removePopupListener = new WeakMap();