@veritree/ui 0.21.1-0 → 0.21.1-10

package/mixins/floating-ui-content.js

@@ -0,0 +1,102 @@
+import FloatingUi from '../src/components/Utils/FloatingUi.vue';
+
+export const floatingUiContentMixin = {
+  components: {
+    FloatingUi,
+  },
+
+  props: {
+    headless: {
+      type: Boolean,
+      default: false,
+    },
+    floatingUiClass: {
+      type: [String, Function],
+      default: null,
+    },
+  },
+
+  data() {
+    return {
+      el: null,
+      isMousemove: false,
+      visible: false,
+    };
+  },
+
+  mounted() {
+    document.addEventListener('click', (e) => this.onDocumentClick(e));
+  },
+
+  destroyed() {
+    document.removeEventListener('click', this.onDocumentClick);
+  },
+
+  methods: {
+    show() {
+      if (this.visible) {
+        return;
+      }
+
+      this.visible = true;
+
+      this.$nextTick(() => {
+        this.component.setActive();
+
+        setTimeout(() => {
+          this.el = document.getElementById(this.id);
+          this.$emit('shown');
+        }, 100);
+      });
+    },
+
+    hide() {
+      if (!this.visible) {
+        return;
+      }
+
+      this.visible = false;
+
+      this.$nextTick(() => {
+        this.component.clearActive();
+
+        setTimeout(() => {
+          this.el = document.getElementById(this.id);
+          this.$emit('hidden');
+        }, 100);
+      });
+    },
+
+    onDocumentClick(e) {
+      if (!e) {
+        return;
+      }
+
+      e.stopPropagation();
+
+      if (this.visible && !this.el.contains(e.target)) {
+        this.componentTrigger.cancel();
+      }
+    },
+
+    // Mousemove instead of mouseover to support keyboard navigation.
+    // The problem with mouseover is that when scrolling (scrollIntoView),
+    // mouseover event gets triggered.
+    setMousemove() {
+      this.isMousemove = true;
+    },
+
+    unsetMousemove() {
+      this.isMousemove = false;
+    },
+
+    getMousemove() {
+      return this.isMousemove;
+    },
+
+    // 
+    setActiveDescedant(id) {
+      this.activeDescedant = id;
+    },
+  },
+}

package/mixins/floating-ui-item.js

