@veritree/ui 0.21.1-1 → 0.21.1-10

package/src/components/Listbox/VTListboxTrigger.vue

@@ -1,35 +1,19 @@
 <template>
   <button
     :id="id"
+    :class="classComputed"
     :aria-expanded="expanded"
     :aria-haspopup="hasPopup"
-    :class="{
-      'listbox-button': headless,
-      'flex w-full justify-between rounded-md border border-solid py-2 px-3':
-        !headless,
-      'border-gray-300 text-gray-500': !dark && !headless,
-      'border-white/70 text-white focus-visible:ring-2 focus-visible:ring-white':
-        dark && !headless,
-    }"
     type="button"
     @click.prevent="onClick"
-    @keydown.down.prevent="onKeyArrowDown"
-    @keydown.up.prevent="onKeyArrowUp"
+    @keydown.down.prevent="onKeyDownOrUp"
+    @keydown.up.prevent="onKeyDownOrUp"
     @keydown.esc.stop="onKeyEsc"
   >
-    <span
-      :class="{
-        'listbox-button__text': headless,
-        'text-left': !headless,
-      }"
-    >
+    <span :class="[headless ? 'listbox-button__text' : 'text-left truncate']">
       <slot></slot>
     </span>
-    <span
-      :class="{
-        'listbox-button__icon': headless,
-      }"
-    >
+    <span :class="[headless ? 'listbox-button__icon' : 'shrink-0']">
       <IconChevronDown
         class="transition-transform"
         :class="{ 'rotate-180': expanded }"
@@ -39,6 +23,7 @@
 </template>
 
 <script>
