@countriesdb/widget 0.1.32 → 0.1.34

package/dist/dom-manipulation.js

@@ -105,9 +105,8 @@ export function applyPreselectedValue(select, apiKey) {
     // Read from select element like old widget (line 740)
     const tempOnce = select.dataset._widgetTempPreselect;
     const permanent = select.getAttribute('data-preselected') || select.dataset.preselected;
-    const chosen = (tempOnce !== undefined && tempOnce !== null && String(tempOnce).trim() !== '')
-        ? tempOnce
-        : permanent;
+    const hasTemp = tempOnce !== undefined && tempOnce !== null && String(tempOnce).trim() !== '';
+    const chosen = hasTemp ? tempOnce : permanent;
     if (!chosen || (typeof chosen === 'string' && chosen.trim() === '')) {
         return;
     }
@@ -133,6 +132,12 @@ export function applyPreselectedValue(select, apiKey) {
     if (select.dataset._widgetTempPreselect !== undefined) {
         delete select.dataset._widgetTempPreselect;
     }
+    // Mark permanent preselect as consumed after first application
+    // This prevents it from being reapplied on user-initiated country changes
+    // But reload: true will clear this flag to allow reapplication
+    if (permanent !== undefined && permanent !== null && String(permanent).trim() !== '') {
+        select.dataset._widgetPreselectedConsumed = '1';
+    }
 }
 /**
  * Handle API error by showing error message in select

package/dist/index.esm.js

@@ -106,9 +106,8 @@ function applyPreselectedValue(select, apiKey) {
     // Read from select element like old widget (line 740)
     const tempOnce = select.dataset._widgetTempPreselect;
     const permanent = select.getAttribute('data-preselected') || select.dataset.preselected;
-    const chosen = (tempOnce !== undefined && tempOnce !== null && String(tempOnce).trim() !== '')
-        ? tempOnce
-        : permanent;
+    const hasTemp = tempOnce !== undefined && tempOnce !== null && String(tempOnce).trim() !== '';
+    const chosen = hasTemp ? tempOnce : permanent;
     if (!chosen || (typeof chosen === 'string' && chosen.trim() === '')) {
         return;
     }
@@ -134,6 +133,12 @@ function applyPreselectedValue(select, apiKey) {
     if (select.dataset._widgetTempPreselect !== undefined) {
         delete select.dataset._widgetTempPreselect;
     }
+    // Mark permanent preselect as consumed after first application
+    // This prevents it from being reapplied on user-initiated country changes
+    // But reload: true will clear this flag to allow reapplication
+    if (permanent !== undefined && permanent !== null && String(permanent).trim() !== '') {
+        select.dataset._widgetPreselectedConsumed = '1';
+    }
 }
 /**
  * Handle API error by showing error message in select
@@ -622,7 +627,13 @@ async function updateSubdivisionSelect(select, apiKey, backendUrl, state, config
                 if (!userSelectionRestored) {
                     // Check if preselected value exists (applyPreselectedValue will read it from select element)
                     const hasPreselectedValue = (select.getAttribute('data-preselected') || select.dataset.preselected || select.dataset._widgetTempPreselect) !== undefined;
-                    if (hasPreselectedValue) {
+                    const preselectedConsumed = select.dataset._widgetPreselectedConsumed === '1';
+                    // Only apply preselected if:
+                    // 1. It exists AND
+                    // 2. Either it hasn't been consumed yet, OR this is the initial load (not a reload)
+                    // This prevents reapplying preselected values on user-initiated country changes
+                    // But allows them on initial load and on reload: true (which clears the consumed flag)
+                    if (hasPreselectedValue && (!preselectedConsumed || !isReload)) {
                         applyPreselectedValue(select, apiKey);
                         dispatchUpdateEvent(select, {
                             type: 'subdivision',
@@ -690,23 +701,62 @@ async function updateSubdivisionSelect(select, apiKey, backendUrl, state, config
     }
 }
 /**
- * Get current subdivision config from window.CountriesDBConfig
+ * Get current subdivision config from window.CountriesDBConfig and script URL
  * This ensures we always use the latest config values, even after widget reload
  */
 function getCurrentSubdivisionConfig(apiKey, backendUrl) {
     const globalConfig = typeof window !== 'undefined' && window.CountriesDBConfig
         ? window.CountriesDBConfig
         : null;
+    // Also check script URL parameters (for backward compatibility and reload scenarios)
+    let scriptUrl = null;
+    try {
+        const scripts = Array.from(document.getElementsByTagName('script'));
+        const loaderScript = scripts.find((s) => s.src && (s.src.includes('@countriesdb/widget') ||
+            s.src.includes('widget/dist/index.js'))) || null;
+        if (loaderScript && loaderScript.src) {
+            scriptUrl = new URL(loaderScript.src);
+        }
+    }
+    catch {
+        // Ignore errors
+    }
+    // Import parseBoolean from dom-manipulation
+    const parseBoolean = (value) => {
+        if (value === null || value === undefined) {
+            return false;
+        }
+        const lowered = String(value).trim().toLowerCase();
+        return !(lowered === '0' || lowered === 'false');
+    };
     return {
-        followRelated: globalConfig?.followRelated || false,
-        followUpward: globalConfig?.followUpward || false,
-        showSubdivisionType: globalConfig?.showSubdivisionType !== false,
-        allowParentSelection: globalConfig?.allowParentSelection || false,
-        preferOfficialSubdivisions: globalConfig?.preferOfficialSubdivisions || false,
-        subdivisionRomanizationPreference: globalConfig?.subdivisionRomanizationPreference,
-        preferLocalVariant: globalConfig?.preferLocalVariant || false,
-        forcedLanguage: globalConfig?.forcedLanguage,
-        defaultLanguage: globalConfig?.defaultLanguage,
+        followRelated: globalConfig?.followRelated !== undefined
+            ? globalConfig.followRelated
+            : parseBoolean(scriptUrl?.searchParams.get('follow_related') ?? 'false'),
+        followUpward: globalConfig?.followUpward !== undefined
+            ? globalConfig.followUpward
+            : parseBoolean(scriptUrl?.searchParams.get('follow_upward') ?? 'false'),
+        showSubdivisionType: globalConfig?.showSubdivisionType !== undefined
+            ? globalConfig.showSubdivisionType
+            : parseBoolean(scriptUrl?.searchParams.get('show_subdivision_type') ?? '1'),
+        allowParentSelection: globalConfig?.allowParentSelection !== undefined
+            ? globalConfig.allowParentSelection
+            : parseBoolean(scriptUrl?.searchParams.get('allow_parent_selection') ?? 'false'),
+        preferOfficialSubdivisions: globalConfig?.preferOfficialSubdivisions !== undefined
+            ? globalConfig.preferOfficialSubdivisions
+            : parseBoolean(scriptUrl?.searchParams.get('prefer_official') ?? 'false'),
+        subdivisionRomanizationPreference: globalConfig?.subdivisionRomanizationPreference ||
+            scriptUrl?.searchParams.get('subdivision_romanization_preference') ||
+            undefined,
+        preferLocalVariant: globalConfig?.preferLocalVariant !== undefined
+            ? globalConfig.preferLocalVariant
+            : parseBoolean(scriptUrl?.searchParams.get('prefer_local_variant') ?? 'false'),
+        forcedLanguage: globalConfig?.forcedLanguage ||
+            scriptUrl?.searchParams.get('forced_language') ||
+            undefined,
+        defaultLanguage: globalConfig?.defaultLanguage ||
+            scriptUrl?.searchParams.get('default_language') ||
+            undefined,
         subdivisionNameFilter: globalConfig?.subdivisionNameFilter,
     };
 }
@@ -897,6 +947,16 @@ async function CountriesWidgetLoad(options = {}) {
     if (shouldReload) {
         NS.initialized = false;
         NS.initPromise = null;
+        // Clear consumed preselected flags to allow preselected values to be reapplied on reload: true
+        // This ensures full reload behavior where preselected values are reapplied
+        if (typeof document !== 'undefined') {
+            const subdivisionSelects = document.querySelectorAll('.subdivision-selection');
+            subdivisionSelects.forEach((select) => {
+                if (select.dataset._widgetPreselectedConsumed) {
+                    delete select.dataset._widgetPreselectedConsumed;
+                }
+            });
+        }
     }
     // Share the same promise across concurrent calls
     NS.initPromise = (async () => {