Skip to content

Commit caf9965

Browse files
Merge branch 'master' into fix
2 parents 405721e + a18a36a commit caf9965

32 files changed

+10306
-5942
lines changed

.eslintrc.js

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/**
2+
* @see https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/docs/rules/naming-convention.md
3+
*/
4+
5+
module.exports = {
6+
env: {
7+
browser: true,
8+
es2021: true,
9+
node: true,
10+
},
11+
extends: [
12+
"plugin:react/recommended",
13+
"standard-with-typescript",
14+
"plugin:@typescript-eslint/recommended",
15+
],
16+
overrides: [],
17+
parserOptions: {
18+
ecmaVersion: "latest",
19+
sourceType: "module",
20+
project: ["./tsconfig.json"],
21+
},
22+
plugins: ["react", "@typescript-eslint"],
23+
ignorePatterns: [".eslintrc.js"],
24+
rules: {
25+
"@typescript-eslint/indent": ["error", "tab"],
26+
"@typescript-eslint/strict-boolean-expressions": 0,
27+
"comma-dangle": ["error", "only-multiline"],
28+
"no-lone-blocks": 0,
29+
"no-tabs": ["error", { allowIndentationTabs: true }],
30+
indent: ["error", "tab", { "SwitchCase": 1, "ImportDeclaration": 1 }],
31+
quotes: ["error", "single"],
32+
semi: ["error", "never"],
33+
},
34+
};
+20-27
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,41 @@
11
---
22
name: User Template
3-
about: Used for general issues, questions, etc.
4-
title: "[QUESTION]"
3+
about: Used for general issues, feature requests, etc.
4+
title: "[BUG|FEATURE]"
55
labels: ''
66
assignees: ''
77

88
---
99

10-
Thank you for reporting an issue, suggesting an enhancement, or asking a question.
11-
1210
We appreciate your feedback - to help the team understand your needs please complete the following template to ensure we have the details to help.
1311

