@openg2p/registry-widgets 1.1.2-dev.8 → 1.1.2

package/dist/index.js

@@ -2244,12 +2244,145 @@ const geoHierarchyBuilder = new GeoHierarchyBuilder();
 /** Sentinel written to Redux when a geo level is cleared by cascade (distinct from "never set"). */
 const GEO_LEVEL_CLEARED = null;
 const geoWidgetParentRegistry = new Map();
+const geoWidgetConfigRegistry = new Map();
 function registerGeoWidgetParent(widgetId, parentWidgetId) {
     geoWidgetParentRegistry.set(widgetId, parentWidgetId || null);
 }
 function unregisterGeoWidgetParent(widgetId) {
     geoWidgetParentRegistry.delete(widgetId);
 }
+function registerGeoWidget(widgetId, geoConfig, dataPath) {
+    if (typeof dataPath !== 'string') {
+        return;
+    }
+    const parentWidgetId = geoConfig.parentWidgetId?.trim() ? geoConfig.parentWidgetId : null;
+    registerGeoWidgetParent(widgetId, parentWidgetId);
+    geoWidgetConfigRegistry.set(widgetId, {
+        widgetId,
+        parentWidgetId,
+        level: geoConfig.level,
+        geoConfig,
+        dataPath,
+        groupId: getGeoGroupId(dataPath),
+    });
+}
+function unregisterGeoWidget(widgetId) {
+    unregisterGeoWidgetParent(widgetId);
+    geoWidgetConfigRegistry.delete(widgetId);
+}
+function orderGeoWidgetRegistrations(registrations) {
+    if (registrations.length <= 1) {
+        return registrations;
+    }
+    const roots = registrations.filter((entry) => !entry.parentWidgetId);
+    if (roots.length === 0) {
+        return registrations;
+    }
+    const ordered = [];
+    let current = roots[0];
+    const visited = new Set();
+    while (current && !visited.has(current.widgetId)) {
+        visited.add(current.widgetId);
+        ordered.push(current);
+        current = registrations.find((entry) => entry.parentWidgetId === current.widgetId);
+    }
+    return ordered.length > 0 ? ordered : registrations;
+}
+function resolveLevelValueId(rawValue) {
+    if (rawValue === null || rawValue === undefined || rawValue === '') {
+        return null;
+    }
+    if (typeof rawValue === 'string' || typeof rawValue === 'number') {
+        return String(rawValue);
+    }
+    if (typeof rawValue === 'object') {
+        const id = rawValue.level_value_id || rawValue.id || rawValue.value;
+        return id != null && id !== '' ? String(id) : null;
+    }
+    return null;
+}
+function resolveStoredMnemonic(values, registration, valueId) {
+    const stored = getWidgetValue(values, registration.dataPath, registration.widgetId);
+    const hierarchy = stored?.hierarchy || stored?.geo_code_hierarchy_json?.hierarchy;
+    if (!Array.isArray(hierarchy)) {
+        return undefined;
+    }
+    const levelData = hierarchy.find((entry) => entry.level === registration.level);
+    if (levelData && String(levelData.level_value_id) === String(valueId)) {
+        return levelData.level_value_mnemonic ? String(levelData.level_value_mnemonic) : undefined;
+    }
+    return undefined;
+}
+/** Resolve display mnemonic from cached dropdown options, then stored hierarchy. */
+function createGeoLevelMnemonicResolver(values, dataSources) {
+    return (registration, valueId) => {
+        const options = dataSources[registration.widgetId];
+        const option = options?.find((entry) => String(entry.value) === String(valueId));
+        if (option?.label) {
+            return option.label;
+        }
+        return resolveStoredMnemonic(values, registration, valueId);
+    };
+}
+/** Rebuild group hierarchy from widget values in parent→child order; stop at first missing level. */
+function rebuildGeoHierarchyFromRegistrations(groupId, values, registrations, resolveMnemonic) {
+    const ordered = orderGeoWidgetRegistrations(registrations.filter((entry) => entry.groupId === groupId));
+    geoHierarchyBuilder.clear(groupId);
+    for (const registration of ordered) {
+        const rawValue = resolveGeoWidgetLevelValue(values, registration.widgetId, registration.dataPath, registration.geoConfig);
+        const valueId = resolveLevelValueId(rawValue);
+        if (!valueId) {
+            break;
+        }
+        const mnemonic = resolveMnemonic?.(registration, valueId) ??
+            resolveStoredMnemonic(values, registration, valueId) ??
+            valueId;
+        geoHierarchyBuilder.addLevel(registration.level, valueId, mnemonic, groupId);
+    }
+    return geoHierarchyBuilder.buildHierarchyJson(groupId) !== null;
+}
+function collectGeoWidgetRegistrationsFromWidgets(widgets, namespace) {
+    return widgets
+        .filter((widget) => widget['widget-geo-config'] && typeof widget['widget-data-path'] === 'string')
+        .map((widget) => {
+        const originalWidgetId = widget['widget-id'];
+        const originalDataPath = widget['widget-data-path'];
+        const geoConfig = widget['widget-geo-config'];
+        const widgetId = namespace ? `${namespace}__${originalWidgetId}` : originalWidgetId;
+        const parentWidgetId = geoConfig.parentWidgetId?.trim()
+            ? (namespace ? `${namespace}__${geoConfig.parentWidgetId}` : geoConfig.parentWidgetId)
+            : null;
+        const dataPath = namespace ? `${namespace}.${originalDataPath}` : originalDataPath;
+        return {
+            widgetId,
+            parentWidgetId,
+            level: geoConfig.level,
+            geoConfig,
+            dataPath,
+            groupId: getGeoGroupId(dataPath),
+        };
+    });
+}
+/** Reconcile all geo groups in section values before save. */
+function reconcileGeoHierarchiesInValues(values, registrations, dataSources = {}) {
+    const groupIds = [...new Set(registrations.map((entry) => entry.groupId))];
+    let updatedValues = values;
+    const resolveMnemonic = createGeoLevelMnemonicResolver(updatedValues, dataSources);
+    for (const groupId of groupIds) {
+        const groupRegistrations = registrations.filter((entry) => entry.groupId === groupId);
+        const dataPath = groupRegistrations[0]?.dataPath;
+        const widgetId = groupRegistrations[0]?.widgetId;
+        if (!dataPath || !widgetId) {
+            continue;
+        }
+        rebuildGeoHierarchyFromRegistrations(groupId, updatedValues, groupRegistrations, resolveMnemonic);
+        updatedValues = applySharedGeoHierarchyToValues(updatedValues, groupId, dataPath, widgetId);
+    }
+    return updatedValues;
+}
+function getGeoWidgetRegistrationsInGroup(groupId) {
+    return orderGeoWidgetRegistrations([...geoWidgetConfigRegistry.values()].filter((entry) => entry.groupId === groupId));
+}
 /** True when changedWidgetId is any upstream geo parent of widgetId (not only immediate parent). */
 function isUpstreamGeoAncestor(changedWidgetId, widgetId, immediateParentWidgetId) {
     if (changedWidgetId === widgetId) {
@@ -2344,7 +2477,7 @@ function resetAndSeedGeoHierarchyFromValues(values, dataPath, widgetId, groupId)
 
 // Define stable empty arrays to avoid selector reference issues
 const EMPTY_ERRORS = [];
-const EMPTY_DATA_SOURCE$1 = [];
+const EMPTY_DATA_SOURCE = [];
 const useBaseWidget = (options) => {
     const { config, dataSourceRequestHandler: propHandler, schemaData, onValueChange } = options;
     const dispatch = reactRedux.useDispatch();
@@ -2359,7 +2492,7 @@ const useBaseWidget = (options) => {
     const errors = reactRedux.useSelector((state) => state.widget.errors[widgetId] ?? EMPTY_ERRORS);
     const touched = reactRedux.useSelector((state) => state.widget.touched[widgetId] || false);
     const loading = reactRedux.useSelector((state) => state.widget.loading[widgetId] || false);
-    const dataSourceOptions = reactRedux.useSelector((state) => state.widget.dataSources[widgetId] ?? EMPTY_DATA_SOURCE$1);
+    const dataSourceOptions = reactRedux.useSelector((state) => state.widget.dataSources[widgetId] ?? EMPTY_DATA_SOURCE);
     // Skip value handling for layout widgets (they don't store data values)
     // Infer layout from widget-type
     const isLayoutWidget = config['widget-type'] === 'layout';
@@ -2681,6 +2814,8 @@ const useBaseWidget = (options) => {
     const apiService = dataSource?.type === 'api' ? dataSource.service : '';
     const apiEndpoint = dataSource?.type === 'api' ? dataSource.endpoint : '';
     const configKey = `${widgetId}-${isReadonly}-${dataSource?.type || 'none'}-${apiService}-${apiEndpoint}`;
+    // Stable key so inline schemaData objects (e.g. dialog-table fields) don't retrigger loads every render
+    const schemaDataKey = React.useMemo(() => (schemaData ? JSON.stringify(schemaData) : ''), [schemaData]);
     // Extract dependency value using a granular selector to prevent unnecessary re-renders
     // and infinite loops when other unrelated values in the state change.
     const dependencyValue = reactRedux.useSelector((state) => {
@@ -2798,7 +2933,7 @@ const useBaseWidget = (options) => {
         loadDataSource();
         // Use configKey and dependencyValue to ensure effect runs only when relevant state changes
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [configKey, dependencyValue, dataSourceRequestHandler, schemaData, widgetId, dispatch]);
+    }, [configKey, dependencyValue, dataSourceRequestHandler, schemaDataKey, widgetId, dispatch]);
     const geoDisplayLabel = React.useMemo(() => {
         if (!geoConfig) {
             return undefined;
@@ -2887,8 +3022,6 @@ const useWidgetCascade = (options) => {
     }, [cascadeConfig, eventBus, dataSource, widgetId, dispatch]);
 };
 
-// Define stable empty array to avoid selector reference issues
-const EMPTY_DATA_SOURCE = [];
 /**
  * Hook for geo widget cascade functionality
  * Handles geo hierarchy building and cascade behavior
@@ -2918,15 +3051,15 @@ const useGeoWidgetCascade = (options) => {
         ? resolveGeoWidgetLevelValue(state.widget.values, widgetId, dataPath, geoConfig)
         : state.widget.values[widgetId]);
     // Memoize selector to avoid returning new array reference
-    const dataSourceOptions = reactRedux.useSelector((state) => state.widget.dataSources[widgetId] ?? EMPTY_DATA_SOURCE);
+    const allDataSources = reactRedux.useSelector((state) => state.widget.dataSources);
     // Register parent chain for upstream-ancestor detection (grandparent → grandchild reset)
     React.useEffect(() => {
-        if (!geoConfig) {
+        if (!geoConfig || typeof dataPath !== 'string') {
             return;
         }
-        registerGeoWidgetParent(widgetId, geoConfig.parentWidgetId);
-        return () => unregisterGeoWidgetParent(widgetId);
-    }, [widgetId, geoConfig]);
+        registerGeoWidget(widgetId, geoConfig, dataPath);
+        return () => unregisterGeoWidget(widgetId);
+    }, [widgetId, geoConfig, dataPath]);
     // Keep in-memory builder in sync with persisted hierarchy (reload, cancel→re-edit, etc.)
     React.useEffect(() => {
         if (!geoConfig || typeof dataPath !== 'string') {
@@ -3018,18 +3151,20 @@ const useGeoWidgetCascade = (options) => {
     }, [geoConfig, eventBus, dataSource, widgetId, dataPath, dispatch, groupId]);
     // Handle value changes to build hierarchy
     React.useEffect(() => {
-        if (!geoConfig) {
+        if (!geoConfig || typeof dataPath !== 'string') {
             return;
         }
-        // Skip if value is undefined (it might still be loading or rehydrating)
+        const { level, isLastLevel } = geoConfig;
+        const groupRegistrations = getGeoWidgetRegistrationsInGroup(groupId);
+        const applyGroupRebuild = () => {
+            const resolveMnemonic = createGeoLevelMnemonicResolver(valuesRef.current, allDataSources);
+            rebuildGeoHierarchyFromRegistrations(groupId, valuesRef.current, groupRegistrations, resolveMnemonic);
+            dispatch(setValues(applySharedGeoHierarchyToValues(valuesRef.current, groupId, dataPath, widgetId)));
+        };
         // ONLY clear hierarchy if the value is explicitly null or empty string (user action)
         if (currentValue === null || currentValue === '') {
-            const { level, isLastLevel } = geoConfig;
             geoHierarchyBuilder.removeLevelAndBelow(level, groupId);
-            // If we have a dataPath, we need to update Redux with the cleared hierarchy
-            if (dataPath) {
-                dispatch(setValues(applySharedGeoHierarchyToValues(valuesRef.current, groupId, dataPath, widgetId)));
-            }
+            applyGroupRebuild();
             if (!isLastLevel && eventBus && lastCascadePublishRef.current !== GEO_LEVEL_CLEARED) {
                 lastCascadePublishRef.current = GEO_LEVEL_CLEARED;
                 eventBus.publish({
@@ -3042,56 +3177,13 @@ const useGeoWidgetCascade = (options) => {
             return;
         }
         if (currentValue === undefined) {
-            return; // Skip if undefined (still initializing)
-        }
-        const { level, isLastLevel } = geoConfig;
-        // Check if hierarchy is already built to prevent endless loops
-        if (dataPath) {
-            const currentHierarchy = getWidgetValue(valuesRef.current, dataPath, widgetId);
-            // If hierarchy JSON is already set and matches current value, skip rebuilding
-            if (currentHierarchy && typeof currentHierarchy === 'object') {
-                // Check if this specific level's value matches the hierarchy
-                const hierarchyArray = currentHierarchy.hierarchy || currentHierarchy.geo_code_hierarchy_json?.hierarchy;
-                if (Array.isArray(hierarchyArray)) {
-                    const currentLevelValue = typeof currentValue === 'object'
-                        ? (currentValue.level_value_id || currentValue.id || currentValue.value)
-                        : currentValue;
-                    const levelData = hierarchyArray.find((l) => l.level === geoConfig.level);
-                    // If this level is already correctly represented in the hierarchy, skip rebuilding
-                    // String conversion ensures comparison works for mixed types
-                    if (levelData && String(levelData.level_value_id) === String(currentLevelValue)) {
-                        return;
-                    }
-                }
+            const hasOwnValue = Object.prototype.hasOwnProperty.call(valuesRef.current, widgetId);
+            if (!hasOwnValue) {
+                return;
             }
         }
-        // Extract level_value_id and level_value_mnemonic from current value
-        // The value could be the ID itself or an object with id/name
-        let level_value_id;
-        let level_value_mnemonic;
-        if (typeof currentValue === 'string' || typeof currentValue === 'number') {
-            // Value is just the ID, need to find mnemonic from data source
-            level_value_id = String(currentValue);
-            // Try to get mnemonic from data source options
-            const option = dataSourceOptions.find((opt) => opt.value === currentValue);
-            level_value_mnemonic = option?.label || String(currentValue);
-        }
-        else if (currentValue && typeof currentValue === 'object') {
-            level_value_id = currentValue.level_value_id || currentValue.id || currentValue.value;
-            level_value_mnemonic = currentValue.level_value_mnemonic || currentValue.name || currentValue.label;
-        }
-        else {
-            return;
-        }
-        // When a widget's own value changes, remove this level and all below from hierarchy first
-        geoHierarchyBuilder.removeLevelAndBelow(level, groupId);
-        // Add level to hierarchy
-        geoHierarchyBuilder.addLevel(level, level_value_id, level_value_mnemonic, groupId);
-        // Build and store hierarchy JSON on every change
-        if (dataPath && geoHierarchyBuilder.buildHierarchyJson(groupId)) {
-            dispatch(setValues(applySharedGeoHierarchyToValues(valuesRef.current, groupId, dataPath, widgetId)));
-        }
-    }, [geoConfig, currentValue, widgetId, dataPath, dispatch, dataSourceOptions, groupId]);
+        applyGroupRebuild();
+    }, [geoConfig, currentValue, widgetId, dataPath, dispatch, allDataSources, groupId, eventBus]);
 };
 
 class WidgetRegistry {
@@ -4993,7 +5085,12 @@ const SectionRenderer = ({ section, dataSourceRequestHandler: propDataSourceRequ
         // This ensures we use the original widget IDs and data paths
         const sectionWidgets = collectWidgets(originalSection.panels);
         const currentState = store.getState().widget;
-        const currentSchemaData = currentState.values || {};
+        let currentSchemaData = currentState.values || {};
+        const geoRegistrations = collectGeoWidgetRegistrationsFromWidgets(sectionWidgets, namespace);
+        if (geoRegistrations.length > 0) {
+            currentSchemaData = reconcileGeoHierarchiesInValues(currentSchemaData, geoRegistrations, currentState.dataSources || {});
+            dispatch(setValues(currentSchemaData));
+        }
         const isSectionValid = sectionValidate(originalSection, currentSchemaData, dispatch, true);
         if (!isSectionValid) {
             return;
@@ -5059,7 +5156,12 @@ const SectionRenderer = ({ section, dataSourceRequestHandler: propDataSourceRequ
         if (isDraft !== false && store && onSectionSave) {
             const sectionWidgets = collectWidgets(originalSection.panels);
             const currentState = store.getState().widget;
-            const currentSchemaData = currentState.values || {};
+            let currentSchemaData = currentState.values || {};
+            const geoRegistrations = collectGeoWidgetRegistrationsFromWidgets(sectionWidgets, namespace);
+            if (geoRegistrations.length > 0) {
+                currentSchemaData = reconcileGeoHierarchiesInValues(currentSchemaData, geoRegistrations, currentState.dataSources || {});
+                dispatch(setValues(currentSchemaData));
+            }
             const isSectionValid = sectionValidate(originalSection, currentSchemaData, dispatch, true);
             if (!isSectionValid)
                 return;
@@ -9987,6 +10089,22 @@ const TableWidget = ({ config }) => {
 };
 
 const isUnsetRowValue = (value) => value === null || value === undefined || value === '';
+/** Match TableWidget cell styling for add / update / delete rows */
+const getRowCellStyle = (editAction) => {
+    if (editAction === 'ADD') {
+        return { color: 'var(--owt-color-success, #16A34A)' };
+    }
+    if (editAction === 'DELETE') {
+        return {
+            color: 'var(--owt-color-error, #B91C1C)',
+            textDecoration: 'line-through',
+        };
+    }
+    if (editAction === 'UPDATE') {
+        return { color: 'var(--owt-color-warning, #F59E0B)' };
+    }
+    return {};
+};
 // Display select value label in view mode
 const SelectDisplayValue = ({ config, value }) => {
     const { dataSourceOptions, loading } = useBaseWidget({ config });
@@ -9997,23 +10115,29 @@ const SelectDisplayValue = ({ config, value }) => {
     const selectedOption = dataSourceOptions.find((option) => option.value === value || String(option.value) === String(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 widgetType = col.widget || 'text';
+    const fieldConfig = React.useMemo(() => {
+        return {
+            ...col,
+            widget: widgetType,
+            'widget-type': col['widget-type'] || 'input',
+            'widget-id': cellWidgetId,
+            'widget-label': col['widget-label'],
+            'widget-readonly': isReadonly || col['widget-readonly'] === true,
+            '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']),
+        };
+    }, [col, cellWidgetId, dialogRowValues, isReadonly, widgetType]);
+    return (jsxRuntimeExports.jsx("div", { className: "min-w-0", children: jsxRuntimeExports.jsx(WidgetRenderer, { config: fieldConfig }) }));
+});
 /**
  * Dialog table widget:
  * - Table displays a subset of columns (n out of x)
  * - Add/Edit happens in a modal dialog that shows ALL columns as a form
- *
- * Usage in schema:
- * {
- *   "widget": "dialog-table",
- *   "widget-type": "table",
- *   "widget-label": "Household Members",
- *   "widget-id": "householdMembers",
- *   "widget-data-path": "household.members",
- *   "widget-data-columns": [ ...all columns... ],
- *   "widget-data-visible-columns": ["firstName", "lastName", "dob"], // optional override; default = by column flag
- *   // Per-column control (recommended): set "column-visible-in-table": false to hide it in the table
- *   "widget-data-operations": { "add": true, "edit": true, "remove": true }
- * }
  */
 const DialogTableWidget = ({ config }) => {
     const { value, error, touched, isEnabled, onChange, config: widgetConfig } = useBaseWidget({ config });
@@ -10023,23 +10147,22 @@ const DialogTableWidget = ({ config }) => {
     const columns = widgetConfig['widget-data-columns'] || [];
     const operations = widgetConfig['widget-data-operations'] || {};
     const isReadonly = widgetConfig['widget-readonly'] || false;
+    // Soft-delete (keep row, red + strikethrough) whenever remove is allowed — matches TableWidget
+    const shouldSoftDeleteOnRemove = !isReadonly && !!operations.remove;
     const visibleColumnKeys = widgetConfig['widget-data-visible-columns'];
     const visibleColumns = React.useMemo(() => {
-        // 1) If explicit list provided, it wins
         if (Array.isArray(visibleColumnKeys) && visibleColumnKeys.length > 0) {
             const keySet = new Set(visibleColumnKeys);
             return columns.filter((c) => keySet.has(c['column-key']));
         }
-        // 2) Otherwise decide per column (default = visible)
         return columns.filter((c) => c['column-visible-in-table'] !== false);
     }, [columns, visibleColumnKeys]);
     const [dialogOpen, setDialogOpen] = React.useState(false);
     const [dialogMode, setDialogMode] = React.useState('add');
     const [activeRowIndex, setActiveRowIndex] = React.useState(null);
-    const [formData, setFormData] = React.useState({});
-    /** Unique per dialog open so Redux widget ids don't reuse stale values across rows/add sessions */
     const dialogSessionRef = React.useRef(0);
     const [dialogSessionId, setDialogSessionId] = React.useState(0);
+    const membersWidgetId = widgetConfig['widget-id'];
     const addDialogTitle = translateConfig(widgetConfig['widget-data-dialog-title-add']) ||
         translate('table.addRecordDialog') ||
         'Add record';
@@ -10059,15 +10182,26 @@ const DialogTableWidget = ({ config }) => {
         });
         return emptyRow;
     }, [columns]);
-    const dialogFieldWidgetId = React.useCallback((columnKey) => `${widgetConfig['widget-id']}-dlg-${dialogSessionId}-${columnKey}`, [widgetConfig, dialogSessionId]);
+    const dialogFieldWidgetId = React.useCallback((sessionId, columnKey) => `${membersWidgetId}-dlg-${sessionId}-${columnKey}`, [membersWidgetId]);
     const resetDialogWidgets = React.useCallback((sessionId) => {
         if (sessionId <= 0)
             return;
         columns.forEach((col) => {
-            const wid = `${widgetConfig['widget-id']}-dlg-${sessionId}-${col['column-key']}`;
-            dispatch(resetWidget(wid));
+            dispatch(resetWidget(dialogFieldWidgetId(sessionId, col['column-key'])));
+        });
+    }, [columns, dialogFieldWidgetId, dispatch]);
+    const seedDialogReduxValues = React.useCallback((sessionId, rowData) => {
+        const seeds = {};
+        columns.forEach((col) => {
+            const key = col['column-key'];
+            if (rowData[key] !== undefined) {
+                seeds[dialogFieldWidgetId(sessionId, key)] = rowData[key];
+            }
         });
-    }, [columns, widgetConfig, dispatch]);
+        if (Object.keys(seeds).length > 0) {
+            dispatch(setValues(seeds));
+        }
+    }, [columns, dialogFieldWidgetId, dispatch]);
     const beginDialogSession = React.useCallback(() => {
         dialogSessionRef.current += 1;
         const nextSession = dialogSessionRef.current;
@@ -10076,15 +10210,21 @@ const DialogTableWidget = ({ config }) => {
     }, []);
     const openAddDialog = React.useCallback(() => {
         resetDialogWidgets(dialogSessionId);
-        beginDialogSession();
+        const sessionId = beginDialogSession();
+        seedDialogReduxValues(sessionId, buildEmptyRow());
         setDialogMode('add');
         setActiveRowIndex(null);
-        setFormData(buildEmptyRow());
         setDialogOpen(true);
-    }, [buildEmptyRow, beginDialogSession, resetDialogWidgets, dialogSessionId]);
+    }, [
+        buildEmptyRow,
+        beginDialogSession,
+        resetDialogWidgets,
+        dialogSessionId,
+        seedDialogReduxValues,
+    ]);
     const openEditDialog = React.useCallback((rowIndex) => {
         resetDialogWidgets(dialogSessionId);
-        beginDialogSession();
+        const sessionId = beginDialogSession();
         const row = rows[rowIndex] || {};
         const nextFormData = buildEmptyRow();
         columns.forEach((col) => {
@@ -10092,23 +10232,26 @@ const DialogTableWidget = ({ config }) => {
             if (row[key] !== undefined)
                 nextFormData[key] = row[key];
         });
+        seedDialogReduxValues(sessionId, nextFormData);
         setDialogMode('edit');
         setActiveRowIndex(rowIndex);
-        setFormData(nextFormData);
         setDialogOpen(true);
-    }, [rows, columns, buildEmptyRow, resetDialogWidgets, dialogSessionId, beginDialogSession]);
+    }, [
+        rows,
+        columns,
+        buildEmptyRow,
+        resetDialogWidgets,
+        dialogSessionId,
+        beginDialogSession,
+        seedDialogReduxValues,
+    ]);
     const closeDialog = React.useCallback(() => {
         const sessionToClear = dialogSessionId;
         setDialogOpen(false);
         setActiveRowIndex(null);
-        setFormData({});
         resetDialogWidgets(sessionToClear);
         setDialogSessionId(0);
     }, [dialogSessionId, resetDialogWidgets]);
-    const updateField = React.useCallback((columnKey, newValue) => {
-        setFormData((prev) => ({ ...prev, [columnKey]: newValue }));
-    }, []);
-    const membersWidgetId = widgetConfig['widget-id'];
     const dialogStoreValues = reactRedux.useSelector((state) => {
         if (dialogSessionId <= 0) {
             return {};
@@ -10117,25 +10260,15 @@ const DialogTableWidget = ({ config }) => {
         const row = {};
         columns.forEach((col) => {
             const k = col['column-key'];
-            const wid = `${membersWidgetId}-dlg-${dialogSessionId}-${k}`;
+            const wid = dialogFieldWidgetId(dialogSessionId, k);
             if (values[wid] !== undefined) {
                 row[k] = values[wid];
             }
         });
         return row;
-    }, (a, b) => JSON.stringify(a) === JSON.stringify(b));
-    const buildDialogRowValues = React.useCallback((storeSlice) => {
-        const row = { ...formData };
-        columns.forEach((col) => {
-            const k = col['column-key'];
-            if (storeSlice[k] !== undefined) {
-                row[k] = storeSlice[k];
-            }
-        });
-        return row;
-    }, [formData, columns]);
-    const dialogRowValues = React.useMemo(() => buildDialogRowValues(dialogStoreValues), [buildDialogRowValues, dialogStoreValues]);
-    const collectMergedRowPayload = React.useCallback(() => buildDialogRowValues(dialogStoreValues), [buildDialogRowValues, dialogStoreValues]);
+    });
+    const dialogRowValues = dialogStoreValues;
+    const collectMergedRowPayload = React.useCallback(() => dialogStoreValues, [dialogStoreValues]);
     const finalizeDialogRowPayload = React.useCallback((raw) => {
         const result = {};
         columns.forEach((col) => {
@@ -10155,7 +10288,7 @@ const DialogTableWidget = ({ config }) => {
         let hasErrors = false;
         columns.forEach((col) => {
             const key = col['column-key'];
-            const cellWidgetId = dialogFieldWidgetId(key);
+            const cellWidgetId = dialogFieldWidgetId(dialogSessionId, key);
             const isColReadonly = isReadonly || col['widget-readonly'] === true;
             if (isColReadonly)
                 return;
@@ -10199,11 +10332,32 @@ const DialogTableWidget = ({ config }) => {
             onChange(newRows);
             closeDialog();
         }
-    }, [collectMergedRowPayload, finalizeDialogRowPayload, dialogMode, onChange, rows, closeDialog, activeRowIndex, columns, dialogFieldWidgetId, isReadonly, dispatch]);
+    }, [
+        collectMergedRowPayload,
+        finalizeDialogRowPayload,
+        dialogMode,
+        onChange,
+        rows,
+        closeDialog,
+        activeRowIndex,
+        columns,
+        dialogSessionId,
+        dialogFieldWidgetId,
+        isReadonly,
+        dispatch,
+    ]);
     const deleteRow = React.useCallback((rowIndex) => {
-        const newRows = rows.filter((_, i) => i !== rowIndex);
-        onChange(newRows);
-    }, [rows, onChange]);
+        if (shouldSoftDeleteOnRemove) {
+            const newRows = [...rows];
+            newRows[rowIndex] = {
+                ...newRows[rowIndex],
+                edit_action: 'DELETE',
+            };
+            onChange(newRows);
+            return;
+        }
+        onChange(rows.filter((_, i) => i !== rowIndex));
+    }, [rows, onChange, shouldSoftDeleteOnRemove]);
     const getDisplayValue = React.useCallback((rowIndex, column) => {
         const key = column['column-key'];
         const cellValue = rows[rowIndex]?.[key];
@@ -10211,11 +10365,12 @@ const DialogTableWidget = ({ config }) => {
         if (cellValue === null || cellValue === undefined || cellValue === '')
             return '-';
         if (widgetType === 'select')
-            return null; // handled by SelectDisplayValue
+            return null;
         if (column['widget-data-format'])
             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 tableWidgetId = `dialog-table-widget-${widgetConfig['widget-id']}`;
     const columnSpan = widgetConfig['widget-column-span'] || 2;
     const minWidth = columnSpan * 200;
@@ -10243,37 +10398,40 @@ const DialogTableWidget = ({ config }) => {
                             }, children: translate('table.addRecord') || 'Add New Record' }) })), jsxRuntimeExports.jsx("div", { className: "overflow-x-auto border", style: {
                             borderRadius: 'var(--owt-widget-table-border-radius, 15px)',
                             borderColor: 'var(--owt-widget-table-border-color, #C4C4C4)',
-                        }, children: jsxRuntimeExports.jsxs("table", { className: "min-w-full", style: { borderCollapse: 'separate', borderSpacing: 0 }, children: [jsxRuntimeExports.jsx("thead", { style: { backgroundColor: 'var(--owt-widget-table-header-bg, #F6F6F6)' }, children: jsxRuntimeExports.jsxs("tr", { style: { borderBottom: '1px solid var(--owt-widget-table-row-divider, #E4E4E4)' }, children: [visibleColumns.map((col) => (jsxRuntimeExports.jsx("th", { className: "px-4 py-3 text-left text-xs font-medium uppercase tracking-wider", style: { color: 'var(--owt-widget-table-header-color, #727474)' }, children: translateConfig(col['widget-label']) }, col['column-key']))), ((operations.edit || operations.remove) && !isReadonly) && (jsxRuntimeExports.jsx("th", { className: "px-4 py-3 text-left text-xs font-medium uppercase tracking-wider", style: { color: 'var(--owt-widget-table-header-color, #727474)' }, children: translate('common.actions') || 'Actions' }))] }) }), jsxRuntimeExports.jsxs("tbody", { style: { backgroundColor: 'var(--owt-widget-table-body-bg, #FFFFFF)' }, children: [rows.length === 0 && (jsxRuntimeExports.jsx("tr", { children: jsxRuntimeExports.jsxs("td", { colSpan: visibleColumns.length + (((operations.edit || operations.remove) && !isReadonly) ? 1 : 0), className: "px-4 py-6 text-center text-sm", style: { color: 'var(--owt-widget-table-empty-color, #727474)' }, children: [translate('table.noData') || 'No records available.', operations.add && !isReadonly && ` ${translate('table.clickToAdd') || 'Click "Add New Record" to add one.'}`] }) })), rows.map((row, rowIndex) => (jsxRuntimeExports.jsxs("tr", { style: {
-                                                borderBottom: '1px solid var(--owt-widget-table-row-divider, #E4E4E4)',
-                                                backgroundColor: row?.edit_action === 'DELETE'
-                                                    ? 'var(--owt-widget-table-deleted-row-bg, #FEE2E2)'
-                                                    : undefined,
-                                            }, children: [visibleColumns.map((col) => {
-                                                    const key = col['column-key'];
-                                                    const widgetType = col.widget || 'text';
-                                                    const displayValue = getDisplayValue(rowIndex, col);
-                                                    if (widgetType === 'select' && displayValue === null) {
-                                                        const displayConfig = {
-                                                            ...col,
-                                                            'widget-id': `${widgetConfig['widget-id']}-view-row-${rowIndex}-col-${key}`,
-                                                            'widget-label': '',
-                                                            'widget-readonly': true,
-                                                            'widget-data-path': undefined,
-                                                        };
-                                                        return (jsxRuntimeExports.jsx("td", { className: "px-4 py-3 whitespace-nowrap", children: jsxRuntimeExports.jsx("div", { className: "text-sm", children: jsxRuntimeExports.jsx(SelectDisplayValue, { config: displayConfig, value: row?.[key] }) }) }, key));
-                                                    }
-                                                    return (jsxRuntimeExports.jsx("td", { className: "px-4 py-3 whitespace-nowrap", children: jsxRuntimeExports.jsx("div", { className: "text-sm", children: displayValue }) }, key));
-                                                }), ((operations.edit || operations.remove) && !isReadonly) && (jsxRuntimeExports.jsx("td", { className: "px-4 py-3 whitespace-nowrap", style: { minWidth: '120px' }, children: jsxRuntimeExports.jsxs("div", { className: "flex gap-2", children: [operations.edit && (jsxRuntimeExports.jsx("button", { type: "button", onClick: () => openEditDialog(rowIndex), disabled: !isEnabled, className: "px-3 py-1 text-xs disabled:opacity-50 disabled:cursor-not-allowed", style: {
-                                                                    borderRadius: 'var(--owt-btn-border-radius, 10px)',
-                                                                    color: 'var(--owt-color-primary-dark, #F07B1A)',
-                                                                    backgroundColor: 'transparent',
-                                                                    border: 'none',
-                                                                }, children: translate('common.edit') || 'Edit' })), operations.remove && (jsxRuntimeExports.jsx("button", { type: "button", onClick: () => deleteRow(rowIndex), disabled: !isEnabled, className: "px-3 py-1 text-xs disabled:opacity-50 disabled:cursor-not-allowed", style: {
-                                                                    borderRadius: 'var(--owt-btn-border-radius, 10px)',
-                                                                    color: 'var(--owt-color-error, #B91C1C)',
-                                                                    backgroundColor: 'transparent',
-                                                                    border: 'none',
-                                                                }, children: translate('common.remove') || 'Delete' }))] }) }))] }, rowIndex)))] })] }) }), touched && error.length > 0 && (jsxRuntimeExports.jsx("p", { className: "text-sm mt-1", style: { color: 'var(--owt-widget-error-color, #B91C1C)' }, children: error[0] }))] }), dialogOpen && (jsxRuntimeExports.jsx("div", { className: "fixed inset-0 flex items-center justify-center z-50", style: { backgroundColor: 'rgba(0,0,0,0.5)' }, children: jsxRuntimeExports.jsxs("div", { className: "rounded-lg p-6 w-full mx-4", style: {
+                        }, children: jsxRuntimeExports.jsxs("table", { className: "min-w-full", style: { borderCollapse: 'separate', borderSpacing: 0 }, children: [jsxRuntimeExports.jsx("thead", { style: { backgroundColor: 'var(--owt-widget-table-header-bg, #F6F6F6)' }, children: jsxRuntimeExports.jsxs("tr", { style: { borderBottom: '1px solid var(--owt-widget-table-row-divider, #E4E4E4)' }, children: [visibleColumns.map((col) => (jsxRuntimeExports.jsx("th", { className: "px-4 py-3 text-left text-xs font-medium uppercase tracking-wider", style: { color: 'var(--owt-widget-table-header-color, #727474)' }, children: translateConfig(col['widget-label']) }, col['column-key']))), ((operations.edit || operations.remove) && !isReadonly) && (jsxRuntimeExports.jsx("th", { className: "px-4 py-3 text-left text-xs font-medium uppercase tracking-wider", style: { color: 'var(--owt-widget-table-header-color, #727474)' }, children: translate('common.actions') || 'Actions' }))] }) }), jsxRuntimeExports.jsxs("tbody", { style: { backgroundColor: 'var(--owt-widget-table-body-bg, #FFFFFF)' }, children: [rows.length === 0 && (jsxRuntimeExports.jsx("tr", { children: jsxRuntimeExports.jsxs("td", { colSpan: visibleColumns.length + (((operations.edit || operations.remove) && !isReadonly) ? 1 : 0), className: "px-4 py-6 text-center text-sm", style: { color: 'var(--owt-widget-table-empty-color, #727474)' }, children: [translate('table.noData') || 'No records available.', operations.add && !isReadonly && ` ${translate('table.clickToAdd') || 'Click "Add New Record" to add one.'}`] }) })), rows.map((row, rowIndex) => {
+                                            const cellStyle = getRowCellStyle(row?.edit_action);
+                                            return (jsxRuntimeExports.jsxs("tr", { style: {
+                                                    borderBottom: '1px solid var(--owt-widget-table-row-divider, #E4E4E4)',
+                                                    backgroundColor: row?.edit_action === 'DELETE'
+                                                        ? 'var(--owt-widget-table-deleted-row-bg, #FEE2E2)'
+                                                        : undefined,
+                                                }, children: [visibleColumns.map((col) => {
+                                                        const key = col['column-key'];
+                                                        const widgetType = col.widget || 'text';
+                                                        const displayValue = getDisplayValue(rowIndex, col);
+                                                        if (widgetType === 'select' && displayValue === null) {
+                                                            const displayConfig = {
+                                                                ...col,
+                                                                'widget-id': `${widgetConfig['widget-id']}-view-row-${rowIndex}-col-${key}`,
+                                                                'widget-label': '',
+                                                                'widget-readonly': true,
+                                                                'widget-data-path': undefined,
+                                                            };
+                                                            return (jsxRuntimeExports.jsx("td", { className: "px-4 py-3 whitespace-nowrap", children: jsxRuntimeExports.jsx("div", { className: "text-sm", style: cellStyle, children: jsxRuntimeExports.jsx(SelectDisplayValue, { config: displayConfig, value: row?.[key] }) }) }, key));
+                                                        }
+                                                        return (jsxRuntimeExports.jsx("td", { className: "px-4 py-3 whitespace-nowrap", children: jsxRuntimeExports.jsx("div", { className: "text-sm", style: cellStyle, children: displayValue }) }, key));
+                                                    }), ((operations.edit || operations.remove) && !isReadonly) && (jsxRuntimeExports.jsx("td", { className: "px-4 py-3 whitespace-nowrap", style: { minWidth: '120px' }, children: jsxRuntimeExports.jsxs("div", { className: "flex gap-2", children: [operations.edit && (jsxRuntimeExports.jsx("button", { type: "button", onClick: () => openEditDialog(rowIndex), disabled: !isEnabled, className: "px-3 py-1 text-xs disabled:opacity-50 disabled:cursor-not-allowed", style: {
+                                                                        borderRadius: 'var(--owt-btn-border-radius, 10px)',
+                                                                        color: 'var(--owt-color-primary-dark, #F07B1A)',
+                                                                        backgroundColor: 'transparent',
+                                                                        border: 'none',
+                                                                    }, children: translate('common.edit') || 'Edit' })), operations.remove && (jsxRuntimeExports.jsx("button", { type: "button", onClick: () => deleteRow(rowIndex), disabled: !isEnabled, className: "px-3 py-1 text-xs disabled:opacity-50 disabled:cursor-not-allowed", style: {
+                                                                        borderRadius: 'var(--owt-btn-border-radius, 10px)',
+                                                                        color: 'var(--owt-color-error, #B91C1C)',
+                                                                        backgroundColor: 'transparent',
+                                                                        border: 'none',
+                                                                    }, children: translate('common.remove') || 'Delete' }))] }) }))] }, rowIndex));
+                                        })] })] }) }), touched && error.length > 0 && (jsxRuntimeExports.jsx("p", { className: "text-sm mt-1", style: { color: 'var(--owt-widget-error-color, #B91C1C)' }, children: error[0] }))] }), dialogOpen && (jsxRuntimeExports.jsx("div", { className: "fixed inset-0 flex items-center justify-center z-50", style: { backgroundColor: 'rgba(0,0,0,0.5)' }, children: jsxRuntimeExports.jsxs("div", { className: "rounded-lg p-6 w-full mx-4", style: {
                         maxWidth: '900px',
                         backgroundColor: 'var(--owt-color-bg, #FFFFFF)',
                         borderRadius: 'var(--owt-widget-card-border-radius, 20px)',
@@ -10284,27 +10442,10 @@ 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: columns.map((col) => {
+                                    }, "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'];
-                                if (!shouldShowWidget(col['widget-data-options'], dialogRowValues)) {
-                                    return null;
-                                }
-                                const widgetType = col.widget || 'text';
-                                const cellWidgetId = dialogFieldWidgetId(key);
-                                const initialValue = formData[key] ?? col['widget-data-default'];
-                                const fieldConfig = {
-                                    ...col,
-                                    widget: widgetType,
-                                    'widget-type': col['widget-type'] || 'input',
-                                    'widget-id': cellWidgetId,
-                                    'widget-label': col['widget-label'],
-                                    'widget-readonly': isReadonly || col['widget-readonly'] === true,
-                                    'widget-data-path': undefined,
-                                    'widget-data-default': initialValue,
-                                    'widget-data-options': undefined,
-                                    'widget-required': shouldRequireWidget(col['widget-data-options'], dialogRowValues, col['widget-required']),
-                                };
-                                return (jsxRuntimeExports.jsx("div", { className: "min-w-0", children: jsxRuntimeExports.jsx(WidgetRenderer, { config: fieldConfig, schemaData: { [cellWidgetId]: initialValue }, onValueChange: (_widgetId, newValue) => updateField(key, newValue) }) }, `${dialogSessionId}-${key}`));
+                                const cellWidgetId = dialogFieldWidgetId(dialogSessionId, key);
+                                return (jsxRuntimeExports.jsx(DialogTableField, { col: col, cellWidgetId: cellWidgetId, dialogRowValues: dialogRowValues, isReadonly: isReadonly }, `${dialogSessionId}-${key}`));
                             }) }, `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)',
@@ -12988,6 +13129,8 @@ exports.applyCaseControl = applyCaseControl;
 exports.applyDecimalPrecision = applyDecimalPrecision;
 exports.applyMask = applyMask;
 exports.applySharedGeoHierarchyToValues = applySharedGeoHierarchyToValues;
+exports.collectGeoWidgetRegistrationsFromWidgets = collectGeoWidgetRegistrationsFromWidgets;
+exports.createGeoLevelMnemonicResolver = createGeoLevelMnemonicResolver;
 exports.createWidgetStore = createWidgetStore;
 exports.createZodSchema = createZodSchema;
 exports.defaultTheme = defaultTheme;
@@ -13005,6 +13148,7 @@ exports.getCachedApiDataSource = getCachedApiDataSource;
 exports.getFormattedNumberLength = getFormattedNumberLength;
 exports.getGeoDescendantWidgetIds = getGeoDescendantWidgetIds;
 exports.getGeoGroupId = getGeoGroupId;
+exports.getGeoWidgetRegistrationsInGroup = getGeoWidgetRegistrationsInGroup;
 exports.getSchemaDataSource = getSchemaDataSource;
 exports.getStaticDataSource = getStaticDataSource;
 exports.getValueByPath = getValueByPath;
@@ -13015,9 +13159,13 @@ exports.isAllowedKey = isAllowedKey;
 exports.isUpstreamGeoAncestor = isUpstreamGeoAncestor;
 exports.normalizeNumericDefault = normalizeNumericDefault;
 exports.normalizeOptionRules = normalizeOptionRules;
+exports.orderGeoWidgetRegistrations = orderGeoWidgetRegistrations;
 exports.parseDataPath = parseDataPath;
 exports.parseNumber = parseNumber;
+exports.rebuildGeoHierarchyFromRegistrations = rebuildGeoHierarchyFromRegistrations;
+exports.reconcileGeoHierarchiesInValues = reconcileGeoHierarchiesInValues;
 exports.registerDefaultWidgets = registerDefaultWidgets;
+exports.registerGeoWidget = registerGeoWidget;
 exports.registerGeoWidgetParent = registerGeoWidgetParent;
 exports.removeMask = removeMask;
 exports.resetAll = resetAll;
@@ -13043,6 +13191,7 @@ exports.transformDataSourceOptions = transformDataSourceOptions;
 exports.translatePanelConfig = translatePanelConfig;
 exports.translateUISchema = translateUISchema;
 exports.translateWidgetConfig = translateWidgetConfig;
+exports.unregisterGeoWidget = unregisterGeoWidget;
 exports.unregisterGeoWidgetParent = unregisterGeoWidgetParent;
 exports.useBaseWidget = useBaseWidget;
 exports.useGeoWidgetCascade = useGeoWidgetCascade;