@countriesdb/widget 0.1.6 → 0.1.8

package/dist/follow-logic.d.ts

@@ -5,7 +5,7 @@ import type { SelectElement, WidgetState } from './types';
 /**
  * Trigger follow logic when a subdivision is selected
  */
-export declare function triggerFollowLogic(select: SelectElement, apiKey: string, backendUrl: string, state: WidgetState, followRelated: boolean, followUpward: boolean, updateSubdivisionSelectFn: (select: SelectElement, apiKey: string, countryCode: string) => Promise<void>): Promise<void>;
+export declare function triggerFollowLogic(select: SelectElement, apiKey: string, backendUrl: string, state: WidgetState, followRelated: boolean, followUpward: boolean, updateSubdivisionSelectFn: (select: SelectElement, apiKey: string, countryCode: string) => Promise<void>, updateSubdivisionsFn?: (countrySelect: SelectElement, apiKey: string) => Promise<void>): Promise<void>;
 /**
  * Handle follow_related from subdivision change event
  */

package/dist/follow-logic.js

@@ -5,7 +5,7 @@ import { dispatchUpdateEvent } from './event-system';
 /**
  * Trigger follow logic when a subdivision is selected
  */
-export async function triggerFollowLogic(select, apiKey, backendUrl, state, followRelated, followUpward, updateSubdivisionSelectFn) {
+export async function triggerFollowLogic(select, apiKey, backendUrl, state, followRelated, followUpward, updateSubdivisionSelectFn, updateSubdivisionsFn) {
     if (!followRelated && !followUpward) {
         return;
     }
@@ -39,9 +39,17 @@ export async function triggerFollowLogic(select, apiKey, backendUrl, state, foll
             relatedSubsSelect.dataset._widgetTempPreselect = targetSubdivision; // one-time preselect
         }
         if (linkedCountrySelect.value !== targetCountry) {
+            // Directly set value like old widget did
             linkedCountrySelect.value = targetCountry;
             dispatchUpdateEvent(linkedCountrySelect, { type: 'country', reason: 'regular' });
-            await updateSubdivisionSelectFn(linkedCountrySelect, apiKey, targetCountry);
+            // Update all subdivision selects for the new country (like old widget)
+            if (updateSubdivisionsFn) {
+                await updateSubdivisionsFn(linkedCountrySelect, apiKey);
+            }
+            else if (relatedSubsSelect) {
+                // Fallback: update just the one subdivision select
+                await updateSubdivisionSelectFn(relatedSubsSelect, apiKey, targetCountry);
+            }
         }
         else {
             if (relatedSubsSelect && targetSubdivision) {
@@ -61,9 +69,19 @@ export async function triggerFollowLogic(select, apiKey, backendUrl, state, foll
             }
         }
         if (linkedCountrySelect.value !== parentCode) {
+            // Directly set value like old widget did
             linkedCountrySelect.value = parentCode;
             dispatchUpdateEvent(linkedCountrySelect, { type: 'country', reason: 'regular' });
-            await updateSubdivisionSelectFn(linkedCountrySelect, apiKey, parentCode);
+            // Update all subdivision selects for the new country (like old widget)
+            if (updateSubdivisionsFn) {
+                await updateSubdivisionsFn(linkedCountrySelect, apiKey);
+            }
+            else {
+                const relatedSubsSelect = document.querySelector(`.subdivision-selection[data-country="${linkedCountrySelect.dataset.name}"]`);
+                if (relatedSubsSelect) {
+                    await updateSubdivisionSelectFn(relatedSubsSelect, apiKey, parentCode);
+                }
+            }
         }
         else if (parentSub) {
             const relatedSubsSelect = document.querySelector(`.subdivision-selection[data-country="${linkedCountrySelect.dataset.name}"]`);
@@ -107,9 +125,12 @@ export async function handleFollowRelatedFromSubdivision(select, apiKey, backend
         relatedSubsSelect.dataset.preselected = targetSubdivision;
     }
     if (linkedCountrySelect.value !== targetCountry) {
+        // Directly set value like old widget did
         linkedCountrySelect.value = targetCountry;
         dispatchUpdateEvent(linkedCountrySelect, { type: 'country', reason: 'regular' });
-        // Update the subdivision select for the new country
+        // Update all subdivision selects for the new country (like old widget)
+        // Note: updateSubdivisionsFn is not available in handleFollowRelatedFromSubdivision,
+        // so we update the subdivision select manually
         if (relatedSubsSelect) {
             await updateSubdivisionSelectFn(relatedSubsSelect, apiKey, targetCountry);
         }
@@ -157,9 +178,12 @@ export async function handleFollowUpwardFromSubdivision(select, apiKey, backendU
         }
     }
     if (linkedCountrySelect.value !== parentCode) {
+        // Directly set value like old widget did
         linkedCountrySelect.value = parentCode;
         dispatchUpdateEvent(linkedCountrySelect, { type: 'country', reason: 'follow' });
-        // Update the subdivision select for the new country
+        // Update all subdivision selects for the new country (like old widget)
+        // Note: updateSubdivisionsFn is not available in handleFollowUpwardFromSubdivision,
+        // so we update the subdivision select manually
         const relatedSubsSelect = document.querySelector(`.subdivision-selection[data-country="${linkedCountrySelect.dataset.name}"]`);
         if (relatedSubsSelect) {
             await updateSubdivisionSelectFn(relatedSubsSelect, apiKey, parentCode);
@@ -204,9 +228,12 @@ export async function handleFollowUpwardFromCountry(select, apiKey, backendUrl,
                 }
             }
         }
+        // Directly set value like old widget did
         select.value = parentCode;
         dispatchUpdateEvent(select, { type: 'country', reason: 'regular' });
-        // Update all linked subdivision selects for the new country
+        // Update all subdivision selects for the new country (like old widget)
+        // Note: updateSubdivisionsFn is not available in handleFollowUpwardFromCountry,
+        // so we update all subdivision selects manually
         const linkedSubdivisionSelects = Array.from(document.querySelectorAll(`.subdivision-selection[data-country="${select.dataset.name}"]`));
         for (const s of linkedSubdivisionSelects) {
             await updateSubdivisionSelectFn(s, apiKey, parentCode);

package/dist/index.esm.js

@@ -169,10 +169,91 @@ function isWidgetInitiatedEvent(event) {
 /**
  * Trigger follow logic when a subdivision is selected
  */
-async function triggerFollowLogic(select, apiKey, backendUrl, state, followRelated, followUpward, updateSubdivisionSelectFn) {
-    {
+async function triggerFollowLogic(select, apiKey, backendUrl, state, followRelated, followUpward, updateSubdivisionSelectFn, updateSubdivisionsFn) {
+    if (!followRelated && !followUpward) {
         return;
     }
+    const linkedCountrySelect = document.querySelector(`.country-selection[data-name="${select.dataset.country}"]`);
+    // Only work if country is single-select (never when country is multi)
+    if (!linkedCountrySelect || linkedCountrySelect.multiple) {
+        return;
+    }
+    const allSubs = state.subdivisionsMap.get(select);
+    if (!allSubs) {
+        return;
+    }
+    // For follow_upward, only work if subdivision is single-select
+    if (followUpward && select.multiple) {
+        return;
+    }
+    const selectedCode = select.value;
+    if (!selectedCode) {
+        return;
+    }
+    const picked = allSubs.find((s) => s.code === selectedCode);
+    if (!picked) {
+        return;
+    }
+    // follow_related
+    if (followRelated && picked.related_country_code) {
+        const targetCountry = picked.related_country_code;
+        const targetSubdivision = picked.related_subdivision_code;
+        const relatedSubsSelect = document.querySelector(`.subdivision-selection[data-country="${linkedCountrySelect.dataset.name}"]`);
+        if (relatedSubsSelect && targetSubdivision) {
+            relatedSubsSelect.dataset._widgetTempPreselect = targetSubdivision; // one-time preselect
+        }
+        if (linkedCountrySelect.value !== targetCountry) {
+            // Directly set value like old widget did
+            linkedCountrySelect.value = targetCountry;
+            dispatchUpdateEvent(linkedCountrySelect, { type: 'country', reason: 'regular' });
+            // Update all subdivision selects for the new country (like old widget)
+            if (updateSubdivisionsFn) {
+                await updateSubdivisionsFn(linkedCountrySelect, apiKey);
+            }
+            else if (relatedSubsSelect) {
+                // Fallback: update just the one subdivision select
+                await updateSubdivisionSelectFn(relatedSubsSelect, apiKey, targetCountry);
+            }
+        }
+        else {
+            if (relatedSubsSelect && targetSubdivision) {
+                await updateSubdivisionSelectFn(relatedSubsSelect, apiKey, targetCountry);
+            }
+        }
+    }
+    // follow_upward
+    if (followUpward && picked.is_subdivision_of) {
+        const parentCode = picked.is_subdivision_of.parent_country_code;
+        const parentSub = picked.is_subdivision_of.subdivision_code;
+        if (parentSub) {
+            const relatedSubsSelect = document.querySelector(`.subdivision-selection[data-country="${linkedCountrySelect.dataset.name}"]`);
+            // Only preselect if subdivision is single-select (follow_upward doesn't work with multi)
+            if (relatedSubsSelect && !relatedSubsSelect.multiple) {
+                relatedSubsSelect.dataset._widgetTempPreselect = parentSub; // one-time preselect
+            }
+        }
+        if (linkedCountrySelect.value !== parentCode) {
+            // Directly set value like old widget did
+            linkedCountrySelect.value = parentCode;
+            dispatchUpdateEvent(linkedCountrySelect, { type: 'country', reason: 'regular' });
+            // Update all subdivision selects for the new country (like old widget)
+            if (updateSubdivisionsFn) {
+                await updateSubdivisionsFn(linkedCountrySelect, apiKey);
+            }
+            else {
+                const relatedSubsSelect = document.querySelector(`.subdivision-selection[data-country="${linkedCountrySelect.dataset.name}"]`);
+                if (relatedSubsSelect) {
+                    await updateSubdivisionSelectFn(relatedSubsSelect, apiKey, parentCode);
+                }
+            }
+        }
+        else if (parentSub) {
+            const relatedSubsSelect = document.querySelector(`.subdivision-selection[data-country="${linkedCountrySelect.dataset.name}"]`);
+            if (relatedSubsSelect && !relatedSubsSelect.multiple) {
+                await updateSubdivisionSelectFn(relatedSubsSelect, apiKey, parentCode);
+            }
+        }
+    }
 }
 /**
  * Handle follow_related from subdivision change event
@@ -208,9 +289,12 @@ async function handleFollowRelatedFromSubdivision(select, apiKey, backendUrl, st
         relatedSubsSelect.dataset.preselected = targetSubdivision;
     }
     if (linkedCountrySelect.value !== targetCountry) {
+        // Directly set value like old widget did
         linkedCountrySelect.value = targetCountry;
         dispatchUpdateEvent(linkedCountrySelect, { type: 'country', reason: 'regular' });
-        // Update the subdivision select for the new country
+        // Update all subdivision selects for the new country (like old widget)
+        // Note: updateSubdivisionsFn is not available in handleFollowRelatedFromSubdivision,
+        // so we update the subdivision select manually
         if (relatedSubsSelect) {
             await updateSubdivisionSelectFn(relatedSubsSelect, apiKey, targetCountry);
         }
@@ -258,9 +342,12 @@ async function handleFollowUpwardFromSubdivision(select, apiKey, backendUrl, sta
         }
     }
     if (linkedCountrySelect.value !== parentCode) {
+        // Directly set value like old widget did
         linkedCountrySelect.value = parentCode;
         dispatchUpdateEvent(linkedCountrySelect, { type: 'country', reason: 'follow' });
-        // Update the subdivision select for the new country
+        // Update all subdivision selects for the new country (like old widget)
+        // Note: updateSubdivisionsFn is not available in handleFollowUpwardFromSubdivision,
+        // so we update the subdivision select manually
         const relatedSubsSelect = document.querySelector(`.subdivision-selection[data-country="${linkedCountrySelect.dataset.name}"]`);
         if (relatedSubsSelect) {
             await updateSubdivisionSelectFn(relatedSubsSelect, apiKey, parentCode);
@@ -305,9 +392,12 @@ async function handleFollowUpwardFromCountry(select, apiKey, backendUrl, state,
                 }
             }
         }
+        // Directly set value like old widget did
         select.value = parentCode;
         dispatchUpdateEvent(select, { type: 'country', reason: 'regular' });
-        // Update all linked subdivision selects for the new country
+        // Update all subdivision selects for the new country (like old widget)
+        // Note: updateSubdivisionsFn is not available in handleFollowUpwardFromCountry,
+        // so we update all subdivision selects manually
         const linkedSubdivisionSelects = Array.from(document.querySelectorAll(`.subdivision-selection[data-country="${select.dataset.name}"]`));
         for (const s of linkedSubdivisionSelects) {
             await updateSubdivisionSelectFn(s, apiKey, parentCode);
@@ -446,9 +536,7 @@ async function updateSubdivisionSelect(select, apiKey, backendUrl, state, config
                         reason: 'preselected',
                     });
                     valueSetByWidget = true;
-                    await triggerFollowLogic(select, apiKey, backendUrl, state, false, // followRelated - handled in event listeners
-                    false, // followUpward - handled in event listeners
-                    (s, key, code) => updateSubdivisionSelect(s, key, backendUrl, state, config, code));
+                    await triggerFollowLogic(select, apiKey, backendUrl, state, config.followRelated, config.followUpward, (s, key, code) => updateSubdivisionSelect(s, key, backendUrl, state, config, code), (countrySelect, key) => updateSubdivisions(countrySelect, key, backendUrl, state, config));
                 }
                 else {
                     // Try GeoIP preselect
@@ -472,7 +560,7 @@ async function updateSubdivisionSelect(select, apiKey, backendUrl, state, config
                                 reason: 'geoip',
                             });
                             valueSetByWidget = true;
-                            await triggerFollowLogic(select, apiKey, backendUrl, state, false, false, (s, key, code) => updateSubdivisionSelect(s, key, backendUrl, state, config, code));
+                            await triggerFollowLogic(select, apiKey, backendUrl, state, config.followRelated, config.followUpward, (s, key, code) => updateSubdivisionSelect(s, key, backendUrl, state, config, code), (countrySelect, key) => updateSubdivisions(countrySelect, key, backendUrl, state, config));
                         }
                     }
                 }
@@ -699,6 +787,8 @@ async function CountriesWidgetLoad(options = {}) {
             subdivisionNameFilter: config.subdivisionNameFilter,
         });
         const subdivisionConfig = {
+            followRelated: config.followRelated || false,
+            followUpward: config.followUpward || false,
             showSubdivisionType: config.showSubdivisionType !== false,
             allowParentSelection: config.allowParentSelection || false,
             subdivisionRomanizationPreference: config.subdivisionRomanizationPreference,