@cyberyozh/text-editor 0.3.1 → 0.4.0

package/dist/styles/index.css

@@ -158,6 +158,40 @@
   padding: 24px;
 }
 
+/* src/editor/components/dialog-error/dialog-error.css */
+.dialog-error {
+  position: relative;
+  padding: 8px 12px;
+  border: 1px solid var(--ui-error-border);
+  border-radius: 4px;
+  background-color: var(--ui-error-bg);
+  color: var(--ui-error-text);
+  font-size: 13px;
+}
+.dialog-error-list {
+  margin: 0;
+  padding-left: 16px;
+}
+.dialog-error-clear-button {
+  display: flex;
+  position: absolute;
+  top: 8px;
+  right: 8px;
+  align-items: center;
+  justify-content: center;
+  width: 20px;
+  height: 20px;
+  padding: 0;
+  border: none;
+  background-color: transparent;
+  cursor: pointer;
+}
+.dialog-error-clear-button svg {
+  width: 14px;
+  height: 14px;
+  color: var(--ui-error-text);
+}
+
 /* src/editor/dialogs/add-katex-dialog/add-katex-dialog.css */
 .katex-dialog-title {
   margin: 0 0 16px 0;
@@ -298,14 +332,6 @@
 .link-dialog-input::placeholder {
   color: var(--tiptap-color-text-placeholder);
 }
-.link-dialog-error {
-  padding: 8px 12px;
-  border: 1px solid var(--ui-error-border);
-  border-radius: 4px;
-  background-color: var(--ui-error-bg);
-  color: var(--ui-error-text);
-  font-size: 13px;
-}
 .link-dialog-actions {
   display: flex;
   justify-content: flex-end;
@@ -423,14 +449,6 @@
 .video-dialog-platform-list li {
   margin: 4px 0;
 }
-.video-dialog-error {
-  padding: 8px 12px;
-  border: 1px solid var(--ui-error-border);
-  border-radius: 4px;
-  background-color: var(--ui-error-bg);
-  color: var(--ui-error-text);
-  font-size: 13px;
-}
 .video-dialog-actions {
   display: flex;
   justify-content: flex-end;
@@ -563,6 +581,9 @@
   background: var(--ui-secondary-bg);
   color: var(--ui-text-primary);
 }
+.image-dialog-error-spacing {
+  margin-bottom: 16px;
+}
 
 /* src/styles/components.css */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cyberyozh/text-editor",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "Rich text editor library based on Tiptap for CyberYozh",
   "author": "CyberYozh",
   "license": "MIT",

package/src/editor/components/dialog-error/dialog-error.css

@@ -0,0 +1,35 @@
+.dialog-error {
+  position: relative;
+  padding: 8px 12px;
+  border: 1px solid var(--ui-error-border);
+  border-radius: 4px;
+  background-color: var(--ui-error-bg);
+  color: var(--ui-error-text);
+  font-size: 13px;
+}
+
+.dialog-error-list {
+  margin: 0;
+  padding-left: 16px;
+}
+
+.dialog-error-clear-button {
+  display: flex;
+  position: absolute;
+  top: 8px;
+  right: 8px;
+  align-items: center;
+  justify-content: center;
+  width: 20px;
+  height: 20px;
+  padding: 0;
+  border: none;
+  background-color: transparent;
+  cursor: pointer;
+}
+
+.dialog-error-clear-button svg {
+  width: 14px;
+  height: 14px;
+  color: var(--ui-error-text);
+}

package/src/editor/components/dialog-error/dialog-error.tsx

@@ -0,0 +1,65 @@
+"use client";
+
+import { isCombinedError } from "@/utils";
+
+import { TiptapX } from "../../../icons";
+import { useTiptapTranslations } from "../../context";
+import { useMemo } from "react";
+
+interface DialogErrorProps {
+  error: unknown;
+  onClose?: () => void;
+  className?: string;
+}
+
+export const DialogError = ({ error, onClose, className }: DialogErrorProps) => {
+  const translations = useTiptapTranslations();
+
+  const renderedMessage = useMemo(() => {
+    if (typeof error === "string") {
+      return error || translations.common.unknownError;
+    }
+
+    if (isCombinedError(error)) {
+      const safeErrors = error.cause.filter((e) => Boolean(e.message));
+      const errorsToDisplay =
+        safeErrors.length === error.cause.length
+          ? safeErrors
+          : [new Error(translations.common.unknownError), ...safeErrors];
+
+      if (errorsToDisplay.length === 1) {
+        return errorsToDisplay[0].message;
+      }
+
+      return (
+        <ul className="dialog-error-list">
+          {errorsToDisplay.map((cause, index) => (
+            <li key={`${index}_${cause.message}`}>{cause.message}</li>
+          ))}
+        </ul>
+      );
+    }
+
+    if (error instanceof Error) {
+      return error.message || translations.common.unknownError;
+    }
+
+    return translations.common.unknownError;
+  }, [error, translations]);
+
+  return (
+    <div className={`dialog-error ${className || ""}`}>
+      {renderedMessage}
+      {onClose && (
+        <button
+          type="button"
+          className="dialog-error-clear-button"
+          onClick={onClose}
+          aria-label={translations.common.clearError}
+        >
+          <TiptapX />
+        </button>
+      )}
+    </div>
+  );
+};

package/src/editor/components/dialog-error/index.ts

@@ -0,0 +1 @@
+export { DialogError } from './dialog-error';

package/src/editor/components/index.ts

@@ -1,3 +1,4 @@
 export { Button } from './button';
 export { Input } from './input';
 export { CommonModal } from './common-modal';
+export { DialogError } from './dialog-error';

package/src/editor/dialogs/add-link-dialog/add-link-dialog.css

@@ -48,15 +48,6 @@
   color: var(--tiptap-color-text-placeholder);
 }
 
-.link-dialog-error {
-  padding: 8px 12px;
-  border: 1px solid var(--ui-error-border);
-  border-radius: 4px;
-  background-color: var(--ui-error-bg);
-  color: var(--ui-error-text);
-  font-size: 13px;
-}
-
 .link-dialog-actions {
   display: flex;
   justify-content: flex-end;

package/src/editor/dialogs/add-link-dialog/add-link-dialog.tsx

@@ -2,7 +2,7 @@
 
 import { ChangeEvent, useEffect, useRef, useState } from "react";
 
-import { CommonModal } from "../../components";
+import { CommonModal, DialogError } from "../../components";
 import { useTiptapTranslations } from "../../context";
 import { LinkDialogContextProps } from "@/types/link";
 
@@ -186,7 +186,7 @@ export const AddLinkDialog = ({
           <p className="link-dialog-help-text">{translations.link.addNofollowHelp}</p>
         </div>
 
-        {error && <div className="link-dialog-error">{error}</div>}
+        {error && <DialogError error={error} />}
       </div>
 
       <div className="link-dialog-actions">

package/src/editor/dialogs/add-video-dialog/add-video-dialog.css

@@ -83,15 +83,6 @@
   margin: 4px 0;
 }
 
-.video-dialog-error {
-  padding: 8px 12px;
-  border: 1px solid var(--ui-error-border);
-  border-radius: 4px;
-  background-color: var(--ui-error-bg);
-  color: var(--ui-error-text);
-  font-size: 13px;
-}
-
 .video-dialog-actions {
   display: flex;
   justify-content: flex-end;

package/src/editor/dialogs/add-video-dialog/add-video-dialog.tsx

@@ -2,7 +2,7 @@
 
 import { ChangeEvent, useEffect, useRef, useState } from "react";
 
-import { CommonModal } from "../../components";
+import { CommonModal, DialogError } from "../../components";
 import { detectVideoHosting, VideoHosting } from "../../../utils/detect-video-hosting";
 import { useTiptapTranslations } from "../../context";
 
@@ -128,7 +128,7 @@ export const AddVideoDialog = ({ open, onClose, onVideoAdd }: AddVideoDialogProp
           </ul>
         </div>
 
-        {error && <div className="video-dialog-error">{error}</div>}
+        {error && <DialogError error={error} />}
       </div>
 
       <div className="video-dialog-actions">

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

@@ -100,3 +100,7 @@
   background: var(--ui-secondary-bg);
   color: var(--ui-text-primary);
 }
+
+.image-dialog-error-spacing {
+  margin-bottom: 16px;
+}

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

@@ -4,7 +4,7 @@ import React, { useEffect, useRef, useState } from "react";
 
 import { TiptapX } from "../../../icons";
 
-import { Button, CommonModal, Input } from "../../components";
+import { Button, CommonModal, DialogError, Input } from "../../components";
 import { ImageUploadHandler, TiptapImageAttrs, ImageGetHandler, FigureAttrs } from "../../../types";
 import { resolveImageSrc } from "../../../utils/image-src-resolver";
 import { useTiptapTranslations } from "../../context";
@@ -90,13 +90,26 @@ export const ImageDialog = ({
     height: constrainedDimensions.height,
   });
 
+  const [fileUploadError, setFileUploadError] = useState<Error | null>(null);
+
   const handleSelectFile = (file: File | undefined) => {
+    setFileUploadError(null);
+
     if (!file) return;
 
+    if (!file.type.startsWith('image/')) {
+      setFileUploadError(new Error(translations.imageDialog.invalidFileType));
+      return;
+    }
+
     const imageUrl = URL.createObjectURL(file);
     const img = new Image();
     img.src = imageUrl;
 
+    img.onerror = () => {
+      setFileUploadError(new Error(translations.imageDialog.invalidFileType));
+    };
+
     img.onload = () => {
       const naturalWidth = img.width;
       const naturalHeight = img.height;
@@ -189,6 +202,7 @@ export const ImageDialog = ({
     if (!formState.file) return;
 
     setIsUploading(true);
+
     try {
       const result = await uploadHandler(formState.file);
 
@@ -204,6 +218,8 @@ export const ImageDialog = ({
       });
 
       handleClose();
+    } catch (error) {
+      setFileUploadError(error instanceof Error ? error : new Error(translations.common.unknownError));
     } finally {
       setIsUploading(false);
     }
@@ -223,7 +239,9 @@ export const ImageDialog = ({
     handleClose();
   };
 
-  const handleSave = mode === "edit" ? handleEditImage : handleAddImage;
+  const isEditMode = mode === "edit";
+  const canSave = isEditMode || Boolean(formState.file);
+  const handleSave = isEditMode ? handleEditImage : handleAddImage;
 
   const handleClose = () => {
     clearImageFormFields();
@@ -315,6 +333,13 @@ export const ImageDialog = ({
           )}
         </div>
       </div>
+      {fileUploadError && (
+        <DialogError
+          error={fileUploadError}
+          onClose={() => setFileUploadError(null)}
+          className="image-dialog-error-spacing"
+        />
+      )}
       <div className="image-dialog-actions">
         <Button
           type="button"
@@ -328,6 +353,7 @@ export const ImageDialog = ({
           isLoading={isUploading}
           type="button"
           onClick={handleSave}
+          disabled={!canSave}
         >
           {saveButtonText}
         </Button>

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

@@ -17,11 +17,10 @@ export function useInsertionHandlers(imageHandlers?: ImageHandlers) {
   }, [insertedImage, activeDialog]);
 
   function genericInsertionHandler(file: File | undefined, event: Event) {
-    if (!file || !file.type.startsWith("image/")) return;
-
     event.preventDefault();
     event.stopPropagation();
 
+    if (!file || !file.type.startsWith("image/")) return;
     if (!imageHandlers?.upload) return;
 
     setInsertedImage(file);

package/src/editor/index.ts

@@ -2,3 +2,4 @@ export { Tiptap, type TiptapProps, type KatexDialogContextProps } 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";
+export { type CombinedErrors as TipTapCombinedErrors  } from '@/types/common'

package/src/styles/components.css

@@ -2,6 +2,7 @@
 @import "../editor/components/button/button.css";
 @import "../editor/components/input/input.css";
 @import "../editor/components/common-modal/common-modal.css";
+@import "../editor/components/dialog-error/dialog-error.css";
 
 /* Dialog Styles */
 @import "../editor/dialogs/add-katex-dialog/add-katex-dialog.css";

package/src/translations/en.json

@@ -112,7 +112,8 @@
     "captionLabel": "Image caption",
     "captionPlaceholder": "Description under image...",
     "save": "Save",
-    "add": "Add"
+    "add": "Add",
+    "invalidFileType": "Invalid file format."
   },
   "videoUpload": {
     "title": "Add video",
@@ -157,6 +158,8 @@
     "words": ["word", "words", "words"]
   },
   "common": {
-    "cancel": "Cancel"
+    "cancel": "Cancel",
+    "unknownError": "Unknown error",
+    "clearError": "Clear error"
   }
 }

package/src/translations/ru.json

@@ -112,7 +112,8 @@
     "captionLabel": "Подпись к изображению",
     "captionPlaceholder": "Описание под изображением...",
     "save": "Сохранить",
-    "add": "Добавить"
+    "add": "Добавить",
+    "invalidFileType": "Неверный формат файла."
   },
   "videoUpload": {
     "title": "Добавить видео",
@@ -157,6 +158,8 @@
     "words": ["слово", "слова", "слов"]
   },
   "common": {
-    "cancel": "Отменить"
+    "cancel": "Отменить",
+    "unknownError": "Неизвестная ошибка",
+    "clearError": "Сбросить ошибку"
   }
 }

package/src/types/common.ts

@@ -0,0 +1,3 @@
+export interface CombinedErrors extends Error {
+  cause: Array<Error>
+}

package/src/types/index.ts

@@ -1 +1,2 @@
+export * from './common';
 export * from './image-handler';

package/src/utils/index.ts

@@ -1,2 +1,3 @@
 export { copyToClipboard } from './copy-to-clipboard';
 export { pluralize } from './pluralize';
+export { isCombinedError } from './is-combined-error';

package/src/utils/is-combined-error.ts

@@ -0,0 +1,9 @@
+import { CombinedErrors } from "@/types";
+
+export function isCombinedError(error: unknown): error is CombinedErrors {
+  return (
+    error instanceof Error &&
+    Array.isArray(error?.cause) &&
+    error.cause.length > 0 && error.cause.every((e) => e instanceof Error)
+  );
+}