@@ -0,0 +1,216 @@
+export const floatingUiItemMixin = {
+  props: {
+    headless: {
+      type: Boolean,
+      default: false,
+    },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+  },
+
+  computed: {
+    id() {
+      return `${this.componentName}-${this.apiInjected().id}-${this.index}`;
+    },
+
+    items() {
+      return this.apiInjected().items;
+    },
+
+    el() {
+      return this.$el;
+    },
+
+    componentContent() {
+      return this.apiInjected().componentContent;
+    },
+
+    componentTrigger() {
+      return this.apiInjected().componentTrigger;
+    },
+
+    classComputed() {
+      return [
+        // default styles
+        this.headless
+          ? `${this.componentName}`
+          : 'relative z-10 flex items-center gap-2 px-3 py-2 text-inherit no-underline',
+        // disabled state styles
+        this.headless
+          ? this.disabled
+            ? `${this.componentName}--disabled`
+            : null
+          : this.disabled
+          ? 'pointer-events-none opacity-75'
+          : null,
+        // selected state styles
+        this.headless
+          ? this.selected
+            ? `${this.componentName}--selected`
+            : null
+          : this.selected
+          ? 'bg-secondary-200/10'
+          : null,
+      ];
+    },
+  },
+
+  data() {
+    return {
+      index: null,
+      selected: false,
+      tabIndex: 0,
+    };
+  },
+
+  watch: {
+    selected(newValue) {
+      if (!newValue || !this.componentContent) return;
+
+      this.componentContent.setActiveDescedant(this.id);
+
+      const isMousemove = this.componentContent.getMousemove();
+
+      if (!isMousemove) {
+        this.el.scrollIntoView({ block: 'nearest' });
+      }
+    },
+  },
+
+  mounted() {
+    this.init();
+    this.addMouseEventListeners();
+  },
+
+  beforeDestroy() {
+    this.apiInjected().unregisterItem(this.id);
+    this.removeMouseEventListeners();
+  },
+
+  methods: {
+    init() {
+      const item = {
+        id: this.id,
+        select: this.select,
+        unselect: this.unselect,
+        focus: this.focus,
+        onClick: this.onClick,
+      };
+  
+      this.apiInjected().registerItem(item);
+  
+      this.index = this.items.length - 1;
+    },
+
+    addMouseEventListeners() {
+      this.el.addEventListener('mousemove', this.onMousemove);
+      this.el.addEventListener('mouseleave', this.onMouseleave);
+    },
+
+    removeMouseEventListeners() {
+      this.el.removeEventListener('mousemove', this.onMousemove);
+      this.el.removeEventListener('mouseleave', this.onMouseleave);
+    },
+
+    select() {
+      this.selected = true;
+    },
+
+    unselect() {
+      this.selected = false;
+    },
+
+    focus() {
+      if (!this.el) return;
+
+      this.tabIndex = -1;
+      this.selected = true;
+      this.el.focus();
+    },
+
+    focusFirstItem() {
+      this.setFocusToItem(0);
+    },
+
+    focusLastItem() {
+      this.setFocusToItem(this.items.length - 1);
+    },
+
+    /**
+     * Focus the previous item in the menu.
+     * If is the first item, jump to the last item.
+     */
+    focusPreviousItem() {
+      const isLast = this.index === this.items.length - 1;
+      const goToIndex = isLast ? 0 : this.index + 1;
+
+      this.setFocusToItem(goToIndex);
+    },
+
+    /**
+     * Focus the next item in the menu.
+     * If is the last item, jump to the first item.
+     */
+    focusNextItem() {
+      const isFirst = this.index === 0;
+      const goToIndex = isFirst ? this.items.length - 1 : this.index - 1;
+
+      this.setFocusToItem(goToIndex);
+    },
+
+    /**
+     * Focus item by remove its tabindex and calling
+     * focus to the element.
+     *
+     * @param {Number, String} goToIndex
+     */
+    setFocusToItem(goToIndex) {
+      this.tabIndex = 0;
+      this.selected = false;
+
+      // set all selected to false
+      this.items.forEach((item) => item.unselect());
+
+      // focus item
+      this.items[goToIndex].focus();
+    },
+
+    leaveMenu() {
+      if (this.componentTrigger) {
+        this.componentTrigger.cancel();
+        this.componentTrigger.focus();
+      }
+    },
+
+    onClick() {
+      if (this.disabled) {
+        return;
+      }
+
+      this.value ? this.apiInjected().emit(this.value) : this.$emit('click');
+      this.$nextTick(() => this.leaveMenu());
+    },
+
+    onKeyEsc() {
+      this.leaveMenu();
+    },
+
+    onMousemove() {
+      if (this.selected) {
+        return;
+      }
+
+      this.items.forEach((item) => item.unselect());
+
+      this.select();
+      this.componentContent.setMousemove();
+    },
+
+    onMouseleave() {
+      this.unselect();
+      this.componentContent.unsetMousemove();
+    },
+  },
+};

package/mixins/floating-ui.js

