From 4e8c3e0ff7a61d766d877db72bbc3156eb52cfa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustavo=20Galv=C3=A3o?= <gu.afgalvao@gmail.com>
Date: Wed, 16 Apr 2025 19:08:16 -0300
Subject: [PATCH 01/15] fix: full page widget layout

---
 resources/views/components/map.blade.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/resources/views/components/map.blade.php b/resources/views/components/map.blade.php
index 8542bcf..dc5c019 100644
--- a/resources/views/components/map.blade.php
+++ b/resources/views/components/map.blade.php
@@ -216,26 +216,26 @@
                 },
                 toggleFullpage: function () {
                     if (this.fullpage == false) {
-                        document.querySelector('.fi-main-ctn').style.position = 'relative';
-                        document.querySelector('.fi-main-ctn').style.maxHeight = '100vh';
-                        document.querySelector('.fi-main-ctn').style.overflow = 'hidden';
+                        document.querySelector('.fi-main-ctn').style.height = '100vh';
+                        document.querySelector('.fi-main').style.position = 'relative';
+                        document.querySelector('.fi-main').style.overflow = 'hidden';
                         this.$refs.map.style.height = this.mapFullpageHeight;
                         this.$refs.map.style.minHeight = this.mapFullpageHeight;
                         this.$refs.map.style.position = 'absolute';
-                        this.$refs.map.style.top = document.querySelector('.fi-topbar').offsetHeight + 'px';
+                        this.$refs.map.style.top = '0';
                         this.$refs.map.style.left = '0';
                         this.$refs.map.style.zIndex = '5';
                         this.fullpage = true;
                         return;
                     }
 
-                    document.querySelector('.fi-main-ctn').style.position = '';
+                    document.querySelector('.fi-main-ctn').style.maxHeight = null;
+                    document.querySelector('.fi-main').style.position = '';
+                    document.querySelector('.fi-main').style.overflow = null;
                     this.$refs.map.style.height = this.mapDefaultHeight;
                     this.$refs.map.style.minHeight = '100%';
                     this.$refs.map.style.position = '';
                     this.$refs.map.style.top = 'inherit';
-                    document.querySelector('.fi-main-ctn').style.maxHeight = null;
-                    document.querySelector('.fi-main-ctn').style.overflow = null;
                     this.fullpage = false;
                 },
                 setTileLayer: function (mode) {

From 0537d617c733e8706915ef10fcd02d297ebaa9b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustavo=20Galv=C3=A3o?= <gu.afgalvao@gmail.com>
Date: Thu, 17 Apr 2025 15:18:09 -0300
Subject: [PATCH 02/15] feat: adapt filament section to local card component

---
 .../views/components/card/heading.blade.php   |  5 ++
 .../views/components/card/index.blade.php     | 60 +++++++++++++++++
 resources/views/components/map.blade.php      | 12 +++-
 resources/views/widgets/map.blade.php         | 64 ++++++-------------
 src/Widgets/MapWidget.php                     |  2 +-
 5 files changed, 96 insertions(+), 47 deletions(-)
 create mode 100644 resources/views/components/card/heading.blade.php
 create mode 100644 resources/views/components/card/index.blade.php

diff --git a/resources/views/components/card/heading.blade.php b/resources/views/components/card/heading.blade.php
new file mode 100644
index 0000000..3f81bc8
--- /dev/null
+++ b/resources/views/components/card/heading.blade.php
@@ -0,0 +1,5 @@
+<h3
+    {{ $attributes->class(['fi-maps-card-header-heading text-base font-semibold leading-6 text-gray-950 dark:text-white']) }}
+>
+    {{ $slot }}
+</h3>
diff --git a/resources/views/components/card/index.blade.php b/resources/views/components/card/index.blade.php
new file mode 100644
index 0000000..aa796ca
--- /dev/null
+++ b/resources/views/components/card/index.blade.php
@@ -0,0 +1,60 @@
+@props([
+    'hasBorder' => true,
+    'heading' => null,
+    'footer' => null,
+])
+
+@php
+    $hasHeading = filled($heading);
+    $hasHeader = $hasHeading;
+
+    $hasFooter = filled($footer);
+@endphp
+
+<section class="fi-maps-card flex flex-col h-full overflow-hidden rounded-xl bg-white shadow-sm ring-1 ring-gray-950/5 dark:bg-gray-900 dark:ring-white/10">
+    @if ($hasHeader)
+        <header @class([
+            'fi-maps-card-header flex flex-col gap-3',
+            match ($hasBorder) {
+                true => 'px-4 py-2.5',
+                false => 'px-6 py-4',
+            }
+        ])>
+            <div class="flex items-center gap-3">
+                @if ($hasHeading)
+                    <div class="grid flex-1 gap-y-1">
+                        @if ($hasHeading)
+                            <x-filament-maps::card.heading>
+                                {{ $heading }}
+                            </x-filament-maps::card.heading>
+                        @endif
+                    </div>
+                @endif
+            </div>
+        </header>
+    @endif
+
+    <div
+        @class([
+            'fi-maps-card-content flex-1',
+            match ($hasBorder) {
+                true => 'p-6',
+                false => '',
+            },
+        ])
+    >
+        {{ $slot }}
+    </div>
+
+    @if ($hasFooter)
+        <footer @class([
+            'fi-maps-card-footer border-t border-gray-200 dark:border-white/10',
+            match ($hasBorder) {
+                true => 'px-4 py-2.5',
+                false => 'px-6 py-4',
+            }
+        ])>
+            {{ $footer }}
+        </footer>
+    @endif
+</section>
diff --git a/resources/views/components/map.blade.php b/resources/views/components/map.blade.php
index dc5c019..57d2462 100644
--- a/resources/views/components/map.blade.php
+++ b/resources/views/components/map.blade.php
@@ -12,6 +12,7 @@
     'modals' => null,
     'rounded' => true,
     'fullpage' => false,
+    'pollingInterval' => null,
 ])
 
 @php
