pptxtojson 1.2.0 → 1.2.1

package/package.json

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

package/src/border.js

@@ -3,9 +3,19 @@ import { getSchemeColorFromTheme } from './schemeColor'
 import { getTextByPathList } from './utils'
 
 export function getBorder(node, elType, warpObj) {
-  const lineNode = node['p:spPr']['a:ln']
+  let lineNode = node['p:spPr']['a:ln']
+  if (!lineNode) {
+    const lnRefNode = getTextByPathList(node, ['p:style', 'a:lnRef'])
+    if (lnRefNode) {
+      const lnIdx = getTextByPathList(lnRefNode, ['attrs', 'idx'])
+      lineNode = warpObj['themeContent']['a:theme']['a:themeElements']['a:fmtScheme']['a:lnStyleLst']['a:ln'][Number(lnIdx) - 1]
+    }
+  }
+  if (!lineNode) lineNode = node
+
+  const isNoFill = getTextByPathList(lineNode, ['a:noFill'])
 
-  let borderWidth = parseInt(getTextByPathList(lineNode, ['attrs', 'w'])) / 12700
+  let borderWidth = isNoFill ? 0 : (parseInt(getTextByPathList(lineNode, ['attrs', 'w'])) / 12700)
   if (isNaN(borderWidth)) {
     if (lineNode) borderWidth = 0
     else if (elType !== 'obj') borderWidth = 0

package/src/fill.js

@@ -112,10 +112,16 @@ export function getGradientFill(node, warpObj) {
     }
   }
   const lin = node['a:lin']
-  let rot = 90
-  if (lin) rot = angleToDegrees(lin['attrs']['ang']) + 90
+  let rot = 0
+  let pathType = 'line'
+  if (lin) rot = angleToDegrees(lin['attrs']['ang'])
+  else {
+    const path = node['a:path']
+    if (path && path['attrs'] && path['attrs']['path']) pathType = path['attrs']['path'] 
+  }
   return {
     rot,
+    path: pathType,
     colors: colors.sort((a, b) => parseInt(a.pos) - parseInt(b.pos)),
   }
 }
@@ -136,10 +142,16 @@ export function getBgGradientFill(bgPr, phClr, slideMasterContent, warpObj) {
       }
     }
     const lin = grdFill['a:lin']
-    let rot = 90
-    if (lin) rot = angleToDegrees(lin['attrs']['ang']) + 90
+    let rot = 0
+    let pathType = 'line'
+    if (lin) rot = angleToDegrees(lin['attrs']['ang']) + 0
+    else {
+      const path = grdFill['a:path']
+      if (path && path['attrs'] && path['attrs']['path']) pathType = path['attrs']['path'] 
+    }
     return {
       rot,
+      path: pathType,
       colors: colors.sort((a, b) => parseInt(a.pos) - parseInt(b.pos)),
     }
   }

package/src/pptxtojson.js

@@ -949,7 +949,11 @@ async function genChart(node, warpObj) {
   const { width, height } = getSize(xfrmNode, undefined, undefined)
 
   const rid = node['a:graphic']['a:graphicData']['c:chart']['attrs']['r:id']
-  const refName = warpObj['slideResObj'][rid]['target']
+  let refName = getTextByPathList(warpObj['slideResObj'], [rid, 'target'])
+  if (!refName) refName = getTextByPathList(warpObj['layoutResObj'], [rid, 'target'])
+  if (!refName) refName = getTextByPathList(warpObj['masterResObj'], [rid, 'target'])
+  if (!refName) return {}
+
   const content = await readXmlFile(warpObj['zip'], refName)
   const plotArea = getTextByPathList(content, ['c:chartSpace', 'c:chart', 'c:plotArea'])