@superdoc-dev/cli 0.3.0-next.4 → 0.3.0-next.6

package/dist/index.js

@@ -131315,7 +131315,7 @@ var init_remark_gfm_CjV8kaUy_es = __esm(() => {
   init_remark_gfm_z_sDF4ss_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-CcGVOrgc.es.js
+// ../../packages/superdoc/dist/chunks/src-CIT7og3M.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -189822,6 +189822,13 @@ function scrollToElement(targetElement, options = {
     behavior: options.behavior
   });
 }
+function getParagraphFontFamilyFromProperties(paragraphProps, convertedXml = {}) {
+  const fontFamilyProps = paragraphProps?.runProperties?.fontFamily;
+  if (!fontFamilyProps)
+    return null;
+  const [markDef] = encodeMarksFromRPr({ fontFamily: fontFamilyProps }, convertedXml);
+  return markDef?.attrs?.fontFamily ?? null;
+}
 var Node$13 = class Node$14 {
   constructor(config2) {
     this.type = "node";
@@ -217740,7 +217747,7 @@ var Node$13 = class Node$14 {
     return false;
   return Boolean(checker(attrs));
 }, SuperToolbar, ICONS, TEXTS, tableActionsOptions;
-var init_src_CcGVOrgc_es = __esm(() => {
+var init_src_CIT7og3M_es = __esm(() => {
   init_rolldown_runtime_B2q5OVn9_es();
   init_SuperConverter_C2Sw7Q5Z_es();
   init_jszip_ChlR43oI_es();
@@ -236794,6 +236801,7 @@ function print() { __p += __j.call(arguments, '') }
     #errorBannerMessage = null;
     #renderScheduled = false;
     #pendingDocChange = false;
+    #focusScrollRafId = null;
     #pendingMapping = null;
     #isRerendering = false;
     #selectionSync = new SelectionSyncCoordinator;
@@ -237117,6 +237125,13 @@ function print() { __p += __j.call(arguments, '') }
           }
         if (win.scrollX !== beforeX || win.scrollY !== beforeY)
           win.scrollTo(beforeX, beforeY);
+        if (this.#focusScrollRafId != null)
+          win.cancelAnimationFrame(this.#focusScrollRafId);
+        this.#focusScrollRafId = win.requestAnimationFrame(() => {
+          this.#focusScrollRafId = null;
+          if (win.scrollX !== beforeX || win.scrollY !== beforeY)
+            win.scrollTo(beforeX, beforeY);
+        });
       };
     }
     get editor() {
@@ -237795,6 +237810,12 @@ function print() { __p += __j.call(arguments, '') }
       return null;
     }
     scrollToPosition(pos, options = {}) {
+      if (this.#focusScrollRafId != null) {
+        const win = this.#visibleHost.ownerDocument?.defaultView;
+        if (win)
+          win.cancelAnimationFrame(this.#focusScrollRafId);
+        this.#focusScrollRafId = null;
+      }
       const doc$2 = this.getActiveEditor()?.state?.doc;
       if (!doc$2)
         return false;
@@ -238012,6 +238033,11 @@ function print() { __p += __j.call(arguments, '') }
           (this.#visibleHost?.ownerDocument?.defaultView ?? window).cancelAnimationFrame(this.#rafHandle);
           this.#rafHandle = null;
         }, "Layout RAF");
+      if (this.#focusScrollRafId != null)
+        safeCleanup(() => {
+          (this.#visibleHost?.ownerDocument?.defaultView ?? window).cancelAnimationFrame(this.#focusScrollRafId);
+          this.#focusScrollRafId = null;
+        }, "Focus scroll RAF");
       if (this.#decorationSyncRafHandle != null)
         safeCleanup(() => {
           (this.#visibleHost?.ownerDocument?.defaultView ?? window).cancelAnimationFrame(this.#decorationSyncRafHandle);
@@ -250784,13 +250810,19 @@ function print() { __p += __j.call(arguments, '') }
       const restoreSelection$1 = () => {
         proxy.$toolbar.activeEditor?.commands?.restoreSelection();
       };
+      const handleToolbarMousedown = (e) => {
+        if (e.target.closest('input, textarea, [contenteditable="true"]'))
+          return;
+        e.preventDefault();
+      };
       return (_ctx, _cache) => {
         return openBlock(), createElementBlock("div", {
           class: "superdoc-toolbar",
           key: unref(toolbarKey),
           role: "toolbar",
           "aria-label": "Toolbar",
-          "data-editor-ui-surface": ""
+          "data-editor-ui-surface": "",
+          onMousedown: handleToolbarMousedown
         }, [
           unref(showLeftSide) ? (openBlock(), createBlock(ButtonGroup_default, {
             key: 0,
@@ -250825,10 +250857,10 @@ function print() { __p += __j.call(arguments, '') }
             onItemClicked: restoreSelection$1,
             class: "superdoc-toolbar-group-side"
           }, null, 8, ["toolbar-items", "ui-font-family"])) : createCommentVNode("", true)
-        ]);
+        ], 32);
       };
     }
-  }, [["__scopeId", "data-v-6f41d6bf"]]);
+  }, [["__scopeId", "data-v-e0242a18"]]);
   toolbarTexts = {
     bold: "Bold",
     fontFamily: "Font",
@@ -251352,8 +251384,12 @@ function print() { __p += __j.call(arguments, '') }
       const inTable = isInTable(this.activeEditor.state);
       const paragraphParent = findParentNode((n) => n.type.name === "paragraph")(selection);
       const paragraphProps = paragraphParent ? calculateResolvedParagraphProperties(this.activeEditor, paragraphParent.node, state.doc.resolve(paragraphParent.pos)) : null;
+      const selectionIsCollapsed = selection.empty;
+      const paragraphIsEmpty = paragraphParent?.node?.content?.size === 0;
+      const paragraphFontFamily = getParagraphFontFamilyFromProperties(paragraphProps, this.activeEditor?.converter?.convertedXml ?? {});
       this.toolbarItems.forEach((item) => {
         item.resetDisabled();
+        let activatedFromLinkedStyle = false;
         if (item.name.value === "undo")
           item.setDisabled(this.undoDepth === 0);
         if (item.name.value === "redo")
@@ -251390,10 +251426,13 @@ function print() { __p += __j.call(arguments, '') }
             const linkedStylesItem = linkedStyles.definition.styles[markToStyleMap[item.name.value]];
             const value = { [item.name.value]: linkedStylesItem };
             item.activate(value);
+            activatedFromLinkedStyle = true;
           }
         }
         if (item.name.value === "textAlign" && paragraphProps?.justification)
           item.activate({ textAlign: paragraphProps.justification });
+        if (item.name.value === "fontFamily" && selectionIsCollapsed && paragraphIsEmpty && !activeMark && !markNegated && !activatedFromLinkedStyle && paragraphFontFamily)
+          item.activate({ fontFamily: paragraphFontFamily });
         if (item.name.value === "lineHeight")
           if (paragraphProps?.spacing)
             item.selectedValue.value = twipsToLines(paragraphProps.spacing.line);
@@ -251836,7 +251875,7 @@ var init_zipper_DqXT7uTa_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_CcGVOrgc_es();
+  init_src_CIT7og3M_es();
   init_SuperConverter_C2Sw7Q5Z_es();
   init_jszip_ChlR43oI_es();
   init_xml_js_BtmJ6bNs_es();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.3.0-next.4",
+  "version": "0.3.0-next.6",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -21,20 +21,20 @@
     "@types/node": "22.19.2",
     "typescript": "^5.9.2",
     "@superdoc/document-api": "0.0.1",
-    "@superdoc/super-editor": "0.0.1",
     "@superdoc/pm-adapter": "0.0.0",
-    "superdoc": "1.19.0"
+    "superdoc": "1.19.0",
+    "@superdoc/super-editor": "0.0.1"
   },
   "module": "src/index.ts",
   "publishConfig": {
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-arm64": "0.3.0-next.4",
-    "@superdoc-dev/cli-darwin-x64": "0.3.0-next.4",
-    "@superdoc-dev/cli-windows-x64": "0.3.0-next.4",
-    "@superdoc-dev/cli-linux-arm64": "0.3.0-next.4",
-    "@superdoc-dev/cli-linux-x64": "0.3.0-next.4"
+    "@superdoc-dev/cli-darwin-arm64": "0.3.0-next.6",
+    "@superdoc-dev/cli-linux-x64": "0.3.0-next.6",
+    "@superdoc-dev/cli-darwin-x64": "0.3.0-next.6",
+    "@superdoc-dev/cli-linux-arm64": "0.3.0-next.6",
+    "@superdoc-dev/cli-windows-x64": "0.3.0-next.6"
   },
   "scripts": {
     "dev": "bun run src/index.ts",