@@ -20,7 +21,15 @@
         fn (\Webbingbrasil\FilamentMaps\Actions\Action $action ): bool => ! $action->isHidden(),
     );
 @endphp
-<div class="filament-map">
+<div
+    @class([
+        'filament-map h-full',
+    ])
+
+    @if ($pollingInterval)
+        wire:poll.{{ $pollingInterval }}
+    @endif
+>
     <div
         {{ $attributes->class([
             'h-full w-full overflow-hidden',
@@ -28,6 +37,7 @@
         ]) }}
         {{ $extraAttributeBag }}>
         <div
+            class="h-full"
             wire:ignore
             x-data="{
                 mode: null,
diff --git a/resources/views/widgets/map.blade.php b/resources/views/widgets/map.blade.php
index 25875a9..7cafa91 100644
--- a/resources/views/widgets/map.blade.php
+++ b/resources/views/widgets/map.blade.php
@@ -1,46 +1,20 @@
-@php
-    $heading = $this->getHeading();
-    $footer = $this->getFooter();
-    $hasBorder = $this->getHasBorder();
-    $rounded = $this->getRounded();
-@endphp
-<x-filament-widgets::widget class="filament-maps-widget">
-    <x-filament::card class="filament-maps-card">
-        @if ($heading)
-            <div @class([
-                'px-4 py-2' => $hasBorder,
-                'px-6 py-4' => !$hasBorder,
-            ])>
-                <div class="flex flex-col gap-4 xl:flex-row xl:items-center xl:justify-between">
-                    {{ $heading }}
-                </div>
-            </div>
-        @endif
-
-        <div    @if ($pollingInterval = $this->getPollingInterval())
-                    wire:poll.5s.visible
-                @endif
-                @class(['px-4 py-2' => $hasBorder])>
-            <x-filament-maps::map
-                :rounded="$rounded && $hasBorder"
-                :tile-layer-url="$this->getTileLayerUrl()"
-                :tile-layer-options="$this->getTileLayerOptions()"
-                :height="$this->getHeight()"
-                :options="$this->getMapOptions()"
-                :actions="$this->getCachedMapActions()"
-                :extra-attribute-bag="$this->getExtraAttributeBag()"
-                :extra-alpine-attribute-bag="$this->getExtraAlpineAttributeBag()"
-                :fullpage="$this->isFullPage()" />
-        </div>
-
-        @if ($footer)
-            <div @class([
-                'px-4 py-2' => $hasBorder,
-                'px-6 py-4' => !$hasBorder,
-            ])>
-                {{ $footer }}
-            </div>
-        @endif
-    </x-filament::card>
+<x-filament-widgets::widget class="fi-maps-widget">
+    <x-filament-maps::card
+        :has-border="$this->getHasBorder()"
+        :heading="$this->getHeading()"
+        :footer="$this->getFooter()"
+    >
+        <x-filament-maps::map
+            :rounded="$this->getRounded()"
+            :tile-layer-url="$this->getTileLayerUrl()"
+            :tile-layer-options="$this->getTileLayerOptions()"
+            :height="$this->getHeight()"
+            :options="$this->getMapOptions()"
+            :actions="$this->getCachedMapActions()"
+            :extra-attribute-bag="$this->getExtraAttributeBag()"
+            :extra-alpine-attribute-bag="$this->getExtraAlpineAttributeBag()"
+            :fullpage="$this->isFullPage()"
+            :polling-interval="$this->getPollingInterval()"
+        />
+    </x-filament-maps::card>
 </x-filament-widgets::widget>
-
diff --git a/src/Widgets/MapWidget.php b/src/Widgets/MapWidget.php
index 07fe200..1de4869 100644
--- a/src/Widgets/MapWidget.php
+++ b/src/Widgets/MapWidget.php
@@ -125,7 +125,7 @@ public function rounded(bool $rounded = true): self
 
     public function getRounded(): bool
     {
-        return $this->rounded;
+        return $this->rounded && $this->getHasBorder();
     }
 
     public function isFullPage(): bool

From ed336c73fafc636aa00879492e5cda02fec36ec9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustavo=20Galv=C3=A3o?= <gu.afgalvao@gmail.com>
Date: Thu, 17 Apr 2025 16:27:10 -0300
Subject: [PATCH 03/15] style: remove unused class

---
 resources/views/button-action.blade.php     |  1 -
 resources/views/fullscreen-action.blade.php | 24 ++++++++++-----------
 resources/views/zoom-action.blade.php       |  6 ++----
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/resources/views/button-action.blade.php b/resources/views/button-action.blade.php
index 65af881..d6a88d4 100644
--- a/resources/views/button-action.blade.php
+++ b/resources/views/button-action.blade.php
@@ -2,5 +2,4 @@
     :action="$action"
     :label="$getLabel()"
     component="filament-maps::icon-button"
-    class="filament-page-icon-button-action"
 />
diff --git a/resources/views/fullscreen-action.blade.php b/resources/views/fullscreen-action.blade.php
index 977faf1..ea17e2b 100644
--- a/resources/views/fullscreen-action.blade.php
+++ b/resources/views/fullscreen-action.blade.php
@@ -3,20 +3,18 @@
     $enterFullscreen = $action;
     $exitFullscreen = (clone $action)->icon('filamentmapsicon-fullscreen-exit');
 @endphp
