@veritree/ui 0.4.0 → 0.5.0

package/index.js

@@ -44,6 +44,7 @@ import VTDrawerClose from './src/Drawer/VTDrawerClose.vue';
 import VTDrawerContent from './src/Drawer/VTDrawerContent.vue';
 import VTDrawerFooter from './src/Drawer/VTDrawerFooter.vue';
 import VTDrawerHeader from './src/Drawer/VTDrawerHeader.vue';
+import VTDrawerTitle from './src/Drawer/VTDrawerTitle.vue';
 import VTDrawerMain from './src/Drawer/VTDrawerMain.vue';
 import VTDrawerOverlay from './src/Drawer/VTDrawerOverlay.vue';
 
@@ -76,6 +77,7 @@ export {
   VTDrawerContent,
   VTDrawerFooter,
   VTDrawerHeader,
+  VTDrawerTitle,
   VTDrawerMain,
   VTDrawerOverlay,
   VTDialog,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@veritree/ui",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "veritree ui library",
   "type": "module",
   "main": "index.js",

package/src/Dialog/VTDialog.vue

@@ -7,22 +7,23 @@
       'fixed inset-0 z-50 grid grid-cols-1 grid-rows-1 p-4 md:p-8': !headless,
     }"
     aria-modal="true"
-    @click="hide"
+    @click="onClick"
   >
     <slot></slot>
   </div>
 </template>
 
 <script>
