Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix shadow types: inner and none #10

Merged
merged 2 commits into from
Aug 11, 2022
Merged

Fix shadow types: inner and none #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0eac3d6
Fix shadow bug for types 'inner' and 'none'
Aug 11, 2022
26fdfb2
Update demos
Aug 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions demos/browser/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,6 +743,14 @@ <h6 class="text-primary">Slide 4: Source URLs</h6>
<li>Source: URL variables</li>
</ul>
</div>
<div class="col">
<h6 class="text-primary">Slide 5: Image Shadows</h6>
<ul class="mb-0">
<li>Type: Outer</li>
<li>Type: None</li>
<li>Type: Inner</li>
</ul>
</div>
</div>
</div>
<div class="card-footer text-center">
Expand Down
27 changes: 27 additions & 0 deletions demos/modules/demo_image.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export function genSlides_Image(pptx) {
genSlide02(pptx);
genSlide03(pptx);
genSlide04(pptx);
genSlide05(pptx);
}

/**
Expand Down Expand Up @@ -279,3 +280,29 @@ function genSlide04(pptx) {
);
slide.addImage({ path: IMAGE_PATHS.sydneyBridge.path, x: 0.5, y: 5.16, h: 1.8, w: 12.33 });
}

/**
* SLIDE 5: Image Shadow
* @param {PptxGenJS} pptx
*/
function genSlide05(pptx) {
let slide = pptx.addSlide({ sectionTitle: "Images" });

slide.addTable([[{ text: "Image Examples: Shadows", options: BASE_TEXT_OPTS_L }, BASE_TEXT_OPTS_R]], BASE_TABLE_OPTS);
slide.addNotes("API Docs: https://gitbrent.github.io/PptxGenJS/docs/api-images.html");
slide.slideNumber = { x: "50%", y: "95%", w: 1, h: 1, color: COLOR_BLUE };

// EXAMPLES

// OUTER SHADOW
slide.addText("Shadow: `type:outer`, `opacity:0.5`, `blur:20`, `color:000000`, `offset:20`, `angle:270`", { x: 0.5, y: 0.6, w: 6.0, h: 0.3, color: COLOR_BLUE });
slide.addImage({ path: IMAGE_PATHS.tokyoSubway.path, x: 0.78, y: 2.46, w: 3.3, h: 2, shadow: {type: 'outer', opacity: 0.5, blur: 20, color: '000000', offset: 20, angle: 270} });

// NO SHADOW
slide.addText("Shadow: `type:none`", { x: 5, y: 1.2, w: 6.0, h: 0.3, color: COLOR_BLUE });
slide.addImage({ path: IMAGE_PATHS.tokyoSubway.path, x: 4.52, y: 2.46, w: 3.3, h: 2, shadow: {type: 'none'} });

// INNER SHADOW
slide.addText("Shadow: `type:inner`, `opacity:1`, `blur:20`, `color:000000`, `offset:20`, `angle:270`", { x: 8, y: 0.6, w: 6.0, h: 0.3, color: COLOR_BLUE });
slide.addImage({ path: IMAGE_PATHS.tokyoSubway.path, x: 8.42, y: 2.46, w: 3.3, h: 2, shadow: {type: 'inner', opacity: 1, blur: 20, color: '000000', offset: 20, angle: 270} });
}
21 changes: 11 additions & 10 deletions src/gen-xml.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ function slideObjectToXml(slide: PresSlide | SlideLayout): string {
}

