@onereach/ui-components 2.71.1-beta.2235.0 → 2.71.1

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(() => [

package/src/components/or-radio-v3/OrRadio.stories3.ts

@@ -26,11 +26,7 @@ export default {
       control: { type: 'text' },
     },
 
-    value: { // TODO: Remove Vue 2 fallback
-      table: { disable: true },
-    },
-
-    inputValue: { // TODO: Rename to `value` after complete migration to Vue 3
+    value: {
       control: { type: 'text' },
     },
 
@@ -112,7 +108,6 @@ const Template: StoryFn<typeof OrRadio> = (args) => ({
       args,
       model,
       onUpdateModelValue: action('update:modelValue'),
-      onInput: action('input'),
       onFocus: action('focus'),
       onBlur: action('blur'),
     };
@@ -124,7 +119,6 @@ const Template: StoryFn<typeof OrRadio> = (args) => ({
         v-model="model"
         v-bind="args"
         @update:modelValue="onUpdateModelValue"
-        @input="onInput"
         @focus="onFocus"
         @blur="onBlur"
       >
@@ -135,10 +129,9 @@ const Template: StoryFn<typeof OrRadio> = (args) => ({
 
       <OrRadio
         v-model="model"
-        input-value="radio-2"
+        value="radio-2"
         label="Radio 2"
         @update:modelValue="onUpdateModelValue"
-        @input="onInput"
         @focus="onFocus"
         @blur="onBlur"
       />
@@ -153,6 +146,6 @@ Radio.args = {
   addon: '<OrIcon icon="info" />',
 
   // Props
-  inputValue: 'radio-1',
+  value: 'radio-1',
   label: 'Radio 1',
 };

package/src/components/or-radio-v3/OrRadio.vue

@@ -4,12 +4,12 @@
     :class="rootStyles"
   >
     <input
-      v-bind="$attrs"
-      :id="controlId"
+      ref="control"
       v-model="proxyModelValue"
+      v-bind="controlAttributes"
       :class="controlStyles"
       type="radio"
-      :value="inputValue"
+      :value="value"
       :required="required"
       :disabled="disabled"
       @focus="$emit('focus', $event)"
@@ -18,7 +18,7 @@
 
     <template v-if="$slots.default || label">
       <OrLabel
-        :control-id="controlId"
+        :control-id="controlAttributes.id"
         :variant="labelVariant"
         :required="required"
         :disabled="disabled"
@@ -34,8 +34,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 } from '../../hooks';
 import { LabelVariant, OrLabelV3 as OrLabel } from '../or-label-v3';
 import { RadioControl, RadioControlHandle, RadioRoot } from './styles';
 
@@ -46,7 +46,10 @@ export default defineComponent({
     OrLabel,
   },
 
-  inheritAttrs: false,
+  model: {
+    prop: 'modelValue',
+    event: 'update:modelValue',
+  },
 
   props: {
     modelValue: {
@@ -54,12 +57,7 @@ export default defineComponent({
       default: undefined,
     },
 
-    value: { // TODO: Remove Vue 2 fallback
-      type: String,
-      default: undefined,
-    },
-
-    inputValue: { // TODO: Rename to `value` after complete migration to Vue 3
+    value: {
       type: String,
       required: true,
     },
@@ -88,28 +86,26 @@ export default defineComponent({
   emits: [
     'update:modelValue',
 
-    'input',
     'focus',
     'blur',
   ],
 
   expose: [
     'root',
+
+    'focus',
+    'blur',
   ],
 
   setup(props, context) {
-    const currentInstance = getCurrentInstance()!;
-
     // Refs
     const root = ref<HTMLElement>();
+    const control = ref<HTMLInputElement>();
 
     // Styles
-    const classAttribute = useClassAttribute();
-
     const rootStyles = computed(() => [
       'or-radio',
       ...RadioRoot,
-      classAttribute.value,
     ]);
 
     const controlStyles = computed(() => [
@@ -118,25 +114,37 @@ export default defineComponent({
     ]);
 
     // State
-    const controlId = ref(context.attrs.id as string ?? currentInstance.uid.toString());
+    const controlAttributes = reactive({
+      id: useIdAttribute(),
+      ...useControlAttributes(),
+    });
 
     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);
       },
     });
 
+    // Methods
+    function focus(): void {
+      control.value?.focus();
+    }
+
+    function blur(): void {
+      control.value?.blur();
+    }
+
     return {
       root,
+      control,
       rootStyles,
       controlStyles,
-      controlId,
+      controlAttributes,
       proxyModelValue,
+      focus,
+      blur,
     };
   },
 });

package/src/components/or-search-v3/OrSearch.stories3.ts

@@ -92,7 +92,6 @@ const Template: StoryFn<typeof OrSearch> = (args) => ({
     return {
       args,
       onSearch: action('search'),
-      onInput: action('input'),
       onKeydown: action('keydown'),
       onKeyup: action('keyup'),
       onFocus: action('focus'),
@@ -106,7 +105,6 @@ const Template: StoryFn<typeof OrSearch> = (args) => ({
       v-bind="args"
       style="min-width: 150px"
       @search="onSearch"
-      @input="onInput"
       @keydown="onKeydown"
       @keyup="onKeyup"
       @focus="onFocus"

package/src/components/or-search-v3/OrSearch.vue

@@ -1,7 +1,6 @@
 <template>
   <OrInput
     ref="root"
-    v-bind="$attrs"
     v-model.trim="localModelValue"
     :class="rootStyles"
     :type="'search'"
@@ -19,9 +18,8 @@
 </template>
 
 <script lang="ts">
-import { computed, watch, defineComponent, PropType, ref } from 'vue-demi';
 import { debouncedWatch } from '@vueuse/core';
-import { useClassAttribute } from '../../hooks';
+import { computed, defineComponent, PropType, ref, watch } from 'vue-demi';
 import { OrInputV3 as OrInput } from '../or-input-v3';
 import { SearchSize } from './props';
 
@@ -32,8 +30,6 @@ export default defineComponent({
     OrInput,
   },
 
-  inheritAttrs: false,
-
   props: {
     modelValue: {
       type: String,
@@ -88,11 +84,8 @@ export default defineComponent({
     const root = ref<InstanceType<typeof OrInput>>();
 
     // Styles
-    const classAttribute = useClassAttribute();
-
     const rootStyles = computed(() => [
       'or-search',
-      classAttribute.value,
     ]);
 
     // State

package/src/components/or-segmented-control-v3/OrSegmentedControl.stories3.ts

@@ -20,10 +20,6 @@ export default {
       control: { type: 'text' },
     },
 
-    value: { // TODO: Remove Vue 2 fallback
-      table: { disable: true },
-    },
-
     size: {
       control: { type: 'select' },
       options: Object.values(SegmentedControlSize),
@@ -75,7 +71,6 @@ const Template: StoryFn<typeof OrSegmentedControl> = (args) => ({
       args,
       model,
       onUpdateModelValue: action('update:modelValue'),
-      onInput: action('input'),
     };
   },
 
@@ -84,7 +79,6 @@ const Template: StoryFn<typeof OrSegmentedControl> = (args) => ({
       v-model="model"
       v-bind="args"
       @update:modelValue="onUpdateModelValue"
-      @input="onInput"
     />
   `,
 });

package/src/components/or-segmented-control-v3/OrSegmentedControl.vue

@@ -1,7 +1,6 @@
 <template>
   <div
     ref="root"
-    v-bind="$attrs"
     :class="rootStyles"
   >
     <OrSegmentedControlItem
@@ -19,8 +18,7 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType, ref } from 'vue-demi';
-import { useClassAttribute } from '../../hooks';
-import OrSegmentedControlItem from './components/or-segmented-control-item/OrSegmentedControlItem.vue';
+import OrSegmentedControlItem from './partials/or-segmented-control-item/OrSegmentedControlItem.vue';
 import { SegmentedControlSize } from './props';
 import { SegmentedControlRoot, SegmentedControlRootSizes } from './styles';
 import { SegmentedControlOption } from './types';
@@ -32,7 +30,10 @@ export default defineComponent({
     OrSegmentedControlItem,
   },
 
-  inheritAttrs: false,
+  model: {
+    prop: 'modelValue',
+    event: 'update:modelValue',
+  },
 
   props: {
     options: {
@@ -45,11 +46,6 @@ export default defineComponent({
       default: undefined,
     },
 
-    value: { // TODO: Remove Vue 2 fallback
-      type: String,
-      default: undefined,
-    },
-
     size: {
       type: String as PropType<SegmentedControlSize>,
       default: SegmentedControlSize.M,
@@ -63,8 +59,6 @@ export default defineComponent({
 
   emits: [
     'update:modelValue',
-
-    'input',
   ],
 
   expose: [
@@ -76,23 +70,17 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
-    const classAttribute = useClassAttribute();
-
     const rootStyles = computed(() => [
       'or-segmented-control',
       ...SegmentedControlRoot,
       ...SegmentedControlRootSizes[props.size],
-      classAttribute.value,
     ]);
 
     // 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);
       },
     });

package/src/components/or-segmented-control-v3/{components → partials}/or-segmented-control-item/OrSegmentedControlItem.vue

@@ -1,7 +1,6 @@
 <template>
   <div
     ref="root"
-    v-bind="$attrs"
     :class="rootStyles"
     :selected="selected ? '' : null"
     :disabled="disabled ? '' : null"
@@ -15,15 +14,12 @@
 
 <script lang="ts">
 import { computed, defineComponent, isVue2, PropType, ref } from 'vue-demi';
-import { useClassAttribute } from '../../../../hooks';
 import { SegmentedControlSize } from '../../props';
 import { SegmentedControlItemRoot, SegmentedControlItemRootSizes } from './styles';
 
 export default defineComponent({
   name: 'OrSegmentedControlItem',
 
-  inheritAttrs: false,
-
   props: {
     size: {
       type: String as PropType<SegmentedControlSize>,
@@ -46,13 +42,10 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
-    const classAttribute = useClassAttribute();
-
     const rootStyles = computed(() => [
       'or-segmented-control-item',
       ...SegmentedControlItemRoot,
       ...SegmentedControlItemRootSizes[props.size],
-      classAttribute.value,
     ]);
 
     // Handlers

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

@@ -71,10 +71,6 @@ export default {
       control: { type: 'object' },
     },
 
-    value: { // TODO: Remove Vue 2 fallback
-      table: { disable: true },
-    },
-
     multiple: {
       control: { type: 'boolean' },
     },
@@ -190,7 +186,6 @@ const Template: StoryFn<typeof OrSelect> = (args) => ({
       model,
       searchOptions,
       onUpdate: action('update:modelValue'),
-      onInput: action('input'),
       onFocus: action('focus'),
       onBlur: action('blur'),
       onSearch,
@@ -203,7 +198,6 @@ const Template: StoryFn<typeof OrSelect> = (args) => ({
       v-bind="args"
       :search-options="searchOptions"
       @update:modelValue="onUpdate"
-      @input="onInput"
       @focus="onFocus"
       @blur="onBlur"
       @search="onSearch"