From 30bf8f5286ad6dca4cff80d6021f0bac85843750 Mon Sep 17 00:00:00 2001
From: danielstorey <danielstorey@gmail.com>
Date: Wed, 11 Sep 2024 19:47:25 +0100
Subject: [PATCH] fix: listbox options and inputs layout and styling

---
 src/components/InputAffix/InputAffix.vue     |  2 +-
 src/components/Listbox/Listbox.vue           | 62 +++++++-------------
 src/components/NumericInput/NumericInput.vue |  2 +-
 src/components/TextArea/TextArea.vue         |  2 +-
 src/components/TextInput/TextInput.vue       |  2 +-
 src/composables/styles.js                    |  2 +-
 6 files changed, 27 insertions(+), 45 deletions(-)

diff --git a/src/components/InputAffix/InputAffix.vue b/src/components/InputAffix/InputAffix.vue
index 5d3ff8e..0901032 100644
--- a/src/components/InputAffix/InputAffix.vue
+++ b/src/components/InputAffix/InputAffix.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="concrete__input-affix h-full relative inline-flex items-center text-inherit px-3 border border-inherit whitespace-nowrap bg-black bg-opacity-[0.03]"
+  <div class="concrete__input-affix relative inline-flex items-center text-inherit px-3 border border-inherit whitespace-nowrap bg-black bg-opacity-[0.03]"
        :class="[sizeClass, typeClass, userClass]">
     <slot />
   </div>
diff --git a/src/components/Listbox/Listbox.vue b/src/components/Listbox/Listbox.vue
index 4ab640d..e16766d 100644
--- a/src/components/Listbox/Listbox.vue
+++ b/src/components/Listbox/Listbox.vue
@@ -25,7 +25,7 @@
       <div :class="['relative', disabledClass]">
         <div class="inline-flex w-full">
           <div
-            class="relative z-0 inline-flex w-full items-center"
+            class="relative z-0 inline-flex w-full"
             :class="inputColorClass"
           >
             <CInputAffix v-if="prefix" type="prefix" v-html="prefix" />
@@ -41,7 +41,7 @@
                 cursorClass,
                 open && 'border-indigo-light',
               ]"
-              class="!flex items-center"
+              class="!flex items-center pr-8"
             >
               <slot name="buttonPrefix" />
               <span
@@ -51,21 +51,8 @@
                 {{ selectedLabel || placeholder }}
               </span>
 
-              <span
-                class="
-                  absolute
-                  inset-y-0
-                  right-0
-                  flex
-                  items-center
-                  pr-2
-                  pointer-events-none
-                "
-              >
-                <ChevronUpDownIcon
-                  :class="[iconColorClass, iconSizeClass]"
-                  aria-hidden="true"
-                />
+              <span class=" absolute inset-y-0 right-0 flex items-center pr-2 pointer-events-none">
+                <ChevronUpDownIcon :class="[iconColorClass, iconSizeClass]" aria-hidden="true"  />
               </span>
             </ListboxButton>
             <input type="hidden" :value="selectedLabel" data-selected />
@@ -121,7 +108,7 @@
                     name="optionPrefix"
                     :option="option"
                   />
-                  {{ option.label }}
+                  {{ formatter(option.label || option.value) }}
                 </div>
               </li>
             </ListboxOption>
@@ -202,6 +189,10 @@ const isDirty = ref(false);
 const localValue = ref(null);
 const buttonRef = ref(null);
 
