pptxtojson 1.3.1 → 1.4.0

package/package.json

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

package/src/pptxtojson.js

@@ -12,6 +12,7 @@ import { getShadow } from './shadow'
 import { getTableBorders, getTableCellParams, getTableRowParams } from './table'
 import { RATIO_EMUs_Points } from './constants'
 import { findOMath, latexFormart, parseOMath } from './math'
+import { getShapePath } from './shapePath'
 
 export async function parse(file) {
   const slides = []
@@ -438,6 +439,12 @@ async function processMathNode(node, warpObj, source) {
   const blipFill = getTextByPathList(fallback, ['p:sp', 'p:spPr', 'a:blipFill'])
   const picBase64 = await getPicFill(source, blipFill, warpObj)
 
+  let text = ''
+  if (getTextByPathList(choice, ['p:sp', 'p:txBody', 'a:p', 'a:r'])) {
+    const sp = getTextByPathList(choice, ['p:sp'])
+    text = genTextBody(sp['p:txBody'], sp, undefined, undefined, warpObj)
+  }
+
   return {
     type: 'math',
     top,
@@ -446,6 +453,7 @@ async function processMathNode(node, warpObj, source) {
     height,
     latex,
     picBase64,
+    text,
     order,
   }
 }
@@ -612,12 +620,14 @@ async function genShape(node, pNode, slideLayoutSpNode, slideMasterSpNode, name,
 
   if (shadow) data.shadow = shadow
 
+  const isHasValidText = data.content && hasValidText(data.content)
+
   if (custShapType && type !== 'diagram') {
     const ext = getTextByPathList(slideXfrmNode, ['a:ext', 'attrs'])
     const w = parseInt(ext['cx']) * RATIO_EMUs_Points
     const h = parseInt(ext['cy']) * RATIO_EMUs_Points
     const d = getCustomShapePath(custShapType, w, h)
-    if (data.content && !hasValidText(data.content)) data.content = ''
+    if (!isHasValidText) data.content = ''
 
     return {
       ...data,
@@ -626,12 +636,26 @@ async function genShape(node, pNode, slideLayoutSpNode, slideMasterSpNode, name,
       path: d,
     }
   }
-  if (shapType && (type === 'obj' || !type)) {
-    if (data.content && !hasValidText(data.content)) data.content = ''
+
+  let shapePath = ''
+  if (shapType) shapePath = getShapePath(shapType, width, height, node)
+
+  if (shapType && (type === 'obj' || !type || shapType !== 'rect')) {
+    if (!isHasValidText) data.content = ''
+    return {
+      ...data,
+      type: 'shape',
+      shapType,
+      path: shapePath,
+    }
+  }
+  if (shapType && !isHasValidText && (fill || borderWidth)) {
     return {
       ...data,
       type: 'shape',
+      content: '',
       shapType,
+      path: shapePath,
     }
   }
   return {
@@ -655,7 +679,12 @@ async function processPicNode(node, warpObj, source) {
   const imgFileExt = extractFileExtension(imgName).toLowerCase()
   const zip = warpObj['zip']
   const imgArrayBuffer = await zip.file(imgName).async('arraybuffer')
-  const xfrmNode = node['p:spPr']['a:xfrm']
+
+  let xfrmNode = node['p:spPr']['a:xfrm']
+  if (!xfrmNode) {
+    const idx = getTextByPathList(node, ['p:nvPicPr', 'p:nvPr', 'p:ph', 'attrs', 'idx'])
+    if (idx) xfrmNode = getTextByPathList(warpObj['slideLayoutTables'], ['idxTable', idx, 'p:spPr', 'a:xfrm'])
+  }
 
   const mimeType = getMimeType(imgFileExt)
   const { top, left } = getPosition(xfrmNode, undefined, undefined)

package/src/shadow.js

@@ -5,7 +5,7 @@ export function getShadow(node, warpObj) {
   const chdwClrNode = getSolidFill(node, undefined, undefined, warpObj)
   const outerShdwAttrs = node['attrs']
   const dir = outerShdwAttrs['dir'] ? (parseInt(outerShdwAttrs['dir']) / 60000) : 0
-  const dist = parseInt(outerShdwAttrs['dist']) * RATIO_EMUs_Points
+  const dist = outerShdwAttrs['dist'] ? parseInt(outerShdwAttrs['dist']) * RATIO_EMUs_Points : 0
   const blurRad = outerShdwAttrs['blurRad'] ? parseInt(outerShdwAttrs['blurRad']) * RATIO_EMUs_Points : ''
   const vx = dist * Math.sin(dir * Math.PI / 180)
   const hx = dist * Math.cos(dir * Math.PI / 180)