@@ -4,8 +4,8 @@ export const floatingUiMixin = {
   props: {
     placement: {
       type: String,
-      default: 'bottom-start'
-    }
+      default: 'bottom-start',
+    },
   },
 
   data() {
@@ -14,7 +14,7 @@ export const floatingUiMixin = {
       componentTrigger: null,
       componentContent: null,
       active: false,
-    }
+    };
   },
 
   watch: {
@@ -40,6 +40,8 @@ export const floatingUiMixin = {
     },
 
     positionContentToTrigger() {
+      // console.log(window.innerWidth)
+
       const trigger = document.getElementById(this.componentTrigger.id);
       const content = document.getElementById(this.componentContent.id);
 
@@ -51,8 +53,14 @@ export const floatingUiMixin = {
           shift({ padding: 5 }),
           size({
             apply({ rects }) {
+              // the min width to floating uis should be 200
+              // since less than that can look not as nice
+              const minWidthLimit = 200;
+              const width = rects.reference.width;
+              const minWidth = width < minWidthLimit ? minWidthLimit : width;
+
               Object.assign(content.style, {
-                width: `${rects.reference.width}px`,
+                minWidth: `${minWidth}px`,
               });
             },
           }),
@@ -64,5 +72,5 @@ export const floatingUiMixin = {
         });
       });
     },
-  }
-}
+  },
+};

package/mixins/form-control.js

@@ -0,0 +1,72 @@
+export const formControlMixin = {
+  model: {
+    prop: 'value',
+    event: 'input',
+  },
+
+  props: {
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    headless: {
+      type: Boolean,
+      default: false,
+    },
+    value: {
+      type: [String, Number, Object, Array],
+      default: null,
+    },
+    variant: {
+      type: [String, Object, Function],
+      default: '',
+    },
+  },
+
+  computed: {
+    listeners() {
+      // `Object.assign` merges objects together to form a new object
+      return Object.assign(
+        {},
+        // We add all the listeners from the parent
+        this.$listeners,
+        // Then we can add custom listeners or override the
+        // behavior of some listeners.
+        {
+          // This ensures that the component works with v-model
+          input: (event) => {
+            // if (this.lazy) return;
+            this.$emit('input', event.target.value);
+          },
+          blur: (event) => {
+            this.$emit('blur', event);
+          },
+        }
+      );
+    },
+
+    classComputed() {
+      return [
+        this.headless
+          ? `${this.name}`
+          : 'leading-0 flex w-full max-w-full appearance-none items-center justify-between gap-3 rounded border border-solid px-3 py-2 font-inherit text-base text-inherit file:hidden focus:border-secondary-200',
+        // variant styles
+        this.headless
+          ? `${this.name}--${this.variant}`
+          : this.isError
+          ? 'border-error-300'
+          : 'border-gray-300',
+        // height styles
+        this.headless
+          ? null
+          : this.name === 'textarea'
+          ? 'min-h-10' // limit it because input type number height can be different from other input types
+          : 'h-10',
+      ];
+    },
+
+    isError() {
+      return this.variant === 'error';
+    },
+  },
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@veritree/ui",
-  "version": "0.21.1-0",
+  "version": "0.21.1-10",
   "description": "veritree ui library",
   "type": "module",
   "main": "index.js",
@@ -13,7 +13,7 @@
   "dependencies": {
     "@floating-ui/dom": "^1.0.4",
     "@linusborg/vue-simple-portal": "^0.1.5",
-    "@veritree/icons": "^0.19.0"
+    "@veritree/icons": "^0.39.0"
   },
   "devDependencies": {}
 }

package/src/components/Avatar/VTAvatar.vue

@@ -1,14 +1,21 @@
 <template>
   <div
-    :class="{
-      Avatar: headless,
-      'flex items-center justify-center overflow-hidden rounded-full':
-        !headless,
-      'h-10 w-10': !small,
-      'h-8 w-8': small,
-      'border border-solid': !dark,
-      'bg-white text-fd-500': dark,
-    }"
+    :class="[
+      // default styles
+      headless
+        ? 'avatar'
+        : 'flex items-center justify-center overflow-hidden rounded-full bg-white border border-solid',
+      // variant styles
+      headless ? `avatar--${variant}` : null,
+      // sizes styles
+      headless
+        ? `avatar--${size}`
+        : isSmall
+        ? 'h-8 w-8'
+        : isLarge
+        ? 'h-10 w-10'
+        : null,
+    ]"
   >
     <slot></slot>
   </div>
