wip

filamentphp · Dec 4, 2023 · 785c828 · 785c828
1 parent be11bcf
commit 785c828
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/packages/forms/resources/views/components/tabs.blade.php b/packages/forms/resources/views/components/tabs.blade.php
@@ -11,25 +11,22 @@
         tab: @if ($isTabPersisted() && filled($persistenceId = $getId())) $persist(null).as('tabs-{{ $persistenceId }}') @else null @endif,
 
         init: function () {
-            // Watcher is first as Alpine.js does not currently
-            // support defining a constant as the first thing in
-            // the function body.
-            this.$watch('tab', () => this.updateQueryString())
-
             const tabs = this.getTabs()
 
             if ((! this.tab) || (! tabs.includes(this.tab))) {
                  this.tab = tabs[@js($getActiveTab()) - 1]
             }
 
+            this.$watch('tab', () => this.updateQueryString())
+
             Livewire.hook('commit', ({ component, commit, succeed, fail, respond }) => {
                 succeed(({ snapshot, effect }) => {
                     $nextTick(() => {
                         if (component.id !== @js($this->getId())) {
                             return
                         }
 
-                        let const = this.getTabs()
+                        const tabs = this.getTabs()
 
                         if (! tabs.includes(this.tab)) {
                              this.tab = tabs[@js($getActiveTab()) - 1]

diff --git a/packages/infolists/resources/views/components/tabs.blade.php b/packages/infolists/resources/views/components/tabs.blade.php
@@ -10,17 +10,14 @@
         tab: @if ($isTabPersisted() && filled($persistenceId = $getId())) $persist(null).as('tabs-{{ $persistenceId }}') @else null @endif,
 
         init: function () {
-            // Watcher is first as Alpine.js does not currently
-            // support defining a constant as the first thing in
-            // the function body.
-            this.$watch('tab', () => this.updateQueryString())
-
             const tabs = this.getTabs()
 
             if ((! this.tab) || (! tabs.includes(this.tab))) {
                  this.tab = tabs[@js($getActiveTab()) - 1]
             }
 
+            this.$watch('tab', () => this.updateQueryString())
+
             Livewire.hook('commit', ({ component, commit, succeed, fail, respond }) => {
                 succeed(({ snapshot, effect }) => {
                     $nextTick(() => {