@d-mok/quasar-app-extension-quasar-axe 2.1.67 → 2.1.69

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@d-mok/quasar-app-extension-quasar-axe",
-    "version": "2.1.67",
+    "version": "2.1.69",
     "description": "A Quasar App Extension",
     "author": "d-mok <49301824+d-mok@users.noreply.github.com>",
     "license": "MIT",

package/src/templates/src/boot/axe/components/QxBtnToggle.vue

@@ -11,12 +11,15 @@ import { computed } from 'vue'
 
 const modelValue = defineModel<T>()
 
-const { options, optionLabel = $ => String($) } = defineProps<{
+const { options, optionLabel } = defineProps<{
     options: T[]
     optionLabel?: (string & keyof T) | ((_: T) => string)
 }>()
 
 let opts = computed(() =>
-    options.map($ => ({ label: String($.pipe(optionLabel)), value: $ }))
+    options.map($ => ({
+        label: String($.pipe(optionLabel ?? ($ => String($)))),
+        value: $,
+    }))
 )
 </script>

package/src/templates/src/boot/axe/components/QxRadio.vue

@@ -11,12 +11,15 @@ import { computed } from 'vue'
 
 let modelValue = defineModel<T>()
 
-const { options, optionLabel = $ => String($) } = defineProps<{
+const { options, optionLabel } = defineProps<{
     options: T[]
     optionLabel?: (string & keyof T) | ((_: T) => string)
 }>()
 
 let opts = computed(() =>
-    options.map($ => ({ label: String($.pipe(optionLabel)), value: $ }))
+    options.map($ => ({
+        label: String($.pipe(optionLabel ?? ($ => String($)))),
+        value: $,
+    }))
 )
 </script>

package/src/templates/src/boot/axe/components/QxSortable.vue

@@ -22,7 +22,9 @@
                 <tr style="cursor: move">
                     <td>{{ index + 1 }}</td>
                     <td>
-                        <b>{{ element.pipe(label) }}</b>
+                        <b>{{
+                            element.pipe(label ?? (($: any) => String($)))
+                        }}</b>
                     </td>
                 </tr>
             </template>
@@ -37,7 +39,7 @@ let modelValue = defineModel<T[]>()
 
 const {
     header,
-    label = $ => String($),
+    label,
     dense = false,
 } = defineProps<{
     header: string

package/src/templates/src/utils/dialog/basic.ts

@@ -151,10 +151,7 @@ export async function askRadio<T>(
         options: {
             model: '',
             type: 'radio',
-            items: items.map($ => ({
-                label: labelFunc($),
-                value: labelFunc($),
-            })),
+            items: values.map($ => ({ label: $, value: $ })),
             isValid: $ => typeof $ === 'string' && values.includes($),
         },
     })