@godxjp/editor 31.18.0 → 31.20.0

package/README.md

@@ -5,7 +5,7 @@ rendered by [`@godxjp/markdown`](../markdown) (the same sanitiser as the publish
 pasted, dropped or attached through an upload function **the host** provides.
 
 ```bash
-pnpm add @godxjp/editor @godxjp/markdown @godxjp/ui lucide-react
+pnpm add @godxjp/editor @godxjp/markdown @godxjp/ui
 ```
 
 ```tsx
@@ -30,7 +30,9 @@ import { FormField } from "@godxjp/ui/data-entry";
   `readOnly`, its actions stay focusable but do nothing (`aria-disabled`).
 - Files: `upload(file) => Promise<{ url, name? }>`. A placeholder marks each upload and is replaced
   by `![name](url)` (images) or `[name](url)`; a failure removes it and says which file failed.
-  `uploadBlockedReason` refuses files with the host's message. Without `upload`, files are ignored.
+  `uploadBlockedReason` refuses files with the host's message — with or without `upload`: a
+  pasted or dropped file shows it, and the attach button names the reason and shows it when
+  pressed instead of opening the picker. With neither prop, files are left to the browser.
 - Strings come from the kit's catalogue in ja / en / vi; `labels` overrides any of them.
 
 ## Props

package/dist/index.d.ts

@@ -164,7 +164,11 @@ type MarkdownEditorProps = Omit<React.TextareaHTMLAttributes<HTMLTextAreaElement
      * (an app's own storage today, the media service later). Omit it and files are not accepted.
      */
     upload?: (file: File) => Promise<MarkdownEditorUploadResult>;
-    /** When set, files are refused with this message (a quota, a read-only space). */
+    /**
+     * When set, files are refused with this message (a quota, a read-only space) — with or without
+     * `upload`. Pasted / dropped files show it; the attach button carries it in its name and tooltip
+     * and shows it when pressed, instead of opening a file picker whose choice would be refused.
+     */
     uploadBlockedReason?: string | null;
     /** The preview. Default: `<Prose><Markdown>{value}</Markdown></Prose>` from `@godxjp/markdown`. */
     renderPreview?: (value: string) => React.ReactNode;
@@ -197,7 +201,11 @@ declare const MarkdownEditor: React.ForwardRefExoticComponent<Omit<React.Textare
      * (an app's own storage today, the media service later). Omit it and files are not accepted.
      */
     upload?: (file: File) => Promise<MarkdownEditorUploadResult>;
-    /** When set, files are refused with this message (a quota, a read-only space). */
+    /**
+     * When set, files are refused with this message (a quota, a read-only space) — with or without
+     * `upload`. Pasted / dropped files show it; the attach button carries it in its name and tooltip
+     * and shows it when pressed, instead of opening a file picker whose choice would be refused.
+     */
     uploadBlockedReason?: string | null;
     /** The preview. Default: `<Prose><Markdown>{value}</Markdown></Prose>` from `@godxjp/markdown`. */
     renderPreview?: (value: string) => React.ReactNode;

package/dist/index.js

@@ -36,12 +36,29 @@ function wrapSelection(text, { start, end }, before, after, placeholder) {
       select: { start: outerStart, end: outerStart + selected.length }
     };
   }
-  const body = selected || placeholder;
+  if (!selected) {
+    return {
+      from: start,
+      to: end,
+      insert: `${before}${placeholder}${after}`,
+      select: { start: start + before.length, end: start + before.length + placeholder.length }
+    };
+  }
+  const count = (value) => before === after ? value.split(before).length - 1 : 0;
+  let from = start;
+  let to = end;
+  if (text.slice(start - before.length, start) === before && count(text.slice(0, start)) % 2 === 1) {
+    from = start - before.length;
+  }
+  if (text.slice(end, end + after.length) === after && count(text.slice(0, end)) % 2 === 1) {
+    to = end + after.length;
+  }
+  const body = text.slice(from, to).split(before).join("").split(after).join("");
   return {
-    from: start,
-    to: end,
+    from,
+    to,
     insert: `${before}${body}${after}`,
-    select: { start: start + before.length, end: start + before.length + body.length }
+    select: { start: from + before.length, end: from + before.length + body.length }
   };
 }
 function lineRange(text, { start, end }) {
@@ -290,12 +307,14 @@ var MarkdownEditor = React.forwardRef(
     const [uploadError, setUploadError] = React.useState(null);
     const uploadSeq = React.useRef(0);
     const fileInput = React.useRef(null);
+    const takesFiles = Boolean(upload) || Boolean(uploadBlockedReason);
     const acceptFiles = async (files) => {
-      if (!upload || files.length === 0 || !editable) return;
+      if (files.length === 0 || !editable) return;
       if (uploadBlockedReason) {
         setUploadError(uploadBlockedReason);
         return;
       }
+      if (!upload) return;
       setUploadError(null);
       for (const file of files) {
         const placeholder = `![${label("uploading")} ${file.name.replace(/[[\]\\]/g, "")} #${++uploadSeq.current}]()`;
@@ -361,12 +380,14 @@ var MarkdownEditor = React.forwardRef(
       },
       { key: "quote", label: label("quote"), icon: /* @__PURE__ */ jsx(Quote, {}), run: () => lines("> ") }
     ];
-    if (upload) {
+    if (takesFiles) {
       builtIn.push({
         key: "attach",
-        label: label("attach"),
+        // A blocked attach says why in its own name and tooltip, BEFORE anyone opens the picker.
+        label: uploadBlockedReason ? `${label("attach")} \u2014 ${uploadBlockedReason}` : label("attach"),
         icon: /* @__PURE__ */ jsx(Paperclip, {}),
-        run: () => fileInput.current?.click()
+        // …and a press repeats the reason instead of opening a picker whose choice would be refused.
+        run: () => uploadBlockedReason ? setUploadError(uploadBlockedReason) : fileInput.current?.click()
       });
     }
     const all = [...builtIn, ...actions];
@@ -397,7 +418,7 @@ var MarkdownEditor = React.forwardRef(
         onPaste: (event) => {
           onPaste?.(event);
           const files = Array.from(event.clipboardData?.files ?? []);
-          if (!event.defaultPrevented && upload && files.length > 0) {
+          if (!event.defaultPrevented && takesFiles && files.length > 0) {
             event.preventDefault();
             void acceptFiles(files);
           }
@@ -405,7 +426,7 @@ var MarkdownEditor = React.forwardRef(
         onDrop: (event) => {
           onDrop?.(event);
           const files = Array.from(event.dataTransfer?.files ?? []);
-          if (!event.defaultPrevented && upload && files.length > 0) {
+          if (!event.defaultPrevented && takesFiles && files.length > 0) {
             event.preventDefault();
             void acceptFiles(files);
           }
@@ -450,7 +471,7 @@ var MarkdownEditor = React.forwardRef(
         /* @__PURE__ */ jsx("div", { hidden: mode === "preview", children: textarea }),
         mode === "preview" ? preview : null
       ] }),
-      upload ? /* @__PURE__ */ jsx(
+      upload && !uploadBlockedReason ? /* @__PURE__ */ jsx(
         "input",
         {
           ref: fileInput,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@godxjp/editor",
-  "version": "31.18.0",
+  "version": "31.20.0",
   "description": "Markdown editor for GoDX apps: formatting toolbar, write / preview / side by side with @godxjp/markdown, paste / drop / attach through a host upload function, IME-safe, ja / en / vi.",
   "type": "module",
   "main": "./dist/index.js",
@@ -28,10 +28,12 @@
     "directory": "packages/editor"
   },
   "license": "Apache-2.0",
+  "dependencies": {
+    "lucide-react": "^1.37.0"
+  },
   "peerDependencies": {
-    "@godxjp/markdown": "~31.18.0",
-    "@godxjp/ui": "~31.18.0",
-    "lucide-react": ">=1.0.0",
+    "@godxjp/markdown": "~31.20.0",
+    "@godxjp/ui": "~31.20.0",
     "react": ">=19.0.0"
   },
   "keywords": [