Merge remote-tracking branch 'origin/main' into develop

# Conflicts:
#	COMPONENTS.md

app/components/malio/input/InputAmount.vue

@@ -1,67 +1,69 @@
 <template>
-  <div
+  <div>
-    :class="mergedGroupClass"
+    <div
-  >
+      :class="mergedGroupClass"
-    <input
-      :id="inputId"
-      :name="name"
-      :autocomplete="autocomplete"
-      :class="mergedInputClass"
-      :required="required"
-      :maxlength="maxLength"
-      :minlength="minLength"
-      :disabled="disabled"
-      :value="currentValue"
-      :readonly="readonly"
-      :aria-invalid="!!error"
-      :aria-describedby="describedBy"
-      v-bind="attrs"
-      type="text"
-      inputmode="decimal"
-      placeholder="_"
-      @input="onInput"
-      @focus="isFocused = true"
-      @blur="onBlur"
     >
+      <input
+        :id="inputId"
+        :name="name"
+        :autocomplete="autocomplete"
+        :class="mergedInputClass"
+        :required="required"
+        :maxlength="maxLength"
+        :minlength="minLength"
+        :disabled="disabled"
+        :value="currentValue"
+        :readonly="readonly"
+        :aria-invalid="!!error"
+        :aria-describedby="describedBy"
+        v-bind="attrs"
+        type="text"
+        inputmode="decimal"
+        placeholder="_"
+        @input="onInput"
+        @focus="isFocused = true"
+        @blur="onBlur"
+      >
 
-    <label
+      <label
-      v-if="label"
+        v-if="label"
-      :for="inputId"
+        :for="inputId"
-      :class="mergedLabelClass"
+        :class="mergedLabelClass"
-    >
+      >
-      {{ label }}
+        {{ label }}
-    </label>
+      </label>
 
-    <IconifyIcon
+      <IconifyIcon
-      v-if="iconName"
+        v-if="iconName"
-      :icon="iconName"
+        :icon="iconName"
-      :width="iconSize"
+        :width="iconSize"
-      :height="iconSize"
+        :height="iconSize"
-      data-test="icon"
+        data-test="icon"
-      :class="[
+        :class="[
-      hasError
-        ? 'text-m-danger'
-        : hasSuccess
-          ? 'text-m-success' : iconColor,
-      iconPositionClass,
-    ]"
-    />
-
-  </div>
-  <p
-    v-if="hint || hasError || hasSuccess"
-    :id="`${inputId}-describedby`"
-    :class="[
         hasError
           ? 'text-m-danger'
           : hasSuccess
-            ? 'text-m-success'
+            ? 'text-m-success' : iconColor,
-            : 'text-m-muted',
+        iconPositionClass,
-        'mt-1 text-xs ml-[2px] ',
       ]"
-  >
+      />
-    {{ hint || error || success }}
+
-  </p>
+    </div>
+    <p
+      v-if="hint || hasError || hasSuccess"
+      :id="`${inputId}-describedby`"
+      :class="[
+          hasError
+            ? 'text-m-danger'
+            : hasSuccess
+              ? 'text-m-success'
+              : 'text-m-muted',
+          'mt-1 text-xs ml-[2px] ',
+        ]"
+    >
+      {{ hint || error || success }}
+    </p>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -133,7 +135,7 @@ const isFilled = computed(() => currentValue.value.trim().length > 0)
 
 const mergedGroupClass = computed(() =>
   twMerge(
-    'relative mt-4 flex h-12 w-full items-center',
+    'relative flex h-12 w-full items-center',
     props.groupClass,
   ),
 )

app/components/malio/input/InputNumber.vue

@@ -1,68 +1,70 @@
 <template>
