Merge branch 'develop' of github.com:Harbour-Enterprises/SuperDoc into develop

Author: falsaadehh

packages/super-editor/src/components/toolbar/defaultItems.js

@@ -654,7 +654,7 @@ export const makeDefaultItems = ({
   const overflow = useToolbarItem({
     type: 'overflow',
     name: 'overflow',
-    command: 'toggleOverflow',
+    command: null,
     icon: toolbarIcons.overflow,
     active: false,
     disabled: false,

packages/super-editor/src/core/super-converter/exporter.js

@@ -4,6 +4,7 @@ import { EditorState } from 'prosemirror-state';
 import { SuperConverter } from './SuperConverter.js';
 import {
   emuToPixels,
+  getTextIndentExportValue,
   inchesToTwips,
   linesToTwips,
   pixelsToEightPoints,
@@ -280,7 +281,7 @@ function generateParagraphProperties(node) {
     if (hanging || hanging === 0) attributes['w:hanging'] = pixelsToTwips(hanging);
 
     if (textIndent && !attributes['w:left']) {
-      attributes['w:left'] = inchesToTwips(textIndent);
+      attributes['w:left'] = getTextIndentExportValue(textIndent);
     }
 
     const indentElement = {
@@ -292,7 +293,7 @@ function generateParagraphProperties(node) {
     const indentElement = {
       name: 'w:ind',
       attributes: {
-        'w:left': inchesToTwips(textIndent),
+        'w:left': getTextIndentExportValue(textIndent),
       },
     };
     pPrElements.push(indentElement);

packages/super-editor/src/core/super-converter/helpers.js

@@ -84,6 +84,22 @@ function ptToTwips(pt) {
   return pt * 20;
 }
 
+/**
+ * Get the export value for text indent
+ * @param {string|number} indent - The text indent value to export
+ * @returns {number} - The export value in twips
+ */
+const getTextIndentExportValue = (indent) => {
+  const [value, unit] = parseSizeUnit(indent);
+  const functionsMap = {
+    pt: ptToTwips,
+    in: inchesToTwips,
+  };
+
+  const exportValue = functionsMap[unit] ? functionsMap[unit](value) : pixelsToTwips(value);
+  return exportValue;
+};
+
 const getArrayBufferFromUrl = async (input, isHeadless) => {
   // Check if it's a full URL or blob/file/data URI
   const isLikelyUrl = /^https?:|^blob:|^file:|^data:/i.test(input);
@@ -230,4 +246,5 @@ export {
   getLineHeightValueString,
   deobfuscateFont,
   hasSomeParentWithClass,
+  getTextIndentExportValue,
 };

packages/super-editor/src/tests/export/helpers.test.js

@@ -0,0 +1,13 @@
+import { getTextIndentExportValue } from '../../core/super-converter/helpers.js';
+
+describe('Export helpers', () => {
+  it('getTextIndentExportValue returns correct value for every case', () => {
+    const pxValue = getTextIndentExportValue('20');
+    const inchValue = getTextIndentExportValue('2in');
+    const ptValue = getTextIndentExportValue('20pt');
+
+    expect(pxValue).toBe(300);
+    expect(inchValue).toBe(2880);
+    expect(ptValue).toBe(400);
+  });
+});

packages/superdoc/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@harbour-enterprises/superdoc",
   "type": "module",
-  "version": "0.15.15-next.2",
+  "version": "0.15.15-next.5",
   "license": "AGPL-3.0",
   "readme": "../../README.md",
   "files": [