@onereach/ui-components 4.7.0-beta.2809.0 → 4.7.0-beta.2811.0

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

@@ -0,0 +1,10 @@
+export const ModalContent: string[] = [
+  // Layout
+  'grow',
+
+  // Overflow
+  'overflow-auto',
+
+  // Spacing
+  'px-md md:px-lg',
+];

package/src/components/or-modal-v3/partials/or-modal-footer/OrModalFooter.vue

@@ -0,0 +1,37 @@
+<template>
+  <div
+    ref="root"
+    :class="rootStyles"
+  >
+    <slot />
+  </div>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent, ref } from 'vue-demi';
+import { ModalFooter } from './styles';
+
+export default defineComponent({
+  name: 'OrModalFooter',
+
+  expose: [
+    'root',
+  ],
+
+  setup() {
+    // Refs
+    const root = ref<HTMLElement>();
+
+    // Styles
+    const rootStyles = computed(() => [
+      'or-modal-footer',
+      ...ModalFooter,
+    ]);
+
+    return {
+      root,
+      rootStyles,
+    };
+  },
+});
+</script>

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

@@ -0,0 +1,4 @@
+export const ModalFooter: string[] = [
+  // Spacing
+  'px-md md:px-lg',
+];

package/src/components/or-modal-v3/partials/or-modal-header/OrModalHeader.vue

@@ -0,0 +1,54 @@
+<template>
+  <div
+    ref="root"
+    :class="rootStyles"
+  >
+    <div :class="['grow']">
+      <slot />
+    </div>
+
+    <OrIconButton
+      :icon="'close'"
+      :size="'l'"
+      @click.stop="$emit('close')"
+    />
+  </div>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent, ref } from 'vue-demi';
+import { OrIconButtonV3 as OrIconButton } from '../../../or-icon-button-v3';
+import { ModalHeader } from './styles';
+
+export default defineComponent({
+  name: 'OrModalHeader',
+
+  components: {
+    OrIconButton,
+  },
+
+  emits: [
+    'close',
+  ],
+
+  expose: [
+    'root',
+  ],
+
+  setup() {
+    // Refs
+    const root = ref<HTMLElement>();
+
+    // Styles
+    const rootStyles = computed(() => [
+      'or-modal-header',
+      ...ModalHeader,
+    ]);
+
+    return {
+      root,
+      rootStyles,
+    };
+  },
+});
+</script>

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

@@ -0,0 +1,10 @@
+export const ModalHeader: string[] = [
+  // Layout
+  'layout-row',
+
+  // Spacing
+  'px-md md:px-lg',
+
+  // Typography
+  'typography-headline-2',
+];

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

@@ -46,28 +46,3 @@ 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.isOpen ? 'arrow_drop_up' : 'arrow_drop_down'" />
+        {{ currentLimit }} <OrIcon :icon="limitMenu && limitMenu.state === 'open' ? '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="isOpen"
+      v-show="state === 'open'"
       :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, nextTick, ref, toRef, unref, watch, watchPostEffect } from 'vue-demi';
