Skip to content

Commit

Permalink
Merge branch 'master' into add-reference-to-new-slides-created-by-tab…
Browse files Browse the repository at this point in the history
…le-auto-paging
  • Loading branch information
mikemeerschaert committed Oct 25, 2022
2 parents 47c481d + a18a36a commit 371cc97
Show file tree
Hide file tree
Showing 32 changed files with 10,305 additions and 5,942 deletions.
34 changes: 34 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/**
* @see https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/docs/rules/naming-convention.md
*/

module.exports = {
env: {
browser: true,
es2021: true,
node: true,
},
extends: [
"plugin:react/recommended",
"standard-with-typescript",
"plugin:@typescript-eslint/recommended",
],
overrides: [],
parserOptions: {
ecmaVersion: "latest",
sourceType: "module",
project: ["./tsconfig.json"],
},
plugins: ["react", "@typescript-eslint"],
ignorePatterns: [".eslintrc.js"],
rules: {
"@typescript-eslint/indent": ["error", "tab"],
"@typescript-eslint/strict-boolean-expressions": 0,
"comma-dangle": ["error", "only-multiline"],
"no-lone-blocks": 0,
"no-tabs": ["error", { allowIndentationTabs: true }],
indent: ["error", "tab", { "SwitchCase": 1, "ImportDeclaration": 1 }],
quotes: ["error", "single"],
semi: ["error", "never"],
},
};
47 changes: 20 additions & 27 deletions .github/ISSUE_TEMPLATE/user-template.md
Original file line number Diff line number Diff line change
@@ -1,48 +1,41 @@
---
name: User Template
about: Used for general issues, questions, etc.
title: "[QUESTION]"
about: Used for general issues, feature requests, etc.
title: "[BUG|FEATURE]"
labels: ''
assignees: ''

---

Thank you for reporting an issue, suggesting an enhancement, or asking a question.

We appreciate your feedback - to help the team understand your needs please complete the following template to ensure we have the details to help.

