From 119275f9ba5775401f81a23c7545851b6e7ec049 Mon Sep 17 00:00:00 2001 From: Arpit Date: Tue, 14 Dec 2021 16:49:12 +0530 Subject: [PATCH] [improvement] Widget components #1475 - container widget (#1488) * new implementation/image * Revert "new implementation/image" This reverts commit 637bd831082c0f32d13941a9d4632ffa872db7ac. * new implementation/container-widget * resolved Co-authored-by: Sherfin Shamsudeen --- frontend/src/Editor/Components/Container.jsx | 37 +++----------------- 1 file changed, 4 insertions(+), 33 deletions(-) diff --git a/frontend/src/Editor/Components/Container.jsx b/frontend/src/Editor/Components/Container.jsx index 30091ff47b..4de9252b27 100644 --- a/frontend/src/Editor/Components/Container.jsx +++ b/frontend/src/Editor/Components/Container.jsx @@ -1,49 +1,20 @@ import React, { useRef } from 'react'; import { SubCustomDragLayer } from '../SubCustomDragLayer'; import { SubContainer } from '../SubContainer'; -import { resolveReferences, resolveWidgetFieldValue } from '@/_helpers/utils'; -export const Container = function Container({ - id, - component, - width, - height, - containerProps, - currentState, - removeComponent, -}) { - const backgroundColor = component.definition.styles.backgroundColor.value; - const widgetVisibility = component.definition.styles?.visibility?.value ?? true; - const disabledState = component.definition.styles?.disabledState?.value ?? false; - - const parsedDisabledState = - typeof disabledState !== 'boolean' ? resolveWidgetFieldValue(disabledState, currentState) : disabledState; - - let parsedWidgetVisibility = widgetVisibility; - - try { - parsedWidgetVisibility = resolveReferences(parsedWidgetVisibility, currentState, []); - } catch (err) { - console.log(err); - } +export const Container = function Container({ id, width, height, containerProps, removeComponent, styles }) { + const { backgroundColor, visibility, disabledState } = styles; const computedStyles = { backgroundColor, height, - display: parsedWidgetVisibility ? 'flex' : 'none', + display: visibility ? 'flex' : 'none', }; const parentRef = useRef(null); return ( -
containerProps.onComponentClick(id, component)} - style={computedStyles} - > +