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

package/dist/components/SectionRenderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SectionRenderer.d.ts","sourceRoot":"","sources":["../../src/components/SectionRenderer.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAyC,MAAM,UAAU,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAQ9D,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAqDlD,MAAM,WAAW,cAAc;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC;IAClB,KAAK,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACrB;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,aAAa,CAAC;IACvB,wBAAwB,CAAC,EAAE,oBAAoB,CAAC,0BAA0B,CAAC,CAAC;IAC5E,UAAU,CAAC,EAAE,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAChD,aAAa,CAAC,EAAE,oBAAoB,CAAC,eAAe,CAAC,CAAC;IACtD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAClE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IAClC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAGjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,2GAA2G;IAC3G,oBAAoB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IAErE,qEAAqE;IACrE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,4DAA4D;IAC5D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,sFAAsF;IACtF,oBAAoB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,oGAAoG;IACpG,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,uGAAuG;IACvG,oBAAoB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/C,4FAA4F;IAC5F,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,wGAAwG;IACxG,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,0HAA0H;IAC1H,gBAAgB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IACjE,iGAAiG;IACjG,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAGD;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,GAAI,saAyB7B,oBAAoB,4CAikDtB,CAAC"}
+{"version":3,"file":"SectionRenderer.d.ts","sourceRoot":"","sources":["../../src/components/SectionRenderer.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAyC,MAAM,UAAU,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAQ9D,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAuDlD,MAAM,WAAW,cAAc;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC;IAClB,KAAK,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACrB;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,aAAa,CAAC;IACvB,wBAAwB,CAAC,EAAE,oBAAoB,CAAC,0BAA0B,CAAC,CAAC;IAC5E,UAAU,CAAC,EAAE,oBAAoB,CAAC,YAAY,CAAC,CAAC;IAChD,aAAa,CAAC,EAAE,oBAAoB,CAAC,eAAe,CAAC,CAAC;IACtD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAClE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IAClC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAGjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,2GAA2G;IAC3G,oBAAoB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IAErE,qEAAqE;IACrE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,4DAA4D;IAC5D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,sFAAsF;IACtF,oBAAoB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,oGAAoG;IACpG,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,uGAAuG;IACvG,oBAAoB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/C,4FAA4F;IAC5F,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,wGAAwG;IACxG,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;OAIG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB,0HAA0H;IAC1H,gBAAgB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IACjE,iGAAiG;IACjG,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAGD;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,GAAI,saAyB7B,oBAAoB,4CAqlDtB,CAAC"}

package/dist/hooks/useGeoWidgetCascade.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useGeoWidgetCascade.d.ts","sourceRoot":"","sources":["../../src/hooks/useGeoWidgetCascade.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAgBtE,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,gBAAgB,CAAC;IACzB,wBAAwB,CAAC,EAAE,wBAAwB,CAAC;IACpD,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC7B;AAKD;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAAI,SAAS,0BAA0B,SAuPtE,CAAC"}
+{"version":3,"file":"useGeoWidgetCascade.d.ts","sourceRoot":"","sources":["../../src/hooks/useGeoWidgetCascade.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAC;AAmBtE,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,gBAAgB,CAAC;IACzB,wBAAwB,CAAC,EAAE,wBAAwB,CAAC;IACpD,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC7B;AAGD;;;GAGG;AACH,eAAO,MAAM,mBAAmB,GAAI,SAAS,0BAA0B,SAwMtE,CAAC"}

package/dist/index.d.ts

@@ -1771,8 +1771,41 @@ declare class GeoHierarchyBuilder {
 declare const geoHierarchyBuilder: GeoHierarchyBuilder;
 /** Sentinel written to Redux when a geo level is cleared by cascade (distinct from "never set"). */
 declare const GEO_LEVEL_CLEARED: null;
+interface GeoWidgetRegistration {
+    widgetId: string;
+    parentWidgetId: string | null;
+    level: string;
+    geoConfig: GeoLevelConfig;
+    dataPath: string;
+    groupId: string;
+}
 declare function registerGeoWidgetParent(widgetId: string, parentWidgetId: string | null): void;
 declare function unregisterGeoWidgetParent(widgetId: string): void;
+declare function registerGeoWidget(widgetId: string, geoConfig: GeoLevelConfig & {
+    parentWidgetId?: string | null;
+}, dataPath: string): void;
+declare function unregisterGeoWidget(widgetId: string): void;
+declare function orderGeoWidgetRegistrations(registrations: GeoWidgetRegistration[]): GeoWidgetRegistration[];
+/** Resolve display mnemonic from cached dropdown options, then stored hierarchy. */
+declare function createGeoLevelMnemonicResolver(values: Record<string, any>, dataSources: Record<string, Array<{
+    value: any;
+    label: string;
+}>>): (registration: GeoWidgetRegistration, valueId: string) => string | undefined;
+/** Rebuild group hierarchy from widget values in parent→child order; stop at first missing level. */
+declare function rebuildGeoHierarchyFromRegistrations(groupId: string, values: Record<string, any>, registrations: GeoWidgetRegistration[], resolveMnemonic?: (registration: GeoWidgetRegistration, valueId: string) => string | undefined): boolean;
+declare function collectGeoWidgetRegistrationsFromWidgets(widgets: Array<{
+    'widget-id': string;
+    'widget-data-path'?: string | Record<string, string>;
+    'widget-geo-config'?: GeoLevelConfig & {
+        parentWidgetId?: string | null;
+    };
+}>, namespace?: string): GeoWidgetRegistration[];
+/** Reconcile all geo groups in section values before save. */
+declare function reconcileGeoHierarchiesInValues(values: Record<string, any>, registrations: GeoWidgetRegistration[], dataSources?: Record<string, Array<{
+    value: any;
+    label: string;
+}>>): Record<string, any>;
+declare function getGeoWidgetRegistrationsInGroup(groupId: string): GeoWidgetRegistration[];
 /** True when changedWidgetId is any upstream geo parent of widgetId (not only immediate parent). */
 declare function isUpstreamGeoAncestor(changedWidgetId: string, widgetId: string, immediateParentWidgetId: string | null): boolean;
 /** Group id for geo widgets sharing the same register prefix (e.g. `{registerId}`). */
@@ -1857,5 +1890,5 @@ declare const translatePanelConfig: (panel: PanelConfig, translate: (key: string
  */
 declare const translateUISchema: (schema: UISchema, translate: (key: string, options?: any) => string) => UISchema;
 
-export { ArrayWidget, BooleanWidget, CheckboxWidget, CurrencyInputWidget, DateInputWidget, DateTimeInputWidget, DialogTableWidget, DisplayWidget, FileInputWidget, GEO_LEVEL_CLEARED, HeaderSectionWidget, IdAuthenticationWidget, IterableAccordionWidget, JSONEditorPanel, MultiSelectWidget, NumberInputWidget, PanelRenderer, PhoneInputWidget, ProfileWidget, PropertyEditor, RadioWidget, RegisterLookupWidget, ScoresDisplayWidget, SectionBuilder, SectionRenderer, SectionTree, SectionsContainer, SelectWidget, SimpleTableWidget, TableWidget, TextAreaWidget, TextInputWidget, VisualBuilderPanel, WidgetEventBus, WidgetProvider, WidgetRenderer, applyCaseControl, applyDecimalPrecision, applyMask, applySharedGeoHierarchyToValues, createWidgetStore, createZodSchema, defaultTheme, evaluateCondition, evaluateWidgetConditions, filterByCharacterType, formatCurrency, formatDate, formatNumber, formatPhone, formatValue, geoHierarchyBuilder, getApiDataSource, getCachedApiDataSource, getFormattedNumberLength, getGeoDescendantWidgetIds, getGeoGroupId, getSchemaDataSource, getStaticDataSource, getValueByPath, getWidgetValue, hasVisibilityRules, initI18n, isAllowedKey, isUpstreamGeoAncestor, normalizeNumericDefault, normalizeOptionRules, parseDataPath, parseNumber, registerDefaultWidgets, registerGeoWidgetParent, removeMask, resetAll, resetAndSeedGeoHierarchyFromValues, resetWidget, resolveGeoWidgetLevelLabel, resolveGeoWidgetLevelValue, resolveTheme, resolveWidgetIdValue, seedGeoHierarchyFromValues, setDataSource, setError, setLoading, setTouched, setValue, setValueByPath, setValues, setWidgetValue, shouldEnableWidget, shouldRequireWidget, shouldShowWidget, transformDataSourceOptions, translatePanelConfig, translateUISchema, translateWidgetConfig, unregisterGeoWidgetParent, useBaseWidget, useGeoWidgetCascade, useWidgetCascade, useWidgetContext, useWidgetEventBus, useWidgetTheme, useWidgetTranslation, validateNumericValue, validateWidget, widgetRegistry };
-export type { ApiAdapter, ApiDataSource$1 as ApiDataSource, BaseWidgetConfig, BooleanControlType, BooleanRepresentation, CaseControl, CharacterType, ConditionOperator, DataSource, DataSourceRequestHandler, DataSourceType, GeoLevelConfig, GeoLevelData, InputMask, NumericType, PanelConfig, RoundingMode, SchemaDataSource, SectionBuilderProps, SectionChanges, SectionConfig, SectionMode, SectionRendererProps, SectionsContainerProps, SectionsFormHandle, StaticDataSource, SupportingDocumentConfig, TextAlign, TreeNode, TreeNodeType, UISchema, UseBaseWidgetOptions, ValidationType, WidgetCascadeConfig, WidgetCondition, WidgetConditionState, WidgetContextValue, WidgetDataPath, WidgetDispatch, WidgetEvent, WidgetEventType, WidgetFormat, WidgetGeoConfig, WidgetOptionRule, WidgetOptions, WidgetRegistryEntry, WidgetRenderFunction, WidgetRootState, WidgetState, WidgetStore, WidgetTheme, WidgetThemeButton, WidgetThemeColors, WidgetThemePanel, WidgetThemeSection, WidgetThemeWidget, WidgetValidation, WidgetValue };
+export { ArrayWidget, BooleanWidget, CheckboxWidget, CurrencyInputWidget, DateInputWidget, DateTimeInputWidget, DialogTableWidget, DisplayWidget, FileInputWidget, GEO_LEVEL_CLEARED, HeaderSectionWidget, IdAuthenticationWidget, IterableAccordionWidget, JSONEditorPanel, MultiSelectWidget, NumberInputWidget, PanelRenderer, PhoneInputWidget, ProfileWidget, PropertyEditor, RadioWidget, RegisterLookupWidget, ScoresDisplayWidget, SectionBuilder, SectionRenderer, SectionTree, SectionsContainer, SelectWidget, SimpleTableWidget, TableWidget, TextAreaWidget, TextInputWidget, VisualBuilderPanel, WidgetEventBus, WidgetProvider, WidgetRenderer, applyCaseControl, applyDecimalPrecision, applyMask, applySharedGeoHierarchyToValues, collectGeoWidgetRegistrationsFromWidgets, createGeoLevelMnemonicResolver, createWidgetStore, createZodSchema, defaultTheme, evaluateCondition, evaluateWidgetConditions, filterByCharacterType, formatCurrency, formatDate, formatNumber, formatPhone, formatValue, geoHierarchyBuilder, getApiDataSource, getCachedApiDataSource, getFormattedNumberLength, getGeoDescendantWidgetIds, getGeoGroupId, getGeoWidgetRegistrationsInGroup, getSchemaDataSource, getStaticDataSource, getValueByPath, getWidgetValue, hasVisibilityRules, initI18n, isAllowedKey, isUpstreamGeoAncestor, normalizeNumericDefault, normalizeOptionRules, orderGeoWidgetRegistrations, parseDataPath, parseNumber, rebuildGeoHierarchyFromRegistrations, reconcileGeoHierarchiesInValues, registerDefaultWidgets, registerGeoWidget, registerGeoWidgetParent, removeMask, resetAll, resetAndSeedGeoHierarchyFromValues, resetWidget, resolveGeoWidgetLevelLabel, resolveGeoWidgetLevelValue, resolveTheme, resolveWidgetIdValue, seedGeoHierarchyFromValues, setDataSource, setError, setLoading, setTouched, setValue, setValueByPath, setValues, setWidgetValue, shouldEnableWidget, shouldRequireWidget, shouldShowWidget, transformDataSourceOptions, translatePanelConfig, translateUISchema, translateWidgetConfig, unregisterGeoWidget, unregisterGeoWidgetParent, useBaseWidget, useGeoWidgetCascade, useWidgetCascade, useWidgetContext, useWidgetEventBus, useWidgetTheme, useWidgetTranslation, validateNumericValue, validateWidget, widgetRegistry };
+export type { ApiAdapter, ApiDataSource$1 as ApiDataSource, BaseWidgetConfig, BooleanControlType, BooleanRepresentation, CaseControl, CharacterType, ConditionOperator, DataSource, DataSourceRequestHandler, DataSourceType, GeoLevelConfig, GeoLevelData, GeoWidgetRegistration, InputMask, NumericType, PanelConfig, RoundingMode, SchemaDataSource, SectionBuilderProps, SectionChanges, SectionConfig, SectionMode, SectionRendererProps, SectionsContainerProps, SectionsFormHandle, StaticDataSource, SupportingDocumentConfig, TextAlign, TreeNode, TreeNodeType, UISchema, UseBaseWidgetOptions, ValidationType, WidgetCascadeConfig, WidgetCondition, WidgetConditionState, WidgetContextValue, WidgetDataPath, WidgetDispatch, WidgetEvent, WidgetEventType, WidgetFormat, WidgetGeoConfig, WidgetOptionRule, WidgetOptions, WidgetRegistryEntry, WidgetRenderFunction, WidgetRootState, WidgetState, WidgetStore, WidgetTheme, WidgetThemeButton, WidgetThemeColors, WidgetThemePanel, WidgetThemeSection, WidgetThemeWidget, WidgetValidation, WidgetValue };

package/dist/index.esm.js

@@ -2243,12 +2243,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) {
@@ -2343,7 +2476,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 = useDispatch();
@@ -2358,7 +2491,7 @@ const useBaseWidget = (options) => {
     const errors = useSelector((state) => state.widget.errors[widgetId] ?? EMPTY_ERRORS);
     const touched = useSelector((state) => state.widget.touched[widgetId] || false);
     const loading = useSelector((state) => state.widget.loading[widgetId] || false);
-    const dataSourceOptions = useSelector((state) => state.widget.dataSources[widgetId] ?? EMPTY_DATA_SOURCE$1);
+    const dataSourceOptions = 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';
@@ -2886,8 +3019,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
@@ -2917,15 +3048,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 = useSelector((state) => state.widget.dataSources[widgetId] ?? EMPTY_DATA_SOURCE);
+    const allDataSources = useSelector((state) => state.widget.dataSources);
     // Register parent chain for upstream-ancestor detection (grandparent → grandchild reset)
     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.)
     useEffect(() => {
         if (!geoConfig || typeof dataPath !== 'string') {
@@ -3017,18 +3148,20 @@ const useGeoWidgetCascade = (options) => {
     }, [geoConfig, eventBus, dataSource, widgetId, dataPath, dispatch, groupId]);
     // Handle value changes to build hierarchy
     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({
@@ -3041,56 +3174,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 {
@@ -4992,7 +5082,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;
@@ -5058,7 +5153,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;
@@ -12946,5 +13046,5 @@ const translateUISchema = (schema, translate) => {
     };
 };
 
-export { ArrayWidget, BooleanWidget, CheckboxWidget, CurrencyInputWidget, DateInputWidget, DateTimeInputWidget, DialogTableWidget, DisplayWidget, FileInputWidget, GEO_LEVEL_CLEARED, HeaderSectionWidget, IdAuthenticationWidget, IterableAccordionWidget, JSONEditorPanel, MultiSelectWidget, NumberInputWidget, PanelRenderer, PhoneInputWidget, ProfileWidget, PropertyEditor, RadioWidget, RegisterLookupWidget, ScoresDisplayWidget, SectionBuilder, SectionRenderer, SectionTree, SectionsContainer, SelectWidget, SimpleTableWidget, TableWidget, TextAreaWidget, TextInputWidget, VisualBuilderPanel, WidgetEventBus, WidgetProvider, WidgetRenderer, applyCaseControl, applyDecimalPrecision, applyMask, applySharedGeoHierarchyToValues, createWidgetStore, createZodSchema, defaultTheme, evaluateCondition, evaluateWidgetConditions, filterByCharacterType, formatCurrency, formatDate, formatNumber, formatPhone, formatValue, geoHierarchyBuilder, getApiDataSource, getCachedApiDataSource, getFormattedNumberLength, getGeoDescendantWidgetIds, getGeoGroupId, getSchemaDataSource, getStaticDataSource, getValueByPath, getWidgetValue, hasVisibilityRules, initI18n, isAllowedKey, isUpstreamGeoAncestor, normalizeNumericDefault, normalizeOptionRules, parseDataPath, parseNumber, registerDefaultWidgets, registerGeoWidgetParent, removeMask, resetAll, resetAndSeedGeoHierarchyFromValues, resetWidget, resolveGeoWidgetLevelLabel, resolveGeoWidgetLevelValue, resolveTheme, resolveWidgetIdValue, seedGeoHierarchyFromValues, setDataSource, setError, setLoading, setTouched, setValue, setValueByPath, setValues, setWidgetValue, shouldEnableWidget, shouldRequireWidget, shouldShowWidget, transformDataSourceOptions, translatePanelConfig, translateUISchema, translateWidgetConfig, unregisterGeoWidgetParent, useBaseWidget, useGeoWidgetCascade, useWidgetCascade, useWidgetContext, useWidgetEventBus, useWidgetTheme, useWidgetTranslation, validateNumericValue, validateWidget, widgetRegistry };
+export { ArrayWidget, BooleanWidget, CheckboxWidget, CurrencyInputWidget, DateInputWidget, DateTimeInputWidget, DialogTableWidget, DisplayWidget, FileInputWidget, GEO_LEVEL_CLEARED, HeaderSectionWidget, IdAuthenticationWidget, IterableAccordionWidget, JSONEditorPanel, MultiSelectWidget, NumberInputWidget, PanelRenderer, PhoneInputWidget, ProfileWidget, PropertyEditor, RadioWidget, RegisterLookupWidget, ScoresDisplayWidget, SectionBuilder, SectionRenderer, SectionTree, SectionsContainer, SelectWidget, SimpleTableWidget, TableWidget, TextAreaWidget, TextInputWidget, VisualBuilderPanel, WidgetEventBus, WidgetProvider, WidgetRenderer, applyCaseControl, applyDecimalPrecision, applyMask, applySharedGeoHierarchyToValues, collectGeoWidgetRegistrationsFromWidgets, createGeoLevelMnemonicResolver, createWidgetStore, createZodSchema, defaultTheme, evaluateCondition, evaluateWidgetConditions, filterByCharacterType, formatCurrency, formatDate, formatNumber, formatPhone, formatValue, geoHierarchyBuilder, getApiDataSource, getCachedApiDataSource, getFormattedNumberLength, getGeoDescendantWidgetIds, getGeoGroupId, getGeoWidgetRegistrationsInGroup, getSchemaDataSource, getStaticDataSource, getValueByPath, getWidgetValue, hasVisibilityRules, initI18n, isAllowedKey, isUpstreamGeoAncestor, normalizeNumericDefault, normalizeOptionRules, orderGeoWidgetRegistrations, parseDataPath, parseNumber, rebuildGeoHierarchyFromRegistrations, reconcileGeoHierarchiesInValues, registerDefaultWidgets, registerGeoWidget, registerGeoWidgetParent, removeMask, resetAll, resetAndSeedGeoHierarchyFromValues, resetWidget, resolveGeoWidgetLevelLabel, resolveGeoWidgetLevelValue, resolveTheme, resolveWidgetIdValue, seedGeoHierarchyFromValues, setDataSource, setError, setLoading, setTouched, setValue, setValueByPath, setValues, setWidgetValue, shouldEnableWidget, shouldRequireWidget, shouldShowWidget, transformDataSourceOptions, translatePanelConfig, translateUISchema, translateWidgetConfig, unregisterGeoWidget, unregisterGeoWidgetParent, useBaseWidget, useGeoWidgetCascade, useWidgetCascade, useWidgetContext, useWidgetEventBus, useWidgetTheme, useWidgetTranslation, validateNumericValue, validateWidget, widgetRegistry };
 //# sourceMappingURL=index.esm.js.map