+const formatter = (value) => {
+  return props.formatter ? props.formatter(value) : value;
+}
+
 const selectedValue = computed({
   get() {
     return getInputValue(props);
@@ -214,6 +205,14 @@ const selectedValue = computed({
   },
 });
 
+const getOptionFromValue = (value) => {
+  const item = localOptions.value.find((option) => {
+    return isEqual(option.value, value);
+  });
+
+  return formatter(item?.label);
+}
+
 const isDisabled = computed(() => {
   return props.disabled || !localOptions.value.length;
 });
@@ -228,41 +227,24 @@ const localOptions = computed(() => {
   const options = getInputIdToOptions(props);
 
   return options.map((option) => {
-    const opt = isPlainObject(option)
+    return isPlainObject(option)
       ? option
       : { label: option, value: option };
-    return props.formatter
-      ? { ...opt, label: props.formatter(opt.label || opt.value) }
-      : opt;
   });
 });
 
 const selectedLabel = computed(() => {
   let sv = selectedValue.value;
-  const { formatter } = props;
 
   if (!props.multiple) {
-    if (formatter) {
-      return formatter(sv);
-    } else {
-      return isPlainObject(sv) ? sv.label : sv;
-    }
+    return getOptionFromValue(sv);
   }
 
   const arrVal = Array.isArray(sv) ? sv : [sv];
-  const labels = arrVal
+  return arrVal
     .filter((selectedItem) => selectedItem != null)
-    .map((selectedItem) => {
-      const item = localOptions.value.find((option) => {
-        return isEqual(option.value, selectedItem);
-      });
-
-      if (!item) return;
-
-      return formatter ? formatter(item) : item.label;
-    });
-
-  return labels.join(', ');
+    .map(getOptionFromValue)
+    .join(', ');
 });
 
 const optionsSizeClass = {
diff --git a/src/components/NumericInput/NumericInput.vue b/src/components/NumericInput/NumericInput.vue
index 462db68..22c56dd 100644
--- a/src/components/NumericInput/NumericInput.vue
+++ b/src/components/NumericInput/NumericInput.vue
@@ -16,7 +16,7 @@
     }"
     :class="inputColorClass"
   >
-    <div class="flex w-full h-full relative concrete__numeric-input" :class="[inputColorClass, disabledClass]">
+    <div class="flex w-full relative concrete__numeric-input" :class="[inputColorClass, disabledClass]">
       <CInputAffix v-if="prefix" type="prefix" v-html="prefix" />
       <slot name="prefix" class="z-10" />
       <input
diff --git a/src/components/TextArea/TextArea.vue b/src/components/TextArea/TextArea.vue
index 4b90b5b..3bf9b0a 100644
--- a/src/components/TextArea/TextArea.vue
+++ b/src/components/TextArea/TextArea.vue
@@ -15,7 +15,7 @@
     }"
     :class="inputColorClass"
   >
-    <div class="flex w-full h-full" :class="[colorClass, disabledClass]">
+    <div class="flex w-full" :class="[colorClass, disabledClass]">
       <CInputAffix v-if="prefix" type="prefix" v-html="prefix" />
       <slot name="prefix" class="z-10"/>
       <textarea
diff --git a/src/components/TextInput/TextInput.vue b/src/components/TextInput/TextInput.vue
index 3140319..87623de 100644
--- a/src/components/TextInput/TextInput.vue
+++ b/src/components/TextInput/TextInput.vue
@@ -16,7 +16,7 @@
     }"
     :class="inputColorClass"
   >
-    <div class="flex w-full h-full concrete__text-input" :class="[inputColorClass, disabledClass]">
+    <div class="flex w-full concrete__text-input" :class="[inputColorClass, disabledClass]">
       <CInputAffix v-if="prefix" type="prefix" v-html="prefix" />
       <slot name="prefix" class="z-10"/>
 
diff --git a/src/composables/styles.js b/src/composables/styles.js
index 62a6502..4978962 100644
--- a/src/composables/styles.js
+++ b/src/composables/styles.js
@@ -41,7 +41,7 @@ export const useInputColorClassValue = (props) => {
   const status = useConcreteForms().getInputStatus(props);
 
   return computed(() => {
-    return colorClassMap[status.value?.color]
+    return colorClassMap[status.value?.color] || colorClassMap.default;
   });
 }