@cyberyozh/text-editor 0.5.0 → 0.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cyberyozh/text-editor",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "Rich text editor library based on Tiptap for CyberYozh",
   "author": "CyberYozh",
   "license": "MIT",
@@ -50,38 +50,38 @@
   },
   "dependencies": {
     "@floating-ui/dom": "1.7.6",
-    "@tiptap/core": "3.23.6",
-    "@tiptap/extension-blockquote": "3.23.6",
-    "@tiptap/extension-bubble-menu": "3.23.6",
-    "@tiptap/extension-code": "3.23.6",
-    "@tiptap/extension-code-block-lowlight": "3.23.6",
-    "@tiptap/extension-collaboration": "3.23.6",
-    "@tiptap/extension-details": "3.23.6",
-    "@tiptap/extension-drag-handle": "3.23.6",
-    "@tiptap/extension-drag-handle-react": "3.23.6",
-    "@tiptap/extension-floating-menu": "3.23.6",
-    "@tiptap/extension-hard-break": "3.23.6",
-    "@tiptap/extension-highlight": "3.23.6",
-    "@tiptap/extension-horizontal-rule": "3.23.6",
-    "@tiptap/extension-image": "3.23.6",
-    "@tiptap/extension-link": "3.23.6",
-    "@tiptap/extension-list": "3.23.6",
-    "@tiptap/extension-mathematics": "3.23.6",
-    "@tiptap/extension-node-range": "3.23.6",
-    "@tiptap/extension-subscript": "3.23.6",
-    "@tiptap/extension-superscript": "3.23.6",
-    "@tiptap/extension-table": "3.23.6",
-    "@tiptap/extension-text-align": "3.23.6",
-    "@tiptap/extensions": "3.23.6",
-    "@tiptap/html": "3.23.6",
-    "@tiptap/pm": "3.23.6",
-    "@tiptap/react": "3.23.6",
-    "@tiptap/starter-kit": "3.23.6",
-    "@tiptap/static-renderer": "3.23.6",
-    "@tiptap/suggestion": "3.23.6",
-    "@tiptap/y-tiptap": "3.0.3",
+    "@tiptap/core": "3.31.3",
+    "@tiptap/extension-blockquote": "3.31.3",
+    "@tiptap/extension-bubble-menu": "3.31.3",
+    "@tiptap/extension-code": "3.31.3",
+    "@tiptap/extension-code-block-lowlight": "3.31.3",
+    "@tiptap/extension-collaboration": "3.31.3",
+    "@tiptap/extension-details": "3.31.3",
+    "@tiptap/extension-drag-handle": "3.31.3",
+    "@tiptap/extension-drag-handle-react": "3.31.3",
+    "@tiptap/extension-floating-menu": "3.31.3",
+    "@tiptap/extension-hard-break": "3.31.3",
+    "@tiptap/extension-highlight": "3.31.3",
+    "@tiptap/extension-horizontal-rule": "3.31.3",
+    "@tiptap/extension-image": "3.31.3",
+    "@tiptap/extension-link": "3.31.3",
+    "@tiptap/extension-list": "3.31.3",
+    "@tiptap/extension-mathematics": "3.31.3",
+    "@tiptap/extension-node-range": "3.31.3",
+    "@tiptap/extension-subscript": "3.31.3",
+    "@tiptap/extension-superscript": "3.31.3",
+    "@tiptap/extension-table": "3.31.3",
+    "@tiptap/extension-text-align": "3.31.3",
+    "@tiptap/extensions": "3.31.3",
+    "@tiptap/html": "3.31.3",
+    "@tiptap/pm": "3.31.3",
+    "@tiptap/react": "3.31.3",
+    "@tiptap/starter-kit": "3.31.3",
+    "@tiptap/static-renderer": "3.31.3",
+    "@tiptap/suggestion": "3.31.3",
+    "@tiptap/y-tiptap": "3.0.9",
     "emoji-picker-react": "4.19.1",
-    "highlight.js": "11.11.1",
+    "highlight.js": "11.12.0",
     "katex": "0.16.35",
     "lowlight": "3.3.0",
     "y-protocols": "1.0.7",
@@ -94,9 +94,10 @@
     "eslint": "^10.0.2",
     "tsup": "^8.5.1",
     "typescript": "^5.9.3",
-    "vitest": "^3.2.6"
+    "vitest": "^5.0.0"
   },
   "overrides": {
-    "glob": "^13.0.6"
+    "glob": "^13.0.6",
+    "esbuild": "^0.28.1"
   }
 }

package/src/editor/commands/items.ts

