chore: Merge remote-tracking branch 'upstream/master' into feat-add-additional-script-macro

Author: hpacleb

phpstan.neon.dist

@@ -15,6 +15,7 @@ parameters:
         -   identifier: binaryOp.invalid
         -   identifier: return.type
         -   identifier: argument.type
+        -   identifier: offsetAccess.nonOffsetAccessible
 
     excludePaths:
         - ./src/Html/Fluent.php

src/Html/Builder.php

@@ -5,6 +5,7 @@
 use Illuminate\Contracts\Config\Repository;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\HtmlString;
 use Illuminate\Support\Traits\Macroable;
 use Yajra\DataTables\Utilities\Helper;
@@ -264,6 +265,20 @@ public function addScript(string $view): static
         return $this;
     }
 
+    public function addScriptIfCannot(string $ability, string $view): static
+    {
+        if (! (Gate::allows($ability))) {
+            $this->addScript($view);
+        }
+
+        return $this;
+    }
+
+    public function getTemplate(): string
+    {
+        return $this->template;
+    }
+
     public function getAdditionalScripts(): array
     {
         return $this->additionalScripts;

src/Html/Button.php

@@ -459,4 +459,18 @@ public function __call($method, $parameters)
 
         return $this;
     }
+
+    /**
+     * Request that the data be refreshed from the server when starting an edit.
+     *
+     * @return $this
+     *
+     * @see https://editor.datatables.net/reference/type/form-options#refresh
+     */
+    public function refresh(bool $value = true): static
+    {
+        $this->attributes['refresh'] = $value;
+
+        return $this;
+    }
 }

src/Html/Editor/FormOptions.php

@@ -205,4 +205,18 @@ public function title(bool|string $value): static
 
         return $this;
     }
+
+    /**
+     * Request that the data be refreshed from the server when starting an edit.
+     *
+     * @return $this
+     *
+     * @see https://editor.datatables.net/reference/type/form-options#refresh
+     */
+    public function refresh(bool $value = true): static
+    {
+        $this->attributes['refresh'] = $value;
+
+        return $this;
+    }
 }

src/Html/HasEditor.php

@@ -8,6 +8,8 @@ trait HasEditor
 {
     /**
      * Collection of Editors.
+     *
+     * @var array<array-key, Editor>
      */
     protected array $editors = [];
 

src/Html/Options/Plugins/ColumnControl.php

@@ -77,8 +77,7 @@ public function columnControlFooterSearch(array $content = []): static
 
     public function columnControlSearchDropdown(int|string $target = 0): static
     {
-        $this->addColumnControl($target, ['order', 'searchDropdown'])
-            ->ordering(['indicators' => false, 'handler' => false]);
+        $this->addColumnControl($target, ['order', 'searchDropdown']);
 
         return $this;
     }

tests/Html/Extensions/ColumnControlTest.php

@@ -143,10 +143,6 @@ public function it_can_add_column_control_search_dropdown()
             ['target' => 1, 'content' => ['order', 'searchDropdown']],
         ];
         $this->assertEquals($expected, $builder->getAttributes()['columnControl']);
-
-        // Should also set ordering options
-        $attributes = $builder->getAttributes();
-        $this->assertEquals(['indicators' => false, 'handler' => false], $attributes['ordering']);
     }
 
     #[Test]