Updated for v3.3.1 release

gitbrent · Aug 23, 2020 · 46ba98d · 46ba98d
1 parent a522953
commit 46ba98d
Show file tree

Hide file tree

Showing 16 changed files with 74 additions and 38 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,8 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Notes]
 
 ## [3.3.1] - 2020-08-23
+### Changed
 - Fixed: Broken pptx has generated if used custom slide layout in v3.3.0 [\#826](https://github.com/gitbrent/PptxGenJS/issues/826) ([yhatt](https://github.com/yhatt))
 - Fixed: lineSpacing option set to decimal triggers repair alert  [\#827](https://github.com/gitbrent/PptxGenJS/issues/827) ([ReimaFrgos](https://github.com/ReimaFrgos))
+- Updated `demos.js` to replace all fill:string with fill:ShapeFillProps ([gitbrent](https://github.com/gitbrent))
 
 
 

diff --git a/README.md b/README.md
@@ -84,14 +84,14 @@ Use the online demo to create a simple presentation to see how easy it is to use
 Bundle: Modern Browsers and IE11
 
 ```html
-<script src="https://cdn.jsdelivr.net/gh/gitbrent/[email protected].0/dist/pptxgen.bundle.js"></script>
+<script src="https://cdn.jsdelivr.net/gh/gitbrent/[email protected].1/dist/pptxgen.bundle.js"></script>
 ```
 
 Min files: Modern Browsers
 
 ```html
-<script src="https://cdn.jsdelivr.net/gh/gitbrent/[email protected].0/libs/jszip.min.js"></script>
-<script src="https://cdn.jsdelivr.net/gh/gitbrent/[email protected].0/dist/pptxgen.min.js"></script>
+<script src="https://cdn.jsdelivr.net/gh/gitbrent/[email protected].1/libs/jszip.min.js"></script>
+<script src="https://cdn.jsdelivr.net/gh/gitbrent/[email protected].1/dist/pptxgen.min.js"></script>
 ```
 
 ## Download

diff --git a/RELEASES.md b/RELEASES.md
@@ -54,7 +54,7 @@ React Test
 
 1. Ensure newest `dist/pptxgen.es.js` and `types/index.d.ts` under local node_modules
 2. Update `demos/react-demo/package.json` version
-3. Open `demos/react-demo/src/latest/Test.tsx`
+3. Open `demos/react-demo/src/tstest/Test.tsx`
 4. Check existing code
 5. Test defs by using auto-complete, "pptxgen.ChartType." etc.
 

diff --git a/demos/browser/index.html b/demos/browser/index.html
@@ -5,7 +5,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 	<meta name="author" content="https://github.com/gitbrent">
 	<meta name="website" content="https://github.com/gitbrent/PptxGenJS/">
-	<meta name="version" content="3.3.1-beta">
+	<meta name="version" content="3.3.1">
 	<meta name="updated" content="2020-08-23">
 	<link rel="icon" href="images/favicon-32x32.png" sizes="32x32" type="image/png">
 	<link rel="icon" href="images/favicon-16x16.png" sizes="16x16" type="image/png">
@@ -146,9 +146,9 @@
 	<script src="https://cdn.jsdelivr.net/gh/gitbrent/pptxgenjs@latest/examples/images/base64Images.js" async></script>
 
 	<!-- RELEASE (CDN)
-		<script src="https://cdn.jsdelivr.net/gh/gitbrent/pptxgenjs@latest/dist/pptxgen.bundle.js"></script>
-		<script src="https://cdn.jsdelivr.net/gh/gitbrent/pptxgenjs@latest/demos/common/demos.js"></script>
 	-->
+	<script src="https://cdn.jsdelivr.net/gh/gitbrent/pptxgenjs@latest/dist/pptxgen.bundle.js"></script>
+	<script src="https://cdn.jsdelivr.net/gh/gitbrent/pptxgenjs@latest/demos/common/demos.js"></script>
 	<!--
 	TODO: [only used during `-beta` dev cycles; update to below on release]
 	<script src="https://cdn.jsdelivr.net/gh/gitbrent/pptxgenjs@master/dist/pptxgen.bundle.js"></script>
@@ -162,9 +162,9 @@
 	<!-- LOCAL TESTING:
 	<script src="../../libs/jszip.min.js"></script>
 	<script src="../../dist/pptxgen.min.js"></script>
-	-->
 	<script src="../../dist/pptxgen.bundle.js"></script>
 	<script src="../common/demos.js"></script>
+	-->
 
 	<script>
 		// ==================================================================================================================

diff --git a/demos/common/demos.js b/demos/common/demos.js
@@ -3,8 +3,8 @@
 * AUTH: Brent Ely (https://github.com/gitbrent/)
 * DESC: Common test/demo slides for all library features
 * DEPS: Used by various demos (./demos/browser, ./demos/node, etc.)
-* VER.: 3.4.0
-* BLD.: 20200817
+* VER.: 3.3.1
+* BLD.: 20200823
 */
 
 var isIE11 = typeof window !== 'undefined' && !!window['MSInputMethodContext'] && !!document['documentMode'];

diff --git a/demos/node/package.json b/demos/node/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "pptxgenjs-demos-node",
-	"version": "3.3.0",
+	"version": "3.3.1",
 	"author": {
 		"name": "Brent Ely",
 		"url": "https://github.com/gitbrent/"
@@ -15,6 +15,6 @@
 	},
 	"license": "MIT",
 	"dependencies": {
-		"pptxgenjs": "^3.3.0"
+		"pptxgenjs": "^3.3.1"
 	}
 }
diff --git a/demos/react-demo/package.json b/demos/react-demo/package.json
@@ -1,9 +1,9 @@
 {
 	"name": "pptxgenjs-react-demo",
-	"version": "3.3.0",
+	"version": "3.3.1",
 	"private": true,
 	"dependencies": {
-		"pptxgenjs": "^3.3.0",
+		"pptxgenjs": "^3.3.1",
 		"react": "^16.10.1",
 		"react-dom": "^16.10.1",
 		"react-scripts": "3.1.2"

diff --git a/demos/react-demo/src/tstest/Test.tsx b/demos/react-demo/src/tstest/Test.tsx
@@ -10,7 +10,7 @@ export function testMainMethods() {
 	// PPTX Method 1:
 	//pptx.layout = "LAYOUT_WIDE";
 	//pptx.defineLayout({ name:'A3', width:16.5, height:11.7 });
-	pptx.defineLayout({ name: 'TST', width: 13, height: 7 });
+	pptx.defineLayout({ name: 'TST', width: 13.4, height: 7.5 });
 	pptx.layout = 'TST';
 
 	// PPTX Method 2:
@@ -380,7 +380,7 @@ function testMethod_Shape(pptx: pptxgen) {
 		line: { color: "000000", width: 3 },
 	});
 	slide.addText("RIGHT-TRIANGLE", {
-		shape: pptx.ShapeType.triangle,
+		shape: pptx.ShapeType.rtTriangle,
 		align: "center",
 		x: 7.0,
 		y: 4.3,

diff --git a/dist/pptxgen.bundle.js b/dist/pptxgen.bundle.js
diff --git a/dist/pptxgen.bundle.js.map b/dist/pptxgen.bundle.js.map
diff --git a/dist/pptxgen.cjs.js b/dist/pptxgen.cjs.js
@@ -1,4 +1,4 @@
-/* PptxGenJS 3.3.0 @ 2020-08-17T04:25:01.746Z */
+/* PptxGenJS 3.3.1 @ 2020-08-23T19:00:27.029Z */
 'use strict';
 
 var JSZip = require('jszip');
@@ -2080,7 +2080,7 @@ function genXmlParagraphProperties(textObj, isDefault) {
             }
         }
         if (textObj.options.lineSpacing)
-            strXmlLnSpc = "<a:lnSpc><a:spcPts val=\"" + textObj.options.lineSpacing + "00\"/></a:lnSpc>";
+            strXmlLnSpc = "<a:lnSpc><a:spcPts val=\"" + textObj.options.lineSpacing * 100 + "\"/></a:lnSpc>";
         // OPTION: indent
         if (textObj.options.indentLevel && !isNaN(Number(textObj.options.indentLevel)) && textObj.options.indentLevel > 0) {
             paragraphPropXml += " lvl=\"" + textObj.options.indentLevel + "\"";
@@ -6039,7 +6039,7 @@ function createSvgPngPreview(rel) {
 |*|  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 |*|  SOFTWARE.
 \*/
-var VERSION = '3.3.0';
+var VERSION = '3.3.1';
 var PptxGenJS = /** @class */ (function () {
     function PptxGenJS() {
         var _this = this;
@@ -6566,6 +6566,19 @@ var PptxGenJS = /** @class */ (function () {
     PptxGenJS.prototype.addSlide = function (options) {
         // TODO: DEPRECATED: arg0 string "masterSlideName" dep as of 3.2.0
         var masterSlideName = typeof options === 'string' ? options : options && options.masterName ? options.masterName : '';
+        var slideLayout = {
+            _name: this.LAYOUTS[DEF_PRES_LAYOUT].name,
+            _presLayout: this.presLayout,
+            _rels: [],
+            _relsChart: [],
+            _relsMedia: [],
+            _slideNum: this.slides.length + 1,
+        };
+        if (masterSlideName) {
+            var tmpLayout = this.slideLayouts.filter(function (layout) { return layout._name === masterSlideName; })[0];
+            if (tmpLayout)
+                slideLayout = tmpLayout;
+        }
         var newSlide = new Slide({
             addSlide: this.addNewSlide,
             getSlide: this.getSlide,
@@ -6574,9 +6587,7 @@ var PptxGenJS = /** @class */ (function () {
             slideId: this.slides.length + 256,
             slideRId: this.slides.length + 2,
             slideNumber: this.slides.length + 1,
-            slideLayout: masterSlideName
-                ? this.slideLayouts.filter(function (layout) { return layout._name === masterSlideName; })[0] || this.LAYOUTS[DEF_PRES_LAYOUT]
-                : this.LAYOUTS[DEF_PRES_LAYOUT],
+            slideLayout: slideLayout
         });
         // A: Add slide to pres
         this._slides.push(newSlide);
@@ -6624,7 +6635,13 @@ var PptxGenJS = /** @class */ (function () {
             console.warn('defineLayout `height` should be a number (inches)');
         else if (typeof layout.width !== 'number')
             console.warn('defineLayout `width` should be a number (inches)');
-        this.LAYOUTS[layout.name] = { name: layout.name, _sizeW: Math.round(Number(layout.width) * EMU), _sizeH: Math.round(Number(layout.height) * EMU) };
+        this.LAYOUTS[layout.name] = {
+            name: layout.name,
+            _sizeW: Math.round(Number(layout.width) * EMU),
+            _sizeH: Math.round(Number(layout.height) * EMU),
+            width: Math.round(Number(layout.width) * EMU),
+            height: Math.round(Number(layout.height) * EMU),
+        };
     };
     /**
      * Create a new slide master [layout] for the Presentation

diff --git a/dist/pptxgen.es.js b/dist/pptxgen.es.js
@@ -1,4 +1,4 @@
-/* PptxGenJS 3.3.0 @ 2020-08-17T04:25:01.751Z */
+/* PptxGenJS 3.3.1 @ 2020-08-23T19:00:27.034Z */
 import * as JSZip from 'jszip';
 
 /**
@@ -2078,7 +2078,7 @@ function genXmlParagraphProperties(textObj, isDefault) {
             }
         }
         if (textObj.options.lineSpacing)
-            strXmlLnSpc = "<a:lnSpc><a:spcPts val=\"" + textObj.options.lineSpacing + "00\"/></a:lnSpc>";
+            strXmlLnSpc = "<a:lnSpc><a:spcPts val=\"" + textObj.options.lineSpacing * 100 + "\"/></a:lnSpc>";
         // OPTION: indent
         if (textObj.options.indentLevel && !isNaN(Number(textObj.options.indentLevel)) && textObj.options.indentLevel > 0) {
             paragraphPropXml += " lvl=\"" + textObj.options.indentLevel + "\"";
@@ -6037,7 +6037,7 @@ function createSvgPngPreview(rel) {
 |*|  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 |*|  SOFTWARE.
 \*/
-var VERSION = '3.3.0';
+var VERSION = '3.3.1';
 var PptxGenJS = /** @class */ (function () {
     function PptxGenJS() {
         var _this = this;
@@ -6564,6 +6564,19 @@ var PptxGenJS = /** @class */ (function () {
     PptxGenJS.prototype.addSlide = function (options) {
         // TODO: DEPRECATED: arg0 string "masterSlideName" dep as of 3.2.0
         var masterSlideName = typeof options === 'string' ? options : options && options.masterName ? options.masterName : '';
+        var slideLayout = {
+            _name: this.LAYOUTS[DEF_PRES_LAYOUT].name,
+            _presLayout: this.presLayout,
+            _rels: [],
+            _relsChart: [],
+            _relsMedia: [],
+            _slideNum: this.slides.length + 1,
+        };
+        if (masterSlideName) {
+            var tmpLayout = this.slideLayouts.filter(function (layout) { return layout._name === masterSlideName; })[0];
+            if (tmpLayout)
+                slideLayout = tmpLayout;
+        }
         var newSlide = new Slide({
             addSlide: this.addNewSlide,
             getSlide: this.getSlide,
@@ -6572,9 +6585,7 @@ var PptxGenJS = /** @class */ (function () {
             slideId: this.slides.length + 256,
             slideRId: this.slides.length + 2,
             slideNumber: this.slides.length + 1,
-            slideLayout: masterSlideName
-                ? this.slideLayouts.filter(function (layout) { return layout._name === masterSlideName; })[0] || this.LAYOUTS[DEF_PRES_LAYOUT]
-                : this.LAYOUTS[DEF_PRES_LAYOUT],
+            slideLayout: slideLayout
         });
         // A: Add slide to pres
         this._slides.push(newSlide);
@@ -6622,7 +6633,13 @@ var PptxGenJS = /** @class */ (function () {
             console.warn('defineLayout `height` should be a number (inches)');
         else if (typeof layout.width !== 'number')
             console.warn('defineLayout `width` should be a number (inches)');
-        this.LAYOUTS[layout.name] = { name: layout.name, _sizeW: Math.round(Number(layout.width) * EMU), _sizeH: Math.round(Number(layout.height) * EMU) };
+        this.LAYOUTS[layout.name] = {
+            name: layout.name,
+            _sizeW: Math.round(Number(layout.width) * EMU),
+            _sizeH: Math.round(Number(layout.height) * EMU),
+            width: Math.round(Number(layout.width) * EMU),
+            height: Math.round(Number(layout.height) * EMU),
+        };
     };
     /**
      * Create a new slide master [layout] for the Presentation

diff --git a/dist/pptxgen.min.js b/dist/pptxgen.min.js
diff --git a/dist/pptxgen.min.js.map b/dist/pptxgen.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pptxgenjs",
-  "version": "3.3.1-beta",
+  "version": "3.3.1",
   "author": {
     "name": "Brent Ely",
     "url": "https://github.com/gitbrent/"

diff --git a/src/pptxgen.ts b/src/pptxgen.ts
@@ -85,7 +85,7 @@ import * as genMedia from './gen-media'
 import * as genTable from './gen-tables'
 import * as genXml from './gen-xml'
 
-const VERSION = '3.3.1-beta-20200823:1122'
+const VERSION = '3.3.1'
 
 export default class PptxGenJS implements IPresentationProps {
 	// Property getters/setters