@onereach/ui-components 4.6.4 → 4.7.0-beta.2795.0

package/src/components/or-menu-v3/OrMenu.vue

@@ -1,12 +1,12 @@
 <template>
   <OrPopover
-    :is-open="state === 'open'"
+    ref="popover"
     :variant="'auto'"
     :trigger="trigger"
     :placement="placement"
     :full-width="false"
     :disable-default-styles="false"
-    @update:state="state = $event"
+    @update:state="$emit('update:state', $event)"
   >
     <div
       ref="root"
@@ -20,8 +20,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, PropType, ref, toRef } from 'vue-demi';
-import { usePopoverState } from '../../hooks';
+import { computed, defineComponent, PropType, ref } from 'vue-demi';
 import { OrPopoverV3 as OrPopover } from '../or-popover-v3';
 import { MenuPlacement } from './props';
 import { MenuRoot } from './styles';
@@ -36,11 +35,6 @@ export default defineComponent({
   inheritAttrs: false,
 
   props: {
-    isOpen: {
-      type: Boolean,
-      default: false,
-    },
-
     trigger: {
       type: HTMLElement,
       default: undefined,
@@ -54,25 +48,25 @@ export default defineComponent({
 
   emits: [
     'update:state',
-
-    'open',
-    'close',
   ],
 
   expose: [
     'root',
-
     'state',
-
+    'isOpen',
     'open',
     'close',
     'toggle',
   ],
 
-  setup(props, context) {
+  setup() {
     // Refs
     const root = ref<HTMLElement>();
 
+    const popover = ref<InstanceType<typeof OrPopover>>();
+    const popoverRoot = computed(() => popover.value?.root);
+    const popoverState = computed(() => popover.value?.state);
+
     // Styles
     const rootStyles = computed(() => [
       'or-menu-v3',
@@ -80,21 +74,49 @@ export default defineComponent({
     ]);
 
     // State
-    const { state, open, close, toggle } = usePopoverState(toRef(props, 'isOpen'), context);
+    const isOpen = computed(() => popover.value?.isOpen);
+
+    // Methods
+    function open(): void {
+      const popoverInstance = popover.value;
+
+      if (popoverInstance) {
+        (popoverInstance.open as () => void)();
+      }
+    }
+
+    function close(): void {
+      const popoverInstance = popover.value;
+
+      if (popoverInstance) {
+        (popoverInstance.close as () => void)();
+      }
+    }
+
+    function toggle(): void {
+      isOpen.value ? close() : open();
+    }
 
     // Handlers
     function onClick(event: Event): void {
       const path = event.composedPath() as HTMLElement[];
 
-      if (path.some(({ classList }) => classList?.contains('or-menu-item-v3'))) {
+      const classLists = path
+        .filter(({ classList }) => !!classList)
+        .map(({ classList }) => classList);
+
+      if (classLists.some((classList) => classList.contains('or-menu-item-v3'))) {
         close();
       }
     }
 
     return {
       root,
+      popover,
+      popoverRoot,
+      state: popoverState,
       rootStyles,
-      state,
+      isOpen,
       open,
       close,
       toggle,

package/src/components/or-modal-v3/OrModal.vue

@@ -1,6 +1,6 @@
 <template>
   <OrOverlay
-    v-if="state === 'open'"
+    v-if="isActive"
     :fullscreen="true"
   >
     <div
@@ -8,67 +8,64 @@
       v-bind="$attrs"
       :class="rootStyles"
     >
-      <OrModalHeader @close="close()">
-        <slot name="header" />
-      </OrModalHeader>
-
-      <OrModalContent>
+      <div :class="headerStyles">
+        <div :class="['grow']">
+          <slot name="header" />
+        </div>
+
+        <OrIconButton
+          :icon="'close'"
+          :size="'l'"
+          @click.stop="close"
+        />
+      </div>
+
+      <div :class="contentStyles">
         <slot />
-      </OrModalContent>
-
-      <OrModalFooter v-if="$slots.footer">
+      </div>
+      <div :class="footerStyles">
         <slot name="footer" />
-      </OrModalFooter>
+      </div>
     </div>
   </OrOverlay>
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, PropType, ref, toRef } from 'vue-demi';
-import { usePopoverState } from '../../hooks';
+import { computed, defineComponent, PropType, ref, watch } from 'vue-demi';
+import { OrIconButtonV3 as OrIconButton } from '../or-icon-button-v3';
 import { OrOverlayV3 as OrOverlay } from '../or-overlay-v3';
-import OrModalContent from './partials/or-modal-content/OrModalContent.vue';
-import OrModalFooter from './partials/or-modal-footer/OrModalFooter.vue';
-import OrModalHeader from './partials/or-modal-header/OrModalHeader.vue';
 import { ModalSize } from './props';
-import { ModalRoot, ModalRootSizes } from './styles';
+import { ModalHeader, ModalRoot, ModalRootSizes, ModalContent, ModalFooter } from './styles';
 
 export default defineComponent({
   name: 'OrModal',
 
   components: {
-    OrModalContent,
-    OrModalFooter,
-    OrModalHeader,
     OrOverlay,
+    OrIconButton,
   },
 
   inheritAttrs: false,
 
   props: {
-    isOpen: {
-      type: Boolean,
-      default: false,
-    },
-
     size: {
-      type: String as PropType<`${ModalSize}`>,
+      type: String as PropType<ModalSize>,
       default: ModalSize.M,
     },
+    isOpen: {
+      type: Boolean as PropType<boolean>,
+      default: false,
+    },
   },
 
   emits: [
-    'update:state',
-
     'open',
     'close',
   ],
 
   expose: [
     'root',
-
-    'state',
-
+    'isActive',
     'open',
     'close',
   ],
@@ -84,13 +81,50 @@ export default defineComponent({
       ...ModalRootSizes[props.size],
     ]);
 
+    const headerStyles = computed(() => [
+      ...ModalHeader,
+    ]);
+
+    const contentStyles = computed(() => [
+      ...ModalContent,
+    ]);
+
+    const footerStyles = computed(() => [
+      ...ModalFooter,
+    ]);
+
     // State
-    const { state, open, close } = usePopoverState(toRef(props, 'isOpen'), context);
+    const isActive = ref(false);
+
+    // Events
+    watch(isActive, (value) => {
+      context.emit(value ? 'open' : 'close');
+    });
+
+    watch(() => props.isOpen, (newIsOpen) => {
+      if (newIsOpen) {
+        open();
+      } else {
+        close();
+      }
+    }, { immediate: true });
+
+    // Methods
+    function open(): void {
+      isActive.value = true;
+    }
+
+    function close(): void {
+      isActive.value = false;
+    }
 
     return {
       root,
       rootStyles,
-      state,
+      headerStyles,
+      contentStyles,
+      footerStyles,
+      isActive,
       open,
       close,
     };

package/src/components/or-modal-v3/styles.ts

@@ -46,3 +46,28 @@ export const ModalRootSizes: Record<ModalSize, string[]> = {
     'md:w-[480px]',
   ],
 };
+
+export const ModalHeader: string[] = [
+  // Layout
+  'layout-row',
+
+  // Spacing
+  'px-md md:px-lg',
+
+  // Typography
+  'typography-headline-2',
+];
+
+export const ModalContent: string[] = [
+  // Box
+  'grow',
+  'overflow-auto',
+
+  // Spacing
+  'px-md md:px-lg',
+];
+
+export const ModalFooter: string[] = [
+  // Spacing
+  'px-md md:px-lg',
+];

package/src/components/or-pagination-v3/OrPagination.vue

@@ -52,7 +52,7 @@
         :activated="true"
         @click.stop="limitMenu.open()"
       >
-        {{ currentLimit }} <OrIcon :icon="limitMenu && limitMenu.state === 'open' ? 'arrow_drop_up' : 'arrow_drop_down'" />
+        {{ currentLimit }} <OrIcon :icon="limitMenu && limitMenu.isOpen ? 'arrow_drop_up' : 'arrow_drop_down'" />
       </OrButton>
 
       <OrMenu

package/src/components/or-popover-v3/OrPopover.vue

@@ -1,7 +1,7 @@
 <template>
   <OrTeleport>
     <div
-      v-show="state === 'open'"
+      v-show="isOpen"
       :class="['contents']"
     >
       <template v-if="isDesktop && variant === 'auto' || variant === 'popover'">
@@ -26,8 +26,8 @@
         <OrBottomSheet
           ref="bottomSheet"
           v-bind="bottomSheetProps"
-          :is-open="state === 'open'"
           @update:state="state = $event"
+          @update:state:closed-automatically="$emit('update:state:closed-automatically')"
         >
           <slot />
         </OrBottomSheet>
@@ -39,8 +39,8 @@
 <script lang="ts">
 import { autoUpdate, computePosition, flip, hide, shift } from '@floating-ui/dom';
 import { onClickOutside } from '@vueuse/core';
-import { PropType, computed, defineComponent, ref, toRef, unref, watchPostEffect } from 'vue-demi';
-import { useElevation, usePopoverState, useResponsive } from '../../hooks';
+import { PropType, computed, defineComponent, nextTick, ref, toRef, unref, watch, watchPostEffect } from 'vue-demi';
+import { useElevation, useResponsive } from '../../hooks';
 import { OrBottomSheetV3 as OrBottomSheet } from '../or-bottom-sheet-v3';
 import { OrTeleportV3 as OrTeleport } from '../or-teleport-v3';
 import { PopoverPlacement, PopoverVariant } from './props';
@@ -57,11 +57,6 @@ export default defineComponent({
   inheritAttrs: false,
 
   props: {
-    isOpen: {
-      type: Boolean,
-      default: false,
-    },
-
     variant: {
       type: String as PropType<`${PopoverVariant}`>,
       default: PopoverVariant.Auto,
@@ -100,22 +95,21 @@ export default defineComponent({
 
   emits: [
     'update:state',
-
-    'open',
-    'close',
+    'update:state:open',
+    'update:state:fullscreen',
+    'update:state:closed',
+    'update:state:closed-automatically',
   ],
 
   expose: [
     'root',
-
     'state',
-
+    'isOpen',
+    'isFullscreen',
+    'isClosed',
     'isFlipped',
-    'isHidden',
-
     'open',
     'close',
-    'toggle',
   ],
 
   setup(props, context) {
@@ -140,10 +134,112 @@ export default defineComponent({
     ]);
 
     // State
-    const { state, open, close, toggle } = usePopoverState(toRef(props, 'isOpen'), context);
+    const state = ref<'open' | 'fullscreen' | 'closed'>('closed');
+
+    const isOpen = computed(() => state.value === 'open');
+    const isFullscreen = computed(() => state.value === 'fullscreen');
+    const isClosed = computed(() => state.value === 'closed');
 
     const isFlipped = ref<boolean>(false);
-    const isHidden = ref<boolean>(false);
+
+    // Events
+    watch(state, (value) => {
+      context.emit('update:state', value);
+
+      switch (value) {
+        case 'open':
+          context.emit('update:state:open');
+          break;
+
+        case 'fullscreen':
+          context.emit('update:state:fullscreen');
+          break;
+
+        case 'closed':
+          context.emit('update:state:closed');
+          break;
+      }
+    });
+
+    // Methods
+    function open(): void {
+      state.value = 'open';
+
+      switch (props.variant) {
+        case PopoverVariant.Auto:
+          if (isMobile.value) {
+            nextTick(() => {
+              const bottomSheetInstance = bottomSheet.value;
+
+              if (bottomSheetInstance) {
+                (bottomSheetInstance.open as () => void)();
+              }
+            });
+          }
+
+          break;
+
+        case PopoverVariant.Popover:
+          break;
+
+        case PopoverVariant.BottomSheet:
+          nextTick(() => {
+            const bottomSheetInstance = bottomSheet.value;
+
+            if (bottomSheetInstance) {
+              (bottomSheetInstance.open as () => void)();
+            }
+          });
+
+          break;
+      }
+    }
+
+    function close(auto: boolean = false): void {
+      state.value = 'closed';
+
+      switch (props.variant) {
+        case PopoverVariant.Auto:
+          if (isMobile.value) {
+            nextTick(() => {
+              const bottomSheetInstance = bottomSheet.value;
+
+              if (bottomSheetInstance) {
+                (bottomSheetInstance.close as () => void)();
+              }
+            });
+          }
+
+          break;
+
+        case PopoverVariant.Popover:
+          break;
+
+        case PopoverVariant.BottomSheet:
+          nextTick(() => {
+            const bottomSheetInstance = bottomSheet.value;
+
+            if (bottomSheetInstance) {
+              (bottomSheetInstance.close as () => void)();
+            }
+          });
+
+          break;
+      }
+
+      if (auto) {
+        context.emit('update:state:closed-automatically');
+      }
+    }
+
+    // Handlers
+    function handleBottomSheetState(bottomSheetState: string): void {
+      if (bottomSheetState === 'closed') {
+        state.value = 'closed';
+      } else {
+        state.value = 'open';
+      }
+    }
 
     // Effects
     watchPostEffect(() => {
@@ -158,8 +254,8 @@ export default defineComponent({
               placement,
 
               middleware: [
-                shift(),
                 flip(),
+                shift(),
                 hide(),
               ],
             });
@@ -172,16 +268,11 @@ export default defineComponent({
             });
 
             isFlipped.value = Boolean(middlewareData.flip?.index);
-            isHidden.value = Boolean(middlewareData.hide?.referenceHidden);
           });
         }
       }
     });
 
-    // #region Elevation
-    useElevation(root, state);
-    // #endregion
-
     // #region Click Outside
     const trigger = toRef(props, 'trigger');
 
@@ -189,27 +280,33 @@ export default defineComponent({
       const path = event.composedPath() as Element[];
 
       if (!path.some(({ classList }) => classList?.contains('or-popover-v3') || classList?.contains('or-bottom-sheet-v3'))) {
-        close();
+        close(true);
       }
     }, {
       ignore: [trigger],
     });
     // #endregion
 
+    // #region Elevation
+    useElevation(root, state);
+    // #endregion
+
     return {
       isDesktop,
       isMobile,
       root,
       bottomSheet,
       bottomSheetRoot,
+      handleBottomSheetState,
       rootStyles,
       bodyStyles,
       state,
+      isOpen,
+      isFullscreen,
+      isClosed,
       isFlipped,
-      isHidden,
       open,
       close,
-      toggle,
     };
   },
 });

package/src/components/or-time-picker-v3/OrTimePicker.vue

@@ -43,7 +43,7 @@
         :bottom-sheet-props="{ variant: 'basic' }"
         :trigger="inputBoxRoot"
         :placement="'bottom-start'"
-        @close="reset()"
+        @update:state:closed-automatically="reset()"
       >
         <OrDateTimePickerPopoverHeader>
           <OrDateTimePickerMobileControl label="Time">

package/src/components/or-tooltip-v3/OrTooltip.vue

@@ -2,20 +2,18 @@
   <div
     ref="root"
     :class="rootStyles"
-    @mouseenter="open()"
-    @mouseleave="close()"
   >
     <slot />
 
     <template v-if="text">
       <OrPopover
-        :is-open="state === 'open'"
+        ref="popover"
         :variant="'popover'"
         :trigger="root"
         :placement="placement"
         :full-width="false"
         :disable-default-styles="true"
-        @update:state="state = $event"
+        @update:state="$emit('update:state', $event)"
       >
         <div :class="bodyStyles">
           {{ text }}
@@ -26,8 +24,8 @@
 </template>
 
 <script lang="ts">
-import { PropType, computed, defineComponent, ref, toRef } from 'vue-demi';
-import { usePopoverState } from '../../hooks';
+import { useDebounceFn, useElementHover } from '@vueuse/core';
+import { PropType, computed, defineComponent, ref, watch } from 'vue-demi';
 import { OrPopoverV3 as OrPopover } from '../or-popover-v3';
 import { TooltipPlacement } from './props';
 import { TooltipBody, TooltipBodyPlacements, TooltipRoot } from './styles';
@@ -40,43 +38,34 @@ export default defineComponent({
   },
 
   props: {
-    isOpen: {
-      type: Boolean,
-      default: false,
-    },
-
     text: {
       type: String,
       default: undefined,
     },
 
     placement: {
-      type: String as PropType<TooltipPlacement>,
+      type: String as PropType<`${TooltipPlacement}`>,
       default: TooltipPlacement.Bottom,
     },
   },
 
   emits: [
     'update:state',
-
-    'open',
-    'close',
   ],
 
   expose: [
     'root',
-
-    'state',
-
     'open',
     'close',
-    'toggle',
   ],
 
-  setup(props, context) {
+  setup(props) {
     // Refs
     const root = ref<HTMLElement>();
 
+    const popover = ref<InstanceType<typeof OrPopover>>();
+    const popoverRoot = computed(() => popover.value?.root);
+
     // Styles
     const rootStyles = computed(() => [
       'or-tooltip-v3',
@@ -88,17 +77,44 @@ export default defineComponent({
       ...TooltipBodyPlacements[props.placement],
     ]);
 
-    // State
-    const { state, open, close, toggle } = usePopoverState(toRef(props, 'isOpen'), context, { debounce: 250 });
+    // Methods
+    const open = useDebounceFn(() => {
+      if (hover.value) {
+        const popoverInstance = popover.value;
+
+        if (popoverInstance) {
+          (popoverInstance.open as () => void)();
+        }
+      }
+    }, 250);
+
+    const close = useDebounceFn(() => {
+      if (!hover.value) {
+        const popoverInstance = popover.value;
+
+        if (popoverInstance) {
+          (popoverInstance.close as () => void)();
+        }
+      }
+    }, 250);
+
+    // Effects
+    // #region Hover
+    const hover = useElementHover(root);
+
+    watch(hover, (value) => {
+      value ? open() : close();
+    });
+    // #endregion
 
     return {
       root,
+      popover,
+      popoverRoot,
       rootStyles,
       bodyStyles,
-      state,
       open,
       close,
-      toggle,
     };
   },
 });