pptxtojson 2.0.4 → 2.0.6

package/package.json

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

package/src/fill.js

@@ -702,25 +702,47 @@ export async function getSlideBackgroundFill(warpObj) {
   }
 }
 
-export async function getShapeFill(node, warpObj, source, groupHierarchy = []) {
-  const fillType = getFillType(getTextByPathList(node, ['p:spPr']))
+function getShapeFillCandidates(node, source, slideLayoutSpNode, slideMasterSpNode) {
+  const candidates = [{ node, source }]
+
+  if (slideLayoutSpNode) {
+    candidates.push({
+      node: slideLayoutSpNode,
+      source: 'slideLayoutBg',
+    })
+  }
+  if (slideMasterSpNode) {
+    candidates.push({
+      node: slideMasterSpNode,
+      source: 'slideMasterBg',
+    })
+  }
+
+  return candidates
+}
+
+async function resolveShapeFillFromNode(node, warpObj, source, groupHierarchy) {
+  if (!node) return { state: 'missing' }
+
+  const spPr = getTextByPathList(node, ['p:spPr'])
+  const fillType = spPr ? getFillType(spPr) : ''
   let type = 'color'
   let fillValue = ''
   if (fillType === 'NO_FILL') {
-    return null
+    return { state: 'none' }
   }
   else if (fillType === 'SOLID_FILL') {
-    const shpFill = node['p:spPr']['a:solidFill']
+    const shpFill = spPr['a:solidFill']
     fillValue = getSolidFill(shpFill, undefined, undefined, warpObj)
     type = 'color'
   }
   else if (fillType === 'GRADIENT_FILL') {
-    const shpFill = node['p:spPr']['a:gradFill']
+    const shpFill = spPr['a:gradFill']
     fillValue = getGradientFill(shpFill, warpObj)
     type = 'gradient'
   }
   else if (fillType === 'PIC_FILL') {
-    const shpFill = node['p:spPr']['a:blipFill']
+    const shpFill = spPr['a:blipFill']
     const picFill = await getPicFill(source, shpFill, warpObj)
     const opacity = getPicFillOpacity(shpFill)
     fillValue = {
@@ -732,12 +754,13 @@ export async function getShapeFill(node, warpObj, source, groupHierarchy = []) {
     type = 'image'
   }
   else if (fillType === 'PATTERN_FILL') {
-    const shpFill = node['p:spPr']['a:pattFill']
+    const shpFill = spPr['a:pattFill']
     fillValue = getPatternFill({ 'a:pattFill': shpFill }, warpObj)
     type = 'pattern'
   }
   else if (fillType === 'GROUP_FILL') {
-    return findFillInGroupHierarchy(groupHierarchy, warpObj, source)
+    const groupFill = await findFillInGroupHierarchy(groupHierarchy, warpObj, source)
+    return groupFill ? { state: 'found', fill: groupFill } : { state: 'none' }
   }
   if (!fillValue) {
     const clrName = getTextByPathList(node, ['p:style', 'a:fillRef'])
@@ -745,15 +768,36 @@ export async function getShapeFill(node, warpObj, source, groupHierarchy = []) {
     type = 'color'
   }
   if (!fillValue) {
-    return null
+    return { state: 'missing' }
   }
 
   return {
-    type,
-    value: fillValue,
+    state: 'found',
+    fill: {
+      type,
+      value: fillValue,
+    }
   }
 }
 
+export async function getShapeFill(node, warpObj, source, options = {}) {
+  const {
+    groupHierarchy = [],
+    slideLayoutSpNode,
+    slideMasterSpNode,
+  } = options
+
+  const candidates = getShapeFillCandidates(node, source, slideLayoutSpNode, slideMasterSpNode)
+  for (const candidate of candidates) {
+    const result = await resolveShapeFillFromNode(candidate.node, warpObj, candidate.source, groupHierarchy)
+
+    if (result.state === 'none') return null
+    if (result.state === 'found') return result.fill
+  }
+
+  return null
+}
+
 async function findFillInGroupHierarchy(groupHierarchy, warpObj, source) {
   for (const groupNode of groupHierarchy) {
     if (!groupNode || !groupNode['p:grpSpPr']) continue
@@ -892,4 +936,4 @@ export function getSolidFill(solidFill, clrMap, phClr, warpObj) {
   if (color && color.indexOf('#') === -1) color = '#' + color
 
   return color
-}
+}

package/src/pptxtojson.js

@@ -7,7 +7,7 @@ import { getVerticalAlign, getTextAutoFit } from './paragraph'
 import { getTextInsets } from './textInsets'
 import { getPosition, getSize } from './position'
 import { genTextBody, getTextNodeValue } from './text'
-import { getCustomShapePath, identifyShape } from './shape'
+import { getCustomShapePath, identifyShape, isStrokeOnlyCustomGeometry } from './shape'
 import { extractFileExtension, getTextByPathList, angleToDegrees, isVideoLink, escapeHtml, hasValidText, numberToFixed } from './utils'
 import { getShadow } from './shadow'
 import { getTableBorders, getTableCellParams, getTableRowParams } from './table'
@@ -267,7 +267,9 @@ async function processSingleSlide(zip, sldFileName, themeContent, defaultTextSty
     }
   }
 
+  let currentThemeContent = themeContent
   if (themeFilename) {
+    currentThemeContent = currentThemeContent || await readXmlFileCached(zip, themeFilename, xmlCache)
     const themeName = themeFilename.split('/').pop()
     const themeResFileName = themeFilename.replace(themeName, '_rels/' + themeName) + '.rels'
     const themeResContent = await readXmlFile(zip, themeResFileName)
@@ -305,7 +307,7 @@ async function processSingleSlide(zip, sldFileName, themeContent, defaultTextSty
     slideMasterTextStyles,
     layoutResObj,
     masterResObj,
-    themeContent,
+    themeContent: currentThemeContent,
     themeResObj,
     diagramFileCache: {},
     defaultTextStyle,
@@ -618,8 +620,8 @@ async function processGroupSpNode(node, warpObj, source, parentGroupHierarchy =
   if (rotate) rotate = angleToDegrees(rotate)
 
   // 计算缩放因子
-  const ws = cx / chcx
-  const hs = cy / chcy
+  const ws = chcx === 0 ? 0 : cx / chcx
+  const hs = chcy === 0 ? 0 : cy / chcy
 
   // 构建当前组合层级（将当前组合添加到父级层级中）
   const currentGroupHierarchy = [...parentGroupHierarchy, node]
@@ -638,30 +640,44 @@ async function processGroupSpNode(node, warpObj, source, parentGroupHierarchy =
     }
   }
 
+  const transformGroupedElement = (element, offsetX = 0, offsetY = 0) => {
+    const elementRotate = element.rotate || 0
+    const normalizedRotate = ((elementRotate % 360) + 360) % 360
+    const isUniformScale = Math.abs(ws - hs) < 0.000001
+    const shouldSwapDimensions = normalizedRotate === 90 || normalizedRotate === 270
+    const centerX = element.left + element.width / 2
+    const centerY = element.top + element.height / 2
+    const nextCenterX = (centerX - offsetX) * ws
+    const nextCenterY = (centerY - offsetY) * hs
+    const widthScale = shouldSwapDimensions && !isUniformScale ? hs : ws
+    const heightScale = shouldSwapDimensions && !isUniformScale ? ws : hs
+    const width = element.width * widthScale
+    const height = element.height * heightScale
+
+    const transformed = {
+      ...element,
+      left: numberToFixed(nextCenterX - width / 2),
+      top: numberToFixed(nextCenterY - height / 2),
+      width: numberToFixed(width),
+      height: numberToFixed(height),
+    }
+    return transformed
+  }
+
   const processedElements = elements.map(element => ({
-    ...element,
-    left: numberToFixed((element.left - chx) * ws),
-    top: numberToFixed((element.top - chy) * hs),
-    width: numberToFixed(element.width * ws),
-    height: numberToFixed(element.height * hs),
+    ...transformGroupedElement(element, chx, chy),
     ...(element.type === 'group' && element.elements ? {
-      elements: processNestedGroupElements(element.elements, ws, hs)
+      elements: processNestedGroupElements(element.elements)
     } : {})
   }))
 
-  function processNestedGroupElements(elements, ws, hs, depth = 0) {
+  function processNestedGroupElements(elements, depth = 0) {
     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 = transformGroupedElement(element)
       if (element.type === 'group' && element.elements) {
-        processed.elements = processNestedGroupElements(element.elements, ws, hs, depth + 1)
+        processed.elements = processNestedGroupElements(element.elements, depth + 1)
       }
       return processed
     })
@@ -761,6 +777,7 @@ async function genShape(node, slideLayoutSpNode, slideMasterSpNode, name, type,
 
   const { top, left } = getPosition(slideXfrmNode, slideLayoutXfrmNode, slideMasterXfrmNode)
   const { width, height } = getSize(slideXfrmNode, slideLayoutXfrmNode, slideMasterXfrmNode)
+  const pathViewBox = { x: 0, y: 0, width, height }
 
   const isFlipV = getTextByPathList(slideXfrmNode, ['attrs', 'flipV']) === '1'
   const isFlipH = getTextByPathList(slideXfrmNode, ['attrs', 'flipH']) === '1'
@@ -779,7 +796,11 @@ async function genShape(node, slideLayoutSpNode, slideMasterSpNode, name, type,
   if (node['p:txBody']) content = genTextBody(node['p:txBody'], node, slideLayoutSpNode, slideMasterSpNode, type, warpObj)
 
   const { borderColor, borderWidth, borderType, strokeDasharray } = getBorder(node, type, warpObj)
-  const fill = await getShapeFill(node, warpObj, source, groupHierarchy)
+  const fill = await getShapeFill(node, warpObj, source, {
+    groupHierarchy,
+    slideLayoutSpNode,
+    slideMasterSpNode,
+  })
 
   let shadow
   const outerShdwNode = getTextByPathList(node, ['p:spPr', 'a:effectLst', 'a:outerShdw'])
@@ -823,36 +844,48 @@ async function genShape(node, slideLayoutSpNode, slideMasterSpNode, name, type,
     const d = getCustomShapePath(custShapType, w, h)
     if (!isHasValidText) data.content = ''
 
-    return {
+    const customShapeData = {
       ...data,
       type: 'shape',
       shapType: 'custom',
       path: d,
+      pathViewBox: { x: 0, y: 0, width: w, height: h },
     }
+    if (isStrokeOnlyCustomGeometry(custShapType)) customShapeData.strokeOnly = true
+
+    return customShapeData
   }
 
   let shapePath = ''
   if (shapType) shapePath = getShapePath(shapType, width, height, node)
+  const STROKE_ONLY_PRESET_SHAPE_TYPES = ['arc', 'leftBrace', 'rightBrace', 'bracePair', 'leftBracket', 'rightBracket', 'bracketPair']
+  const isStrokeOnlyPresetShape = STROKE_ONLY_PRESET_SHAPE_TYPES.includes(shapType)
 
   if (shapType && (type === 'obj' || !type || shapType !== 'rect')) {
     if (!isHasValidText) data.content = ''
-    return {
+    const shapeData = {
       ...data,
       type: 'shape',
       shapType,
       path: shapePath,
+      pathViewBox,
       keypoints,
     }
+    if (isStrokeOnlyPresetShape) shapeData.strokeOnly = true
+    return shapeData
   }
   if (shapType && !isHasValidText && (fill || borderWidth)) {
-    return {
+    const shapeData = {
       ...data,
       type: 'shape',
       content: '',
       shapType,
       path: shapePath,
+      pathViewBox,
       keypoints,
     }
+    if (isStrokeOnlyPresetShape) shapeData.strokeOnly = true
+    return shapeData
   }
   return {
     ...data,

package/src/shape.js

@@ -223,6 +223,15 @@ export function getCustomShapePath(custShapType, w, h) {
   return d
 }
 
+export function isStrokeOnlyCustomGeometry(custShapType) {
+  const pathNodes = getTextByPathList(custShapType, ['a:pathLst', 'a:path'])
+  if (!pathNodes) return false
+
+  const pathNodeList = Array.isArray(pathNodes) ? pathNodes : [pathNodes]
+
+  return pathNodeList.length === 1 && getTextByPathList(pathNodeList[0], ['attrs', 'fill']) === 'none'
+}
+
 export function identifyShape(shapeData) {
   const pathLst = shapeData['a:pathLst']
   if (!pathLst || !pathLst['a:path']) return 'custom'