pptxtojson 2.0.2 → 2.0.3

package/package.json

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

package/src/pptxtojson.js

@@ -4,6 +4,7 @@ import { getBorder } from './border'
 import { getSlideBackgroundFill, getShapeFill, getSolidFill, getPicFill, getPicFilters, getImageData, getVideoData, getAudioData } from './fill'
 import { getChartInfo } from './chart'
 import { getVerticalAlign, getTextAutoFit } from './paragraph'
+import { getTextInsets } from './textInsets'
 import { getPosition, getSize } from './position'
 import { genTextBody, getTextNodeValue } from './text'
 import { getCustomShapePath, identifyShape } from './shape'
@@ -640,13 +641,13 @@ async function processGroupSpNode(node, warpObj, source, parentGroupHierarchy =
     if (depth > 10) return elements
 
     return elements.map(element => {
-      const processed = {
-        ...element,
-        left: numberToFixed(element.left * ws),
-        top: numberToFixed(element.top * hs),
-        width: numberToFixed(element.width * ws),
-        height: numberToFixed(element.height * hs),
-      }
+      const processed = {
+        ...element,
+        left: numberToFixed(element.left * ws),
+        top: numberToFixed(element.top * hs),
+        width: numberToFixed(element.width * ws),
+        height: numberToFixed(element.height * hs),
+      }
       if (element.type === 'group' && element.elements) {
         processed.elements = processNestedGroupElements(element.elements, ws, hs, depth + 1)
       }
@@ -698,11 +699,11 @@ async function processSpNode(node, warpObj, source, groupHierarchy = []) {
     const txBoxVal = getTextByPathList(node, ['p:nvSpPr', 'p:cNvSpPr', 'attrs', 'txBox'])
     if (txBoxVal === '1') type = 'text'
   }
-  if (!type) type = getTextByPathList(slideLayoutSpNode, ['p:nvSpPr', 'p:nvPr', 'p:ph', 'attrs', 'type'])
-  if (!type) type = getTextByPathList(slideMasterSpNode, ['p:nvSpPr', 'p:nvPr', 'p:ph', 'attrs', 'type'])
-  if (!slideMasterSpNode && type === 'ctrTitle') slideMasterSpNode = warpObj['slideMasterTables']['typeTable']['title']
-
-  if (!type) {
+  if (!type) type = getTextByPathList(slideLayoutSpNode, ['p:nvSpPr', 'p:nvPr', 'p:ph', 'attrs', 'type'])
+  if (!type) type = getTextByPathList(slideMasterSpNode, ['p:nvSpPr', 'p:nvPr', 'p:ph', 'attrs', 'type'])
+  if (!slideMasterSpNode && type === 'ctrTitle') slideMasterSpNode = warpObj['slideMasterTables']['typeTable']['title']
+
+  if (!type) {
     if (source === 'diagramBg') type = 'diagram'
     else type = 'obj'
   }
@@ -775,6 +776,7 @@ async function genShape(node, slideLayoutSpNode, slideMasterSpNode, name, type,
   const vAlign = getVerticalAlign(node, slideLayoutSpNode, slideMasterSpNode, type)
   const isVertical = getTextByPathList(node, ['p:txBody', 'a:bodyPr', 'attrs', 'vert']) === 'eaVert'
   const autoFit = getTextAutoFit(node, slideLayoutSpNode, slideMasterSpNode)
+  const textInset = getTextInsets(node, slideLayoutSpNode, slideMasterSpNode)
 
   const data = {
     left,
@@ -798,6 +800,7 @@ async function genShape(node, slideLayoutSpNode, slideMasterSpNode, name, type,
   if (shadow) data.shadow = shadow
   if (autoFit) data.autoFit = autoFit
   if (link) data.link = link
+  if (textInset) data.textInset = textInset
 
   const isHasValidText = data.content && hasValidText(data.content)
 
@@ -1188,11 +1191,11 @@ async function genTable(node, warpObj) {
         if (cell.rowSpan) td.rowSpan = cell.rowSpan
         if (cell.colSpan) td.colSpan = cell.colSpan
         if (cell.vMerge) td.vMerge = cell.vMerge
-        if (cell.hMerge) td.hMerge = cell.hMerge
-        if (cell.vAlign) td.vAlign = cell.vAlign
-        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.fillColor = cell.fillColor || fillColor || tbl_bgcolor
+        if (cell.hMerge) td.hMerge = cell.hMerge
+        if (cell.vAlign) td.vAlign = cell.vAlign
+        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.fillColor = cell.fillColor || fillColor || tbl_bgcolor
         if (cell.borders) td.borders = cell.borders
 
         tr.push(td)
@@ -1221,11 +1224,11 @@ async function genTable(node, warpObj) {
       if (cell.rowSpan) td.rowSpan = cell.rowSpan
       if (cell.colSpan) td.colSpan = cell.colSpan
       if (cell.vMerge) td.vMerge = cell.vMerge
-      if (cell.hMerge) td.hMerge = cell.hMerge
-      if (cell.vAlign) td.vAlign = cell.vAlign
-      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.fillColor = cell.fillColor || fillColor || tbl_bgcolor
+      if (cell.hMerge) td.hMerge = cell.hMerge
+      if (cell.vAlign) td.vAlign = cell.vAlign
+      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.fillColor = cell.fillColor || fillColor || tbl_bgcolor
       if (cell.borders) td.borders = cell.borders
 
       tr.push(td)

package/src/textInsets.js

@@ -0,0 +1,64 @@
+import { getTextByPathList, numberToFixed } from './utils'
+import { RATIO_EMUs_Points } from './constants'
+
+const DEFAULT_INSET_EMU = {
+  lIns: 91440, // 0.1 in
+  rIns: 91440, // 0.1 in
+  tIns: 45720, // 0.05 in
+  bIns: 45720, // 0.05 in
+}
+
+function getInsetAttr(slideNode, layoutNode, masterNode, attrName) {
+  let v = getTextByPathList(slideNode, ['p:txBody', 'a:bodyPr', 'attrs', attrName])
+  if (v !== undefined && v !== null && v !== '') return v
+
+  v = getTextByPathList(layoutNode, ['p:txBody', 'a:bodyPr', 'attrs', attrName])
+  if (v !== undefined && v !== null && v !== '') return v
+
+  return getTextByPathList(masterNode, ['p:txBody', 'a:bodyPr', 'attrs', attrName])
+}
+
+function emuToPt(emuStr) {
+  if (emuStr === undefined || emuStr === null || emuStr === '') return null
+  const v = parseInt(emuStr, 10)
+  if (!Number.isFinite(v)) return null
+  return numberToFixed(v * RATIO_EMUs_Points)
+}
+
+export function getTextInsets(node, slideLayoutSpNode, slideMasterSpNode) {
+  const nodeBodyPr = getTextByPathList(node, ['p:txBody', 'a:bodyPr'])
+  const layoutBodyPr = getTextByPathList(slideLayoutSpNode, ['p:txBody', 'a:bodyPr'])
+  const masterBodyPr = getTextByPathList(slideMasterSpNode, ['p:txBody', 'a:bodyPr'])
+
+  if (!nodeBodyPr) {
+    if (!layoutBodyPr) {
+      if (!masterBodyPr) return null
+    }
+  }
+
+  let li = getInsetAttr(node, slideLayoutSpNode, slideMasterSpNode, 'lIns')
+  if (li === undefined || li === null || li === '') li = DEFAULT_INSET_EMU.lIns
+
+  let ti = getInsetAttr(node, slideLayoutSpNode, slideMasterSpNode, 'tIns')
+  if (ti === undefined || ti === null || ti === '') ti = DEFAULT_INSET_EMU.tIns
+
+  let ri = getInsetAttr(node, slideLayoutSpNode, slideMasterSpNode, 'rIns')
+  if (ri === undefined || ri === null || ri === '') ri = DEFAULT_INSET_EMU.rIns
+
+  let bi = getInsetAttr(node, slideLayoutSpNode, slideMasterSpNode, 'bIns')
+  if (bi === undefined || bi === null || bi === '') bi = DEFAULT_INSET_EMU.bIns
+
+  let l = emuToPt(li)
+  if (l === null) l = 0
+
+  let t = emuToPt(ti)
+  if (t === null) t = 0
+
+  let r = emuToPt(ri)
+  if (r === null) r = 0
+
+  let b = emuToPt(bi)
+  if (b === null) b = 0
+
+  return { l, t, r, b }
+}