Merge pull request #702 from juanesquintero/master

Fix: build error for default value in normalizeBorderToCSS
wyozi · Feb 24, 2025 · 26d6859 · 26d6859
2 parents bd6ee5f + b5b63ac
commit 26d6859
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/pages/index.tsx b/pages/index.tsx
@@ -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>
@@ -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

diff --git a/src/index.spec.tsx b/src/index.spec.tsx
@@ -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>

diff --git a/src/preview/Preview.tsx b/src/preview/Preview.tsx
@@ -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 }) => {

diff --git a/src/renderer.ts b/src/renderer.ts
@@ -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[] => {