From fab9a3501b783b6de215581be029bc6cb2f79826 Mon Sep 17 00:00:00 2001
From: Ryan Scherler <ryan@eastslope.studio>
Date: Tue, 15 Dec 2020 15:03:55 -0800
Subject: [PATCH] Remove blade component dependency

---
 composer.json                             |  1 -
 resources/views/fields/checkbox.blade.php |  1 -
 resources/views/fields/text.blade.php     |  1 -
 resources/views/fields/textarea.blade.php |  1 -
 resources/views/fields/trix.blade.php     |  8 ++++----
 src/BladeDirectives.php                   | 12 ++++++++++++
 src/FilamentServiceProvider.php           |  2 ++
 7 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index e6ee0935c5..275a5ead84 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,6 @@
   ],
   "license": "MIT",
   "require": {
-    "appstract/laravel-blade-directives": "^1.10",
     "blade-ui-kit/blade-heroicons": "^0.3",
     "graham-campbell/markdown": "^13.1",
     "league/glide-laravel": "^1.0",
diff --git a/resources/views/fields/checkbox.blade.php b/resources/views/fields/checkbox.blade.php
index 6aa728c338..c870b0efa2 100644
--- a/resources/views/fields/checkbox.blade.php
+++ b/resources/views/fields/checkbox.blade.php
@@ -2,7 +2,6 @@
     <x-filament::label>
         <span class="inline-flex items-center space-x-2">
             <input type="{{ $type }}" 
-                name="{{ $name }}"
                 @if ($model)
                     {{ $modelDirective }}="{{ $model }}"
                 @endif
diff --git a/resources/views/fields/text.blade.php b/resources/views/fields/text.blade.php
index c4b9b52339..fa3b019134 100644
--- a/resources/views/fields/text.blade.php
+++ b/resources/views/fields/text.blade.php
@@ -2,7 +2,6 @@
 
 @section('field')
     <input type="{{ $type }}" 
-        name="{{ $name }}"
         id="{{ $id ?? $name }}"
         value="{{ $value ?? '' }}"
         @if ($model)
diff --git a/resources/views/fields/textarea.blade.php b/resources/views/fields/textarea.blade.php
index c11e16cd3d..47d8ea44f4 100644
--- a/resources/views/fields/textarea.blade.php
+++ b/resources/views/fields/textarea.blade.php
@@ -2,7 +2,6 @@
 
 @section('field')
     <textarea 
-        name="{{ $name }}"
         id="{{ $id ?? $name }}"
         @if ($model)
             {{ $modelDirective }}="{{ $model }}"
diff --git a/resources/views/fields/trix.blade.php b/resources/views/fields/trix.blade.php
index 1eff311304..79e6cce965 100644
--- a/resources/views/fields/trix.blade.php
+++ b/resources/views/fields/trix.blade.php
@@ -1,11 +1,11 @@
 @extends('filament::layouts.field-group')
 
-@pushonce('head:trix')
-    @style('https://www.unpkg.com/trix@1.3.1/dist/trix.css')
+@pushonce('head')
+    <link rel="stylesheet" href="https://www.unpkg.com/trix@1.3.1/dist/trix.css">
 @endpushonce
 
-@pushonce('js:trix')
-    @script('https://www.unpkg.com/trix@1.3.1/dist/trix.js')
+@pushonce('js')
+    <script src="https://www.unpkg.com/trix@1.3.1/dist/trix.js"></script>
 @endpushonce
 
 @section('field')
diff --git a/src/BladeDirectives.php b/src/BladeDirectives.php
index 6c22155fb9..8376948508 100644
--- a/src/BladeDirectives.php
+++ b/src/BladeDirectives.php
@@ -13,4 +13,16 @@ class BladeDirectives
     {
         return '{!! \Filament::scripts() !!}';
     }
+
+    public static function pushOnce($expression): string
+    {
+        $var = '$__env->{"__pushonce_" . md5(__FILE__ . ":" . __LINE__)}';
+    
+        return "<?php if(!isset({$var})): {$var} = true; \$__env->startPush({$expression}); ?>";
+    }
+    
+    public static function endPushOnce(): string
+    {
+        return '<?php $__env->stopPush(); endif; ?>';
+    }
 }
diff --git a/src/FilamentServiceProvider.php b/src/FilamentServiceProvider.php
index 2746196907..789efd1403 100644
--- a/src/FilamentServiceProvider.php
+++ b/src/FilamentServiceProvider.php
@@ -90,6 +90,8 @@ class FilamentServiceProvider extends ServiceProvider
     {
         Blade::directive('filamentStyles', [BladeDirectives::class, 'styles']);
         Blade::directive('filamentScripts', [BladeDirectives::class, 'scripts']);
+        Blade::directive('pushonce', [BladeDirectives::class, 'pushOnce']);
+        Blade::directive('endpushonce', [BladeDirectives::class, 'endPushOnce']);
     }
 
     protected function bootPublishing(): void