Revert "Merge pull request #3454 from filamentphp/notifications-actio…

…n-group" This reverts commit d02cbfa, reversing changes made to 83409d9.
filamentphp · Aug 31, 2022 · dee193f · dee193f
1 parent 19a6e87
commit dee193f
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 96 deletions.
diff --git a/packages/notifications/docs/01-installation.md b/packages/notifications/docs/01-installation.md
@@ -39,7 +39,6 @@ You're now ready to start [sending notifications](sending-notifications)!
 The package uses the following dependencies:
 
 - [Alpine.js](https://alpinejs.dev)
-- [Alpine Floating UI](https://github.com/awcodes/alpine-floating-ui)
 - [Tailwind CSS](https://tailwindcss.com)
 
 You may install these through NPM:
@@ -147,14 +146,12 @@ In `/resources/css/app.css`, import [Tailwind CSS](https://tailwindcss.com):
 
 ### Configuring scripts
 
-In `/resources/js/app.js`, import [Alpine.js](https://alpinejs.dev), Alpine Floating UI and the `filament/notifications` plugin, and register them:
+In `/resources/js/app.js`, import [Alpine.js](https://alpinejs.dev) and the `filament/notifications` plugin, and register it:
 
 ```js
 import Alpine from 'alpinejs'
-import AlpineFloatingUI from '@awcodes/alpine-floating-ui'
 import NotificationsAlpinePlugin from '../../vendor/filament/notifications/dist/module.esm'
 
-Alpine.plugin(AlpineFloatingUI)
 Alpine.plugin(NotificationsAlpinePlugin)
 
 window.Alpine = Alpine

diff --git a/packages/notifications/resources/views/actions/group.blade.php b/packages/notifications/resources/views/actions/group.blade.php
diff --git a/packages/notifications/resources/views/actions/grouped-action.blade.php b/packages/notifications/resources/views/actions/grouped-action.blade.php
diff --git a/packages/notifications/resources/views/components/dropdown/item.blade.php b/packages/notifications/resources/views/components/dropdown/item.blade.php
diff --git a/packages/notifications/src/Actions/Action.php b/packages/notifications/src/Actions/Action.php
@@ -77,13 +77,6 @@ public function button(): static
         return $this;
     }
 
-    public function grouped(): static
-    {
-        $this->view('notifications::actions.grouped-action');
-
-        return $this;
-    }
-
     public function link(): static
     {
         $this->view('notifications::actions.link-action');

diff --git a/packages/notifications/src/Actions/ActionGroup.php b/packages/notifications/src/Actions/ActionGroup.php
diff --git a/packages/notifications/src/Concerns/HasActions.php b/packages/notifications/src/Concerns/HasActions.php
@@ -3,14 +3,12 @@
 namespace Filament\Notifications\Concerns;
 
 use Closure;
-use Filament\Notifications\Actions\ActionGroup;
-use Illuminate\Support\Arr;
 
 trait HasActions
 {
-    protected array | ActionGroup | Closure $actions = [];
+    protected array | Closure $actions = [];
 
-    public function actions(array | ActionGroup | Closure $actions): static
+    public function actions(array | Closure $actions): static
     {
         $this->actions = $actions;
 
@@ -19,6 +17,6 @@ public function actions(array | ActionGroup | Closure $actions): static
 
     public function getActions(): array
     {
-        return Arr::wrap($this->evaluate($this->actions));
+        return $this->evaluate($this->actions);
     }
 }
diff --git a/packages/notifications/src/Notification.php b/packages/notifications/src/Notification.php
@@ -3,7 +3,6 @@
 namespace Filament\Notifications;
 
 use Filament\Notifications\Actions\Action;
-use Filament\Notifications\Actions\ActionGroup;
 use Filament\Notifications\Concerns\HasActions;
 use Filament\Notifications\Concerns\HasBody;
 use Filament\Notifications\Concerns\HasDuration;
@@ -44,7 +43,7 @@ public function toArray(): array
     {
         return [
             'id' => $this->getId(),
-            'actions' => array_map(fn (Action | ActionGroup $action): array => $action->toArray(), $this->getActions()),
+            'actions' => collect($this->getActions())->toArray(),
             'body' => $this->getBody(),
             'duration' => $this->getDuration(),
             'icon' => $this->getIcon(),
@@ -56,15 +55,7 @@ public function toArray(): array
     public static function fromArray(array $data): static
     {
         $static = static::make($data['id']);
-        $static->actions(
-            array_map(
-                fn (array $action): Action | ActionGroup => match (array_key_exists('actions', $action)) {
-                    true => ActionGroup::fromArray($action),
-                    false => Action::fromArray($action),
-                },
-                $data['actions'],
-            ),
-        );
+        $static->actions(array_map(fn (array $action): Action => Action::fromArray($action), $data['actions']));
         $static->body($data['body']);
         $static->duration($data['duration']);
         $static->icon($data['icon']);

diff --git a/packages/notifications/stubs/scaffolding/resources/js/app.js b/packages/notifications/stubs/scaffolding/resources/js/app.js
@@ -1,8 +1,6 @@
 import Alpine from 'alpinejs'
-import AlpineFloatingUI from '@awcodes/alpine-floating-ui'
 import NotificationsAlpinePlugin from '../../vendor/filament/notifications/dist/module.esm'
 
-Alpine.plugin(AlpineFloatingUI)
 Alpine.plugin(NotificationsAlpinePlugin)
 
 window.Alpine = Alpine