+import { formControlMixin } from '../../../mixins/form-control';
 import { IconChevronDown } from '@veritree/icons';
 
 export default {
@@ -46,17 +31,13 @@ export default {
 
   components: { IconChevronDown },
 
-  inject: ['api'],
+  mixins: [formControlMixin],
 
-  props: {
-    headless: {
-      type: Boolean,
-      default: false,
-    },
-  },
+  inject: ['apiListbox'],
 
   data() {
     return {
+      name: 'listbox-button',
       expanded: false,
       hasPopup: false,
     };
@@ -64,19 +45,15 @@ export default {
 
   computed: {
     id() {
-      return `listbox-trigger-${this.api().id}`;
-    },
-
-    dark() {
-      return this.api().isDark;
+      return `listbox-trigger-${this.apiListbox().id}`;
     },
 
     componentContent() {
-      return this.api().componentContent;
+      return this.apiListbox().componentContent;
     },
 
     items() {
-      return this.api().items;
+      return this.apiListbox().items;
     },
 
     firstMenuItem() {
@@ -90,101 +67,85 @@ export default {
 
   mounted() {
     const trigger = {
-      toggleExpanded: this.toggleExpanded,
       el: this.$el,
+      cancel: this.cancel,
       focus: this.focus,
       id: this.id,
-      onClick: this.onClick,
     };
 
-    this.api().registerTrigger(trigger);
+    this.apiListbox().registerTrigger(trigger);
   },
 
   methods: {
-    /**
-     * Shows content/menu if not already visible
-     */
-    showContent() {
-      this.expanded = true;
-      this.componentContent.show();
-    },
-
-    focus() {
-      this.$el.focus();
-    },
-
-    toggleExpanded() {
-      if (!this.expanded) return;
-      this.expanded = false;
-    },
-
-    /**
-     * On click, do the following:
-     *
-     * 1. Toggle aria expanded attribute/state
-     * 2. Open the menu if it's closed
-     * 3. Close the menu if it's open
-     */
-    onClick(e) {
-      if (!this.componentContent) return;
+    init(e) {
+      if (!this.componentContent) {
+        return;
+      }
 
       if (this.expanded) {
-        this.componentContent.hide();
+        this.cancel();
         return;
       }
 
+      this.expanded = true;
+
       // delay stop propagation to close other visible
       // dropdowns and delay click event to control
       // this dropdown visibility
       setTimeout(() => e.stopImmediatePropagation(), 50);
-      setTimeout(() => this.showContent(), 100);
+      setTimeout(() => this.showComponentContent(), 100);
     },
 
-    /**
-     * On key arrow down, do the following:
-     *
-     * 1. if the menu is not expanded, expand it and focus the first menu item
-     * 2. if the menu is expanded, focus the first menu item
-     */
-    onKeyArrowDown() {
-      if (!this.componentContent) return;
+    cancel() {
+      if (!this.componentContent) {
+        return;
+      }
+      this.expanded = false;
 
-      this.showContent();
+      this.hideComponentContent();
+    },
 
-      // settimeout here is delaying the focusing the element
-      // since it is not rendered yet. All items will only
-      // be available when the content is fully visible.
-      this.$nextTick(() => {
-        setTimeout(() => this.firstMenuItem.focus(), 150);
-      });
+    focus() {
+      this.$el.focus();
     },
 
-    /**
-     * On key arrow up, do the following:
-     *
-     * 1. if the menu is not expanded, expand it and focus the last menu item
-     * 2. if the menu is expanded, focus the last menu item
-     */
-    onKeyArrowUp() {
-      if (!this.componentContent) return;
+    showComponentContent() {
+      this.componentContent.show();
+    },
 
-      this.showContent();
+    hideComponentContent() {
+      this.componentContent.hide();
+    },
+
+    onClick(e) {
+      this.init(e);
+    },
+
+    onKeyDownOrUp(e) {
+      if (!this.expanded) {
+        this.$el.click(e);
+      }
+
+      const keyCode = e.code;
+      const listItemPosition =
+        keyCode === 'ArrowDown'
+          ? 'firstMenuItem'
+          : keyCode === 'ArrowUp'
+          ? 'lastMenuItem'
+          : null;
 
       // settimeout here is delaying the focusing the element
       // since it is not rendered yet. All items will only
       // be available when the content is fully visible.
       this.$nextTick(() => {
-        setTimeout(() => this.lastMenuItem.focus(), 150);
+        setTimeout(() => this[listItemPosition].focus(), 100);
       });
     },
 
+    // change it to a better name or move the methods inside to another function
     onKeyEsc() {
-      if (!this.componentContent) return;
-
-      if (this.expanded) {
-        this.toggleExpanded();
-        this.componentContent.hide();
-      }
+      this.cancel();
+      this.focus();
     },
   },
 };

package/src/components/Popover/VTPopover.vue

@@ -20,9 +20,7 @@ export default {
 
   provide() {
     return {
-      api: () => {
-        const { dark: isDark, headless: isHeadless, right: isRight } = this;
-
+      apiPopover: () => {
         const registerTrigger = (trigger) => {
           if (!trigger) return;
           this.componentTrigger = trigger;
@@ -35,9 +33,6 @@ export default {
 
         return {
           id: this.componentId,
-          isDark,
-          isHeadless,
-          isRight,
           component: this.component,
           componentTrigger: this.componentTrigger,
           componentContent: this.componentContent,
@@ -53,14 +48,6 @@ export default {
       type: Boolean,
       default: false,
     },
-    dark: {
-      type: Boolean,
-      default: false,
-    },
-    right: {
-      type: Boolean,
-      default: false,
-    },
   },
 
   data() {

package/src/components/Popover/VTPopoverContent.vue

@@ -3,96 +3,45 @@
     :visible="visible"
     :id="id"
     :headless="headless"
-    :class="{
-      'popover-content': headless,
-    }"
+    :class="{ 'popover-content': headless }"
+    :floating-ui-class="floatingUiClass"
   >
     <slot></slot>
   </FloatingUi>
 </template>
 
 <script>
-import FloatingUi from '../Utils/FloatingUi.vue';
+import { floatingUiContentMixin } from '../../../mixins/floating-ui-content';
 
 export default {
   name: 'VTPopoverContent',
 
-  components: {
-    FloatingUi,
-  },
-
-  inject: ['api'],
+  mixins: [floatingUiContentMixin],
 
-  data() {
-    return {
-      visible: false,
-    };
-  },
+  inject: ['apiPopover'],
 
   computed: {
     id() {
-      return `popover-content-${this.api().id}`;
-    },
-
-    headless() {
-      return this.api().isHeadless;
+      return `popover-content-${this.apiPopover().id}`;
     },
 
     component() {
-      return this.api().component;
+      return this.apiPopover().component;
     },
 
     componentTrigger() {
-      return this.api().componentTrigger;
+      return this.apiPopover().componentTrigger;
     },
   },
 
   mounted() {
-    this.api().registerContent(this);
-
-    // T-307 Create a directive or mixin for this
-    document.addEventListener('click', (e) => {
-      if (!e) {
-        return;
-      }
-
-      e.stopPropagation();
-
-      if (this.visible && !this.$el.contains(e.target)) {
-        this.hide();
-      }
-    });
-  },
-
-  destroyed() {
-    // T-325 Create a directive or mixin for this
-    document.removeEventListener('click', this.componentTrigger.onClick);
-  },
-
-  methods: {
-    show() {
-      if (this.visible) return;
-
-      this.visible = true;
-
-      this.$nextTick(() => {
-        this.component.setActive();
-      });
-    },
-
-    hide() {
-      if (!this.visible) return;
-
-      this.visible = false;
-
-      this.$nextTick(() => {
-        this.componentTrigger.focus();
+    const content = {
+      id: this.id,
+      show: this.show,
+      hide: this.hide,
+    };
 
-        setTimeout(() => {
-          this.component.clearActive();
-        }, 100);
-      });
-    },
+    this.apiPopover().registerContent(content);
   },
 };
 </script>

package/src/components/Popover/VTPopoverDivider.vue

@@ -3,8 +3,6 @@
     :class="{
       PopoverDivider: headless,
       'h-[1px]': !headless,
-      'bg-white': !dark,
-      'bg-fd-500': dark,
     }"
   ></div>
 </template>
@@ -13,15 +11,10 @@
 export default {
   name: 'VTPopoverDivider',
 
-  inject: ['api'],
-
-  computed: {
-    dark() {
-      return this.api().isDark;
-    },
-
-    headless() {
-      return this.api().isHeadless;
+  props: {
+    headless: {
+      type: Boolean,
+      default: false,
     },
   },
 };

package/src/components/Popover/VTPopoverItem.vue

@@ -1,13 +1,12 @@
 <template>
   <component
     :is="as"
-    :class="{
-      PopoverItem: headless,
-      '-mx-3 flex min-w-max items-center gap-2 px-3 py-2 no-underline':
-        !headless,
-      'text-fd-500': !dark,
-      'text-white hover:bg-fd-450': dark,
-    }"
+    :class="[
+      // default styles
+      headless
+        ? 'popover-item'
+        : 'relative z-10 -mx-3 flex items-center gap-2 px-3 py-2 text-inherit no-underline hover:bg-secondary-200/10',
+    ]"
     @click="onClick"
   >
     <slot></slot>
@@ -18,26 +17,30 @@
 export default {
   name: 'VTPopoverItem',
 
-  inject: ['api'],
+  inject: ['apiPopover'],
 
   props: {
-    to: {
-      type: [String, Object],
-      default: null,
+    headless: {
+      type: Boolean,
+      default: false,
     },
     href: {
       type: String,
       default: null,
     },
+    to: {
+      type: [String, Object],
+      default: null,
+    },
   },
 
   computed: {
     dark() {
-      return this.api().isDark;
+      return this.apiPopover().isDark;
     },
 
     headless() {
-      return this.api().isHeadless;
+      return this.apiPopover().isHeadless;
     },
 
     as() {

package/src/components/Popover/VTPopoverTrigger.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :id="id" @keydown.esc.prevent="onEsc">
+  <div :id="id" @keydown.esc.prevent="onKeyEsc">
     <slot></slot>
   </div>
 </template>
@@ -8,52 +8,149 @@
 export default {
   name: 'VTPopoverTrigger',
 
-  inject: ['api'],
+  inject: ['apiPopover'],
+
+  data() {
+    return {
+      expanded: false,
+      hasPopup: false,
+      controls: null,
+      trigger: null,
+    };
+  },
 
   computed: {
     id() {
-      return `popover-trigger-${this.api().id}`;
+      return `popover-trigger-${this.apiPopover().id}`;
     },
 
     componentContent() {
-      return this.api().componentContent;
+      return this.apiPopover().componentContent;
     },
   },
 
   mounted() {
-    this.api().registerTrigger(this);
-    this.handleSlotTrigger();
+    const trigger = {
+      id: this.id,
+      el: this.$el,
+      cancel: this.cancel,
+      focus: this.focus,
+    };
+
+    this.apiPopover().registerTrigger(trigger);
+
+    this.setTrigger();
+    this.addTriggerEvents();
+  },
+
+  destroyed() {
+    this.trigger.removeEventListener('click', this.onClick);
   },
 
   methods: {
-    handleSlotTrigger() {
-      const slot = this.$slots.default;
-      const trigger = slot[0].elm;
+    setTrigger() {
+      this.trigger = this.$el.querySelector(':first-child');
+    },
+
+    /**
+     * Add event listener to slot element
+     *
+     * The click event has to be added to the slot child element
+     * since we are not setting the onclick on the component
+     * itself.
+     *
+     * Slot must have only one child element. It avoids
+     * errors related to adding the event listener.
+     */
+    addTriggerEvents() {
+      this.trigger.addEventListener('click', (e) => {
+        this.onClick(e);
+      });
+    },
 
-      if (slot.length > 1) {
-        console.error('VTPopoverButton only accepts one item in its slot');
+    init(e) {
+      if (!this.componentContent) {
         return;
       }
 
-      trigger.addEventListener('click', (e) => {
-        this.onClick();
-        e.stopPropagation();
-      });
+      if (this.expanded) {
+        this.cancel();
+        return;
+      }
+
+      this.expanded = true;
+
+      // delay stop propagation to close other visible
+      // dropdowns and delay click event to control
+      // this dropdown visibility
+      setTimeout(() => e.stopImmediatePropagation(), 50);
+      setTimeout(() => this.showComponentContent(), 100);
+    },
+
+    cancel() {
+      if (!this.componentContent) {
+        return;
+      }
+
+      this.expanded = false;
+
+      this.hideComponentContent();
     },
 
     focus() {
-      this.$el.focus();
+      if (this.trigger) this.trigger.focus();
     },
 
-    onClick() {
-      if (this.componentContent.visible) this.componentContent.hide();
-      else this.componentContent.show();
+    showComponentContent() {
+      this.componentContent.show();
     },
 
-    onEsc() {
-      if (!this.componentContent) return;
+    hideComponentContent() {
       this.componentContent.hide();
     },
+
+    toggleAriaHasPopup() {
+      if (this.expanded) {
+        this.hasPopup = this.componentContent !== null;
+        this.controls = this.hasPopup ? this.componentContent.id : null;
+
+        return;
+      }
+
+      this.hasPopup = null;
+      this.controls = null;
+    },
+
+    onClick(e) {
+      this.init(e);
+    },
+
+    onKeyDownOrUp(e) {
+      if (!this.expanded) {
+        this.$el.click(e);
+      }
+
+      const keyCode = e.code;
+      const listItemPosition =
+        keyCode === 'ArrowDown'
+          ? 'firstMenuItem'
+          : keyCode === 'ArrowUp'
+          ? 'lastMenuItem'
+          : null;
+
+      // settimeout here is delaying the focusing the element
+      // since it is not rendered yet. All items will only
+      // be available when the content is fully visible.
+      this.$nextTick(() => {
+        setTimeout(() => this[listItemPosition].focus(), 100);
+      });
+    },
+
+    // change it to a better name or move the methods inside to another function
+    onKeyEsc() {
+      this.cancel();
+      this.focus();
+    },
   },
 };
 </script>

package/src/components/Utils/FloatingUi.vue

@@ -15,7 +15,8 @@
         :class="[
           headless
             ? null
-            : 'absolute z-50 grid min-w-[222px] overflow-hidden rounded-md py-2 px-3 border-gray-100 bg-white shadow-300',
+            : 'absolute z-50 grid overflow-x-hidden rounded-md py-2 px-3 border-gray-100 bg-white shadow-300',
+          floatingUiClass ? floatingUiClass : null,
         ]"
       >
         <slot></slot>
@@ -45,6 +46,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    floatingUiClass: {
+      type: [String, Function],
+      default: null,
+    },
   },
 
   methods: {

package/src/utils/components.js

@@ -1,18 +0,0 @@
-/**
- *
- * @param {HTMLElement} el
- * @param {HTMLElement} parent
- */
- export const scrollElementIntoView = (el, parent) => {
-  // this works better than scrollIntoView
-  if (parent.scrollHeight <= parent.clientHeight) return;
-
-  const scrollBottom = parent.clientHeight + parent.scrollTop;
-  const elBottom = el.offsetTop + el.offsetHeight;
-
-  if (elBottom > scrollBottom) {
-    parent.scrollTop = elBottom - parent.clientHeight;
-  } else if (el.offsetTop < parent.scrollTop) {
-    parent.scrollTop = el.offsetTop;
-  }
-};