tabs bootstrap 4 theme changes, tab IDs fix, assets publishes and cop…

…ied to repository
dobrik · Jun 18, 2019 · 7f62f96 · 7f62f96
1 parent 82c7c27
commit 7f62f96
Show file tree

Hide file tree

Showing 33 changed files with 26,125 additions and 31 deletions.
diff --git a/src/Creator.php b/src/Creator.php
@@ -71,7 +71,7 @@ public function create(string $form_name, Model $model = null): HtmlAbstract
         $tabs_main_obj = $this->factory->html('tabs')->setLabel('');
 
         $main_tabs = [];
-        $main_tabs[1] = $this->factory->html('tab')->setId(1)->setTitle('Общее')->setContent('');
+        $main_tabs[1] = $this->factory->html('tab')->setId('tab_' . 1)->setTitle('Общее')->setContent('');
 
         if ($form_config->has('tabs')) {
             $tabs_data = $form_config->get('tabs');
@@ -82,9 +82,9 @@ public function create(string $form_name, Model $model = null): HtmlAbstract
 
             foreach ($tabs_data as $tab_data) {
                 if (!empty($tab_data['callback']) && $tab_data['callback'] instanceof Closure) {
-                    $main_tabs[$tab_data['id']] = $this->factory->html('tab')->setId($tab_data['id'])->setTitle($tab_data['title'])->setContent($tab_data['callback']());
+                    $main_tabs[$tab_data['id']] = $this->factory->html('tab')->setId('tab_' . $tab_data['id'])->setTitle($tab_data['title'])->setContent($tab_data['callback']());
                 } else {
-                    $main_tabs[$tab_data['id']] = $this->factory->html('tab')->setId($tab_data['id'])->setTitle($tab_data['title']);
+                    $main_tabs[$tab_data['id']] = $this->factory->html('tab')->setId('tab_' . $tab_data['id'])->setTitle($tab_data['title']);
                 }
             }
         }

diff --git a/src/Forms/Html/Tab.php b/src/Forms/Html/Tab.php
@@ -15,9 +15,15 @@ class Tab extends HtmlAbstract
      * @var array
      */
     protected $required_attributes = [
-        'content', 'title', 'id'
+        'title', 'id'
     ];
 
+    public $attributes = [
+        'class' => 'nav-items'
+    ];
+
+    public $content;
+
     /**
      * @param array|string $data
      * @return HtmlAbstract
@@ -30,15 +36,27 @@ public function append($data): HtmlAbstract
 
         if (\is_array($data)) {
             foreach ($data as $item) {
-                $this->attributes['content'] .= $item;
+                $this->content .= $item;
             }
             return $this;
         }
-        $this->attributes['content'] .= $data;
+        $this->content .= $data;
 
         return $this;
     }
 
+    public function setContent($data)
+    {
+        $this->content = $data;
+        return $this;
+    }
+
+    public function getContent()
+    {
+        return $this->content;
+    }
+
+
     /**
      * Add tabs plugin class.
      * @throws \Throwable
@@ -49,7 +67,7 @@ private function prepareTabClass(): void
         if (null === $this->getClass()) {
             $this->setClass('');
         }
-        $this->attributes['class'] .= ' tab-pane';
+        $this->attributes['class'] .= ' tab-pane fade';
     }
 
     /**
@@ -59,6 +77,6 @@ private function prepareTabClass(): void
     public function getData(): array
     {
         $this->prepareTabClass();
-        return ['content' => Arr::pull($this->attributes, 'content')];
+        return ['content' => $this->getContent()];
     }
 }
diff --git a/src/Forms/Html/Tabs.php b/src/Forms/Html/Tabs.php
@@ -14,7 +14,7 @@ class Tabs extends HtmlAbstract
     /**
      * @var array
      */
-    public $attributes = ['class' => 'nav-tabs-custom'];
+    public $attributes = ['class' => 'nav nav-tabs'];
 
     /**
      * @var array
@@ -53,13 +53,8 @@ private function checkActive(): void
     {
         $has_active = false;
         foreach ($this->tabs as $key => $tab) {
-            if (Str::contains($tab->getClass(), 'active')) {
-                $has_active = true;
-                break;
-            }
-        }
-        if (!$has_active) {
-            $this->tabs[0]->setClass('active');
+            $tab->setClass('active show');
+            break;
         }
     }
 
@@ -69,11 +64,9 @@ private function checkActive(): void
      */
     public function setTabs(array $tabs): HtmlAbstract
     {
-        if (\is_array($tabs)) {
-            foreach ($tabs as $tab) {
-                if ($tab instanceof Tab) {
-                    $this->tabs[] = $tab;
-                }
+        foreach ($tabs as $tab) {
+            if ($tab instanceof Tab) {
+                $this->tabs[] = $tab;
             }
         }
 

diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -30,6 +30,7 @@ public function boot()
             $this->getFormsConfigPath() => config_path('easy_form/forms.php'),
             $this->getViewsPath() => resource_path('views/vendor/easy_form'),
         ]);
+        $this->publiches([__DIR__ . '/resources/assets' => public_path('vendor/easy_form/assets')], 'assets');
     }
 
     private function getMainConfigPath()