@superdoc-dev/cli 0.17.0-next.41 → 0.17.0-next.42

package/dist/index.js

@@ -68164,7 +68164,7 @@ var init_remark_gfm_BUJjZJLy_es = __esm(() => {
   emptyOptions2 = {};
 });
 
-// ../../packages/superdoc/dist/chunks/SuperConverter--x_mSI6o.es.js
+// ../../packages/superdoc/dist/chunks/SuperConverter-DRKaQwZS.es.js
 function getExtensionConfigField(extension$1, field, context = { name: "" }) {
   const fieldValue = extension$1.config[field];
   if (typeof fieldValue === "function")
@@ -90006,6 +90006,7 @@ function getFormattingStateAtPos(state, pos, editor, options = {}) {
   const context = getParagraphRunContext($pos, editor);
   const currentRunProperties = context?.runProperties || null;
   const cursorMarks = $pos.marks();
+  const directMarkRunProperties = decodeRPrFromMarks(cursorMarks);
   const hasStoredMarks = storedMarks !== null;
   const hasExplicitEmptyStoredMarks = hasStoredMarks && storedMarks.length === 0;
   const resolvedMarks = [];
@@ -90033,7 +90034,9 @@ function getFormattingStateAtPos(state, pos, editor, options = {}) {
       inlineMarks: [],
       resolvedRunProperties: {},
       inlineRunProperties: {},
-      styleRunProperties: {}
+      styleRunProperties: {},
+      directMarkRunProperties: {},
+      mixedRunProperties: null
     };
   const resolvedFromSelection = getInheritedRunProperties($pos, editor, preferParagraphRunProperties || !hasStoredMarks && context?.isEmpty ? context?.paragraphAttrs?.paragraphProperties?.runProperties || null : inlineRunProperties);
   const resolvedRunProperties = resolvedFromSelection?.resolvedRunProperties ?? inlineRunProperties;
@@ -90047,7 +90050,9 @@ function getFormattingStateAtPos(state, pos, editor, options = {}) {
     inlineMarks,
     resolvedRunProperties,
     inlineRunProperties,
-    styleRunProperties
+    styleRunProperties,
+    directMarkRunProperties,
+    mixedRunProperties: null
   };
 }
 function getFormattingStateForRange(state, from4, to, editor) {
@@ -90067,9 +90072,14 @@ function getFormattingStateForRange(state, from4, to, editor) {
   return aggregateFormattingSegments(state, editor, segments);
 }
 function aggregateFormattingSegments(state, editor, segments) {
-  const resolvedRunProperties = intersectRunProperties(segments.map((segment) => segment.resolvedRunProperties));
-  const inlineRunProperties = intersectRunProperties(segments.map((segment) => segment.inlineRunProperties));
-  const styleRunProperties = intersectRunProperties(segments.map((segment) => segment.styleRunProperties));
+  const resolvedRunPropertiesList = segments.map((segment) => segment.resolvedRunProperties);
+  const inlineRunPropertiesList = segments.map((segment) => segment.inlineRunProperties);
+  const styleRunPropertiesList = segments.map((segment) => segment.styleRunProperties);
+  const directMarkRunPropertiesList = segments.map((segment) => segment.directMarkRunProperties);
+  const resolvedRunProperties = intersectRunProperties(resolvedRunPropertiesList);
+  const inlineRunProperties = intersectRunProperties(inlineRunPropertiesList);
+  const styleRunProperties = intersectRunProperties(styleRunPropertiesList);
+  const directMarkRunProperties = intersectRunProperties(directMarkRunPropertiesList);
   const resolvedMarks = createMarksFromRunProperties(state, resolvedRunProperties, editor);
   const inlineMarks = createMarksFromRunProperties(state, inlineRunProperties, editor);
   return {
@@ -90077,7 +90087,9 @@ function aggregateFormattingSegments(state, editor, segments) {
     inlineMarks,
     resolvedRunProperties,
     inlineRunProperties,
-    styleRunProperties
+    styleRunProperties,
+    directMarkRunProperties,
+    mixedRunProperties: getMixedRunProperties(resolvedRunPropertiesList, directMarkRunPropertiesList)
   };
 }
 function mergeResolvedMarksWithInlineFallback(resolvedMarks, inlineMarks) {
@@ -90102,6 +90114,41 @@ function intersectRunProperties(runPropertiesList) {
   });
   return Object.keys(intersection).length ? intersection : null;
 }
+function getMixedRunProperties(runPropertiesList, directRunPropertiesList = []) {
+  const filtered = runPropertiesList.filter((props) => props && typeof props === "object");
+  if (filtered.length <= 1)
+    return null;
+  const keys$1 = new Set(filtered.flatMap((props) => Object.keys(props)));
+  const mixed = {};
+  keys$1.forEach((key) => {
+    if (key === "fontFamily" && hasUniformDirectFontFamily(directRunPropertiesList))
+      return;
+    const values = filtered.map((props) => Object.prototype.hasOwnProperty.call(props, key) ? props[key] : undefined);
+    const first = JSON.stringify(values[0]);
+    if (values.some((value) => JSON.stringify(value) !== first))
+      mixed[key] = true;
+  });
+  return Object.keys(mixed).length ? mixed : null;
+}
+function hasUniformDirectFontFamily(runPropertiesList) {
+  if (runPropertiesList.length <= 1)
+    return false;
+  let firstValue;
+  let hasFirstValue = false;
+  for (const props of runPropertiesList) {
+    if (!props || typeof props !== "object" || !Object.prototype.hasOwnProperty.call(props, "fontFamily"))
+      return false;
+    const value = props.fontFamily;
+    if (!hasFirstValue) {
+      firstValue = value;
+      hasFirstValue = true;
+      continue;
+    }
+    if (JSON.stringify(value) !== JSON.stringify(firstValue))
+      return false;
+  }
+  return hasFirstValue;
+}
 function getInheritedRunProperties($pos, editor, inlineRunProperties) {
   if (!editor)
     return {
@@ -136401,7 +136448,7 @@ Docs: https://docs.superdoc.dev/getting-started/fonts`);
       state.kern = kernNode.attributes["w:val"];
   }
 }, SuperConverter;
-var init_SuperConverter_x_mSI6o_es = __esm(() => {
+var init_SuperConverter_DRKaQwZS_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
@@ -165327,7 +165374,7 @@ var init_SuperConverter_x_mSI6o_es = __esm(() => {
   };
 });
 
-// ../../packages/superdoc/dist/chunks/create-headless-toolbar-D1KbRv5B.es.js
+// ../../packages/superdoc/dist/chunks/create-headless-toolbar-ChACxHAH.es.js
 function parseSizeUnit(val = "0") {
   const length3 = val.toString() || "0";
   const value = Number.parseFloat(length3);
@@ -175292,6 +175339,14 @@ var CSS_DIMENSION_REGEX, DOM_SIZE_UNITS, MARK_KEYS, STEP_OP_CATALOG_UNFROZEN2, P
   if (!rawActiveMark || !hasFormattingAttrs(rawActiveMark))
     return false;
   return isNegatedMark(rawActiveMark.name, rawActiveMark.attrs);
+}, getPrimaryFontFamily = (value) => {
+  if (typeof value === "string")
+    return value.split(",")[0].trim();
+  if (!value || typeof value !== "object")
+    return null;
+  const fontFamily = value;
+  const primary = fontFamily.ascii ?? fontFamily.hAnsi ?? fontFamily.eastAsia ?? fontFamily.cs;
+  return typeof primary === "string" ? primary.split(",")[0].trim() : null;
 }, isFormatCommandsStorage = (value) => {
   return typeof value === "object" && value !== null && "storedStyle" in value;
 }, hasStoredCopyFormat = (context) => {
@@ -175384,15 +175439,20 @@ var CSS_DIMENSION_REGEX, DOM_SIZE_UNITS, MARK_KEYS, STEP_OP_CATALOG_UNFROZEN2, P
       disabled: true,
       value: null
     };
-  const normalizedValues = getFormattingAttr(formatting, "fontFamily", "fontFamily").map((value$1) => normalizeFontFamilyValue(value$1));
+  const values = getFormattingAttr(formatting, "fontFamily", "fontFamily");
+  const selectionFormattingState = stateEditor?.state?.selection?.empty === false ? getSelectionFormattingState(stateEditor.state, stateEditor) : null;
+  const normalizedValues = values.map((value$1) => normalizeFontFamilyValue(value$1));
   const uniqueValues = [...new Set(normalizedValues)];
-  const canUseLinkedStyle = !(uniqueValues.length > 0) && isFormattingActivatedFromLinkedStyle(context, "font-family");
+  const hasDirectValue = uniqueValues.length > 0;
+  const hasMixedFontFamily = Boolean(selectionFormattingState?.mixedRunProperties?.fontFamily);
+  const directSelectionValue = normalizeFontFamilyValue(getPrimaryFontFamily(selectionFormattingState?.directMarkRunProperties?.fontFamily));
+  const canUseLinkedStyle = !hasDirectValue && !hasMixedFontFamily && isFormattingActivatedFromLinkedStyle(context, "font-family");
   const paragraphProps = canUseLinkedStyle ? getCurrentResolvedParagraphProperties(context) : null;
   const documentEditor = context?.presentationEditor?.editor ?? context?.editor ?? null;
   const linkedStyleValue = normalizeFontFamilyValue((canUseLinkedStyle ? documentEditor?.converter?.linkedStyles?.find((style) => style.id === paragraphProps?.styleId) : null)?.definition?.styles?.["font-family"]) ?? null;
-  const value = uniqueValues.length === 1 ? uniqueValues[0] : linkedStyleValue;
+  const value = hasMixedFontFamily ? null : directSelectionValue || (uniqueValues.length === 1 ? uniqueValues[0] : linkedStyleValue);
   return {
-    active: uniqueValues.length > 0 || linkedStyleValue != null,
+    active: hasMixedFontFamily || uniqueValues.length > 0 || directSelectionValue != null || linkedStyleValue != null,
     disabled: false,
     value
   };
@@ -176117,9 +176177,9 @@ var CSS_DIMENSION_REGEX, DOM_SIZE_UNITS, MARK_KEYS, STEP_OP_CATALOG_UNFROZEN2, P
     }
   };
 };
