reactjs-tiptap-editor 0.4.1 → 1.0.0

package/lib/Table.cjs

@@ -1,9 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const g=require("./index-DF2Lp4HZ.cjs"),c=require("./RichTextEditor-CxvwGvQG.cjs"),w=require("react/jsx-runtime"),_=require("react"),x=require("./index-6D1J-A-o.cjs");var N=g.Node3.create({name:"tableCell",addOptions(){return{HTMLAttributes:{}}},content:"block+",addAttributes(){return{colspan:{default:1},rowspan:{default:1},colwidth:{default:null,parseHTML:e=>{var t,l;const r=e.getAttribute("colwidth"),o=r?r.split(",").map(n=>parseInt(n,10)):null;if(!o){const n=(t=e.closest("table"))==null?void 0:t.querySelectorAll("colgroup > col"),i=Array.from(((l=e.parentElement)==null?void 0:l.children)||[]).indexOf(e);if(i&&i>-1&&n&&n[i]){const a=n[i].getAttribute("width");return a?[parseInt(a,10)]:null}}return o}}}},tableRole:"cell",isolating:!0,parseHTML(){return[{tag:"td"}]},renderHTML({HTMLAttributes:e}){return["td",g.mergeAttributes(this.options.HTMLAttributes,e),0]}}),D=g.Node3.create({name:"tableHeader",addOptions(){return{HTMLAttributes:{}}},content:"block+",addAttributes(){return{colspan:{default:1},rowspan:{default:1},colwidth:{default:null,parseHTML:e=>{const t=e.getAttribute("colwidth");return t?t.split(",").map(r=>parseInt(r,10)):null}}}},tableRole:"header_cell",isolating:!0,parseHTML(){return[{tag:"th"}]},renderHTML({HTMLAttributes:e}){return["th",g.mergeAttributes(this.options.HTMLAttributes,e),0]}}),W=g.Node3.create({name:"tableRow",addOptions(){return{HTMLAttributes:{}}},content:"(tableCell | tableHeader)*",tableRole:"row",parseHTML(){return[{tag:"tr"}]},renderHTML({HTMLAttributes:e}){return["tr",g.mergeAttributes(this.options.HTMLAttributes,e),0]}});function R(e,t){return t?["width",`${Math.max(t,e)}px`]:["min-width",`${e}px`]}function v(e,t,l,r,o,n){var i;let a=0,C=!0,d=t.firstChild;const m=e.firstChild;if(m!==null)for(let f=0,p=0;f<m.childCount;f+=1){const{colspan:h,colwidth:b}=m.child(f).attrs;for(let s=0;s<h;s+=1,p+=1){const T=o===p?n:b&&b[s],y=T?`${T}px`:"";if(a+=T||r,T||(C=!1),d){if(d.style.width!==y){const[A,E]=R(r,T);d.style.setProperty(A,E)}d=d.nextSibling}else{const A=document.createElement("col"),[E,S]=R(r,T);A.style.setProperty(E,S),t.appendChild(A)}}}for(;d;){const f=d.nextSibling;(i=d.parentNode)==null||i.removeChild(d),d=f}const u=e.attrs.style&&typeof e.attrs.style=="string"&&/\bwidth\s*:/i.test(e.attrs.style);C&&!u?(l.style.width=`${a}px`,l.style.minWidth=""):(l.style.width="",l.style.minWidth=`${a}px`)}var $=class{constructor(e,t){this.node=e,this.cellMinWidth=t,this.dom=document.createElement("div"),this.dom.className="tableWrapper",this.table=this.dom.appendChild(document.createElement("table")),e.attrs.style&&(this.table.style.cssText=e.attrs.style),this.colgroup=this.table.appendChild(document.createElement("colgroup")),v(e,this.colgroup,this.table,t),this.contentDOM=this.table.appendChild(document.createElement("tbody"))}update(e){return e.type!==this.node.type?!1:(this.node=e,v(e,this.colgroup,this.table,this.cellMinWidth),!0)}ignoreMutation(e){const t=e.target,l=this.dom.contains(t),r=this.contentDOM.contains(t);return!!(l&&!r&&(e.type==="attributes"||e.type==="childList"||e.type==="characterData"))}};function O(e,t,l,r){let o=0,n=!0;const i=[],a=e.firstChild;if(!a)return{};for(let u=0,f=0;u<a.childCount;u+=1){const{colspan:p,colwidth:h}=a.child(u).attrs;for(let b=0;b<p;b+=1,f+=1){const s=l===f?r:h&&h[b];o+=s||t,s||(n=!1);const[T,y]=R(t,s);i.push(["col",{style:`${T}: ${y}`}])}}const C=n?`${o}px`:"",d=n?"":`${o}px`;return{colgroup:["colgroup",{},...i],tableWidth:C,tableMinWidth:d}}function L(e,t){return e.createAndFill()}function z(e){if(e.cached.tableNodeTypes)return e.cached.tableNodeTypes;const t={};return Object.keys(e.nodes).forEach(l=>{const r=e.nodes[l];r.spec.tableRole&&(t[r.spec.tableRole]=r)}),e.cached.tableNodeTypes=t,t}function G(e,t,l,r,o){const n=z(e),i=[],a=[];for(let d=0;d<l;d+=1){const m=L(n.cell);if(m&&a.push(m),r){const u=L(n.header_cell);u&&i.push(u)}}const C=[];for(let d=0;d<t;d+=1)C.push(n.row.createChecked(null,r&&d===0?i:a));return n.table.createChecked(null,C)}function P(e){return e instanceof c.CellSelection}var M=({editor:e})=>{const{selection:t}=e.state;if(!P(t))return!1;let l=0;const r=g.findParentNodeClosestToPos(t.ranges[0].$from,n=>n.type.name==="table");return r==null||r.node.descendants(n=>{if(n.type.name==="table")return!1;["tableCell","tableHeader"].includes(n.type.name)&&(l+=1)}),l===t.ranges.length?(e.commands.deleteTable(),!0):!1},Z="";function F(e){return(e||"").replace(/\s+/g," ").trim()}function V(e,t,l={}){var r;const o=(r=l.cellLineSeparator)!=null?r:Z;if(!e||!e.content||e.content.length===0)return"";const n=[];e.content.forEach(h=>{const b=[];h.content&&h.content.forEach(s=>{let T="";s.content&&Array.isArray(s.content)&&s.content.length>1?T=s.content.map(S=>t.renderChildren(S)).join(o):T=s.content?t.renderChildren(s.content):"";const y=F(T),A=s.type==="tableHeader";b.push({text:y,isHeader:A})}),n.push(b)});const i=n.reduce((h,b)=>Math.max(h,b.length),0);if(i===0)return"";const a=new Array(i).fill(0);n.forEach(h=>{var b;for(let s=0;s<i;s+=1){const y=(((b=h[s])==null?void 0:b.text)||"").length;y>a[s]&&(a[s]=y),a[s]<3&&(a[s]=3)}});const C=(h,b)=>h+" ".repeat(Math.max(0,b-h.length)),d=n[0],m=d.some(h=>h.isHeader);let u=`
-`;const f=new Array(i).fill(0).map((h,b)=>m&&d[b]&&d[b].text||"");return u+=`| ${f.map((h,b)=>C(h,a[b])).join(" | ")} |
-`,u+=`| ${a.map(h=>"-".repeat(Math.max(3,h))).join(" | ")} |
-`,(m?n.slice(1):n).forEach(h=>{u+=`| ${new Array(i).fill(0).map((b,s)=>C(h[s]&&h[s].text||"",a[s])).join(" | ")} |
-`}),u}var q=V,B=g.Node3.create({name:"table",addOptions(){return{HTMLAttributes:{},resizable:!1,renderWrapper:!1,handleWidth:5,cellMinWidth:25,View:$,lastColumnResizable:!0,allowTableNodeSelection:!1}},content:"tableRow+",tableRole:"table",isolating:!0,group:"block",parseHTML(){return[{tag:"table"}]},renderHTML({node:e,HTMLAttributes:t}){const{colgroup:l,tableWidth:r,tableMinWidth:o}=O(e,this.options.cellMinWidth),n=t.style;function i(){return n||(r?`width: ${r}`:`min-width: ${o}`)}const a=["table",g.mergeAttributes(this.options.HTMLAttributes,t,{style:i()}),l,["tbody",0]];return this.options.renderWrapper?["div",{class:"tableWrapper"},a]:a},parseMarkdown:(e,t)=>{const l=[];if(e.header){const r=[];e.header.forEach(o=>{r.push(t.createNode("tableHeader",{},[{type:"paragraph",content:t.parseInline(o.tokens)}]))}),l.push(t.createNode("tableRow",{},r))}return e.rows&&e.rows.forEach(r=>{const o=[];r.forEach(n=>{o.push(t.createNode("tableCell",{},[{type:"paragraph",content:t.parseInline(n.tokens)}]))}),l.push(t.createNode("tableRow",{},o))}),t.createNode("table",void 0,l)},renderMarkdown:(e,t)=>q(e,t),addCommands(){return{insertTable:({rows:e=3,cols:t=3,withHeaderRow:l=!0}={})=>({tr:r,dispatch:o,editor:n})=>{const i=G(n.schema,e,t,l);if(o){const a=r.selection.from+1;r.replaceSelectionWith(i).scrollIntoView().setSelection(g.TextSelection.near(r.doc.resolve(a)))}return!0},addColumnBefore:()=>({state:e,dispatch:t})=>c.addColumnBefore(e,t),addColumnAfter:()=>({state:e,dispatch:t})=>c.addColumnAfter(e,t),deleteColumn:()=>({state:e,dispatch:t})=>c.deleteColumn(e,t),addRowBefore:()=>({state:e,dispatch:t})=>c.addRowBefore(e,t),addRowAfter:()=>({state:e,dispatch:t})=>c.addRowAfter(e,t),deleteRow:()=>({state:e,dispatch:t})=>c.deleteRow(e,t),deleteTable:()=>({state:e,dispatch:t})=>c.deleteTable(e,t),mergeCells:()=>({state:e,dispatch:t})=>c.mergeCells(e,t),splitCell:()=>({state:e,dispatch:t})=>c.splitCell(e,t),toggleHeaderColumn:()=>({state:e,dispatch:t})=>c.toggleHeader("column")(e,t),toggleHeaderRow:()=>({state:e,dispatch:t})=>c.toggleHeader("row")(e,t),toggleHeaderCell:()=>({state:e,dispatch:t})=>c.toggleHeaderCell(e,t),mergeOrSplit:()=>({state:e,dispatch:t})=>c.mergeCells(e,t)?!0:c.splitCell(e,t),setCellAttribute:(e,t)=>({state:l,dispatch:r})=>c.setCellAttr(e,t)(l,r),goToNextCell:()=>({state:e,dispatch:t})=>c.goToNextCell(1)(e,t),goToPreviousCell:()=>({state:e,dispatch:t})=>c.goToNextCell(-1)(e,t),fixTables:()=>({state:e,dispatch:t})=>(t&&c.fixTables(e),!0),setCellSelection:e=>({tr:t,dispatch:l})=>{if(l){const r=c.CellSelection.create(t.doc,e.anchorCell,e.headCell);t.setSelection(r)}return!0}}},addKeyboardShortcuts(){return{Tab:()=>this.editor.commands.goToNextCell()?!0:this.editor.can().addRowAfter()?this.editor.chain().addRowAfter().goToNextCell().run():!1,"Shift-Tab":()=>this.editor.commands.goToPreviousCell(),Backspace:M,"Mod-Backspace":M,Delete:M,"Mod-Delete":M}},addProseMirrorPlugins(){return[...this.options.resizable&&this.editor.isEditable?[c.columnResizing({handleWidth:this.options.handleWidth,cellMinWidth:this.options.cellMinWidth,defaultCellMinWidth:this.options.cellMinWidth,View:this.options.View,lastColumnResizable:this.options.lastColumnResizable})]:[],c.tableEditing({allowTableNodeSelection:this.options.allowTableNodeSelection})]},extendNodeSchema(e){const t={name:e.name,options:e.options,storage:e.storage};return{tableRole:g.callOrReturn(g.getExtensionField(e,"tableRole",t))}}});g.Extension.create({name:"tableKit",addExtensions(){const e=[];return this.options.table!==!1&&e.push(B.configure(this.options.table)),this.options.tableCell!==!1&&e.push(N.configure(this.options.tableCell)),this.options.tableHeader!==!1&&e.push(D.configure(this.options.tableHeader)),this.options.tableRow!==!1&&e.push(W.configure(this.options.tableRow)),e}});const U=/(android|bb\d+|meego).+mobile|armv7l|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series[46]0|samsungbrowser.*mobile|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i,K=/CrOS/,X=/android|ipad|playbook|silk/i;function I(e={}){let t=e.ua||typeof navigator<"u"&&navigator.userAgent;return t&&typeof t=="object"&&t.headers&&typeof t.headers["user-agent"]=="string"&&(t=t.headers["user-agent"]),typeof t!="string"?!1:!!(U.test(t)&&!K.test(t)||e.tablet&&X.test(t)||e.tablet&&e.featureDetect&&navigator&&navigator.maxTouchPoints>1&&t.includes("Macintosh")&&t.includes("Safari"))}const H=e=>Array.from({length:e}).map((t,l)=>l+1);function J(e){var m;const[t,l]=_.useState(!0),[r,o]=_.useState({rows:I()?x.TABLE_MAX_GRID_SIZE:x.TABLE_INIT_GRID_SIZE,cols:I()?x.TABLE_MAX_GRID_SIZE:x.TABLE_INIT_GRID_SIZE}),[n,i]=_.useState({rows:x.TABLE_DEFAULT_SELECTED_GRID_SIZE,cols:x.TABLE_DEFAULT_SELECTED_GRID_SIZE});function a(u,f){u===r.rows&&o(p=>({...p,rows:Math.min(u+1,x.TABLE_MAX_GRID_SIZE)})),f===r.cols&&o(p=>({...p,cols:Math.min(f+1,x.TABLE_MAX_GRID_SIZE)})),i({rows:u,cols:f})}function C(u,f){e==null||e.createTable({rows:u,cols:f,withHeaderRow:t}),d()}function d(){l(!1),o({rows:x.TABLE_INIT_GRID_SIZE,cols:x.TABLE_INIT_GRID_SIZE}),i({rows:x.TABLE_DEFAULT_SELECTED_GRID_SIZE,cols:x.TABLE_DEFAULT_SELECTED_GRID_SIZE})}return w.jsxs(c.Popover,{modal:!0,children:[w.jsx(c.PopoverTrigger,{asChild:!0,children:e==null?void 0:e.children}),w.jsx(c.PopoverContent,{align:"start",className:"richtext-w-full !richtext-p-2",side:"bottom",children:w.jsxs("div",{className:"table-grid-size-editor richtext-p-0",children:[w.jsx("div",{className:"richtext-flex richtext-flex-col richtext-flex-wrap richtext-justify-between richtext-gap-1",children:(m=H(r==null?void 0:r.rows))==null?void 0:m.map(u=>{var f;return w.jsx("div",{className:"richtext-flex richtext-gap-1",children:(f=H(r==null?void 0:r.cols))==null?void 0:f.map(p=>w.jsx("div",{onMouseDown:()=>C(u,p),onMouseOver:()=>a(u,p),className:`richtext-cursor-pointer richtext-border-border ${p<=n.cols&&u<=n.rows&&"tableCellActive !richtext-bg-foreground"}`,children:w.jsx("div",{className:"richtext-box-border richtext-size-4 richtext-rounded-[2px] !richtext-border richtext-border-solid !richtext-border-border richtext-p-1"})},`c-${p}`))},`r-${u}`)})}),w.jsxs("div",{className:"richtext-mt-2 richtext-text-center richtext-text-sm richtext-text-zinc-600",children:[n.rows," ","x",n.cols]})]})})]})}function Q(e){function t(l){e.disabled||e.editor.chain().focus().insertTable({...l,withHeaderRow:!1}).run()}return w.jsx(J,{createTable:t,children:w.jsx(c.ActionButton,{icon:e==null?void 0:e.icon,tooltip:e==null?void 0:e.tooltip,tooltipOptions:e==null?void 0:e.tooltipOptions,disabled:e==null?void 0:e.disabled,color:e==null?void 0:e.color,action:e==null?void 0:e.action,isActive:e==null?void 0:e.isActive})})}function Y(e,t,l){if(!e.doc)return e;const r=e.doc.nodeAt(t);if(!r||l===r.attrs.backgroundColor)return e;const o={...r.attrs,backgroundColor:l};return e.setNodeMarkup(t,r.type,o,r.marks)}function ee(e,t,l){const{doc:r,selection:o}=e;return!r||!o||!(o instanceof c.CellSelection)||o.forEachCell((n,i)=>{e=Y(e,i,l)}),e}function k(e,t){return({tr:l,state:r,dispatch:o})=>{const{selection:n}=r;return l=l.setSelection(n),l=ee(l,t,e),l.docChanged?(o==null||o(l),!0):!1}}const te=g.Extension.create({name:"tableCellBackground",addOptions(){return{types:["tableCell"],HTMLAttributes:{}}},addGlobalAttributes(){return[{types:this.options.types,attributes:{backgroundColor:{parseHTML:e=>e.style.backgroundColor||"",renderHTML:e=>!e.backgroundColor||e.backgroundColor===""?{}:{style:`background-color: ${e.backgroundColor}`}}}}]},addCommands(){return{setTableCellBackground:e=>k(e,this.options),unsetTableCellBackground:()=>k("",this.options)}}}),j=B.extend({addOptions(){var e;return{...(e=this.parent)==null?void 0:e.call(this),HTMLAttributes:{style:`
-          border: 1px solid #000;
-          border-collapse: collapse;
-          width: 100%;
-        `},resizable:!0,lastColumnResizable:!0,allowTableNodeSelection:!1,button:({editor:t,t:l})=>({component:Q,componentProps:{disabled:t.isActive("table")||!1,icon:"Table",tooltip:l("editor.table.tooltip"),editor:t}})}},addExtensions(){return[W.configure(this.options.tableRow),D.configure(this.options.tableHeader),N.configure(this.options.tableCell),te.configure(this.options.tableCellBackground)]}});exports.Table=j;exports.default=j;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./Table-B1j1Ebmh.cjs");exports.RichTextTable=e.RichTextTable;exports.Table=e.Table;

