Replace $dotName property with Str::dot helper

blade-ui-kit · Sep 10, 2020 · dcb4f21 · dcb4f21
1 parent 8eaf506
commit dcb4f21
Show file tree

Hide file tree

Showing 18 changed files with 33 additions and 35 deletions.
diff --git a/resources/views/components/editors/easy-mde.blade.php b/resources/views/components/editors/easy-mde.blade.php
@@ -4,4 +4,4 @@
     name="{{ $name }}"
     id="{{ $id }}"
     {{ $attributes }}
->{{ old($dotName, $slot) }}</textarea>
+>{{ old(Str::dot($name), $slot) }}</textarea>
diff --git a/resources/views/components/editors/trix.blade.php b/resources/views/components/editors/trix.blade.php
@@ -1,4 +1,4 @@
 <div {{ $attributes }}>
-    <input name="{{ $name }}" id="{{ $id }}" value="{{ old($dotName, $slot) }}" type="hidden">
+    <input name="{{ $name }}" id="{{ $id }}" value="{{ old(Str::dot($name), $slot) }}" type="hidden">
     <trix-editor input="{{ $id }}" class="{{ $styling }}"></trix-editor>
 </div>
diff --git a/resources/views/components/forms/inputs/textarea.blade.php b/resources/views/components/forms/inputs/textarea.blade.php
@@ -3,4 +3,4 @@
     id="{{ $id }}"
     rows="{{ $rows }}"
     {{ $attributes }}
->{{ old($dotName, $slot) }}</textarea>
+>{{ old(Str::dot($name), $slot) }}</textarea>
diff --git a/src/BladeUIKitServiceProvider.php b/src/BladeUIKitServiceProvider.php
@@ -32,6 +32,7 @@ public function boot(): void
         $this->bootBladeComponents();
         $this->bootLivewireComponents();
         $this->bootDirectives();
+        $this->bootHelpers();
         $this->bootPublishing();
     }
 
@@ -105,6 +106,13 @@ private function bootDirectives(): void
         });
     }
 
