@ctzhian/tiptap 1.7.5-beta.2 → 1.7.5-beta.3

package/dist/EditorToolbar/index.js

@@ -1,68 +1,54 @@
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Box, Divider, Stack } from '@mui/material';
-import React, { useEffect, useState } from 'react';
+import { useEditorState } from '@tiptap/react';
+import React from 'react';
 import { AiGenerate2Icon, ArrowGoBackLineIcon, ArrowGoForwardLineIcon, BoldIcon, EraserLineIcon, ItalicIcon, LinkIcon, MarkPenLineIcon, StrikethroughIcon, SubscriptIcon, SuperscriptIcon, UnderlineIcon } from "../component/Icons";
 import { EditorAlignSelect, EditorFontBgColor, EditorFontColor, EditorFontSize, EditorHeading, EditorInsert, EditorListSelect, EditorMore, EditorVerticalAlignSelect, ToolbarItem } from "../component/Toolbar";
+import { hasMarksInSelection } from "../util";
 var EditorToolbar = function EditorToolbar(_ref) {
   var editor = _ref.editor,
     menuInToolbarMore = _ref.menuInToolbarMore;
-  var _useState = useState({
-      undo: false,
-      redo: false,
-      format: false,
-      quote: false,
-      bold: false,
-      italic: false,
-      strike: false,
-      underline: false,
-      superscript: false,
-      subscript: false,
-      details: false,
-      table: false,
-      link: false,
-      alert: false,
-      iframe: false,
-      aiWriting: false,
-      highlight: false
+  var _useEditorState = useEditorState({
+      editor: editor,
+      selector: function selector(ctx) {
+        var _ctx$editor$can$chain, _ctx$editor$can$chain2, _ctx$editor$storage;
+        return {
+          isUndo: (_ctx$editor$can$chain = ctx.editor.can().chain().undo().run()) !== null && _ctx$editor$can$chain !== void 0 ? _ctx$editor$can$chain : false,
+          isRedo: (_ctx$editor$can$chain2 = ctx.editor.can().chain().redo().run()) !== null && _ctx$editor$can$chain2 !== void 0 ? _ctx$editor$can$chain2 : false,
+          isFormat: hasMarksInSelection(ctx.editor.state),
+          isQuote: ctx.editor.isActive('blockquote'),
+          isBold: ctx.editor.isActive('bold'),
+          isItalic: ctx.editor.isActive('italic'),
+          isStrike: ctx.editor.isActive('strike'),
+          isUnderline: ctx.editor.isActive('underline'),
+          isSuperscript: ctx.editor.isActive('superscript'),
+          isSubscript: ctx.editor.isActive('subscript'),
+          isDetails: ctx.editor.isActive('details'),
+          isTable: ctx.editor.isActive('table'),
+          isLink: ctx.editor.isActive('link'),
+          isAlert: ctx.editor.isActive('alert'),
+          isIframe: ctx.editor.isActive('iframe'),
+          isHighlight: ctx.editor.isActive('highlight'),
+          isAiWriting: !!((_ctx$editor$storage = ctx.editor.storage) !== null && _ctx$editor$storage !== void 0 && (_ctx$editor$storage = _ctx$editor$storage.aiWriting) !== null && _ctx$editor$storage !== void 0 && _ctx$editor$storage.enabled)
+        };
+      }
     }),
-    _useState2 = _slicedToArray(_useState, 2),
-    active = _useState2[0],
-    setActive = _useState2[1];
-  var updateSelection = function updateSelection() {
-    var _editor$can$chain$und, _editor$can$chain$red, _editor$can$chain$uns, _editor$storage;
-    setActive({
-      undo: (_editor$can$chain$und = editor.can().chain().undo().run()) !== null && _editor$can$chain$und !== void 0 ? _editor$can$chain$und : false,
-      redo: (_editor$can$chain$red = editor.can().chain().redo().run()) !== null && _editor$can$chain$red !== void 0 ? _editor$can$chain$red : false,
-      format: (_editor$can$chain$uns = editor.can().chain().unsetAllMarks().run()) !== null && _editor$can$chain$uns !== void 0 ? _editor$can$chain$uns : false,
-      quote: editor.isActive('blockquote'),
-      bold: editor.isActive('bold'),
-      italic: editor.isActive('italic'),
-      strike: editor.isActive('strike'),
-      underline: editor.isActive('underline'),
-      superscript: editor.isActive('superscript'),
-      subscript: editor.isActive('subscript'),
-      details: editor.isActive('details'),
-      table: editor.isActive('table'),
-      link: editor.isActive('link'),
-      alert: editor.isActive('alert'),
-      iframe: editor.isActive('iframe'),
-      aiWriting: !!((_editor$storage = editor.storage) !== null && _editor$storage !== void 0 && (_editor$storage = _editor$storage.aiWriting) !== null && _editor$storage !== void 0 && _editor$storage.enabled),
-      highlight: editor.isActive('highlight')
-    });
-  };
-  useEffect(function () {
-    editor.on('selectionUpdate', updateSelection);
-    editor.on('transaction', updateSelection);
-    return function () {
-      editor.off('selectionUpdate', updateSelection);
-      editor.off('transaction', updateSelection);
-    };
-  }, [editor]);
+    isUndo = _useEditorState.isUndo,
+    isRedo = _useEditorState.isRedo,
+    isFormat = _useEditorState.isFormat,
+    isQuote = _useEditorState.isQuote,
+    isBold = _useEditorState.isBold,
+    isItalic = _useEditorState.isItalic,
+    isStrike = _useEditorState.isStrike,
+    isUnderline = _useEditorState.isUnderline,
+    isSuperscript = _useEditorState.isSuperscript,
+    isSubscript = _useEditorState.isSubscript,
+    isDetails = _useEditorState.isDetails,
+    isTable = _useEditorState.isTable,
+    isLink = _useEditorState.isLink,
+    isAlert = _useEditorState.isAlert,
+    isIframe = _useEditorState.isIframe,
+    isAiWriting = _useEditorState.isAiWriting,
+    isHighlight = _useEditorState.isHighlight;
   return /*#__PURE__*/React.createElement(Box, {
     className: "editor-toolbar"
   }, /*#__PURE__*/React.createElement(Stack, {
@@ -107,9 +93,9 @@ var EditorToolbar = function EditorToolbar(_ref) {
       }
     }),
     onClick: function onClick() {
-      return editor.chain().focus().setAiWriting(!active.aiWriting).run();
+      return editor.chain().focus().setAiWriting(!isAiWriting).run();
     },
-    className: active.aiWriting ? 'tool-active' : ''
+    className: isAiWriting ? 'tool-active' : ''
   }), /*#__PURE__*/React.createElement(EditorInsert, {
     editor: editor
   }), /*#__PURE__*/React.createElement(Divider, {
@@ -131,7 +117,7 @@ var EditorToolbar = function EditorToolbar(_ref) {
     onClick: function onClick() {
       return editor.chain().focus().undo().run();
     },
-    disabled: !active.undo
+    disabled: !isUndo
   }), /*#__PURE__*/React.createElement(ToolbarItem, {
     tip: '重做',
     shortcutKey: ['ctrl', 'Y'],
@@ -143,7 +129,7 @@ var EditorToolbar = function EditorToolbar(_ref) {
     onClick: function onClick() {
       return editor.chain().focus().redo().run();
     },
-    disabled: !active.redo
+    disabled: !isRedo
   }), /*#__PURE__*/React.createElement(ToolbarItem, {
     tip: '清除格式',
     icon: /*#__PURE__*/React.createElement(EraserLineIcon, {
@@ -151,7 +137,7 @@ var EditorToolbar = function EditorToolbar(_ref) {
         fontSize: '1rem'
       }
     }),
-    disabled: !active.format,
+    disabled: !isFormat,
     onClick: function onClick() {
       return editor.chain().focus().unsetAllMarks().run();
     }
@@ -186,7 +172,7 @@ var EditorToolbar = function EditorToolbar(_ref) {
     onClick: function onClick() {
       return editor.chain().focus().toggleBold().run();
     },
-    className: active.bold ? 'tool-active' : ''
+    className: isBold ? 'tool-active' : ''
   }), /*#__PURE__*/React.createElement(ToolbarItem, {
     tip: '斜体',
     shortcutKey: ['ctrl', 'I'],
@@ -198,7 +184,7 @@ var EditorToolbar = function EditorToolbar(_ref) {
     onClick: function onClick() {
       return editor.chain().focus().toggleItalic().run();
     },
-    className: active.italic ? 'tool-active' : ''
+    className: isItalic ? 'tool-active' : ''
   }), /*#__PURE__*/React.createElement(ToolbarItem, {
     tip: '删除线',
     shortcutKey: ['ctrl', 'shift', 'S'],
@@ -210,7 +196,7 @@ var EditorToolbar = function EditorToolbar(_ref) {
     onClick: function onClick() {
       return editor.chain().focus().toggleStrike().run();
     },
-    className: active.strike ? 'tool-active' : ''
+    className: isStrike ? 'tool-active' : ''
   }), /*#__PURE__*/React.createElement(ToolbarItem, {
     tip: '下划线',
     shortcutKey: ['ctrl', 'U'],
@@ -222,7 +208,7 @@ var EditorToolbar = function EditorToolbar(_ref) {
     onClick: function onClick() {
       return editor.chain().focus().toggleUnderline().run();
     },
-    className: active.underline ? 'tool-active' : ''
+    className: isUnderline ? 'tool-active' : ''
   }), /*#__PURE__*/React.createElement(ToolbarItem, {
     tip: '高亮',
     shortcutKey: ['ctrl', 'shift', 'H'],
@@ -234,7 +220,7 @@ var EditorToolbar = function EditorToolbar(_ref) {
     onClick: function onClick() {
       return editor.chain().focus().toggleHighlight().run();
     },
-    className: active.highlight ? 'tool-active' : ''
+    className: isHighlight ? 'tool-active' : ''
   }), /*#__PURE__*/React.createElement(ToolbarItem, {
     tip: '上标',
     shortcutKey: ['ctrl', '.'],
@@ -246,7 +232,7 @@ var EditorToolbar = function EditorToolbar(_ref) {
     onClick: function onClick() {
       return editor.chain().focus().toggleSuperscript().run();
     },
-    className: active.superscript ? 'tool-active' : ''
+    className: isSuperscript ? 'tool-active' : ''
   }), /*#__PURE__*/React.createElement(ToolbarItem, {
     tip: '下标',
     shortcutKey: ['ctrl', ','],
@@ -258,7 +244,7 @@ var EditorToolbar = function EditorToolbar(_ref) {
     onClick: function onClick() {
       return editor.chain().focus().toggleSubscript().run();
     },
-    className: active.subscript ? 'tool-active' : ''
+    className: isSubscript ? 'tool-active' : ''
   }), /*#__PURE__*/React.createElement(EditorFontColor, {
     editor: editor
   }), /*#__PURE__*/React.createElement(EditorFontBgColor, {
@@ -291,7 +277,7 @@ var EditorToolbar = function EditorToolbar(_ref) {
         title: text
       }).run();
     },
-    className: active.link ? 'tool-active' : ''
+    className: isLink ? 'tool-active' : ''
   }), /*#__PURE__*/React.createElement(EditorAlignSelect, {
     editor: editor
   }), /*#__PURE__*/React.createElement(EditorVerticalAlignSelect, {

package/dist/component/CustomBubbleMenu/index.js

@@ -48,7 +48,7 @@ var CustomBubbleMenu = function CustomBubbleMenu(_ref) {
           isUnderline: ctx.editor.isActive('underline'),
           isCode: ctx.editor.isActive('code'),
           isHighlight: ctx.editor.isActive('highlight'),
-          hasAnyMarks: ctx.editor.state.selection.empty ? ctx.editor.state.selection.$from.marks().length > 0 : hasMarksInSelection(ctx.editor.state)
+          hasAnyMarks: hasMarksInSelection(ctx.editor.state)
           // isSuperscript: ctx.editor.isActive('superscript'),
           // isSubscript: ctx.editor.isActive('subscript'),
         };

package/dist/util/index.js

@@ -16,6 +16,9 @@ export var insertNodeAfterPosition = function insertNodeAfterPosition(editor, po
   editor.chain().focus().insertContentAt(pos, nodeContent).run();
 };
 export var hasMarksInSelection = function hasMarksInSelection(state) {
+  if (state.selection.empty) {
+    return false;
+  }
   var _state$selection = state.selection,
     from = _state$selection.from,
     to = _state$selection.to;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ctzhian/tiptap",
-  "version": "1.7.5-beta.2",
+  "version": "1.7.5-beta.3",
   "description": "基于 Tiptap 二次开发的编辑器组件",
   "main": "dist/index.js",
   "module": "dist/index.js",