package/lib/Table.d.cts

@@ -1,5 +1,6 @@
 import { Editor } from '@tiptap/react';
 import { Extension } from '@tiptap/core';
+import { JSX } from 'react/jsx-runtime';
 import { Node as Node_2 } from '@tiptap/core';
 import { TableCellOptions } from '@tiptap/extension-table';
 import { TableHeaderOptions } from '@tiptap/extension-table';
@@ -74,9 +75,9 @@ declare interface GeneralOptions<T> {
     shortcutKeys?: string[] | string[][];
 }
 
-declare const Table: Node_2<TableOptions, any>;
-export { Table }
-export default Table;
+export declare function RichTextTable(): JSX.Element;
+
+export declare const Table: Node_2<TableOptions, any>;
 
 declare interface TableCellBackgroundOptions {
     HTMLAttributes: Record<string, any>;
@@ -133,11 +134,22 @@ declare module '@tiptap/core' {
 }
 
 
+declare module '@tiptap/core' {
+    interface Storage {
+        color: ColorStorage;
+    }
+}
+
+
 declare module '@tiptap/core' {
     interface Commands<ReturnType> {
-        drawer: {
-            setDrawer: (options: any, replace?: any) => ReturnType;
-            setAlignImageDrawer: (align: 'left' | 'center' | 'right') => ReturnType;
+        columns: {
+            insertColumns: (attrs?: {
+                cols: number;
+            }) => ReturnType;
+            addColBefore: () => ReturnType;
+            addColAfter: () => ReturnType;
+            deleteCol: () => ReturnType;
         };
     }
 }
@@ -145,8 +157,9 @@ declare module '@tiptap/core' {
 
 declare module '@tiptap/core' {
     interface Commands<ReturnType> {
-        excalidraw: {
-            setExcalidraw: (attrs?: IExcalidrawAttrs) => ReturnType;
+        drawer: {
+            setDrawer: (options: any, replace?: any) => ReturnType;
+            setAlignImageDrawer: (align: 'left' | 'center' | 'right') => ReturnType;
         };
     }
 }
@@ -164,7 +177,16 @@ declare module '@tiptap/core' {
 declare module '@tiptap/core' {
     interface Commands<ReturnType> {
         exportWord: {
-            exportToWord: () => ReturnType;
+            exportToWord: (docState: any) => ReturnType;
+        };
+    }
+}
+
+
+declare module '@tiptap/core' {
+    interface Commands<ReturnType> {
+        excalidraw: {
+            setExcalidraw: (attrs?: IExcalidrawAttrs) => ReturnType;
         };
     }
 }
@@ -189,10 +211,8 @@ declare module '@tiptap/core' {
 
 
 declare module '@tiptap/core' {
-    interface Commands<ReturnType> {
-        painter: {
-            setPainter: (marks: Mark[]) => ReturnType;
-        };
+    interface Storage {
+        highlight: HighlightStorage;
     }
 }
 
@@ -232,22 +252,6 @@ declare module '@tiptap/core' {
 }
 
 
-declare module '@tiptap/core' {
-    interface Commands<ReturnType> {
-        indent: {
-            /**
-             * Set the indent attribute
-             */
-            indent: () => ReturnType;
-            /**
-             * Set the outdent attribute
-             */
-            outdent: () => ReturnType;
-        };
-    }
-}
-
-
 declare module '@tiptap/core' {
     interface Commands<ReturnType> {
         imageGifUpload: {
@@ -270,8 +274,15 @@ declare module '@tiptap/core' {
 
 declare module '@tiptap/core' {
     interface Commands<ReturnType> {
-        katex: {
-            setKatex: (arg?: IKatexAttrs) => ReturnType;
+        indent: {
+            /**
+             * Set the indent attribute
+             */
+            indent: () => ReturnType;
+            /**
+             * Set the outdent attribute
+             */
+            outdent: () => ReturnType;
         };
     }
 }
@@ -279,9 +290,8 @@ declare module '@tiptap/core' {
 
 declare module '@tiptap/core' {
     interface Commands<ReturnType> {
-        lineHeight: {
-            setLineHeight: (lineHeight: string) => ReturnType;
-            unsetLineHeight: () => ReturnType;
+        katex: {
+            setKatex: (arg?: IKatexAttrs) => ReturnType;
         };
     }
 }
@@ -297,20 +307,6 @@ declare module '@tiptap/core' {
 }
 
 
-declare module '@tiptap/core' {
-    interface Commands<ReturnType> {
-        columns: {
-            insertColumns: (attrs?: {
-                cols: number;
-            }) => ReturnType;
-            addColBefore: () => ReturnType;
-            addColAfter: () => ReturnType;
-            deleteCol: () => ReturnType;
-        };
-    }
-}
-
-
 declare module '@tiptap/core' {
     interface Commands<ReturnType> {
         search: {
@@ -334,16 +330,6 @@ declare module '@tiptap/core' {
 }
 
 
-declare module '@tiptap/core' {
-    interface Commands<ReturnType> {
-        tableOfContents: {
-            setTableOfContents: () => ReturnType;
-            removeTableOfContents: () => ReturnType;
-        };
-    }
-}
-
-
 declare module '@tiptap/core' {
     interface Commands<ReturnType> {
         twitter: {

package/lib/Table.d.ts

@@ -1,5 +1,6 @@
 import { Editor } from '@tiptap/react';
 import { Extension } from '@tiptap/core';
+import { JSX } from 'react/jsx-runtime';
 import { Node as Node_2 } from '@tiptap/core';
 import { TableCellOptions } from '@tiptap/extension-table';
 import { TableHeaderOptions } from '@tiptap/extension-table';
@@ -74,9 +75,9 @@ declare interface GeneralOptions<T> {
     shortcutKeys?: string[] | string[][];
 }
 
-declare const Table: Node_2<TableOptions, any>;
-export { Table }
-export default Table;
+export declare function RichTextTable(): JSX.Element;
+
+export declare const Table: Node_2<TableOptions, any>;
 
 declare interface TableCellBackgroundOptions {
     HTMLAttributes: Record<string, any>;
@@ -133,11 +134,22 @@ declare module '@tiptap/core' {
 }
 
 
+declare module '@tiptap/core' {
+    interface Storage {
+        color: ColorStorage;
+    }
+}
+
+
 declare module '@tiptap/core' {
     interface Commands<ReturnType> {
-        drawer: {
-            setDrawer: (options: any, replace?: any) => ReturnType;
-            setAlignImageDrawer: (align: 'left' | 'center' | 'right') => ReturnType;
+        columns: {
+            insertColumns: (attrs?: {
+                cols: number;
+            }) => ReturnType;
+            addColBefore: () => ReturnType;
+            addColAfter: () => ReturnType;
+            deleteCol: () => ReturnType;
         };
     }
 }
@@ -145,8 +157,9 @@ declare module '@tiptap/core' {
 
 declare module '@tiptap/core' {
     interface Commands<ReturnType> {
-        excalidraw: {
-            setExcalidraw: (attrs?: IExcalidrawAttrs) => ReturnType;
+        drawer: {
+            setDrawer: (options: any, replace?: any) => ReturnType;
+            setAlignImageDrawer: (align: 'left' | 'center' | 'right') => ReturnType;
         };
     }
 }
@@ -164,7 +177,16 @@ declare module '@tiptap/core' {
 declare module '@tiptap/core' {
     interface Commands<ReturnType> {
         exportWord: {
-            exportToWord: () => ReturnType;
+            exportToWord: (docState: any) => ReturnType;
+        };
+    }
+}
+
+
+declare module '@tiptap/core' {
+    interface Commands<ReturnType> {
+        excalidraw: {
+            setExcalidraw: (attrs?: IExcalidrawAttrs) => ReturnType;
         };
     }
 }
@@ -189,10 +211,8 @@ declare module '@tiptap/core' {
 
 
 declare module '@tiptap/core' {
-    interface Commands<ReturnType> {
-        painter: {
-            setPainter: (marks: Mark[]) => ReturnType;
-        };
+    interface Storage {
+        highlight: HighlightStorage;
     }
 }
 
@@ -232,22 +252,6 @@ declare module '@tiptap/core' {
 }
 
 
-declare module '@tiptap/core' {
-    interface Commands<ReturnType> {
-        indent: {
-            /**
-             * Set the indent attribute
-             */
-            indent: () => ReturnType;
-            /**
-             * Set the outdent attribute
-             */
-            outdent: () => ReturnType;
-        };
-    }
-}
-
-
 declare module '@tiptap/core' {
     interface Commands<ReturnType> {
         imageGifUpload: {
@@ -270,8 +274,15 @@ declare module '@tiptap/core' {
 
 declare module '@tiptap/core' {
     interface Commands<ReturnType> {
-        katex: {
-            setKatex: (arg?: IKatexAttrs) => ReturnType;
+        indent: {
+            /**
+             * Set the indent attribute
+             */
+            indent: () => ReturnType;
+            /**
+             * Set the outdent attribute
+             */
+            outdent: () => ReturnType;
         };
     }
 }
@@ -279,9 +290,8 @@ declare module '@tiptap/core' {
 
 declare module '@tiptap/core' {
     interface Commands<ReturnType> {
-        lineHeight: {
-            setLineHeight: (lineHeight: string) => ReturnType;
-            unsetLineHeight: () => ReturnType;
+        katex: {
+            setKatex: (arg?: IKatexAttrs) => ReturnType;
         };
     }
 }
@@ -297,20 +307,6 @@ declare module '@tiptap/core' {
 }
 
 
-declare module '@tiptap/core' {
-    interface Commands<ReturnType> {
-        columns: {
-            insertColumns: (attrs?: {
-                cols: number;
-            }) => ReturnType;
-            addColBefore: () => ReturnType;
-            addColAfter: () => ReturnType;
-            deleteCol: () => ReturnType;
-        };
-    }
-}
-
-
 declare module '@tiptap/core' {
     interface Commands<ReturnType> {
         search: {
@@ -334,16 +330,6 @@ declare module '@tiptap/core' {
 }
 
 
-declare module '@tiptap/core' {
-    interface Commands<ReturnType> {
-        tableOfContents: {
-            setTableOfContents: () => ReturnType;
-            removeTableOfContents: () => ReturnType;
-        };
-    }
-}
-
-
 declare module '@tiptap/core' {
     interface Commands<ReturnType> {
         twitter: {