-  <div :class="mergedGroupClass" >
+  <div>
-    <label
+    <div :class="mergedGroupClass" >
-      v-if="label"
+      <label
-      :for="inputId"
+        v-if="label"
-      :class="mergedLabelClass"
+        :for="inputId"
-    >
+        :class="mergedLabelClass"
-      {{ label }}
+      >
-    </label>
+        {{ label }}
-    <button
+      </label>
-      type="button"
+      <button
-      :disabled="isMinusDisabled"
+        type="button"
-      @click="decrement"
+        :disabled="isMinusDisabled"
-    >
+        @click="decrement"
-      <IconifyIcon
+      >
-        icon="mdi:minus"
+        <IconifyIcon
-        :class="mergedButtonMinusClass"
+          icon="mdi:minus"
-      />
+          :class="mergedButtonMinusClass"
-    </button>
+        />
-    <input
+      </button>
-      :id="inputId"
+      <input
-      :name="name"
+        :id="inputId"
-      autocomplete="off"
+        :name="name"
-      :class="mergedInputClass"
+        autocomplete="off"
-      :style="inputWidthStyle"
+        :class="mergedInputClass"
-      :value="displayedValue"
+        :style="inputWidthStyle"
-      :required="required"
+        :value="displayedValue"
-      :disabled="disabled"
+        :required="required"
-      :readonly="readonly"
+        :disabled="disabled"
-      :aria-invalid="!!error"
+        :readonly="readonly"
-      :aria-describedby="describedBy"
+        :aria-invalid="!!error"
-      v-bind="attrs"
+        :aria-describedby="describedBy"
-      type="text"
+        v-bind="attrs"
-      inputmode="numeric"
+        type="text"
-      placeholder="_"
+        inputmode="numeric"
-      @input="onInput"
+        placeholder="_"
-      @focus="isFocused = true"
+        @input="onInput"
-      @blur="isFocused = false"
+        @focus="isFocused = true"
-    >
+        @blur="isFocused = false"
-    <button
+      >
-      type="button"
+      <button
-      :disabled="isPlusDisabled"
+        type="button"
-      @click="increment"
+        :disabled="isPlusDisabled"
-    >
+        @click="increment"
-      <IconifyIcon
+      >
-        icon="mdi:plus"
+        <IconifyIcon
-        :class="mergedButtonPlusClass"
+          icon="mdi:plus"
-      />
+          :class="mergedButtonPlusClass"
-    </button>
+        />
+      </button>
 
+    </div>
+    <p
+      v-if="hint || hasError || hasSuccess"
+      :id="`${inputId}-describedby`"
+      :class="[
+          hasError
+            ? 'text-m-danger'
+            : hasSuccess
+              ? 'text-m-success'
+              : 'text-m-muted',
+          'text-xs ml-[2px] ',
+        ]"
+    >
+      {{ hint || error || success }}
+    </p>
   </div>
-  <p
-    v-if="hint || hasError || hasSuccess"
-    :id="`${inputId}-describedby`"
-    :class="[
-        hasError
-          ? 'text-m-danger'
-          : hasSuccess
-            ? 'text-m-success'
-            : 'text-m-muted',
-        'text-xs ml-[2px] ',
-      ]"
-  >
-    {{ hint || error || success }}
-  </p>
 </template>
 
 <script setup lang="ts">
@@ -170,7 +172,7 @@ const isPlusDisabled = computed(() =>
 
 const mergedGroupClass = computed(() =>
   twMerge(
-    'relative mt-4 flex h-12 w-full items-center',
+    'relative flex h-12 w-full items-center',
     props.groupClass,
   ),
 )

app/components/malio/input/InputPassword.vue

@@ -1,67 +1,69 @@
 <template>
-  <div
+  <div>
-    :class="mergedGroupClass"
+    <div
-  >
+      :class="mergedGroupClass"
-    <input
-      :id="inputId"
-      :name="name"
-      :autocomplete="autocomplete"
-      :class="mergedInputClass"
-      :required="required"
-      :maxlength="maxLength"
-      :minlength="minLength"
-      :disabled="disabled"
-      :value="currentValue"
-      :readonly="readonly"
-      :aria-invalid="!!error"
-      :aria-describedby="describedBy"
-      v-bind="attrs"
-      placeholder="_"
-      :type="isPasswordVisible ? 'text' : 'password'"
-      @input="onInput"
-      @focus="isFocused = true"
-      @blur="isFocused = false"
     >
+      <input
+        :id="inputId"
+        :name="name"
+        :autocomplete="autocomplete"
+        :class="mergedInputClass"
+        :required="required"
+        :maxlength="maxLength"
+        :minlength="minLength"
+        :disabled="disabled"
+        :value="currentValue"
+        :readonly="readonly"
+        :aria-invalid="!!error"
+        :aria-describedby="describedBy"
+        v-bind="attrs"
+        placeholder="_"
+        :type="isPasswordVisible ? 'text' : 'password'"
+        @input="onInput"
+        @focus="isFocused = true"
+        @blur="isFocused = false"
+      >
 
-    <label
+      <label
-      v-if="label"
+        v-if="label"
-      :for="inputId"
+        :for="inputId"
-      :class="mergedLabelClass"
+        :class="mergedLabelClass"
-    >
+      >
-      {{ label }}
+        {{ label }}
-    </label>
+      </label>
 
-    <IconifyIcon
+      <IconifyIcon
-      v-if="displayIcon"
+        v-if="displayIcon"
-      :icon="isPasswordVisible ? 'mdi:eye-outline' : 'mdi:eye-off-outline'"
+        :icon="isPasswordVisible ? 'mdi:eye-outline' : 'mdi:eye-off-outline'"
-      :width="24"
+        :width="24"
-      :height="24"
+        :height="24"
-      data-test="icon"
+        data-test="icon"
-      :class="[
+        :class="[
-      hasError
-        ? 'text-m-danger'
-        : hasSuccess
-          ? 'text-m-success' : 'text-m-muted',
-      'cursor-pointer absolute right-[10px] top-1/2 -translate-y-1/2',
-    ]"
-      @click="toggleVisibility"
-    />
-
-  </div>
-  <p
-    v-if="hint || hasError || hasSuccess"
-    :id="`${inputId}-describedby`"
-    :class="[
         hasError
           ? 'text-m-danger'
           : hasSuccess
