Skip to content

Commit d2987c6

Browse files
committed
if: return null for else if not provided
1 parent cd2dcee commit d2987c6

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

src/property-handlers/if-element.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,8 @@ export class IfElementHandler extends CustomPropertyHandler {
168168
const ifChains: IfModel[] = widget.tempData.ifChains;
169169
const hasMultipleChild = ifChains.filter(a => a.childWidget.length > 1).length > 0 || widget.tempData.elseWidget && widget.tempData.elseWidget.length > 1;
170170
const elseWidget: WidgetModel[] = widget.tempData.elseWidget;
171-
const elseCode = elseWidget ? elseWidget.map(c => generateChildWidgetCode(c, tabsLevel + 1 + (hasMultipleChild ? 1 : 0))).join(`,\n${elseItemsTabs} `) : 'Container(width: 0, height: 0)';
171+
const defaultElseWidget = 'null'; //'Container(width: 0, height: 0)';
172+
const elseCode = elseWidget ? elseWidget.map(c => generateChildWidgetCode(c, tabsLevel + 1 + (hasMultipleChild ? 1 : 0))).join(`,\n${elseItemsTabs} `) : defaultElseWidget;
172173

173174
let code = `${hasMultipleChild ? '...' : ''}WidgetHelpers.ifElseChain${hasMultipleChild ? 'MultiChild' : ''}([\n${tabs} `;
174175
code += ifChains.map(a => {

src/property-handlers/if.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,12 @@ export class IfHandler extends CustomPropertyHandler {
5151
const data = widget.tempData;
5252
const wrappedWidget = widget.wrappedWidgets[0];
5353
const elseWidget = widget.wrappedWidgets[1];
54+
const defaultElseWidget = 'null'; //'Container(width: 0, height: 0)';
5455

5556
if (data && wrappedWidget) {
5657
code = `WidgetHelpers.ifTrue(${data.condition},
5758
${tabs} () => ${generateChildWidgetCode(wrappedWidget, tabsLevel + 1)},
58-
${tabs} () => ${elseWidget ? generateChildWidgetCode(elseWidget, tabsLevel + 1) : 'Container(width: 0, height: 0)'}
59+
${tabs} () => ${elseWidget ? generateChildWidgetCode(elseWidget, tabsLevel + 1) : defaultElseWidget}
5960
${tabs})`;
6061
}
6162

0 commit comments

Comments
 (0)