**Please check out the [Docs](https://gitbrent.github.io/PptxGenJS/) to see if your question is already addressed there.**
### Submission Guidelines

- **If you are not using the latest release, please update and see if the issue is resolved before submitting an issue**
- General questions or high-level topics should be posted in [Discussions](https://github.com/gitbrent/PptxGenJS/discussions)
- Please browse the online [Documentation](https://gitbrent.github.io/PptxGenJS/) to see if your question is already addressed there

### Issue Category

### Category
- [ ] Enhancement
- [ ] Bug
- [ ] Question
- [ ] Documentation gap/issue

### Version

Please specify what version of the library you are using: [ ]
### Product Versions

Please specify what version(s) of PowerPoint you are targeting: [ ]
- Please specify what version of the library you are using......: [ ]
- Please specify what version(s) of PowerPoint you are targeting: [ ]
- Please specify what web browser you are using.................: [ ]

Please specify what web browser you are using: [ ]

**If you are not using the latest release, please update and see if the issue is resolved before submitting an issue.**

### Expected / Desired Behavior / Question
*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!*
### Desired Behavior
<!--- 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. -->

### Observed Behavior
*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.*
<!--- 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. -->

### Steps to Reproduce
*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.*

### Submission Guidelines
*Delete this section after reading*
* All suggestions, questions and issues are welcome, please let us know what's on your mind.
* Remember to include sufficient details and context.
* Please check back occasionally on your issue as we may have follow up questions.
* If you have multiple suggestions, questions, or bugs please submit them in separate issues so we can track resolution.

Thank you for your feedback!
<!--- 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. -->
39 changes: 39 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# Submission Guidelines

- Only modify the `src/*.ts` files (do not submit `dist` or `src/bld` files)
- New and updated properties must be added to `src/core-interfaces.ts` and `types/index.d.ts`
- New and updated features must be included in the corresponding `demos/modules/*.mjs` file
- Review previously accepted changes for examples on what to provide

## Change Summary
<!--- Required: Provide a general summary of your changes -->

## Change Description
<!--- Optional: Describe your changes in detail if complex or summary is not sufficiently detailed -->
<!--- Optional: Describe any new npm libraries needed -->

## Change Type

- [ ] Bug fix
- [ ] New feature
- [ ] Documentation update

## Related Issue
<!--- Optional: If this change is targeted towards an existing Issue -->

## Motivation and Context
<!--- Required: Why is this change required? What does it add or what problem does it solve? -->

## Checklist before requesting a review

- [ ] If it is a core feature, I have added new code under `/demos/modules/`
- [ ] My code follows the style guidelines of this project
- [ ] My changes generate no new eslint warnings
- [ ] I have performed a self-review of my code
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have included code/tests that prove my fix is effective or that my feature works
- [ ] I have used the "Run All Demos" feature on the [browser demo](/demos/browser/index.html) and no errors were found

## Screenshots / Sample Code (if appropriate)

Thanks for your contribution!
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ demo
.docusaurus
build
docs
static
7 changes: 0 additions & 7 deletions .prettierrc.json

This file was deleted.

11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Notes]

## [3.12.0] - 2022-10-??

### Fixed

- Fixed gh-pages text api docs: transparency + wrap [\#1153](https://github.com/gitbrent/PptxGenJS/pull/1153) ([tjinauyeung](https://github.com/tjinauyeung))
- Fixed 3D chart options not working correctly (and updated demo) ([gitbrent](https://github.com/gitbrent))

### Changed

- [Internal] migrate library from tslint to eslint [\#1155](https://github.com/gitbrent/PptxGenJS/pull/1155) ([gitbrent](https://github.com/gitbrent))

## [3.11.0] - 2022-08-06

### Added
Expand Down
10 changes: 5 additions & 5 deletions demos/browser/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="author" content="https://github.com/gitbrent">
<meta name="website" content="https://github.com/gitbrent/PptxGenJS/">
<meta name="version" content="3.11.0">
<meta name="updated" content="2022-08-06">
<meta name="version" content="3.12.0-beta">
<meta name="updated" content="2022-08-14">
<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">
<link rel="icon" href="images/favicon.png">
Expand All @@ -28,9 +28,9 @@
crossorigin="anonymous"></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/modules/demos.mjs" type="module"></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/modules/demos.mjs" type="module"></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>
Expand All @@ -42,9 +42,9 @@
<script src="../modules/demos.mjs" type="module"></script>
-->
<!-- LOCAL TESTING: bundle
-->
<script src="./js/pptxgen.bundle.js"></script>
<script src="../modules/demos.mjs" type="module"></script>
-->

<script type="module">
import { buildDataTable, doAppStart, execGenSlidesFunc, runAllDemos, table2slides1, table2slides2, table2slidesDemoForTab } from './js/browser.js';
Expand Down
4 changes: 2 additions & 2 deletions demos/browser/js/pptxgen.bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion demos/browser/js/pptxgen.bundle.js.map

Large diffs are not rendered by default.

22 changes: 22 additions & 0 deletions demos/modules/demo_chart.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -762,6 +762,10 @@ function genSlide06(pptx) {
chartColors: COLORS_SPECTRUM,
chartColorsOpacity: 80,
//
v3DRotX: 20,
v3DRotY: 10,
v3DRAngAx: false,
//
catAxisLabelColor: COLORS_SPECTRUM[1],
catAxisLineColor: COLORS_SPECTRUM[1],
catAxisLabelFontFace: "Arial",
Expand Down Expand Up @@ -791,6 +795,11 @@ function genSlide06(pptx) {
chartColors: COLORS_SPECTRUM,
barDir: "col",
bar3DShape: "cylinder",
//
v3DRotX: 10,
v3DRotY: 20,
v3DRAngAx: false,
//
catAxisLabelColor: "0000CC",
catAxisLabelFontFace: "Courier",
catAxisLabelFontSize: 12,
Expand All @@ -817,6 +826,7 @@ function genSlide06(pptx) {
barDir: "col",
bar3DShape: "pyramid",
barGrouping: "stacked",
v3DRAngAx: true,
//
catAxisLabelFontFace: "Arial",
catAxisLabelFontSize: 10,
Expand All @@ -843,6 +853,7 @@ function genSlide06(pptx) {
chartColors: COLORS_ACCENT,
barDir: "col",
bar3DShape: "coneToMax",
v3DRAngAx: true,
//
catAxisLabelColor: COLORS_ACCENT[0],
catAxisLabelFontSize: 11,
Expand Down Expand Up @@ -1151,6 +1162,7 @@ function genSlide12(pptx) {
chartColors: COLORS_SPECTRUM,
dataBorder: { pt: 1, color: "404040" },
dataLabelColor: "f2f9fc",
showPercent: true,
showLegend: true,
legendPos: "t",
});
Expand All @@ -1165,6 +1177,7 @@ function genSlide12(pptx) {
chartColors: COLORS_SPECTRUM,
dataBorder: { pt: "1", color: "F1F1F1" },
showLegend: true,
showPercent: true,
legendPos: "t",
legendFontSize: 14,
showLeaderLines: true,
Expand Down Expand Up @@ -1202,6 +1215,7 @@ function genSlide12(pptx) {
dataBorder: { pt: "1", color: "F1F1F1" },
chartColors: COLORS_SPECTRUM,
dataLabelColor: "F1F1F1",
showPercent: true,
showLegend: true,
legendPos: "b",
});
Expand All @@ -1214,6 +1228,7 @@ function genSlide12(pptx) {
h: 3.2,
chartArea: { fill: { color: "F1F1F1" } },
dataBorder: { pt: "1", color: "F1F1F1" },
showPercent: true,
showLegend: true,
legendPos: "b",
showTitle: true,
Expand Down Expand Up @@ -1692,6 +1707,7 @@ function genSlide17(pptx) {
chartArea: { fill: { color: "F1F1F1" } },
catAxisMultiLevelLabels: true,
barDir: "col",
v3DRAngAx: true,
};

const opts4 = {
Expand Down Expand Up @@ -2236,6 +2252,12 @@ function genSlide21(pptx) {
showTitle: true,
title: "Rotated cyan shadow",
dataLabelColor: "FFFFFF",
/* NOTE: following are optional and default to `false`, leavign chart "plain" (without labels, etc.)
dataLabelFontSize: 9,
showLabel: true,
showValue: true,
showPercent: true,
*/
shadow: {
type: "outer",
blur: 10,
Expand Down
2 changes: 2 additions & 0 deletions demos/modules/demo_master.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ function genSlide04(pptx) {
slide.addImage({
placeholder: "body",
path: IMAGE_PATHS.starlabsBkgd.path,
w: 12.0,
h: 5.25,
});
}

Expand Down
4 changes: 2 additions & 2 deletions dist/pptxgen.bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/pptxgen.bundle.js.map

Large diffs are not rendered by default.

Loading

0 comments on commit 371cc97

Please sign in to comment.