-            ? 'text-m-success'
+            ? 'text-m-success' : 'text-m-muted',
-            : 'text-m-muted',
+        'cursor-pointer absolute right-[10px] top-1/2 -translate-y-1/2',
-        'mt-1 text-xs ml-[2px] ',
       ]"
-  >
+        @click="toggleVisibility"
-    {{ hint || error || success }}
+      />
-  </p>
+
+    </div>
+    <p
+      v-if="hint || hasError || hasSuccess"
+      :id="`${inputId}-describedby`"
+      :class="[
+          hasError
+            ? 'text-m-danger'
+            : hasSuccess
+              ? 'text-m-success'
+              : 'text-m-muted',
+          'mt-1 text-xs ml-[2px] ',
+        ]"
+    >
+      {{ hint || error || success }}
+    </p>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -132,7 +134,7 @@ const hasSuccess = computed(() => !!props.success)
 const isFilled = computed(() => currentValue.value.trim().length > 0)
 const mergedGroupClass = computed(() =>
   twMerge(
-    'relative mt-4 flex h-12 w-full items-center',
+    'relative flex h-12 w-full items-center',
     props.groupClass,
   ),
 )

app/components/malio/input/InputText.vue

@@ -1,67 +1,69 @@
 <template>
-  <div
+  <div>
-    :class="mergedGroupClass"
+    <div
-  >
+      :class="mergedGroupClass"
-    <input
-      :id="inputId"
-      v-maska="mask"
-      :name="name"
-      :autocomplete="autocomplete"
-      :class="mergedInputClass"
-      :required="required"
-      :maxlength="maxLength"
-      :minlength="minLength"
-      :disabled="disabled"
-      :value="currentValue"
-      :readonly="readonly"
-      :aria-invalid="!!error"
-      :aria-describedby="describedBy"
-      v-bind="attrs"
-      placeholder="_"
-      type="text"
-      @input="onInput"
-      @focus="isFocused = true"
-      @blur="isFocused = false"
     >
+      <input
+        :id="inputId"
+        v-maska="mask"
+        :name="name"
+        :autocomplete="autocomplete"
+        :class="mergedInputClass"
+        :required="required"
+        :maxlength="maxLength"
+        :minlength="minLength"
+        :disabled="disabled"
+        :value="currentValue"
+        :readonly="readonly"
+        :aria-invalid="!!error"
+        :aria-describedby="describedBy"
+        v-bind="attrs"
+        placeholder="_"
+        type="text"
+        @input="onInput"
+        @focus="isFocused = true"
+        @blur="isFocused = false"
+      >
 
-    <label
+      <label
-      v-if="label"
+        v-if="label"
-      :for="inputId"
+        :for="inputId"
-      :class="mergedLabelClass"
+        :class="mergedLabelClass"
-    >
+      >
-      {{ label }}
+        {{ label }}
-    </label>
+      </label>
 