-<template x-if="!isFullscreen">
-<x-filament-maps::actions.action
-    :action="$enterFullscreen"
-    label="Enter {{ $label }}"
-    component="filament-maps::icon-button"
-    class="filament-page-icon-button-action"
 
-/>
+<template x-if="!isFullscreen">
+    <x-filament-maps::actions.action
+        :action="$enterFullscreen"
+        label="Enter {{ $label }}"
+        component="filament-maps::icon-button"
+    />
 </template>
 <template x-if="isFullscreen">
-<x-filament-maps::actions.action
-    :action="$exitFullscreen"
-    label="Exit {{ $label }}"
-    component="filament-maps::icon-button"
-    class="filament-page-icon-button-action"
-/>
+    <x-filament-maps::actions.action
+        :action="$exitFullscreen"
+        label="Exit {{ $label }}"
+        component="filament-maps::icon-button"
+    />
 </template>
diff --git a/resources/views/zoom-action.blade.php b/resources/views/zoom-action.blade.php
index 250458c..4a2426e 100644
--- a/resources/views/zoom-action.blade.php
+++ b/resources/views/zoom-action.blade.php
@@ -1,19 +1,17 @@
 @php
- $zoomIn = $action;
- $zoomOut = (clone $action)->icon('heroicon-o-minus');
+    $zoomIn = $action;
+    $zoomOut = (clone $action)->icon('heroicon-o-minus');
 @endphp
 
 <x-filament-maps::actions.action
     :action="$zoomIn->increment()"
     label="Zoom in"
     component="filament-maps::icon-button"
-    class="filament-page-icon-button-action"
     style="border-bottom-right-radius: 0px;border-bottom-left-radius: 0px;"
 />
 <x-filament-maps::actions.action
     :action="$zoomOut->decrement()"
     label="Zoom out"
     component="filament-maps::icon-button"
-    class="filament-page-icon-button-action"
     style="border-top-right-radius: 0px;border-top-left-radius: 0px;"
 />

From 395a576c6717cc45b1b95d3ce91eb7df8b31445b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gustavo=20Galv=C3=A3o?= <gu.afgalvao@gmail.com>
Date: Thu, 17 Apr 2025 16:29:03 -0300
Subject: [PATCH 04/15] feat: update filament v3 action/icon-button based
 components

---
 .../views/components/actions/action.blade.php |  37 +--
 .../views/components/actions/index.blade.php  |  38 +--
 .../views/components/icon-button.blade.php    | 232 ++++++++++++------
 3 files changed, 180 insertions(+), 127 deletions(-)

diff --git a/resources/views/components/actions/action.blade.php b/resources/views/components/actions/action.blade.php
index 978eae1..c7f9dce 100644
--- a/resources/views/components/actions/action.blade.php
+++ b/resources/views/components/actions/action.blade.php
@@ -4,25 +4,34 @@
     'icon' => null,
 ])
 
+@php
+    $isDisabled = $action->isDisabled();
+    $url = $action->getUrl();
+@endphp
+
 <x-dynamic-component
-    :x-on:click="$action->getAlpineClickHandler()"
+    :color="$action->getColor()"
     :component="$component"
-    :dark-mode="config('filament.dark_mode')"
-    :attributes="\Filament\Support\prepare_inherited_attributes($attributes)->merge($action->getExtraAttributes())"
+    :disabled="$isDisabled"
     :form="$action->getFormToSubmit()"
-    :tag="$action->getUrl() ? 'a' : 'button'"
-    :wire:click="$action->getLivewireClickHandler()"
-    :href="$action->isEnabled() ? $action->getUrl() : null"
-    :target="$action->shouldOpenUrlInNewTab() ? '_blank' : null"
-    :type="$action->canSubmitForm() ? 'submit' : 'button'"
-    :color="$action->getColor()"
-    :key-bindings="$action->getKeybindings()"
-    :tooltip="$action->getTooltip()"
-    :disabled="$action->isDisabled()"
+    :form-id="$action->getFormId()"
+    :href="$isDisabled ? null : $url"
     :icon="$icon ?? $action->getIcon()"
-    :size="$action->getSize()"
+    :icon-size="$action->getIconSize()"
+    :key-bindings="$action->getKeyBindings()"
     :label-sr-only="$action->isLabelHidden()"
-    dusk="filament.admin.action.{{ $action->getName() }}"
+    :tag="$url ? 'a' : 'button'"
+    :target="($url && $action->shouldOpenUrlInNewTab()) ? '_blank' : null"
+    :tooltip="$action->getTooltip()"
+    :type="$action->canSubmitForm() ? 'submit' : 'button'"
+    :wire:click="$action->getLivewireClickHandler()"
+    :wire:target="$action->getLivewireTarget()"
+    :x-on:click="$action->getAlpineClickHandler()"
+    :attributes="
+        \Filament\Support\prepare_inherited_attributes($attributes)
+            ->merge($action->getExtraAttributes(), escape: false)
+            ->class(['fi-ac-action'])
+    "
 >
     {{ $slot }}
 </x-dynamic-component>