-import { useElevation, useResponsive } from '../../hooks';
+import { PropType, computed, defineComponent, ref, toRef, unref, watchPostEffect } from 'vue-demi';
+import { useElevation, usePopoverState, 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,6 +57,11 @@ export default defineComponent({
   inheritAttrs: false,
 
   props: {
+    isOpen: {
+      type: Boolean,
+      default: false,
+    },
+
     variant: {
       type: String as PropType<`${PopoverVariant}`>,
       default: PopoverVariant.Auto,
@@ -95,21 +100,22 @@ export default defineComponent({
 
   emits: [
     'update:state',
-    'update:state:open',
-    'update:state:fullscreen',
-    'update:state:closed',
-    'update:state:closed-automatically',
+
+    'open',
+    'close',
   ],
 
   expose: [
     'root',
+
     'state',
-    'isOpen',
-    'isFullscreen',
-    'isClosed',
+
     'isFlipped',
+    'isHidden',
+
     'open',
     'close',
+    'toggle',
   ],
 
   setup(props, context) {
@@ -134,112 +140,10 @@ export default defineComponent({
     ]);
 
     // State
-    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 { state, open, close, toggle } = usePopoverState(toRef(props, 'isOpen'), context);
 
     const isFlipped = 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';
-      }
-    }
+    const isHidden = ref<boolean>(false);
 
     // Effects
     watchPostEffect(() => {
@@ -254,8 +158,8 @@ export default defineComponent({
               placement,
 
               middleware: [
-                flip(),
                 shift(),
+                flip(),
                 hide(),
               ],
             });
@@ -268,11 +172,16 @@ 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');
 
@@ -280,33 +189,27 @@ 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(true);
+        close();
       }
     }, {
       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'"
-        @update:state:closed-automatically="reset()"
+        @close="reset()"
       >
         <OrDateTimePickerPopoverHeader>
           <OrDateTimePickerMobileControl label="Time">

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

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

package/src/hooks/index.ts

@@ -2,6 +2,7 @@ export { useControlAttributes } from './useControlAttributes';
 export { useElevation } from './useElevation';
 export { useIdAttribute } from './useIdAttribute';
 export { useOverflow } from './useOverflow';
+export { usePopoverState } from './usePopoverState';
 export { useResponsive } from './useResponsive';
 export { default as useToggle } from './useToggle';
 export { useValidationAttributes } from './useValidationAttributes';

package/src/hooks/useControlAttributes.ts

@@ -1,6 +1,6 @@
 import { computed, ComputedRef, useAttrs } from 'vue-demi';
 
-interface ControlAttributes {
+export interface ControlAttributes {
   readonly: ComputedRef<boolean | undefined>;
   disabled: ComputedRef<boolean | undefined>;
 

package/src/hooks/useElevation.ts

@@ -25,6 +25,8 @@ export function useElevation(
 
   // Effects
   watch([elementRef, triggerRef], ([element]) => {
-    if (element) setElementElevation(element);
+    if (element) {
+      setElementElevation(element);
+    }
   }, { immediate: true });
 }

package/src/hooks/usePopoverState.ts

@@ -0,0 +1,66 @@
+import { debouncedRef } from '@vueuse/core';
+import { Ref, SetupContext, UnwrapRef, ref, watch } from 'vue-demi';
+
+export interface PopoverState {
+  state: Ref<'open' | 'closed'>;
+
+  open: () => void;
+  close: () => void;
+  toggle: () => void;
+}
+
+export interface PopoverStateOptions {
+  debounce?: number;
+}
+
+// TODO: Remove type `any` (https://github.com/microsoft/TypeScript/issues/27808)
+// TODO: Use `defineEmits` after migration to Vue 3
+export function usePopoverState(
+  isOpen: Ref<boolean>,
+  context: SetupContext<('update:state' | 'open' | 'close' | any)[]>,
+  options?: PopoverStateOptions
+): PopoverState {
+  // State
+  const state = ref<UnwrapRef<PopoverState['state']>>(isOpen.value ? 'open' : 'closed');
+
+  watch(isOpen, (value) => {
+    state.value = value ? 'open' : 'closed';
+  });
+
+  const debouncedState = options?.debounce ? debouncedRef(state, options.debounce) : state;
+
+  watch(debouncedState, (value) => {
+    context.emit('update:state', value);
+
+    switch (value) {
+      case 'open':
+        context.emit('open');
+        break;
+
+      case 'closed':
+        context.emit('close');
+        break;
+    }
+  });
+
+  // Methods
+  function open(): void {
+    state.value = 'open';
+  }
+
+  function close(): void {
+    state.value = 'closed';
+  }
+
+  function toggle(): void {
+    state.value = state.value === 'open' ? 'closed' : 'open';
+  }
+
+  return {
+    state: debouncedState,
+
+    open,
+    close,
+    toggle,
+  };
+}

package/src/hooks/useValidationAttributes.ts

@@ -1,6 +1,6 @@
 import { computed, ComputedRef, useAttrs } from 'vue-demi';
 
-interface ValidationAttributes {
+export interface ValidationAttributes {
   required: ComputedRef<boolean | undefined>;
   minlength: ComputedRef<number | undefined>;
   maxlength: ComputedRef<number | undefined>;