// EFFECTS > SHADOW: REF: @see http://officeopenxml.com/drwSp-effects.php
if (slideItemObj.options.shadow) {
if (slideItemObj.options.shadow && slideItemObj.options.shadow.type !== 'none') {
slideItemObj.options.shadow.type = slideItemObj.options.shadow.type || 'outer'
slideItemObj.options.shadow.blur = valToPts(slideItemObj.options.shadow.blur || 8)
slideItemObj.options.shadow.offset = valToPts(slideItemObj.options.shadow.offset || 4)
Expand All @@ -533,12 +533,13 @@ function slideObjectToXml(slide: PresSlide | SlideLayout): string {
slideItemObj.options.shadow.color = slideItemObj.options.shadow.color || DEF_TEXT_SHADOW.color

strSlideXml += '<a:effectLst>'
strSlideXml += '<a:' + slideItemObj.options.shadow.type + 'Shdw sx="100000" sy="100000" kx="0" ky="0" '
strSlideXml += ' algn="bl" rotWithShape="0" blurRad="' + slideItemObj.options.shadow.blur + '" '
strSlideXml += '<a:' + slideItemObj.options.shadow.type + 'Shdw'
strSlideXml += slideItemObj.options.shadow.type === 'outer' ? ' sx="100000" sy="100000" kx="0" ky="0" algn="bl" rotWithShape="0"' : ''
strSlideXml += ' blurRad="' + slideItemObj.options.shadow.blur + '"'
strSlideXml += ' dist="' + slideItemObj.options.shadow.offset + '" dir="' + slideItemObj.options.shadow.angle + '">'
strSlideXml += '<a:srgbClr val="' + slideItemObj.options.shadow.color + '">'
strSlideXml += '<a:alpha val="' + slideItemObj.options.shadow.opacity + '"/></a:srgbClr>'
strSlideXml += '</a:outerShdw>'
strSlideXml += '</a:' + slideItemObj.options.shadow.type + 'Shdw>'
strSlideXml += '</a:effectLst>'
}

Expand Down Expand Up @@ -628,10 +629,9 @@ function slideObjectToXml(slide: PresSlide | SlideLayout): string {
strSlideXml += ' <a:ext cx="' + width + '" cy="' + height + '"/>'
strSlideXml += ' </a:xfrm>'
strSlideXml += ' <a:prstGeom prst="' + (rounding ? 'ellipse' : 'rect') + '"><a:avLst/></a:prstGeom>'
strSlideXml += solidFillXmlString
// UGH: COPY-PASTA FROM SHAPE

// EFFECTS > SHADOW: REF: @see http://officeopenxml.com/drwSp-effects.php
if (slideItemObj.options.shadow) {
if (slideItemObj.options.shadow && slideItemObj.options.shadow.type !== 'none') {
slideItemObj.options.shadow.type = slideItemObj.options.shadow.type || 'outer'
slideItemObj.options.shadow.blur = valToPts(slideItemObj.options.shadow.blur || 8)
slideItemObj.options.shadow.offset = valToPts(slideItemObj.options.shadow.offset || 4)
Expand All @@ -640,12 +640,13 @@ function slideObjectToXml(slide: PresSlide | SlideLayout): string {
slideItemObj.options.shadow.color = slideItemObj.options.shadow.color || DEF_TEXT_SHADOW.color

strSlideXml += '<a:effectLst>'
strSlideXml += '<a:' + slideItemObj.options.shadow.type + 'Shdw sx="100000" sy="100000" kx="0" ky="0" '
strSlideXml += ' algn="bl" rotWithShape="0" blurRad="' + slideItemObj.options.shadow.blur + '" '
strSlideXml += '<a:' + slideItemObj.options.shadow.type + 'Shdw'
strSlideXml += slideItemObj.options.shadow.type === 'outer' ? ' sx="100000" sy="100000" kx="0" ky="0" algn="bl" rotWithShape="0"' : ''
strSlideXml += ' blurRad="' + slideItemObj.options.shadow.blur + '"'
strSlideXml += ' dist="' + slideItemObj.options.shadow.offset + '" dir="' + slideItemObj.options.shadow.angle + '">'
strSlideXml += '<a:srgbClr val="' + slideItemObj.options.shadow.color + '">'
strSlideXml += '<a:alpha val="' + slideItemObj.options.shadow.opacity + '"/></a:srgbClr>'
strSlideXml += '</a:outerShdw>'
strSlideXml += '</a:' + slideItemObj.options.shadow.type + 'Shdw>'
strSlideXml += '</a:effectLst>'
}
strSlideXml += '</p:spPr>'
Expand Down