Merge branch 'v4' into v5

# Conflicts:
#	composer.json

Author: cheesegrits

.gitignore

@@ -4,3 +4,4 @@
 composer.lock
 phpunit.xml
 .phpunit.result.cache
+/.output.txt

composer.json

@@ -41,7 +41,7 @@
         "pestphp/pest": "^4.0",
         "pestphp/pest-plugin-laravel": "^4.0",
         "orchestra/testbench": "^8.0|^9.0|^10.0",
-        "nonsapiens/realaddressfactory": "^2.0",
+        "nonsapiens/realaddressfactory": "^3.0",
         "timacdonald/log-fake": "^2.0",
         "laravel/pint": "^1.6"
     },

resources/views/fields/filament-google-widget-map.blade.php

@@ -16,7 +16,8 @@
             <input x-ref="pacinput" type="text" placeholder="Search Box" />
         @endif
 
-        <div
+        <div 
+            id="map-{{ $getMapId() }}"
             x-ref="map"
             class="w-full"
             style="

resources/views/widgets/filament-google-maps-widget.blade.php

@@ -55,6 +55,7 @@ class="-my-2"
                     @endif
             >
                 <div
+                        id="map-{{ $this->getMapId() }}"
                         x-ref="map"
                         class="w-full"
                         style="

src/Concerns/InteractsWithMaps.php

@@ -4,6 +4,7 @@
 
 use Cheesegrits\FilamentGoogleMaps\Fields\Geocomplete;
 use Cheesegrits\FilamentGoogleMaps\Fields\Map;
+use Filament\Schemas\Components\Component;
 
 trait InteractsWithMaps
 {
@@ -27,7 +28,11 @@ public function reverseGeocodeUpdated($container, string $statePath, array $resu
                 return true;
             }
 
-            foreach ($component->getChildComponentContainers() as $childComponentContainer) {
+            if (! $component instanceof Component) {
+                return false;
+            }
+
+            foreach ($component->getChildSchemas() as $childComponentContainer) {
                 if ($childComponentContainer->isHidden()) {
                     continue;
                 }
@@ -61,7 +66,11 @@ public function placeUpdated($container, string $statePath, array $results): boo
                 return true;
             }
 
-            foreach ($component->getChildComponentContainers() as $childComponentContainer) {
+            if (! $component instanceof Component) {
+                return false;
+            }
+
+            foreach ($component->getChildSchemas() as $childComponentContainer) {
                 if ($childComponentContainer->isHidden()) {
                     continue;
                 }

src/Fields/Geocomplete.php

@@ -131,7 +131,7 @@ public function getUpdateLatLngFields(): array
             $fields = $this->getModel()::getLatLngAttributes();
 
             foreach ($fields as $fieldKey => $field) {
-                $fieldId = FieldHelper::getFieldId($field, $this);
+                $fieldId = FieldHelper::getFieldStatePath($field, $this);
 
                 if ($fieldId) {
                     $statePaths[$fieldKey] = $fieldId;
@@ -247,7 +247,7 @@ public function getReverseGeocode(): array
         $statePaths = [];
 
         foreach ($fields as $field => $format) {
-            $fieldId = FieldHelper::getFieldId($field, $this);
+            $fieldId = FieldHelper::getFieldStatePath($field, $this);
 
             if ($fieldId) {
                 $statePaths[$fieldId] = $format;

src/Fields/Map.php

@@ -274,7 +274,7 @@ public function getReverseGeocode(): array
         $statePaths = [];
 
         foreach ($fields as $field => $format) {
-            $fieldId = FieldHelper::getFieldId($field, $this);
+            $fieldId = FieldHelper::getFieldStatePath($field, $this);
 
             if ($fieldId) {
                 $statePaths[$fieldId] = $format;
@@ -380,7 +380,7 @@ public function getDrawingField(): ?string
         $drawingField = $this->evaluate($this->drawingField);
 
         if ($drawingField) {
-            return FieldHelper::getFieldId($drawingField, $this);
+            return FieldHelper::getFieldStatePath($drawingField, $this);
         }
 
         return null;
@@ -507,7 +507,7 @@ public function getGeoJsonField(): ?string
         $jsonField = $this->evaluate($this->geoJsonField);
 
         if ($jsonField) {
-            return FieldHelper::getFieldId($jsonField, $this);
+            return FieldHelper::getFieldStatePath($jsonField, $this);
         }
 
         return null;
@@ -709,7 +709,7 @@ public function getAutocompleteId(): ?string
         $autoCompleteField = $this->getAutocomplete();
 
         if (! blank($autoCompleteField)) {
-            return FieldHelper::getFieldId($autoCompleteField, $this);
+            return FieldHelper::getFieldStatePath($autoCompleteField, $this);
         }
 
         return null;

src/Fields/WidgetMap.php

@@ -37,6 +37,8 @@ class WidgetMap extends Field
 
     protected Closure|Action|null $markerAction = null;
 
+    protected static ?string $mapId = null;
+
     /**
      * Main field config variables
      */
@@ -301,4 +303,11 @@ public function getState(): mixed
             }
         }
     }
+
+    public function getMapId(): ?string
+    {
+        $mapId = static::$mapId ?? str(get_called_class())->afterLast('\\')->studly()->toString();
+
+        return preg_replace('/[^a-zA-Z0-9_]/', '', $mapId);
+    }
 }

src/Helpers/FieldHelper.php

@@ -30,7 +30,7 @@ public static function getFlatFields($topComponent): array
         return $flatFields;
     }
 
-    public static function getFieldId(string $field, Component $component): ?string
+    public static function getFieldStatePath(string $field, Component $component): ?string
     {
         $topComponent = self::getTopComponent($component);
         $flatFields   = static::getFlatFields($topComponent);

src/Infolists/MapEntry.php

@@ -94,7 +94,7 @@ public function getDrawingField(): ?string
         $drawingField = $this->evaluate($this->drawingField);
 
         if ($drawingField) {
-            return FieldHelper::getFieldId($drawingField, $this);
+            return FieldHelper::getFieldStatePath($drawingField, $this);
         }
 
         return null;