@onereach/ui-components 2.72.2-beta.2270.0 → 2.72.2-beta.2271.0

package/dist/esm/v3/components/or-tabs-v3/index.js

@@ -1,11 +1,11 @@
-export { s as OrTabsV3, T as TabsVariant } from '../../OrTabs-328d41b9.js';
+export { s as OrTabsV3, T as TabsVariant } from '../../OrTabs-8c550d38.js';
 import '@vueuse/core';
 import 'vue-demi';
 import '../../OrIcon-34f59f73.js';
 import 'vue';
 import '../../OrMenuItem-58707d47.js';
-import '../../OrMenu-7f3ea117.js';
-import '../../OrPopover-40217b49.js';
+import '../../OrMenu-34e6601c.js';
+import '../../OrPopover-a24dba9b.js';
 import '@floating-ui/dom';
 import '../../useElevation-31bfe1f6.js';
 import '../../useResponsive-a02e95b7.js';

package/dist/esm/v3/components/or-tag-v3/index.js

@@ -1,11 +1,11 @@
-export { s as OrTagV3, a as TagColor, T as TagVariant } from '../../OrTag-148ff9ae.js';
+export { s as OrTagV3, a as TagColor, T as TagVariant } from '../../OrTag-88dff18b.js';
 import 'vue-demi';
-import '../../OrIconButton-2dcfb83e.js';
+import '../../OrIconButton-24b89457.js';
 import '../../OrIcon-34f59f73.js';
 import 'vue';
-import '../../OrTooltip-b07616f4.js';
+import '../../OrTooltip-e12df498.js';
 import '@vueuse/core';
-import '../../OrPopover-40217b49.js';
+import '../../OrPopover-a24dba9b.js';
 import '@floating-ui/dom';
 import '../../useElevation-31bfe1f6.js';
 import '../../useResponsive-a02e95b7.js';

package/dist/esm/v3/components/or-toast-v3/index.js

@@ -1,17 +1,17 @@
-export { a as OrToastContainerV3, s as OrToastV3, t as TypesV3 } from '../../types-c3417028.js';
+export { a as OrToastContainerV3, s as OrToastV3, t as TypesV3 } from '../../types-92ea0eb9.js';
 export { p as PropsV3, a as useQueueV3, u as useToastV3 } from '../../useToast-0665462d.js';
 import '@vueuse/core';
 import 'vue-demi';
 import '../../OrTeleport.vue3-8099178c.js';
 import 'vue';
-import '../../OrIconButton-2dcfb83e.js';
+import '../../OrIconButton-24b89457.js';
 import '../../OrIcon-34f59f73.js';
-import '../../OrTooltip-b07616f4.js';
-import '../../OrPopover-40217b49.js';
+import '../../OrTooltip-e12df498.js';
+import '../../OrPopover-a24dba9b.js';
 import '@floating-ui/dom';
 import '../../useElevation-31bfe1f6.js';
 import '../../useResponsive-a02e95b7.js';
 import '../../OrBottomSheet-13a416ef.js';
 import '../../OrOverlay-afad3aa4.js';
-import '../../OrLoader-1709eb68.js';
+import '../../OrLoader-a53d2edf.js';
 import '../../style-inject.es-4c6f2515.js';

package/dist/esm/v3/components/or-tooltip-v3/index.js

@@ -1,5 +1,5 @@
-export { s as OrTooltipV3 } from '../../OrTooltip-b07616f4.js';
-export { P as TooltipPlacement } from '../../OrPopover-40217b49.js';
+export { s as OrTooltipV3 } from '../../OrTooltip-e12df498.js';
+export { P as TooltipPlacement } from '../../OrPopover-a24dba9b.js';
 import '@vueuse/core';
 import 'vue-demi';
 import 'vue';

package/dist/esm/v3/index.js

@@ -3,10 +3,10 @@ export { a as AvatarColor, A as AvatarSize, s as OrAvatarV3 } from './OrAvatar-6
 export { s as OrBottomSheetV3 } from './OrBottomSheet-13a416ef.js';
 export { s as OrButton, a as OrButtonColors, b as OrButtonSizes, O as OrButtonViews } from './OrButton-fca9019a.js';
 export { b as BUTTON_COLOR, d as BUTTON_LOADER_TYPE, c as BUTTON_SIZE, B as BUTTON_TYPE, I as ICON_BUTTON_TYPE, s as OrButtonV2, a as OrIconButton } from './OrIconButton-8be9c89f.js';
