@onereach/ui-components 2.74.0-beta.2287.0 → 2.74.1-beta.2289.0

package/src/components/or-code/OrCode.vue

@@ -24,7 +24,7 @@
           <or-icon-button
             v-if="isShowingFullscreen"
             icon="fullscreen"
-            icon-color="neutral-4"
+            icon-color="neutral-3"
             class="fullscreen-button"
             @click="toggleFullscreen(true)"
           />
@@ -85,8 +85,8 @@ import { Language, LanguageSupport } from '@codemirror/language';
 import { EditorState, Extension, Transaction } from '@codemirror/state';
 import { ViewUpdate, keymap } from '@codemirror/view';
 import { indentWithTab } from '@codemirror/commands';
-import { basicSetup, EditorView } from 'codemirror';
 import { useElementHover } from '@vueuse/core';
+import { basicSetup, EditorView } from 'codemirror';
 import _ from 'lodash';
 import { defineComponent, PropType, ref, Ref } from 'vue-demi';
 import { OrIconButton } from '../or-button-v2';
@@ -97,7 +97,6 @@ import { OrModal } from '../or-modal';
 import { OrTeleport } from '../or-teleport';
 import { OrCodeLanguages } from './constants';
 import languages from './lang';
-import orCodeTheme from './theme';
 
 //partially based on https://github.com/logue/vue-codemirror6/blob/master/src/components/CodeMirror.vue
 