+    private function bootHelpers(): void
+    {
+        Str::macro('dot', function ($subject) {
+            return trim(str_replace(['[', ']', '..'], '.', $subject), '.');
+        });
+    }
+
     private function bootPublishing(): void
     {
         if ($this->app->runningInConsole()) {

diff --git a/src/Components/Editors/EasyMDE.php b/src/Components/Editors/EasyMDE.php
@@ -6,15 +6,13 @@
 
 use BladeUIKit\Components\BladeComponent;
 use Illuminate\Contracts\View\View;
+use Illuminate\Support\Str;
 
 class EasyMDE extends BladeComponent
 {
     /** @var string */
     public $name;
 
-    /** @var string */
-    public $dotName;
-
     /** @var string */
     public $id;
 
@@ -26,9 +24,8 @@ class EasyMDE extends BladeComponent
     public function __construct(string $name, string $id = null, array $options = [])
     {
         $this->name = $name;
-        $this->id = $id ?? $name;
+        $this->id = $id ?? str_replace('.', '_', Str::dot($name));
         $this->options = $options;
-        $this->dotName = trim(str_replace(['[', ']', '..'], '.', $name), '.');
     }
 
     public function options(): array

diff --git a/src/Components/Editors/Trix.php b/src/Components/Editors/Trix.php
@@ -6,15 +6,13 @@
 
 use BladeUIKit\Components\BladeComponent;
 use Illuminate\Contracts\View\View;
+use Illuminate\Support\Str;
 
 class Trix extends BladeComponent
 {
     /** @var string */
     public $name;
 
-    /** @var string */
-    public $dotName;
-
     /** @var string */
     public $id;
 
@@ -26,9 +24,8 @@ class Trix extends BladeComponent
     public function __construct(string $name, string $id = null, string $styling = 'trix-content')
     {
         $this->name = $name;
-        $this->id = $id ?? $name;
+        $this->id = $id ?? str_replace('.', '_', Str::dot($name));
         $this->styling = $styling;
-        $this->dotName = trim(str_replace(['[', ']', '..'], '.', $name), '.');
     }
 
     public function render(): View

diff --git a/src/Components/Forms/Error.php b/src/Components/Forms/Error.php
@@ -5,6 +5,7 @@
 namespace BladeUIKit\Components\Forms;
 
 use BladeUIKit\Components\BladeComponent;
+use Illuminate\Support\Str;
 use Illuminate\Support\ViewErrorBag;
 use Illuminate\View\View;
 
@@ -18,7 +19,7 @@ class Error extends BladeComponent
 
     public function __construct(string $field, string $bag = 'default')
     {
-        $this->field = trim(str_replace(['[', ']', '..'], '.', $field), '.');
+        $this->field = Str::dot($field);
         $this->bag = $bag;
     }
 

diff --git a/src/Components/Forms/Inputs/Checkbox.php b/src/Components/Forms/Inputs/Checkbox.php
@@ -5,6 +5,7 @@
 namespace BladeUIKit\Components\Forms\Inputs;
 
 use Illuminate\Contracts\View\View;
+use Illuminate\Support\Str;
 
 class Checkbox extends Input
 {
@@ -15,7 +16,7 @@ public function __construct(string $name, string $id = null, bool $checked = fal
     {
         parent::__construct($name, $id, 'checkbox');
 
-        $this->checked = (bool) old($this->dotName, $checked);
+        $this->checked = (bool) old(Str::dot($name), $checked);
     }
 
     public function render(): View

diff --git a/src/Components/Forms/Inputs/Input.php b/src/Components/Forms/Inputs/Input.php
@@ -6,15 +6,13 @@
 
 use BladeUIKit\Components\BladeComponent;
 use Illuminate\Contracts\View\View;
+use Illuminate\Support\Str;
 
 class Input extends BladeComponent
 {
     /** @var string */
     public $name;
 
-    /** @var string */
-    public $dotName;
-
     /** @var string */
     public $id;
 
@@ -27,10 +25,9 @@ class Input extends BladeComponent
     public function __construct(string $name, string $id = null, string $type = 'text', ?string $value = '')
     {
         $this->name = $name;
-        $this->id = $id ?? $name;
+        $this->id = $id ?? str_replace('.', '_', Str::dot($name));
         $this->type = $type;
-        $this->dotName = trim(str_replace(['[', ']', '..'], '.', $name), '.');
-        $this->value = old($this->dotName, $value ?? '');
+        $this->value = old(Str::dot($name), $value ?? '');
     }
 
     public function render(): View

diff --git a/src/Components/Forms/Inputs/Textarea.php b/src/Components/Forms/Inputs/Textarea.php
@@ -6,15 +6,13 @@
 
 use BladeUIKit\Components\BladeComponent;
 use Illuminate\Contracts\View\View;
+use Illuminate\Support\Str;
 
 class Textarea extends BladeComponent
 {
     /** @var string */
     public $name;
 
-    /** @var string */
-    public $dotName;
-
     /** @var string */
     public $id;
 
@@ -24,9 +22,8 @@ class Textarea extends BladeComponent
     public function __construct(string $name, string $id = null, $rows = 3)
     {
         $this->name = $name;
-        $this->id = $id ?? $name;
+        $this->id = $id ?? str_replace('.', '_', Str::dot($name));
         $this->rows = $rows;
-        $this->dotName = trim(str_replace(['[', ']', '..'], '.', $name), '.');
     }
 
     public function render(): View

diff --git a/tests/Components/Editors/EasyMDETest.php b/tests/Components/Editors/EasyMDETest.php
@@ -36,7 +36,7 @@ public function nested_editor_can_have_old_values()
         $this->flashOld(['profile.about' => 'About me text']);
 
         $expected = <<<HTML
-<textarea x-data x-init="new EasyMDE({ element: \$el , ...{&quot;forceSync&quot;:true} })" name="profile[about]" id="profile[about]">About me text</textarea>
+<textarea x-data x-init="new EasyMDE({ element: \$el , ...{&quot;forceSync&quot;:true} })" name="profile[about]" id="profile_about">About me text</textarea>
 HTML;
 
         $this->assertComponentRenders($expected, '<x-easy-mde name="profile[about]"/>');

diff --git a/tests/Components/Editors/TrixTest.php b/tests/Components/Editors/TrixTest.php
@@ -45,8 +45,8 @@ public function nested_editor_can_have_old_values()
 
         $expected = <<<HTML
 <div>
-    <input name="profile[about]" id="profile[about]" value="About me text" type="hidden">
-    <trix-editor input="profile[about]" class="trix-content">
+    <input name="profile[about]" id="profile_about" value="About me text" type="hidden">
+    <trix-editor input="profile_about" class="trix-content">
     </trix-editor>
 </div>
 HTML;

diff --git a/tests/Components/Forms/Inputs/CheckboxTest.php b/tests/Components/Forms/Inputs/CheckboxTest.php
@@ -43,7 +43,7 @@ public function nested_inputs_can_have_old_values()
         $this->flashOld(['login.remember_me' => true]);
 
         $this->assertComponentRenders(
-            '<input name="login[remember_me]" type="checkbox" id="login[remember_me]" checked />',
+            '<input name="login[remember_me]" type="checkbox" id="login_remember_me" checked />',
             '<x-checkbox name="login[remember_me]"/>'
         );
     }

diff --git a/tests/Components/Forms/Inputs/EmailTest.php b/tests/Components/Forms/Inputs/EmailTest.php
@@ -43,7 +43,7 @@ public function nested_inputs_can_have_old_values()
         $this->flashOld(['profile.email' => 'Eloquent']);
 
         $this->assertComponentRenders(
-            '<input name="profile[email]" type="email" id="profile[email]" value="Eloquent" />',
+            '<input name="profile[email]" type="email" id="profile_email" value="Eloquent" />',
             '<x-email name="profile[email]"/>'
         );
     }

diff --git a/tests/Components/Forms/Inputs/InputTest.php b/tests/Components/Forms/Inputs/InputTest.php
@@ -43,7 +43,7 @@ public function nested_inputs_can_have_old_values()
         $this->flashOld(['filters.search' => 'Eloquent']);
 
         $this->assertComponentRenders(
-            '<input name="filters[search]" type="text" id="filters[search]" value="Eloquent" />',
+            '<input name="filters[search]" type="text" id="filters_search" value="Eloquent" />',
             '<x-input name="filters[search]" />'
         );
     }

diff --git a/tests/Components/Forms/Inputs/PasswordTest.php b/tests/Components/Forms/Inputs/PasswordTest.php
@@ -43,7 +43,7 @@ public function nested_inputs_cannot_have_old_values()
         $this->flashOld(['login.password' => 'secret']);
 
         $this->assertComponentRenders(
-            '<input name="login[password]" type="password" id="login[password]" />',
+            '<input name="login[password]" type="password" id="login_password" />',
             '<x-password name="login[password]"/>'
         );
     }

diff --git a/tests/Components/Forms/Inputs/PikadayTest.php b/tests/Components/Forms/Inputs/PikadayTest.php
@@ -36,7 +36,7 @@ public function nested_pikaday_can_have_old_values()
         $this->flashOld(['profile.birthday' => '23/03/1989']);
 
         $expected = <<<HTML
-<input x-data x-init="new Pikaday({ field: \$el , ...{&quot;format&quot;:&quot;DD\/MM\/YYYY&quot;} })" name="profile[birthday]" type="text" id="profile[birthday]" placeholder="DD/MM/YYYY" value="23/03/1989" />
+<input x-data x-init="new Pikaday({ field: \$el , ...{&quot;format&quot;:&quot;DD\/MM\/YYYY&quot;} })" name="profile[birthday]" type="text" id="profile_birthday" placeholder="DD/MM/YYYY" value="23/03/1989" />
 HTML;
 
         $this->assertComponentRenders($expected, '<x-pikaday name="profile[birthday]"/>');

diff --git a/tests/Components/Forms/Inputs/TextareaTest.php b/tests/Components/Forms/Inputs/TextareaTest.php
@@ -43,7 +43,7 @@ public function nested_inputs_can_have_old_values()
         $this->flashOld(['profile.about' => 'About me text']);
 
         $this->assertComponentRenders(
-            '<textarea name="profile[about]" id="profile[about]" rows="3">About me text</textarea>',
+            '<textarea name="profile[about]" id="profile_about" rows="3">About me text</textarea>',
             '<x-textarea name="profile[about]"/>'
         );
     }