@tpzdsp/next-toolkit 1.12.4 → 1.12.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tpzdsp/next-toolkit",
-  "version": "1.12.4",
+  "version": "1.12.5",
   "description": "A reusable React component library for Next.js applications",
   "engines": {
     "node": ">= 24.12.0",

package/src/map/MapComponent.tsx

@@ -89,12 +89,8 @@ export const MapComponent = ({
     const attribution = new Attribution();
     const layerSwitcher = new LayerSwitcherControl(layers);
 
-    // Add controls in the desired order
-    const controls = [mapZoom, layerSwitcher, scaleLine, attribution];
-
     const newMap = new Map({
       target,
-      controls,
       layers,
       view: new View({
         projection: 'EPSG:3857',
@@ -108,12 +104,7 @@ export const MapComponent = ({
       }),
     });
 
-    // Mark the map as initialized to prevent re-initialization
-    // This is a workaround to avoid re-initializing the map when the component
-    // re-renders. The map is only initialized once when the component mounts.
-    // This is important because the map is a singleton and should not be
-    // re-initialized.
-    mapInitializedRef.current = true;
+    const controls = [mapZoom, layerSwitcher, scaleLine, attribution];
 
     // Create an instance of the custom provider, passing any options that are
     // required
@@ -122,12 +113,23 @@ export const MapComponent = ({
       try {
         const geocoder = initializeGeocoder(osMapsApiKey, geocoderUrl, newMap);
 
-        newMap.addControl(geocoder as Control);
+        // Put geocoder first so the tabbing order is sensible
+        controls.unshift(geocoder);
       } catch (error) {
         console.error('Failed to initialize geocoder:', error);
       }
     }
 
+    // Add controls in the desired order
+    controls.forEach((control) => newMap.addControl(control));
+
+    // Mark the map as initialized to prevent re-initialization
+    // This is a workaround to avoid re-initializing the map when the component
+    // re-renders. The map is only initialized once when the component mounts.
+    // This is important because the map is a singleton and should not be
+    // re-initialized.
+    mapInitializedRef.current = true;
+
     // Setup popup overlay
     const overlay = new Overlay({
       element: document.getElementById('popup-container') ?? undefined,