5.1.8

laravelwebdev · laravelwebdev · commit 7bcc54dfb2ba · 2025-01-28T23:47:47.000+08:00
diff --git a/composer.json b/composer.json
@@ -162,5 +162,5 @@
   },
   "minimum-stability": "dev",
   "prefer-stable": true,
-  "version": "5.1.7"
+  "version": "5.1.8"
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/public/app.css b/public/app.css
diff --git a/public/app.js b/public/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,8 +1,8 @@
 {
-    "/app.js": "/app.js?id=b7957e7b100155d49d1e321d9811d94a",
+    "/app.js": "/app.js?id=0ebc84751434d26f74064de407093b72",
     "/ui.js": "/ui.js?id=592866a715b1c20b43fff6ca7980b279",
     "/manifest.js": "/manifest.js?id=3267e5c99fd7b729e2f38ec55b50397d",
-    "/app.css": "/app.css?id=5be2f220306cc89d3f1400a1b2b7bb98",
+    "/app.css": "/app.css?id=0864a7b81f5021e62095c1bd570dedb5",
     "/vendor.js": "/vendor.js?id=7ea02f3d5fdd3c4b567217ae68db7376",
     "/fonts/snunitosansv11pe01mimslybiv1o4x1m8cce4g1pty10iurt9w6fk2a.woff2": "/fonts/snunitosansv11pe01mimslybiv1o4x1m8cce4g1pty10iurt9w6fk2a.woff2?id=c8390e146be0a3c8a5498355dec892ae",
     "/fonts/snunitosansv11pe01mimslybiv1o4x1m8cce4g1pty14iurt9w6fk2a.woff2": "/fonts/snunitosansv11pe01mimslybiv1o4x1m8cce4g1pty14iurt9w6fk2a.woff2?id=b0735c7dd6126471acbaf9d6e9f5e41a",
diff --git a/resources/css/form.css b/resources/css/form.css
@@ -18,7 +18,7 @@
 
 .form-control[data-disabled],
 .form-control:disabled,
-.form-control:read-only {
+.form-control:read-only:not(select) {
   @apply bg-gray-50 dark:bg-gray-800 text-gray-400 outline-none focus:outline-none;
 }
 
diff --git a/resources/js/components/Filters/SelectFilter.vue b/resources/js/components/Filters/SelectFilter.vue
@@ -44,14 +44,15 @@
         class="w-full block"
         :dusk="filter.uniqueKey"
       >
-        <option value="" :selected="value == ''">{{ __('&mdash;') }}</option>
+        <option value="" :selected="!filledValue">{{ __('&mdash;') }}</option>
       </SelectControl>
     </template>
   </FilterContainer>
 </template>
 
 <script>
 import debounce from 'lodash/debounce'
+import filled from '@/util/filled'
 
 export default {
   emits: ['change'],
@@ -139,6 +140,7 @@ export default {
 
     handleFilterReset() {
       if (this.filter.currentValue != '') {
+        this.setCurrentFilterValue()
         return
       }
 
@@ -210,6 +212,10 @@ export default {
         o => this.value === o.value || this.value === o.value.toString()
       )
     },
+
+    filledValue() {
+      return filled(this.value)
+    },
   },
 }
 </script>
diff --git a/resources/js/components/Inputs/ComboBoxInput.vue b/resources/js/components/Inputs/ComboBoxInput.vue
@@ -126,8 +126,12 @@ const selectedOptionIndex = ref(0)
 
 // Lifecycle Methods
 useEventListener(document, 'keydown', event => {
+  if (dropdownShown.value !== true) {
+    return
+  }
+
   // 'tab' or 'escape'
-  if (dropdownShown.value && [9, 27].includes(event.keyCode)) {
+  if ([9, 27].includes(event.keyCode)) {
     setTimeout(() => close(), 50)
 
     return
diff --git a/resources/js/components/Inputs/SearchInput.vue b/resources/js/components/Inputs/SearchInput.vue
@@ -210,8 +210,12 @@ watch(dropdownShown, show => {
 
 // Lifecycle Methods
 useEventListener(document, 'keydown', event => {
+  if (dropdownShown.value !== true) {
+    return
+  }
+
   // 'tab' or 'escape'
-  if (dropdownShown.value && [9, 27].includes(event.keyCode)) {
+  if ([9, 27].includes(event.keyCode)) {
     setTimeout(() => close(), 50)
 
     return
diff --git a/resources/js/fields/Filter/MorphToField.vue b/resources/js/fields/Filter/MorphToField.vue
@@ -9,14 +9,15 @@
         label="singularLabel"
         :dusk="filter.uniqueKey"
       >
-        <option value="" :selected="value === ''">&mdash;</option>
+        <option value="" :selected="!filledValue">&mdash;</option>
       </SelectControl>
     </template>
   </FilterContainer>
 </template>
 
 <script>
 import debounce from 'lodash/debounce'
+import filled from '@/util/filled'
 
 export default {
   emits: ['change'],
@@ -92,6 +93,10 @@ export default {
     hasMorphToTypes() {
       return this.field.morphToTypes.length > 0
     },
+
+    filledValue() {
+      return filled(this.value)
+    },
   },
 }
 </script>
diff --git a/resources/js/fields/Filter/MultiSelectField.vue b/resources/js/fields/Filter/MultiSelectField.vue
@@ -9,14 +9,15 @@
         :options="field.options"
         :dusk="filter.uniqueKey"
       >
-        <option value="" :selected="value === ''">&mdash;</option>
+        <option value="" :selected="!filledValue">&mdash;</option>
       </MultiSelectControl>
     </template>
   </FilterContainer>
 </template>
 
 <script>
 import debounce from 'lodash/debounce'
+import filled from '@/util/filled'
 
 export default {
   emits: ['change'],
@@ -74,6 +75,10 @@ export default {
     field() {
       return this.filter.field
     },
+
+    filledValue() {
+      return filled(this.value)
+    },
   },
 }
 </script>
diff --git a/resources/js/fields/Filter/SelectField.vue b/resources/js/fields/Filter/SelectField.vue
@@ -40,14 +40,15 @@
         :options="field?.options ?? []"
         :dusk="filter.uniqueKey"
       >
-        <option value="" :selected="value === ''">&mdash;</option>
+        <option value="" :selected="!filledValue">&mdash;</option>
       </SelectControl>
     </template>
   </FilterContainer>
 </template>
 
 <script>
 import debounce from 'lodash/debounce'
+import filled from '@/util/filled'
 
 export default {
   emits: ['change'],
@@ -118,6 +119,7 @@ export default {
 
     handleFilterReset() {
       if (this.filter.currentValue !== '') {
+        this.setCurrentFilterValue()
         return
       }
 
@@ -162,6 +164,10 @@ export default {
         o => this.value === o.value || this.value === o.value.toString()
       )
     },
+
+    filledValue() {
+      return filled(this.value)
+    },
   },
 }
 </script>
diff --git a/resources/js/pages/TwoFactorChallenge.vue b/resources/js/pages/TwoFactorChallenge.vue
@@ -82,7 +82,7 @@
           >
             {{
               __(
-                recovery ? 'Use a recovery code' : 'Use an authentication code'
+                !recovery ? 'Use a recovery code' : 'Use an authentication code'
               )
             }}
           </Button>
diff --git a/src/Console/asset-stubs/composer.json b/src/Console/asset-stubs/composer.json
@@ -12,7 +12,7 @@
     },
     "require-dev": {
         "laravel/nova": "^5.0",
-        "laravel/nova-devtool": "^1.4.2"
+        "laravel/nova-devtool": "^1.5"
     },
     "repositories": [
         { "type": "composer", "url": "https://nova.laravel.com" }
diff --git a/src/Console/card-stubs/composer.json b/src/Console/card-stubs/composer.json
@@ -12,7 +12,7 @@
     },
     "require-dev": {
         "laravel/nova": "^5.0",
-        "laravel/nova-devtool": "^1.4.2"
+        "laravel/nova-devtool": "^1.5"
     },
     "repositories": [
         { "type": "composer", "url": "https://nova.laravel.com" }
diff --git a/src/Console/field-stubs/composer.json b/src/Console/field-stubs/composer.json
@@ -12,7 +12,7 @@
     },
     "require-dev": {
         "laravel/nova": "^5.0",
-        "laravel/nova-devtool": "^1.4.2"
+        "laravel/nova-devtool": "^1.5"
     },
     "repositories": [
         { "type": "composer", "url": "https://nova.laravel.com" }
diff --git a/src/Console/filter-stubs/composer.json b/src/Console/filter-stubs/composer.json
@@ -12,7 +12,7 @@
     },
     "require-dev": {
         "laravel/nova": "^5.0",
-        "laravel/nova-devtool": "^1.4.2"
+        "laravel/nova-devtool": "^1.5"
     },
     "repositories": [
         { "type": "composer", "url": "https://nova.laravel.com" }
diff --git a/src/Console/resource-tool-stubs/composer.json b/src/Console/resource-tool-stubs/composer.json
@@ -12,7 +12,7 @@
     },
     "require-dev": {
         "laravel/nova": "^5.0",
-        "laravel/nova-devtool": "^1.4.2"
+        "laravel/nova-devtool": "^1.5"
     },
     "repositories": [
         { "type": "composer", "url": "https://nova.laravel.com" }
diff --git a/src/Console/tool-stubs/composer.json b/src/Console/tool-stubs/composer.json
@@ -12,7 +12,7 @@
     },
     "require-dev": {
         "laravel/nova": "^5.0",
-        "laravel/nova-devtool": "^1.4.2"
+        "laravel/nova-devtool": "^1.5"
     },
     "repositories": [
         { "type": "composer", "url": "https://nova.laravel.com" }
diff --git a/src/Http/Controllers/Fortify/AuthenticatedSessionController.php b/src/Http/Controllers/Fortify/AuthenticatedSessionController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Laravel\Nova\Http\Controllers\Fortify;
+
+use Illuminate\Contracts\Auth\StatefulGuard;
+use Illuminate\Http\Request;
+use Laravel\Fortify\Contracts\LogoutResponse;
+use Laravel\Fortify\Http\Controllers\AuthenticatedSessionController as Controller;
+
+class AuthenticatedSessionController extends Controller
+{
+    /** {@inheritDoc} */
+    #[\Override]
+    public function destroy(Request $request): LogoutResponse
+    {
+        $this->guard = app(StatefulGuard::class);
+
+        return parent::destroy($request);
+    }
+}
diff --git a/src/Http/Controllers/Fortify/ConfirmablePasswordController.php b/src/Http/Controllers/Fortify/ConfirmablePasswordController.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Laravel\Nova\Http\Controllers\Fortify;
+
+use Illuminate\Contracts\Auth\StatefulGuard;
+use Illuminate\Http\Request;
+use Laravel\Fortify\Http\Controllers\ConfirmablePasswordController as Controller;
+
+class ConfirmablePasswordController extends Controller
+{
+    /** {@inheritDoc} */
+    #[\Override]
+    public function store(Request $request)
+    {
+        $this->guard = app(StatefulGuard::class);
+
+        return parent::store($request);
+    }
+}
diff --git a/src/Http/Controllers/Fortify/NewPasswordController.php b/src/Http/Controllers/Fortify/NewPasswordController.php
@@ -3,14 +3,24 @@
 namespace Laravel\Nova\Http\Controllers\Fortify;
 
 use Illuminate\Contracts\Auth\PasswordBroker;
+use Illuminate\Contracts\Auth\StatefulGuard;
+use Illuminate\Contracts\Support\Responsable;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Password;
 use Laravel\Fortify\Http\Controllers\NewPasswordController as Controller;
 
 class NewPasswordController extends Controller
 {
-    /**
-     * Get the broker to be used during password reset.
-     */
+    /** {@inheritDoc} */
+    #[\Override]
+    public function store(Request $request): Responsable
+    {
+        $this->guard = app(StatefulGuard::class);
+
+        return parent::store($request);
+    }
+
+    /** {@inheritDoc} */
     #[\Override]
     protected function broker(): PasswordBroker
     {
diff --git a/src/Http/Controllers/Fortify/PasswordResetLinkController.php b/src/Http/Controllers/Fortify/PasswordResetLinkController.php
@@ -8,9 +8,7 @@
 
 class PasswordResetLinkController extends Controller
 {
-    /**
-     * Get the broker to be used during password reset.
-     */
+    /** {@inheritDoc} */
     #[\Override]
     protected function broker(): PasswordBroker
     {
diff --git a/src/Http/Controllers/Fortify/TwoFactorAuthenticatedSessionController.php b/src/Http/Controllers/Fortify/TwoFactorAuthenticatedSessionController.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Laravel\Nova\Http\Controllers\Fortify;
+
+use Illuminate\Contracts\Auth\StatefulGuard;
+use Laravel\Fortify\Http\Controllers\TwoFactorAuthenticatedSessionController as Controller;
+use Laravel\Fortify\Http\Requests\TwoFactorLoginRequest;
+
+class TwoFactorAuthenticatedSessionController extends Controller
+{
+    /** {@inheritDoc} */
+    #[\Override]
+    public function store(TwoFactorLoginRequest $request)
+    {
+        $this->guard = app(StatefulGuard::class);
+
+        return parent::store($request);
+    }
+}
diff --git a/src/PendingRouteRegistration.php b/src/PendingRouteRegistration.php
@@ -7,21 +7,21 @@
 use Illuminate\Support\Facades\Route;
 use Laravel\Fortify\Features;
 use Laravel\Fortify\Fortify;
-use Laravel\Fortify\Http\Controllers\AuthenticatedSessionController;
-use Laravel\Fortify\Http\Controllers\ConfirmablePasswordController;
 use Laravel\Fortify\Http\Controllers\ConfirmedPasswordStatusController;
 use Laravel\Fortify\Http\Controllers\ConfirmedTwoFactorAuthenticationController;
 use Laravel\Fortify\Http\Controllers\EmailVerificationNotificationController;
 use Laravel\Fortify\Http\Controllers\EmailVerificationPromptController;
 use Laravel\Fortify\Http\Controllers\PasswordController;
 use Laravel\Fortify\Http\Controllers\RecoveryCodeController;
-use Laravel\Fortify\Http\Controllers\TwoFactorAuthenticatedSessionController;
 use Laravel\Fortify\Http\Controllers\TwoFactorAuthenticationController;
 use Laravel\Fortify\Http\Controllers\TwoFactorQrCodeController;
 use Laravel\Fortify\Http\Controllers\TwoFactorSecretKeyController;
 use Laravel\Fortify\Http\Controllers\VerifyEmailController;
+use Laravel\Nova\Http\Controllers\Fortify\AuthenticatedSessionController;
+use Laravel\Nova\Http\Controllers\Fortify\ConfirmablePasswordController;
 use Laravel\Nova\Http\Controllers\Fortify\NewPasswordController;
 use Laravel\Nova\Http\Controllers\Fortify\PasswordResetLinkController;
+use Laravel\Nova\Http\Controllers\Fortify\TwoFactorAuthenticatedSessionController;
 use Laravel\Nova\Http\Controllers\Pages\AttachableController;
 use Laravel\Nova\Http\Controllers\Pages\AttachedResourceUpdateController;
 use Laravel\Nova\Http\Controllers\Pages\DashboardController;

Original file line number	Diff line number	Diff line change
`@@ -162,5 +162,5 @@`
`162`	`162`	`},`
`163`	`163`	`"minimum-stability": "dev",`
`164`	`164`	`"prefer-stable": true,`
`165`		`- "version": "5.1.7"`
	`165`	`+ "version": "5.1.8"`
`166`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`
`19`	`19`	`.form-control[data-disabled],`
`20`	`20`	`.form-control:disabled,`
`21`		`-.form-control:read-only {`
	`21`	`+.form-control:read-only:not(select) {`
`22`	`22`	`@apply bg-gray-50 dark:bg-gray-800 text-gray-400 outline-none focus:outline-none;`
`23`	`23`	`}`
`24`	`24`