Merge branch 'main' into fix-container-height-reset-on-child-delete

FalkWolsky · web-flow · commit c9ca7b5a854c · 2023-07-27T14:02:38.000+02:00
diff --git a/client/packages/lowcoder/src/comps/comps/timelineComp/timelineComp.tsx b/client/packages/lowcoder/src/comps/comps/timelineComp/timelineComp.tsx
@@ -91,14 +91,15 @@ const TimelineComp = (
   return (
     <div
       style={{
-        margin: style.margin,
-        padding: style.padding,
-        width: widthCalculator(style.margin),
-        height: heightCalculator(style.margin),
+        margin: style.margin ?? '3px',
+        padding: style.padding ?? '3px',
+        width: widthCalculator(style.margin ?? '3px'),
+        height: heightCalculator(style.margin ?? '3px'),
         background: style.background,
         overflow: "auto",
         overflowX: "hidden",
         borderRadius: style.radius,
+        //height: '100%'
       }}
     >
       <Timeline
