@onereach/ui-components 2.74.3-beta.2302.0 → 2.74.3-beta.2303.0

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

@@ -7,7 +7,7 @@ export const ButtonRoot: string[] = [
   // Shape
   'rounded-md',
 
-  // Sizing
+  // Spacing
   'min-w-[96px]',
 
   // Interactivity
@@ -48,9 +48,9 @@ export const ButtonRootVariants: Record<ButtonVariant, string[]> = {
 
   'link': [
     // Spacing
-    'gap-sm md:gap-xs',
+    'gap-xs',
 
-    // Sizing
+    // Spacing
     'min-w-[auto]',
   ],
 };

package/src/components/or-empty-state-v3/styles.ts

@@ -11,12 +11,12 @@ export const EmptyStateRoot: string[] = [
   // Box
   'w-full',
 
-  // Sizing
+  // Spacing
   'gap-sm',
 ];
 
 export const EmptyStateImage = [
-  // Sizing
+  // Spacing
   'mb-sm',
 ];
 

package/src/components/or-error-tag-v3/styles.ts

@@ -3,7 +3,7 @@ export const ErrorTagRoot: string[] = [
   'layout-inline-row',
 
   // Box
-  'max-w-fit',
+  'max-w-min',
 
   // Shape
   'rounded-full',

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

@@ -1,32 +1,29 @@
 <template>
-  <div
-    ref="root"
-    :class="rootStyles"
+  <OrPopover
+    ref="popover"
+    :variant="'auto'"
+    :trigger="trigger"
+    :placement="placement"
+    :full-width="false"
+    :disable-default-styles="false"
+    @update:state="$emit('update:state', $event)"
   >
-    <OrPopover
-      ref="popover"
-      :variant="'auto'"
-      :trigger="trigger"
-      :placement="placement"
-      :full-width="false"
-      :disable-default-styles="false"
-      @update:state="$emit('update:state', $event)"
+    <div
+      ref="root"
+      v-bind="$attrs"
+      :class="rootStyles"
+      @click.stop="onClick"
     >
-      <div
-        :class="bodyStyles"
-        @click.stop="onClick"
-      >
-        <slot />
-      </div>
-    </OrPopover>
-  </div>
+      <slot />
+    </div>
+  </OrPopover>
 </template>
 
 <script lang="ts">
 import { computed, defineComponent, PropType, ref } from 'vue-demi';
 import { OrPopoverV3 as OrPopover } from '../or-popover-v3';
 import { MenuPlacement } from './props';
-import { MenuBody, MenuRoot } from './styles';
+import { MenuRoot } from './styles';
 
 export default defineComponent({
   name: 'OrMenu',
@@ -35,6 +32,8 @@ export default defineComponent({
     OrPopover,
   },
 
+  inheritAttrs: false,
+
   props: {
     trigger: {
       type: HTMLElement,
@@ -53,9 +52,9 @@ export default defineComponent({
 
   expose: [
     'root',
+    'isOpen',
     'open',
     'close',
-    'isOpen',
     'toggle',
   ],
 
@@ -65,7 +64,6 @@ export default defineComponent({
 
     const popover = ref<InstanceType<typeof OrPopover>>();
     const popoverRoot = computed(() => popover.value?.root);
-    const isOpen = computed(() => popover.value?.isOpen);
 
     // Styles
     const rootStyles = computed(() => [
@@ -73,9 +71,8 @@ export default defineComponent({
       ...MenuRoot,
     ]);
 
-    const bodyStyles = computed(() => [
-      ...MenuBody,
-    ]);
+    // State
+    const isOpen = computed(() => popover.value?.isOpen);
 
     // Methods
     function open(): void {
@@ -116,7 +113,6 @@ export default defineComponent({
       popover,
       popoverRoot,
       rootStyles,
-      bodyStyles,
       isOpen,
       open,
       close,

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

@@ -1,9 +1,4 @@
 export const MenuRoot: string[] = [
-  // Layout
-  'inline-block',
-];
-
-export const MenuBody: string[] = [
   // Layout
   'overflow-y-auto',
 

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

@@ -14,31 +14,35 @@
         <OrIcon :icon="'keyboard_arrow_left'" />
       </OrButton>
 
-      <OrButton
-        v-for="(page, index) in buttonGroup"
-        :key="index"
-        :class="itemStyles"
-        :variant="'link'"
-        :color="'inherit'"
-        :activated="currentPage === page"
-        @click.stop="typeof page === 'number' && toPage(page)"
-      >
-        {{ page }}
-      </OrButton>
-
-      <OrButton
-        :class="itemStyles"
-        :variant="'link'"
-        :color="'inherit'"
-        :disabled="currentPage === lastPage"
-        @click.stop="toNextPage()"
-      >
-        <OrIcon :icon="'keyboard_arrow_right'" />
-      </OrButton>
+      <template v-if="isDesktop">
+        <OrButton
+          v-for="(page, index) in buttonGroup"
+          :key="index"
+          :class="itemStyles"
+          :variant="'link'"
+          :color="'inherit'"
+          :activated="currentPage === page"
+          @click.stop="typeof page === 'number' && toPage(page)"
+        >
+          {{ page }}
+        </OrButton>
+
+        <OrButton
+          :class="itemStyles"
+          :variant="'link'"
+          :color="'inherit'"
+          :disabled="currentPage === lastPage"
+          @click.stop="toNextPage()"
+        >
+          <OrIcon :icon="'keyboard_arrow_right'" />
+        </OrButton>
+      </template>
     </div>
 
     <div :class="limitControlStyles">
-      Per page:
+      <template v-if="isDesktop">
+        Per page:
+      </template>
 
       <OrButton
         ref="limitButton"
@@ -48,28 +52,44 @@
         :activated="true"
         @click.stop="limitMenu.open()"
       >
-        {{ currentLimit }} <OrIcon :icon="'arrow_drop_down'" />
+        {{ currentLimit }} <OrIcon :icon="limitMenu && limitMenu.isOpen ? 'arrow_drop_up' : 'arrow_drop_down'" />
       </OrButton>
 
       <OrMenu
         ref="limitMenu"
+        :class="['min-w-[60px]']"
         :trigger="limitButtonRoot"
         :placement="'top'"
       >
         <OrMenuItem
           v-for="pageSize in pageSizeOptions"
           :key="pageSize"
-          @click.stop="currentLimit = pageSize"
+          @click.stop="currentLimit = pageSize; limitMenu.close()"
         >
           {{ pageSize }}
         </OrMenuItem>
       </OrMenu>
     </div>
+
+    <template v-if="isMobile">
+      <div :class="offsetControlStyles">
+        <OrButton
+          :class="itemStyles"
+          :variant="'link'"
+          :color="'inherit'"
+          :disabled="currentPage === lastPage"
+          @click.stop="toNextPage()"
+        >
+          <OrIcon :icon="'keyboard_arrow_right'" />
+        </OrButton>
+      </div>
+    </template>
   </div>
 </template>
 
 <script lang="ts">
 import { computed, defineComponent, PropType, ref } from 'vue-demi';
+import { useResponsive } from '../../hooks';
 import { OrButtonV3 as OrButton } from '../or-button-v3';
 import { OrIconV3 as OrIcon } from '../or-icon-v3';
 import { OrMenuItemV3 as OrMenuItem } from '../or-menu-item-v3';
@@ -118,6 +138,8 @@ export default defineComponent({
   ],
 
   setup(props, context) {
+    const { isDesktop, isMobile } = useResponsive();
+
     // Refs
     const root = ref<HTMLElement>();
 
@@ -193,24 +215,43 @@ export default defineComponent({
     });
 
     const buttonGroup = computed<(number | string)[]>(() => {
-      return Array.from({ length: lastPage.value }, (_, index) => index + 1)
-        .map((page) => {
-          switch (true) {
-            case page > firstPage.value && page < currentPage.value - 1:
-            case page > currentPage.value + 1 && page < lastPage.value:
-              return '…';
-
-            default:
-              return page;
-          }
-        })
-        .reduce((accumulator, page) => {
-          if (accumulator[accumulator.length - 1] === page) {
-            return accumulator;
-          }
-
-          return [...accumulator, page];
-        }, [] as (number | string)[]);
+      const pages = Array.from({ length: lastPage.value }, (_, index) => index + 1);
+
+      switch (true) {
+        case currentPage.value < firstPage.value + 4:
+          return [
+            ...pages.slice(0, 5),
+            '…',
+            lastPage.value,
+          ];
+
+        case currentPage.value > lastPage.value - 4:
+          return [
+            firstPage.value,
+            '…',
+            ...pages.slice(-5),
+          ];
+
+        default:
+          return pages
+            .map((page) => {
+              switch (true) {
+                case page > firstPage.value && page < currentPage.value - 1:
+                case page < lastPage.value && page > currentPage.value + 1:
+                  return '…';
+
+                default:
+                  return page;
+              }
+            })
+            .reduce((accumulator, page) => {
+              if (accumulator[accumulator.length - 1] === page) {
+                return accumulator;
+              }
+
+              return [...accumulator, page];
+            }, [] as (number | string)[]);
+      }
     });
 
     // Methods
@@ -227,6 +268,9 @@ export default defineComponent({
     }
 
     return {
+      isDesktop,
+      isMobile,
+
       root,
       limitButton,
       limitButtonRoot,

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

@@ -3,7 +3,7 @@ export const PaginationRoot: string[] = [
   'layout-row',
 
   // Spacing
-  'gap-xl',
+  'gap-lg md:gap-xl',
 
   // Typography
   'typography-caption-regular',

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

@@ -232,7 +232,7 @@ export default defineComponent({
     // #endregion
 
     // #region Elevation
-    useElevation(root, state);
+    useElevation(root);
     // #endregion
 
     return {

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

@@ -1,4 +1,4 @@
-import { ProgressType, ProgressColor } from './props';
+import { ProgressColor, ProgressType } from './props';
 
 export const ProgressRoot: string[] = [
   // Typography
@@ -31,7 +31,7 @@ export const ProgressHeader: string[] = [
   'flex',
   'flex-row',
 
-  // Sizing
+  // Spacing
   'mb-[6px]',
 ];
 
@@ -45,7 +45,7 @@ export const ProgressHeaderLabel: string[] = [
 ];
 
 export const ProgressHeaderPercent: string[] = [
-  // Sizing
+  // Spacing
   'ml-auto',
 ];
 
@@ -102,6 +102,6 @@ export const ProgressBarColors: Record<Exclude<ProgressColor, ProgressColor.Auto
 };
 
 export const ProgressFooter: string[] = [
-  // Sizing
+  // Spacing
   'mt-[2px]',
 ];

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

@@ -202,7 +202,7 @@ export const SidebarContent: string[] = [
   'grow',
   'overflow-auto',
 
-  // Sizing
+  // Spacing
   'p-md',
 ];
 
@@ -211,7 +211,7 @@ export const SidebarFooter: string[] = [
   'shrink-0',
   'overflow-x-hidden',
 
-  // Sizing
+  // Spacing
   'p-md',
 
   // Borders

package/src/components/or-tag-v3/OrTag.stories3.ts

@@ -1,13 +1,13 @@
 import { action } from '@storybook/addon-actions';
 import { Meta, StoryFn } from '@storybook/vue3';
 import Faker from 'faker';
+import { ref } from 'vue-demi';
+import { useOverflow } from '../../hooks';
+import { OrButtonV3 as OrButton } from '../or-button-v3';
+import { OrPopoverV3 as OrPopover } from '../or-popover-v3';
 import OrTagDocs from './OrTag.docs.mdx';
 import OrTag from './OrTag.vue';
 import { TagColor, TagVariant } from './props';
-import { OrButtonV3 as OrButton } from '../or-button-v3';
-import { OrPopoverV3 as OrPopover } from '../or-popover-v3';
-import { useOverflow } from '../../hooks';
-import { ref } from 'vue-demi';
 
 export default {
   title: 'Components/Tag',
@@ -77,7 +77,7 @@ const Template: StoryFn<typeof OrTag> = (args) => ({
       @blur="handleBlur"
       @reset="handleReset"
     >
-    ${args.default}
+      ${args.default}
     </OrTag>
   `,
 });

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

@@ -5,7 +5,7 @@ export const TagRoot: string[] = [
   'layout-inline-row',
 
   // Box
-  'max-w-fit',
+  'max-w-min',
 
   // Shape
   'rounded-full',

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

@@ -2,13 +2,16 @@ import { TooltipPlacement } from './props';
 
 export const TooltipRoot: string[] = [
   // Layout
-  'layout-inline-row justify-center',
+  'inline-block',
 ];
 
 export const TooltipBody: string[] = [
   // Layout
   'layout-inline-row',
 
+  // Box
+  'max-w-min',
+
   // Shape
   'rounded-sm',
 

package/src/hooks/useElevation.ts

@@ -1,13 +1,11 @@
 import { MaybeElementRef } from '@vueuse/core';
-import { isRef, Ref, ref, watch } from 'vue-demi';
+import { isRef, ref, watch } from 'vue-demi';
 import isVisible from '../utils/isVisible';
 
 export function useElevation(
-  element: MaybeElementRef<HTMLElement | undefined>,
-  trigger?: Ref<unknown>
+  element: MaybeElementRef<HTMLElement | undefined>
 ): void {
   const elementRef = isRef(element) ? element : ref(element);
-  const triggerRef = isRef(trigger) ? trigger : ref();
 
   // Functions
   function getPageElevations(): number[] {
@@ -23,7 +21,7 @@ export function useElevation(
   }
 
   // Effects
-  watch([elementRef, triggerRef], ([element]) => {
+  watch(elementRef, (element) => {
     if (element) setElementElevation(element);
   }, { immediate: true });
 }