@lowdefy/layout 4.1.0 → 4.2.0

package/dist/Area.js

@@ -16,19 +16,26 @@
 import { Row } from 'antd';
 import { blockDefaultProps } from '@lowdefy/block-utils';
 import gutterSetup from './gutterSetup.js';
-const Area = ({ area = {}, areaStyle, children, highlightBorders, id, makeCssClass })=>/*#__PURE__*/ React.createElement(Row, {
+import layoutParamsToArea from './layoutParamsToArea.js';
+const Area = ({ area = {}, areaKey, areaStyle, children, id, layout, makeCssClass })=>{
+    const derivedArea = layoutParamsToArea({
+        area,
+        areaKey,
+        layout
+    });
+    return /*#__PURE__*/ React.createElement(Row, {
         id: id,
-        align: area.align,
+        align: derivedArea.align,
         className: makeCssClass(areaStyle),
-        gutter: gutterSetup(area.gutter),
-        justify: area.justify,
+        gutter: gutterSetup(derivedArea.gutter),
+        justify: derivedArea.justify,
         style: {
             // antd keeps bottom margin which can cause overflow issues.
-            flexDirection: area.direction,
-            flexWrap: area.wrap,
-            overflow: area.overflow,
-            border: highlightBorders && '1px dashed red'
+            flexDirection: derivedArea.direction,
+            flexWrap: derivedArea.wrap,
+            overflow: derivedArea.overflow
         }
     }, children);
+};
 Area.defaultProps = blockDefaultProps;
 export default Area;

package/dist/BlockLayout.js

@@ -28,7 +28,7 @@ const alignSelf = (align)=>{
     }
     return align;
 };
-const BlockLayout = ({ id, blockStyle, children, highlightBorders, layout = {}, makeCssClass })=>{
+const BlockLayout = ({ id, blockStyle, children, layout = {}, makeCssClass })=>{
     if (layout.disabled) {
         return /*#__PURE__*/ React.createElement("div", {
             id: id,
@@ -38,8 +38,7 @@ const BlockLayout = ({ id, blockStyle, children, highlightBorders, layout = {},
     return /*#__PURE__*/ React.createElement(Col, {
         ...deriveLayout(layout),
         style: {
-            alignSelf: alignSelf(layout.align),
-            border: highlightBorders && '1px dashed #8eccf5'
+            alignSelf: alignSelf(layout.align)
         },
         id: id,
         className: makeCssClass(blockStyle)

package/dist/index.js

@@ -14,5 +14,4 @@
   limitations under the License.
 */ import Area from './Area.js';
 import BlockLayout from './BlockLayout.js';
-import layoutParamsToArea from './layoutParamsToArea.js';
-export { Area, BlockLayout, layoutParamsToArea };
+export { Area, BlockLayout };

package/dist/layoutParamsToArea.js

@@ -18,11 +18,11 @@ const layoutParamsToArea = ({ areaKey, area = {}, layout = {} })=>{
         return area;
     }
     area.align = type.isNone(area.align) ? layout.contentAlign : area.align;
-    area.justify = type.isNone(area.justify) ? layout.contentJustify : area.justify;
     area.direction = type.isNone(area.direction) ? layout.contentDirection : area.direction;
-    area.wrap = type.isNone(area.wrap) ? layout.contentWrap : area.wrap;
-    area.overflow = type.isNone(area.overflow) ? layout.contentOverflow : area.overflow;
     area.gutter = type.isNone(area.gutter) ? layout.contentGutter : area.gutter;
+    area.justify = type.isNone(area.justify) ? layout.contentJustify : area.justify;
+    area.overflow = type.isNone(area.overflow) ? layout.contentOverflow : area.overflow;
+    area.wrap = type.isNone(area.wrap) ? layout.contentWrap : area.wrap;
     return area;
 };
 export default layoutParamsToArea;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lowdefy/layout",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "license": "Apache-2.0",
   "description": "",
   "homepage": "https://lowdefy.com",
@@ -34,8 +34,8 @@
     "dist/*"
   ],
   "dependencies": {
-    "@lowdefy/block-utils": "4.1.0",
-    "@lowdefy/helpers": "4.1.0",
+    "@lowdefy/block-utils": "4.2.0",
+    "@lowdefy/helpers": "4.2.0",
     "antd": "4.24.14",
     "react": "18.2.0",
     "react-dom": "18.2.0"
@@ -43,8 +43,8 @@
   "devDependencies": {
     "@emotion/jest": "11.10.5",
     "@jest/globals": "28.1.3",
-    "@lowdefy/block-dev": "4.1.0",
-    "@lowdefy/jest-yaml-transform": "4.1.0",
+    "@lowdefy/block-dev": "4.2.0",
+    "@lowdefy/jest-yaml-transform": "4.2.0",
     "@swc/cli": "0.1.63",
     "@swc/core": "1.3.99",
     "@swc/jest": "0.2.29",