@cyberyozh/text-editor 0.1.12 → 0.1.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cyberyozh/text-editor",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "Rich text editor library based on Tiptap for CyberYozh",
   "author": "CyberYozh",
   "license": "MIT",
@@ -48,42 +48,42 @@
   },
   "dependencies": {
     "@floating-ui/dom": "^1.7.4",
-    "@tiptap/core": "^3.10.6",
-    "@tiptap/extension-blockquote": "^3.10.6",
-    "@tiptap/extension-bubble-menu": "^3.10.6",
-    "@tiptap/extension-code": "^3.10.6",
-    "@tiptap/extension-code-block-lowlight": "^3.10.6",
-    "@tiptap/extension-collaboration": "^3.10.7",
-    "@tiptap/extension-details": "^3.10.6",
-    "@tiptap/extension-drag-handle": "^3.10.7",
-    "@tiptap/extension-drag-handle-react": "^3.10.6",
-    "@tiptap/extension-floating-menu": "^3.10.6",
-    "@tiptap/extension-hard-break": "^3.10.6",
+    "@tiptap/core": "^3.17.1",
+    "@tiptap/extension-blockquote": "^3.17.1",
+    "@tiptap/extension-bubble-menu": "^3.17.1",
+    "@tiptap/extension-code": "^3.17.1",
+    "@tiptap/extension-code-block-lowlight": "^3.17.1",
+    "@tiptap/extension-collaboration": "^3.17.1",
+    "@tiptap/extension-details": "^3.17.1",
+    "@tiptap/extension-drag-handle": "^3.17.1",
+    "@tiptap/extension-drag-handle-react": "^3.17.1",
+    "@tiptap/extension-floating-menu": "^3.17.1",
+    "@tiptap/extension-hard-break": "^3.17.1",
     "@tiptap/extension-highlight": "^3.10.6",
-    "@tiptap/extension-horizontal-rule": "^3.10.6",
-    "@tiptap/extension-image": "^3.10.6",
-    "@tiptap/extension-link": "^3.10.6",
-    "@tiptap/extension-list": "^3.10.6",
-    "@tiptap/extension-mathematics": "^3.10.6",
-    "@tiptap/extension-node-range": "^3.10.6",
-    "@tiptap/extension-subscript": "^3.10.6",
-    "@tiptap/extension-superscript": "^3.10.6",
-    "@tiptap/extension-table": "^3.10.6",
-    "@tiptap/extension-text-align": "^3.10.6",
-    "@tiptap/extensions": "^3.10.6",
-    "@tiptap/html": "^3.10.6",
-    "@tiptap/pm": "^3.10.6",
-    "@tiptap/react": "^3.10.6",
-    "@tiptap/starter-kit": "^3.10.6",
-    "@tiptap/static-renderer": "^3.10.6",
-    "@tiptap/suggestion": "^3.10.6",
-    "@tiptap/y-tiptap": "^3.0.1",
-    "emoji-picker-react": "^4.15.1",
-    "highlight.js": "^11.11.0",
-    "katex": "^0.16.25",
+    "@tiptap/extension-horizontal-rule": "^3.17.1",
+    "@tiptap/extension-image": "^3.17.1",
+    "@tiptap/extension-link": "^3.17.1",
+    "@tiptap/extension-list": "^3.17.1",
+    "@tiptap/extension-mathematics": "^3.17.1",
+    "@tiptap/extension-node-range": "^3.17.1",
+    "@tiptap/extension-subscript": "^3.17.1",
+    "@tiptap/extension-superscript": "^3.17.1",
+    "@tiptap/extension-table": "^3.17.1",
+    "@tiptap/extension-text-align": "^3.17.1",
+    "@tiptap/extensions": "^3.17.1",
+    "@tiptap/html": "^3.17.1",
+    "@tiptap/pm": "^3.17.1",
+    "@tiptap/react": "^3.17.1",
+    "@tiptap/starter-kit": "^3.17.1",
+    "@tiptap/static-renderer": "^3.17.1",
+    "@tiptap/suggestion": "^3.17.1",
+    "@tiptap/y-tiptap": "^3.0.2",
+    "emoji-picker-react": "^4.17.1",
+    "highlight.js": "^11.11.1",
+    "katex": "^0.16.27",
     "lowlight": "^3.3.0",
-    "y-protocols": "^1.0.6",
-    "yjs": "^13.6.27"
+    "y-protocols": "^1.0.7",
+    "yjs": "^13.6.29"
   },
   "devDependencies": {
     "@changesets/cli": "^2.29.7",

package/src/editor/dialogs/image-dialog/image-dialog.tsx

@@ -49,14 +49,43 @@ export const ImageDialog = ({
     ? resolveImageSrc({ fileId: initialAttrs.fileId, src: initialAttrs.src }, { getImageById })
     : "";
 
+  const getConstrainedDimensions = () => {
+    if (!initialAttrs?.width || !initialAttrs?.height) {
+      return { width: 0, height: 0 };
+    }
+
+    let maxWidth: number | undefined;
+    try {
+      const editorElement = document.querySelector(".tiptap-content-wrapper") as HTMLElement;
+      if (editorElement && editorElement.clientWidth > 0) {
+        maxWidth = editorElement.clientWidth - 32;
+      }
+    } catch {}
+
+    if (maxWidth && initialAttrs.width > maxWidth) {
+      const aspectRatio = initialAttrs.height / initialAttrs.width;
+      return {
+        width: maxWidth,
+        height: Math.round(maxWidth * aspectRatio),
+      };
+    }
+
+    return {
+      width: initialAttrs.width,
+      height: initialAttrs.height,
+    };
+  };
+
+  const constrainedDimensions = getConstrainedDimensions();
+
   const [formState, setFormState] = useState<ImageFormState>({
     file: null,
     title: initialAttrs?.title || "",
     alt: initialAttrs?.alt || "",
     caption: initialAttrs?.caption || "",
     fileUrl: resolvedInitialUrl,
-    width: initialAttrs?.width || 0,
-    height: initialAttrs?.height || 0,
+    width: constrainedDimensions.width,
+    height: constrainedDimensions.height,
   });
 
   const handleSelectFile = (file: File | undefined) => {
@@ -154,6 +183,7 @@ export const ImageDialog = ({
     setIsUploading(true);
     try {
       const result = await uploadHandler(formState.file);
+      console.log("👀 ~ handleAddImage ~ result:", result);
 
       onImageAdd({
         fileId: result.fileId,
@@ -179,6 +209,8 @@ export const ImageDialog = ({
       alt: formState.alt,
       title: formState.title,
       caption: formState.caption,
+      width: formState.width || undefined,
+      height: formState.height || undefined,
     });
 
     handleClose();

package/src/editor/editor.tsx

@@ -77,7 +77,7 @@ function TiptapContent({
 }: TiptapProps) {
   const [linkDialogContext, setLinkDialogContext] = useState<LinkDialogContextProps | null>(null);
   const [katexDialogContext, setKatexDialogContext] = useState<KatexDialogContextProps | null>(
-    null
+    null,
   );
   const [editFigureContext, setEditFigureContext] = useState<{
     attrs: FigureAttrs;
@@ -136,7 +136,7 @@ function TiptapContent({
       onCreate: ({ editor }) => handleChange?.(editor.getJSON()),
       onBlur: ({ editor }) => handleChange?.(editor.getJSON()),
     },
-    [lang]
+    [lang],
   );
 
   useEffect(() => {

package/src/editor/index.ts

@@ -1,3 +1,4 @@
 export { Tiptap } from "./editor";
 export type { SupportedLanguage as TiptapSupportedLanguages } from "../utils/get-translations";
 export { type JSONContent } from "@tiptap/react";
+export { htmlToTiptapContent } from "../utils/html-to-tiptap-content";

package/src/extensions/editor/figure.ts

@@ -17,7 +17,7 @@ export const Figure = BaseFigure.extend({
       const attrs = node.attrs;
 
       const imageExtension = editor.extensionManager.extensions.find(
-        (ext) => ext.name === "image"
+        (ext) => ext.name === "image",
       ) as typeof BaseFigure | undefined;
       const getImageById = imageExtension?.options.getImageById;
 
@@ -79,6 +79,25 @@ export const Figure = BaseFigure.extend({
         if (maxWidth && naturalAspectRatio) {
           maxHeight = Math.round(maxWidth * naturalAspectRatio);
         }
+
+        if (attrs.width && attrs.height && maxWidth && attrs.width > maxWidth) {
+          const width = maxWidth;
+          const height = Math.round((attrs.height / attrs.width) * maxWidth);
+
+          imageContainer.style.width = `${width}px`;
+          imageContainer.style.height = `${height}px`;
+
+          const pos = getPos();
+          if (typeof pos === "number") {
+            editor
+              .chain()
+              .updateAttributes("image", {
+                width: Math.round(width),
+                height: Math.round(height),
+              })
+              .run();
+          }
+        }
       };
 
       imageContainer.appendChild(img);
@@ -104,6 +123,7 @@ export const Figure = BaseFigure.extend({
 
       const resizableView = new ResizableNodeView({
         element: imageContainer,
+        editor: editor,
         node,
         getPos,
         onResize: (w, h) => {

package/src/render/index.ts

@@ -20,3 +20,4 @@
  */
 
 export { TiptapRender } from "./tiptap-render";
+export { htmlToTiptapContent } from "../utils/html-to-tiptap-content";

package/src/utils/html-to-tiptap-content.ts

@@ -0,0 +1,41 @@
+import { generateJSON, type JSONContent } from "@tiptap/core";
+import { getSharedExtensions } from "./get-shared-extensions";
+import { BaseFigure } from "@/extensions/base/figure";
+
+function isJSONContent(value: unknown): value is JSONContent {
+  return (
+    typeof value === "object" && value !== null && "type" in value && typeof value.type === "string"
+  );
+}
+
+export function htmlToTiptapContent(content: string | JSONContent): JSONContent {
+  if (isJSONContent(content)) {
+    return content;
+  }
+
+  if (typeof content === "string") {
+    try {
+      const parsed = JSON.parse(content);
+      if (isJSONContent(parsed)) {
+        return parsed;
+      }
+    } catch {
+      // Not valid JSON, treat as HTML
+    }
+  }
+
+  if (!content || content.trim() === "") {
+    return { type: "doc", content: [{ type: "paragraph" }] };
+  }
+
+  const sharedExtensions = getSharedExtensions();
+
+  const extensions = [...sharedExtensions, BaseFigure];
+
+  try {
+    return generateJSON(content, extensions);
+  } catch (error) {
+    console.error("Failed to convert HTML to Tiptap content:", error);
+    return { type: "doc", content: [{ type: "paragraph" }] };
+  }
+}