Merge branch '4.x' into 5.x

Author: cklei-carly

CHANGELOG.md

@@ -2,6 +2,23 @@
 
 All notable changes to `inspirecms-support` will be documented in this file.
 
+## 4.0.7 - 2026-03-27
+
+### What's Changed in 4.0.7
+
+#### 🐛 Bug fixes
+
+- Bug fix - failed to apply 'node' to the arguments of tree node's action (a072d9d)
+
+### Installation
+
+**Full Changelog**: https://github.com/solutionforest/inspirecms-support/compare/4.0.6...4.0.7
+
+## 4.0.6 - 2026-03-27
+
+<!-- Release notes generated using configuration in .github/release.yml at 4.x -->
+**Full Changelog**: https://github.com/solutionforest/inspirecms-support/compare/4.0.5...4.0.6
+
 ## 4.0.5 - 2026-01-15
 
 ### What's Changed in 4.0.5
@@ -79,6 +96,8 @@ composer require solution-forest/inspirecms-support:^1.2.2
 
 
 
+
+
 ```
 ## Sync version with core - 2025-08-19
 
@@ -113,6 +132,8 @@ composer require solution-forest/inspirecms-support:^1.1.3
 
 
 
+
+
 ```
 ## 1.1.2 - 2025-08-11
 

src/Base/Models/Interfaces/HasRecursiveRelationshipsInterface.php

@@ -6,6 +6,7 @@
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Support\Collection;
+use SolutionForest\InspireCms\Support\Models\Concerns\HasRecursiveRelationships;
 use Staudenmeir\LaravelAdjacencyList\Eloquent\Relations\Ancestors;
 use Staudenmeir\LaravelAdjacencyList\Eloquent\Relations\Bloodline;
 use Staudenmeir\LaravelAdjacencyList\Eloquent\Relations\Descendants;
@@ -22,7 +23,7 @@
  * @property null | TModel $parent
  * @property Collection<TModel> $parentAndSelf
  *
- * @see \SolutionForest\InspireCms\Support\Models\Concerns\HasRecursiveRelationships
+ * @see HasRecursiveRelationships
  */
 interface HasRecursiveRelationshipsInterface
 {

src/Helpers/TreeNodeActionHelper.php

@@ -6,6 +6,7 @@
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Illuminate\Database\Eloquent\Model;
+use Livewire\Component;
 
 class TreeNodeActionHelper
 {
@@ -14,7 +15,7 @@ class TreeNodeActionHelper
      * @param  Closure(Model|string|int|null):Model|null  $resolveRecordUsing
      * @return array<Action|ActionGroup>
      */
-    public static function getNodeActions(array $node, array $livewireActions, ?Closure $resolveRecordUsing = null, string | Model | null $model = null, ?\Livewire\Component $livewire = null, string $idName = 'id', string $actionName = '__visibleActions'): array
+    public static function getNodeActions(array $node, array $livewireActions, ?Closure $resolveRecordUsing = null, string | Model | null $model = null, ?Component $livewire = null, string $idName = 'id', string $actionName = '__visibleActions'): array
     {
         $actionNames = $node[$actionName] ?? [];
 
@@ -36,7 +37,7 @@ public static function getNodeActions(array $node, array $livewireActions, ?Clos
             if ($action instanceof Action) {
                 if (in_array($action->getName(), $actionNames)) {
 
-                    $action = $action->arguments(['node' => $node]);
+                    $action = $action(['node' => $node]);
 
                     if ($model && is_string($model && is_a(Model::class, $model, true))) {
                         $action = $action->model($model);

src/InspireCmsSupportServiceProvider.php

@@ -75,7 +75,7 @@ public function packageRegistered(): void
         });
         // Media library config END
 
-        \SolutionForest\InspireCms\Support\Facades\ResolverRegistry::register($this->app);
+        Facades\ResolverRegistry::register($this->app);
     }
 
     public function packageBooted(): void

src/Macros/BlueprintMarcos.php

@@ -2,8 +2,10 @@
 
 namespace SolutionForest\InspireCms\Support\Macros;
 
+use Illuminate\Database\Schema\Blueprint;
+
 /**
- * @see \Illuminate\Database\Schema\Blueprint
+ * @see Blueprint
  */
 class BlueprintMarcos
 {

src/MediaLibrary/Concerns/HasFilters.php

@@ -10,7 +10,7 @@
 use SolutionForest\InspireCms\Support\MediaLibrary\FilterType;
 
 /**
- * @property \Filament\Schemas\Schema $filterForm
+ * @property Schema $filterForm
  */
 trait HasFilters
 {

src/MediaLibrary/Concerns/HasItemActions.php

@@ -56,10 +56,9 @@ protected function getMediaItemActions(): array
 
     public function getVisibleMediaItemActions(): array
     {
-        return array_filter(
-            $this->getMediaItemActions(),
-            fn (Action | ActionGroup $action): bool => $action->isVisible(),
-        );
+        // Return cached (configured) actions so that record-based visibility
+        // closures are evaluated per-item in the view (actions.blade.php).
+        return array_values($this->cachedMediaItemActions);
     }
 
     /**

src/MediaLibrary/Concerns/HasSorts.php

@@ -10,7 +10,7 @@
 use Illuminate\Database\Eloquent\Builder;
 
 /**
- * @property \Filament\Schemas\Schema $sortForm
+ * @property Schema $sortForm
  */
 trait HasSorts
 {

src/MediaLibrary/Livewire/FolderBrowserComponent.php

@@ -2,6 +2,7 @@
 
 namespace SolutionForest\InspireCms\Support\MediaLibrary\Livewire;
 
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Livewire\Attributes\Lazy;
 use Livewire\Attributes\Reactive;
@@ -25,7 +26,7 @@ class FolderBrowserComponent extends Component implements HasItemActions
 
     public function boot()
     {
-        if ($this->folders && $this->folders instanceof \Illuminate\Database\Eloquent\Collection) {
+        if ($this->folders && $this->folders instanceof Collection) {
             $this->folders->loadCount('children');
         }
     }

src/MediaLibrary/Livewire/MediaLibraryComponent.php

@@ -9,6 +9,7 @@
 use Filament\Support\Colors\Color;
 use Filament\Support\Facades\FilamentIcon;
 use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Collection;
@@ -38,7 +39,7 @@
 use function Filament\authorize;
 
 /**
- * @property \Filament\Schemas\Schema $uploadForm
+ * @property Schema $uploadForm
  */
 class MediaLibraryComponent extends Component implements HasItemActions, HasItemBulkActions
 {
@@ -527,7 +528,7 @@ protected function mutateSortData(array $data): array
     /**
      * Get the media assets from the parent.
      *
-     * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator<int, Model&MediaAsset>
+     * @return LengthAwarePaginator<int, Model&MediaAsset>
      */
     #[Computed(persist: true, seconds: 120)]
     public function assets()
@@ -664,7 +665,7 @@ protected function changeParent($key)
     }
 
     /**
-     * @return \Illuminate\Database\Eloquent\Model & MediaAsset |null
+     * @return Model & MediaAsset |null
      */
     protected function getParentRecord()
     {