diff --git a/resources/views/components/actions/index.blade.php b/resources/views/components/actions/index.blade.php
index 5713eeb..f5a0ad7 100644
--- a/resources/views/components/actions/index.blade.php
+++ b/resources/views/components/actions/index.blade.php
@@ -1,35 +1,3 @@
-@props([
-    'actions',
-    'alignment' => 'left',
-    'fullWidth' => false,
-])
-
-@if ($actions instanceof \Illuminate\Contracts\View\View)
-    {{ $actions }}
-@elseif (is_array($actions))
-    @php
-        $actions = array_filter(
-            $actions,
-            fn (\Filament\Pages\Actions\Action | \Filament\Pages\Actions\ActionGroup $action): bool => ! $action->isHidden(),
-        );
-    @endphp
-
-    @if (count($actions))
-        <div
-            {{ $attributes->class([
-                'filament-page-actions',
-                'flex flex-wrap items-center gap-4' => ! $fullWidth,
-                match ($alignment) {
-                    'center' => 'justify-center',
-                    'right' => 'flex-row-reverse space-x-reverse',
-                    default => 'justify-start',
-                } => ! $fullWidth,
-                'grid gap-2 grid-cols-[repeat(auto-fit,minmax(0,1fr))]' => $fullWidth,
-            ]) }}
-        >
-            @foreach ($actions as $action)
-                {{ $action }}
-            @endforeach
-        </div>
-    @endif
-@endif
+<x-filament::actions
+    :attributes="\Filament\Support\prepare_inherited_attributes($attributes)"
+/>
diff --git a/resources/views/components/icon-button.blade.php b/resources/views/components/icon-button.blade.php
index aea0ee8..399caa6 100644
--- a/resources/views/components/icon-button.blade.php
+++ b/resources/views/components/icon-button.blade.php
@@ -1,79 +1,138 @@
+@php
+    use Filament\Support\Enums\ActionSize;
+    use Filament\Support\Enums\IconSize;
+@endphp
+
 @props([
+    'badge' => null,
+    'badgeColor' => 'primary',
+    'badgeSize' => 'xs',
     'color' => 'primary',
-    'darkMode' => config('filament.dark_mode'),
     'disabled' => false,
     'form' => null,
-    'iconAlias' => null,
+    'formId' => null,
+    'href' => null,
     'icon' => null,
+    'iconAlias' => null,
+    'iconSize' => null,
     'keyBindings' => null,
-    'indicator' => null,
     'label' => null,
-    'size' => 'md',
+    'loadingIndicator' => true,
+    'size' => ActionSize::Medium,
+    'spaMode' => null,
     'tag' => 'button',
+    'target' => null,
     'tooltip' => null,
     'type' => 'button',
 ])
 
 @php
