Fix dynamic component bug preventing checkboxes/radios from using wir…

…e:model.live - fixes #601
livewire · Nov 7, 2024 · 87d1b2b · 87d1b2b
1 parent 5895892
commit 87d1b2b
Show file tree

Hide file tree

Showing 321 changed files with 339 additions and 955 deletions.
diff --git a/src/Console/IconCommand.php b/src/Console/IconCommand.php
@@ -97,8 +97,6 @@ protected function generateIconBlade($svg) {
         $stub = <<<'HTML'
         {{-- Credit: Lucide (https://lucide.dev) --}}
 
-        @php $attributes = $unescapedForwardedAttributes ?? $attributes; @endphp
-
         @props([
             'variant' => 'outline',
         ])

diff --git a/src/FluxServiceProvider.php b/src/FluxServiceProvider.php
@@ -21,8 +21,8 @@ public function register(): void
     public function boot(): void
     {
         $this->bootComponentPath();
-
         $this->bootTagCompiler();
+        $this->bootMacros();
 
         AssetManager::boot();
 
@@ -55,6 +55,13 @@ public function bootTagCompiler()
         });
     }
 
+    public function bootMacros()
+    {
+        app('view')::macro('getCurrentComponentData', function () {
+            return $this->currentComponentData;
+        });
+    }
+
     public function bootCommands()
     {
         if (! $this->app->runningInConsole()) {

diff --git a/src/FluxTagCompiler.php b/src/FluxTagCompiler.php
@@ -8,6 +8,19 @@ class FluxTagCompiler extends ComponentTagCompiler
 {
     public function componentString(string $component, array $attributes)
     {
+        // A component that forwards all data, attributes, and named slots to another component...
+        if ($component === 'flux::delegate-component') {
+            $component = $attributes['component'];
+
+            $class = \Illuminate\View\AnonymousComponent::class;
+
+            return "##BEGIN-COMPONENT-CLASS##@component('{$class}', 'flux::' . {$component}, [
+    'view' => md5('flux') . '::' . {$component},
+    'data' => \$__env->getCurrentComponentData(),
+])
+<?php \$component->withAttributes(\$attributes->all()); ?>";
+        }
+
         return parent::componentString($component, $attributes);
     }
 

diff --git a/stubs/resources/views/flux/icon/academic-cap.blade.php b/stubs/resources/views/flux/icon/academic-cap.blade.php
@@ -1,7 +1,5 @@
 {{-- Credit: Heroicons (https://heroicons.com) --}}
 
-@php $attributes = $unescapedForwardedAttributes ?? $attributes; @endphp
-
 @props([
     'variant' => 'outline',
 ])
@@ -47,4 +45,4 @@
 
         <?php break; ?>
 
-<?php endswitch; ?>
+<?php endswitch; ?>
diff --git a/stubs/resources/views/flux/icon/adjustments-horizontal.blade.php b/stubs/resources/views/flux/icon/adjustments-horizontal.blade.php
@@ -1,7 +1,5 @@
 {{-- Credit: Heroicons (https://heroicons.com) --}}
 
-@php $attributes = $unescapedForwardedAttributes ?? $attributes; @endphp
-
 @props([
     'variant' => 'outline',
 ])
@@ -44,4 +42,4 @@
 
         <?php break; ?>
 
-<?php endswitch; ?>
+<?php endswitch; ?>
diff --git a/stubs/resources/views/flux/icon/adjustments-vertical.blade.php b/stubs/resources/views/flux/icon/adjustments-vertical.blade.php
@@ -1,7 +1,5 @@
 {{-- Credit: Heroicons (https://heroicons.com) --}}
 
-@php $attributes = $unescapedForwardedAttributes ?? $attributes; @endphp
-
 @props([
     'variant' => 'outline',
 ])
@@ -44,4 +42,4 @@
 
         <?php break; ?>
 
-<?php endswitch; ?>
+<?php endswitch; ?>
diff --git a/stubs/resources/views/flux/icon/archive-box-arrow-down.blade.php b/stubs/resources/views/flux/icon/archive-box-arrow-down.blade.php
@@ -1,7 +1,5 @@
 {{-- Credit: Heroicons (https://heroicons.com) --}}
 
-@php $attributes = $unescapedForwardedAttributes ?? $attributes; @endphp
-
 @props([
     'variant' => 'outline',
 ])
@@ -46,4 +44,4 @@
 
         <?php break; ?>
 
-<?php endswitch; ?>
+<?php endswitch; ?>
diff --git a/stubs/resources/views/flux/icon/archive-box-x-mark.blade.php b/stubs/resources/views/flux/icon/archive-box-x-mark.blade.php
@@ -1,7 +1,5 @@
 {{-- Credit: Heroicons (https://heroicons.com) --}}
 
-@php $attributes = $unescapedForwardedAttributes ?? $attributes; @endphp
-
 @props([
     'variant' => 'outline',
 ])
@@ -47,4 +45,4 @@
 
         <?php break; ?>
 
-<?php endswitch; ?>
+<?php endswitch; ?>
diff --git a/stubs/resources/views/flux/icon/archive-box.blade.php b/stubs/resources/views/flux/icon/archive-box.blade.php
@@ -1,7 +1,5 @@
 {{-- Credit: Heroicons (https://heroicons.com) --}}
 
-@php $attributes = $unescapedForwardedAttributes ?? $attributes; @endphp
-
 @props([
     'variant' => 'outline',
 ])
@@ -47,4 +45,4 @@
 
         <?php break; ?>
 
-<?php endswitch; ?>
+<?php endswitch; ?>
diff --git a/stubs/resources/views/flux/icon/arrow-down-circle.blade.php b/stubs/resources/views/flux/icon/arrow-down-circle.blade.php
@@ -1,7 +1,5 @@
 {{-- Credit: Heroicons (https://heroicons.com) --}}
 
-@php $attributes = $unescapedForwardedAttributes ?? $attributes; @endphp
-
 @props([
     'variant' => 'outline',
 ])
@@ -44,4 +42,4 @@
 
         <?php break; ?>
 
-<?php endswitch; ?>
+<?php endswitch; ?>
diff --git a/stubs/resources/views/flux/icon/arrow-down-left.blade.php b/stubs/resources/views/flux/icon/arrow-down-left.blade.php
@@ -1,7 +1,5 @@
 {{-- Credit: Heroicons (https://heroicons.com) --}}
 
-@php $attributes = $unescapedForwardedAttributes ?? $attributes; @endphp
-
 @props([
     'variant' => 'outline',
 ])
@@ -44,4 +42,4 @@
 
         <?php break; ?>
 
-<?php endswitch; ?>
+<?php endswitch; ?>
diff --git a/stubs/resources/views/flux/icon/arrow-down-on-square-stack.blade.php b/stubs/resources/views/flux/icon/arrow-down-on-square-stack.blade.php
@@ -1,7 +1,5 @@
 {{-- Credit: Heroicons (https://heroicons.com) --}}
 
-@php $attributes = $unescapedForwardedAttributes ?? $attributes; @endphp
-
 @props([
     'variant' => 'outline',
 ])
@@ -46,4 +44,4 @@
 
         <?php break; ?>
 
-<?php endswitch; ?>
+<?php endswitch; ?>
diff --git a/stubs/resources/views/flux/icon/arrow-down-on-square.blade.php b/stubs/resources/views/flux/icon/arrow-down-on-square.blade.php
@@ -1,7 +1,5 @@
 {{-- Credit: Heroicons (https://heroicons.com) --}}
 
-@php $attributes = $unescapedForwardedAttributes ?? $attributes; @endphp
-
 @props([
     'variant' => 'outline',
 ])
@@ -44,4 +42,4 @@
 
         <?php break; ?>
 
-<?php endswitch; ?>
+<?php endswitch; ?>
diff --git a/stubs/resources/views/flux/icon/arrow-down-right.blade.php b/stubs/resources/views/flux/icon/arrow-down-right.blade.php
@@ -1,7 +1,5 @@
 {{-- Credit: Heroicons (https://heroicons.com) --}}
 
-@php $attributes = $unescapedForwardedAttributes ?? $attributes; @endphp
-
 @props([
     'variant' => 'outline',
 ])
@@ -44,4 +42,4 @@
 
         <?php break; ?>
 
-<?php endswitch; ?>
+<?php endswitch; ?>
diff --git a/stubs/resources/views/flux/icon/arrow-down-tray.blade.php b/stubs/resources/views/flux/icon/arrow-down-tray.blade.php
@@ -1,7 +1,5 @@
 {{-- Credit: Heroicons (https://heroicons.com) --}}
 
-@php $attributes = $unescapedForwardedAttributes ?? $attributes; @endphp
-
 @props([
     'variant' => 'outline',
 ])
@@ -46,4 +44,4 @@
 
         <?php break; ?>
 
-<?php endswitch; ?>
+<?php endswitch; ?>
diff --git a/stubs/resources/views/flux/icon/arrow-down.blade.php b/stubs/resources/views/flux/icon/arrow-down.blade.php
@@ -1,7 +1,5 @@
 {{-- Credit: Heroicons (https://heroicons.com) --}}
 
-@php $attributes = $unescapedForwardedAttributes ?? $attributes; @endphp
-
 @props([
     'variant' => 'outline',
 ])
@@ -44,4 +42,4 @@
 
         <?php break; ?>
 
-<?php endswitch; ?>
+<?php endswitch; ?>
diff --git a/stubs/resources/views/flux/icon/arrow-left-circle.blade.php b/stubs/resources/views/flux/icon/arrow-left-circle.blade.php
@@ -1,7 +1,5 @@
 {{-- Credit: Heroicons (https://heroicons.com) --}}
 
-@php $attributes = $unescapedForwardedAttributes ?? $attributes; @endphp
-
 @props([
     'variant' => 'outline',
 ])
@@ -44,4 +42,4 @@
 
         <?php break; ?>
 
-<?php endswitch; ?>
+<?php endswitch; ?>
diff --git a/stubs/resources/views/flux/icon/arrow-left-end-on-rectangle.blade.php b/stubs/resources/views/flux/icon/arrow-left-end-on-rectangle.blade.php
@@ -1,7 +1,5 @@
 {{-- Credit: Heroicons (https://heroicons.com) --}}
 
-@php $attributes = $unescapedForwardedAttributes ?? $attributes; @endphp
-
 @props([
     'variant' => 'outline',
 ])
@@ -46,4 +44,4 @@
 
         <?php break; ?>
 
-<?php endswitch; ?>
+<?php endswitch; ?>
diff --git a/stubs/resources/views/flux/icon/arrow-left-start-on-rectangle.blade.php b/stubs/resources/views/flux/icon/arrow-left-start-on-rectangle.blade.php
@@ -1,7 +1,5 @@
 {{-- Credit: Heroicons (https://heroicons.com) --}}
 
-@php $attributes = $unescapedForwardedAttributes ?? $attributes; @endphp
-
 @props([
     'variant' => 'outline',
 ])
@@ -45,4 +43,4 @@
 
         <?php break; ?>
 
-<?php endswitch; ?>
+<?php endswitch; ?>
diff --git a/stubs/resources/views/flux/icon/arrow-left.blade.php b/stubs/resources/views/flux/icon/arrow-left.blade.php
@@ -1,7 +1,5 @@
 {{-- Credit: Heroicons (https://heroicons.com) --}}
 
-@php $attributes = $unescapedForwardedAttributes ?? $attributes; @endphp
-
 @props([
     'variant' => 'outline',
 ])
@@ -44,4 +42,4 @@
 
         <?php break; ?>
 
-<?php endswitch; ?>
+<?php endswitch; ?>
diff --git a/stubs/resources/views/flux/icon/arrow-long-down.blade.php b/stubs/resources/views/flux/icon/arrow-long-down.blade.php
@@ -1,7 +1,5 @@
 {{-- Credit: Heroicons (https://heroicons.com) --}}
 
-@php $attributes = $unescapedForwardedAttributes ?? $attributes; @endphp
-
 @props([
     'variant' => 'outline',
 ])
@@ -44,4 +42,4 @@
 
         <?php break; ?>
 
-<?php endswitch; ?>
+<?php endswitch; ?>
diff --git a/stubs/resources/views/flux/icon/arrow-long-left.blade.php b/stubs/resources/views/flux/icon/arrow-long-left.blade.php
@@ -1,7 +1,5 @@
 {{-- Credit: Heroicons (https://heroicons.com) --}}
 
-@php $attributes = $unescapedForwardedAttributes ?? $attributes; @endphp
-
 @props([
     'variant' => 'outline',
 ])
@@ -44,4 +42,4 @@
 
         <?php break; ?>
 
-<?php endswitch; ?>
+<?php endswitch; ?>
diff --git a/stubs/resources/views/flux/icon/arrow-long-right.blade.php b/stubs/resources/views/flux/icon/arrow-long-right.blade.php
@@ -1,7 +1,5 @@
 {{-- Credit: Heroicons (https://heroicons.com) --}}
 
-@php $attributes = $unescapedForwardedAttributes ?? $attributes; @endphp
-
 @props([
     'variant' => 'outline',
 ])
@@ -44,4 +42,4 @@
 
         <?php break; ?>
 
-<?php endswitch; ?>
+<?php endswitch; ?>
diff --git a/stubs/resources/views/flux/icon/arrow-long-up.blade.php b/stubs/resources/views/flux/icon/arrow-long-up.blade.php
@@ -1,7 +1,5 @@
 {{-- Credit: Heroicons (https://heroicons.com) --}}
 
-@php $attributes = $unescapedForwardedAttributes ?? $attributes; @endphp
-
 @props([
     'variant' => 'outline',
 ])
@@ -44,4 +42,4 @@
 
         <?php break; ?>
 
-<?php endswitch; ?>
+<?php endswitch; ?>
diff --git a/stubs/resources/views/flux/icon/arrow-path-rounded-square.blade.php b/stubs/resources/views/flux/icon/arrow-path-rounded-square.blade.php
@@ -1,7 +1,5 @@
 {{-- Credit: Heroicons (https://heroicons.com) --}}
 
-@php $attributes = $unescapedForwardedAttributes ?? $attributes; @endphp
-
 @props([
     'variant' => 'outline',
 ])
@@ -44,4 +42,4 @@
 
         <?php break; ?>
 
-<?php endswitch; ?>
+<?php endswitch; ?>
diff --git a/stubs/resources/views/flux/icon/arrow-path.blade.php b/stubs/resources/views/flux/icon/arrow-path.blade.php
@@ -1,7 +1,5 @@
 {{-- Credit: Heroicons (https://heroicons.com) --}}
 
-@php $attributes = $unescapedForwardedAttributes ?? $attributes; @endphp
-
 @props([
     'variant' => 'outline',
 ])
@@ -44,4 +42,4 @@
 
         <?php break; ?>
 
-<?php endswitch; ?>
+<?php endswitch; ?>