Merge pull request #36 from singerla/bug-extended-chart

Merge pull request #35 from singerla/main

Author: singerla

src/classes/shape.ts

@@ -1,7 +1,7 @@
 import JSZip from 'jszip';
 
 import { XmlHelper } from '../helper/xml-helper';
-import { GeneralHelper, vd } from '../helper/general-helper';
+import { GeneralHelper } from '../helper/general-helper';
 import {
   ImportedElement,
   ShapeModificationCallback,
@@ -132,6 +132,8 @@ export class Shape {
       sourceElementOnTargetSlide,
     );
 
+    // vd(insertBefore);
+
     await XmlHelper.writeXmlToArchive(archive, slideFile, targetSlideXml);
   }
 

src/classes/slide.ts

@@ -6,8 +6,8 @@ import {
   AnalyzedElementType,
   ImportedElement,
   ImportElement,
-  SlideModificationCallback,
   ShapeModificationCallback,
+  SlideModificationCallback,
   SourceSlideIdentifier,
   StatusTracker,
 } from '../types/types';
@@ -17,14 +17,14 @@ import { PresTemplate } from '../interfaces/pres-template';
 import { RootPresTemplate } from '../interfaces/root-pres-template';
 import { ElementType } from '../enums/element-type';
 import {
+  HelperElement,
   RelationshipAttribute,
   SlideListAttribute,
-  HelperElement,
 } from '../types/xml-types';
 import { Image } from '../shapes/image';
 import { Chart } from '../shapes/chart';
 import { GenericShape } from '../shapes/generic';
