mirror/lowdefy
2
0
Fork 0
mirror of https://github.com/lowdefy/lowdefy.git synced 2025-01-30 13:50:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(layout): Apply area and layout default.

Browse Source
This commit is contained in:
Gervwyk 2022-06-27 12:24:00 +02:00
parent 0f57e648ef
commit af8611fddf
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/layout/src/Area.js
View File

@ -20,7 +20,7 @@ import { blockDefaultProps } from '@lowdefy/block-utils';
import gutterSetup from './gutterSetup.js';
const Area = ({ area, areaStyle, children, highlightBorders, id, makeCssClass }) => (
const Area = ({ area = {}, areaStyle, children, highlightBorders, id, makeCssClass }) => (
<Row
id={id}
align={area.align}

4
packages/layout/src/BlockLayout.js
View File

@ -32,8 +32,8 @@ const alignSelf = (align) => {
return align;
};
const BlockLayout = ({ id, blockStyle, children, highlightBorders, layout, makeCssClass }) => {
if (layout && layout.disabled) {
const BlockLayout = ({ id, blockStyle, children, highlightBorders, layout = {}, makeCssClass }) => {
if (layout.disabled) {
return (
<div id={id} className={makeCssClass(blockStyle)}>
{children}

2
packages/layout/src/layoutParamsToArea.js
View File

@ -16,7 +16,7 @@
import { type } from '@lowdefy/helpers';
const layoutParamsToArea = ({ areaKey, area, layout }) => {
const layoutParamsToArea = ({ areaKey, area = {}, layout = {} }) => {
if (areaKey !== 'content') {
return area;
}

9
packages/layout/src/tests/blocks/AutoBlockSim.js
View File

@ -15,7 +15,6 @@
*/
import React from 'react';
import { type } from '@lowdefy/helpers';
import { Area, BlockLayout, layoutParamsToArea } from '../../../src/index.js';
import Block from './Block.js';
@ -69,11 +68,11 @@ const AutoBlock = ({ block, makeCssClass, highlightBorders }) => {
content[areaKey] = (areaStyle) => (
<Area
area={layoutParamsToArea({
area: areas[areaKey] || {},
area: areas[areaKey],
areaKey,
layout: block.layout || {},
layout: block.layout,
})}
areaStyle={[areaStyle, type.isObject(areas[areaKey]) ? areas[areaKey].style : {}]}
areaStyle={[areaStyle, areas[areaKey]?.style]}
highlightBorders={highlightBorders}
id={`${block.id}-${areaKey}` + randomId()}
key={`${block.id}-${areaKey}`}
@ -115,7 +114,7 @@ const BindAutoBlock = ({ block, state, makeCssClass, highlightBorders }) => {
<BlockLayout
id={`bl-${block.id}` + randomId()}
highlightBorders={highlightBorders}
layout={block.layout || {}}
layout={block.layout}
blockStyle={block.style}
makeCssClass={makeCssClass}
>