@underverse-ui/underverse 1.0.186 → 1.0.187

package/dist/index.d.cts

@@ -3783,6 +3783,7 @@ declare const underverseMessages: {
             };
             linkInput: {
                 placeholder: string;
+                invalid: string;
             };
             imageInput: {
                 urlTab: string;
@@ -4208,6 +4209,7 @@ declare const underverseMessages: {
             };
             linkInput: {
                 placeholder: string;
+                invalid: string;
             };
             imageInput: {
                 urlTab: string;
@@ -4633,6 +4635,7 @@ declare const underverseMessages: {
             };
             linkInput: {
                 placeholder: string;
+                invalid: string;
             };
             imageInput: {
                 urlTab: string;
@@ -5058,6 +5061,7 @@ declare const underverseMessages: {
             };
             linkInput: {
                 placeholder: string;
+                invalid: string;
             };
             imageInput: {
                 urlTab: string;
@@ -5486,6 +5490,7 @@ declare function getUnderverseMessages(locale?: UnderverseLocale): {
         };
         linkInput: {
             placeholder: string;
+            invalid: string;
         };
         imageInput: {
             urlTab: string;
@@ -5910,6 +5915,7 @@ declare function getUnderverseMessages(locale?: UnderverseLocale): {
         };
         linkInput: {
             placeholder: string;
+            invalid: string;
         };
         imageInput: {
             urlTab: string;
@@ -6334,6 +6340,7 @@ declare function getUnderverseMessages(locale?: UnderverseLocale): {
         };
         linkInput: {
             placeholder: string;
+            invalid: string;
         };
         imageInput: {
             urlTab: string;
@@ -6758,6 +6765,7 @@ declare function getUnderverseMessages(locale?: UnderverseLocale): {
         };
         linkInput: {
             placeholder: string;
+            invalid: string;
         };
         imageInput: {
             urlTab: string;

package/dist/index.d.ts

@@ -3783,6 +3783,7 @@ declare const underverseMessages: {
             };
             linkInput: {
                 placeholder: string;
+                invalid: string;
             };
             imageInput: {
                 urlTab: string;
@@ -4208,6 +4209,7 @@ declare const underverseMessages: {
             };
             linkInput: {
                 placeholder: string;
+                invalid: string;
             };
             imageInput: {
                 urlTab: string;
@@ -4633,6 +4635,7 @@ declare const underverseMessages: {
             };
             linkInput: {
                 placeholder: string;
+                invalid: string;
             };
             imageInput: {
                 urlTab: string;
@@ -5058,6 +5061,7 @@ declare const underverseMessages: {
             };
             linkInput: {
                 placeholder: string;
+                invalid: string;
             };
             imageInput: {
                 urlTab: string;
@@ -5486,6 +5490,7 @@ declare function getUnderverseMessages(locale?: UnderverseLocale): {
         };
         linkInput: {
             placeholder: string;
+            invalid: string;
         };
         imageInput: {
             urlTab: string;
@@ -5910,6 +5915,7 @@ declare function getUnderverseMessages(locale?: UnderverseLocale): {
         };
         linkInput: {
             placeholder: string;
+            invalid: string;
         };
         imageInput: {
             urlTab: string;
@@ -6334,6 +6340,7 @@ declare function getUnderverseMessages(locale?: UnderverseLocale): {
         };
         linkInput: {
             placeholder: string;
+            invalid: string;
         };
         imageInput: {
             urlTab: string;
@@ -6758,6 +6765,7 @@ declare function getUnderverseMessages(locale?: UnderverseLocale): {
         };
         linkInput: {
             placeholder: string;
+            invalid: string;
         };
         imageInput: {
             urlTab: string;

package/dist/index.js

@@ -815,7 +815,8 @@ var en_default = {
       addBlock: "Add block"
     },
     linkInput: {
-      placeholder: "Paste or type a link..."
+      placeholder: "Paste or type a link...",
+      invalid: "Enter a valid link, such as https://example.com."
     },
     imageInput: {
       urlTab: "URL",
@@ -1242,7 +1243,8 @@ var vi_default = {
       addBlock: "Th\xEAm kh\u1ED1i"
     },
     linkInput: {
-      placeholder: "D\xE1n ho\u1EB7c nh\u1EADp li\xEAn k\u1EBFt..."
+      placeholder: "D\xE1n ho\u1EB7c nh\u1EADp li\xEAn k\u1EBFt...",
+      invalid: "Vui l\xF2ng nh\u1EADp li\xEAn k\u1EBFt h\u1EE3p l\u1EC7, v\xED d\u1EE5: https://example.com."
     },
     imageInput: {
       urlTab: "URL",
@@ -1669,7 +1671,8 @@ var ko_default = {
       addBlock: "\uBE14\uB85D \uCD94\uAC00"
     },
     linkInput: {
-      placeholder: "\uB9C1\uD06C \uBD99\uC5EC\uB123\uAE30 \uB610\uB294 \uC785\uB825..."
+      placeholder: "\uB9C1\uD06C \uBD99\uC5EC\uB123\uAE30 \uB610\uB294 \uC785\uB825...",
+      invalid: "https://example.com\uACFC \uAC19\uC740 \uC62C\uBC14\uB978 \uB9C1\uD06C\uB97C \uC785\uB825\uD574 \uC8FC\uC138\uC694."
     },
     imageInput: {
       urlTab: "URL",
@@ -2096,7 +2099,8 @@ var ja_default = {
       addBlock: "\u30D6\u30ED\u30C3\u30AF\u3092\u8FFD\u52A0"
     },
     linkInput: {
-      placeholder: "\u30EA\u30F3\u30AF\u3092\u8CBC\u308A\u4ED8\u3051\u307E\u305F\u306F\u5165\u529B..."
+      placeholder: "\u30EA\u30F3\u30AF\u3092\u8CBC\u308A\u4ED8\u3051\u307E\u305F\u306F\u5165\u529B...",
+      invalid: "https://example.com \u306E\u3088\u3046\u306A\u6709\u52B9\u306A\u30EA\u30F3\u30AF\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002"
     },
     imageInput: {
       urlTab: "URL",
@@ -27566,6 +27570,32 @@ function isProtocolRelativeUrl(value) {
 function isRelativeUrl(value) {
   return value.startsWith("/") || value.startsWith("./") || value.startsWith("../") || value.startsWith("#");
 }
+function isValidIpv4Hostname(hostname) {
+  const parts = hostname.split(".");
+  return parts.length === 4 && parts.every((part) => /^\d{1,3}$/.test(part) && Number(part) <= 255);
+}
+function isValidWebHostname(hostname) {
+  const normalized = hostname.toLowerCase();
+  if (normalized === "localhost" || isValidIpv4Hostname(normalized)) return true;
+  if (normalized.startsWith("[") && normalized.endsWith("]") && normalized.includes(":")) return true;
+  const labels = normalized.split(".");
+  if (labels.length < 2) return false;
+  const validLabel = /^(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?)$/;
+  return labels.every((label) => validLabel.test(label)) && /[a-z]/.test(labels.at(-1) ?? "");
+}
+function isValidLinkUrl(parsed) {
+  if (parsed.protocol === "http:" || parsed.protocol === "https:") {
+    return isValidWebHostname(parsed.hostname);
+  }
+  if (parsed.protocol === "mailto:") {
+    return /^[^@]+@[^@]+\.[^@]+$/.test(decodeURIComponent(parsed.pathname));
+  }
+  if (parsed.protocol === "tel:") {
+    const number = decodeURIComponent(parsed.pathname);
+    return /^\+?[\d().-]+$/.test(number) && (number.match(/\d/g)?.length ?? 0) >= 3;
+  }
+  return false;
+}
 function isDataImageUrl(value) {
   return /^data:image\/(?:png|jpe?g|gif|webp|svg\+xml|bmp|x-icon|avif);base64,/i.test(value);
 }
@@ -27583,7 +27613,7 @@ function isSafeUEditorUrl(raw, kind) {
     const parsed = new URL(value);
     if (kind === "image") return IMAGE_PROTOCOLS.has(parsed.protocol);
     if (kind === "file") return FILE_PROTOCOLS.has(parsed.protocol);
-    return LINK_PROTOCOLS.has(parsed.protocol);
+    return LINK_PROTOCOLS.has(parsed.protocol) && isValidLinkUrl(parsed);
   } catch {
     return false;
   }
@@ -32379,7 +32409,7 @@ function deleteSelectedImage(editor) {
 }
 
 // src/components/UEditor/inputs.tsx
-import { useEffect as useEffect36, useRef as useRef32, useState as useState48 } from "react";
+import { useEffect as useEffect36, useId as useId15, useRef as useRef32, useState as useState48 } from "react";
 import { Check as Check13, X as X19 } from "lucide-react";
 import { jsx as jsx90, jsxs as jsxs74 } from "react/jsx-runtime";
 function normalizeUrl(raw) {
@@ -32392,7 +32422,9 @@ var LinkInput = ({
 }) => {
   const t = useSmartTranslations("UEditor");
   const [url, setUrl] = useState48(initialUrl);
+  const [error, setError] = useState48("");
   const inputRef = useRef32(null);
+  const errorId = useId15();
   useEffect36(() => {
     inputRef.current?.focus();
     inputRef.current?.select();
@@ -32400,22 +32432,35 @@ var LinkInput = ({
   const handleSubmit = (e) => {
     e.preventDefault();
     const normalized = normalizeUrl(url);
-    if (normalized) onSubmit(normalized);
+    if (!normalized) {
+      setError(t("linkInput.invalid"));
+      return;
+    }
+    setError("");
+    onSubmit(normalized);
   };
-  return /* @__PURE__ */ jsxs74("form", { onSubmit: handleSubmit, className: "flex items-center gap-2 p-2", children: [
-    /* @__PURE__ */ jsx90(
-      "input",
-      {
-        ref: inputRef,
-        type: "text",
-        value: url,
-        onChange: (e) => setUrl(e.target.value),
-        placeholder: t("linkInput.placeholder"),
-        className: "flex-1 px-3 py-2 text-sm bg-muted/50 border-0 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary/20"
-      }
-    ),
-    /* @__PURE__ */ jsx90("button", { type: "submit", className: "p-2 rounded-lg bg-primary text-primary-foreground hover:bg-primary/90 transition-colors", children: /* @__PURE__ */ jsx90(Check13, { className: "w-4 h-4" }) }),
-    /* @__PURE__ */ jsx90("button", { type: "button", onClick: onCancel, className: "p-2 rounded-lg hover:bg-muted transition-colors text-muted-foreground", children: /* @__PURE__ */ jsx90(X19, { className: "w-4 h-4" }) })
+  return /* @__PURE__ */ jsxs74("form", { onSubmit: handleSubmit, className: "p-2", children: [
+    /* @__PURE__ */ jsxs74("div", { className: "flex items-center gap-2", children: [
+      /* @__PURE__ */ jsx90(
+        "input",
+        {
+          ref: inputRef,
+          type: "text",
+          value: url,
+          onChange: (e) => {
+            setUrl(e.target.value);
+            if (error) setError("");
+          },
+          placeholder: t("linkInput.placeholder"),
+          "aria-invalid": Boolean(error),
+          "aria-describedby": error ? errorId : void 0,
+          className: "flex-1 px-3 py-2 text-sm bg-muted/50 border-0 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary/20 aria-invalid:ring-2 aria-invalid:ring-destructive/40"
+        }
+      ),
+      /* @__PURE__ */ jsx90("button", { type: "submit", className: "p-2 rounded-lg bg-primary text-primary-foreground hover:bg-primary/90 transition-colors", children: /* @__PURE__ */ jsx90(Check13, { className: "w-4 h-4" }) }),
+      /* @__PURE__ */ jsx90("button", { type: "button", onClick: onCancel, className: "p-2 rounded-lg hover:bg-muted transition-colors text-muted-foreground", children: /* @__PURE__ */ jsx90(X19, { className: "w-4 h-4" }) })
+    ] }),
+    error ? /* @__PURE__ */ jsx90("p", { id: errorId, role: "alert", className: "mt-1.5 px-1 text-xs text-destructive", children: error }) : null
   ] });
 };
 var ImageInput = ({ onSubmit, onCancel }) => {
@@ -32476,8 +32521,28 @@ var ImageInput = ({ onSubmit, onCancel }) => {
   ] });
 };
 
-// src/components/UEditor/table-cell-commands.ts
+// src/components/UEditor/link-commands.ts
 import { TextSelection as TextSelection2 } from "@tiptap/pm/state";
+function applyEditorLink(editor, href) {
+  const isEditingLink = editor.isActive("link");
+  const hasSelectedText = !editor.state.selection.empty;
+  const chain = editor.chain().focus();
+  if (isEditingLink) {
+    chain.extendMarkRange("link");
+  }
+  chain.setLink({ href });
+  if (!hasSelectedText && !isEditingLink) {
+    chain.insertContent(href);
+  }
+  return chain.command(({ tr }) => {
+    tr.setSelection(TextSelection2.create(tr.doc, tr.selection.to));
+    tr.removeStoredMark(editor.schema.marks.link);
+    return true;
+  }).run();
+}
+
+// src/components/UEditor/table-cell-commands.ts
+import { TextSelection as TextSelection3 } from "@tiptap/pm/state";
 import { selectedRect, TableMap as TableMap2 } from "@tiptap/pm/tables";
 function getCellSelectionPositions(selection) {
   const value = selection;
@@ -32511,7 +32576,7 @@ function getFocusableCellPos(editor, cellPos) {
   return node?.isTextblock ? offset + 1 : cellPos + 1;
 }
 function focusCell(editor, cellPos) {
-  const selection = TextSelection2.near(editor.state.doc.resolve(getFocusableCellPos(editor, cellPos)));
+  const selection = TextSelection3.near(editor.state.doc.resolve(getFocusableCellPos(editor, cellPos)));
   editor.view.dispatch(editor.state.tr.setSelection(selection));
   editor.view.focus();
 }
@@ -33057,7 +33122,7 @@ var EditorToolbar = ({
             {
               initialUrl: String(editor.getAttributes("link").href ?? ""),
               onSubmit: (url) => {
-                editor.chain().focus().extendMarkRange("link").setLink({ href: url }).run();
+                applyEditorLink(editor, url);
                 setShowLinkInput(false);
               },
               onCancel: () => setShowLinkInput(false)
@@ -33294,7 +33359,7 @@ var EditorToolbar = ({
           {
             initialUrl: String(editor.getAttributes("link").href ?? ""),
             onSubmit: (url) => {
-              editor.chain().focus().extendMarkRange("link").setLink({ href: url }).run();
+              applyEditorLink(editor, url);
               setShowLinkInput(false);
             },
             onCancel: () => setShowLinkInput(false)
@@ -33916,7 +33981,7 @@ import {
 } from "lucide-react";
 
 // src/components/UEditor/table-formula-commands.ts
-import { TextSelection as TextSelection3 } from "@tiptap/pm/state";
+import { TextSelection as TextSelection4 } from "@tiptap/pm/state";
 import { selectedRect as selectedRect2, setCellAttr as setCellAttr2, TableMap as TableMap3 } from "@tiptap/pm/tables";
 
 // src/components/UEditor/table-formula.ts
@@ -34532,7 +34597,7 @@ function restoreSelectionAtTableCell(editor, anchor) {
   if (!cellNode || cellNode.type.name !== "tableCell" && cellNode.type.name !== "tableHeader") return false;
   const selectionPos = Math.min(cellPos + 2, editor.state.doc.content.size);
   editor.view.dispatch(
-    editor.state.tr.setSelection(TextSelection3.near(editor.state.doc.resolve(selectionPos))).setMeta("addToHistory", false)
+    editor.state.tr.setSelection(TextSelection4.near(editor.state.doc.resolve(selectionPos))).setMeta("addToHistory", false)
   );
   return true;
 }
@@ -34609,7 +34674,7 @@ function removeSelectedTableCellFormula(editor, clearContent) {
   );
   let transaction = editor.state.tr.replaceWith(selectedCell.cellPos, selectedCell.cellPos + selectedCell.node.nodeSize, nextCell2).setMeta(UEDITOR_TABLE_FORMULA_RECALCULATE_META, true);
   const selectionPos = Math.min(selectedCell.cellPos + 2, transaction.doc.content.size);
-  transaction = transaction.setSelection(TextSelection3.near(transaction.doc.resolve(selectionPos)));
+  transaction = transaction.setSelection(TextSelection4.near(transaction.doc.resolve(selectionPos)));
   editor.view.dispatch(transaction);
   recalculateActiveTableFormulas(editor);
   restoreSelectionAtTableCell(editor, selectedCell);
@@ -35095,7 +35160,7 @@ var BubbleMenuContent = ({
       {
         initialUrl: editor.getAttributes("link").href || "",
         onSubmit: (url) => {
-          editor.chain().focus().extendMarkRange("link").setLink({ href: url }).run();
+          applyEditorLink(editor, url);
           setShowLinkInput(false);
           requestAnimationFrame(() => editor.commands.focus());
         },
@@ -38952,7 +39017,7 @@ var Selection = class {
   found.
   */
   static findFrom($pos, dir, textOnly = false) {
-    let inner = $pos.parent.inlineContent ? new TextSelection4($pos) : findSelectionIn($pos.node(0), $pos.parent, $pos.pos, $pos.index(), dir, textOnly);
+    let inner = $pos.parent.inlineContent ? new TextSelection5($pos) : findSelectionIn($pos.node(0), $pos.parent, $pos.pos, $pos.index(), dir, textOnly);
     if (inner)
       return inner;
     for (let depth = $pos.depth - 1; depth >= 0; depth--) {
@@ -39021,7 +39086,7 @@ var Selection = class {
   returns the bookmark for that.
   */
   getBookmark() {
-    return TextSelection4.between(this.$anchor, this.$head).getBookmark();
+    return TextSelection5.between(this.$anchor, this.$head).getBookmark();
   }
 };
 Selection.prototype.visible = true;
@@ -39041,7 +39106,7 @@ function checkTextSelection($pos) {
     console["warn"]("TextSelection endpoint not pointing into a node with inline content (" + $pos.parent.type.name + ")");
   }
 }
-var TextSelection4 = class _TextSelection extends Selection {
+var TextSelection5 = class _TextSelection extends Selection {
   /**
   Construct a text selection between the given points.
   */
@@ -39127,7 +39192,7 @@ var TextSelection4 = class _TextSelection extends Selection {
     return new _TextSelection($anchor, $head);
   }
 };
-Selection.jsonID("text", TextSelection4);
+Selection.jsonID("text", TextSelection5);
 var TextBookmark = class _TextBookmark {
   constructor(anchor, head) {
     this.anchor = anchor;
@@ -39137,7 +39202,7 @@ var TextBookmark = class _TextBookmark {
     return new _TextBookmark(mapping.map(this.anchor), mapping.map(this.head));
   }
   resolve(doc) {
-    return TextSelection4.between(doc.resolve(this.anchor), doc.resolve(this.head));
+    return TextSelection5.between(doc.resolve(this.anchor), doc.resolve(this.head));
   }
 };
 var NodeSelection2 = class _NodeSelection extends Selection {
@@ -39256,7 +39321,7 @@ var AllBookmark = {
 };
 function findSelectionIn(doc, node, pos, index, dir, text = false) {
   if (node.inlineContent)
-    return TextSelection4.create(doc, pos);
+    return TextSelection5.create(doc, pos);
   for (let i = index - (dir > 0 ? 0 : 1); dir > 0 ? i < node.childCount : i >= 0; i += dir) {
     let child = node.child(i);
     if (!child.isAtom) {
@@ -39848,7 +39913,7 @@ var CellSelection = class CellSelection2 extends Selection {
       else if (tableChanged && this.isColSelection()) return CellSelection2.colSelection($anchorCell, $headCell);
       else return new CellSelection2($anchorCell, $headCell);
     }
-    return TextSelection4.between($anchorCell, $headCell);
+    return TextSelection5.between($anchorCell, $headCell);
   }
   content() {
     const table = this.$anchorCell.node(-1);
@@ -40463,7 +40528,7 @@ function shiftArrow(axis, dir) {
   };
 }
 function atEndOfCell(view, axis, dir) {
-  if (!(view.state.selection instanceof TextSelection4)) return null;
+  if (!(view.state.selection instanceof TextSelection5)) return null;
   const { $head } = view.state.selection;
   for (let d = $head.depth - 1; d >= 0; d--) {
     const parent = $head.node(d);
@@ -42365,7 +42430,7 @@ import { useEffect as useEffect39, useRef as useRef37 } from "react";
 import { TableMap as TableMap6 } from "@tiptap/pm/tables";
 
 // src/components/UEditor/table-formula-range-picker.ts
-import { TextSelection as TextSelection5 } from "@tiptap/pm/state";
+import { TextSelection as TextSelection6 } from "@tiptap/pm/state";
 import { TableMap as TableMap5 } from "@tiptap/pm/tables";
 function getCellText2(cellNode) {
   return cellNode.textBetween(0, cellNode.content.size, "\n").trim();
@@ -42443,7 +42508,7 @@ function cancelFormulaEditing(view) {
   if (!context) return false;
   let tr = view.state.tr.delete(context.cellContentStart, context.cellContentEnd);
   const selectionPos = Math.min(context.cellContentStart, tr.doc.content.size);
-  tr = tr.setSelection(TextSelection5.near(tr.doc.resolve(selectionPos)));
+  tr = tr.setSelection(TextSelection6.near(tr.doc.resolve(selectionPos)));
   view.dispatch(tr);
   view.focus();
   return true;
@@ -42520,7 +42585,7 @@ function replacePickedLabel(view, pickState, nextLabel, currentCell) {
   }
   let tr = view.state.tr.insertText(nextLabel, pickState.insertedFrom, pickState.insertedTo);
   const nextTo = pickState.insertedFrom + nextLabel.length;
-  tr = tr.setSelection(TextSelection5.create(tr.doc, nextTo));
+  tr = tr.setSelection(TextSelection6.create(tr.doc, nextTo));
   view.dispatch(tr);
   return {
     ...pickState,
@@ -42557,7 +42622,7 @@ function beginFormulaRangePick(view, event) {
   const insertedText = `${prefix}${picked.label}`;
   const insertedFrom = from + prefix.length;
   let tr = view.state.tr.insertText(insertedText, from, to);
-  tr = tr.setSelection(TextSelection5.create(tr.doc, from + insertedText.length));
+  tr = tr.setSelection(TextSelection6.create(tr.doc, from + insertedText.length));
   view.dispatch(tr);
   view.focus();
   event.preventDefault();
@@ -43524,7 +43589,7 @@ var MenuBar = ({
     closeInsertMenu();
   };
   const handleLinkSubmit = (url) => {
-    editor.chain().focus().setLink({ href: url }).run();
+    applyEditorLink(editor, url);
     closeInsertMenu();
   };
   const insertMenuItems = [