From ea1f196ef63e0d5206c81e62832d062317d9df3a Mon Sep 17 00:00:00 2001
From: Benjamin Canac <canacb1@gmail.com>
Date: Tue, 23 Nov 2021 13:09:12 +0100
Subject: [PATCH] chore: update components

---
 src/components/elements/Avatar.vue   |  14 +--
 src/components/elements/Dropdown.vue |   2 +-
 src/components/forms/Textarea.vue    | 168 ++++++++++++++-------------
 src/components/overlays/Popover.vue  |   2 +-
 src/components/overlays/Tooltip.vue  | 155 +++++++++---------------
 5 files changed, 146 insertions(+), 195 deletions(-)

diff --git a/src/components/elements/Avatar.vue b/src/components/elements/Avatar.vue
index 6955a47b..e6c230df 100644
--- a/src/components/elements/Avatar.vue
+++ b/src/components/elements/Avatar.vue
@@ -2,15 +2,11 @@
   <span class="relative inline-flex items-center justify-center" :class="avatarClass" @click="goto">
     <img v-if="url" :src="url" :alt="alt" :class="[sizeClass, roundedClass]">
     <!-- eslint-disable-next-line vue/no-v-html -->
-    <span v-else-if="gradientPlaceholder" class="w-full h-full" v-html="gradientPlaceholder" />
+    <span v-else-if="gradientPlaceholder" class="w-full h-full overflow-hidden" :class="roundedClass" v-html="gradientPlaceholder" />
     <span
       v-else-if="placeholder"
-      class="font-bold leading-none text-white uppercase"
+      class="font-medium leading-none text-white uppercase"
     >{{ placeholder }}</span>
-    <span
-      v-else-if="text"
-      class="leading-snug"
-    >{{ text }}</span>
     <svg
       v-else
       class="w-full h-full text-tw-gray-300"
@@ -40,10 +36,6 @@ export default {
       type: [String, Boolean],
       default: null
     },
