5.4.2

Author: laravelwebdev

composer.json

@@ -169,5 +169,5 @@
   },
   "minimum-stability": "dev",
   "prefer-stable": true,
-  "version": "5.4.1"
+  "version": "5.4.2"
 }

package-lock.json

@@ -1,5 +1,5 @@
 {
-    "/app.js": "/app.js?id=3ddbff62c536804bfe9fb3e0a0157759",
+    "/app.js": "/app.js?id=a96a6e9f8ac73b0780f4a029bc70fb0f",
     "/ui.js": "/ui.js?id=592866a715b1c20b43fff6ca7980b279",
     "/manifest.js": "/manifest.js?id=3267e5c99fd7b729e2f38ec55b50397d",
     "/app.css": "/app.css?id=4ac240e9b4c482451bf95d4161751414",

public/app.js

@@ -1,9 +1,15 @@
 <template>
   <div v-if="field.visible" :class="fieldWrapperClasses">
     <div v-if="field.withLabel" :class="labelClasses">
-      <slot>
+      <slot
+        name="default"
+        :for="fieldLabelFor"
+        :label="fieldLabel"
+        :required="field.required"
+        :hasHelpText="shouldShowHelpText"
+      >
         <FormLabel
-          :label-for="labelFor || field.uniqueKey"
+          :label-for="fieldLabelFor"
           class="space-x-1"
           :class="{ 'mb-2': shouldShowHelpText }"
         >
@@ -49,6 +55,11 @@ export default {
   },
 
   computed: {
+    /**
+     * HTML classes for field wrapper.
+     *
+     * @returns {string[]}
+     */
     fieldWrapperClasses() {
       // prettier-ignore
       return [
@@ -61,6 +72,11 @@ export default {
       ]
     },
 
+    /**
+     * HTML classes for label.
+     *
+     * @returns {string[]}
+     */
     labelClasses() {
       // prettier-ignore
       return [
@@ -74,6 +90,11 @@ export default {
       ]
     },
 
+    /**
+     * HTML classes for control wrapper.
+     *
+     * @returns {string[]}
+     */
     controlWrapperClasses() {
       // prettier-ignore
       return [
@@ -90,6 +111,8 @@ export default {
 
     /**
      * Return the label that should be used for the field.
+     *
+     * @returns {string}
      */
     fieldLabel() {
       // If the field name is purposefully an empty string, then let's show it as such
@@ -100,8 +123,19 @@ export default {
       return this.fieldName || this.field.name || this.field.singularLabel
     },
 
+    /**
+     * Return the label target for the field.
+     *
+     * @returns {string}
+     */
+    fieldLabelFor() {
+      return this.labelFor || this.field.uniqueKey
+    },
+
     /**
      * Determine help text should be shown.
+     *
+     * @returns {boolean}
      */
     shouldShowHelpText() {
       return this.showHelpText && this.field.helpText?.length > 0

public/mix-manifest.json

@@ -139,6 +139,7 @@ export function useActions(props, emitter, store) {
   }
 
   function openConfirmationModal() {
+    state.errors = new Errors()
     state.actionModalVisible = true
   }
 

resources/js/components/DefaultField.vue

@@ -5,6 +5,20 @@
     :show-help-text="showHelpText"
     :full-width-content="fullWidthContent"
   >
+    <template #default="defaultSlotProps">
+      <FormLabel
+        class="space-x-1"
+        :class="{ 'mb-2': defaultSlotProps.hasHelpText }"
+        @click.prevent.stop="toggle"
+      >
+        <span>
+          {{ defaultSlotProps.label }}
+        </span>
+        <span v-if="defaultSlotProps.required" class="text-red-500 text-sm">
+          {{ __('*') }}
+        </span>
+      </FormLabel>
+    </template>
     <template #field>
       <Checkbox
         :disabled="currentlyIsReadonly"

resources/js/composables/useActions.js

@@ -100,7 +100,6 @@ public function resolveFields(NovaRequest $request)
             ->each(function (Field $field) use ($request) {
                 $field
                     ->compact()
-//                    ->fullWidth()
                     ->resolve($this->data, $field->attribute);
 
                 if (\is_null($field->value) && empty($this->data)) {
@@ -109,6 +108,20 @@ public function resolveFields(NovaRequest $request)
             });
     }
 
+    /**
+     * Resolve the values of the fields in the Repeatable.
+     *
+     * @return \Laravel\Nova\Fields\FieldCollection
+     */
+    public function resolveFieldsForDisplay(NovaRequest $request)
+    {
+        return FieldCollection::make($this->fields($request))
+            ->withoutMissingValues()
+            ->each(function (Field $field) {
+                $field->compact()->resolveForDisplay($this->data, $field->attribute);
+            });
+    }
+
     /**
      * Get the fields displayed by the block.
      *
@@ -151,14 +164,18 @@ public function setData($data): Repeatable
     #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
-        $request = app(NovaRequest::class);
+        $fields = with(app(NovaRequest::class), function ($request) {
+            return $request->isFormRequest()
+                ? $this->resolveFields($request)
+                : $this->resolveFieldsForDisplay($request);
+        });
 
         return [
             'icon' => static::$icon,
             'label' => static::label(),
             'singularLabel' => static::singularLabel(),
             'type' => static::key(),
-            'fields' => $this->resolveFields($request),
+            'fields' => $fields,
             'confirmBeforeRemoval' => $this->confirmRemoval,
         ];
     }

resources/js/fields/Form/BooleanField.vue

@@ -140,6 +140,9 @@ public function __construct()
     {
         $this->username = Fortify::username();
         $this->email = Fortify::email();
+
+        $this->cachedConfig = config('fortify', []);
+        $this->cachedOptionsConfig = config('fortify-options', []);
     }
 
     /**
@@ -150,13 +153,8 @@ public function __construct()
      */
     public function features(Closure|array|null $features = null)
     {
-        $this->cachedConfig = config('fortify', []);
-        $this->cachedOptionsConfig = config('fortify-options', []);
-
         if (! \is_null($features)) {
-            $this->features = collect(Arr::wrap(value($features)))->merge(array_filter([
-                Nova::routes()->withPasswordReset ? Features::resetPasswords() : null,
-            ]))->unique()->all();
+            $this->features = Arr::wrap(value($features));
 
             $this->options = config('fortify-options');
         }
@@ -328,10 +326,12 @@ public function flush(): void
     public function register(?bool $routes = null): void
     {
         if (\is_null($routes)) {
-            $routes = Util::isFortifyRoutesRegisteredForFrontend();
+            $routes = Fortify::$registersRoutes === true
+                ? Util::isFortifyRoutesRegisteredForFrontend()
+                : false;
         }
 
-        if ($routes === false) {
+        if ($routes === false && Fortify::$registersRoutes === true) {
             Fortify::ignoreRoutes();
         }
 
@@ -346,6 +346,11 @@ public function bootstrap(): void
         /** @var \Laravel\Nova\PendingRouteRegistration $routes */
         $routes = Nova::routes();
 
+        $this->features = collect($this->features ?? [])->merge(array_filter([
+            $routes->withPasswordReset ? Features::resetPasswords() : null,
+            $routes->withEmailVerification ? Features::emailVerification() : null,
+        ]))->unique()->all();
+
         Nova::serving(function (ServingNova $event) use ($routes) {
             $this->sync();