-import { GeneralHelper, vd } from '../helper/general-helper';
+import { vd } from '../helper/general-helper';
 
 export class Slide implements ISlide {
   /**
@@ -102,7 +102,11 @@ export class Slide implements ISlide {
    * List of unsupported tags in slide xml
    * @internal
    */
-  unsupportedTags = ['p:custDataLst', 'mc:AlternateContent', 'a14:imgProps'];
+  unsupportedTags = [
+    'p:custDataLst',
+    //'mc:AlternateContent',
+    //'a14:imgProps',
+  ];
 
   constructor(params: {
     presentation: IPresentationProps;
@@ -268,11 +272,7 @@ export class Slide implements ISlide {
 
   /**
    * Remove a single element from slide.
-   * @param {string} presName - Filename or alias name of the template presentation.
-   * Must have been importet with Automizer.load().
-   * @param {number} slideNumber - Slide number within the specified template to search for the required element.
-   * @param {ShapeModificationCallback | ShapeModificationCallback[]} callback - One or more callback functions to apply.
-   * Depending on the shape type (e.g. chart or table), different arguments will be passed to the callback.
+   * @param {string} selector - Element's name on the slide.
    */
   removeElement(selector: string): this {
     const presName = this.sourceTemplate.name;

src/dev.ts

@@ -1,12 +1,4 @@
-import Automizer, {
-  ChartData,
-  modify,
-  TableRow,
-  TableRowStyle,
-  XmlHelper,
-} from './index';
-import { vd } from './helper/general-helper';
-import ModifyPresentationHelper from './helper/modify-presentation-helper';
+import Automizer, { ChartData, modify } from './index';
 
 const automizer = new Automizer({
   templateDir: `${__dirname}/../__tests__/pptx-templates`,
@@ -59,18 +51,34 @@ const run = async () => {
       //   }),
       // ]);
 
+      // slide.modifyElement('Waterfall 1', [
+      //   modify.setExtendedChartData(<ChartData>{
+      //     series: [{ label: 'series 1' }],
+      //     categories: [
+      //       { label: 'cat 2-1', values: [100] },
+      //       { label: 'cat 2-2', values: [20] },
+      //       { label: 'cat 2-3', values: [50] },
+      //       { label: 'cat 2-4', values: [-40] },
+      //       { label: 'cat 2-5', values: [130] },
+      //       { label: 'cat 2-6', values: [-60] },
+      //       { label: 'cat 2-7', values: [70] },
+      //       { label: 'cat 2-8', values: [140] },
+      //     ],
+      //   }),
+      // ]);
+
       slide.addElement('ChartWaterfall', 1, 'Waterfall 1', [
         modify.setExtendedChartData(<ChartData>{
           series: [{ label: 'series 1' }],
           categories: [
-            { label: 'cat 2-1', values: [50] },
-            { label: 'cat 2-2', values: [14] },
-            { label: 'cat 2-3', values: [15] },
-            { label: 'cat 2-4', values: [26] },
-            { label: 'cat 2-4', values: [26] },
-            { label: 'cat 2-4', values: [26] },
-            { label: 'cat 2-4', values: [26] },
-            { label: 'cat 2-4', values: [26] },
+            { label: 'cat 2-1', values: [100] },
+            { label: 'cat 2-2', values: [20] },
+            { label: 'cat 2-3', values: [50] },
+            { label: 'cat 2-4', values: [-40] },
+            { label: 'cat 2-5', values: [130] },
+            { label: 'cat 2-6', values: [-60] },
+            { label: 'cat 2-7', values: [70] },
+            { label: 'cat 2-8', values: [140] },
           ],
         }),
       ]);

src/helper/modify-chart-helper.ts

@@ -1,16 +1,14 @@
 import { ModifyChart } from '../modify/modify-chart';
 import { Workbook } from '../types/types';
 import {
-  ChartData,
+  ChartAxisRange,
   ChartBubble,
-  ChartSlot,
   ChartCategory,
-  ChartSeries,
+  ChartData,
   ChartPoint,
-  ChartAxisRange,
+  ChartSeries,
+  ChartSlot,
 } from '../types/chart-types';
-import { vd } from './general-helper';
-import { XmlHelper } from './xml-helper';
 import ModifyXmlHelper from './modify-xml-helper';
 
 export default class ModifyChartHelper {
@@ -229,7 +227,7 @@ export default class ModifyChartHelper {
 
       new ModifyChart(chart, workbook, data, slots).modifyExtended();
 
-      XmlHelper.dump(chart);
+      // XmlHelper.dump(chart);
       // XmlHelper.dump(workbook.table)
     };
 

src/shapes/chart.ts

@@ -4,11 +4,10 @@ import { XmlHelper } from '../helper/xml-helper';
 import { Shape } from '../classes/shape';
 import path from 'path';
 
-import { RelationshipAttribute, HelperElement } from '../types/xml-types';
+import { HelperElement, RelationshipAttribute } from '../types/xml-types';
 import { ImportedElement, Target, Workbook } from '../types/types';
 import { IChart } from '../interfaces/ichart';
 import { RootPresTemplate } from '../interfaces/root-pres-template';
-import { vd } from '../helper/general-helper';
 
 export class Chart extends Shape implements IChart {
   sourceWorksheet: number | string;
@@ -29,8 +28,13 @@ export class Chart extends Shape implements IChart {
 
     this.relRootTag = this.subtype === 'chart' ? 'c:chart' : 'cx:chart';
     this.relAttribute = 'r:id';
-    this.relParent = (element: Element) =>
-      element.parentNode.parentNode.parentNode as Element;
+    this.relParent =
+      this.subtype === 'chart'
+        ? (element: Element) =>
+            element.parentNode.parentNode.parentNode as Element
+        : (element: Element) =>
+            element.parentNode.parentNode.parentNode.parentNode
+              .parentNode as Element;
 
     this.wbEmbeddingsPath = `../embeddings/`;
     this.wbExtension = '.xlsx';
@@ -409,10 +413,15 @@ export class Chart extends Shape implements IChart {
   }
 
   appendChartToContentType(): Promise<HelperElement> {
+    const contentType =
+      this.subtype === 'chart'
+        ? 'application/vnd.openxmlformats-officedocument.drawingml.chart+xml'
+        : 'application/vnd.ms-office.chartex+xml';
+
     return XmlHelper.append(
       XmlHelper.createContentTypeChild(this.targetArchive, {
         PartName: `/ppt/charts/${this.subtype}${this.targetNumber}.xml`,
-        ContentType: `application/vnd.openxmlformats-officedocument.drawingml.chart+xml`,
+        ContentType: contentType,
       }),
     );
   }