-    <IconifyIcon
+      <IconifyIcon
-      v-if="iconName"
+        v-if="iconName"
-      :icon="iconName"
+        :icon="iconName"
-      :width="iconSize"
+        :width="iconSize"
-      :height="iconSize"
+        :height="iconSize"
-      data-test="icon"
+        data-test="icon"
-      :class="[
+        :class="[
-      hasError
-        ? 'text-m-danger'
-        : hasSuccess
-          ? 'text-m-success' : iconColor,
-      iconPositionClass,
-    ]"
-    />
-
-  </div>
-  <p
-    v-if="hint || hasError || hasSuccess"
-    :id="`${inputId}-describedby`"
-    :class="[
         hasError
           ? 'text-m-danger'
           : hasSuccess
-            ? 'text-m-success'
+            ? 'text-m-success' : iconColor,
-            : 'text-m-muted',
+        iconPositionClass,
-        'mt-1 text-xs ml-[2px] ',
       ]"
-  >
+      />
-    {{ hint || error || success }}
+
-  </p>
+    </div>
+    <p
+      v-if="hint || hasError || hasSuccess"
+      :id="`${inputId}-describedby`"
+      :class="[
+          hasError
+            ? 'text-m-danger'
+            : hasSuccess
+              ? 'text-m-success'
+              : 'text-m-muted',
+          'mt-1 text-xs ml-[2px] ',
+        ]"
+    >
+      {{ hint || error || success }}
+    </p>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -138,7 +140,7 @@ const hasSuccess = computed(() => !!props.success)
 const isFilled = computed(() => currentValue.value.trim().length > 0)
 const mergedGroupClass = computed(() =>
   twMerge(
-    'relative mt-4 flex h-12 w-full items-center',
+    'relative flex h-12 w-full items-center',
     props.groupClass,
   ),
 )

app/components/malio/input/InputUpload.vue

@@ -1,70 +1,72 @@
 <template>
-  <div
+  <div>
-    :class="mergedGroupClass"
+    <div
-  >
+      :class="mergedGroupClass"
-    <input
-      ref="fileInputRef"
-      type="file"
-      :accept="accept"
-      class="hidden"
-      :disabled="disabled"
-      @change="onFileChange"
     >
+      <input
+        ref="fileInputRef"
+        type="file"
+        :accept="accept"
+        class="hidden"
+        :disabled="disabled"
+        @change="onFileChange"
+      >
 
-    <input
+      <input
-      :id="inputId"
+        :id="inputId"
-      :class="mergedInputClass"
+        :class="mergedInputClass"
-      :disabled="disabled"
+        :disabled="disabled"
-      :value="currentDisplayValue"
+        :value="currentDisplayValue"
-      :readonly="true"
+        :readonly="true"
-      :aria-invalid="!!error"
+        :aria-invalid="!!error"
-      :aria-describedby="describedBy"
+        :aria-describedby="describedBy"
-      v-bind="attrs"
+        v-bind="attrs"
-      placeholder="_"
+        placeholder="_"
-      type="text"
+        type="text"
-      @click="openFilePicker"
+        @click="openFilePicker"
-      @focus="isFocused = true"
+        @focus="isFocused = true"
-      @blur="isFocused = false"
+        @blur="isFocused = false"
-    >
+      >
 
-    <label
+      <label
-      v-if="label"
+        v-if="label"
-      :for="inputId"
+        :for="inputId"
-      :class="mergedLabelClass"
+        :class="mergedLabelClass"
-    >
+      >
-      {{ label }}
+        {{ label }}
-    </label>
+      </label>
 
-    <IconifyIcon
+      <IconifyIcon
-      v-if="displayIcon"
+        v-if="displayIcon"
-      icon="mdi:cloud-arrow-up-outline"
+        icon="mdi:cloud-arrow-up-outline"
-      :width="24"
+        :width="24"
-      :height="24"
+        :height="24"
-      data-test="icon"
+        data-test="icon"
-      :class="[
+        :class="[
-      hasError
-        ? 'text-m-danger'
-        : hasSuccess
-          ? 'text-m-success' : 'text-m-muted',
-      'pointer-events-none absolute right-[10px] top-1/2 -translate-y-1/2',
-    ]"
-    />
-
-  </div>
-  <p
-    v-if="hint || hasError || hasSuccess"
-    :id="`${inputId}-describedby`"
-    :class="[
         hasError
           ? 'text-m-danger'
           : hasSuccess
