pptxtojson 1.0.1 → 1.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pptxtojson",
-	"version": "1.0.1",
+	"version": "1.0.3",
 	"description": "A javascript tool for parsing .pptx file",
 	"type": "module",
 	"main": "./dist/index.umd.js",

package/src/fill.js

@@ -452,9 +452,9 @@ export function getShapeFill(node, isSvgMode, warpObj) {
 }
 
 export function getSolidFill(solidFill, clrMap, phClr, warpObj) {
-  if (!solidFill) return solidFill
+  if (!solidFill) return ''
 
-  let color = '#ffffff'
+  let color = ''
   let clrNode
 
   if (solidFill['a:srgbClr']) {
@@ -464,7 +464,7 @@ export function getSolidFill(solidFill, clrMap, phClr, warpObj) {
   else if (solidFill['a:schemeClr']) {
     clrNode = solidFill['a:schemeClr']
     const schemeClr = 'a:' + getTextByPathList(clrNode, ['attrs', 'val'])
-    color = getSchemeColorFromTheme(schemeClr, warpObj, clrMap, phClr) || '#ffffff'
+    color = getSchemeColorFromTheme(schemeClr, warpObj, clrMap, phClr) || ''
   }
   else if (solidFill['a:scrgbClr']) {
     clrNode = solidFill['a:scrgbClr']

package/src/fontStyle.js

@@ -1,5 +1,6 @@
 import { getTextByPathList } from './utils'
 import { getShadow } from './shadow'
+import { getFillType, getSolidFill } from './fill'
 
 export function getFontType(node, type, warpObj) {
   let typeface = getTextByPathList(node, ['a:rPr', 'a:latin', 'attrs', 'typeface'])
@@ -21,9 +22,30 @@ export function getFontType(node, type, warpObj) {
   return typeface || ''
 }
 
-export function getFontColor(node) {
-  const color = getTextByPathList(node, ['a:rPr', 'a:solidFill', 'a:srgbClr', 'attrs', 'val'])
-  return color ? `#${color}` : ''
+export function getFontColor(node, pNode, lstStyle, pFontStyle, lvl, warpObj) {
+  const rPrNode = getTextByPathList(node, ['a:rPr'])
+  let filTyp, color
+  if (rPrNode) {
+    filTyp = getFillType(rPrNode)
+    if (filTyp === 'SOLID_FILL') {
+      const solidFillNode = rPrNode['a:solidFill']
+      color = getSolidFill(solidFillNode, undefined, undefined, warpObj)
+    }
+  }
+  if (!color && getTextByPathList(lstStyle, ['a:lvl' + lvl + 'pPr', 'a:defRPr'])) {
+    const lstStyledefRPr = getTextByPathList(lstStyle, ['a:lvl' + lvl + 'pPr', 'a:defRPr'])
+    filTyp = getFillType(lstStyledefRPr)
+    if (filTyp === 'SOLID_FILL') {
+      const solidFillNode = lstStyledefRPr['a:solidFill']
+      color = getSolidFill(solidFillNode, undefined, undefined, warpObj)
+    }
+  }
+  if (!color) {
+    const sPstyle = getTextByPathList(pNode, ['p:style', 'a:fontRef'])
+    if (sPstyle) color = getSolidFill(sPstyle, undefined, undefined, warpObj)
+    if (!color && pFontStyle) color = getSolidFill(pFontStyle, undefined, undefined, warpObj)
+  }
+  return color || ''
 }
 
 export function getFontSize(node, slideLayoutSpNode, type, slideMasterTextStyles) {
@@ -95,7 +117,7 @@ export function getFontShadow(node, warpObj) {
     if (shadow) {
       const { h, v, blur, color } = shadow
       if (!isNaN(v) && !isNaN(h)) {
-        return h + 'px ' + v + 'px ' + (blur ? blur + 'px' : '') + ' ' + color
+        return h + 'pt ' + v + 'pt ' + (blur ? blur + 'pt' : '') + ' ' + color
       }
     }
   }

package/src/pptxtojson.js

@@ -9,7 +9,7 @@ import { genTextBody } from './text'
 import { getCustomShapePath } from './shape'
 import { extractFileExtension, base64ArrayBuffer, getTextByPathList, angleToDegrees, getMimeType, isVideoLink, escapeHtml } from './utils'
 import { getShadow } from './shadow'
-import { getTableCellParams, getTableRowParams } from './table'
+import { getTableBorders, getTableCellParams, getTableRowParams } from './table'
 import { RATIO_EMUs_Points } from './constants'
 
 export async function parse(file) {
@@ -410,7 +410,10 @@ async function processGroupSpNode(node, warpObj, source) {
   const cy = parseInt(xfrmNode['a:ext']['attrs']['cy']) * RATIO_EMUs_Points
   const chcx = parseInt(xfrmNode['a:chExt']['attrs']['cx']) * RATIO_EMUs_Points
   const chcy = parseInt(xfrmNode['a:chExt']['attrs']['cy']) * RATIO_EMUs_Points
-  // children coordinate
+
+  let rotate = getTextByPathList(xfrmNode, ['attrs', 'rot']) || 0
+  if (rotate) rotate = angleToDegrees(rotate)
+
   const ws = cx / chcx
   const hs = cy / chcy
 
@@ -434,6 +437,7 @@ async function processGroupSpNode(node, warpObj, source) {
     left: x,
     width: cx,
     height: cy,
+    rotate,
     elements: elements.map(element => ({
       ...element,
       left: (element.left - chx) * ws,
@@ -748,6 +752,14 @@ function genTable(node, warpObj) {
   }
   if (thisTblStyle) thisTblStyle['tblStylAttrObj'] = tblStylAttrObj
 
+  let tbl_border
+  const tblStyl = getTextByPathList(thisTblStyle, ['a:wholeTbl', 'a:tcStyle'])
+  const tblBorderStyl = getTextByPathList(tblStyl, ['a:tcBdr'])
+  if (tblBorderStyl) {
+    const tbl_borders = getTableBorders(tblBorderStyl, warpObj)
+    if (tbl_borders) tbl_border = tbl_borders.bottom || tbl_borders.left || tbl_borders.right || tbl_borders.top
+  }
+
   let tbl_bgcolor = ''
   let tbl_bgFillschemeClr = getTextByPathList(thisTblStyle, ['a:tblBg', 'a:fillRef'])
   if (tbl_bgFillschemeClr) {
@@ -821,7 +833,7 @@ function genTable(node, warpObj) {
         if (cell.hMerge) td.hMerge = cell.hMerge
         if (cell.fontBold || fontBold) td.fontBold = cell.fontBold || fontBold
         if (cell.fontColor || fontColor) td.fontColor = cell.fontColor || fontColor
-        if (cell.fillColor || fillColor || tbl_bgcolor) td.fill = cell.fillColor || fillColor || tbl_bgcolor
+        if (cell.fillColor || fillColor || tbl_bgcolor) td.fillColor = cell.fillColor || fillColor || tbl_bgcolor
 
         tr.push(td)
       }
@@ -852,7 +864,7 @@ function genTable(node, warpObj) {
       if (cell.hMerge) td.hMerge = cell.hMerge
       if (cell.fontBold || fontBold) td.fontBold = cell.fontBold || fontBold
       if (cell.fontColor || fontColor) td.fontColor = cell.fontColor || fontColor
-      if (cell.fillColor || fillColor || tbl_bgcolor) td.fill = cell.fillColor || fillColor || tbl_bgcolor
+      if (cell.fillColor || fillColor || tbl_bgcolor) td.fillColor = cell.fillColor || fillColor || tbl_bgcolor
 
       tr.push(td)
     }
@@ -866,6 +878,7 @@ function genTable(node, warpObj) {
     width,
     height,
     data,
+    ...(tbl_border || {}),
   }
 }
 

package/src/table.js

@@ -1,6 +1,47 @@
 import { getShapeFill, getSolidFill } from './fill'
 import { getTextByPathList } from './utils'
+import { getBorder } from './border'
 
+export function getTableBorders(node, warpObj) {
+  const borderStyles = {}
+  if (node['a:bottom']) {
+    const obj = {
+      'p:spPr': {
+        'a:ln': node['a:bottom']['a:ln']
+      }
+    }
+    const border = getBorder(obj, undefined, warpObj)
+    borderStyles.bottom = border
+  }
+  if (node['a:top']) {
+    const obj = {
+      'p:spPr': {
+        'a:ln': node['a:top']['a:ln']
+      }
+    }
+    const border = getBorder(obj, undefined, warpObj)
+    borderStyles.top = border
+  }
+  if (node['a:right']) {
+    const obj = {
+      'p:spPr': {
+        'a:ln': node['a:right']['a:ln']
+      }
+    }
+    const border = getBorder(obj, undefined, warpObj)
+    borderStyles.right = border
+  }
+  if (node['a:left']) {
+    const obj = {
+      'p:spPr': {
+        'a:ln': node['a:left']['a:ln']
+      }
+    }
+    const border = getBorder(obj, undefined, warpObj)
+    borderStyles.left = border
+  }
+  return borderStyles
+}
 
 export function getTableCellParams(tcNode, thisTblStyle, cellSource, warpObj) {
   const rowSpan = getTextByPathList(tcNode, ['attrs', 'rowSpan'])
@@ -35,10 +76,10 @@ export function getTableCellParams(tcNode, thisTblStyle, cellSource, warpObj) {
     fillColor,
     fontColor,
     fontBold,
-    rowSpan,
-    colSpan,
-    vMerge,
-    hMerge,
+    rowSpan: rowSpan ? +rowSpan : undefined,
+    colSpan: colSpan ? +colSpan : undefined,
+    vMerge: vMerge ? +vMerge : undefined,
+    hMerge: hMerge ? +hMerge : undefined,
   }
 }
 

package/src/text.js

@@ -19,6 +19,8 @@ export function genTextBody(textBodyNode, spNode, slideLayoutSpNode, type, warpO
 
   let text = ''
 
+  const pFontStyle = getTextByPathList(spNode, ['p:style', 'a:fontRef'])
+
   const pNode = textBodyNode['a:p']
   const pNodes = pNode.constructor === Array ? pNode : [pNode]
 
@@ -71,10 +73,10 @@ export function genTextBody(textBodyNode, spNode, slideLayoutSpNode, type, warpO
       text += `<p style="text-align: ${align};">`
     }
     
-    if (!rNode) text += genSpanElement(pNode, slideLayoutSpNode, type, warpObj)
+    if (!rNode) text += genSpanElement(pNode, spNode, textBodyNode, pFontStyle, slideLayoutSpNode, type, warpObj)
     else {
       for (const rNodeItem of rNode) {
-        text += genSpanElement(rNodeItem, slideLayoutSpNode, type, warpObj)
+        text += genSpanElement(rNodeItem, pNode, textBodyNode, pFontStyle, slideLayoutSpNode, type, warpObj)
       }
     }
 
@@ -94,15 +96,21 @@ export function getListType(node) {
   return ''
 }
 
-export function genSpanElement(node, slideLayoutSpNode, type, warpObj) {
+export function genSpanElement(node, pNode, textBodyNode, pFontStyle, slideLayoutSpNode, type, warpObj) {
+  const lstStyle = textBodyNode['a:lstStyle']
   const slideMasterTextStyles = warpObj['slideMasterTextStyles']
 
+  let lvl = 1
+  const pPrNode = pNode['a:pPr']
+  const lvlNode = getTextByPathList(pPrNode, ['attrs', 'lvl'])
+  if (lvlNode !== undefined) lvl = parseInt(lvlNode) + 1
+
   let text = node['a:t']
   if (typeof text !== 'string') text = getTextByPathList(node, ['a:fld', 'a:t'])
   if (typeof text !== 'string') text = '&nbsp;'
 
   let styleText = ''
-  const fontColor = getFontColor(node)
+  const fontColor = getFontColor(node, pNode, lstStyle, pFontStyle, lvl, warpObj)
   const fontSize = getFontSize(node, slideLayoutSpNode, type, slideMasterTextStyles)
   const fontType = getFontType(node, type, warpObj)
   const fontBold = getFontBold(node)