-export { a as ButtonColor, b as ButtonType, B as ButtonVariant, s as OrButtonV3 } from './OrButton-d9f6c316.js';
+export { a as ButtonColor, b as ButtonType, B as ButtonVariant, s as OrButtonV3 } from './OrButton-55dd2ad9.js';
 export { s as OrCard } from './OrCard-e3a5aea4.js';
 export { C as CARD_COLLECTION_LAYOUT, s as OrCardCollection } from './OrCardCollection-1e44c758.js';
-export { D as DefaultCardCollectionViews, s as OrCardCollectionV3, d as defaultViewModes, g as gridView, l as listView } from './OrCardCollection-04b36455.js';
+export { D as DefaultCardCollectionViews, s as OrCardCollectionV3, d as defaultViewModes, g as gridView, l as listView } from './OrCardCollection-85fdfd7f.js';
 export { s as OrCardV3 } from './OrCard-cd6af82e.js';
 export { a as OrCarousel, s as OrCarouselItem } from './OrCarouselItem-636d99a1.js';
 export { s as OrCheckbox } from './OrCheckbox-ed4a19cf.js';
@@ -16,26 +16,26 @@ export { s as OrCode, O as OrCodeLanguages } from './OrCode-5ed69c23.js';
 export { s as OrCollapse } from './OrCollapse-445141ab.js';
 export { s as OrColorPicker, h as amber, n as black, b as blue, m as blueGrey, k as brown, c as cyan, j as deepOrange, d as deepPurple, g as green, i as indigo, l as lightBlue, e as lightGreen, f as lime, o as orange, p as pink, a as purple, r as red, t as teal, w as white, y as yellow } from './OrColorPicker-189cb097.js';
 export { s as OrConfirm } from './OrConfirm-c11ee2ec.js';
-export { C as ConfirmType, s as OrConfirmV3 } from './OrConfirm-d7d6255c.js';
+export { C as ConfirmType, s as OrConfirmV3 } from './OrConfirm-f2f4738b.js';
 export { D as DEFAULT_TEXT, s as OrDateTimePicker, a as OrDateTimePickerItemTypes, O as OrDateTimePickerTypes } from './OrDateTimePicker-f2e08564.js';
 export { s as OrError } from './OrError-f90296db.js';
-export { s as OrErrorTagV3 } from './OrErrorTag-308119de.js';
+export { s as OrErrorTagV3 } from './OrErrorTag-a3e6ef83.js';
 export { s as OrErrorV3 } from './OrError-19198748.js';
-export { E as EmptyStateSize, s as OrEmptyStateV3 } from './OrEmptyState-bb8e3145.js';
+export { E as EmptyStateSize, s as OrEmptyStateV3 } from './OrEmptyState-cd3a4026.js';
 export { a as ExpansionPanelColor, E as ExpansionPanelVariant, s as OrExpansionPanelV3 } from './OrExpansionPanel-3a4282da.js';
 export { F as FabColor, s as OrFabV3 } from './OrFab-61131b31.js';
 export { s as OrFloating, a as OrFloatingHideStrategy, O as OrFloatingPlacements } from './OrFloating-5240e758.js';
 export { s as OrHint } from './OrHint-1414c530.js';
 export { s as OrHintV3 } from './OrHint-6863124f.js';
 export { s as OrIcon, O as OrIconColors, a as OrIconType } from './OrIcon-669503c3.js';
-export { I as IconButtonColor, s as OrIconButtonV3 } from './OrIconButton-2dcfb83e.js';
+export { I as IconButtonColor, s as OrIconButtonV3 } from './OrIconButton-24b89457.js';
 export { I as IconButtonSize, I as IconSize, a as IconVariant, s as OrIconV3 } from './OrIcon-34f59f73.js';
 export { I as InlineInputBoxSize, I as InlineInputSize, s as OrInlineInputBoxV3 } from './OrInlineInputBox-09b33e18.js';
-export { I as InlineInputType, s as OrInlineInputV3 } from './OrInlineInput-fbc35f85.js';
+export { I as InlineInputType, s as OrInlineInputV3 } from './OrInlineInput-fa55010c.js';
 export { a as InlineTextEditTrimmingTypes, I as InlineTextEditTypes, s as OrInlineTextEdit } from './OrInlineTextEdit-1aa477b5.js';
