@onereach/ui-components 2.75.2-beta.2392.0 → 2.75.2-beta.2399.0

package/src/components/or-input-v3/OrInput.vue

@@ -21,7 +21,7 @@
     <OrInputBox
       :variant="disableDefaultStyles ? 'unstyled' : 'styled'"
       :size="size"
-      :invalid="invalid"
+      :invalid="!!error"
       :readonly="readonly || loading"
       :disabled="disabled"
     >
@@ -42,7 +42,7 @@
         @blur="$emit('blur', $event)"
       >
 
-      <div :class="['layout-inline-row']">
+      <div :class="['layout-row']">
         <template v-if="loading">
           <OrLoader
             :variant="'circular'"
@@ -82,7 +82,10 @@
       </div>
     </OrInputBox>
 
-    <template v-if="!invalid">
+    <div
+      v-show="!error"
+      :class="['contents']"
+    >
       <template v-if="hint || maxLength">
         <OrHint :disabled="disabled">
           {{ hint }}
@@ -95,9 +98,12 @@
           </template>
         </OrHint>
       </template>
-    </template>
+    </div>
 
-    <template v-else>
+    <div
+      v-show="typeof error === 'string'"
+      :class="['contents']"
+    >
       <OrError :disabled="disabled">
         {{ error }}
 
@@ -108,7 +114,7 @@
           {{ currentLength }} / {{ maxLength }}
         </template>
       </OrError>
-    </template>
+    </div>
   </div>
 </template>
 
