@ctzhian/tiptap 1.6.0 → 1.6.2

package/dist/Editor/demo.js

@@ -4,7 +4,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { Editor, EditorThemeProvider, EditorToolbar, useTiptap } from "./..";
 import { Box } from '@mui/material';
-import React, { useEffect } from 'react';
+import React from 'react';
 import { AiGenerate2Icon } from "../component/Icons";
 import "../index.css";
 var Reader = function Reader() {
@@ -15,17 +15,22 @@ var Reader = function Reader() {
         console.log(editor.getHTML());
         editor.commands.setContent(editor.getHTML());
       },
+      onCreate: function onCreate(_ref) {
+        var currentEditor = _ref.editor;
+        currentEditor.commands.setAiWriting(true);
+      },
       onAiWritingGetSuggestion: function () {
-        var _onAiWritingGetSuggestion = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-          var text;
+        var _onAiWritingGetSuggestion = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
+          var prefix, suffix;
           return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
-                text = _ref.text;
+                prefix = _ref2.prefix, suffix = _ref2.suffix;
+                console.log('onAiWritingGetSuggestion', prefix, suffix);
                 return _context.abrupt("return", new Promise(function (resolve) {
                   resolve(['this is a default suggestion.', 'we are good.', 'what is your name?', 'how are you?', 'what is your favorite color?', 'what is your favorite food?', 'what is your favorite animal?', 'what is your favorite book?', 'what is your favorite movie?', 'what is your favorite song?', 'what is your favorite artist?', 'what is your favorite band?', 'what is your favorite city?', 'what is your favorite country?', 'what is your favorite sport?'][Math.floor(Math.random() * 10)]);
                 }));
-              case 2:
+              case 3:
               case "end":
                 return _context.stop();
             }
@@ -38,12 +43,12 @@ var Reader = function Reader() {
       }(),
       // onTocUpdate: handleTocUpdate,
       onMentionFilter: function () {
-        var _onMentionFilter = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
+        var _onMentionFilter = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3) {
           var query;
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
-                query = _ref2.query;
+                query = _ref3.query;
                 return _context2.abrupt("return", new Promise(function (resolve) {
                   resolve(['Winona Ryder', 'Molly Ringwald', 'Ally Sheedy', 'Debbie Harry', 'Olivia Newton-John', 'Elton John', 'Michael J. Fox', 'Axl Rose', 'Emilio Estevez', 'Ralph Macchio', 'Rob Lowe', 'Jennifer Grey'].filter(function (item) {
                     return item.toLowerCase().startsWith(query.toLowerCase());
@@ -105,11 +110,6 @@ var Reader = function Reader() {
       content: ""
     }),
     editor = _useTiptap.editor;
-  useEffect(function () {
-    if (editor) {
-      editor.commands.setAiWriting(true);
-    }
-  }, [editor]);
   return /*#__PURE__*/React.createElement(EditorThemeProvider, {
     mode: "light"
   }, /*#__PURE__*/React.createElement(Box, {

package/dist/extension/extension/AiWriting.d.ts

@@ -10,6 +10,11 @@ declare module '@tiptap/core' {
             setAiWriting: (enabled: boolean) => ReturnType;
         };
     }
+    interface Storage {
+        aiWriting: {
+            enabled: boolean;
+        };
+    }
 }
 type SuggestionState = {
     enabled: boolean;
@@ -17,10 +22,12 @@ type SuggestionState = {
     text: string;
     decorations: DecorationSet;
     lastDocText: string;
+    lastTriggerPos: number | null;
 };
 export declare const AiWritingExtension: (props: {
-    onAiWritingGetSuggestion?: (({ text }: {
-        text: string;
+    onAiWritingGetSuggestion?: (({ prefix, suffix }: {
+        prefix: string;
+        suffix: string;
     }) => Promise<string>) | undefined;
 }) => Extension<AiWritingOptions, any>;
 export type { SuggestionState };

package/dist/extension/extension/AiWriting.js

@@ -34,16 +34,11 @@ function isAtEndWithNoContentAfter(view) {
   var selection = state.selection,
     doc = state.doc;
   if (!selection.empty) return false;
-  // 文档需非空
-  var fullText = getFullText(view);
-  if (!fullText || fullText.trim().length === 0) return false;
-  // 光标后文档范围内无可见字符
-  var afterText = doc.textBetween(selection.from, doc.content.size, '\n', '\n');
-  if (afterText && afterText.trim().length > 0) return false;
-  // 同时在当前文本块末尾（不在块中间）
-  var $from = selection.$from;
-  var atEndOfBlock = $from.parentOffset === $from.parent.content.size;
-  return !!atEndOfBlock;
+  // 基于当前行：从光标到下一处换行（或文末）之间是否仅为空白
+  var suffixFromCursor = doc.textBetween(selection.from, doc.content.size, '\n', '\n');
+  var nextNewlineIndex = suffixFromCursor.indexOf('\n');
+  var currentLineAfterCursor = nextNewlineIndex >= 0 ? suffixFromCursor.slice(0, nextNewlineIndex) : suffixFromCursor;
+  return currentLineAfterCursor.trim().length === 0;
 }
 function createSuggestionWidget(text) {
   var dom = document.createElement('span');
@@ -56,7 +51,7 @@ export var AiWritingExtension = function AiWritingExtension(props) {
     name: 'aiWriting',
     addOptions: function addOptions() {
       return {
-        minChars: 1,
+        minChars: 0,
         debounceMs: 1000
       };
     },
@@ -71,16 +66,13 @@ export var AiWritingExtension = function AiWritingExtension(props) {
         setAiWriting: function setAiWriting(enabled) {
           return function (_ref) {
             var tr = _ref.tr,
-              state = _ref.state,
               dispatch = _ref.dispatch;
             if (dispatch) {
               var meta = {
                 type: 'setEnabled',
                 enabled: enabled
               };
-              dispatch(tr.setMeta(aiWritingPluginKey, meta))
-              // 同步到 storage，便于外部判断
-              ;
+              dispatch(tr.setMeta(aiWritingPluginKey, meta));
               _this.storage.enabled = !!enabled;
             }
             return true;
@@ -103,7 +95,21 @@ export var AiWritingExtension = function AiWritingExtension(props) {
               dispatch = _ref2.dispatch;
             if (!dispatch) return true;
             var insertPos = state.selection.from;
-            tr.insertText(text, insertPos);
+            var schema = state.schema;
+            var segments = text.split('\n');
+            var posCursor = insertPos;
+            for (var i = 0; i < segments.length; i++) {
+              var segment = segments[i];
+              if (segment.length > 0) {
+                tr.insertText(segment, posCursor);
+                posCursor += segment.length;
+              }
+              if (i < segments.length - 1) {
+                var br = schema.nodes.hardBreak.create();
+                tr.insert(posCursor, br);
+                posCursor += 1;
+              }
+            }
             // 接受后清空建议
             dispatch(tr.setMeta(aiWritingPluginKey, {
               type: 'clearSuggestion'
@@ -120,7 +126,7 @@ export var AiWritingExtension = function AiWritingExtension(props) {
       var debouncedRequest = null;
       var request = /*#__PURE__*/function () {
         var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(view) {
-          var state, text, suggestion, _yield$props$onAiWrit, _props$onAiWritingGet, tr;
+          var state, text, from, suggestion, _yield$props$onAiWrit, _props$onAiWritingGet, _ref4, doc, prefix, suffix, tr;
           return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
@@ -144,57 +150,70 @@ export var AiWritingExtension = function AiWritingExtension(props) {
                 }
                 return _context.abrupt("return");
               case 8:
-                if (!(state.lastDocText === text)) {
+                if (!(!text || text.trim().length === 0)) {
                   _context.next = 10;
                   break;
                 }
                 return _context.abrupt("return");
               case 10:
+                // 避免重复请求同一内容与同一光标位置
+                from = view.state.selection.from;
+                if (!(state.lastDocText === text && state.lastTriggerPos === from)) {
+                  _context.next = 13;
+                  break;
+                }
+                return _context.abrupt("return");
+              case 13:
                 suggestion = '';
-                _context.prev = 11;
-                _context.next = 14;
+                _context.prev = 14;
+                _ref4 = view.state, doc = _ref4.doc;
+                prefix = doc.textBetween(0, from, '\n', '\n');
+                suffix = doc.textBetween(from, doc.content.size, '\n', '\n');
+                _context.next = 20;
                 return (_props$onAiWritingGet = props.onAiWritingGetSuggestion) === null || _props$onAiWritingGet === void 0 ? void 0 : _props$onAiWritingGet.call(props, {
-                  text: text
+                  prefix: prefix,
+                  suffix: suffix
                 });
-              case 14:
+              case 20:
                 _context.t1 = _yield$props$onAiWrit = _context.sent;
                 _context.t0 = _context.t1 !== null;
                 if (!_context.t0) {
-                  _context.next = 18;
+                  _context.next = 24;
                   break;
                 }
                 _context.t0 = _yield$props$onAiWrit !== void 0;
-              case 18:
+              case 24:
                 if (!_context.t0) {
-                  _context.next = 22;
+                  _context.next = 28;
                   break;
                 }
                 _context.t2 = _yield$props$onAiWrit;
-                _context.next = 23;
+                _context.next = 29;
                 break;
-              case 22:
+              case 28:
                 _context.t2 = '';
-              case 23:
+              case 29:
                 suggestion = _context.t2;
-                _context.next = 29;
+                _context.next = 35;
                 break;
-              case 26:
-                _context.prev = 26;
-                _context.t3 = _context["catch"](11);
+              case 32:
+                _context.prev = 32;
+                _context.t3 = _context["catch"](14);
                 console.error('getSuggestion error', _context.t3);
-              case 29:
+              case 35:
                 tr = view.state.tr.setMeta(aiWritingPluginKey, {
                   type: 'setSuggestion',
                   text: suggestion,
                   pos: view.state.selection.from,
-                  lastDocText: text
+                  lastDocText: text,
+                  lastTriggerPos: from
                 });
                 view.dispatch(tr);
-              case 31:
+              case 37:
               case "end":
                 return _context.stop();
             }
-          }, _callee, null, [[11, 26]]);
+          }, _callee, null, [[14, 32]]);
         }));
         return function request(_x) {
           return _ref3.apply(this, arguments);
@@ -217,7 +236,8 @@ export var AiWritingExtension = function AiWritingExtension(props) {
               pos: null,
               text: '',
               decorations: DecorationSet.create(state.doc, []),
-              lastDocText: ''
+              lastDocText: '',
+              lastTriggerPos: null
             };
           },
           apply: function apply(tr, pluginState, _old, newState) {
@@ -234,7 +254,8 @@ export var AiWritingExtension = function AiWritingExtension(props) {
                 next = _objectSpread(_objectSpread({}, next), {}, {
                   text: '',
                   pos: null,
-                  decorations: DecorationSet.create(newState.doc, [])
+                  decorations: DecorationSet.create(newState.doc, []),
+                  lastTriggerPos: null
                 });
               }
             }
@@ -250,7 +271,8 @@ export var AiWritingExtension = function AiWritingExtension(props) {
                       enabled: _enabled,
                       text: _enabled ? next.text : '',
                       pos: _enabled ? next.pos : null,
-                      decorations: cleared
+                      decorations: cleared,
+                      lastTriggerPos: _enabled ? next.lastTriggerPos : null
                     });
                   }
                 case 'setSuggestion':
@@ -259,12 +281,14 @@ export var AiWritingExtension = function AiWritingExtension(props) {
                     var text = meta.text || '';
                     var pos = typeof meta.pos === 'number' ? meta.pos : null;
                     var lastDocText = (_meta$lastDocText = meta.lastDocText) !== null && _meta$lastDocText !== void 0 ? _meta$lastDocText : next.lastDocText;
+                    var lastTriggerPos = typeof meta.lastTriggerPos === 'number' ? meta.lastTriggerPos : next.lastTriggerPos;
                     if (!text || pos == null) {
                       return _objectSpread(_objectSpread({}, next), {}, {
                         text: '',
                         pos: null,
                         decorations: DecorationSet.create(newState.doc, []),
-                        lastDocText: lastDocText
+                        lastDocText: lastDocText,
+                        lastTriggerPos: lastTriggerPos
                       });
                     }
                     var deco = Decoration.widget(pos, function () {
@@ -278,7 +302,8 @@ export var AiWritingExtension = function AiWritingExtension(props) {
                       text: text,
                       pos: pos,
                       decorations: decoSet,
-                      lastDocText: lastDocText
+                      lastDocText: lastDocText,
+                      lastTriggerPos: lastTriggerPos
                     });
                   }
                 case 'clearSuggestion':
@@ -286,7 +311,8 @@ export var AiWritingExtension = function AiWritingExtension(props) {
                     return _objectSpread(_objectSpread({}, next), {}, {
                       text: '',
                       pos: null,
-                      decorations: DecorationSet.create(newState.doc, [])
+                      decorations: DecorationSet.create(newState.doc, []),
+                      lastTriggerPos: null
                     });
                   }
               }
@@ -307,6 +333,13 @@ export var AiWritingExtension = function AiWritingExtension(props) {
           var handler = function handler() {
             var state = aiWritingPluginKey.getState(view.state);
             if (!state || !state.enabled) return;
+            var currentPos = view.state.selection.from;
+            // 若光标位置与建议位置不同且有建议，先清空（视为拒绝）
+            if (state.text && state.pos != null && state.pos !== currentPos) {
+              view.dispatch(view.state.tr.setMeta(aiWritingPluginKey, {
+                type: 'clearSuggestion'
+              }));
+            }
             if (!isAtEndWithNoContentAfter(view)) return;
             ensureDebounced()(view);
           };

package/dist/extension/node/FileHandler.d.ts

@@ -1,4 +1,4 @@
 import { UploadFunction } from "../../type";
 export declare const FileHandlerExtension: (props: {
     onUpload?: UploadFunction;
-}) => import("@tiptap/core").Extension<Omit<import("@tiptap/extension-file-handler").FileHandlePluginOptions, "editor" | "key">, any>;
+}) => import("@tiptap/core").Extension<Omit<import("@tiptap/extension-file-handler").FileHandlePluginOptions, "key" | "editor">, any>;

package/dist/type/index.d.ts

@@ -70,8 +70,9 @@ export type EditorFnProps = {
     onError?: (error: Error) => void;
     onUpload?: UploadFunction;
     onTocUpdate?: (toc: TocList) => void;
-    onAiWritingGetSuggestion?: ({ text }: {
-        text: string;
+    onAiWritingGetSuggestion?: ({ prefix, suffix }: {
+        prefix: string;
+        suffix: string;
     }) => Promise<string>;
 };
 export type MentionItems = string[];

package/package.json

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