-export { s as OrInlineTextareaV3 } from './OrInlineTextarea-79da8697.js';
+export { s as OrInlineTextareaV3 } from './OrInlineTextarea-2f25e0cb.js';
 export { a as InputBoxSize, I as InputBoxVariant, a as InputSize, s as OrInputBoxV3, a as SearchSize, a as SelectSize, a as TextareaSize } from './OrInputBox-e16ade90.js';
-export { I as InputType, s as OrInputV3 } from './OrInput-bd054213.js';
+export { I as InputType, s as OrInputV3 } from './OrInput-22b90c7d.js';
 export { s as OrInput } from './OrInput-81125804.js';
 export { s as OrLabel } from './OrLabel-876f8729.js';
 export { L as LabelVariant, s as OrLabelV3 } from './OrLabel-f700f9fb.js';
@@ -43,46 +43,46 @@ export { L as LinkColor, s as OrLinkV3 } from './OrLink-07f6f27d.js';
 export { s as OrList } from './OrList-b740d13e.js';
 export { s as OrListOfInputs } from './OrListOfInputs-508e056f.js';
 export { L as LoaderViews, s as OrLoader } from './OrLoader-15174477.js';
-export { a as LoaderColor, b as LoaderSize, L as LoaderVariant, s as OrLoaderV3 } from './OrLoader-1709eb68.js';
+export { a as LoaderColor, b as LoaderSize, L as LoaderVariant, s as OrLoaderV3 } from './OrLoader-a53d2edf.js';
 export { s as OrMenuItemV3 } from './OrMenuItem-58707d47.js';
-export { s as OrMenuV3 } from './OrMenu-7f3ea117.js';
-export { P as MenuPlacement, s as OrPopoverV3, P as PopoverPlacement, a as PopoverVariant, P as TooltipPlacement } from './OrPopover-40217b49.js';
+export { s as OrMenuV3 } from './OrMenu-34e6601c.js';
+export { P as MenuPlacement, s as OrPopoverV3, P as PopoverPlacement, a as PopoverVariant, P as TooltipPlacement } from './OrPopover-a24dba9b.js';
 export { s as OrModal, O as OrModalSizes } from './OrModal-8b074b0c.js';
-export { M as ModalSize, s as OrModalV3 } from './OrModal-4219a6dc.js';
+export { M as ModalSize, s as OrModalV3 } from './OrModal-ff6512f4.js';
 export { a as OR_NOTIFICATION_SIZE, O as OR_NOTIFICATION_TYPE, s as OrNotification } from './OrNotification-e85a4956.js';
-export { N as NotificationVariant, s as OrNotificationV3 } from './OrNotification-0e682c7f.js';
+export { N as NotificationVariant, s as OrNotificationV3 } from './OrNotification-9e1b7e16.js';
 export { s as OrNumberInput } from './OrNumberInput-b32b5ce3.js';
 export { s as OrOverflowMenu } from './OrOverflowMenu-e82cbcbe.js';
 export { s as OrOverlay } from './OrOverlay-451dce49.js';
 export { s as OrOverlayV3 } from './OrOverlay-afad3aa4.js';
 export { s as OrPassword } from './OrPassword-b0cbb578.js';
-export { s as OrPaginationV3 } from './OrPagination-7cbdbb05.js';
+export { s as OrPaginationV3 } from './OrPagination-a6b63ef2.js';
 export { s as OrProgress, O as OrProgressColors, a as OrProgressTypes } from './OrProgress-d0d52c86.js';
-export { s as OrProgressV3, P as ProgressColor, a as ProgressType } from './OrProgress-639ed5e8.js';
+export { s as OrProgressV3, P as ProgressColor, a as ProgressType } from './OrProgress-4856808a.js';
 export { s as OrRadio } from './OrRadio-c3ab11f2.js';
 export { s as OrRadioGroup } from './OrRadioGroup-00785e41.js';
 export { s as OrRadioV3 } from './OrRadio-bb9b37c1.js';
 export { s as OrSearch } from './OrSearch-11fdf667.js';
-export { s as OrSearchV3 } from './OrSearch-5406bf03.js';
+export { s as OrSearchV3 } from './OrSearch-a61cb1ab.js';
 export { s as OrSegmentedControlV3, S as SegmentedControlSize } from './OrSegmentedControl-880b4911.js';
 export { s as OrSelect } from './OrSelect-0821b907.js';
