@cgboiler/biz-basic 1.0.52 → 1.0.53

package/es/index.d.ts

@@ -5,6 +5,6 @@ declare namespace _default {
 }
 export default _default;
 export function install(app: any): void;
-export const version: "1.0.51";
+export const version: "1.0.52";
 import RichTextEditor from './rich-text-editor';
 export { RichTextEditor };

package/es/index.js

@@ -1,5 +1,5 @@
 import RichTextEditor from "./rich-text-editor";
-const version = "1.0.51";
+const version = "1.0.52";
 function install(app) {
   const components = [
     RichTextEditor

package/es/rich-text-editor/useExtensions.js

@@ -7,10 +7,12 @@ import { TextStyle } from "@tiptap/extension-text-style";
 import { Color } from "@tiptap/extension-color";
 import { Markdown } from "tiptap-markdown";
 import { Extension, InputRule, Mark, mergeAttributes } from "@tiptap/core";
+import { Plugin } from "@tiptap/pm/state";
 import HtmlBlock from "./extensions/HtmlBlock";
 import { Placeholder } from "@tiptap/extensions";
 function useExtensions({ props, emit }) {
   let activeEditor = null;
+  let isComposing = false;
   const ConsumedTrigger = Mark.create({
     name: "consumedTrigger",
     keepOnSplit: false,
@@ -119,8 +121,11 @@ function useExtensions({ props, emit }) {
        * allow
        * - 功能：判断是否允许触发建议态。
        * - 若该字符带有 consumedTrigger 标记，说明此前已触发过或用户选择忽略，则不再触发建议。
+       * - 若当前处于 IME composition 状态，也不触发建议（防止中文输入法误触发）。
        */
       allow: ({ state, range }) => {
+        if (isComposing)
+          return true;
         return !checkConsumed(state, range);
       },
       render() {
@@ -159,6 +164,9 @@ function useExtensions({ props, emit }) {
           },
           onExit({ editor, range }) {
             var _a, _b, _c, _d, _e;
+            if (isComposing) {
+              return;
+            }
             try {
               const sel = (_a = editor.state) == null ? void 0 : _a.selection;
               const from = (_b = sel == null ? void 0 : sel.from) != null ? _b : 0;
@@ -281,6 +289,30 @@ function useExtensions({ props, emit }) {
     StarterKit,
     HtmlBlock,
     ConsumedTrigger,
+    // IME Composition 事件监听扩展
+    Extension.create({
+      name: "imeCompositionTracker",
+      addProseMirrorPlugins() {
+        return [
+          new Plugin({
+            props: {
+              handleDOMEvents: {
+                compositionstart: () => {
+                  isComposing = true;
+                  return false;
+                },
+                compositionend: () => {
+                  setTimeout(() => {
+                    isComposing = false;
+                  }, 10);
+                  return false;
+                }
+              }
+            }
+          })
+        ];
+      }
+    }),
     // Video input rule extension
     Extension.create({
       name: "videoInputRule",
@@ -387,6 +419,8 @@ function useExtensions({ props, emit }) {
         allowedPrefixes: null,
         allowSpaces: false,
         allow: ({ state, range }) => {
+          if (isComposing)
+            return true;
           if (checkConsumed(state, range))
             return false;
           const doc = state.doc;
@@ -417,6 +451,9 @@ function useExtensions({ props, emit }) {
               emit("mention-input", query != null ? query : "");
             },
             onExit({ editor, range }) {
+              if (isComposing) {
+                return;
+              }
               markAsConsumed(editor, range, "@");
               emit("mention-exit");
             }

package/lib/index.d.ts

@@ -5,6 +5,6 @@ declare namespace _default {
 }
 export default _default;
 export function install(app: any): void;
-export const version: "1.0.51";
+export const version: "1.0.52";
 import RichTextEditor from './rich-text-editor';
 export { RichTextEditor };

package/lib/index.js

@@ -36,7 +36,7 @@ __export(stdin_exports, {
 module.exports = __toCommonJS(stdin_exports);
 var import_rich_text_editor = __toESM(require("./rich-text-editor"));
 __reExport(stdin_exports, require("./rich-text-editor"), module.exports);
-const version = "1.0.51";
+const version = "1.0.52";
 function install(app) {
   const components = [
     import_rich_text_editor.default

package/lib/rich-text-editor/useExtensions.js

@@ -39,10 +39,12 @@ var import_extension_text_style = require("@tiptap/extension-text-style");
 var import_extension_color = require("@tiptap/extension-color");
 var import_tiptap_markdown = require("tiptap-markdown");
 var import_core = require("@tiptap/core");
+var import_state = require("@tiptap/pm/state");
 var import_HtmlBlock = __toESM(require("./extensions/HtmlBlock"));
 var import_extensions = require("@tiptap/extensions");
 function useExtensions({ props, emit }) {
   let activeEditor = null;
+  let isComposing = false;
   const ConsumedTrigger = import_core.Mark.create({
     name: "consumedTrigger",
     keepOnSplit: false,
@@ -151,8 +153,11 @@ function useExtensions({ props, emit }) {
        * allow
        * - 功能：判断是否允许触发建议态。
        * - 若该字符带有 consumedTrigger 标记，说明此前已触发过或用户选择忽略，则不再触发建议。
+       * - 若当前处于 IME composition 状态，也不触发建议（防止中文输入法误触发）。
        */
       allow: ({ state, range }) => {
+        if (isComposing)
+          return true;
         return !checkConsumed(state, range);
       },
       render() {
@@ -191,6 +196,9 @@ function useExtensions({ props, emit }) {
           },
           onExit({ editor, range }) {
             var _a, _b, _c, _d, _e;
+            if (isComposing) {
+              return;
+            }
             try {
               const sel = (_a = editor.state) == null ? void 0 : _a.selection;
               const from = (_b = sel == null ? void 0 : sel.from) != null ? _b : 0;
@@ -313,6 +321,30 @@ function useExtensions({ props, emit }) {
     import_starter_kit.default,
     import_HtmlBlock.default,
     ConsumedTrigger,
+    // IME Composition 事件监听扩展
+    import_core.Extension.create({
+      name: "imeCompositionTracker",
+      addProseMirrorPlugins() {
+        return [
+          new import_state.Plugin({
+            props: {
+              handleDOMEvents: {
+                compositionstart: () => {
+                  isComposing = true;
+                  return false;
+                },
+                compositionend: () => {
+                  setTimeout(() => {
+                    isComposing = false;
+                  }, 10);
+                  return false;
+                }
+              }
+            }
+          })
+        ];
+      }
+    }),
     // Video input rule extension
     import_core.Extension.create({
       name: "videoInputRule",
@@ -419,6 +451,8 @@ function useExtensions({ props, emit }) {
         allowedPrefixes: null,
         allowSpaces: false,
         allow: ({ state, range }) => {
+          if (isComposing)
+            return true;
           if (checkConsumed(state, range))
             return false;
           const doc = state.doc;
@@ -449,6 +483,9 @@ function useExtensions({ props, emit }) {
               emit("mention-input", query != null ? query : "");
             },
             onExit({ editor, range }) {
+              if (isComposing) {
+                return;
+              }
               markAsConsumed(editor, range, "@");
               emit("mention-exit");
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cgboiler/biz-basic",
-  "version": "1.0.52",
+  "version": "1.0.53",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",