@windoc/react 0.2.7 → 0.2.9

package/dist/index.d.mts

@@ -276,8 +276,10 @@ interface EditorProps {
     style?: React$1.CSSProperties;
     /** Enable drag-and-drop badge insertion */
     onDrop?: (e: React$1.DragEvent, editor: EditorInstance) => void;
+    /** Called when cursor/selection style changes — use this instead of overwriting editor.listener.rangeStyleChange via onReady */
+    onRangeStyleChange?: (payload: RangeStylePayload) => void;
 }
-declare function Editor({ defaultValue, options: userOptions, onChange, onReady, toolbar, footer, renderToolbar, renderFooter, children, className, style, onDrop: userOnDrop, }: EditorProps): react_jsx_runtime.JSX.Element;
+declare function Editor({ defaultValue, options: userOptions, onChange, onReady, onRangeStyleChange, toolbar, footer, renderToolbar, renderFooter, children, className, style, onDrop: userOnDrop, }: EditorProps): react_jsx_runtime.JSX.Element;
 
 interface EditorContextValue {
     editorRef: MutableRefObject<EditorInstance | null>;

package/dist/index.d.ts

@@ -276,8 +276,10 @@ interface EditorProps {
     style?: React$1.CSSProperties;
     /** Enable drag-and-drop badge insertion */
     onDrop?: (e: React$1.DragEvent, editor: EditorInstance) => void;
+    /** Called when cursor/selection style changes — use this instead of overwriting editor.listener.rangeStyleChange via onReady */
+    onRangeStyleChange?: (payload: RangeStylePayload) => void;
 }
-declare function Editor({ defaultValue, options: userOptions, onChange, onReady, toolbar, footer, renderToolbar, renderFooter, children, className, style, onDrop: userOnDrop, }: EditorProps): react_jsx_runtime.JSX.Element;
+declare function Editor({ defaultValue, options: userOptions, onChange, onReady, onRangeStyleChange, toolbar, footer, renderToolbar, renderFooter, children, className, style, onDrop: userOnDrop, }: EditorProps): react_jsx_runtime.JSX.Element;
 
 interface EditorContextValue {
     editorRef: MutableRefObject<EditorInstance | null>;

package/dist/index.js

@@ -310,8 +310,14 @@ function TitleTool() {
 var import_react6 = require("react");
 var import_jsx_runtime8 = require("react/jsx-runtime");
 var FONTS = [
-  { family: "Arial", label: "Sans Serif" },
-  { family: "Times New Roman", label: "Serif" }
+  { family: "Arial", label: "Arial" },
+  { family: "Times New Roman", label: "Times New Roman" },
+  { family: "Georgia", label: "Georgia" },
+  { family: "Verdana", label: "Verdana" },
+  { family: "Trebuchet MS", label: "Trebuchet MS" },
+  { family: "Courier New", label: "Courier New" },
+  { family: "Comic Sans MS", label: "Comic Sans MS" },
+  { family: "Impact", label: "Impact" }
 ];
 function FontTool() {
   const { editorRef, rangeStyle } = useEditor();
@@ -340,11 +346,11 @@ function FontTool() {
 // src/toolbar/FontSizeTool.tsx
 var import_react7 = require("react");
 var import_jsx_runtime9 = require("react/jsx-runtime");
-var SIZES = [56, 48, 34, 32, 29, 24, 21, 20, 18, 16, 14, 12, 10, 8];
+var SIZES = [72, 48, 36, 24, 20, 18, 16, 14, 12, 11, 10, 9, 8];
 function FontSizeTool() {
   const { editorRef, rangeStyle } = useEditor();
   const optionsRef = (0, import_react7.useRef)(null);
-  const activeSize = rangeStyle?.size ?? 16;
+  const activeSize = rangeStyle?.size ?? 11;
   const handleSize = (size) => {
     editorRef.current?.command.executeSize(size);
   };
@@ -1029,6 +1035,7 @@ function PaperDirectionTool() {
 }
 
 // src/footer/PaperMarginTool.tsx
+var import_core = require("@windoc/core");
 var import_jsx_runtime36 = require("react/jsx-runtime");
 function PaperMarginTool() {
   const { editorRef } = useEditor();
@@ -1039,10 +1046,10 @@ function PaperMarginTool() {
     new Dialog({
       title: "Page Margins",
       data: [
-        { type: "text", label: "Top Margin", name: "top", required: true, value: `${topMargin}`, placeholder: "Please enter top margin" },
-        { type: "text", label: "Bottom Margin", name: "bottom", required: true, value: `${bottomMargin}`, placeholder: "Please enter bottom margin" },
-        { type: "text", label: "Left Margin", name: "left", required: true, value: `${leftMargin}`, placeholder: "Please enter left margin" },
-        { type: "text", label: "Right Margin", name: "right", required: true, value: `${rightMargin}`, placeholder: "Please enter right margin" }
+        { type: "text", label: "Top Margin (cm)", name: "top", required: true, value: `${(0, import_core.pxToCm)(topMargin)}`, placeholder: "e.g. 2.54" },
+        { type: "text", label: "Bottom Margin (cm)", name: "bottom", required: true, value: `${(0, import_core.pxToCm)(bottomMargin)}`, placeholder: "e.g. 2.54" },
+        { type: "text", label: "Left Margin (cm)", name: "left", required: true, value: `${(0, import_core.pxToCm)(leftMargin)}`, placeholder: "e.g. 2.54" },
+        { type: "text", label: "Right Margin (cm)", name: "right", required: true, value: `${(0, import_core.pxToCm)(rightMargin)}`, placeholder: "e.g. 2.54" }
       ],
       onConfirm: (payload) => {
         const top = payload.find((p) => p.name === "top")?.value;
@@ -1054,10 +1061,10 @@ function PaperMarginTool() {
         const right = payload.find((p) => p.name === "right")?.value;
         if (!right) return;
         editorRef.current?.command.executeSetPaperMargin([
-          Number(top),
-          Number(right),
-          Number(bottom),
-          Number(left)
+          (0, import_core.cmToPx)(Number(top)),
+          (0, import_core.cmToPx)(Number(right)),
+          (0, import_core.cmToPx)(Number(bottom)),
+          (0, import_core.cmToPx)(Number(left))
         ]);
       }
     });
@@ -1220,85 +1227,95 @@ function WatermarkFooterTool() {
   };
   return /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "watermark-footer", ref: containerRef, onClick: () => setVisible(!visible), children: [
     /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("i", { title: "Watermark" }),
-    visible && /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "watermark-footer-panel", ref: panelRef, onClick: (e) => e.stopPropagation(), children: [
-      /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "wm-panel-tabs", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("button", { className: `wm-panel-tab ${tab === "text" ? "active" : ""}`, onClick: () => setTab("text"), children: "Text" }),
-        /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("button", { className: `wm-panel-tab ${tab === "image" ? "active" : ""}`, onClick: () => setTab("image"), children: "Image" })
-      ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "wm-panel-body", children: [
-        tab === "text" ? /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(import_jsx_runtime39.Fragment, { children: [
-          /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "wm-panel-field", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("label", { children: "Text" }),
-            /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("input", { type: "text", value: text, onChange: (e) => setText(e.target.value), placeholder: "Watermark text" })
+    visible && /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(import_jsx_runtime39.Fragment, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: "wm-panel-mask", onClick: (e) => {
+        e.stopPropagation();
+        setVisible(false);
+      } }),
+      /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "watermark-footer-panel", ref: panelRef, onClick: (e) => e.stopPropagation(), children: [
+        /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "wm-panel-title", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("span", { children: "Watermark" }),
+          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("i", { onClick: () => setVisible(false) })
+        ] }),
+        /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "wm-panel-tabs", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("button", { className: `wm-panel-tab ${tab === "text" ? "active" : ""}`, onClick: () => setTab("text"), children: "Text" }),
+          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("button", { className: `wm-panel-tab ${tab === "image" ? "active" : ""}`, onClick: () => setTab("image"), children: "Image" })
+        ] }),
+        /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "wm-panel-body", children: [
+          tab === "text" ? /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(import_jsx_runtime39.Fragment, { children: [
+            /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "wm-panel-field", children: [
+              /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("label", { children: "Text" }),
+              /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("input", { type: "text", value: text, onChange: (e) => setText(e.target.value), placeholder: "Watermark text" })
+            ] }),
+            /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "wm-panel-field", children: [
+              /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("label", { children: "Font" }),
+              /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("select", { value: font, onChange: (e) => setFont(e.target.value), children: FONTS2.map((f) => /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("option", { value: f.family, children: f.label }, f.family)) })
+            ] }),
+            /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "wm-panel-field", children: [
+              /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("label", { children: "Color" }),
+              /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: "wm-panel-colors", children: COLOR_PALETTE2.flat().map((c) => /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+                "div",
+                {
+                  className: `wm-panel-color ${color.toLowerCase() === c.toLowerCase() ? "active" : ""}`,
+                  style: { backgroundColor: c },
+                  onClick: () => setColor(c)
+                },
+                c
+              )) })
+            ] })
+          ] }) : /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(import_jsx_runtime39.Fragment, { children: [
+            /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "wm-panel-field", children: [
+              /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("label", { children: "Image" }),
+              /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { style: { display: "flex", alignItems: "center", gap: "6px" }, children: [
+                /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("button", { className: "wm-panel-upload", onClick: () => fileInputRef.current?.click(), children: "Choose File" }),
+                /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("input", { ref: fileInputRef, type: "file", accept: "image/*", style: { display: "none" }, onChange: handleFileUpload }),
+                imageData && /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("span", { style: { fontSize: "11px", color: "#667085" }, children: "Loaded" })
+              ] })
+            ] }),
+            imageData && /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: "wm-panel-field", children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: "wm-panel-preview", children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("img", { src: imageData, alt: "preview", style: { maxWidth: "100%", maxHeight: "48px", objectFit: "contain" } }) }) }),
+            /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "wm-panel-field-row", children: [
+              /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "wm-panel-field wm-panel-field-half", children: [
+                /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("label", { children: "W" }),
+                /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("input", { type: "number", value: imgWidth, min: 10, onChange: (e) => setImgWidth(Number(e.target.value)) })
+              ] }),
+              /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "wm-panel-field wm-panel-field-half", children: [
+                /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("label", { children: "H" }),
+                /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("input", { type: "number", value: imgHeight, min: 10, onChange: (e) => setImgHeight(Number(e.target.value)) })
+              ] })
+            ] })
           ] }),
           /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "wm-panel-field", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("label", { children: "Font" }),