@@ -18,32 +25,28 @@
 export default {
   name: 'VTAvatar',
 
-  provide() {
-    return {
-      api: () => {
-        const { dark: isDark, headless: isHeadless, light: isLight } = this;
-
-        return {
-          isDark,
-          isHeadless,
-          isLight,
-        };
-      },
-    };
-  },
-
   props: {
     headless: {
       type: Boolean,
       default: false,
     },
-    dark: {
-      type: Boolean,
-      default: false,
+    variant: {
+      type: String,
+      default: 'primary',
     },
-    small: {
-      type: Boolean,
-      default: false,
+    size: {
+      type: String,
+      default: 'large',
+    },
+  },
+
+  computed: {
+    isLarge() {
+      return this.size === 'large';
+    },
+
+    isSmall() {
+      return this.size === 'small';
     },
   },
 };

package/src/components/DropdownMenu/VTDropdownMenu.vue

@@ -15,9 +15,7 @@ export default {
 
   provide() {
     return {
-      api: () => {
-        const { dark: isDark, headless: isHeadless } = this;
-
+      apiDropdownMenu: () => {
         const registerTrigger = (trigger) => {
           if (!trigger) return;
           this.componentTrigger = trigger;
@@ -33,14 +31,13 @@ export default {
           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: this.componentId,
-          isDark,
-          isHeadless,
           component: this.component,
           componentTrigger: this.componentTrigger,
           componentContent: this.componentContent,
@@ -48,7 +45,7 @@ export default {
           registerTrigger,
           registerContent,
           registerItem,
-          unregisterItems,
+          unregisterItem,
         };
       },
     };
@@ -59,14 +56,6 @@ export default {
       type: Boolean,
       default: false,
     },
-    dark: {
-      type: Boolean,
-      default: false,
-    },
-    right: {
-      type: Boolean,
-      default: false,
-    },
   },
 
   data() {

package/src/components/DropdownMenu/VTDropdownMenuContent.vue

@@ -4,96 +4,48 @@
     :id="id"
     :headless="headless"
     :class="{ 'dropdown-menu-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: 'VTDropdownMenuContent',
 
-  components: {
-    FloatingUi,
-  },
-
-  inject: ['api'],
+  mixins: [floatingUiContentMixin],
 
-  data() {
-    return {
-      visible: false,
-    };
-  },
+  inject: ['apiDropdownMenu'],
 
   computed: {
     id() {
-      return `dropdown-menu-content-${this.api().id}`;
-    },
-
-    dark() {
-      return this.api().isDark;
-    },
-
-    headless() {
-      return this.api().isHeadless;
+      return `dropdown-menu-content-${this.apiDropdownMenu().id}`;
     },
 
     component() {
-      return this.api().component;
+      return this.apiDropdownMenu().component;
     },
 
     componentTrigger() {
-      return this.api().componentTrigger;
+      return this.apiDropdownMenu().componentTrigger;
     },
   },
 
   mounted() {
-    this.api().registerContent(this);
-
-    // T-218 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.componentTrigger.onClick();
-      }
-    });
-  },
-
-  destroyed() {
-    document.removeEventListener('click', this.componentTrigger.onClick);
-  },
-
-  methods: {
-    show() {
-      if (this.visible) return;
-
-      this.visible = true;
-
-      this.$nextTick(() => {
-        this.component.setActive();
-        this.$emit('shown');
-      });
-    },
-
-    hide() {
-      if (!this.visible) return;
-
-      this.visible = false;
+    const content = {
+      id: this.id,
+      hide: this.hide,
+      show: this.show,
+      getMousemove: this.getMousemove,
+      setMousemove: this.setMousemove,
+      unsetMousemove: this.unsetMousemove,
+      setActiveDescedant: this.setActiveDescedant,
+    };
 
-      this.$nextTick(() => {
-        this.componentTrigger.focus();
-        this.componentTrigger.hideExpanded();
-        this.component.clearActive();
-        this.$emit('hidden');
-      });
-    },
+    this.apiDropdownMenu().registerContent(content);
   },
 };
 </script>