-import { genId } from '~/utils/ids';
+import { genId } from "~/utils/ids";
 
 export default {
-  name: 'VTDialog',
+  name: "VTDialog",
 
   provide() {
     return {
       api: () => {
         const id = this.id;
+        const componentId = this.componentId;
         const isDark = this.dark;
         const isHeadless = this.headless;
 
@@ -42,6 +43,7 @@ export default {
 
         return {
           id,
+          componentId,
           isDark,
           isHeadless,
           hide,
@@ -54,7 +56,7 @@ export default {
   },
 
   model: {
-    prop: 'visible',
+    prop: "visible",
   },
 
   props: {
@@ -74,13 +76,17 @@ export default {
 
   data() {
     return {
-      id: `dialog-${genId()}`,
+      componentId: genId(),
       content: null,
       overlay: null,
     };
   },
 
   computed: {
+    id() {
+      return `dialog-${this.componentId}`;
+    },
+
     hasContent() {
       return this.content !== null;
     },
@@ -109,10 +115,20 @@ export default {
 
     emit() {
       this.$nextTick(() => {
-        this.$emit('input', false);
-        this.$emit('hidden');
+        this.$emit("input", false);
+        this.$emit("hidden");
       });
     },
+
+    /**
+     * Hides the dialog when clicking outside its content.
+     *
+     * @param {object} event
+     */
+    onClick(ev) {
+      if (!ev || ev.target.id !== this.overlay.id) return;
+      this.hide();
+    },
   },
 };
 </script>

package/src/Dialog/VTDialogClose.vue

@@ -1,6 +1,7 @@
 <template>
   <VTButton
     variant="icon"
+    :id="id"
     :class="{
       'Dialog-close': headless,
     }"
@@ -22,6 +23,10 @@ export default {
   inject: ["api"],
 
   computed: {
+    id() {
+      return `dialog-close-${this.api().componentId}`;
+    },
+
     dark() {
       return this.api().isDark;
     },

package/src/Dialog/VTDialogContent.vue

@@ -10,6 +10,7 @@
   >
     <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':
@@ -19,7 +20,6 @@
       }"
       tabindex="-1"
       @keyup.esc="hide"
-      @click.stop
     >
       <slot></slot>
     </div>
@@ -39,6 +39,10 @@ export default {
   },
 
   computed: {
+    id() {
+      return `dialog-content-${this.api().componentId}`;
+    },
+
     dark() {
       return this.api().isDark;
     },

package/src/Dialog/VTDialogOverlay.vue

@@ -2,6 +2,7 @@
   <FadeInOut>
     <div
       v-if="visible"
+      :id="id"
       :class="{
         'Dialog-overlay': headless,
         'fixed inset-0 bg-fd-450/80': !headless,
@@ -11,16 +12,16 @@
 </template>
 
 <script>
-import FadeInOut from '../Transitions/FadeInOut.vue';
+import FadeInOut from "../Transitions/FadeInOut.vue";
 
 export default {
-  name: 'VTDialogOverlay',
+  name: "VTDialogOverlay",
 
   components: {
     FadeInOut,
   },
 
-  inject: ['api'],
+  inject: ["api"],
 
   data() {
     return {
@@ -29,6 +30,10 @@ export default {
   },
 
   computed: {
+    id() {
+      return `dialog-overlay-${this.api().componentId}`;
+    },
+
     dark() {
       return this.api().isDark;
     },

package/src/Drawer/VTDrawerClose.vue

@@ -3,7 +3,7 @@
     variant="icon"
     :class="{
       'Drawer-close': headless,
-      'ml-auto mb-4 text-inherit sm:mb-8': !headless,
+      'ml-auto text-inherit -mr-2': !headless,
     }"
     :theme="theme"
     @click.prevent="hide"
@@ -12,15 +12,15 @@
 </template>
 
 <script>
-import { IconLeft } from '@veritree/icons';
-import VTButton from '../Button/VTButton.vue';
+import { IconLeft } from "@veritree/icons";
+import VTButton from "../Button/VTButton.vue";
 
 export default {
-  name: 'VTDrawerClose',
+  name: "VTDrawerClose",
 
   components: { IconLeft, VTButton },
 
-  inject: ['api'],
+  inject: ["api"],
 
   computed: {
     dark() {
@@ -37,7 +37,7 @@ export default {
 
     // temporary till button theme is implemented
     theme() {
-      return this.dark ? 'dark' : null;
+      return this.dark ? "dark" : null;
     },
   },
 

package/src/Drawer/VTDrawerContent.vue

@@ -14,7 +14,7 @@
         'Drawer-content': headless,
         'absolute z-20 flex h-screen max-h-full max-w-full flex-col overflow-auto p-5 outline-0 sm:px-10 sm:py-6':
           !headless,
-        'bg-white': !dark,
+        'bg-white text-gray-600': !dark,
         'bg-fd-600': dark,
         'right-0': right,
       }"
@@ -29,9 +29,9 @@
 
 <script>
 export default {
-  name: 'VTDrawerContent',
+  name: "VTDrawerContent",
 
-  inject: ['api'],
+  inject: ["api"],
 
   data() {
     return {
@@ -53,23 +53,23 @@ export default {
     },
 
     activeClass() {
-      return 'transform transition duration-300 ease-in-out';
+      return "transform transition duration-300 ease-in-out";
     },
 
     enterClass() {
-      return `opacity-0 ${this.right ? '' : '-'}translate-x-full`;
+      return `opacity-0 ${this.right ? "" : "-"}translate-x-full`;
     },
 
     enterToClass() {
-      return `opacity-100 ${this.right ? '-' : ''}translate-x-0`;
+      return `opacity-100 ${this.right ? "-" : ""}translate-x-0`;
     },
 
     leaveClass() {
-      return `opacity-100 ${this.right ? '-' : ''}translate-x-0`;
+      return `opacity-100 ${this.right ? "-" : ""}translate-x-0`;
     },
 
     leaveToClass() {
-      return `opacity-0 ${this.right ? '' : '-'}translate-x-full`;
+      return `opacity-0 ${this.right ? "" : "-"}translate-x-full`;
     },
   },
 

package/src/Drawer/VTDrawerHeader.vue

@@ -4,7 +4,7 @@
     :id="id"
     :class="{
       'Drawer-header': headless,
-      'mb-8 text-2xl font-semibold': !headless,
+      'flex items-center justify-between': !headless,
     }"
   >
     <slot></slot>
@@ -13,14 +13,14 @@
 
 <script>
 export default {
-  name: 'VTDrawerHeader',
+  name: "VTDrawerHeader",
 
-  inject: ['api'],
+  inject: ["api"],
 
   props: {
     as: {
       type: String,
-      default: 'header',
+      default: "header",
     },
   },
 
@@ -37,20 +37,5 @@ export default {
       return `${this.api().id}-header`;
     },
   },
-
-  mounted() {
-    this.setDialogLabelledby();
-  },
-
-  methods: {
-    // In here because if there is no header, the dialog will not be labelled by
-    setDialogLabelledby() {
-      const dialog = document.getElementById(this.api().id);
-
-      if (dialog) {
-        dialog.setAttribute('aria-labelledby', this.id);
-      }
-    },
-  },
 };
 </script>

package/src/Drawer/VTDrawerTitle.vue

@@ -0,0 +1,56 @@
+<template>
+  <component
+    :is="as"
+    :id="id"
+    :class="{
+      'Drawer-title': headless,
+      'mb-8 text-2xl font-semibold': !headless,
+    }"
+  >
+    <slot></slot>
+  </component>
+</template>
+
+<script>
+export default {
+  name: "VTDrawerTitle",
+
+  inject: ["api"],
+
+  props: {
+    as: {
+      type: String,
+      default: "div",
+    },
+  },
+
+  computed: {
+    dark() {
+      return this.api().isDark;
+    },
+
+    headless() {
+      return this.api().isHeadless;
+    },
+
+    id() {
+      return `${this.api().id}-title`;
+    },
+  },
+
+  mounted() {
+    this.setDialogLabelledby();
+  },
+
+  methods: {
+    // In here because if there is no header, the dialog will not be labelled by
+    setDialogLabelledby() {
+      const dialog = document.getElementById(this.api().id);
+
+      if (dialog) {
+        dialog.setAttribute("aria-labelledby", this.id);
+      }
+    },
+  },
+};
+</script>