@@ -5,10 +5,7 @@ import {
   TiptapMenuAddImage,
   TiptapMenuBlockquote,
   TiptapMenuBulletList,
-  TiptapMenuCalloutError,
-  TiptapMenuCalloutInfo,
   TiptapMenuCalloutSuccess,
-  TiptapMenuCalloutWarning,
   TiptapMenuCodeBlock,
   TiptapMenuCustomQuote,
   TiptapMenuDetails,
@@ -22,11 +19,9 @@ import {
   TiptapMenuMythReality,
   TiptapMenuOrderedList,
   TiptapMenuPrompt,
-  TiptapMenuRedo,
   TiptapMenuSubscript,
   TiptapMenuSuperscript,
   TiptapMenuTable,
-  TiptapMenuUndo,
   TiptapMenuVideo,
 } from "../../icons";
 
@@ -45,7 +40,7 @@ export interface CommandMenuItem {
 
 export const getCommandItems = (
   translations: TiptapTranslations,
-  hasImageHandlers: boolean
+  hasImageHandlers: boolean,
 ): CommandMenuItem[] => [
   // Undo/Redo group
   // {

package/src/editor/handlers/insertion-handlers.test.ts

@@ -0,0 +1,37 @@
+import { describe, expect, it, vi } from "vitest";
+import { shouldHandleInsertedFile } from "./markup-insertion";
+
+function fakeEvent() {
+  return {
+    preventDefault: vi.fn(),
+    stopPropagation: vi.fn(),
+  } as unknown as Event & {
+    preventDefault: ReturnType<typeof vi.fn>;
+    stopPropagation: ReturnType<typeof vi.fn>;
+  };
+}
+
+describe("shouldHandleInsertedFile", () => {
+  it("leaves the event untouched when clipboard has no files (plain text / html paste)", () => {
+    const event = fakeEvent();
+    expect(shouldHandleInsertedFile(undefined, event)).toBe(false);
+    expect(event.preventDefault).not.toHaveBeenCalled();
+    expect(event.stopPropagation).not.toHaveBeenCalled();
+  });
+
+  it("blocks the event for a non-image file and does not handle it", () => {
+    const event = fakeEvent();
+    const file = new File(["data"], "doc.pdf", { type: "application/pdf" });
+    expect(shouldHandleInsertedFile(file, event)).toBe(false);
+    expect(event.preventDefault).toHaveBeenCalledOnce();
+    expect(event.stopPropagation).toHaveBeenCalledOnce();
+  });
+
+  it("blocks the event for an image file and handles it", () => {
+    const event = fakeEvent();
+    const file = new File(["data"], "pic.png", { type: "image/png" });
+    expect(shouldHandleInsertedFile(file, event)).toBe(true);
+    expect(event.preventDefault).toHaveBeenCalledOnce();
+    expect(event.stopPropagation).toHaveBeenCalledOnce();
+  });
+});

package/src/editor/handlers/insertion-handlers.ts

@@ -3,7 +3,12 @@ import { useDialogCommand } from "../context";
 import { EditorView } from "@tiptap/pm/view";
 import { Slice } from "@tiptap/pm/model";
 import { ImageHandlers } from "@/types";
-import { applyUploadResultsToNodes, collectRehostableImages, removeImagesFromSlice } from "./markup-insertion";
+import {
+  applyUploadResultsToNodes,
+  collectRehostableImages,
+  removeImagesFromSlice,
+  shouldHandleInsertedFile,
+} from "./markup-insertion";
 
 export function useInsertionHandlers(imageHandlers?: ImageHandlers) {
   const [insertedImage, setInsertedImage] = useState<File | null>(null);
@@ -17,10 +22,7 @@ export function useInsertionHandlers(imageHandlers?: ImageHandlers) {
   }, [insertedImage, activeDialog]);
 
   function genericInsertionHandler(file: File | undefined, event: Event) {
-    event.preventDefault();
-    event.stopPropagation();
-
-    if (!file || !file.type.startsWith("image/")) return;
+    if (!file || !shouldHandleInsertedFile(file, event)) return;
     if (!imageHandlers?.upload) return;
 
     setInsertedImage(file);
@@ -48,7 +50,7 @@ export function useInsertionHandlers(imageHandlers?: ImageHandlers) {
     if (
       "clipboardData" in event &&
       Array.from(event.clipboardData?.items ?? []).some(
-        (item) => item.type === "text/html"
+        (item) => item.type === "text/html",
       )
     ) {
       hasMarkupInsertion = true;
@@ -57,7 +59,7 @@ export function useInsertionHandlers(imageHandlers?: ImageHandlers) {
     if (
       "dataTransfer" in event &&
       Array.from(event.dataTransfer?.items ?? []).some(
-        (item) => item.type === "text/html"
+        (item) => item.type === "text/html",
       )
     ) {
       hasMarkupInsertion = true;
@@ -69,7 +71,8 @@ export function useInsertionHandlers(imageHandlers?: ImageHandlers) {
 
         const imagesToNodes = collectRehostableImages(slice);
 
-        imageHandlers.uploadMultipleByURL(imagesToNodes.map(([url]) => url))
+        imageHandlers
+          .uploadMultipleByURL(imagesToNodes.map(([url]) => url))
           .then((results) => {
             applyUploadResultsToNodes(imagesToNodes, results);
             view.dispatch(view.state.tr.replaceSelection(slice));
@@ -78,7 +81,9 @@ export function useInsertionHandlers(imageHandlers?: ImageHandlers) {
             setDisabled(false);
           });
       } else {
-        view.dispatch(view.state.tr.replaceSelection(removeImagesFromSlice(slice)));
+        view.dispatch(
+          view.state.tr.replaceSelection(removeImagesFromSlice(slice)),
+        );
       }
 
       return true;

package/src/editor/handlers/markup-insertion.ts

@@ -70,3 +70,12 @@ export function applyUploadResultsToNodes(
     node.attrs.storageKey = result.storageKey;
   });
 }
+
+export function shouldHandleInsertedFile(file: File | undefined, event: Event): boolean {
+  if (!file) return false;
+
+  event.preventDefault();
+  event.stopPropagation();
+
+  return file.type.startsWith("image/");
+}

package/src/extensions/base/compatibility.ts

@@ -441,10 +441,12 @@ export const BaseLegacyFigure = Image.extend<FigureOptions>({
   selectable: false,
 
   addOptions() {
+    const parentOptions = this.parent?.() || {};
     return {
+      ...parentOptions,
       HTMLAttributes: {},
       getImageById: undefined,
-    };
+    } as FigureOptions;
   },
 
   addAttributes() {

package/src/extensions/base/myth-reality.ts

@@ -1,5 +1,4 @@
 import { mergeAttributes, Node } from "@tiptap/core";
-import { TextSelection } from "@tiptap/pm/state";
 import { handleExitNode } from "../../utils/handle-exit-node";
 
 export const BaseMythRealityBlock = Node.create({