5.2.4

Author: laravelwebdev

composer.json

@@ -162,5 +162,5 @@
   },
   "minimum-stability": "dev",
   "prefer-stable": true,
-  "version": "5.2.3"
+  "version": "5.2.4"
 }

public/app.js

@@ -1,5 +1,5 @@
 {
-    "/app.js": "/app.js?id=daaffa78cdcf42b078c1a3167c9a19d1",
+    "/app.js": "/app.js?id=b857d5654171bf2bc52af06dc8eb5772",
     "/ui.js": "/ui.js?id=592866a715b1c20b43fff6ca7980b279",
     "/manifest.js": "/manifest.js?id=3267e5c99fd7b729e2f38ec55b50397d",
     "/app.css": "/app.css?id=e6e32c23966698900f862c22cfc1651d",

public/mix-manifest.json

@@ -12,19 +12,23 @@
           ref="theInput"
           :value="value"
           @blur="handleChangesOnBlurEvent"
+          @keyup.enter="handleChangeOnPressingEnterEvent"
+          @keydown.enter="handleChangeOnPressingEnterEvent"
           :id="field.uniqueKey"
-          :disabled="isReadonly"
+          :disabled="isImmutable"
+          :readonly="isImmutable"
           class="w-full form-control form-input form-control-bordered"
           :dusk="field.attribute"
           autocomplete="off"
           spellcheck="false"
         />
 
         <button
-          class="rounded inline-flex text-sm ml-3 link-default"
           v-if="field.showCustomizeButton"
           type="button"
           @click="toggleCustomizeClick"
+          :dusk="`${field.attribute}-slug-field-edit-button`"
+          class="rounded inline-flex text-sm ml-3 link-default"
         >
           {{ __('Customize') }}
         </button>
@@ -40,13 +44,15 @@ import {
   HandlesValidationErrors,
 } from '@/mixins'
 import debounce from 'lodash/debounce'
+import get from 'lodash/get'
 import isNil from 'lodash/isNil'
 
 export default {
   mixins: [FormField, HandlesFieldPreviews, HandlesValidationErrors],
 
   data: () => ({
     isListeningToChanges: false,
+    isCustomisingValue: false,
     debouncedHandleChange: null,
   }),
 
@@ -74,10 +80,24 @@ export default {
       }
     },
 
-    async handleChangesOnBlurEvent(event) {
-      let value = event?.target?.value ?? event
+    handleChangeOnPressingEnterEvent(event) {
+      event.preventDefault()
+      event.stopPropagation()
+
+      this.listenToValueChanges(event?.target?.value ?? event)
+    },
+
+    handleChangesOnBlurEvent(event) {
+      this.listenToValueChanges(event?.target?.value ?? event)
+    },
 
-      if (this.isReadonly) {
+    listenToValueChanges(value) {
+      if (this.isImmutable === true) {
+        return
+      }
+
+      if (this.isCustomisingValue === true) {
+        this.value = value
         return
       }
 
@@ -91,18 +111,20 @@ export default {
     },
 
     toggleCustomizeClick() {
-      if (this.field.readonly) {
+      if (this.field.extraAttributes.readonly === true) {
+        this.isCustomisingValue = true
         this.removeChangeListener()
         this.isListeningToChanges = false
-        this.field.readonly = false
+        this.field.writable = true
         this.field.extraAttributes.readonly = false
         this.field.showCustomizeButton = false
         this.$refs.theInput.focus()
         return
       }
 
+      this.isCustomisingValue = false
       this.registerChangeListener()
-      this.field.readonly = true
+      this.field.writable = false
       this.field.extraAttributes.readonly = true
     },
   },
@@ -112,6 +134,14 @@ export default {
       return this.field.shouldListenToFromChanges
     },
 
+    isImmutable() {
+      return Boolean(
+        this.field.readonly === false &&
+          this.field.writable === true &&
+          get(this.field, 'extraAttributes.readonly') === true
+      )
+    },
+
     eventName() {
       return this.getFieldAttributeChangeEventName(this.field.from)
     },

resources/js/fields/Form/SlugField.vue

@@ -2,6 +2,7 @@
 
 namespace Laravel\Nova\Fields;
 
+use Illuminate\Support\Arr;
 use Laravel\Nova\Exceptions\NovaException;
 use Laravel\Nova\Fields\Repeater\Presets\HasMany;
 use Laravel\Nova\Fields\Repeater\Presets\JSON;
@@ -288,8 +289,8 @@ protected function replaceRulesPlaceholder(array $rules, string $replaceWith = '
             return $rules;
         }
 
-        return collect($rules)->map(static function ($rules) use ($replacements) {
-            return collect($rules)->map(static function ($rule) use ($replacements) {
+        return collect($rules)->map(static function ($fieldRules) use ($replacements) {
+            return collect(Arr::wrap($fieldRules))->map(static function ($rule) use ($replacements) {
                 return is_string($rule)
                     ? str_replace(array_keys($replacements), array_values($replacements), $rule)
                     : $rule;

src/Fields/Repeater.php

@@ -101,7 +101,7 @@ public function jsonSerialize(): array
         };
 
         if (! is_null($from) && $request->isUpdateOrUpdateAttachedRequest()) {
-            $this->readonly();
+            $this->immutable();
             $this->showCustomizeButton = true;
         }
 

src/Fields/Slug.php

@@ -5,6 +5,7 @@
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Route;
+use Laravel\Nova\TrashedStatus;
 use Mockery as m;
 use Symfony\Component\HttpFoundation\Request as SymfonyRequest;
 
@@ -150,6 +151,18 @@ public function isPresentationRequest(): bool
             || $this->isLensRequest();
     }
 
+    /**
+     * Get the trashed status of the request.
+     */
+    public function trashed(): TrashedStatus
+    {
+        if (is_null($trashed = $this->trashed)) {
+            return TrashedStatus::DEFAULT;
+        }
+
+        return TrashedStatus::tryFrom((string) $trashed) ?? TrashedStatus::DEFAULT;
+    }
+
     /**
      * Create an Illuminate request from a Symfony instance.
      */

src/Http/Requests/NovaRequest.php

@@ -73,8 +73,5 @@ public function orderings(): array
     /**
      * Get the trashed status of the request.
      */
-    protected function trashed(): TrashedStatus
-    {
-        return TrashedStatus::tryFrom((string) $this->trashed) ?? TrashedStatus::DEFAULT;
-    }
+    abstract public function trashed(): TrashedStatus;
 }

src/Http/Requests/QueriesResources.php

@@ -34,7 +34,7 @@ protected function restorableModels(Collection $models): Collection
     /**
      * Get the trashed status of the request.
      */
-    protected function trashed(): TrashedStatus
+    public function trashed(): TrashedStatus
     {
         return TrashedStatus::WITH;
     }

src/Http/Requests/RestoreLensResourceRequest.php

@@ -34,7 +34,7 @@ protected function restorableModels(Collection $models): Collection
     /**
      * Get the trashed status of the request.
      */
-    protected function trashed(): TrashedStatus
+    public function trashed(): TrashedStatus
     {
         return TrashedStatus::WITH;
     }