Fix editor options implementation

Author: yajra

src/Html/HasEditor.php

@@ -18,7 +18,6 @@ trait HasEditor
      *
      * @param  array|mixed  ...$editors
      * @return $this
-     * @throws \Exception
      * @see https://editor.datatables.net/
      */
     public function editors(...$editors): static
@@ -27,49 +26,30 @@ public function editors(...$editors): static
             $editors = $editors[0];
         }
 
+        $collection = [];
         foreach ($editors as $editor) {
-            $this->editor($editor);
+            $collection[] = $this->editor($editor);
         }
 
+        $this->editors = $collection;
+
         return $this;
     }
 
     /**
      * Integrate with DataTables Editor.
      *
-     * @param  Editor  $fields
+     * @param  Editor  $editor
      * @return $this
-     * @throws \Exception
      * @see https://editor.datatables.net/
      */
-    public function editor(Editor $fields): static
+    public function editor(Editor $editor): static
     {
         /** @var string $template */
         $template = $this->config->get('datatables-html.editor', 'datatables::editor');
 
         $this->setTemplate($template);
 
-        $editor = $this->newEditor($fields);
-
-        $this->editors[] = $editor;
-
-        return $this;
-    }
-
-    /**
-     * @param  array|Editor  $fields
-     * @return Editor
-     * @throws \Exception
-     */
-    protected function newEditor(Editor|array $fields): Editor
-    {
-        if ($fields instanceof Editor) {
-            $editor = $fields;
-        } else {
-            $editor = new Editor;
-            $editor->fields($fields);
-        }
-
         if (! $editor->table) {
             $editor->table('#'.$this->getTableAttribute('id'));
         }
@@ -78,7 +58,9 @@ protected function newEditor(Editor|array $fields): Editor
             $editor->ajax($this->getAjaxUrl());
         }
 
-        return $editor;
+        $this->editors[] = $editor;
+
+        return $this;
     }
 
     /**

tests/BuilderTest.php

@@ -7,6 +7,7 @@
 use Yajra\DataTables\Html\Column;
 use Yajra\DataTables\Html\ColumnDefinition;
 use Yajra\DataTables\Html\ColumnDefinitions;
+use Yajra\DataTables\Html\Editor\Editor;
 
 class BuilderTest extends TestCase
 {
@@ -232,4 +233,21 @@ public function it_has_table_options()
         $this->assertInstanceOf(HtmlString::class, $builder->table());
         $this->assertEquals('<table class="table" id="my-table"><thead><tr></tr></thead></table>', $builder->table()->toHtml());
     }
+
+    /** @test */
+    public function it_has_editors()
+    {
+        $builder = $this->getHtmlBuilder();
+
+        $builder->editor(Editor::make());
+        $this->assertCount(1, $builder->getEditors());
+
+        $builder->editors([
+            Editor::make(),
+            Editor::make('edit'),
+        ]);
+        $this->assertCount(2, $builder->getEditors());
+    }
+
+
 }