more changes

microsoft · Oct 2, 2024 · e7bd52c · e7bd52c
1 parent 71b4151
commit e7bd52c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/packages/roosterjs-content-model-dom/lib/domToModel/processors/tableProcessor.ts b/packages/roosterjs-content-model-dom/lib/domToModel/processors/tableProcessor.ts
@@ -147,7 +147,8 @@ export const tableProcessor: ElementProcessor<HTMLTableElement> = (
 
                                 if (needCalcHeight) {
                                     rowPositions[rowEnd] =
-                                        rowPositions[row] + rect.height / zoomScale;
+                                        rowPositions[row] +
+                                        (rect.height - getPaddingInCell(td)) / zoomScale;
                                 }
                             }
                         }
@@ -340,3 +341,17 @@ function processColGroup(
 
     return hasColGroup;
 }
+
+function getPaddingInCell(td: HTMLTableCellElement) {
+    let result = 0;
+
+    if (!td.style.paddingTop?.endsWith('%')) {
+        result += parseInt(td.style.paddingTop) || 0;
+    }
+
+    if (!td.style.paddingBottom?.endsWith('%')) {
+        result += parseInt(td.style.paddingBottom) || 0;
+    }
+
+    return result;
+}
diff --git a/packages/roosterjs-content-model-dom/lib/formatHandlers/table/tableSpacingFormatHandler.ts b/packages/roosterjs-content-model-dom/lib/formatHandlers/table/tableSpacingFormatHandler.ts
@@ -41,10 +41,12 @@ export const tableSpacingFormatHandler: FormatHandler<SpacingFormat> = {
         }
 
         if (format.cellSpacing) {
-            const cellSpacing = format.cellSpacing.concat(
-                format.cellSpacing.endsWith('%') ? '' : 'px'
-            );
-            element.style.borderSpacing = cellSpacing;
+            element.setAttribute(CellSpacing, format.cellSpacing);
+
+            // const cellSpacing = format.cellSpacing.concat(
+            //     format.cellSpacing.endsWith('%') ? '' : 'px'
+            // );
+            // element.style.borderSpacing = cellSpacing;
         }
 
         if (format.cellPadding) {

diff --git a/...es/roosterjs-content-model-dom/test/formatHandlers/table/tableSpacingFormatHandlerTest.ts b/...es/roosterjs-content-model-dom/test/formatHandlers/table/tableSpacingFormatHandlerTest.ts
@@ -85,6 +85,6 @@ describe('tableSpacingFormatHandler.apply', () => {
     it('Set cellspacing attribute', () => {
         format.cellSpacing = '5';
         tableSpacingFormatHandler.apply(format, div, context);
-        expect(div.outerHTML).toEqual('<div style="border-spacing: 5px;"></div>');
+        expect(div.outerHTML).toEqual('<div cellspacing="5"></div>');
     });
 });