-            ? 'text-m-success'
+            ? 'text-m-success' : 'text-m-muted',
-            : 'text-m-muted',
+        'pointer-events-none absolute right-[10px] top-1/2 -translate-y-1/2',
-        'mt-1 text-xs ml-[2px] ',
       ]"
-  >
+      />
-    {{ hint || error || success }}
+
-  </p>
+    </div>
+    <p
+      v-if="hint || hasError || hasSuccess"
+      :id="`${inputId}-describedby`"
+      :class="[
+          hasError
+            ? 'text-m-danger'
+            : hasSuccess
+              ? 'text-m-success'
+              : 'text-m-muted',
+          'mt-1 text-xs ml-[2px] ',
+        ]"
+    >
+      {{ hint || error || success }}
+    </p>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -121,7 +123,7 @@ const hasSuccess = computed(() => !!props.success)
 const isFilled = computed(() => currentDisplayValue.value.trim().length > 0)
 const mergedGroupClass = computed(() =>
   twMerge(
-    'relative mt-4 flex h-12 w-full items-center',
+    'relative flex h-12 w-full items-center',
     props.groupClass,
   ),
 )

app/components/malio/select/Select.vue

@@ -1,8 +1,9 @@
 <template>
-  <div
+  <div>
-    ref="root"
+    <div
-    :class="mergedGroupClass"
+      ref="root"
-  >
+      :class="mergedGroupClass"
+    >
     <button
       :id="buttonId"
       type="button"
@@ -133,21 +134,22 @@
         {{ opt.label || '\u00A0' }}
       </li>
     </ul>
+    </div>
+    <p
+      v-if="hint || hasError || hasSuccess"
+      :id="`${buttonId}-describedby`"
+      :class="[
+        hasError
+          ? 'text-m-danger'
+          : hasSuccess
+            ? 'text-m-success'
+            : 'text-m-muted',
+        'mt-1 ml-[2px] text-xs',
+      ]"
+    >
+      {{ error || success || hint }}
+    </p>
   </div>
-  <p
-    v-if="hint || hasError || hasSuccess"
-    :id="`${buttonId}-describedby`"
-    :class="[
-      hasError
-        ? 'text-m-danger'
-        : hasSuccess
-          ? 'text-m-success'
-          : 'text-m-muted',
-      'mt-1 ml-[2px] text-xs',
-    ]"
-  >
-    {{ error || success || hint }}
-  </p>
 </template>
 
 <script setup lang="ts">
@@ -211,7 +213,7 @@ const normalizedOptions = computed<Option[]>(() => [
   ...props.options,
 ])
 const mergedGroupClass = computed(() =>
-  twMerge('relative mt-4 w-full', props.minWidth, props.maxWidth, props.groupClass),
+  twMerge('relative w-full', props.minWidth, props.maxWidth, props.groupClass),
 )
 const hasError = computed(() => !!props.error)
 const hasSuccess = computed(() => !!props.success && !hasError.value)

app/components/malio/select/SelectCheckbox.vue

@@ -1,9 +1,10 @@
 <template>
-  <div
+  <div>
-    ref="root"
+    <div
-    class="relative mt-4 w-full"
+      ref="root"
-    :class="[minWidth, maxWidth]"
+      class="relative w-full"
-  >
+      :class="[minWidth, maxWidth]"
+    >
     <button
       :id="buttonId"
       type="button"
@@ -184,21 +185,22 @@
         />
       </li>
     </ul>
+    </div>
+    <p
+      v-if="hint || hasError || hasSuccess"
+      :id="`${buttonId}-describedby`"
+      :class="[
+        hasError
+          ? 'text-m-danger'
+          : hasSuccess
+            ? 'text-m-success'
+            : 'text-m-muted',
+        'mt-1 ml-[2px] text-xs',
+      ]"
+    >
+      {{ error || success || hint }}
+    </p>
   </div>
-  <p
-    v-if="hint || hasError || hasSuccess"
-    :id="`${buttonId}-describedby`"
-    :class="[
-      hasError
-        ? 'text-m-danger'
-        : hasSuccess
-          ? 'text-m-success'
-          : 'text-m-muted',
-      'mt-1 ml-[2px] text-xs',
-    ]"
-  >
-    {{ error || success || hint }}
-  </p>
 </template>
 
 <script setup lang="ts">