@openg2p/registry-widgets 1.1.2 → 1.1.3-dev.1

package/dist/index.js

@@ -406,9 +406,8 @@ const createZodSchema = (validation, required = false) => {
 const normalizeBooleanLike = (val) => {
     if (val === true || val === 1)
         return true;
-    if (val === false || val === 0 || val === null || val === undefined || val === '') {
+    if (val === false || val === 0)
         return false;
-    }
     if (typeof val === 'string') {
         const normalized = val.trim().toLowerCase();
         return normalized === 'true' || normalized === 'yes' || normalized === '1';
@@ -423,8 +422,11 @@ const evaluateCondition = (condition, allValues) => {
     const { operator, value } = condition;
     switch (operator) {
         case 'equals':
-            if (typeof value === 'boolean' || typeof fieldValue === 'boolean') {
-                return normalizeBooleanLike(fieldValue) === normalizeBooleanLike(value);
+            if (typeof value === 'boolean') {
+                return typeof fieldValue === 'boolean' && fieldValue === value;
+            }
+            if (typeof fieldValue === 'boolean') {
+                return fieldValue === normalizeBooleanLike(value);
             }
             return fieldValue === value;
         case 'notEquals':
@@ -10089,6 +10091,40 @@ const TableWidget = ({ config }) => {
 };
 
 const isUnsetRowValue = (value) => value === null || value === undefined || value === '';
+const buildDialogConditionValues = (row, columns) => {
+    let context = { ...row };
+    columns.forEach((col) => {
+        const columnKey = col['column-key'];
+        if (!columnKey || row[columnKey] === undefined) {
+            return;
+        }
+        const dataPath = col['widget-data-path'];
+        if (typeof dataPath === 'string' && dataPath) {
+            context = setValueByPath(context, dataPath, row[columnKey]);
+        }
+    });
+    return context;
+};
+const buildDialogColumnSegments = (columns) => {
+    const segments = [];
+    let index = 0;
+    while (index < columns.length) {
+        const group = columns[index]['column-group'];
+        if (group) {
+            const groupCols = [];
+            while (index < columns.length && columns[index]['column-group'] === group) {
+                groupCols.push(columns[index]);
+                index += 1;
+            }
+            segments.push({ type: 'group', group, cols: groupCols });
+        }
+        else {
+            segments.push({ type: 'single', col: columns[index] });
+            index += 1;
+        }
+    }
+    return segments;
+};
 /** Match TableWidget cell styling for add / update / delete rows */
 const getRowCellStyle = (editAction) => {
     if (editAction === 'ADD') {
@@ -10116,7 +10152,7 @@ const SelectDisplayValue = ({ config, value }) => {
     return jsxRuntimeExports.jsx("span", { children: selectedOption ? selectedOption.label : String(value) });
 };
 /** Isolated dialog field — avoids re-running data-source effects when sibling fields update. */
-const DialogTableField = React.memo(function DialogTableField({ col, cellWidgetId, dialogRowValues, isReadonly, }) {
+const DialogTableField = React.memo(function DialogTableField({ col, cellWidgetId, dialogConditionValues, isReadonly, }) {
     const widgetType = col.widget || 'text';
     const fieldConfig = React.useMemo(() => {
         return {
@@ -10129,9 +10165,9 @@ const DialogTableField = React.memo(function DialogTableField({ col, cellWidgetI
             'widget-data-path': undefined,
             'widget-data-default': col['widget-data-default'],
             'widget-data-options': undefined,
-            'widget-required': shouldRequireWidget(col['widget-data-options'], dialogRowValues, col['widget-required']),
+            'widget-required': shouldRequireWidget(col['widget-data-options'], dialogConditionValues, col['widget-required']),
         };
-    }, [col, cellWidgetId, dialogRowValues, isReadonly, widgetType]);
+    }, [col, cellWidgetId, dialogConditionValues, isReadonly, widgetType]);
     return (jsxRuntimeExports.jsx("div", { className: "min-w-0", children: jsxRuntimeExports.jsx(WidgetRenderer, { config: fieldConfig }) }));
 });
 /**
@@ -10268,12 +10304,14 @@ const DialogTableWidget = ({ config }) => {
         return row;
     });
     const dialogRowValues = dialogStoreValues;
+    const dialogConditionValues = React.useMemo(() => buildDialogConditionValues(dialogRowValues, columns), [dialogRowValues, columns]);
     const collectMergedRowPayload = React.useCallback(() => dialogStoreValues, [dialogStoreValues]);
     const finalizeDialogRowPayload = React.useCallback((raw) => {
+        const conditionValues = buildDialogConditionValues(raw, columns);
         const result = {};
         columns.forEach((col) => {
             const key = col['column-key'];
-            if (!shouldShowWidget(col['widget-data-options'], raw)) {
+            if (!shouldShowWidget(col['widget-data-options'], conditionValues)) {
                 return;
             }
             const val = raw[key];
@@ -10285,6 +10323,7 @@ const DialogTableWidget = ({ config }) => {
     }, [columns]);
     const saveDialog = React.useCallback(() => {
         const payload = collectMergedRowPayload();
+        const conditionValues = buildDialogConditionValues(payload, columns);
         let hasErrors = false;
         columns.forEach((col) => {
             const key = col['column-key'];
@@ -10292,10 +10331,10 @@ const DialogTableWidget = ({ config }) => {
             const isColReadonly = isReadonly || col['widget-readonly'] === true;
             if (isColReadonly)
                 return;
-            if (!shouldShowWidget(col['widget-data-options'], payload))
+            if (!shouldShowWidget(col['widget-data-options'], conditionValues))
                 return;
             const cellValue = payload[key];
-            const isRequired = shouldRequireWidget(col['widget-data-options'], payload, col['widget-required']);
+            const isRequired = shouldRequireWidget(col['widget-data-options'], conditionValues, col['widget-required']);
             const validationErrors = validateWidget(cellValue, col['widget-data-validation'], isRequired);
             if (validationErrors && validationErrors.length > 0) {
                 hasErrors = true;
@@ -10370,7 +10409,28 @@ const DialogTableWidget = ({ config }) => {
             return formatValue(cellValue, column['widget-data-format'], column.widget);
         return String(cellValue);
     }, [rows]);
-    const visibleDialogColumns = React.useMemo(() => columns.filter((col) => shouldShowWidget(col['widget-data-options'], dialogRowValues)), [columns, dialogRowValues]);
+    const dialogColumnSegments = React.useMemo(() => {
+        return buildDialogColumnSegments(columns)
+            .map((segment) => {
+            if (segment.type === 'single') {
+                if (!shouldShowWidget(segment.col['widget-data-options'], dialogConditionValues)) {
+                    return null;
+                }
+                return segment;
+            }
+            const visibleCols = segment.cols.filter((col) => shouldShowWidget(col['widget-data-options'], dialogConditionValues));
+            if (visibleCols.length === 0) {
+                return null;
+            }
+            return { type: 'group', group: segment.group, cols: visibleCols };
+        })
+            .filter((segment) => segment !== null);
+    }, [columns, dialogConditionValues]);
+    const renderDialogField = (col) => {
+        const key = col['column-key'];
+        const cellWidgetId = dialogFieldWidgetId(dialogSessionId, key);
+        return (jsxRuntimeExports.jsx(DialogTableField, { col: col, cellWidgetId: cellWidgetId, dialogConditionValues: dialogConditionValues, isReadonly: isReadonly }, `${dialogSessionId}-${key}`));
+    };
     const tableWidgetId = `dialog-table-widget-${widgetConfig['widget-id']}`;
     const columnSpan = widgetConfig['widget-column-span'] || 2;
     const minWidth = columnSpan * 200;
@@ -10442,10 +10502,11 @@ const DialogTableWidget = ({ config }) => {
                                         cursor: 'pointer',
                                         fontSize: '20px',
                                         lineHeight: 1,
-                                    }, "aria-label": "Close", children: "\u00D7" })] }), jsxRuntimeExports.jsx("div", { className: "grid grid-cols-1 md:grid-cols-2 gap-4", style: { maxHeight: '70vh', overflow: 'auto' }, children: visibleDialogColumns.map((col) => {
-                                const key = col['column-key'];
-                                const cellWidgetId = dialogFieldWidgetId(dialogSessionId, key);
-                                return (jsxRuntimeExports.jsx(DialogTableField, { col: col, cellWidgetId: cellWidgetId, dialogRowValues: dialogRowValues, isReadonly: isReadonly }, `${dialogSessionId}-${key}`));
+                                    }, "aria-label": "Close", children: "\u00D7" })] }), jsxRuntimeExports.jsx("div", { className: "grid grid-cols-1 md:grid-cols-2 gap-4", style: { maxHeight: '70vh', overflow: 'auto' }, children: dialogColumnSegments.map((segment) => {
+                                if (segment.type === 'single') {
+                                    return renderDialogField(segment.col);
+                                }
+                                return (jsxRuntimeExports.jsx("div", { className: "md:col-span-2 grid grid-cols-1 md:grid-cols-2 gap-4", children: segment.cols.map((col) => renderDialogField(col)) }, `${dialogSessionId}-group-${segment.group}`));
                             }) }, `dialog-fields-${dialogSessionId}`), jsxRuntimeExports.jsxs("div", { className: "flex justify-end gap-3 mt-6", children: [jsxRuntimeExports.jsx("button", { type: "button", onClick: closeDialog, className: "px-4 py-2 text-sm font-medium", style: {
                                         borderRadius: 'var(--owt-btn-border-radius, 10px)',
                                         border: '1px solid var(--owt-btn-secondary-border, #C4C4C4)',