-            /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("select", { value: font, onChange: (e) => setFont(e.target.value), children: FONTS2.map((f) => /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("option", { value: f.family, children: f.label }, f.family)) })
+            /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("label", { children: [
+              "Opacity ",
+              /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("span", { className: "wm-panel-value", children: [
+                opacity,
+                "%"
+              ] })
+            ] }),
+            /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("input", { type: "range", min: 0, max: 100, value: opacity, onChange: (e) => setOpacity(Number(e.target.value)), className: "wm-panel-slider" })
           ] }),
           /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "wm-panel-field", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("label", { children: "Color" }),
-            /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: "wm-panel-colors", children: COLOR_PALETTE2.flat().map((c) => /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
-              "div",
-              {
-                className: `wm-panel-color ${color.toLowerCase() === c.toLowerCase() ? "active" : ""}`,
-                style: { backgroundColor: c },
-                onClick: () => setColor(c)
-              },
-              c
-            )) })
-          ] })
-        ] }) : /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(import_jsx_runtime39.Fragment, { children: [
-          /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "wm-panel-field", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("label", { children: "Image" }),
-            /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { style: { display: "flex", alignItems: "center", gap: "6px" }, children: [
-              /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("button", { className: "wm-panel-upload", onClick: () => fileInputRef.current?.click(), children: "Choose File" }),
-              /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("input", { ref: fileInputRef, type: "file", accept: "image/*", style: { display: "none" }, onChange: handleFileUpload }),
-              imageData && /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("span", { style: { fontSize: "11px", color: "#667085" }, children: "Loaded" })
-            ] })
-          ] }),
-          imageData && /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: "wm-panel-field", children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("div", { className: "wm-panel-preview", children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("img", { src: imageData, alt: "preview", style: { maxWidth: "100%", maxHeight: "48px", objectFit: "contain" } }) }) }),
-          /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "wm-panel-field-row", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "wm-panel-field wm-panel-field-half", children: [
-              /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("label", { children: "W" }),
-              /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("input", { type: "number", value: imgWidth, min: 10, onChange: (e) => setImgWidth(Number(e.target.value)) })
+            /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("label", { children: [
+              "Rotation ",
+              /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("span", { className: "wm-panel-value", children: [
+                rotation,
+                "\xB0"
+              ] })
             ] }),
-            /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "wm-panel-field wm-panel-field-half", children: [
-              /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("label", { children: "H" }),
-              /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("input", { type: "number", value: imgHeight, min: 10, onChange: (e) => setImgHeight(Number(e.target.value)) })
-            ] })
-          ] })
-        ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "wm-panel-field", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("label", { children: [
-            "Opacity ",
-            /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("span", { className: "wm-panel-value", children: [
-              opacity,
-              "%"
-            ] })
+            /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("input", { type: "range", min: -90, max: 90, value: rotation, onChange: (e) => setRotation(Number(e.target.value)), className: "wm-panel-slider" })
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("input", { type: "range", min: 0, max: 100, value: opacity, onChange: (e) => setOpacity(Number(e.target.value)), className: "wm-panel-slider" })
-        ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "wm-panel-field", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("label", { children: [
-            "Rotation ",
-            /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("span", { className: "wm-panel-value", children: [
-              rotation,
-              "\xB0"
+          /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "wm-panel-field", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("label", { children: "Position" }),
+            /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "wm-panel-toggle", children: [
+              /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("button", { className: !inFront ? "active" : "", onClick: () => setInFront(false), children: "Behind" }),
+              /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("button", { className: inFront ? "active" : "", onClick: () => setInFront(true), children: "In Front" })
             ] })
-          ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("input", { type: "range", min: -90, max: 90, value: rotation, onChange: (e) => setRotation(Number(e.target.value)), className: "wm-panel-slider" })
-        ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "wm-panel-field", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("label", { children: "Position" }),
-          /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "wm-panel-toggle", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("button", { className: !inFront ? "active" : "", onClick: () => setInFront(false), children: "Behind" }),
-            /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("button", { className: inFront ? "active" : "", onClick: () => setInFront(true), children: "In Front" })
           ] })
+        ] }),
+        /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "wm-panel-actions", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("button", { className: "wm-panel-btn-delete", onClick: handleDelete, children: "Remove" }),
+          /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("button", { className: "wm-panel-btn-apply", onClick: handleApply, children: "Apply" })
         ] })