-export { s as OrSelectV3 } from './OrSelect-466e50ca.js';
+export { s as OrSelectV3 } from './OrSelect-8b73cdba.js';
 export { s as OrSidebar, O as OrSidebarSide } from './OrSidebar-375c85a3.js';
-export { O as OrSidebarPlacement, s as OrSidebarV3 } from './OrSidebar-a62972f5.js';
+export { O as OrSidebarPlacement, s as OrSidebarV3 } from './OrSidebar-5d97c7cc.js';
 export { s as OrSkeletonCircle, a as OrSkeletonRect, b as OrSkeletonText, O as OrSkeletonTextSizes } from './OrSkeletonText-2b1610ce.js';
 export { s as OrSkeletonCircleV3, a as OrSkeletonRectV3, b as OrSkeletonTextV3 } from './OrSkeletonText-afd3d007.js';
 export { s as OrSlider } from './OrSlider-87e2da8c.js';
 export { s as OrSortHeaderV3 } from './OrSortHeader-a39f77f9.js';
 export { s as OrStepper } from './OrStepper-f19b4eac.js';
 export { s as OrSwitch } from './OrSwitch-c333ee32.js';
-export { s as OrSwitchV3 } from './OrSwitch-54988e7a.js';
+export { s as OrSwitchV3 } from './OrSwitch-1c2196da.js';
 export { s as OrTab } from './OrTab-bc98be02.js';
 export { s as OrTabHeaderItem } from './OrTabHeaderItem-d668cc59.js';
 export { s as OrTabV3 } from './OrTab-d3785ea4.js';
 export { s as OrTabs } from './OrTabs-d3812c11.js';
-export { s as OrTabsV3, T as TabsVariant } from './OrTabs-328d41b9.js';
+export { s as OrTabsV3, T as TabsVariant } from './OrTabs-8c550d38.js';
 export { s as OrTag } from './OrTag-1b5e43fa.js';
-export { s as OrTagV3, a as TagColor, T as TagVariant } from './OrTag-148ff9ae.js';
+export { s as OrTagV3, a as TagColor, T as TagVariant } from './OrTag-88dff18b.js';
 export { s as OrTeleport } from './OrTeleportVue3-ad639f12.js';
 export { s as OrTeleportV3 } from './OrTeleport.vue3-8099178c.js';
 export { s as OrTextV3 } from './OrText-6b4f7cd1.js';
@@ -91,10 +91,10 @@ export { s as OrTextareaV3 } from './OrTextarea-37566985.js';
 export { s as OrTextbox, T as TextboxTypes } from './OrTextbox-2f33e9c3.js';
 export { s as OrToast, a as OrToastContainer } from './OrToastContainer-40c4c1c8.js';
 export { P as PositionsX, b as PositionsY, c as ToastType, T as TransitionType, a as useQueue, u as useToast } from './useToast-4fbe0e5a.js';
-export { a as OrToastContainerV3, s as OrToastV3, t as TypesV3 } from './types-c3417028.js';
+export { a as OrToastContainerV3, s as OrToastV3, t as TypesV3 } from './types-92ea0eb9.js';
 export { p as PropsV3, a as useQueueV3, u as useToastV3 } from './useToast-0665462d.js';
 export { s as OrTooltip, a as OrTooltipContent } from './OrTooltip-78cd7f6b.js';
-export { s as OrTooltipV3 } from './OrTooltip-b07616f4.js';
+export { s as OrTooltipV3 } from './OrTooltip-e12df498.js';
 export { D as DropdownClose, a as DropdownOpen } from './dropdown-open-0d314aa4.js';
 export { u as useControlAttributes, a as useIdAttribute } from './useIdAttribute-859439f0.js';
 export { u as useElevation } from './useElevation-31bfe1f6.js';

package/dist/esm/v3/{types-c3417028.js → types-92ea0eb9.js}

@@ -2,8 +2,8 @@ import { useToggle } from '@vueuse/core';
 import { defineComponent, ref, computed, onBeforeMount, onBeforeUnmount, nextTick } from 'vue-demi';
 import { s as script$4 } from './OrTeleport.vue3-8099178c.js';
 import { T as ToastType, P as PositionsX, b as PositionsY, c as TransitionType, d as useToastEventBus, a as useQueue } from './useToast-0665462d.js';