@@ -175,7 +181,7 @@ export default defineComponent({
     },
 
     error: {
-      type: String,
+      type: [String, Boolean],
       default: undefined,
     },
 
@@ -259,8 +265,6 @@ export default defineComponent({
     const currentLength = computed(() => proxyModelValue.value?.toString().length ?? 0);
     const maxLength = computed(() => controlAttributes.maxlength);
 
-    const invalid = computed(() => !!props.error);
-
     const disclosed = ref(false);
 
     const { isMobile } = useResponsive();
@@ -283,7 +287,6 @@ export default defineComponent({
       proxyModelValue,
       currentLength,
       maxLength,
-      invalid,
       disclosed,
       isMobile,
       focus,

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

@@ -7,8 +7,8 @@ export const InputRoot: string[] = [
 ];
 
 export const InputControl: string[] = [
-  // Layout
-  'grow',
+  // Box
+  'w-full',
 
   // Typography
   'typography-inherit',

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

@@ -38,7 +38,7 @@ export const LabelText: string[] = [
 
 export const LabelAddon: string[] = [
   // Layout
-  'layout-inline-row empty:hidden',
+  'layout-row empty:hidden',
 
   // Typography
   'whitespace-nowrap',

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

@@ -2,10 +2,8 @@ import { LinkColor } from './props';
 
 export const LinkRoot: string[] = [
   // Layout
-  'layout-inline-row',
-
-  // Spacing
-  'gap-xs',
+  'inline-flex',
+  'items-center',
 
   // Interactivity
   'interactivity-auto',
@@ -42,10 +40,8 @@ export const LinkRootColors: Record<LinkColor, string[]> = {
   'inherit': [
     // Theme
     'theme-foreground-inherit',
-    'dark:theme-foreground-inherit-dark',
-
-    // Theme (hover)
     'hover:theme-foreground-primary-hover',
-    'dark:hover:theme-foreground-primary-hover-dark',
+    'disabled:!text-on-disabled',
+    'disabled:dark:!text-on-disabled-dark',
   ],
 };

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

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

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

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

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

@@ -14,35 +14,31 @@
         <OrIcon :icon="'keyboard_arrow_left'" />
       </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>
+      <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>
     </div>
 
     <div :class="limitControlStyles">
-      <template v-if="isDesktop">
-        Per page:
-      </template>
+      Per page:
 
       <OrButton
         ref="limitButton"
@@ -52,44 +48,28 @@
         :activated="true"
         @click.stop="limitMenu.open()"
       >
-        {{ currentLimit }} <OrIcon :icon="limitMenu && limitMenu.isOpen ? 'arrow_drop_up' : 'arrow_drop_down'" />
+        {{ currentLimit }} <OrIcon :icon="'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; limitMenu.close()"
+          @click.stop="currentLimit = pageSize"
         >
           {{ 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';
@@ -138,8 +118,6 @@ export default defineComponent({
   ],
 
   setup(props, context) {
-    const { isDesktop, isMobile } = useResponsive();
-
     // Refs
     const root = ref<HTMLElement>();
 
@@ -215,46 +193,24 @@ export default defineComponent({
     });
 
     const buttonGroup = computed<(number | string)[]>(() => {
-      const pages = Array.from({ length: lastPage.value }, (_, index) => index + 1);
-
-      switch (true) {
-        case lastPage.value <= 7:
-          return pages;
-
-        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)[]);
-      }
+      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)[]);
     });
 
     // Methods
@@ -271,9 +227,6 @@ 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-lg md:gap-xl',
+  'gap-xl',
 
   // Typography
   'typography-caption-regular',

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

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

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

@@ -8,7 +8,7 @@ export const RadioRoot: string[] = [
 
 export const RadioControl: string[] = [
   // Layout
-  'layout-inline-row justify-center',
+  'layout-row justify-center',
 
   // Box
   'w-md+ md:w-md',

package/src/components/or-select-v3/OrSelect.stories3.ts

@@ -104,6 +104,10 @@ export default {
       control: { type: 'boolean' },
     },
 
+    disableDefaultStyles: {
+      control: { type: 'boolean' },
+    },
+
     enableSearch: {
       control: { type: 'boolean' },
     },

package/src/components/or-select-v3/OrSelect.vue

@@ -25,7 +25,7 @@
       :class="[popoverState === 'open' && 'rounded-b-0']"
       :variant="disableDefaultStyles ? 'unstyled' : 'styled'"
       :size="size"
-      :invalid="invalid"
+      :invalid="!!error"
       :readonly="readonly"
       :disabled="disabled"
     >
@@ -82,7 +82,7 @@
         +{{ outerItems.length }}
       </template>
 
-      <div :class="['layout-inline-row']">
+      <div :class="['layout-row']">
         <OrIcon
           :icon="popoverState === 'open' ? 'arrow_drop_up' : 'arrow_drop_down'"
           :variant="'outlined'"
@@ -202,19 +202,25 @@
       </OrPopover>
     </OrInputBox>
 
-    <template v-if="!invalid">
+    <div
+      v-show="!error"
+      :class="['contents']"
+    >
       <template v-if="hint">
         <OrHint :disabled="disabled">
           {{ hint }}
         </OrHint>
       </template>
-    </template>
+    </div>
 
-    <template v-else>
+    <div
+      v-show="typeof error === 'string'"
+      :class="['contents']"
+    >
       <OrError :disabled="disabled">
         {{ error }}
       </OrError>
-    </template>
+    </div>
   </div>
 </template>
 
@@ -306,7 +312,7 @@ export default defineComponent({
     },
 
     error: {
-      type: String,
+      type: [String, Boolean],
       default: undefined,
     },
 
@@ -416,7 +422,6 @@ export default defineComponent({
       }
     });
 
-    const invalid = computed(() => !!props.error);
     const readonly = computed(() => context.attrs.readonly as boolean);
 
     const selection = computed(() => {
@@ -519,7 +524,6 @@ export default defineComponent({
       noSearchResultsStyles,
       controlId,
       proxyModelValue,
-      invalid,
       readonly,
       selection,
       searchText,

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

@@ -8,7 +8,10 @@ export const SelectRoot: string[] = [
 
 export const SelectControl: string[] = [
   // Layout
-  'layout-row grow',
+  'layout-row',
+
+  // Box
+  'w-full',
 
   // Overflow
   'overflow-hidden',

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

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

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

@@ -8,7 +8,7 @@ export const SwitchRoot: string[] = [
 
 export const SwitchControl: string[] = [
   // Layout
-  'layout-inline-row justify-start checked:justify-end',
+  'layout-row justify-start checked:justify-end',
 
   // Box
   'w-[43px] md:w-[37px]',

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

@@ -1,6 +1,6 @@
 export const TabRoot: string[] = [
   // Layout
-  'layout-inline-row justify-center',
+  'layout-row justify-center',
 
   // Spacing
   'py-[6px]',

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

@@ -3,10 +3,10 @@ import { TabsVariant } from './props';
 export const TabsRoot: string[] = [
   // Layout
   'grid',
-  'grid-flow-col',
-
   'items-center',
 
+  'grid-flow-col',
+
   // Box
   'overflow-hidden',
 

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/OrTag.vue

@@ -12,7 +12,7 @@
       <slot />
     </div>
     <template v-if="variant === 'reset'">
-      <div :class="['layout-inline-row', 'm-[-4px] md:m-[-2px]']">
+      <div :class="['layout-row', 'm-[-4px] md:m-[-2px]']">
         <OrIconButton
           :icon="'close'"
           :color="custom ? 'inherit' : color"