From 154927404baf6b8553be9df326ad3162d3b4720e Mon Sep 17 00:00:00 2001 From: Nakul Nagargade Date: Thu, 6 Mar 2025 15:18:40 +0530 Subject: [PATCH 1/5] Fix alignment issues arising due to label width setting for input components --- frontend/src/_ui/Label.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/_ui/Label.jsx b/frontend/src/_ui/Label.jsx index 3cd7f886cb..721ac05203 100644 --- a/frontend/src/_ui/Label.jsx +++ b/frontend/src/_ui/Label.jsx @@ -13,6 +13,7 @@ function Label({ label, width, labelRef, color, defaultAlignment, direction, aut justifyContent: direction == 'right' ? 'flex-end' : 'flex-start', fontSize: '12px', height: defaultAlignment === 'top' && '20px', + overflow: 'hidden', }} >

Date: Fri, 7 Mar 2025 21:48:04 +0530 Subject: [PATCH 2/5] fix --- frontend/src/_ui/Label.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/_ui/Label.jsx b/frontend/src/_ui/Label.jsx index 721ac05203..443f4ddc6e 100644 --- a/frontend/src/_ui/Label.jsx +++ b/frontend/src/_ui/Label.jsx @@ -13,7 +13,7 @@ function Label({ label, width, labelRef, color, defaultAlignment, direction, aut justifyContent: direction == 'right' ? 'flex-end' : 'flex-start', fontSize: '12px', height: defaultAlignment === 'top' && '20px', - overflow: 'hidden', + overflow: auto ? 'visible' : 'hidden', }} >

