Fixed types and added missing radius

hyperifyio · Jan 23, 2024 · fc4c994 · fc4c994
1 parent 206d686
commit fc4c994
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/entities/border/BorderEntity.ts b/entities/border/BorderEntity.ts
@@ -195,10 +195,12 @@ export class BorderEntity
         const width = this.getWidth();
         const color = this.getColor();
         const style = this.getStyle();
+        const radius = this.getRadius();
         return {
             border: `${ width ? width.getCssStyles() : '0' } ${
                 style
-            }${ color ? ' ' + color.getCssStyles() : '' }`
+            }${ color ? ' ' + color.getCssStyles() : '' }`,
+            ...(radius ? { borderRadius : radius.getCssStyles() } : {}),
         };
     }
 

diff --git a/entities/style/StyleDTO.ts b/entities/style/StyleDTO.ts
@@ -2,6 +2,7 @@
 
 import { BackgroundDTO } from "../background/BackgroundDTO";
 import { BorderDTO } from "../border/BorderDTO";
+import { BorderBoxDTO } from "../borderBox/BorderBoxDTO";
 import { ColorDTO } from "../color/ColorDTO";
 import { FontDTO } from "../font/FontDTO";
 import { SizeBoxDTO } from "../sizeBox/SizeBoxDTO";
@@ -18,7 +19,7 @@ export interface StyleDTO extends DTO {
     readonly height             ?: SizeDTO;
     readonly margin             ?: SizeDTO | SizeBoxDTO;
     readonly padding            ?: SizeDTO | SizeBoxDTO;
-    readonly border             ?: BorderDTO | [BorderDTO, BorderDTO] | [BorderDTO, BorderDTO, BorderDTO, BorderDTO];
+    readonly border             ?: BorderDTO | BorderBoxDTO;
     readonly font               ?: FontDTO;
     readonly textDecoration     ?: TextDecorationDTO;
     readonly background         ?: BackgroundDTO;