-import { s as script$2 } from './OrIconButton-2dcfb83e.js';
-import { s as script$3 } from './OrLoader-1709eb68.js';
+import { s as script$2 } from './OrIconButton-24b89457.js';
+import { s as script$3 } from './OrLoader-a53d2edf.js';
 import { resolveComponent, openBlock, createElementBlock, normalizeClass, renderSlot, createCommentVNode, createVNode, createElementVNode, toDisplayString, createBlock, withModifiers, withCtx, TransitionGroup, Fragment, renderList, mergeProps } from 'vue';
 import { s as styleInject } from './style-inject.es-4c6f2515.js';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onereach/ui-components",
-  "version": "2.72.2-beta.2270.0",
+  "version": "2.72.2-beta.2271.0",
   "description": "Vue components library for v2/3",
   "sideEffects": false,
   "main": "./dist/auto/index.js",
@@ -38,7 +38,7 @@
     "@codemirror/lang-json": "6.0.0",
     "@codemirror/lang-markdown": "6.0.1",
     "@floating-ui/dom": "0.3.1",
-    "@onereach/styles": "^2.34.0",
+    "@onereach/styles": "^2.34.1-beta.2271.0",
     "@splidejs/splide": "4.0.6",
     "@types/lodash": "4.14.173",
     "@types/sortablejs": "1.10.7",

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

@@ -2,9 +2,6 @@ export const ErrorTagRoot: string[] = [
   // Layout
   'layout-inline-row',
 
-  // Box
-  'max-w-fit',
-
   // Shape
   'rounded-full',
 

package/src/components/or-loader-v3/OrLoader.stories3.ts

@@ -25,16 +25,16 @@ export default {
     },
 
     title: {
-      control: { type: 'text' },
+      control: { type: 'string' },
     },
 
     description: {
-      control: { type: 'text' },
+      control: { type: 'string' },
     },
   },
 
   parameters: {
-    layout: 'fullscreen',
+    layout: 'centered',
 
     docs: {
       page: OrLoaderDocs,
@@ -56,11 +56,7 @@ const Template: StoryFn<typeof OrLoader> = (args) => ({
     return { args };
   },
 
-  template: `
-    <div class="w-full min-h-[100px] p-md flex justify-center items-center">
-      <OrLoader class="w-2/5 max-w-[400px]" v-bind="args" />
-    </div>
-  `,
+  template: '<OrLoader v-bind="args" />',
 });
 
 export const Default = Template.bind({});
@@ -76,11 +72,3 @@ LinearWithText.args = {
   variant: 'linear',
   description: 'Promptly retrieving your data from the cloud',
 };
-LinearWithText.parameters = {
-  docs: {
-    description: {
-      story: 'By setting width on the component you may control the width of the linear loading indicator. \
-        Circular indicator size is controlled by the `size` prop.',
-    },
-  },
-};

package/src/components/or-loader-v3/OrLoader.vue

@@ -92,18 +92,11 @@ export default defineComponent({
       default: LoaderVariant.Circular,
     },
 
-    /**
-     * Defines a semantic color of the loading indicator.
-     * Use `'inherit'` option to set your own color from the parent (not recommended).
-     */
     color: {
       type: String as PropType<LoaderColor>,
       default: LoaderColor.Primary,
     },
 
-    /**
-     * Defines a diameter of the circular loader. Ignored for linear one.
-     */
     size: {
       type: String as PropType<LoaderSize>,
       default: LoaderSize.M,
@@ -145,16 +138,15 @@ export default defineComponent({
 
     const containerStyles = computed(() => [
       ...LoaderContainer,
-      `min-w-[${computedSize}px]`,
     ]);
 
     // State
     const computedSize = computed(() => {
       switch (props.size) {
-        case LoaderSize.M:
+        case 'm':
           return 20;
 
-        case LoaderSize.S:
+        case 's':
           return 16;
       }
     });

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

@@ -2,9 +2,10 @@ import { LoaderColor } from './props';
 
 export const LoaderRoot: string[] = [
   // Layout
+  'contents',
   'flex',
   'flex-col',
-  'gap-md',
+  'space-y-md',
 ];
 
 export const LoaderRootColors: Record<LoaderColor, string[]> = {

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,