14-
**Please check out the [Docs](https://gitbrent.github.io/PptxGenJS/) to see if your question is already addressed there.**
12+
### Submission Guidelines
13+
14+
- **If you are not using the latest release, please update and see if the issue is resolved before submitting an issue**
15+
- General questions or high-level topics should be posted in [Discussions](https://github.com/gitbrent/PptxGenJS/discussions)
16+
- Please browse the online [Documentation](https://gitbrent.github.io/PptxGenJS/) to see if your question is already addressed there
17+
18+
### Issue Category
1519

16-
### Category
1720
- [ ] Enhancement
1821
- [ ] Bug
1922
- [ ] Question
2023
- [ ] Documentation gap/issue
2124

22-
### Version
23-
24-
Please specify what version of the library you are using: [ ]
25+
### Product Versions
2526

26-
Please specify what version(s) of PowerPoint you are targeting: [ ]
27+
- Please specify what version of the library you are using......: [ ]
28+
- Please specify what version(s) of PowerPoint you are targeting: [ ]
29+
- Please specify what web browser you are using.................: [ ]
2730

28-
Please specify what web browser you are using: [ ]
29-
30-
**If you are not using the latest release, please update and see if the issue is resolved before submitting an issue.**
31-
32-
### Expected / Desired Behavior / Question
33-
*If you are reporting an issue please describe the expected behavior. If you are suggesting an enhancement please describe thoroughly the enhancement, how it can be achieved, and expected benefit. If you are asking a question, ask away!*
31+
### Desired Behavior
32+
<!--- If you are reporting an issue please describe the expected behavior. -->
33+
<!--- If you are suggesting an enhancement please describe thoroughly the enhancement, how it can be achieved, and expected benefit. -->
3434

3535
### Observed Behavior
36-
*If you are reporting an issue please describe the behavior you expected to occur when performing the action. If you are making a suggestion or asking a question delete this section.*
36+
<!--- If you are reporting an issue please describe the behavior you expected to occur when performing the action. -->
37+
<!--- If you are making a suggestion or asking a question delete this section. -->
3738

3839
### Steps to Reproduce
39-
*If you are reporting an issue please describe the steps to reproduce the bug in sufficient detail to allow testing. If you are making a suggestion or asking a question delete this section.*
40-
41-
### Submission Guidelines
42-
*Delete this section after reading*
43-
* All suggestions, questions and issues are welcome, please let us know what's on your mind.
44-
* Remember to include sufficient details and context.
45-
* Please check back occasionally on your issue as we may have follow up questions.
46-
* If you have multiple suggestions, questions, or bugs please submit them in separate issues so we can track resolution.
47-
48-
Thank you for your feedback!
40+
<!--- If you are reporting an issue please describe the steps to reproduce the bug in sufficient detail to allow testing. -->
41+
<!--- If you are making a suggestion or asking a question delete this section. -->
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Submission Guidelines
2+
3+
- Only modify the `src/*.ts` files (do not submit `dist` or `src/bld` files)
4+
- New and updated properties must be added to `src/core-interfaces.ts` and `types/index.d.ts`
5+
- New and updated features must be included in the corresponding `demos/modules/*.mjs` file
6+
- Review previously accepted changes for examples on what to provide
7+
8+
## Change Summary
9+
<!--- Required: Provide a general summary of your changes -->
10+
11+
## Change Description
12+
<!--- Optional: Describe your changes in detail if complex or summary is not sufficiently detailed -->
13+
<!--- Optional: Describe any new npm libraries needed -->
14+
15+
## Change Type
16+
17+
- [ ] Bug fix
18+
- [ ] New feature
19+
- [ ] Documentation update
20+
21+
## Related Issue
22+
<!--- Optional: If this change is targeted towards an existing Issue -->
23+
24+
## Motivation and Context
25+
<!--- Required: Why is this change required? What does it add or what problem does it solve? -->
26+
27+
## Checklist before requesting a review
28+
29+
- [ ] If it is a core feature, I have added new code under `/demos/modules/`
30+
- [ ] My code follows the style guidelines of this project
31+
- [ ] My changes generate no new eslint warnings
32+
- [ ] I have performed a self-review of my code
33+
- [ ] I have commented my code, particularly in hard-to-understand areas
34+
- [ ] I have included code/tests that prove my fix is effective or that my feature works
35+
- [ ] I have used the "Run All Demos" feature on the [browser demo](/demos/browser/index.html) and no errors were found
36+
37+
## Screenshots / Sample Code (if appropriate)
38+
39+
Thanks for your contribution!

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ demo
1414
.docusaurus
1515
build
1616
docs
17+
static

.prettierrc.json

-7
This file was deleted.

CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Notes]
99

10+
## [3.12.0] - 2022-10-??
11+
12+
### Fixed
13+
14+
- Fixed gh-pages text api docs: transparency + wrap [\#1153](https://github.com/gitbrent/PptxGenJS/pull/1153) ([tjinauyeung](https://github.com/tjinauyeung))
15+
- Fixed 3D chart options not working correctly (and updated demo) ([gitbrent](https://github.com/gitbrent))
16+
17+
### Changed
18+
19+
- [Internal] migrate library from tslint to eslint [\#1155](https://github.com/gitbrent/PptxGenJS/pull/1155) ([gitbrent](https://github.com/gitbrent))
20+
1021
## [3.11.0] - 2022-08-06
1122

1223
### Added

demos/browser/index.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<meta name="viewport" content="width=device-width, initial-scale=1">
66
<meta name="author" content="https://github.com/gitbrent">
77
<meta name="website" content="https://github.com/gitbrent/PptxGenJS/">
8-
<meta name="version" content="3.11.0">
9-
<meta name="updated" content="2022-08-06">
8+
<meta name="version" content="3.12.0-beta">
9+
<meta name="updated" content="2022-08-14">
1010
<link rel="icon" href="images/favicon-32x32.png" sizes="32x32" type="image/png">
1111
<link rel="icon" href="images/favicon-16x16.png" sizes="16x16" type="image/png">
1212
<link rel="icon" href="images/favicon.png">
@@ -28,9 +28,9 @@
2828
crossorigin="anonymous"></script>
2929

3030
<!-- RELEASE (CDN)
31+
<script src="https://cdn.jsdelivr.net/gh/gitbrent/pptxgenjs@latest/dist/pptxgen.bundle.js"></script>
32+
<script src="https://cdn.jsdelivr.net/gh/gitbrent/pptxgenjs@latest/demos/modules/demos.mjs" type="module"></script>
3133
-->
32-
<script src="https://cdn.jsdelivr.net/gh/gitbrent/pptxgenjs@latest/dist/pptxgen.bundle.js"></script>
33-
<script src="https://cdn.jsdelivr.net/gh/gitbrent/pptxgenjs@latest/demos/modules/demos.mjs" type="module"></script>
3434
<!--
3535
TODO: [only used during `-beta` dev cycles; update to below on release]
3636
<script src="https://cdn.jsdelivr.net/gh/gitbrent/pptxgenjs@master/dist/pptxgen.bundle.js"></script>
@@ -42,9 +42,9 @@
4242
<script src="../modules/demos.mjs" type="module"></script>
4343
-->
4444
<!-- LOCAL TESTING: bundle
45+
-->
4546
<script src="./js/pptxgen.bundle.js"></script>
4647
<script src="../modules/demos.mjs" type="module"></script>
47-
-->
4848

4949
<script type="module">
5050
import { buildDataTable, doAppStart, execGenSlidesFunc, runAllDemos, table2slides1, table2slides2, table2slidesDemoForTab } from './js/browser.js';

demos/browser/js/pptxgen.bundle.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demos/browser/js/pptxgen.bundle.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

demos/modules/demo_chart.mjs

+22
Original file line numberDiff line numberDiff line change
@@ -762,6 +762,10 @@ function genSlide06(pptx) {
762762
chartColors: COLORS_SPECTRUM,
763763
chartColorsOpacity: 80,
764764
//
765+
v3DRotX: 20,
766+
v3DRotY: 10,
767+
v3DRAngAx: false,
768+
//
765769
catAxisLabelColor: COLORS_SPECTRUM[1],
766770
catAxisLineColor: COLORS_SPECTRUM[1],
767771
catAxisLabelFontFace: "Arial",
@@ -791,6 +795,11 @@ function genSlide06(pptx) {
791795
chartColors: COLORS_SPECTRUM,
792796
barDir: "col",
793797
bar3DShape: "cylinder",
798+
//
799+
v3DRotX: 10,
800+
v3DRotY: 20,
801+
v3DRAngAx: false,
802+
//
794803
catAxisLabelColor: "0000CC",
795804
catAxisLabelFontFace: "Courier",
796805
catAxisLabelFontSize: 12,
@@ -817,6 +826,7 @@ function genSlide06(pptx) {
817826
barDir: "col",
818827
bar3DShape: "pyramid",
819828
barGrouping: "stacked",
829+
v3DRAngAx: true,
820830
//
821831
catAxisLabelFontFace: "Arial",
822832
catAxisLabelFontSize: 10,
@@ -843,6 +853,7 @@ function genSlide06(pptx) {
843853
chartColors: COLORS_ACCENT,
844854
barDir: "col",
845855
bar3DShape: "coneToMax",
856+
v3DRAngAx: true,
846857
//
847858
catAxisLabelColor: COLORS_ACCENT[0],
848859
catAxisLabelFontSize: 11,
@@ -1151,6 +1162,7 @@ function genSlide12(pptx) {
11511162
chartColors: COLORS_SPECTRUM,
11521163
dataBorder: { pt: 1, color: "404040" },
11531164
dataLabelColor: "f2f9fc",
1165+
showPercent: true,
11541166
showLegend: true,
11551167
legendPos: "t",
11561168
});
@@ -1165,6 +1177,7 @@ function genSlide12(pptx) {
11651177
chartColors: COLORS_SPECTRUM,
11661178
dataBorder: { pt: "1", color: "F1F1F1" },
11671179
showLegend: true,
1180+
showPercent: true,
11681181
legendPos: "t",
11691182
legendFontSize: 14,
11701183
showLeaderLines: true,
@@ -1202,6 +1215,7 @@ function genSlide12(pptx) {
12021215
dataBorder: { pt: "1", color: "F1F1F1" },
12031216
chartColors: COLORS_SPECTRUM,
12041217
dataLabelColor: "F1F1F1",
1218+
showPercent: true,
12051219
showLegend: true,
12061220
legendPos: "b",
12071221
});
@@ -1214,6 +1228,7 @@ function genSlide12(pptx) {
12141228
h: 3.2,
12151229
chartArea: { fill: { color: "F1F1F1" } },
12161230
dataBorder: { pt: "1", color: "F1F1F1" },
1231+
showPercent: true,
12171232
showLegend: true,
12181233
legendPos: "b",
12191234
showTitle: true,
@@ -1692,6 +1707,7 @@ function genSlide17(pptx) {
16921707
chartArea: { fill: { color: "F1F1F1" } },
16931708
catAxisMultiLevelLabels: true,
16941709
barDir: "col",
1710+
v3DRAngAx: true,
16951711
};
16961712

16971713
const opts4 = {
@@ -2236,6 +2252,12 @@ function genSlide21(pptx) {
22362252
showTitle: true,
22372253
title: "Rotated cyan shadow",
22382254
dataLabelColor: "FFFFFF",
2255+
/* NOTE: following are optional and default to `false`, leavign chart "plain" (without labels, etc.)
2256+
dataLabelFontSize: 9,
2257+
showLabel: true,
2258+
showValue: true,
2259+
showPercent: true,
2260+
*/
22392261
shadow: {
22402262
type: "outer",
22412263
blur: 10,

demos/modules/demo_master.mjs

+2
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ function genSlide04(pptx) {
6969
slide.addImage({
7070
placeholder: "body",
7171
path: IMAGE_PATHS.starlabsBkgd.path,
72+
w: 12.0,
73+
h: 5.25,
7274
});
7375
}
7476

dist/pptxgen.bundle.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/pptxgen.bundle.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)