-    text: {
-      type: String,
-      default: null
-    },
     alt: {
       type: String,
       default: null
@@ -117,7 +109,7 @@ export default {
     },
     placeholderClass () {
       return ({
-        true: 'bg-tw-white',
+        true: 'bg-tw-gray-500',
         false: 'bg-tw-gray-100'
       })[!!this.alt]
     },
diff --git a/src/components/elements/Dropdown.vue b/src/components/elements/Dropdown.vue
index dceb725e..647a1fc7 100644
--- a/src/components/elements/Dropdown.vue
+++ b/src/components/elements/Dropdown.vue
@@ -64,7 +64,7 @@ export default {
     },
     strategy: {
       type: String,
-      default: 'absolute'
+      default: 'fixed'
     },
     wrapperClass: {
       type: String,
diff --git a/src/components/forms/Textarea.vue b/src/components/forms/Textarea.vue
index c04108d4..da46c3d3 100644
--- a/src/components/forms/Textarea.vue
+++ b/src/components/forms/Textarea.vue
@@ -3,26 +3,23 @@
     <textarea
       :id="name"
       ref="textarea"
-      :name="name"
       :value="modelValue"
+      :name="name"
       :rows="rows"
       :required="required"
       :disabled="disabled"
       :placeholder="placeholder"
       :autocomplete="autocomplete"
-      :class="textareaClass"
-      @input="updateValue($event.target.value)"
+      :class="[baseClass, customClass, sizeClass, paddingClass, appearanceClass, resizeClass]"
+      @input="onInput($event.target.value)"
+      @focus="$emit('focus', $event)"
+      @blur="$emit('blur', $event)"
     />
   </div>
 </template>
 
 <script>
-// import Focus from '../../directives/focus'
-
 export default {
-  // directives: {
-  //   focus: Focus
-  // },
   props: {
     modelValue: {
       type: [String, Number],
@@ -48,6 +45,10 @@ export default {
       type: Number,
       default: 3
     },
+    autoresize: {
+      type: Boolean,
+      default: false
+    },
     autofocus: {
       type: Boolean,
       default: false
@@ -63,6 +64,13 @@ export default {
         return ['default', 'none'].includes(value)
       }
     },
+    resize: {
+      type: Boolean,
+      default: null,
+      validator (value) {
+        return ['none'].includes(value)
+      }
+    },
     size: {
       type: String,
       default: 'md',
@@ -70,88 +78,90 @@ export default {
         return ['', 'xxs', 'xs', 'sm', 'md', 'lg', 'xl'].includes(value)
       }
     },
+    wrapperClass: {
+      type: String,
+      default: 'relative'
+    },
     baseClass: {
       type: String,
-      default: 'block w-full bg-tw-white disabled:cursor-not-allowed disabled:bg-tw-gray-50'
+      default: 'block w-full bg-tw-white disabled:cursor-not-allowed disabled:bg-tw-gray-50 focus:outline-none'
     },
     customClass: {
       type: String,
       default: null
-    },
-    noResize: {
-      type: Boolean,
-      default: false
     }
   },
   emits: ['update:modelValue'],
-  computed: {
-    sizeClass () {
-      return ({
-        xxs: 'text-xs',
-        xs: 'text-xs',
-        sm: 'text-sm leading-4',
-        md: 'text-sm',
-        lg: 'text-base',
-        xl: 'text-base'
-      })[this.size]
-    },
-    paddingClass () {
-      return ({
-        xxs: 'px-1 py-0.5',
-        xs: 'px-2.5 py-1.5',
-        sm: 'px-3 py-2',
-        md: 'px-4 py-2',
-        lg: 'px-4 py-2',
-        xl: 'px-6 py-3'
-      })[this.size]
-    },
-    appearanceClass () {
-      return ({
-        default: 'focus:ring-primary-500 focus:border-primary-500 border-tw-gray-300 rounded-md',
-        none: 'border-0 bg-transparent focus:ring-0 focus:shadow-none'
-      })[this.appearance]
-    },
-    resizeClass () {
-      return ({
-        true: 'resize-none',
-        false: ''
-      })[this.noResize]
-    },
-    textareaClass () {
-      return [
-        this.baseClass,
-        this.customClass,
-        this.sizeClass,
-        this.paddingClass,
-        this.resizeClass,
-        this.appearanceClass
-      ].join(' ')
-    },
-    wrapperClass () {
-      return [
-        'relative',
-        this.appearance !== 'none' ? 'shadow-sm' : ''
-      ].filter(Boolean).join(' ')
+  setup (props, { emit }) {
+    const textarea = ref(null)
+
+    const autoFocus = () => {
+      if (props.autofocus) {
+        textarea.value.focus()
+      }
     }
-  },
-  watch: {
-    value () {
-      this.resizeTextarea()
+
+    const autoResize = () => {
+      if (props.autoresize) {
+        const styles = window.getComputedStyle(textarea.value)
+        const paddingTop = parseInt(styles.paddingTop)
+        const paddingBottom = parseInt(styles.paddingBottom)
+        const padding = paddingTop + paddingBottom
+        const initialHeight = (parseInt(styles.height) - padding) / textarea.value.rows
+        const scrollHeight = textarea.value.scrollHeight - padding
+        const newRows = Math.ceil(scrollHeight / initialHeight)
+
+        textarea.value.rows = newRows
+      }
     }
-  },
-  mounted () {
-    this.resizeTextarea()
-  },
-  methods: {
-    resizeTextarea () {
-      this.$nextTick(() => {
-        const textarea = this.$refs.textarea
-        textarea.style.height = 'auto'
-        textarea.style.height = `${textarea.scrollHeight}px`
-      })
-    },
-    updateValue (value) {
-      this.$emit('update:modelValue', value)
+
+    const onInput = (value) => {
+      autoResize()
+
+      emit('update:modelValue', value)
+    }
+
+    onMounted(() => {
+      setTimeout(() => {
+        autoFocus()
+        autoResize()
+      }, 100)
+    })
+
+    const sizeClass = computed(() => ({
+      xxs: 'text-xs',
+      xs: 'text-xs',
+      sm: 'text-sm leading-4',
+      md: 'text-sm',
+      lg: 'text-base',
+      xl: 'text-base'
+    })[props.size])
+
+    const paddingClass = computed(() => ({
+      xxs: 'px-1 py-0.5',
+      xs: 'px-2.5 py-1.5',
+      sm: 'px-3 py-2',
+      md: 'px-4 py-2',
+      lg: 'px-4 py-2',
+      xl: 'px-6 py-3'
+    })[props.size])
+
+    const appearanceClass = computed(() => ({
+      default: 'focus:ring-1 focus:ring-primary-500 focus:border-primary-500 border border-tw-gray-300 rounded-md',
+      none: 'border-0 bg-transparent focus:ring-0 focus:shadow-none'
+    })[props.appearance])
+
+    const resizeClass = computed(() => {
+      return props.resize === 'none' ? 'resize-none' : ''
+    })
+
+    return {
+      textarea,
+      onInput,
+      sizeClass,
+      paddingClass,
+      appearanceClass,
+      resizeClass
     }
   }
 }
diff --git a/src/components/overlays/Popover.vue b/src/components/overlays/Popover.vue
index b480928f..658e342d 100644
--- a/src/components/overlays/Popover.vue
+++ b/src/components/overlays/Popover.vue
@@ -42,7 +42,7 @@ export default {
     },
     strategy: {
       type: String,
-      default: 'absolute'
+      default: 'fixed'
     },
     wrapperClass: {
       type: String,
diff --git a/src/components/overlays/Tooltip.vue b/src/components/overlays/Tooltip.vue
index 6723a649..3d860873 100644
--- a/src/components/overlays/Tooltip.vue
+++ b/src/components/overlays/Tooltip.vue
@@ -14,11 +14,7 @@
       <div
         v-show="show && (text || shortcuts.length || $slots.text)"
         ref="tooltip"
-        class="fixed z-30 flex items-center justify-center invisible w-auto h-6 max-w-xs px-2 space-x-1 truncate rounded shadow lg:visible"
-        :class="{
-          'bg-gray-800': !darken,
-          'bg-gray-900': darken
-        }"
+        class="fixed z-30 flex bg-gray-800 items-center justify-center invisible w-auto h-6 max-w-xs px-2 space-x-1 truncate rounded shadow lg:visible"
       >
         <span v-if="text || $slots.text" class="truncate text-gray-50 text-xxs">
           <slot name="text">{{ text }}</slot>
@@ -43,113 +39,66 @@
 </template>
 
 <script>
-import { createPopper } from '@popperjs/core'
-// import { directive as onClickaway } from 'vue-clickaway'
+import { Popover, PopoverButton, PopoverPanel } from '@headlessui/vue'
+
+import { usePopper } from '../../utils'
 
 export default {
-  // directives: {
-  //   onClickaway
-  // },
+  components: {
+    Popover,
+    PopoverButton,
+    PopoverPanel
+  },
   props: {
-    text: {
-      type: String,
-      default: null
-    },
-    shortcuts: {
-      type: Array,
-      default: () => []
-    },
-    darken: {
-      type: Boolean,
-      default: false
-    },
-    openDelay: {
-      type: Number,
-      default: 0
-    },
-    closeDelay: {
-      type: Number,
-      default: 100
-    },
     placement: {
       type: String,
       default: 'bottom'
+    },
+    strategy: {
+      type: String,
+      default: 'absolute'
+    },
+    wrapperClass: {
+      type: String,
+      default: 'relative'
+    },
+    tooltipClass: {
+      type: String,
+      default: 'z-10'
+    },
+    label: {
+      type: String,
+      default: ''
     }
   },
-  data () {
+  setup (props) {
+    const [trigger, container] = usePopper({
+      placement: props.placement,
+      strategy: props.strategy,
+      modifiers: [{
+        name: 'offset',
+        options: {
+          offset: [0, 8]
+        }
+      },
+      {
+        name: 'computeStyles',
+        options: {
+          gpuAcceleration: false,
+          adaptive: false
+        }
+      },
+      {
+        name: 'preventOverflow',
+        options: {
+          padding: 8
+        }
+      }]
+    })
+
     return {
-      show: false,
-      instance: null,
-      openTimeout: null,
-      closeTimeout: null
-    }
-  },
-  watch: {
-    show (value) {
-      if (!value) {
-        return
-      }
-
-      if (this.instance) {
-        this.instance.destroy()
-        this.instance = null
-      }
-
-      this.instance = createPopper(this.$refs.container, this.$refs.tooltip, {
-        strategy: 'fixed',
-        placement: this.placement,
-        modifiers: [
-          {
-            name: 'offset',
-            options: {
-              offset: [0, 8]
-            }
-          },
-          {
-            name: 'computeStyles',
-            options: {
-              gpuAcceleration: false,
-              adaptive: false
-            }
-          },
-          {
-            name: 'preventOverflow',
-            options: {
-              padding: 8
-            }
-          }
-        ]
-      })
-    }
-  },
-  beforeDestroy () {
-    if (this.instance) {
-      this.instance.destroy()
-      this.instance = null
-    }
-  },
-  methods: {
-    mouseover () {
-      clearTimeout(this.closeTimeout)
-      this.closeTimeout = null
-      this.openTimeout = this.openTimeout || setTimeout(() => {
-        this.open()
-        this.openTimeout = null
-      }, this.openDelay)
-    },
-    mouseleave () {
-      clearTimeout(this.openTimeout)
-      this.openTimeout = null
-      this.closeTimeout = this.closeTimeout || setTimeout(() => {
-        this.close()
-        this.closeTimeout = null
-      }, this.closeDelay)
-    },
-    open () {
-      this.show = true
-    },
-    close () {
-      this.show = false
+      trigger,
+      container
     }
   }
 }