Apply font-only styles for calculations

simonbengtsson · Apr 9, 2020 · 0abbc07 · 0abbc07
1 parent 0cf831b
commit 0abbc07
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/common.ts b/src/common.ts
@@ -3,7 +3,7 @@ import state from './state'
 import { assign } from './polyfills'
 
 export function getStringWidth(text, styles) {
-  applyStyles(styles)
+  applyStyles(styles, true)
   const textArr: any = Array.isArray(text) ? text : [text]
 
   const widestLineWidth = textArr
@@ -75,20 +75,24 @@ export function applyUserStyles() {
   applyStyles(state().table.userStyles)
 }
 
-export function applyStyles(styles) {
-  let doc = state().doc
-  let styleModifiers = {
+export function applyStyles(styles, fontOnly = false) {
+  const doc = state().doc
+  const nonFontModifiers = {
     fillColor: doc.setFillColor,
     textColor: doc.setTextColor,
-    fontStyle: doc.setFontStyle,
     lineColor: doc.setDrawColor,
     lineWidth: doc.setLineWidth,
+  }
+  const styleModifiers = {
     font: doc.setFont,
     fontSize: doc.setFontSize,
+    fontStyle: doc.setFontStyle,
+    ...(fontOnly ? {} : nonFontModifiers),
   }
+
   Object.keys(styleModifiers).forEach(function (name) {
-    let style = styles[name]
-    let modifier = styleModifiers[name]
+    const style = styles[name]
+    const modifier = styleModifiers[name]
     if (typeof style !== 'undefined') {
       if (Array.isArray(style)) {
         modifier.apply(this, style)

diff --git a/src/widthCalculator.ts b/src/widthCalculator.ts
@@ -200,7 +200,7 @@ function fitContent(table) {
       let cell: Cell = row.cells[column.index]
       if (!cell) continue
 
-      applyStyles(cell.styles)
+      applyStyles(cell.styles, true)
       let textSpace = cell.width - cell.padding('horizontal')
       if (cell.styles.overflow === 'linebreak') {
         // Add one pt to textSpace to fix rounding error