owl-tiptap 1.2.1 → 1.2.2

package/es/components/tag-input/SuggestionList.js

@@ -35,6 +35,7 @@ export class SuggestionList extends Component {
      * 获取处理后的项目列表
      */
     get processedItems() {
+        console.log(this.props.items);
         // 检查是否有分组项结构
         const hasGroupItems = this.props.items.some((item) => this.isGroupItem(item));
         // 如果有分组项，则直接返回
@@ -99,7 +100,7 @@ export class SuggestionList extends Component {
         if (!selectableItems.length) {
             return;
         }
-        const selectedIndex = selectableItems.indexOf(selectedItem);
+        const selectedIndex = selectableItems.findIndex((item) => item.value === selectedItem?.value);
         const newIndex = (selectedIndex - 1 + selectableItems.length) % selectableItems.length;
         this.state.selectedItem = selectableItems[newIndex];
     }
@@ -120,7 +121,7 @@ export class SuggestionList extends Component {
         if (!selectableItems.length) {
             return;
         }
-        const selectedIndex = selectableItems.indexOf(selectedItem);
+        const selectedIndex = selectableItems.findIndex((item) => item.value === selectedItem?.value);
         const newIndex = (selectedIndex + 1) % selectableItems.length;
         this.state.selectedItem = selectableItems[newIndex];
     }

package/es/components/tag-input/TagInput.d.ts

@@ -2,8 +2,8 @@ import { Component } from '@odoo/owl';
 import { Editor } from '@tiptap/core';
 import { SuggestionList } from './SuggestionList';
 import type { SuggestionItem, ListItem } from './SuggestionList';
-export type { SuggestionItem, ListItem, GroupItem } from './SuggestionList';
 import './TagInput.css';
+export type { SuggestionItem, ListItem, GroupItem } from './SuggestionList';
 export interface TagAttributes {
     value: string;
     label?: string;
@@ -47,6 +47,7 @@ interface TagInputProps {
     readonly?: boolean;
     onTagClick?: (index: number, attrs: TagAttributes) => void;
     char?: string;
+    tagOnly?: boolean;
 }
 export declare class TagInput extends Component<TagInputProps> {
     static components: {
@@ -97,12 +98,17 @@ export declare class TagInput extends Component<TagInputProps> {
             type: StringConstructor;
             optional: boolean;
         };
+        tagOnly: {
+            type: BooleanConstructor;
+            optional: boolean;
+        };
     };
     static template: string;
     static defaultProps: {
         items: () => any[];
         readonly: boolean;
         char: string;
+        tagOnly: boolean;
     };
     editorRef: {
         el: HTMLElement;

package/es/components/tag-input/TagInput.js

@@ -8,7 +8,7 @@ import History from '@tiptap/extension-history';
 import Placeholder from '@tiptap/extension-placeholder';
 import { SuggestionList } from './SuggestionList';
 import { TagNode } from './TagNode';
-import { SuggestionPlugin } from './suggestion';
+import { SuggestionPlugin, exitSuggestionPlugin } from './suggestion';
 import './TagInput.css';
 export class TagInput extends Component {
     constructor() {
@@ -188,9 +188,14 @@ export class TagInput extends Component {
                 }),
             ],
             content: null,
+            onFocus: ({ editor }) => {
+                if (this.props.tagOnly) {
+                    this.state.suggestion.visible = true;
+                }
+            },
             onBlur: ({ editor }) => {
-                // this.state.suggestion.visible = false;
-                // exitSuggestionPlugin(editor.view);
+                this.state.suggestion.visible = false;
+                exitSuggestionPlugin(editor.view);
             },
             onUpdate: ({ editor, transaction }) => {
                 if (transaction.docChanged) {
@@ -235,6 +240,7 @@ TagInput.props = {
     readonly: { type: Boolean, optional: true },
     onTagClick: { type: Function, optional: true },
     char: { type: String, optional: true },
+    tagOnly: { type: Boolean, optional: true },
 };
 TagInput.template = xml `
 <div t-att-class="className">
@@ -253,4 +259,5 @@ TagInput.defaultProps = {
     items: () => [],
     readonly: false,
     char: '@',
+    tagOnly: false,
 };

package/es/components/tag-input/suggestion.js

@@ -2,6 +2,7 @@ import { Extension } from '@tiptap/core';
 import { Suggestion } from '@tiptap/suggestion';
 import { PluginKey } from 'prosemirror-state'; // optional, if you need to create a custom key
 import { exitSuggestion } from '@tiptap/suggestion';
+import { isChangeOrigin } from '@tiptap/extension-collaboration';
 export const MySuggestionPluginKey = new PluginKey('my-suggestions'); // or use the default 'suggestion'
 export const exitSuggestionPlugin = (view) => {
     exitSuggestion(view, MySuggestionPluginKey);
@@ -20,6 +21,9 @@ export const SuggestionPlugin = Extension.create({
                 pluginKey: MySuggestionPluginKey,
                 editor: this.editor,
                 ...this.options,
+                shouldShow: ({ transaction }) => {
+                    return isChangeOrigin(transaction);
+                },
             }),
         ];
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "owl-tiptap",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "tiptap used in odoo owl2",
   "main": "es/index.js",
   "scripts": {
@@ -24,6 +24,7 @@
   "license": "MIT",
   "dependencies": {
     "@tiptap/core": "^3.2.0",
+    "@tiptap/extension-collaboration": "^3.15.3",
     "@tiptap/extension-document": "^3.13.0",
     "@tiptap/extension-history": "^3.13.0",
     "@tiptap/extension-mention": "^3.2.0",
@@ -31,7 +32,8 @@
     "@tiptap/extension-placeholder": "^3.2.0",
     "@tiptap/extension-text": "^3.13.0",
     "@tiptap/suggestion": "^3.13.0",
-    "classnames": "^2.3.2"
+    "classnames": "^2.3.2",
+    "prosemirror-state": "1.4.4"
   },
   "peerDependencies": {
     "@odoo/owl": "~2.4.1"