@veritree/ui 0.19.2-9 → 0.20.0-0

package/src/components/Dialog/VTDialogContent.vue

@@ -11,15 +11,13 @@
     <div
       v-show="visible"
       :id="id"
-      :class="{
-        'Dialog-content': headless,
-        'relative m-auto max-h-full max-w-full overflow-auto rounded p-6 focus:outline-none sm:p-10 flex flex-col':
-          !headless,
-        'bg-white': !dark,
-        'bg-fd-600': dark,
-      }"
+      :class="
+        headless
+          ? 'dialog-content'
+          : `relative m-auto flex flex-col overflow-auto rounded bg-white p-4 focus:outline-none lg:p-6 ${classes}`
+      "
       tabindex="-1"
-      @keyup.esc="hide"
+      @keydown.esc.stop="hide"
     >
       <slot></slot>
     </div>
@@ -32,6 +30,13 @@ export default {
 
   inject: ['apiDialog'],
 
+  props: {
+    headless: {
+      type: Boolean,
+      default: false,
+    },
+  },
+
   data() {
     return {
       visible: false,
@@ -43,12 +48,12 @@ export default {
       return `dialog-content-${this.apiDialog().componentId}`;
     },
 
-    dark() {
-      return this.apiDialog().isDark;
+    classes() {
+      return this.full ? 'h-screen w-screen' : 'max-h-full max-w-full';
     },
 
-    headless() {
-      return this.apiDialog().isHeadless;
+    full() {
+      return this.apiDialog().full;
     },
   },
 

package/src/components/Dialog/VTDialogFooter.vue

@@ -1,7 +1,11 @@
 <template>
   <component
     :is="as"
-    :class="{ 'Dialog-footer': headless, 'w-full': !headless }"
+    :class="[
+      headless
+        ? 'dialog-footer'
+        : '-mx-4 -mb-4 flex items-center justify-between gap-x-3 p-4 md:-mx-6 md:-mb-6 md:p-6',
+    ]"
   >
     <slot></slot>
   </component>
@@ -10,24 +14,15 @@
 <script>
 export default {
   name: 'VTDialogFooter',
-
-  inject: ['apiDialog'],
-
   props: {
+    headless: {
+      type: Boolean,
+      default: false,
+    },
     as: {
       type: String,
       default: 'footer',
     },
   },
-
-  computed: {
-    dark() {
-      return this.apiDialog().isDark;
-    },
-
-    headless() {
-      return this.apiDialog().isHeadless;
-    },
-  },
 };
 </script>

package/src/components/Dialog/VTDialogHeader.vue

@@ -2,10 +2,12 @@
   <component
     :is="as"
     :id="id"
-    :class="{
-      'Dialog-header': headless,
-      'mb-8 flex justify-between gap-x-3 items-center w-full': !headless,
-    }"
+    :class="[
+      headless
+        ? 'dialog-header'
+        : '-mx-4 -mt-4 flex items-center justify-between gap-x-3 p-4 md:-mx-6 md:-mt-6 md:p-6',
+    ]"
+    @click.stop
   >
     <slot></slot>
   </component>
@@ -18,6 +20,10 @@ export default {
   inject: ['apiDialog'],
 
   props: {
+    headless: {
+      type: Boolean,
+      default: false,
+    },
     as: {
       type: String,
       default: 'header',
@@ -25,16 +31,8 @@ export default {
   },
 
   computed: {
-    dark() {
-      return this.apiDialog().isDark;
-    },
-
-    headless() {
-      return this.apiDialog().isHeadless;
-    },
-
     id() {
-      return `${this.apiDialog().id}-header`;
+      return `dialog-header-${this.apiDialog().componentId}`;
     },
   },
 

package/src/components/Dialog/VTDialogMain.vue

@@ -2,10 +2,7 @@
   <component
     :is="as"
     :id="id"
-    :class="{
-      'Dialog-body': headless,
-      'flex-1 w-full h-full overflow-y-auto': !headless,
-    }"
+    :class="[headless ? 'dialog-body' : 'h-full flex-1 overflow-y-auto']"
   >
     <slot></slot>
   </component>
@@ -18,6 +15,10 @@ export default {
   inject: ['apiDialog'],
 
   props: {
+    headless: {
+      type: Boolean,
+      default: false,
+    },
     as: {
       type: String,
       default: 'main',
@@ -25,16 +26,8 @@ export default {
   },
 
   computed: {
-    dark() {
-      return this.apiDialog().isDark;
-    },
-
-    headless() {
-      return this.apiDialog().isHeadless;
-    },
-
     id() {
-      return `${this.apiDialog().id}-desc`;
+      return `dialog-main-${this.apiDialog().componentId}`;
     },
   },
 

package/src/components/Dialog/VTDialogOverlay.vue

@@ -3,11 +3,8 @@
     <div
       v-if="visible"
       :id="id"
-      :class="{
-        'Dialog-overlay': headless,
-        'fixed inset-0 bg-fd-450/80': !headless,
-      }"
-    ></div>
+      :class="[headless ? 'dialog-overlay' : 'bg-primary-200/80 fixed inset-0']"
+    />
   </FadeInOut>
 </template>
 
@@ -23,6 +20,13 @@ export default {
 
   inject: ['apiDialog'],
 
+  props: {
+    headless: {
+      type: Boolean,
+      default: false,
+    },
+  },
+
   data() {
     return {
       visible: false,
@@ -33,14 +37,6 @@ export default {
     id() {
       return `dialog-overlay-${this.apiDialog().componentId}`;
     },
-
-    dark() {
-      return this.apiDialog().isDark;
-    },
-
-    headless() {
-      return this.apiDialog().isHeadless;
-    },
   },
 
   mounted() {

package/src/components/Dialog/VTDialogTitle.vue

@@ -1,7 +1,7 @@
 <template>
   <span
     :id="id"
-    :class="{ 'Dialog-header': headless, 'text-2xl font-semibold': !headless }"
+    :class="[headless ? 'dialog-header' : 'text-2xl font-semibold']"
   >
     <slot></slot
   ></span>
@@ -13,13 +13,16 @@ export default {
 
   inject: ['apiDialog'],
 
-  computed: {
-    headless() {
-      return this.apiDialog().isHeadless;
+  props: {
+    headless: {
+      type: Boolean,
+      default: false,
     },
+  },
 
+  computed: {
     id() {
-      return `${this.apiDialog().id}-title`;
+      return `dialog-overlay-${this.apiDialog().componentId}`;
     },
   },
 };

package/src/components/Disclosure/VTDisclosureContent.vue

@@ -59,7 +59,7 @@ export default {
     this.apiDisclosure().register('contents', content);
   },
 
-  beforeDestroy() {
+  beforeUnmount() {
     this.apiDisclosure().unregister('contents', this.id);
   },
 

package/src/components/Disclosure/VTDisclosureDetails.vue

@@ -63,7 +63,7 @@ export default {
     this.apiDisclosure().register('details', detail);
   },
 
-  beforeDestroy() {
+  beforeUnmount() {
     this.apiDisclosure().unregister('details', this.id);
   },
 

package/src/components/Disclosure/VTDisclosureHeader.vue

@@ -4,7 +4,7 @@
     :class="[
       headless
         ? 'details-header'
-        : 'flex cursor-pointer justify-between gap-3 text-body font-semibold',
+        : 'text-body flex cursor-pointer justify-between gap-3 font-semibold',
     ]"
     :aria-controls="ariaControls"
     :aria-expanded="String(ariaExpanded)"
@@ -78,7 +78,7 @@ export default {
     this.apiDisclosure().register('headers', header);
   },
 
-  beforeDestroy() {
+  beforeUnmount() {
     this.apiDisclosure().unregister('headers', this.id);
   },
 

package/src/components/Disclosure/VTDisclosureIcon.vue

@@ -50,7 +50,7 @@ export default {
     this.apiDisclosure().register('icons', icon);
   },
 
-  beforeDestroy() {
+  beforeUnmount() {
     this.apiDisclosure().unregister('icons', this.id);
   },
 

package/src/components/DropdownMenu/VTDropdownMenu.vue

@@ -5,45 +5,47 @@
 </template>
 
 <script>
+import { floatingUiMixin } from '../../../mixins/floating-ui';
 import { genId } from '../../utils/ids';
 
 export default {
   name: 'VTDropdownMenu',
 
+  mixins: [floatingUiMixin],
+
   provide() {
     return {
       apiDropdownMenu: () => {
-        const { dark: isDark, headless: isHeadless, right: isRight } = this;
-        const { id, trigger, content, items } = this;
-
         const registerTrigger = (trigger) => {
-          this.trigger = trigger;
+          if (!trigger) return;
+          this.componentTrigger = trigger;
         };
 
         const registerContent = (content) => {
-          this.content = content;
+          if (!content) return;
+          this.componentContent = content;
         };
 
         const registerItem = (item) => {
+          if (!item) return;
           this.items.push(item);
         };
 
-        const unregisterItems = () => {
-          this.items = [];
+        const unregisterItem = (id) => {
+          const index = this.items.findIndex((item) => item.id === id);
+          this.items.splice(index, 1);
         };
 
         return {
-          id,
-          isDark,
-          isHeadless,
-          isRight,
-          trigger,
-          content,
-          items,
+          id: this.componentId,
+          component: this.component,
+          componentTrigger: this.componentTrigger,
+          componentContent: this.componentContent,
+          items: this.items,
           registerTrigger,
           registerContent,
           registerItem,
-          unregisterItems,
+          unregisterItem,
         };
       },
     };
@@ -54,23 +56,38 @@ export default {
       type: Boolean,
       default: false,
     },
-    dark: {
-      type: Boolean,
-      default: false,
-    },
-    right: {
-      type: Boolean,
-      default: false,
+    placement: {
+      type: String,
+      default: 'bottom-start',
     },
   },
 
   data() {
     return {
-      id: `menu-${genId()}`,
-      trigger: null,
-      content: null,
+      componentId: genId(),
       items: [],
+      /**
+       * Explaining the need for the floatingUiMinWidth data
+       *
+       * The floating ui is a result of two items:
+       *
+       * 1. Trigger: the action button
+       * 2. Content: the popper/wrapper that appears after triggering the action button
+       *
+       * By default, the content will match the triggers width.
+       * The problem with this is that the trigger width
+       * might be too small causing the content to not fit
+       * what is inside it properly. So, to avoid this,
+       * a min width is needed.
+       */
+      floatingUiMinWidth: 200,
     };
   },
+
+  computed: {
+    id() {
+      return `dropdown-menu-${this.componentId}`;
+    },
+  },
 };
 </script>

package/src/components/DropdownMenu/VTDropdownMenuContent.vue

@@ -1,93 +1,58 @@
 <template>
-  <transition
-    enter-active-class="duration-200 ease-out"
-    enter-from-class="translate-y-[15px] opacity-0"
-    enter-to-class="translate-y-0 opacity-100"
-    leave-active-class="duration-200 ease-in"
-    leave-from-class="translate-y-0 opacity-100"
-    leave-to-class="translate-y-[15px] opacity-0"
-    @after-leave="hide"
+  <FloatingUi
+    :id="id"
+    :visible="visible"
+    :headless="headless"
+    component="dropdown"
   >
-    <div
-      v-if="visible"
-      :id="id"
-      :class="{
-        MenuList: headless,
-        'absolute top-full mt-3 grid min-w-[222px] overflow-hidden rounded border border-solid py-2 px-3 transition-all':
-          !headless,
-        'border-gray-100 bg-white shadow-300': !dark,
-        'bg-forest-default border-gray-700 shadow-gray-700': dark,
-        'left-0': !right,
-        'right-0': right,
-      }"
-    >
-      <slot></slot>
-    </div>
-  </transition>
+    <slot></slot>
+  </FloatingUi>
 </template>
 
 <script>
-import { genId } from '../../utils/ids';
+import { floatingUiContentMixin } from '../../../mixins/floating-ui-content';
 
 export default {
   name: 'VTDropdownMenuContent',
 
-  inject: ['apiDropdownMenu'],
+  inheritAttrs: false,
 
-  data() {
-    return {
-      id: `menucontent-${genId()}`,
-      visible: false,
-    };
-  },
+  mixins: [floatingUiContentMixin],
 
-  computed: {
-    dark() {
-      return this.apiDropdownMenu().isDark;
-    },
+  inject: ['apiDropdownMenu'],
 
-    headless() {
-      return this.apiDropdownMenu().isHeadless;
+  computed: {
+    id() {
+      return `dropdown-menu-content-${this.apiDropdownMenu().id}`;
     },
 
-    right() {
-      return this.apiDropdownMenu().isRight;
+    component() {
+      return this.apiDropdownMenu().component;
     },
 
-    trigger() {
-      return this.apiDropdownMenu().trigger;
+    componentTrigger() {
+      return this.apiDropdownMenu().componentTrigger;
     },
   },
 
   mounted() {
-    this.apiDropdownMenu().registerContent(this);
-
-    this.$nextTick(() => {
-      if (this.trigger) this.trigger.toggleHasPopup();
-    });
-
-    // T-79 Create a directive or mixin for this
-    document.addEventListener('click', (e) => {
-      e.stopPropagation();
-      if (this.visible && !this.$el.contains(e.target)) this.trigger.onClick();
-    });
-  },
+    const content = {
+      id: this.id,
+      hide: this.hide,
+      show: this.show,
+      setActiveDescedant: this.setActiveDescedant,
+    };
 
-  destroyed() {
-    // TODO: Create a directive or mixin for this
-    document.removeEventListener('click', this.trigger.onClick());
+    this.apiDropdownMenu().registerContent(content);
   },
 
   methods: {
-    show() {
-      this.visible = true;
-      this.$emit('shown');
+    hidden() {
+      this.$emit('hidden');
     },
 
-    hide() {
-      this.visible = false;
-      this.$emit('hidden');
-      this.apiDropdownMenu().unregisterItems();
+    shown() {
+      this.$emit('shown');
     },
   },
 };

package/src/components/DropdownMenu/VTDropdownMenuDivider.vue

@@ -1,11 +1,8 @@
 <template>
   <div
-    :class="{
-      PopoverDivider: headless,
-      '-mx-3 my-2 h-[1px]': !headless,
-      'bg-gray-200': !dark,
-      'bg-fd-500': dark,
-    }"
+    :class="[
+      headless ? 'dropdown-menu-divider' : '-mx-3 my-2 h-[1px] bg-gray-200',
+    ]"
   ></div>
 </template>
 
@@ -15,13 +12,10 @@ export default {
 
   inject: ['apiDropdownMenu'],
 
-  computed: {
-    dark() {
-      return this.apiDropdownMenu().isDark;
-    },
-
-    headless() {
-      return this.apiDropdownMenu().isHeadless;
+  props: {
+    headless: {
+      type: Boolean,
+      default: false,
     },
   },
 };