-      ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)("div", { className: "wm-panel-actions", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("button", { className: "wm-panel-btn-delete", onClick: handleDelete, children: "Remove" }),
-        /* @__PURE__ */ (0, import_jsx_runtime39.jsx)("button", { className: "wm-panel-btn-apply", onClick: handleApply, children: "Apply" })
       ] })
     ] })
   ] });
@@ -1335,6 +1352,7 @@ function Editor({
   options: userOptions,
   onChange,
   onReady,
+  onRangeStyleChange,
   toolbar = true,
   footer = true,
   renderToolbar,
@@ -1351,6 +1369,7 @@ function Editor({
       options: userOptions,
       onChange,
       onReady,
+      onRangeStyleChange,
       toolbar,
       footer,
       renderToolbar,
@@ -1367,6 +1386,7 @@ function EditorInner({
   options: userOptions,
   onChange,
   onReady,
+  onRangeStyleChange,
   toolbar = true,
   footer = true,
   renderToolbar,
@@ -1410,6 +1430,7 @@ function EditorInner({
       editorRef.current = instance;
       instance.listener.rangeStyleChange = (payload) => {
         setRangeStyle(payload);
+        onRangeStyleChange?.(payload);
         const rangeContext = instance?.command.getRangeContext();
         if (rangeContext) {
           setRowNo(rangeContext.startRowNo + 1);
@@ -1501,7 +1522,9 @@ function EditorInner({
       ]);
       const closeDropdowns = (evt) => {
         const visibleDom = document.querySelector(".visible");
-        if (!visibleDom || visibleDom.contains(evt.target)) return;
+        if (!visibleDom) return;
+        const parent = visibleDom.parentElement;
+        if (parent && parent.contains(evt.target)) return;
         visibleDom.classList.remove("visible");
       };
       window.addEventListener("click", closeDropdowns, { capture: true });