@onereach/ui-components 2.71.1-beta.2220.0 → 2.71.1-beta.2221.0

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

@@ -5,7 +5,7 @@
   >
     <template v-if="label">
       <OrLabel
-        :control-id="controlId"
+        :control-id="controlAttributes.id"
         :variant="'input'"
         :required="required"
         :disabled="disabled"
@@ -26,14 +26,14 @@
       :disabled="disabled"
     >
       <input
-        :id="controlId"
-        ref="input"
+        ref="control"
         v-model="proxyModelValue"
-        v-bind="$attrs"
+        v-bind="controlAttributes"
         :class="controlStyles"
         :type="type === 'password' && disclosed ? 'text' : type"
         :placeholder="placeholder"
         :required="required"
+        :readonly="readonly"
         :disabled="disabled"
         @keydown="$emit('keydown', $event)"
         @keyup="$emit('keyup', $event)"
@@ -56,7 +56,7 @@
             <OrIconButton
               :icon="'close'"
               :color="'inherit'"
-              :disabled="disabled"
+              :disabled="readonly || disabled"
               @click.stop="$emit('update:modelValue', '')"
             />
           </template>
@@ -102,8 +102,8 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, getCurrentInstance, PropType, ref } from 'vue-demi';
-import { useClassAttribute } from '../../hooks';
+import { computed, defineComponent, PropType, reactive, ref } from 'vue-demi';
+import { useControlAttributes, useIdAttribute, 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';
@@ -125,7 +125,10 @@ export default defineComponent({
     OrLabel,
   },
 
-  inheritAttrs: false,
+  model: {
+    prop: 'modelValue',
+    event: 'update:modelValue',
+  },
 
   props: {
     modelValue: {
@@ -133,11 +136,6 @@ export default defineComponent({
       default: undefined,
     },
 
-    value: { // TODO: Remove Vue 2 fallback
-      type: [String, Number],
-      default: undefined,
-    },
-
     type: {
       type: String as PropType<InputType>,
       default: InputType.Text,
@@ -173,6 +171,11 @@ export default defineComponent({
       default: false,
     },
 
+    readonly: {
+      type: Boolean,
+      default: false,
+    },
+
     disabled: {
       type: Boolean,
       default: false,
@@ -187,7 +190,6 @@ export default defineComponent({
   emits: [
     'update:modelValue',
 
-    'input',
     'keydown',
     'keyup',
     'focus',
@@ -196,23 +198,20 @@ export default defineComponent({
 
   expose: [
     'root',
+
     'focus',
+    'blur',
   ],
 
   setup(props, context) {
-    const currentInstance = getCurrentInstance()!;
-
     // Refs
     const root = ref<HTMLElement>();
-    const input = ref<HTMLInputElement>();
+    const control = ref<HTMLInputElement>();
 
     // Styles
-    const classAttribute = useClassAttribute();
-
     const rootStyles = computed(() => [
       'or-input',
       ...InputRoot,
-      classAttribute.value,
     ]);
 
     const controlStyles = computed(() => [
@@ -220,45 +219,49 @@ export default defineComponent({
     ]);
 
     // State
-    const controlId = ref(context.attrs.id as string ?? currentInstance.uid.toString());
+    const controlAttributes = reactive({
+      id: useIdAttribute(),
+      ...useControlAttributes(),
+      ...useValidationAttributes(),
+    });
 
     const proxyModelValue = computed({
-      get: () => {
-        return props.modelValue ?? props.value; // TODO: Remove Vue 2 fallback
-      },
+      get: () => props.modelValue,
 
       set: (value) => {
-        context.emit('input', value);
         context.emit('update:modelValue', value);
       },
     });
 
-    const invalid = computed(() => !!props.error);
-    const readonly = computed(() => context.attrs.readonly as boolean);
-
     const currentLength = computed(() => proxyModelValue.value?.toString().length ?? 0);
-    const maxLength = computed(() => context.attrs.maxlength as number | undefined);
+    const maxLength = computed(() => controlAttributes.maxlength);
+
+    const invalid = computed(() => !!props.error);
 
     const disclosed = ref(false);
 
     // Methods
     function focus(): void {
-      input.value?.focus();
+      control.value?.focus();
+    }
+
+    function blur(): void {
+      control.value?.blur();
     }
 
     return {
       root,
-      input,
+      control,
       rootStyles,
       controlStyles,
-      controlId,
+      controlAttributes,
       proxyModelValue,
-      invalid,
-      readonly,
       currentLength,
       maxLength,
+      invalid,
       disclosed,
       focus,
+      blur,
     };
   },
 });

package/src/components/or-label-v3/OrLabel.vue

@@ -1,7 +1,6 @@
 <template>
   <div
     ref="root"
-    v-bind="$attrs"
     :class="rootStyles"
     :disabled="disabled ? '' : null"
   >
@@ -22,15 +21,12 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType, ref } from 'vue-demi';
-import { useClassAttribute } from '../../hooks';
 import { LabelVariant } from './props';
 import { LabelAddon, LabelRoot, LabelRootVariants, LabelText } from './styles';
 
 export default defineComponent({
   name: 'OrLabel',
 
-  inheritAttrs: false,
-
   props: {
     controlId: {
       type: String,
@@ -62,13 +58,10 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
-    const classAttribute = useClassAttribute();
-
     const rootStyles = computed(() => [
       'or-label',
       ...LabelRoot,
       ...LabelRootVariants[props.variant],
-      classAttribute.value,
     ]);
 
     const textStyles = computed(() => [

package/src/components/or-link-v3/OrLink.vue

@@ -1,7 +1,6 @@
 <template>
   <a
     ref="root"
-    v-bind="$attrs"
     :class="rootStyles"
     :href="href"
     :disabled="disabled ? '' : null"
@@ -18,15 +17,12 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType, ref } from 'vue-demi';
-import { useClassAttribute } from '../../hooks';
 import { LinkColor } from './props';
 import { LinkRoot, LinkRootColors } from './styles';
 
 export default defineComponent({
   name: 'OrLink',
 
-  inheritAttrs: false,
-
   props: {
     href: {
       type: String,
@@ -68,15 +64,12 @@ export default defineComponent({
     const root = ref<HTMLButtonElement>();
 
     // Styles
-    const classAttribute = useClassAttribute();
-
     const rootStyles = computed(() => [
       'or-link',
       ...LinkRoot,
       ...LinkRootColors[`${props.color}`],
       props.loading && 'interactivity-none',
       props.underlined && 'underline hover:no-underline',
-      classAttribute.value,
     ]);
 
     return {

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

@@ -1,7 +1,6 @@
 <template>
   <div
     ref="root"
-    v-bind="$attrs"
     :class="rootStyles"
   >
     <template v-if="title">
@@ -81,15 +80,12 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType, ref } from 'vue-demi';
-import { useClassAttribute } from '../../hooks';
 import { LoaderColor, LoaderSize, LoaderVariant } from './props';
-import { LoaderRoot, LoaderRootColors, LoaderTitle, LoaderDescription, LoaderContainer } from './styles';
+import { LoaderContainer, LoaderDescription, LoaderRoot, LoaderRootColors, LoaderTitle } from './styles';
 
 export default defineComponent({
   name: 'OrLoader',
 
-  inheritAttrs: false,
-
   props: {
     variant: {
       type: String as PropType<LoaderVariant>,
@@ -126,13 +122,10 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
-    const classAttribute = useClassAttribute();
-
     const rootStyles = computed(() => [
       'or-loader',
       ...LoaderRoot,
       ...LoaderRootColors[props.color],
-      classAttribute.value,
     ]);
 
     const titleStyles = computed(() => [

package/src/components/or-menu-item-v3/OrMenuItem.vue

@@ -1,7 +1,6 @@
 <template>
   <div
     ref="root"
-    v-bind="$attrs"
     :class="rootStyles"
     :tabindex="!disabled ? 0 : null"
     :selected="selected ? '' : null"
@@ -22,7 +21,6 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType, ref } from 'vue-demi';
-import { useClassAttribute } from '../../hooks';
 import { OrIconV3 as OrIcon } from '../or-icon-v3';
 import { MenuItemRoot } from './styles';
 
@@ -33,8 +31,6 @@ export default defineComponent({
     OrIcon,
   },
 
-  inheritAttrs: false,
-
   props: {
     icon: {
       type: [String, Object] as PropType<string | InstanceType<typeof OrIcon>['$props']>,
@@ -67,12 +63,9 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
-    const classAttribute = useClassAttribute();
-
     const rootStyles = computed(() => [
       'or-menu-item',
       ...MenuItemRoot,
-      classAttribute.value,
     ]);
 
     return {

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

@@ -1,7 +1,6 @@
 <template>
   <div
     ref="root"
-    v-bind="$attrs"
     :class="rootStyles"
   >
     <OrPopover
@@ -25,7 +24,6 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType, ref } from 'vue-demi';
-import { useClassAttribute } from '../../hooks';
 import { OrPopoverV3 as OrPopover } from '../or-popover-v3';
 import { MenuPlacement } from './props';
 import { MenuBody, MenuRoot } from './styles';
@@ -37,8 +35,6 @@ export default defineComponent({
     OrPopover,
   },
 
-  inheritAttrs: false,
-
   props: {
     trigger: {
       type: HTMLElement,
@@ -72,12 +68,9 @@ export default defineComponent({
     const isOpen = computed(() => popover.value?.isOpen);
 
     // Styles
-    const classAttribute = useClassAttribute();
-
     const rootStyles = computed(() => [
       'or-menu',
       ...MenuRoot,
-      classAttribute.value,
     ]);
 
     const bodyStyles = computed(() => [

package/src/components/or-modal-v3/OrModal.vue

@@ -31,7 +31,6 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType, ref, watch } from 'vue-demi';
-import { useClassAttribute } from '../../hooks';
 import { OrIconButtonV3 as OrIconButton } from '../or-icon-button-v3';
 import { OrOverlayV3 as OrOverlay } from '../or-overlay-v3';
 import { ModalSize } from './props';
@@ -75,13 +74,10 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
-    const classAttribute = useClassAttribute();
-
     const rootStyles = computed(() => [
       'or-modal',
       ...ModalRoot,
       ...ModalRootSizes[props.size],
-      classAttribute.value,
     ]);
 
     const headerStyles = computed(() => [

package/src/components/or-notification-v3/OrNotification.vue

@@ -1,7 +1,6 @@
 <template>
   <div
     ref="root"
-    v-bind="$attrs"
     :class="rootStyles"
   >
     <div :class="iconStyles">
@@ -25,7 +24,6 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType, ref } from 'vue-demi';
-import { useClassAttribute } from '../../hooks';
 import { OrIconButtonV3 as OrIconButton } from '../or-icon-button-v3';
 import { OrIconV3 as OrIcon } from '../or-icon-v3';
 import { NotificationVariant } from './props';
@@ -39,8 +37,6 @@ export default defineComponent({
     OrIconButton,
   },
 
-  inheritAttrs: false,
-
   props: {
     variant: {
       type: String as PropType<NotificationVariant>,
@@ -57,13 +53,10 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
-    const classAttribute = useClassAttribute();
-
     const rootStyles = computed(() => [
       'or-notification',
       ...NotificationRoot,
       ...NotificationRootVariants[props.variant],
-      classAttribute.value,
     ]);
 
     const iconStyles = computed(() => [

package/src/components/or-overlay-v3/OrOverlay.vue

@@ -13,7 +13,7 @@
 <script lang="ts">
 import { useScrollLock } from '@vueuse/core';
 import { computed, defineComponent, ref } from 'vue-demi';
-import { useClassAttribute, useElevation } from '../../hooks';
+import { useElevation } from '../../hooks';
 import { OrTeleportV3 as OrTeleport } from '../or-teleport-v3';
 import { OverlayRoot } from './styles';
 
@@ -42,12 +42,9 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
-    const classAttribute = useClassAttribute();
-
     const rootStyles = computed(() => [
       'or-overlay',
       ...OverlayRoot,
-      classAttribute.value,
     ]);
 
     // Effects

package/src/components/or-pagination-v3/OrPagination.stories3.ts

@@ -15,10 +15,6 @@ export default {
       control: { type: 'text' },
     },
 
-    value: { // TODO: Remove Vue 2 fallback
-      table: { disable: true },
-    },
-
     length: {
       control: { type: 'number' },
     },
@@ -65,7 +61,6 @@ const Template: StoryFn<typeof OrPagination> = (args) => ({
       args,
       model,
       onUpdateModelValue: action('update:modelValue'),
-      onInput: action('input'),
     };
   },
 
@@ -74,7 +69,6 @@ const Template: StoryFn<typeof OrPagination> = (args) => ({
       v-model="model"
       v-bind="args"
       @update:modelValue="onUpdateModelValue"
-      @input="onInput"
     />
   `,
 });

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

@@ -1,7 +1,6 @@
 <template>
   <div
     ref="root"
-    v-bind="$attrs"
     :class="rootStyles"
   >
     <div :class="offsetControlStyles">
@@ -71,7 +70,6 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType, ref } from 'vue-demi';
-import { useClassAttribute } 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';
@@ -89,7 +87,10 @@ export default defineComponent({
     OrMenuItem,
   },
 
-  inheritAttrs: false,
+  model: {
+    prop: 'modelValue',
+    event: 'update:modelValue',
+  },
 
   props: {
     modelValue: {
@@ -97,11 +98,6 @@ export default defineComponent({
       default: undefined,
     },
 
-    value: { // TODO: Remove Vue 2 fallback
-      type: Object as PropType<PaginationModel>,
-      default: undefined,
-    },
-
     length: {
       type: Number,
       required: true,
@@ -115,8 +111,6 @@ export default defineComponent({
 
   emits: [
     'update:modelValue',
-
-    'input',
   ],
 
   expose: [
@@ -134,12 +128,9 @@ export default defineComponent({
     const limitMenuRoot = computed(() => limitMenu.value?.root);
 
     // Styles
-    const classAttribute = useClassAttribute();
-
     const rootStyles = computed(() => [
       'or-pagination',
       ...PaginationRoot,
-      classAttribute.value,
     ]);
 
     const offsetControlStyles = computed(() => [
@@ -156,20 +147,15 @@ export default defineComponent({
 
     // State
     const proxyModelValue = computed({
-      get: () => {
-        return props.modelValue ?? props.value; // TODO: Remove Vue 2 fallback
-      },
+      get: () => props.modelValue,
 
       set: (value) => {
-        context.emit('input', value);
         context.emit('update:modelValue', value);
       },
     });
 
     const currentLimit = computed<number>({
-      get: () => {
-        return proxyModelValue.value?.limit ?? props.pageSizeOptions[0];
-      },
+      get: () => proxyModelValue.value?.limit ?? props.pageSizeOptions[0],
 
       set: (value) => {
         proxyModelValue.value = {
@@ -180,9 +166,7 @@ export default defineComponent({
     });
 
     const currentOffset = computed<number>({
-      get: () => {
-        return proxyModelValue.value?.offset ?? 0;
-      },
+      get: () => proxyModelValue.value?.offset ?? 0,
 
       set: (value) => {
         proxyModelValue.value = {
@@ -193,9 +177,7 @@ export default defineComponent({
     });
 
     const currentPage = computed<number>({
-      get: () => {
-        return Math.floor(currentOffset.value / currentLimit.value) + 1;
-      },
+      get: () => Math.floor(currentOffset.value / currentLimit.value) + 1,
 
       set: (value) => {
         currentOffset.value = (value - 1) * currentLimit.value;
@@ -231,7 +213,7 @@ export default defineComponent({
         }, [] as (number | string)[]);
     });
 
-    // Functions
+    // Methods
     function toPreviousPage(): void {
       currentPage.value = currentPage.value - 1;
     }

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

@@ -33,7 +33,7 @@
 import { autoUpdate, computePosition, flip, hide, shift } from '@floating-ui/dom';
 import { onClickOutside } from '@vueuse/core';
 import { computed, defineComponent, nextTick, PropType, ref, toRef, unref, watch, watchPostEffect } from 'vue-demi';
-import { useClassAttribute, useElevation, useResponsive } from '../../hooks';
+import { useElevation, 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';
@@ -98,12 +98,9 @@ export default defineComponent({
     const bottomSheetRoot = computed(() => bottomSheet.value?.root);
 
     // Styles
-    const classAttribute = useClassAttribute();
-
     const rootStyles = computed(() => [
       'or-popover',
       ...PopoverRoot,
-      classAttribute.value,
     ]);
 
     const bodyStyles = computed(() => [

package/src/components/or-progress-v3/OrProgress.vue

@@ -1,7 +1,6 @@
 <template>
   <div
     ref="root"
-    v-bind="$attrs"
     :class="rootStyles"
   >
     <template v-if="isLinearType">
@@ -98,29 +97,16 @@
 </template>
 
 <script lang="ts">
-import _ from 'lodash';
 import { useElementBounding } from '@vueuse/core';
+import _ from 'lodash';
 import { computed, defineComponent, PropType, ref, useSlots } from 'vue-demi';
+import { useResponsive } from '../../hooks';
 import { ProgressColor, ProgressType } from './props';
-import { useClassAttribute, useResponsive } from '../../hooks';
-import {
-  ProgressBarAnimationTypes,
-  ProgressBarBackground,
-  ProgressBarColors,
-  ProgressBarMain,
-  ProgressFooter,
-  ProgressHeader,
-  ProgressHeaderLabel,
-  ProgressHeaderPercent,
-  ProgressRoot,
-  ProgressRootTypes,
-} from './styles';
+import { ProgressBarAnimationTypes, ProgressBarBackground, ProgressBarColors, ProgressBarMain, ProgressFooter, ProgressHeader, ProgressHeaderLabel, ProgressHeaderPercent, ProgressRoot, ProgressRootTypes } from './styles';
 
 export default defineComponent({
   name: 'OrProgress',
 
-  inheritAttrs: false,
-
   props: {
     maxValue: {
       type: Number,
@@ -216,13 +202,10 @@ export default defineComponent({
     const computedSize = computed(() => isMobile.value ? 20 : 16);
 
     // Styles
-    const classAttribute = useClassAttribute();
-
     const rootStyles = computed(() => [
       'or-progress',
       ...ProgressRoot,
       ...ProgressRootTypes[props.type],
-      classAttribute.value,
     ]);
 
     const headerStyles = computed(() => [