-var init_create_headless_toolbar_D1KbRv5B_es = __esm(() => {
+var init_create_headless_toolbar_ChACxHAH_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
-  init_SuperConverter_x_mSI6o_es();
+  init_SuperConverter_DRKaQwZS_es();
   init_jszip_C49i9kUs_es();
   init_uuid_B2wVPhPi_es();
   init_constants_D9qj59G2_es();
@@ -226212,7 +226272,7 @@ var init_remark_gfm_DCND_V_3_es = __esm(() => {
   init_remark_gfm_BUJjZJLy_es();
 });
 
-// ../../packages/superdoc/dist/chunks/src-Fy-l94Cn.es.js
+// ../../packages/superdoc/dist/chunks/src-ly1ZYfUZ.es.js
 function deleteProps(obj, propOrProps) {
   const props = typeof propOrProps === "string" ? [propOrProps] : propOrProps;
   const removeNested = (target, pathParts, index2 = 0) => {
@@ -303010,7 +303070,12 @@ var Node$13 = class Node$14 {
     suppressActiveHighlight: true,
     attributes: { ariaLabel: "Font family" },
     options: fontOptions,
-    onActivate: ({ fontFamily }) => {
+    onActivate: ({ fontFamily } = {}, isMultiple = false) => {
+      if (isMultiple) {
+        fontButton.label.value = "";
+        fontButton.selectedValue.value = "";
+        return;
+      }
       if (!fontFamily)
         return;
       fontFamily = fontFamily.split(",")[0];
@@ -326428,13 +326493,13 @@ menclose::after {
     return;
   console.log(...args$1);
 }, HEADER_FOOTER_INIT_BUDGET_MS = 200, MAX_ZOOM_WARNING_THRESHOLD = 10, MAX_SELECTION_RECTS_PER_USER = 100, SEMANTIC_RESIZE_DEBOUNCE_MS = 120, MIN_SEMANTIC_CONTENT_WIDTH_PX = 1, GLOBAL_PERFORMANCE, PresentationEditor, ICONS, TEXTS, tableActionsOptions, TRACKED_MARK_NAMES;
-var init_src_Fy_l94Cn_es = __esm(() => {
+var init_src_ly1ZYfUZ_es = __esm(() => {
   init_rolldown_runtime_Bg48TavK_es();
-  init_SuperConverter_x_mSI6o_es();
+  init_SuperConverter_DRKaQwZS_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
   init_uuid_B2wVPhPi_es();
-  init_create_headless_toolbar_D1KbRv5B_es();
+  init_create_headless_toolbar_ChACxHAH_es();
   init_constants_D9qj59G2_es();
   init_unified_BDuVPlMu_es();
   init_remark_gfm_BUJjZJLy_es();
@@ -333196,10 +333261,18 @@ ${err.toString()}`);
     addCommands() {
       return {
         setFontFamily: (fontFamily) => ({ chain }) => {
-          return chain().setMark("textStyle", { fontFamily }).run();
+          return chain().setMark("textStyle", {
+            fontFamily,
+            eastAsiaFontFamily: null,
+            csFontFamily: null
+          }).run();
         },
         unsetFontFamily: () => ({ chain }) => {
-          return chain().setMark("textStyle", { fontFamily: null }).removeEmptyTextStyle().run();
+          return chain().setMark("textStyle", {
+            fontFamily: null,
+            eastAsiaFontFamily: null,
+            csFontFamily: null
+          }).removeEmptyTextStyle().run();
         }
       };
     }
@@ -356364,7 +356437,7 @@ function print() { __p += __j.call(arguments, '') }
         return null;
       return getParagraphFontFamilyFromProperties(calculateResolvedParagraphProperties(this.activeEditor, paragraphParent.node, state.doc.resolve(paragraphParent.pos)), this.activeEditor?.converter?.convertedXml ?? {}) || null;
     }
-    #isFontSizeMixedState(commandState) {
+    #isMixedState(commandState) {
       return Boolean(commandState?.active) && commandState?.value == null;
     }
     #applyHeadlessState(item) {
@@ -356408,6 +356481,10 @@ function print() { __p += __j.call(arguments, '') }
             item.activate({ fontFamily: commandState.value });
             return;
           }
+          if (this.#isMixedState(commandState)) {
+            item.activate({}, true);
+            return;
+          }
           const fallbackFontFamily = this.#getFontFamilyFallbackValue();
           if (fallbackFontFamily) {
             item.activate({ fontFamily: fallbackFontFamily });
@@ -356420,7 +356497,7 @@ function print() { __p += __j.call(arguments, '') }
             item.activate({ fontSize: commandState.value });
             return;
           }
-          if (this.#isFontSizeMixedState(commandState)) {
+          if (this.#isMixedState(commandState)) {
             item.activate({}, true);
             return;
           }
@@ -369677,11 +369754,11 @@ function print() { __p += __j.call(arguments, '') }
   ]);
 });
 
-// ../../packages/superdoc/dist/chunks/create-super-doc-ui-Du-2OQ-7.es.js
+// ../../packages/superdoc/dist/chunks/create-super-doc-ui-CjKDFHjb.es.js
 var DEFAULT_TEXT_ALIGN_OPTIONS, DEFAULT_LINE_HEIGHT_OPTIONS, DEFAULT_ZOOM_OPTIONS, DEFAULT_DOCUMENT_MODE_OPTIONS, DEFAULT_FONT_SIZE_OPTIONS, headlessToolbarConstants, MOD_ALIASES, ALT_ALIASES, CTRL_ALIASES, SHIFT_ALIASES, BUILTIN_CONTEXT_MENU_GROUPS, BUILTIN_GROUP_ORDER, RESERVED_PROXY_PROPERTY_NAMES, ALL_TOOLBAR_COMMAND_IDS, EMPTY_ACTIVE_IDS, FONT_SIZE_OPTIONS;
-var init_create_super_doc_ui_Du_2OQ_7_es = __esm(() => {
-  init_SuperConverter_x_mSI6o_es();
-  init_create_headless_toolbar_D1KbRv5B_es();
+var init_create_super_doc_ui_CjKDFHjb_es = __esm(() => {
+  init_SuperConverter_DRKaQwZS_es();
+  init_create_headless_toolbar_ChACxHAH_es();
   DEFAULT_TEXT_ALIGN_OPTIONS = [
     {
       label: "Left",
@@ -369972,15 +370049,15 @@ var init_zipper_BxRAi0_5_es = __esm(() => {
 
 // ../../packages/superdoc/dist/super-editor.es.js
 var init_super_editor_es = __esm(() => {
-  init_src_Fy_l94Cn_es();
-  init_SuperConverter_x_mSI6o_es();
+  init_src_ly1ZYfUZ_es();
+  init_SuperConverter_DRKaQwZS_es();
   init_jszip_C49i9kUs_es();
   init_xml_js_CqGKpaft_es();
-  init_create_headless_toolbar_D1KbRv5B_es();
+  init_create_headless_toolbar_ChACxHAH_es();
   init_constants_D9qj59G2_es();
   init_unified_BDuVPlMu_es();
   init_DocxZipper_BzS208BW_es();
-  init_create_super_doc_ui_Du_2OQ_7_es();
+  init_create_super_doc_ui_CjKDFHjb_es();
   init_ui_CGB3qmy3_es();
   init_eventemitter3_UwU_CLPU_es();
   init_errors_C_DoKMoN_es();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superdoc-dev/cli",
-  "version": "0.17.0-next.41",
+  "version": "0.17.0-next.42",
   "type": "module",
   "bin": {
     "superdoc": "./dist/index.js"
@@ -26,20 +26,20 @@
     "lib0": "^0.2.114",
     "typescript": "^5.9.2",
     "y-protocols": "^1.0.6",
-    "@superdoc/super-editor": "0.0.1",
     "@superdoc/document-api": "0.1.0-alpha.0",
-    "superdoc": "1.43.1"
+    "superdoc": "1.43.1",
+    "@superdoc/super-editor": "0.0.1"
   },
   "module": "src/index.ts",
   "publishConfig": {
     "access": "public"
   },
   "optionalDependencies": {
-    "@superdoc-dev/cli-darwin-x64": "0.17.0-next.41",
-    "@superdoc-dev/cli-darwin-arm64": "0.17.0-next.41",
-    "@superdoc-dev/cli-linux-x64": "0.17.0-next.41",
-    "@superdoc-dev/cli-linux-arm64": "0.17.0-next.41",
-    "@superdoc-dev/cli-windows-x64": "0.17.0-next.41"
+    "@superdoc-dev/cli-darwin-x64": "0.17.0-next.42",
+    "@superdoc-dev/cli-darwin-arm64": "0.17.0-next.42",
+    "@superdoc-dev/cli-linux-x64": "0.17.0-next.42",
+    "@superdoc-dev/cli-linux-arm64": "0.17.0-next.42",
+    "@superdoc-dev/cli-windows-x64": "0.17.0-next.42"
   },
   "scripts": {
     "predev": "node scripts/ensure-superdoc-build.js",