pptxtojson 1.1.0 → 1.2.0

package/src/pptxtojson.js

@@ -7,7 +7,7 @@ import { getVerticalAlign } from './align'
 import { getPosition, getSize } from './position'
 import { genTextBody } from './text'
 import { getCustomShapePath } from './shape'
-import { extractFileExtension, base64ArrayBuffer, getTextByPathList, angleToDegrees, getMimeType, isVideoLink, escapeHtml } from './utils'
+import { extractFileExtension, base64ArrayBuffer, getTextByPathList, angleToDegrees, getMimeType, isVideoLink, escapeHtml, hasValidText } from './utils'
 import { getShadow } from './shadow'
 import { getTableBorders, getTableCellParams, getTableRowParams } from './table'
 import { RATIO_EMUs_Points } from './constants'
@@ -20,7 +20,7 @@ export async function parse(file) {
 
   const filesInfo = await getContentTypes(zip)
   const { width, height, defaultTextStyle } = await getSlideInfo(zip)
-  const themeContent = await loadTheme(zip)
+  const { themeContent, themeColors } = await getTheme(zip)
 
   for (const filename of filesInfo.slides) {
     const singleSlide = await processSingleSlide(zip, filename, themeContent, defaultTextStyle)
@@ -29,6 +29,7 @@ export async function parse(file) {
 
   return {
     slides,
+    themeColors,
     size: {
       width,
       height,
@@ -79,7 +80,7 @@ async function getSlideInfo(zip) {
   }
 }
 
-async function loadTheme(zip) {
+async function getTheme(zip) {
   const preResContent = await readXmlFile(zip, 'ppt/_rels/presentation.xml.rels')
   const relationshipArray = preResContent['Relationships']['Relationship']
   let themeURI
@@ -95,103 +96,109 @@ async function loadTheme(zip) {
   else if (relationshipArray['attrs']['Type'] === 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme') {
     themeURI = relationshipArray['attrs']['Target']
   }
-  if (!themeURI) throw Error(`Can't open theme file.`)
 
-  return await readXmlFile(zip, 'ppt/' + themeURI)
+  const themeContent = await readXmlFile(zip, 'ppt/' + themeURI)
+
+  const themeColors = []
+  const clrScheme = getTextByPathList(themeContent, ['a:theme', 'a:themeElements', 'a:clrScheme'])
+  if (clrScheme) {
+    for (let i = 1; i <= 6; i++) {
+      if (clrScheme[`a:accent${i}`] === undefined) break
+      const color = getTextByPathList(clrScheme, [`a:accent${i}`, 'a:srgbClr', 'attrs', 'val'])
+      if (color) themeColors.push('#' + color)
+    }
+  }
+
+  return { themeContent, themeColors }
 }
 
 async function processSingleSlide(zip, sldFileName, themeContent, defaultTextStyle) {
   const resName = sldFileName.replace('slides/slide', 'slides/_rels/slide') + '.rels'
   const resContent = await readXmlFile(zip, resName)
   let relationshipArray = resContent['Relationships']['Relationship']
+  if (relationshipArray.constructor !== Array) relationshipArray = [relationshipArray]
+  
+  let noteFilename = ''
   let layoutFilename = ''
+  let masterFilename = ''
+  let themeFilename = ''
   let diagramFilename = ''
-  let notesFilename = ''
   const slideResObj = {}
+  const layoutResObj = {}
+  const masterResObj = {}
+  const themeResObj = {}
+  const diagramResObj = {}
 
-  if (relationshipArray.constructor === Array) {
-    for (const relationshipArrayItem of relationshipArray) {
-      switch (relationshipArrayItem['attrs']['Type']) {
-        case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout':
-          layoutFilename = relationshipArrayItem['attrs']['Target'].replace('../', 'ppt/')
-          break
-        case 'http://schemas.microsoft.com/office/2007/relationships/diagramDrawing':
-          diagramFilename = relationshipArrayItem['attrs']['Target'].replace('../', 'ppt/')
-          slideResObj[relationshipArrayItem['attrs']['Id']] = {
-            type: relationshipArrayItem['attrs']['Type'].replace('http://schemas.openxmlformats.org/officeDocument/2006/relationships/', ''),
-            target: relationshipArrayItem['attrs']['Target'].replace('../', 'ppt/')
-          }
-          break
-        case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/notesSlide':
-          notesFilename = relationshipArrayItem['attrs']['Target'].replace('../', 'ppt/')
-          break
-        case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image':
-        case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart':
-        case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink':
-        default:
-          slideResObj[relationshipArrayItem['attrs']['Id']] = {
-            type: relationshipArrayItem['attrs']['Type'].replace('http://schemas.openxmlformats.org/officeDocument/2006/relationships/', ''),
-            target: relationshipArrayItem['attrs']['Target'].replace('../', 'ppt/'),
-          }
-      }
+  for (const relationshipArrayItem of relationshipArray) {
+    switch (relationshipArrayItem['attrs']['Type']) {
+      case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout':
+        layoutFilename = relationshipArrayItem['attrs']['Target'].replace('../', 'ppt/')
+        break
+      case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/notesSlide':
+        noteFilename = relationshipArrayItem['attrs']['Target'].replace('../', 'ppt/')
+        break
+      case 'http://schemas.microsoft.com/office/2007/relationships/diagramDrawing':
+        diagramFilename = relationshipArrayItem['attrs']['Target'].replace('../', 'ppt/')
+        slideResObj[relationshipArrayItem['attrs']['Id']] = {
+          type: relationshipArrayItem['attrs']['Type'].replace('http://schemas.openxmlformats.org/officeDocument/2006/relationships/', ''),
+          target: relationshipArrayItem['attrs']['Target'].replace('../', 'ppt/')
+        }
+        break
+      case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/image':
+      case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart':
+      case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink':
+      default:
+        slideResObj[relationshipArrayItem['attrs']['Id']] = {
+          type: relationshipArrayItem['attrs']['Type'].replace('http://schemas.openxmlformats.org/officeDocument/2006/relationships/', ''),
+          target: relationshipArrayItem['attrs']['Target'].replace('../', 'ppt/'),
+        }
     }
-  } 
-  else layoutFilename = relationshipArray['attrs']['Target'].replace('../', 'ppt/')
+  }
   
-  const slideNotesContent = await readXmlFile(zip, notesFilename)
+  const slideNotesContent = await readXmlFile(zip, noteFilename)
   const note = getNote(slideNotesContent)
 
   const slideLayoutContent = await readXmlFile(zip, layoutFilename)
   const slideLayoutTables = await indexNodes(slideLayoutContent)
-
   const slideLayoutResFilename = layoutFilename.replace('slideLayouts/slideLayout', 'slideLayouts/_rels/slideLayout') + '.rels'
   const slideLayoutResContent = await readXmlFile(zip, slideLayoutResFilename)
   relationshipArray = slideLayoutResContent['Relationships']['Relationship']
+  if (relationshipArray.constructor !== Array) relationshipArray = [relationshipArray]
 
-  let masterFilename = ''
-  const layoutResObj = {}
-  if (relationshipArray.constructor === Array) {
-    for (const relationshipArrayItem of relationshipArray) {
-      switch (relationshipArrayItem['attrs']['Type']) {
-        case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideMaster':
-          masterFilename = relationshipArrayItem['attrs']['Target'].replace('../', 'ppt/')
-          break
-        default:
-          layoutResObj[relationshipArrayItem['attrs']['Id']] = {
-            type: relationshipArrayItem['attrs']['Type'].replace('http://schemas.openxmlformats.org/officeDocument/2006/relationships/', ''),
-            target: relationshipArrayItem['attrs']['Target'].replace('../', 'ppt/'),
-          }
-      }
+  for (const relationshipArrayItem of relationshipArray) {
+    switch (relationshipArrayItem['attrs']['Type']) {
+      case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideMaster':
+        masterFilename = relationshipArrayItem['attrs']['Target'].replace('../', 'ppt/')
+        break
+      default:
+        layoutResObj[relationshipArrayItem['attrs']['Id']] = {
+          type: relationshipArrayItem['attrs']['Type'].replace('http://schemas.openxmlformats.org/officeDocument/2006/relationships/', ''),
+          target: relationshipArrayItem['attrs']['Target'].replace('../', 'ppt/'),
+        }
     }
-  } 
-  else masterFilename = relationshipArray['attrs']['Target'].replace('../', 'ppt/')
+  }
 
   const slideMasterContent = await readXmlFile(zip, masterFilename)
   const slideMasterTextStyles = getTextByPathList(slideMasterContent, ['p:sldMaster', 'p:txStyles'])
   const slideMasterTables = indexNodes(slideMasterContent)
-
   const slideMasterResFilename = masterFilename.replace('slideMasters/slideMaster', 'slideMasters/_rels/slideMaster') + '.rels'
   const slideMasterResContent = await readXmlFile(zip, slideMasterResFilename)
   relationshipArray = slideMasterResContent['Relationships']['Relationship']
+  if (relationshipArray.constructor !== Array) relationshipArray = [relationshipArray]
 
-  let themeFilename = ''
-  const masterResObj = {}
-  if (relationshipArray.constructor === Array) {
-    for (const relationshipArrayItem of relationshipArray) {
-      switch (relationshipArrayItem['attrs']['Type']) {
-        case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme':
-          break
-        default:
-          masterResObj[relationshipArrayItem['attrs']['Id']] = {
-            type: relationshipArrayItem['attrs']['Type'].replace('http://schemas.openxmlformats.org/officeDocument/2006/relationships/', ''),
-            target: relationshipArrayItem['attrs']['Target'].replace('../', 'ppt/'),
-          }
-      }
+  for (const relationshipArrayItem of relationshipArray) {
+    switch (relationshipArrayItem['attrs']['Type']) {
+      case 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme':
+        themeFilename = relationshipArrayItem['attrs']['Target'].replace('../', 'ppt/')
+        break
+      default:
+        masterResObj[relationshipArrayItem['attrs']['Id']] = {
+          type: relationshipArrayItem['attrs']['Type'].replace('http://schemas.openxmlformats.org/officeDocument/2006/relationships/', ''),
+          target: relationshipArrayItem['attrs']['Target'].replace('../', 'ppt/'),
+        }
     }
   }
-  else themeFilename = relationshipArray['attrs']['Target'].replace('../', 'ppt/')
 
-  const themeResObj = {}
   if (themeFilename) {
     const themeName = themeFilename.split('/').pop()
     const themeResFileName = themeFilename.replace(themeName, '_rels/' + themeName) + '.rels'
@@ -199,50 +206,34 @@ async function processSingleSlide(zip, sldFileName, themeContent, defaultTextSty
     if (themeResContent) {
       relationshipArray = themeResContent['Relationships']['Relationship']
       if (relationshipArray) {
-        if (relationshipArray.constructor === Array) {
-          for (const relationshipArrayItem of relationshipArray) {
-            themeResObj[relationshipArrayItem['attrs']['Id']] = {
-              'type': relationshipArrayItem['attrs']['Type'].replace('http://schemas.openxmlformats.org/officeDocument/2006/relationships/', ''),
-              'target': relationshipArrayItem['attrs']['Target'].replace('../', 'ppt/')
-            }
-          }
-        } 
-        else {
-          themeResObj[relationshipArray['attrs']['Id']] = {
-            'type': relationshipArray['attrs']['Type'].replace('http://schemas.openxmlformats.org/officeDocument/2006/relationships/', ''),
-            'target': relationshipArray['attrs']['Target'].replace('../', 'ppt/')
+        if (relationshipArray.constructor !== Array) relationshipArray = [relationshipArray]
+        for (const relationshipArrayItem of relationshipArray) {
+          themeResObj[relationshipArrayItem['attrs']['Id']] = {
+            'type': relationshipArrayItem['attrs']['Type'].replace('http://schemas.openxmlformats.org/officeDocument/2006/relationships/', ''),
+            'target': relationshipArrayItem['attrs']['Target'].replace('../', 'ppt/')
           }
         }
       }
     }
   }
 
-  const diagramResObj = {}
   let digramFileContent = {}
   if (diagramFilename) {
     const diagName = diagramFilename.split('/').pop()
     const diagramResFileName = diagramFilename.replace(diagName, '_rels/' + diagName) + '.rels'
     digramFileContent = await readXmlFile(zip, diagramFilename)
-    if (digramFileContent && digramFileContent && digramFileContent) {
-      let digramFileContentObjToStr = JSON.stringify(digramFileContent)
-      digramFileContentObjToStr = digramFileContentObjToStr.replace(/dsp:/g, 'p:')
+    if (digramFileContent) {
+      const digramFileContentObjToStr = JSON.stringify(digramFileContent).replace(/dsp:/g, 'p:')
       digramFileContent = JSON.parse(digramFileContentObjToStr)
     }
     const digramResContent = await readXmlFile(zip, diagramResFileName)
     if (digramResContent) {
       relationshipArray = digramResContent['Relationships']['Relationship']
-      if (relationshipArray.constructor === Array) {
-        for (const relationshipArrayItem of relationshipArray) {
-          diagramResObj[relationshipArrayItem['attrs']['Id']] = {
-            'type': relationshipArrayItem['attrs']['Type'].replace('http://schemas.openxmlformats.org/officeDocument/2006/relationships/', ''),
-            'target': relationshipArrayItem['attrs']['Target'].replace('../', 'ppt/')
-          }
-        }
-      } 
-      else {
-        diagramResObj[relationshipArray['attrs']['Id']] = {
-          'type': relationshipArray['attrs']['Type'].replace('http://schemas.openxmlformats.org/officeDocument/2006/relationships/', ''),
-          'target': relationshipArray['attrs']['Target'].replace('../', 'ppt/')
+      if (relationshipArray.constructor !== Array) relationshipArray = [relationshipArray]
+      for (const relationshipArrayItem of relationshipArray) {
+        diagramResObj[relationshipArrayItem['attrs']['Id']] = {
+          'type': relationshipArrayItem['attrs']['Type'].replace('http://schemas.openxmlformats.org/officeDocument/2006/relationships/', ''),
+          'target': relationshipArrayItem['attrs']['Target'].replace('../', 'ppt/')
         }
       }
     }
@@ -270,26 +261,22 @@ async function processSingleSlide(zip, sldFileName, themeContent, defaultTextSty
     diagramResObj,
     defaultTextStyle,
   }
-  // const bgElements = await getBackground(warpObj)
-  const bgColor = await getSlideBackgroundFill(warpObj)
+  const layoutElements = await getLayoutElements(warpObj)
+  const fill = await getSlideBackgroundFill(warpObj)
 
   const elements = []
   for (const nodeKey in nodes) {
-    if (nodes[nodeKey].constructor === Array) {
-      for (const node of nodes[nodeKey]) {
-        const ret = await processNodesInSlide(nodeKey, node, warpObj, 'slide')
-        if (ret) elements.push(ret)
-      }
-    } 
-    else {
-      const ret = await processNodesInSlide(nodeKey, nodes[nodeKey], warpObj, 'slide')
+    if (nodes[nodeKey].constructor !== Array) nodes[nodeKey] = [nodes[nodeKey]]
+    for (const node of nodes[nodeKey]) {
+      const ret = await processNodesInSlide(nodeKey, node, warpObj, 'slide')
       if (ret) elements.push(ret)
     }
   }
 
   return {
-    fill: bgColor,
+    fill,
     elements,
+    layoutElements,
     note,
   }
 }
@@ -307,56 +294,62 @@ function getNote(noteContent) {
     if (rNodes.constructor !== Array) rNodes = [rNodes]
     for (const rNode of rNodes) {
       const t = getTextByPathList(rNode, ['a:t'])
-      if (t) text += t
+      if (t && typeof t === 'string') text += t
     }
   }
   return text
 }
 
-// async function getBackground(warpObj) {
-//   const elements = []
-//   const slideLayoutContent = warpObj['slideLayoutContent']
-//   const slideMasterContent = warpObj['slideMasterContent']
-//   const nodesSldLayout = getTextByPathList(slideLayoutContent, ['p:sldLayout', 'p:cSld', 'p:spTree'])
-//   const nodesSldMaster = getTextByPathList(slideMasterContent, ['p:sldMaster', 'p:cSld', 'p:spTree'])
-
-//   const showMasterSp = getTextByPathList(slideLayoutContent, ['p:sldLayout', 'attrs', 'showMasterSp'])
-//   if (nodesSldLayout) {
-//     for (const nodeKey in nodesSldLayout) {
-//       if (nodesSldLayout[nodeKey].constructor === Array) {
-//         for (let i = 0; i < nodesSldLayout[nodeKey].length; i++) {
-//           const ph_type = getTextByPathList(nodesSldLayout[nodeKey][i], ['p:nvSpPr', 'p:nvPr', 'p:ph', 'attrs', 'type'])
-//           if (ph_type !== 'pic') {
-//             const ret = await processNodesInSlide(nodeKey, nodesSldLayout[nodeKey][i], warpObj, 'slideLayoutBg')
-//             if (ret) elements.push(ret)
-//           }
-//         }
-//       } 
-//       else {
-//         const ph_type = getTextByPathList(nodesSldLayout[nodeKey], ['p:nvSpPr', 'p:nvPr', 'p:ph', 'attrs', 'type'])
-//         if (ph_type !== 'pic') {
-//           const ret = await processNodesInSlide(nodeKey, nodesSldLayout[nodeKey], warpObj, 'slideLayoutBg')
-//           if (ret) elements.push(ret)
-//         }
-//       }
-//     }
-//   }
-//   if (nodesSldMaster && (showMasterSp === '1' || showMasterSp)) {
-//     for (const nodeKey in nodesSldMaster) {
-//       if (nodesSldMaster[nodeKey].constructor === Array) {
-//         for (let i = 0; i < nodesSldMaster[nodeKey].length; i++) {
-//           const ret = await processNodesInSlide(nodeKey, nodesSldMaster[nodeKey][i], warpObj, 'slideMasterBg')
-//           if (ret) elements.push(ret)
-//         }
-//       } 
-//       else {
-//         const ret = await processNodesInSlide(nodeKey, nodesSldMaster[nodeKey], warpObj, 'slideMasterBg')
-//         if (ret) elements.push(ret)
-//       }
-//     }
-//   }
-//   return elements
-// }
+async function getLayoutElements(warpObj) {
+  const elements = []
+  const slideLayoutContent = warpObj['slideLayoutContent']
+  const slideMasterContent = warpObj['slideMasterContent']
+  const nodesSldLayout = getTextByPathList(slideLayoutContent, ['p:sldLayout', 'p:cSld', 'p:spTree'])
+  const nodesSldMaster = getTextByPathList(slideMasterContent, ['p:sldMaster', 'p:cSld', 'p:spTree'])
+
+  const showMasterSp = getTextByPathList(slideLayoutContent, ['p:sldLayout', 'attrs', 'showMasterSp'])
+  if (nodesSldLayout) {
+    for (const nodeKey in nodesSldLayout) {
+      if (nodesSldLayout[nodeKey].constructor === Array) {
+        for (let i = 0; i < nodesSldLayout[nodeKey].length; i++) {
+          const ph = getTextByPathList(nodesSldLayout[nodeKey][i], ['p:nvSpPr', 'p:nvPr', 'p:ph'])
+          if (!ph) {
+            const ret = await processNodesInSlide(nodeKey, nodesSldLayout[nodeKey][i], warpObj, 'slideLayoutBg')
+            if (ret) elements.push(ret)
+          }
+        }
+      } 
+      else {
+        const ph = getTextByPathList(nodesSldLayout[nodeKey], ['p:nvSpPr', 'p:nvPr', 'p:ph'])
+        if (!ph) {
+          const ret = await processNodesInSlide(nodeKey, nodesSldLayout[nodeKey], warpObj, 'slideLayoutBg')
+          if (ret) elements.push(ret)
+        }
+      }
+    }
+  }
+  if (nodesSldMaster && showMasterSp !== '0') {
+    for (const nodeKey in nodesSldMaster) {
+      if (nodesSldMaster[nodeKey].constructor === Array) {
+        for (let i = 0; i < nodesSldMaster[nodeKey].length; i++) {
+          const ph = getTextByPathList(nodesSldMaster[nodeKey][i], ['p:nvSpPr', 'p:nvPr', 'p:ph'])
+          if (!ph) {
+            const ret = await processNodesInSlide(nodeKey, nodesSldMaster[nodeKey][i], warpObj, 'slideMasterBg')
+            if (ret) elements.push(ret)
+          }
+        }
+      } 
+      else {
+        const ph = getTextByPathList(nodesSldMaster[nodeKey], ['p:nvSpPr', 'p:nvPr', 'p:ph'])
+        if (!ph) {
+          const ret = await processNodesInSlide(nodeKey, nodesSldMaster[nodeKey], warpObj, 'slideMasterBg')
+          if (ret) elements.push(ret)
+        }
+      }
+    }
+  }
+  return elements
+}
 
 function indexNodes(content) {
   const keys = Object.keys(content)
@@ -402,13 +395,13 @@ async function processNodesInSlide(nodeKey, nodeValue, warpObj, source) {
 
   switch (nodeKey) {
     case 'p:sp': // Shape, Text
-      json = processSpNode(nodeValue, warpObj, source)
+      json = await processSpNode(nodeValue, warpObj, source)
       break
     case 'p:cxnSp': // Shape, Text
-      json = processCxnSpNode(nodeValue, warpObj, source)
+      json = await processCxnSpNode(nodeValue, warpObj, source)
       break
     case 'p:pic': // Image, Video, Audio
-      json = processPicNode(nodeValue, warpObj, source)
+      json = await processPicNode(nodeValue, warpObj, source)
       break
     case 'p:graphicFrame': // Chart, Diagram, Table
       json = await processGraphicFrameNode(nodeValue, warpObj, source)
@@ -421,7 +414,7 @@ async function processNodesInSlide(nodeKey, nodeValue, warpObj, source) {
         json = await processGroupSpNode(getTextByPathList(nodeValue, ['mc:Fallback']), warpObj, source)
       }
       else if (getTextByPathList(nodeValue, ['mc:Choice'])) {
-        json = await processMathNode(getTextByPathList(nodeValue, ['mc:Choice']))
+        json = processMathNode(getTextByPathList(nodeValue, ['mc:Choice']))
       }
       break
     default:
@@ -431,6 +424,7 @@ async function processNodesInSlide(nodeKey, nodeValue, warpObj, source) {
 }
 
 function processMathNode(node) {
+  const order = node['attrs']['order']
   const xfrmNode = getTextByPathList(node, ['p:sp', 'p:spPr', 'a:xfrm'])
   const { top, left } = getPosition(xfrmNode, undefined, undefined)
   const { width, height } = getSize(xfrmNode, undefined, undefined)
@@ -445,10 +439,12 @@ function processMathNode(node) {
     width, 
     height,
     latex,
+    order,
   }
 }
 
 async function processGroupSpNode(node, warpObj, source) {
+  const order = node['attrs']['order']
   const xfrmNode = getTextByPathList(node, ['p:grpSpPr', 'a:xfrm'])
   if (!xfrmNode) return null
 
@@ -488,6 +484,7 @@ async function processGroupSpNode(node, warpObj, source) {
     width: cx,
     height: cy,
     rotate,
+    order,
     elements: elements.map(element => ({
       ...element,
       left: (element.left - chx) * ws,
@@ -498,10 +495,11 @@ async function processGroupSpNode(node, warpObj, source) {
   }
 }
 
-function processSpNode(node, warpObj, source) {
+async function processSpNode(node, warpObj, source) {
   const name = getTextByPathList(node, ['p:nvSpPr', 'p:cNvPr', 'attrs', 'name'])
   const idx = getTextByPathList(node, ['p:nvSpPr', 'p:nvPr', 'p:ph', 'attrs', 'idx'])
   let type = getTextByPathList(node, ['p:nvSpPr', 'p:nvPr', 'p:ph', 'attrs', 'type'])
+  const order = getTextByPathList(node, ['attrs', 'order'])
 
   let slideLayoutSpNode, slideMasterSpNode
 
@@ -532,17 +530,18 @@ function processSpNode(node, warpObj, source) {
     else type = 'obj'
   }
 
-  return genShape(node, slideLayoutSpNode, slideMasterSpNode, name, type, warpObj)
+  return await genShape(node, slideLayoutSpNode, slideMasterSpNode, name, type, order, warpObj, source)
 }
 
-function processCxnSpNode(node, warpObj) {
+async function processCxnSpNode(node, warpObj, source) {
   const name = node['p:nvCxnSpPr']['p:cNvPr']['attrs']['name']
   const type = (node['p:nvCxnSpPr']['p:nvPr']['p:ph'] === undefined) ? undefined : node['p:nvSpPr']['p:nvPr']['p:ph']['attrs']['type']
+  const order = node['attrs']['order']
 
-  return genShape(node, undefined, undefined, name, type, warpObj)
+  return await genShape(node, undefined, undefined, name, type, order, warpObj, source)
 }
 
-function genShape(node, slideLayoutSpNode, slideMasterSpNode, name, type, warpObj) {
+async function genShape(node, slideLayoutSpNode, slideMasterSpNode, name, type, order, warpObj, source) {
   const xfrmList = ['p:spPr', 'a:xfrm']
   const slideXfrmNode = getTextByPathList(node, xfrmList)
   const slideLayoutXfrmNode = getTextByPathList(slideLayoutSpNode, xfrmList)
@@ -571,7 +570,7 @@ function genShape(node, slideLayoutSpNode, slideMasterSpNode, name, type, warpOb
   if (node['p:txBody']) content = genTextBody(node['p:txBody'], node, slideLayoutSpNode, type, warpObj)
 
   const { borderColor, borderWidth, borderType, strokeDasharray } = getBorder(node, type, warpObj)
-  const fillColor = getShapeFill(node, undefined, warpObj) || ''
+  const fill = await getShapeFill(node, undefined, warpObj, source) || ''
 
   let shadow
   const outerShdwNode = getTextByPathList(node, ['p:spPr', 'a:effectLst', 'a:outerShdw'])
@@ -589,13 +588,14 @@ function genShape(node, slideLayoutSpNode, slideMasterSpNode, name, type, warpOb
     borderWidth,
     borderType,
     borderStrokeDasharray: strokeDasharray,
-    fillColor,
+    fill,
     content,
     isFlipV,
     isFlipH,
     rotate,
     vAlign,
     name,
+    order,
   }
 
   if (shadow) data.shadow = shadow
@@ -605,6 +605,7 @@ function genShape(node, slideLayoutSpNode, slideMasterSpNode, name, type, warpOb
     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 = ''
 
     return {
       ...data,
@@ -614,6 +615,7 @@ function genShape(node, slideLayoutSpNode, slideMasterSpNode, name, type, warpOb
     }
   }
   if (shapType && (type === 'obj' || !type)) {
+    if (data.content && !hasValidText(data.content)) data.content = ''
     return {
       ...data,
       type: 'shape',
@@ -633,6 +635,8 @@ async function processPicNode(node, warpObj, source) {
   if (source === 'slideMasterBg') resObj = warpObj['masterResObj']
   else if (source === 'slideLayoutBg') resObj = warpObj['layoutResObj']
   else resObj = warpObj['slideResObj']
+
+  const order = node['attrs']['order']
   
   const rid = node['p:blipFill']['a:blip']['attrs']['r:embed']
   const imgName = resObj[rid]['target']
@@ -697,6 +701,7 @@ async function processPicNode(node, warpObj, source) {
       height,
       rotate,
       blob: videoBlob,
+      order,
     }
   } 
   if (videoNode && isVdeoLink) {
@@ -708,6 +713,7 @@ async function processPicNode(node, warpObj, source) {
       height,
       rotate,
       src: videoFile,
+      order,
     }
   }
   if (audioNode) {
@@ -719,6 +725,7 @@ async function processPicNode(node, warpObj, source) {
       height,
       rotate,
       blob: audioBlob,
+      order,
     }
   }
   return {
@@ -730,7 +737,8 @@ async function processPicNode(node, warpObj, source) {
     rotate,
     src,
     isFlipV,
-    isFlipH
+    isFlipH,
+    order,
   }
 }
 
@@ -740,25 +748,26 @@ async function processGraphicFrameNode(node, warpObj, source) {
   let result
   switch (graphicTypeUri) {
     case 'http://schemas.openxmlformats.org/drawingml/2006/table':
-      result = genTable(node, warpObj)
+      result = await genTable(node, warpObj)
       break
     case 'http://schemas.openxmlformats.org/drawingml/2006/chart':
       result = await genChart(node, warpObj)
       break
     case 'http://schemas.openxmlformats.org/drawingml/2006/diagram':
-      result = genDiagram(node, warpObj)
+      result = await genDiagram(node, warpObj)
       break
     case 'http://schemas.openxmlformats.org/presentationml/2006/ole':
       let oleObjNode = getTextByPathList(node, ['a:graphic', 'a:graphicData', 'mc:AlternateContent', 'mc:Fallback', 'p:oleObj'])
       if (!oleObjNode) oleObjNode = getTextByPathList(node, ['a:graphic', 'a:graphicData', 'p:oleObj'])
-      else processGroupSpNode(oleObjNode, warpObj, source)
+      if (oleObjNode) result = await processGroupSpNode(oleObjNode, warpObj, source)
       break
     default:
   }
   return result
 }
 
-function genTable(node, warpObj) {
+async function genTable(node, warpObj) {
+  const order = node['attrs']['order']
   const tableNode = getTextByPathList(node, ['a:graphic', 'a:graphicData', 'a:tbl'])
   const xfrmNode = getTextByPathList(node, ['p:xfrm'])
   const { top, left } = getPosition(xfrmNode, undefined, undefined)
@@ -875,7 +884,7 @@ function genTable(node, warpObj) {
           }
         }
         const text = genTextBody(tcNode['a:txBody'], tcNode, undefined, undefined, warpObj)
-        const cell = getTableCellParams(tcNode, thisTblStyle, a_sorce, warpObj)
+        const cell = await getTableCellParams(tcNode, thisTblStyle, a_sorce, warpObj)
         const td = { text }
         if (cell.rowSpan) td.rowSpan = cell.rowSpan
         if (cell.colSpan) td.colSpan = cell.colSpan
@@ -906,7 +915,7 @@ function genTable(node, warpObj) {
       }
 
       const text = genTextBody(tcNodes['a:txBody'], tcNodes, undefined, undefined, warpObj)
-      const cell = getTableCellParams(tcNodes, thisTblStyle, a_sorce, warpObj)
+      const cell = await getTableCellParams(tcNodes, thisTblStyle, a_sorce, warpObj)
       const td = { text }
       if (cell.rowSpan) td.rowSpan = cell.rowSpan
       if (cell.colSpan) td.colSpan = cell.colSpan
@@ -928,11 +937,13 @@ function genTable(node, warpObj) {
     width,
     height,
     data,
+    order,
     ...(tbl_border || {}),
   }
 }
 
 async function genChart(node, warpObj) {
+  const order = node['attrs']['order']
   const xfrmNode = getTextByPathList(node, ['p:xfrm'])
   const { top, left } = getPosition(xfrmNode, undefined, undefined)
   const { width, height } = getSize(xfrmNode, undefined, undefined)
@@ -942,7 +953,7 @@ async function genChart(node, warpObj) {
   const content = await readXmlFile(warpObj['zip'], refName)
   const plotArea = getTextByPathList(content, ['c:chartSpace', 'c:chart', 'c:plotArea'])
 
-  const chart = getChartInfo(plotArea)
+  const chart = getChartInfo(plotArea, warpObj)
 
   if (!chart) return {}
 
@@ -953,7 +964,9 @@ async function genChart(node, warpObj) {
     width,
     height,
     data: chart.data,
+    colors: chart.colors,
     chartType: chart.type,
+    order,
   }
   if (chart.marker !== undefined) data.marker = chart.marker
   if (chart.barDir !== undefined) data.barDir = chart.barDir
@@ -964,7 +977,8 @@ async function genChart(node, warpObj) {
   return data
 }
 
-function genDiagram(node, warpObj) {
+async function genDiagram(node, warpObj) {
+  const order = node['attrs']['order']
   const xfrmNode = getTextByPathList(node, ['p:xfrm'])
   const { left, top } = getPosition(xfrmNode, undefined, undefined)
   const { width, height } = getSize(xfrmNode, undefined, undefined)
@@ -973,7 +987,7 @@ function genDiagram(node, warpObj) {
   const elements = []
   if (dgmDrwSpArray) {
     for (const item of dgmDrwSpArray) {
-      const el = processSpNode(item, warpObj, 'diagramBg')
+      const el = await processSpNode(item, warpObj, 'diagramBg')
       if (el) elements.push(el)
     }
   }
@@ -985,5 +999,6 @@ function genDiagram(node, warpObj) {
     width,
     height,
     elements,
+    order,
   }
 }