Date: Tue, 11 Mar 2025 12:54:46 +0530 Subject: [PATCH 3/5] fix child component image widget width not correct --- frontend/src/AppBuilder/WidgetManager/widgets/listview.js | 1 + frontend/src/AppBuilder/WidgetManager/widgets/tabs.js | 1 + frontend/src/Editor/WidgetManager/configs/listview.js | 1 + frontend/src/Editor/WidgetManager/configs/tabs.js | 1 + server/src/modules/apps/services/widget-config/listview.js | 1 + server/src/modules/apps/services/widget-config/tabs.js | 1 + 6 files changed, 6 insertions(+) diff --git a/frontend/src/AppBuilder/WidgetManager/widgets/listview.js b/frontend/src/AppBuilder/WidgetManager/widgets/listview.js index fec2e812b4..62b55a7fea 100644 --- a/frontend/src/AppBuilder/WidgetManager/widgets/listview.js +++ b/frontend/src/AppBuilder/WidgetManager/widgets/listview.js @@ -13,6 +13,7 @@ export const listviewConfig = { top: 15, left: 3, height: 100, + width: 7, }, properties: ['source'], accessorKey: 'imageURL', diff --git a/frontend/src/AppBuilder/WidgetManager/widgets/tabs.js b/frontend/src/AppBuilder/WidgetManager/widgets/tabs.js index a397979a3e..0ed1e2a320 100644 --- a/frontend/src/AppBuilder/WidgetManager/widgets/tabs.js +++ b/frontend/src/AppBuilder/WidgetManager/widgets/tabs.js @@ -13,6 +13,7 @@ export const tabsConfig = { top: 60, left: 17, height: 100, + width: 7, }, tab: 0, properties: ['source'], diff --git a/frontend/src/Editor/WidgetManager/configs/listview.js b/frontend/src/Editor/WidgetManager/configs/listview.js index 25da8f73c6..86825142eb 100644 --- a/frontend/src/Editor/WidgetManager/configs/listview.js +++ b/frontend/src/Editor/WidgetManager/configs/listview.js @@ -13,6 +13,7 @@ export const listviewConfig = { top: 15, left: 3, height: 100, + width: 7, }, properties: ['source'], accessorKey: 'imageURL', diff --git a/frontend/src/Editor/WidgetManager/configs/tabs.js b/frontend/src/Editor/WidgetManager/configs/tabs.js index a397979a3e..0ed1e2a320 100644 --- a/frontend/src/Editor/WidgetManager/configs/tabs.js +++ b/frontend/src/Editor/WidgetManager/configs/tabs.js @@ -13,6 +13,7 @@ export const tabsConfig = { top: 60, left: 17, height: 100, + width: 7, }, tab: 0, properties: ['source'], diff --git a/server/src/modules/apps/services/widget-config/listview.js b/server/src/modules/apps/services/widget-config/listview.js index d710babbf0..fc8cd749ed 100644 --- a/server/src/modules/apps/services/widget-config/listview.js +++ b/server/src/modules/apps/services/widget-config/listview.js @@ -13,6 +13,7 @@ export const listviewConfig = { top: 15, left: 3, height: 100, + width: 7, }, properties: ['source'], accessorKey: 'imageURL', diff --git a/server/src/modules/apps/services/widget-config/tabs.js b/server/src/modules/apps/services/widget-config/tabs.js index a397979a3e..0ed1e2a320 100644 --- a/server/src/modules/apps/services/widget-config/tabs.js +++ b/server/src/modules/apps/services/widget-config/tabs.js @@ -13,6 +13,7 @@ export const tabsConfig = { top: 60, left: 17, height: 100, + width: 7, }, tab: 0, properties: ['source'], From fd36e3447026730393645f1c6b2c6b32967c669f Mon Sep 17 00:00:00 2001 From: Nakul Nagargade Date: Tue, 11 Mar 2025 13:08:52 +0530 Subject: [PATCH 4/5] fix in listview and kanban, confighandle is appearing for subcontainer child widgets --- .../AppBuilder/AppCanvas/ConfigHandle/ConfigHandle.jsx | 9 +++++---- frontend/src/AppBuilder/AppCanvas/WidgetWrapper.jsx | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/frontend/src/AppBuilder/AppCanvas/ConfigHandle/ConfigHandle.jsx b/frontend/src/AppBuilder/AppCanvas/ConfigHandle/ConfigHandle.jsx index bb4d4fc69b..84d31bc6ac 100644 --- a/frontend/src/AppBuilder/AppCanvas/ConfigHandle/ConfigHandle.jsx +++ b/frontend/src/AppBuilder/AppCanvas/ConfigHandle/ConfigHandle.jsx @@ -14,6 +14,7 @@ export const ConfigHandle = ({ showHandle, componentType, visibility, + subContainerIndex, }) => { const shouldFreeze = useStore((state) => state.getShouldFreeze()); const componentName = useStore((state) => state.getComponentDefinition(id)?.component?.name || '', shallow); @@ -35,12 +36,12 @@ export const ConfigHandle = ({ const anyComponentHovered = state.getHoveredComponentForGrid() !== '' || state.hoveredComponentBoundaryId !== ''; // If one component is hovered and one is selected, show the handle for the hovered component return ( - isWidgetHovered || - (showHandle && - (!isMultipleComponentsSelected || (isModal && isModalOpen)) && - !anyComponentHovered) + (subContainerIndex === 0 || subContainerIndex === null) && + (isWidgetHovered || + (showHandle && (!isMultipleComponentsSelected || (isModal && isModalOpen)) && !anyComponentHovered)) ); }, shallow); + let height = visibility === false ? 10 : widgetHeight; return ( diff --git a/frontend/src/AppBuilder/AppCanvas/WidgetWrapper.jsx b/frontend/src/AppBuilder/AppCanvas/WidgetWrapper.jsx index f583ebb53a..7758f29b68 100644 --- a/frontend/src/AppBuilder/AppCanvas/WidgetWrapper.jsx +++ b/frontend/src/AppBuilder/AppCanvas/WidgetWrapper.jsx @@ -90,6 +90,7 @@ const WidgetWrapper = memo( showHandle={isWidgetActive} componentType={componentType} visibility={visibility} + subContainerIndex={subContainerIndex} /> )} Date: Wed, 12 Mar 2025 11:26:05 +0530 Subject: [PATCH 5/5] Fix visibility and disable variables naming conventions --- frontend/src/Editor/Components/TextInput.jsx | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/frontend/src/Editor/Components/TextInput.jsx b/frontend/src/Editor/Components/TextInput.jsx index 29fbaaa625..ce482947a9 100644 --- a/frontend/src/Editor/Components/TextInput.jsx +++ b/frontend/src/Editor/Components/TextInput.jsx @@ -236,8 +236,6 @@ export const TextInput = function TextInput({ value: properties.value, isMandatory: isMandatory, isLoading: loading, - isVisible: visibility, - isDisabled: disable, }; setExposedVariables(exposedVariables); @@ -245,6 +243,17 @@ export const TextInput = function TextInput({ // eslint-disable-next-line react-hooks/exhaustive-deps }, []); + useEffect(() => { + // Fix for "visibility is not defined" in production because there's a naming conflict in the code. + // The issue is in the exposedVariables object where we had both a function named visibility and a property isVisible that depends on the state variable with the same name. + const exposedVariables = { + isVisible: visibility, + isDisabled: disable, + }; + setExposedVariables(exposedVariables); + // eslint-disable-next-line react-hooks/exhaustive-deps + }, []); + const setInputValue = (value) => { setValue(value); setExposedVariable('value', value);