5.5.3

Author: laravelwebdev

composer.json

@@ -170,5 +170,5 @@
   },
   "minimum-stability": "dev",
   "prefer-stable": true,
-  "version": "5.5.2"
+  "version": "5.5.3"
 }

package-lock.json

@@ -41,7 +41,7 @@
     "@floating-ui/vue": "^1.1.6",
     "@headlessui/vue": "^1.7.23",
     "@heroicons/vue": "^2.2.0",
-    "@inertiajs/vue3": "^2.0.7",
+    "@inertiajs/vue3": "^2.0.8",
     "@popperjs/core": "^2.11.8",
     "@vue/compat": "^3.5.13",
     "@vueuse/core": "^10.11.1",

package.json

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

public/app.js

@@ -32,23 +32,26 @@ export default {
   created() {
     this.field.value = this.field.value || {}
 
-    this.value = this.field.options
-      .filter(o => {
-        if (this.field.hideFalseValues === true && o.checked === false) {
-          return false
-        } else if (this.field.hideTrueValues === true && o.checked === true) {
-          return false
-        }
+    const hideTrueValues = this.field.hideTrueValues
+    const hideFalseValues = this.field.hideFalseValues
 
-        return true
-      })
+    this.value = this.field.options
       .map(o => {
         return {
           name: o.name,
           label: o.label,
           checked: this.field.value[o.name] || false,
         }
       })
+      .filter(o => {
+        if (hideFalseValues === true && o.checked === false) {
+          return false
+        } else if (hideTrueValues === true && o.checked === true) {
+          return false
+        }
+
+        return true
+      })
   },
 }
 </script>

public/mix-manifest.json

@@ -20,7 +20,7 @@
           </ul>
           <span
             v-else
-            class="max-w-xxs space-2 py-3 px-4 rounded-full text-sm leading-tight"
+            class="block max-w-xxs space-2 my-3 mx-4 rounded-full text-sm leading-tight"
           >
             {{ field.noValueText }}
           </span>
@@ -51,23 +51,26 @@ export default {
   created() {
     this.field.value = this.field.value || {}
 
-    this.value = this.field.options
-      .filter(o => {
-        if (this.field.hideFalseValues === true && o.checked === false) {
-          return false
-        } else if (this.field.hideTrueValues === true && o.checked === true) {
-          return false
-        }
+    const hideTrueValues = this.field.hideTrueValues
+    const hideFalseValues = this.field.hideFalseValues
 
-        return true
-      })
+    this.value = this.field.options
       .map(o => {
         return {
           name: o.name,
           label: o.label,
           checked: this.field.value[o.name] || false,
         }
       })
+      .filter(o => {
+        if (hideFalseValues === true && o.checked === false) {
+          return false
+        } else if (hideTrueValues === true && o.checked === true) {
+          return false
+        }
+
+        return true
+      })
   },
 }
 </script>

resources/js/fields/Detail/BooleanGroupField.vue

@@ -228,7 +228,7 @@ export default class Nova {
         const page =
           this.pages[name] != null
             ? this.pages[name]
-            : require('@/pages/Error404').default
+            : require('@/pages/Loading').default
 
         page.layout = page.layout || Layout
 

resources/js/fields/Index/BooleanGroupField.vue

@@ -0,0 +1,12 @@
+<template>
+  <LoadingView />
+</template>
+
+<script setup>
+import Guest from '@/layouts/Guest'
+
+defineOptions({
+  name: 'AppLoadingPage',
+  layout: Guest,
+})
+</script>

resources/js/nova.js

@@ -2,6 +2,7 @@
 
 namespace Laravel\Nova\Fields;
 
+use Closure;
 use Illuminate\Support\Arr;
 use Laravel\Nova\Contracts\FilterableField;
 use Laravel\Nova\Fields\Filters\BooleanGroupFilter;
@@ -10,6 +11,11 @@
 use Laravel\Nova\Util;
 use Stringable;
 
+/**
+ * @phpstan-type TOptionLabel \Stringable|string
+ * @phpstan-type TOptionValue string
+ * @phpstan-type TOption iterable<TOptionValue|int, TOptionLabel>
+ */
 class BooleanGroup extends Field implements FilterableField
 {
     use FieldFilterable;
@@ -37,11 +43,13 @@ class BooleanGroup extends Field implements FilterableField
     public $noValueText = 'No Data';
 
     /**
-     * The options for the field.
+     * The field's options callback.
      *
-     * @var array|null
+     * @var iterable<string|int, string>|callable|null
+     *
+     * @phpstan-var TOption|(callable(): (TOption))|null
      */
-    public $options = null;
+    public $optionsCallback;
 
     /**
      * Determine false values should be hidden.
@@ -65,11 +73,26 @@ class BooleanGroup extends Field implements FilterableField
      */
     public function options(callable|iterable $options)
     {
-        if (Util::isSafeCallable($options)) {
-            $options = \call_user_func($options);
-        }
+        $this->optionsCallback = $options;
 
-        $this->options = with(collect($options), static function ($options) {
+        return $this;
+    }
+
+    /**
+     * Serialize options for the field.
+     *
+     * @return array<int, array<string, mixed>>
+     *
+     * @phpstan-return array<int, array{label: string, value: string}>
+     */
+    protected function serializeOptions(): array
+    {
+        /** @var TOption $options */
+        $options = ! Util::isSafeCallable($this->optionsCallback) && ! $this->optionsCallback instanceof Closure
+            ? value($this->optionsCallback)
+            : \call_user_func($this->optionsCallback);
+
+        return with(collect($options), static function ($options) {
             $isList = array_is_list($options->all());
 
             return $options->map(static function ($label, $name) use ($isList) {
@@ -78,8 +101,6 @@ public function options(callable|iterable $options)
                     : ['label' => $label, 'name' => $label];
             })->values()->all();
         });
-
-        return $this;
     }
 
     /**
@@ -188,7 +209,7 @@ public function jsonSerialize(): array
         return array_merge(parent::jsonSerialize(), [
             'hideTrueValues' => $this->hideTrueValues,
             'hideFalseValues' => $this->hideFalseValues,
-            'options' => $this->options,
+            'options' => $this->serializeOptions(),
             'noValueText' => Nova::__($this->noValueText),
         ]);
     }