-    $buttonClasses = array_merge([
-        "filament-button filament-button-size-{$size} inline-flex items-center justify-center py-1 gap-1 font-medium rounded-lg border transition-colors focus:outline-none focus:ring-offset-2 focus:ring-2 focus:ring-inset",
-        'dark:focus:ring-offset-0' => $darkMode,
-        'opacity-70 cursor-not-allowed pointer-events-none' => $disabled,
-        'min-h-[2.25rem] px-2 text-sm' => $size === 'md',
-        'min-h-[2rem] px-1 text-sm' => $size === 'sm',
-        'min-h-[2.75rem] px-4 text-lg' => $size === 'lg',
-    ], [
-        'text-white shadow focus:ring-white border-transparent' => $color !== 'secondary',
-        'bg-primary-600 hover:bg-primary-500 focus:bg-primary-700 focus:ring-offset-primary-700' => $color === 'primary',
-        'bg-success-600 hover:bg-success-500 focus:bg-success-700 focus:ring-offset-success-700' => $color === 'success',
-        'bg-danger-600 hover:bg-danger-500 focus:bg-danger-700 focus:ring-offset-danger-700' => $color === 'danger',
-        'bg-warning-600 hover:bg-warning-500 focus:bg-warning-700 focus:ring-offset-warning-700' => $color === 'warning',
-        'bg-gray-600 hover:bg-gray-500 focus:bg-gray-700 focus:ring-offset-gray-700' => $color === 'gray',
-        'text-gray-800 bg-white border-gray-300 hover:bg-gray-50 focus:ring-primary-600 focus:text-primary-600 focus:bg-primary-50 focus:border-primary-600' => $color === 'secondary',
-        'dark:bg-gray-800 dark:hover:bg-gray-700 dark:border-gray-600 dark:hover:border-gray-500 dark:text-gray-200 dark:focus:text-primary-400 dark:focus:border-primary-400 dark:focus:bg-gray-800' => $color === 'secondary' && $darkMode,
+    if (! $size instanceof ActionSize) {
+        $size = filled($size) ? (ActionSize::tryFrom($size) ?? $size) : null;
+    }
+
+    $iconSize ??= match ($size) {
+        ActionSize::ExtraSmall => IconSize::Small,
+        ActionSize::Small, ActionSize::Medium => IconSize::Medium,
+        ActionSize::Large, ActionSize::ExtraLarge => IconSize::Large,
+        default => IconSize::Medium,
+    };
+
+    if (! $iconSize instanceof IconSize) {
+        $iconSize = filled($iconSize) ? (IconSize::tryFrom($iconSize) ?? $iconSize) : null;
+    }
+
+    $buttonClasses = \Illuminate\Support\Arr::toCssClasses([
+        ...[
+            'fi-icon-btn relative grid-flow-col items-center justify-center font-semibold outline-none transition duration-75 focus-visible:ring-2 shadow-sm rounded-lg',
+            'pointer-events-none opacity-70' => $disabled,
+            'cursor-pointer' => $tag === 'label',
+            match ($color) {
+                'gray' => null,
+                default => 'fi-color-custom',
+            },
+            is_string($color) ? "fi-color-{$color}" : null,
+            ($size instanceof ActionSize) ? "fi-size-{$size->value}" : null,
+            match ($size) {
+                ActionSize::ExtraSmall => 'gap-1 px-2 py-1.5 text-xs',
+                ActionSize::Small => 'gap-1 px-2.5 py-1.5 text-sm',
+                ActionSize::Medium => 'gap-1.5 px-3 py-2 text-sm',
+                ActionSize::Large => 'gap-1.5 px-3.5 py-2.5 text-sm',
+                ActionSize::ExtraLarge => 'gap-1.5 px-4 py-3 text-sm',
+                default => $size,
+            },
+            'bg-white text-gray-950 hover:bg-gray-50 dark:bg-white/5 dark:text-white dark:hover:bg-white/10' => ($color === 'gray') || ($tag === 'label'),
+            'ring-1 ring-gray-950/10 dark:ring-white/20' => (($color === 'gray') || ($tag === 'label')),
+            'bg-custom-600 text-white hover:bg-custom-500 focus-visible:ring-custom-500/50 dark:bg-custom-500 dark:hover:bg-custom-400 dark:focus-visible:ring-custom-400/50' => ($color !== 'gray') && ($tag !== 'label'),
+            '[input:checked+&]:bg-custom-600 [input:checked+&]:text-white [input:checked+&]:ring-0 [input:checked+&]:hover:bg-custom-500 dark:[input:checked+&]:bg-custom-500 dark:[input:checked+&]:hover:bg-custom-400 [input:checked:focus-visible+&]:ring-custom-500/50 dark:[input:checked:focus-visible+&]:ring-custom-400/50 [input:focus-visible+&]:z-10 [input:focus-visible+&]:ring-2 [input:focus-visible+&]:ring-gray-950/10 dark:[input:focus-visible+&]:ring-white/20' => ($color !== 'gray') && ($tag === 'label'),
+            '[input:checked+&]:bg-gray-400 [input:checked+&]:text-white [input:checked+&]:ring-0 [input:checked+&]:hover:bg-gray-300 dark:[input:checked+&]:bg-gray-600 dark:[input:checked+&]:hover:bg-gray-500' => ($color === 'gray'),
+        ],
     ]);
 
-    $iconClasses = \Illuminate\Support\Arr::toCssClasses([
-        'filament-icon-button-icon',
-        'w-5 h-5' => $size === 'md',
-        'w-4 h-4' => $size === 'sm',
-        'w-4 h-4 md:w-5 md:h-5' => $size === 'sm md:md',
-        'w-6 h-6' => $size === 'lg',
+    $buttonStyles = \Illuminate\Support\Arr::toCssStyles([
+        \Filament\Support\get_color_css_variables(
+            $color,
+            shades: [400, 500, 600],
+            alias: 'button',
+        ) => $color !== 'gray',
     ]);
 
-    $indicatorClasses = \Illuminate\Support\Arr::toCssClasses([
-        'filament-icon-button-indicator absolute rounded-full text-xs inline-block w-4 h-4 -top-0.5 -right-0.5',
-        'bg-primary-500/10' => $color === 'primary',
-        'bg-danger-500/10' => $color === 'danger',
-        'bg-gray-500/10' => $color === 'secondary',
-        'bg-success-500/10' => $color === 'success',
-        'bg-warning-500/10' => $color === 'warning',
+    $iconClasses = \Illuminate\Support\Arr::toCssClasses([
+        'fi-icon-btn-icon transition duration-75',
+        match ($iconSize) {
+            IconSize::Small => 'h-4 w-4',
+            IconSize::Medium => 'h-5 w-5',
+            IconSize::Large => 'h-6 w-6',
+            default => $iconSize,
+        },
+        'text-gray-400 dark:text-gray-500' => ($color === 'gray') || ($tag === 'label'),
+        'text-white' => ($color !== 'gray') && ($tag !== 'label'),
+        '[:checked+*>&]:text-white' => $tag === 'label',
     ]);
 
-    $hasLoadingIndicator = filled($attributes->get('wire:target')) || filled($attributes->get('wire:click')) || (($type === 'submit') && filled($form));
+    $badgeContainerClasses = 'fi-icon-btn-badge-ctn absolute start-full top-1 z-[1] w-max -translate-x-1/2 -translate-y-1/2 rounded-md bg-white dark:bg-gray-900 rtl:translate-x-1/2';
+
+    $wireTarget = $loadingIndicator ? $attributes->whereStartsWith(['wire:target', 'wire:click'])->filter(fn ($value): bool => filled($value))->first() : null;
+
+    $hasLoadingIndicator = filled($wireTarget) || ($type === 'submit' && filled($form));
 
     if ($hasLoadingIndicator) {
-        $loadingIndicatorTarget = html_entity_decode($attributes->get('wire:target', $attributes->get('wire:click', $form)), ENT_QUOTES);
+        $loadingIndicatorTarget = html_entity_decode($wireTarget ?: $form, ENT_QUOTES);
     }
+
+    $hasTooltip = filled($tooltip);
 @endphp
 
 @if ($tag === 'button')
     <button
-        @if ($keyBindings)
-            x-mousetrap.global.{{ collect($keyBindings)->map(fn (string $keyBinding): string => str_replace('+', '-', $keyBinding))->implode('.') }}
-        @endif
-        @if ($label)
-            title="{{ $label }}"
+        @if ($keyBindings || $hasTooltip)
+            x-data="{}"
         @endif
-        @if ($tooltip)
-            x-tooltip.raw="{{ $tooltip }}"
+        @if ($keyBindings)
+            x-bind:id="$id('key-bindings')"
+            x-mousetrap.global.{{ collect($keyBindings)->map(fn (string $keyBinding): string => str_replace('+', '-', $keyBinding))->implode('.') }}="document.getElementById($el.id).click()"
         @endif
-        type="{{ $type }}"
-        {!! $disabled ? 'disabled' : '' !!}
-        @if ($keyBindings || $tooltip)
-            x-data="{}"
+        @if ($hasTooltip)
+            x-tooltip="{
+                content: @js($tooltip),
+                theme: $store.theme,
+            }"
         @endif
-        {{ $attributes->class($buttonClasses) }}
+        {{
+            $attributes
+                ->merge([
+                    'disabled' => $disabled,
+                    'form' => $formId,
+                    'type' => $type,
+                    'wire:loading.attr' => 'disabled',
+                    'wire:target' => ($hasLoadingIndicator && $loadingIndicatorTarget) ? $loadingIndicatorTarget : null,
+                ], escape: false)
+                ->merge([
+                    'title' => $hasTooltip ? null : $label,
+                ], escape: true)
+                ->class([$buttonClasses])
+                ->style([$buttonStyles])
+        }}
     >
         @if ($label)
             <span class="sr-only">
@@ -83,47 +142,62 @@
 
         <x-filament::icon
             :attributes="
-            \Filament\Support\prepare_inherited_attributes(
-                new \Illuminate\View\ComponentAttributeBag([
-                    'alias' => $iconAlias,
-                    'icon' => $icon,
-                    'wire:loading.remove.delay.' . config('filament.livewire_loading_delay', 'default') => $hasLoadingIndicator,
-                    'wire:target' => $hasLoadingIndicator ? $loadingIndicatorTarget : null,
-                ])
-            )->class([$iconClasses])
-        "
+                \Filament\Support\prepare_inherited_attributes(
+                    new \Illuminate\View\ComponentAttributeBag([
+                        'alias' => $iconAlias,
+                        'icon' => $icon,
+                        'wire:loading.remove.delay.' . config('filament.livewire_loading_delay', 'default') => $hasLoadingIndicator,
+                        'wire:target' => $hasLoadingIndicator ? $loadingIndicatorTarget : null,
+                    ])
+                )->class([$iconClasses])
+            "
         />
 
         @if ($hasLoadingIndicator)
             <x-filament::loading-indicator
-                x-cloak
-                wire:loading.delay
-                :wire:target="$loadingIndicatorTarget"
-                :class="$iconClasses"
+                :attributes="
+                    \Filament\Support\prepare_inherited_attributes(
+                        new \Illuminate\View\ComponentAttributeBag([
+                            'wire:loading.delay.' . config('filament.livewire_loading_delay', 'default') => '',
+                            'wire:target' => $loadingIndicatorTarget,
+                        ])
+                    )->class([$iconClasses])
+                "
             />
         @endif
 
-        @if ($indicator)
-            <span class="{{ $indicatorClasses }}">
-                {{ $indicator }}
-            </span>
+        @if (filled($badge))
+            <div class="{{ $badgeContainerClasses }}">
+                <x-filament::badge :color="$badgeColor" :size="$badgeSize">
+                    {{ $badge }}
+                </x-filament::badge>
+            </div>
         @endif
     </button>
 @elseif ($tag === 'a')
     <a
-        @if ($keyBindings)
-            x-mousetrap.global.{{ collect($keyBindings)->map(fn (string $keyBinding): string => str_replace('+', '-', $keyBinding))->implode('.') }}
-        @endif
-        @if ($label)
-            title="{{ $label }}"
+        {{ \Filament\Support\generate_href_html($href, $target === '_blank', $spaMode) }}
+        @if ($keyBindings || $hasTooltip)
+            x-data="{}"
         @endif
-        @if ($tooltip)
-            x-tooltip.raw="{{ $tooltip }}"
+        @if ($keyBindings)
+            x-bind:id="$id('key-bindings')"
+            x-mousetrap.global.{{ collect($keyBindings)->map(fn (string $keyBinding): string => str_replace('+', '-', $keyBinding))->implode('.') }}="document.getElementById($el.id).click()"
         @endif
-        @if ($keyBindings || $tooltip)
-            x-data="{}"
+        @if ($hasTooltip)
+            x-tooltip="{
+                content: @js($tooltip),
+                theme: $store.theme,
+            }"
         @endif
-        {{ $attributes->class($buttonClasses) }}
+        {{
+            $attributes
+                ->merge([
+                    'title' => $hasTooltip ? null : $label,
+                ], escape: true)
+                ->class([$buttonClasses])
+                ->style([$buttonStyles])
+        }}
     >
         @if ($label)
             <span class="sr-only">
@@ -137,10 +211,12 @@
             :class="$iconClasses"
         />
 
-        @if ($indicator)
-            <span class="{{ $indicatorClasses }}">
-                {{ $indicator }}
-            </span>
+        @if (filled($badge))
+            <div class="{{ $badgeContainerClasses }}">
+                <x-filament::badge :color="$badgeColor" size="xs">
+                    {{ $badge }}
+                </x-filament::badge>
+            </div>
         @endif
     </a>
 @endif

From abc5160a006f309d97d06eb81a721352b43b9edb Mon Sep 17 00:00:00 2001
From: Danilo Andrade <mandrade.danilo@gmail.com>
Date: Wed, 23 Apr 2025 12:48:18 -0300
Subject: [PATCH 05/15] fix: adjust to call the setUp method for compatibility

---
 src/Widgets/MapWidget.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Widgets/MapWidget.php b/src/Widgets/MapWidget.php
index 1de4869..c332df4 100644
--- a/src/Widgets/MapWidget.php
+++ b/src/Widgets/MapWidget.php
@@ -59,13 +59,16 @@ public function mount()
 
     public function configure(): static
     {
-        return $this
+        $this
             ->configureMarkers()
             ->configurePolylines()
             ->configurePolygones()
             ->configureRectangles()
             ->configureCircles();
-//            ->configureWidget();
+
+        $this->setUp();
+
+        return $this;
     }
 
     public function height(string $height): self

From 4e53b54af27cfc7883e9ea704decb31a127718ca Mon Sep 17 00:00:00 2001
From: Danilo Andrade <mandrade.danilo@gmail.com>
Date: Wed, 23 Apr 2025 12:49:14 -0300
Subject: [PATCH 06/15] Update README.md

---
 README.md | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/README.md b/README.md
index ef87b21..5243f99 100644
--- a/README.md
+++ b/README.md
@@ -94,26 +94,6 @@ public function setUp(): void
 
 > The `setUp` method is called on `mount` of the widget. See [livewire lifecycle hooks](https://laravel-livewire.com/docs/2.x/lifecycle-hooks) for more information.
 
-### Global Configuration
-
-If you want to set a default configuration for all instances of the map widget, you can use the `configureUsing` method in a service provider:
-
-```php
-MyMap::configureUsing(function (ResellerMap $widget) {
-    $widget->mapMarkers([
-        Marker::make('id')
-            ->lat(51.505)
-            ->lng(-0.09)
-            ->popup('I am a popup')
-            ->tooltip('I am a tooltip'),
-    ])
-    ->tileLayerUrl('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png')
-    ->tileLayerOptions([
-        'attribution' => 'Map data © <a href="https://openstreetmap.org">OpenStreetMap</a> contributors',
-    ])
-});
-```
-
 ## Tile Layers
 
 The map uses OpenStreetMap tiles by default, but you can change it to use any other provider using `$tileLayerUrl` property or `tileLayerUrl` method. It's recommended to also use the `tileLayerOptions` to set correct attributions.

From 88e1aa0c6749a4ba6b7e0cf5e5e4824dbf1c8e9b Mon Sep 17 00:00:00 2001
From: mstfkhazaal <47450090+mstfkhazaal@users.noreply.github.com>
Date: Fri, 25 Jul 2025 11:13:57 +0300
Subject: [PATCH 07/15] Update map.blade.php

---
 resources/views/components/map.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/components/map.blade.php b/resources/views/components/map.blade.php
index 57d2462..849eb55 100644
--- a/resources/views/components/map.blade.php
+++ b/resources/views/components/map.blade.php
@@ -450,7 +450,7 @@ class="h-full"
             @if (count($actions))
                 <div
                     {{ $attributes->class([
-                        'filament-map-actions',
+                        'absolute z-10 p-2 space-y-2 filament-map-actions',
                     ]) }}
                 >
                     @foreach ($actions as $action)

From d02940e131dffbfeca0d4cef99ae906254f22423 Mon Sep 17 00:00:00 2001
From: SHEFOO10 <445585913@g102019.moe.edu.eg>
Date: Tue, 6 Jan 2026 17:30:29 +0200
Subject: [PATCH 08/15] update filament version to v4 instead of v3

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 534a45e..ef8fc47 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "filament/filament": "^3.0.0",
+        "filament/filament": "^4.0.0",
         "spatie/laravel-package-tools": "^1.16"
     },
     "autoload": {

From cd90b126556d26ddfdabeefdb360b664383ed7ec Mon Sep 17 00:00:00 2001
From: SHEFOO10 <shhamdy299@gmail.com>
Date: Wed, 7 Jan 2026 17:34:13 +0200
Subject: [PATCH 09/15] update composer.json

---
 composer.json             | 4 ++--
 src/Widgets/MapWidget.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index ef8fc47..8134ec1 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,11 @@
 {
-    "name": "webbingbrasil/filament-maps",
+    "name": "aquadic/filament-maps",
     "description": "Map components for Filament.",
     "keywords": [
         "laravel",
         "filament"
     ],
-    "homepage": "https://github.com/webbingbrasil/filament-maps",
+    "homepage": "https://github.com/aquadic/filament-maps",
     "license": "MIT",
     "authors": [
         {
diff --git a/src/Widgets/MapWidget.php b/src/Widgets/MapWidget.php
index 58b130a..ec45424 100644
--- a/src/Widgets/MapWidget.php
+++ b/src/Widgets/MapWidget.php
@@ -35,7 +35,7 @@ abstract class MapWidget extends Widget implements HasForms, HasActions
         configure as protected configureWidget;
     }
 
-    protected static string $view = 'filament-maps::widgets.map';
+    protected string $view = 'filament-maps::widgets.map';
 
     protected static ?string $pollingInterval = null;
 

From 0a8550768963f18c48871424378ab93151a71c0c Mon Sep 17 00:00:00 2001
From: Saif Allah Khaled <Saifallak@yahoo.com>
Date: Tue, 12 May 2026 16:06:17 +0300
Subject: [PATCH 10/15] Revert package name.

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 8134ec1..ef8fc47 100644
--- a/composer.json
+++ b/composer.json
@@ -1,11 +1,11 @@
 {
-    "name": "aquadic/filament-maps",
+    "name": "webbingbrasil/filament-maps",
     "description": "Map components for Filament.",
     "keywords": [
         "laravel",
         "filament"
     ],
-    "homepage": "https://github.com/aquadic/filament-maps",
+    "homepage": "https://github.com/webbingbrasil/filament-maps",
     "license": "MIT",
     "authors": [
         {

From 8b69f49f24f32d0af3abf7d3b2c767302a456c3e Mon Sep 17 00:00:00 2001
From: Saif Allah Khaled <Saifallak@yahoo.com>
Date: Tue, 12 May 2026 16:08:40 +0300
Subject: [PATCH 11/15] Fix missing newline at end of map.blade.php

---
 resources/views/widgets/map.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/widgets/map.blade.php b/resources/views/widgets/map.blade.php
index 8d25353..7cafa91 100644
--- a/resources/views/widgets/map.blade.php
+++ b/resources/views/widgets/map.blade.php
@@ -17,4 +17,4 @@
             :polling-interval="$this->getPollingInterval()"
         />
     </x-filament-maps::card>
-</x-filament-widgets::widget>
\ No newline at end of file
+</x-filament-widgets::widget>

From 366c5fba5197ea66d74641c58721680b154ef36f Mon Sep 17 00:00:00 2001
From: Saifallak <Saifallak@yahoo.com>
Date: Tue, 12 May 2026 16:11:53 +0300
Subject: [PATCH 12/15] revert un needed

---
 README.md                 | 17 -----------------
 src/Widgets/MapWidget.php |  8 +-------
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 79a9c4a..b47f92e 100644
--- a/README.md
+++ b/README.md
@@ -547,23 +547,6 @@ $livewire->removeCircle('circle-name');
 $livewire->updateCircle(Circle::make('circle-name')->lat(...)->lng(...)->options([...]));
 ```
 
-### Update Map / Polling
-
-set pollingInterval to anything you like inside your widget:
-```php
-    protected static ?string $pollingInterval = '10s';
-```
-
-then inside your widget declare public function named updateMap, and add any logic you wish inside it
-
-```php
-    public function updateMap(): void
-    {
-        // for example this clears markers, you can add markers, polygon ..etc
-        $this->mapMarkers([]);
-    }
-```
-
 ## Images
 
 ![Header & Footer](https://raw.githubusercontent.com/webbingbrasil/filament-maps/main/docs/images/image-header-footer.png)
diff --git a/src/Widgets/MapWidget.php b/src/Widgets/MapWidget.php
index e1a4db2..12e7828 100644
--- a/src/Widgets/MapWidget.php
+++ b/src/Widgets/MapWidget.php
@@ -30,6 +30,7 @@ abstract class MapWidget extends Widget implements HasForms, HasActions
     use Concerns\HasPolygones;
     use Concerns\HasRectangles;
     use Concerns\HasCircles;
+    use CanPoll;
 
     use Configurable {
         configure as protected configureWidget;
@@ -37,8 +38,6 @@ abstract class MapWidget extends Widget implements HasForms, HasActions
 
     protected string $view = 'filament-maps::widgets.map';
 
-    protected static ?string $pollingInterval = null;
-
     protected string $height = '400px';
 
     protected string | Htmlable | null $heading = null;
@@ -72,11 +71,6 @@ public function configure(): static
         return $this;
     }
 
-    protected function getPollingInterval(): ?string
-    {
-        return static::$pollingInterval;
-    }
-
     public function updateMap(): void
     {
         // Add Code you want to update map with.

From 6acc2c152b855a4d40d2e983d1d61eb91f39ba6f Mon Sep 17 00:00:00 2001
From: Saifallak <Saifallak@yahoo.com>
Date: Tue, 12 May 2026 16:12:11 +0300
Subject: [PATCH 13/15] revert un needed

---
 src/Widgets/MapWidget.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Widgets/MapWidget.php b/src/Widgets/MapWidget.php
index 12e7828..ebcb806 100644
--- a/src/Widgets/MapWidget.php
+++ b/src/Widgets/MapWidget.php
@@ -71,11 +71,6 @@ public function configure(): static
         return $this;
     }
 
-    public function updateMap(): void
-    {
-        // Add Code you want to update map with.
-    }
-
     public function height(string $height): self
     {
         $this->height = $height;

From 8385832267574f816b19511938a2377dbe47593e Mon Sep 17 00:00:00 2001
From: Saifallak <Saifallak@yahoo.com>
Date: Tue, 12 May 2026 16:12:50 +0300
Subject: [PATCH 14/15] revert un needed

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index b47f92e..5243f99 100644
--- a/README.md
+++ b/README.md
@@ -546,7 +546,6 @@ $livewire->addCircle(Circle::make('circle-name')->lat(...)->lng(...)->options([.
 $livewire->removeCircle('circle-name');
 $livewire->updateCircle(Circle::make('circle-name')->lat(...)->lng(...)->options([...]));
 ```
-
 ## Images
 
 ![Header & Footer](https://raw.githubusercontent.com/webbingbrasil/filament-maps/main/docs/images/image-header-footer.png)

From f813b898614361682ddbd5bb0df0ec49d9554dd5 Mon Sep 17 00:00:00 2001
From: Saif Allah Khaled <Saifallak@yahoo.com>
Date: Tue, 12 May 2026 16:16:35 +0300
Subject: [PATCH 15/15] Update filament/filament version requirement

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index ef8fc47..7455a38 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
     ],
     "require": {
         "php": "^8.0",
-        "filament/filament": "^4.0.0",
+        "filament/filament": "^4.0 || ^5.0",
         "spatie/laravel-package-tools": "^1.16"
     },
     "autoload": {