Skip to content

Fix: build error for default value in normalizeBorderToCSS #702

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

Merged
wyozi merged 4 commits into from
Feb 24, 2025
Merged

Fix: build error for default value in normalizeBorderToCSS #702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
481e73e
fix: default border color handling in normalizeBorderToCSS
juanesquintero Feb 23, 2025
6798f35
test: update image source URL in index.spec.tsx
juanesquintero Feb 23, 2025
bda9228
chore: update image source URL in pages and clean up whitespace
juanesquintero Feb 23, 2025
b5b63ac
chore: run format fot linter fix
juanesquintero Feb 23, 2025
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
12 changes: 6 additions & 6 deletions pages/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ const code = `ReactPPTX.render(
}}
/>
</Slide>

<Slide style={{ backgroundColor: "#DDDDDD" }}>
<Text style={{ x: 3, y: 1, w: 3, h: 0.5, fontSize: 32 }}>
<Text.Bullet>Adding bullet 1</Text.Bullet>
Expand All @@ -163,18 +163,18 @@ const code = `ReactPPTX.render(
</Slide>
<Slide>
<Image
src={{ kind: "path", path: "https://source.unsplash.com/random/800x600" }}
src={{ kind: "path", path: "https://picsum.photos/800/600" }}
style={{ x: "10%", y: "10%", w: "80%", h: "80%" }}
/>
</Slide>
<Slide>
<Table
rows={[
[<Table.Cell
colSpan={2}
style={{
align: "center",
backgroundColor: '#115599',
colSpan={2}
style={{
align: "center",
backgroundColor: '#115599',
color: 'white'
}}>
Title
Expand Down
2 changes: 1 addition & 1 deletion src/index.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ describe("test render", () => {
}}
>
<Image
src={{ kind: "path", path: "http://www.fillmurray.com/460/300" }}
src={{ kind: "path", path: "https://picsum.photos/460/300" }}
style={{ x: "10%", y: "10%", w: "80%", h: "80%" }}
/>
</Slide>
Expand Down
4 changes: 1 addition & 3 deletions src/preview/Preview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ const normalizedColorToCSS = (color: HexColor | ComplexColor) => {

const normalizeBorderToCSS = (style: InternalTableStyle) =>
`${style.borderWidth ?? 0}px solid ${
style.borderColor
? normalizedColorToCSS(style.borderColor)
: undefined ?? "transparent"
style.borderColor ? normalizedColorToCSS(style.borderColor) : undefined
}`;

const SlideObjectShape = ({ shape }: { shape: InternalShape }) => {
Expand Down
2 changes: 1 addition & 1 deletion src/renderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
const normalizedColorToPptxgenShapeFill = (
color: HexColor | ComplexColor | null | undefined
): pptxgen.ShapeFillProps | undefined => {
return typeof color === "string" ? { color: color } : color ?? undefined;
return typeof color === "string" ? { color: color } : (color ?? undefined);
};

const renderTextParts = (parts: InternalTextPart[]): PptxGenJs.TextProps[] => {
Expand Down
Loading