@@ -186,7 +185,6 @@ export default defineComponent({
   emits: ['update:modelValue', 'focus', 'blur'],
 
   setup(props, { emit }) {
-    // editor config
     const root = ref<HTMLDivElement>();
     const target = ref<HTMLDivElement>();
     const fullscreenTarget = ref<HTMLDivElement>();
@@ -227,9 +225,8 @@ export default defineComponent({
     },
     localExtensions(): Extension[] {
       const { allowDrop, allowPaste, lineWrapping } = this;
-
       const ext = _.compact([
-        orCodeTheme,
+        // Toggle light/dark mode
         EditorView.baseTheme({}),
         // locale settings
         this.phrases ? EditorState.phrases.of(this.phrases) : undefined,
@@ -262,10 +259,11 @@ export default defineComponent({
         // line wrapping
         lineWrapping ? EditorView.lineWrapping : undefined,
         keymap.of([indentWithTab]),
-        ...this.extensions,
       ]) as Extension[];
 
-      return [...ext];
+      // Append Extensions (such as basic-setup)
+      if (this.extensions.length !== 0) _.merge(ext, this.extensions);
+      return ext;
     },
     isShowingError(): boolean {
       return !!this.error && this.isInvalid;

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-input-box-v3/styles.ts

@@ -90,13 +90,11 @@ export const InputBoxRootVariants: Record<InputBoxVariant, string[]> = {
 export const InputBoxRootSizes: Record<InputBoxSize, string[]> = {
   'm': [
     // Box
-    'children:min-h-[34px]',
+    'children:min-h-[46px] children:md:min-h-[34px]',
 
     // Spacing
     'first-child:pl-md first-child:md:pl-sm+',
     'last-child:pr-md last-child:md:pr-sm+',
-    'children:pt-[11px] children:md:pt-[7px]',
-    'children:pb-[11px] children:md:pb-[6px]',
 
     'gap-sm+ md:gap-sm',
 
@@ -109,9 +107,8 @@ export const InputBoxRootSizes: Record<InputBoxSize, string[]> = {
     'children:min-h-[30px]',
 
     // Spacing
-    'first-child:pl-sm',
-    'last-child:pr-sm',
-    'children:py-[6px]',
+    'first-child:pl-md first-child:md:pl-sm+',
+    'last-child:pr-md last-child:md:pr-sm+',
 
     'gap-[6px]',
 

package/src/components/or-input-v3/OrInput.stories3.ts

@@ -62,6 +62,10 @@ export default {
       control: { type: 'text' },
     },
 
+    loading: {
+      control: { type: 'boolean' },
+    },
+
     required: {
       control: { type: 'boolean' },
     },

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

@@ -22,7 +22,7 @@
       :variant="disableDefaultStyles ? 'unstyled' : 'styled'"
       :size="size"
       :invalid="invalid"
-      :readonly="readonly"
+      :readonly="readonly || loading"
       :disabled="disabled"
     >
       <input
@@ -33,7 +33,7 @@
         :type="type === 'password' && disclosed ? 'text' : type"
         :placeholder="placeholder"
         :required="required"
-        :readonly="readonly"
+        :readonly="readonly || loading"
         :disabled="disabled"
         @keydown="$emit('keydown', $event)"
         @keyup="$emit('keyup', $event)"
@@ -42,30 +42,40 @@
       >
 
       <div :class="['layout-row']">
-        <template v-if="type === 'password'">
-          <OrIconButton
-            :icon="{ icon: disclosed ? 'visibility_off' : 'visibility', variant: 'filled' }"
-            :color="'inherit'"
-            :disabled="disabled"
-            @click.stop="disclosed = !disclosed"
+        <template v-if="loading">
+          <OrLoader
+            :variant="'circular'"
+            :color="'primary'"
+            :size="isMobile ? 'm' : 's'"
           />
         </template>
 
-        <template v-if="type === 'search'">
-          <template v-if="modelValue">
+        <template v-else>
+          <template v-if="type === 'password'">
             <OrIconButton
-              :icon="'close'"
+              :icon="{ icon: disclosed ? 'visibility_off' : 'visibility', variant: 'filled' }"
               :color="'inherit'"
-              :disabled="readonly || disabled"
-              @click.stop="$emit('update:modelValue', '')"
+              :disabled="disabled"
+              @click.stop="disclosed = !disclosed"
             />
           </template>
 
-          <template v-else>
-            <OrIcon
-              :icon="'search'"
-              :variant="'outlined'"
-            />
+          <template v-if="type === 'search'">
+            <template v-if="modelValue">
+              <OrIconButton
+                :icon="'close'"
+                :color="'inherit'"
+                :disabled="readonly || disabled"
+                @click.stop="$emit('update:modelValue', '')"
+              />
+            </template>
+
+            <template v-else>
+              <OrIcon
+                :icon="'search'"
+                :variant="'outlined'"
+              />
+            </template>
           </template>
         </template>
       </div>
@@ -103,13 +113,14 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType, reactive, ref } from 'vue-demi';
-import { useControlAttributes, useIdAttribute, useValidationAttributes } from '../../hooks';
+import { useControlAttributes, useIdAttribute, useResponsive, useValidationAttributes } from '../../hooks';
 import { OrErrorV3 as OrError } from '../or-error-v3';
 import { OrHintV3 as OrHint } from '../or-hint-v3';
 import { OrIconButtonV3 as OrIconButton } from '../or-icon-button-v3';
 import { OrIconV3 as OrIcon } from '../or-icon-v3';
 import { OrInputBoxV3 as OrInputBox } from '../or-input-box-v3';
 import { OrLabelV3 as OrLabel } from '../or-label-v3';
+import { OrLoaderV3 as OrLoader } from '../or-loader-v3';
 import { InputSize, InputType } from './props';
 import { InputControl, InputRoot } from './styles';
 
@@ -123,6 +134,7 @@ export default defineComponent({
     OrIconButton,
     OrInputBox,
     OrLabel,
+    OrLoader,
   },
 
   model: {
@@ -166,6 +178,11 @@ export default defineComponent({
       default: undefined,
     },
 
+    loading: {
+      type: Boolean,
+      default: false,
+    },
+
     required: {
       type: Boolean,
       default: false,
@@ -240,6 +257,8 @@ export default defineComponent({
 
     const disclosed = ref(false);
 
+    const { isMobile } = useResponsive();
+
     // Methods
     function focus(): void {
       control.value?.focus();
@@ -260,6 +279,7 @@ export default defineComponent({
       maxLength,
       invalid,
       disclosed,
+      isMobile,
       focus,
       blur,
     };

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-notification/OrNotification.vue

@@ -115,6 +115,7 @@ export default defineComponent({
     warning: ($c-warning, $c-warning-lighten-45),
     success: ($c-success, $c-success-lighten-45),
   );
+
   /** TODO: Override when mobile design is ready to guarantee alignment of icons with first text row */
   --alignment-height: #{$lh-1};
 
@@ -177,30 +178,4 @@ export default defineComponent({
     }
   }
 }
-
-[data-theme="dark"] {
-  .or-notification {
-    $notification-types: (
-      info: ($c-neutral-6, $c-primary-darken-45),
-      error: ($c-neutral-6, $c-error-darken-45),
-      warning: ($c-neutral-6, $c-warning-darken-45),
-      success: ($c-neutral-6, $c-success-darken-45),
-    );
-
-    .or-icon {
-      color: $c-neutral-1;
-    }
-
-    @each $type, $colors in $notification-types {
-      &.is-type-#{$type} {
-        background-color: list.nth($colors, 2);
-        color: list.nth($colors, 1);
-
-        a {
-          color: list.nth($colors, 1);
-        }
-      }
-    }
-  }
-}
 </style>

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-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-skeleton/styles.scss

@@ -9,10 +9,10 @@
   }
 }
 
-$c-skeleton-bg: #f6f8fd;
-$c-skeleton-center: #fff;
-
 .or-skeleton {
+  $c-skeleton-bg: #f6f8fd;
+  $c-skeleton-center: #fff;
+
   overflow: hidden;
   position: relative;
   padding: 0;
@@ -33,18 +33,3 @@ $c-skeleton-center: #fff;
     }
   }
 }
-
-
-[data-theme="dark"] {
-  $c-skeleton-dark-bg: $c-neutral-3;
-  $c-skeleton-dark-center: $c-neutral-2;
-
-  .or-skeleton {
-    background:  $c-skeleton-dark-bg;
-    &.is-animated {
-      &::before {
-        background: linear-gradient(90.14deg,  $c-skeleton-dark-bg 0.1%, $c-skeleton-dark-center 49.98%,  $c-skeleton-dark-bg 99.06%);
-      }
-    }
-  }
-}