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

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

@@ -1,7 +1,6 @@
 <template>
   <div
     ref="root"
-    v-bind="$attrs"
     :class="rootStyles"
   >
     <template v-if="label">
@@ -126,7 +125,7 @@
                   >
                     <OrCheckbox
                       v-model="proxyModelValue"
-                      :input-value="option.value"
+                      :value="option.value"
                       :label="option.label"
                       :label-variant="'input'"
                     />
@@ -165,7 +164,7 @@
                 >
                   <OrCheckbox
                     v-model="proxyModelValue"
-                    :input-value="option.value"
+                    :value="option.value"
                     :label="option.label"
                     :label-variant="'input'"
                   />
@@ -220,7 +219,7 @@
 <script lang="ts">
 import { computed, defineComponent, getCurrentInstance, onMounted, PropType, ref, watch } from 'vue-demi';
 import { DropdownClose, DropdownOpen } from '../../directives';
-import { useClassAttribute, useOverflow } from '../../hooks';
+import { useOverflow } from '../../hooks';
 import { OrCheckboxV3 as OrCheckbox } from '../or-checkbox-v3';
 import { OrErrorV3 as OrError } from '../or-error-v3';
 import { OrExpansionPanelV3 as OrExpansionPanel } from '../or-expansion-panel-v3';
@@ -258,7 +257,10 @@ export default defineComponent({
     DropdownOpen,
   },
 
-  inheritAttrs: false,
+  model: {
+    prop: 'modelValue',
+    event: 'update:modelValue',
+  },
 
   props: {
     options: {
@@ -276,11 +278,6 @@ export default defineComponent({
       default: undefined,
     },
 
-    value: { // TODO: Remove Vue 2 fallback
-      type: [String, Number, Array] as PropType<string | number | (string | number)[]>,
-      default: undefined,
-    },
-
     multiple: {
       type: Boolean,
       default: false,
@@ -353,7 +350,6 @@ export default defineComponent({
   emits: [
     'update:modelValue',
 
-    'input',
     'focus',
     'blur',
 
@@ -380,12 +376,9 @@ export default defineComponent({
     const popoverState = computed(() => popover.value?.state);
 
     // Styles
-    const classAttribute = useClassAttribute();
-
     const rootStyles = computed(() => [
       'or-select',
       ...SelectRoot,
-      classAttribute.value,
     ]);
 
     const controlStyles = computed(() => [
@@ -408,12 +401,9 @@ export default defineComponent({
     const controlId = ref(context.attrs.id as string ?? currentInstance.uid.toString());
 
     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-skeleton-v3/OrSkeletonCircle.vue

@@ -1,30 +1,27 @@
 <template>
   <div
     ref="root"
-    v-bind="$attrs"
     :class="rootStyles"
     :style="rootStyle"
   />
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, ref } from 'vue-demi';
 import _ from 'lodash';
+import { computed, defineComponent, ref } from 'vue-demi';
 import { pxToRem } from '../../utils/functions/px-to-rem';
-import { useClassAttribute } from '../../hooks';
 import { SkeletonAnimated, SkeletonCircle, SkeletonRoot } from './styles';
 
 export default defineComponent({
   name: 'OrSkeletonCircle',
 
-  inheritAttrs: false,
-
   props: {
     animated: {
       type: Boolean,
       required: false,
       default: true,
     },
+
     size: {
       type: [Number, String],
       required: false,
@@ -41,15 +38,12 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
-    const classAttribute = useClassAttribute();
-
     const rootStyles = computed(() => [
       'or-skeleton',
       'or-skeleton-circle',
       ...SkeletonRoot,
       ...SkeletonCircle,
       ...(props.animated ? SkeletonAnimated : []),
-      classAttribute.value,
     ]);
 
     const rootStyle = computed(() => {

package/src/components/or-skeleton-v3/OrSkeletonRect.vue

@@ -1,35 +1,33 @@
 <template>
   <div
     ref="root"
-    v-bind="$attrs"
     :class="rootStyles"
     :style="rootStyle"
   />
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, ref } from 'vue-demi';
 import _ from 'lodash';
+import { computed, defineComponent, ref } from 'vue-demi';
 import { pxToRem } from '../../utils/functions/px-to-rem';
-import { useClassAttribute } from '../../hooks';
 import { SkeletonAnimated, SkeletonRect, SkeletonRoot } from './styles';
 
 export default defineComponent({
   name: 'OrSkeletonRect',
 
-  inheritAttrs: false,
-
   props: {
     animated: {
       type: Boolean,
       required: false,
       default: true,
     },
+
     width: {
       type: [Number, String],
       required: false,
       default: '100%',
     },
+
     height: {
       type: [Number, String],
       required: false,
@@ -46,15 +44,12 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
-    const classAttribute = useClassAttribute();
-
     const rootStyles = computed(() => [
       'or-skeleton',
       'or-skeleton-rect',
       ...SkeletonRoot,
       ...SkeletonRect,
       ...(props.animated ? SkeletonAnimated : []),
-      classAttribute.value,
     ]);
 
     const rootStyle = computed(() => {

package/src/components/or-skeleton-v3/OrSkeletonText.vue

@@ -1,7 +1,6 @@
 <template>
   <div
     ref="root"
-    v-bind="$attrs"
     :class="containerStyles"
     :style="containerStyle"
   >
@@ -15,38 +14,39 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, ref } from 'vue-demi';
 import _ from 'lodash';
+import { computed, defineComponent, ref } from 'vue-demi';
 import { pxToRem } from '../../utils/functions/px-to-rem';
-import { useClassAttribute } from '../../hooks';
 import { SkeletonAnimated, SkeletonRoot, SkeletonText, SkeletonTextContainerRoot } from './styles';
 
 export default defineComponent({
   name: 'OrSkeletonText',
 
-  inheritAttrs: false,
-
   props: {
     animated: {
       type: Boolean,
       required: false,
       default: true,
     },
+
     linesCount: {
       type: Number,
       required: false,
       default: 1,
     },
+
     width: {
       type: [Number, String],
       required: false,
       default: '100%',
     },
+
     fontSize: {
       type: Number,
       required: false,
       default: 16,
     },
+
     lineHeight: {
       type: Number,
       required: false,
@@ -63,12 +63,9 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
-    const classAttribute = useClassAttribute();
-
     const containerStyles = computed(() => [
       'or-skeleton-text-root',
       ...SkeletonTextContainerRoot,
-      classAttribute.value,
     ]);
 
     const containerStyle = computed(() => {
@@ -85,7 +82,6 @@ export default defineComponent({
       ...SkeletonRoot,
       ...SkeletonText,
       ...(props.animated ? SkeletonAnimated : []),
-      classAttribute.value,
     ]);
 
     const rowStyle = computed(() => {

package/src/components/or-sort-header-v3/OrSortHeader.stories3.ts

@@ -25,11 +25,7 @@ export default {
       control: { type: 'object' },
     },
 
-    value: { // TODO: Remove Vue 2 fallback
-      control: { type: 'object' },
-    },
-
-    inputValue: { // TODO: Rename to `value` after complete migration to Vue 3
+    value: {
       control: { type: 'text' },
     },
 
@@ -88,7 +84,6 @@ const Template: StoryFn<typeof OrSortHeader> = (args) => ({
       args,
       model,
       onUpdateModelValue: action('update:modelValue'),
-      onInput: action('input'),
       onFocus: action('focus'),
       onBlur: action('blur'),
     };
@@ -100,7 +95,6 @@ const Template: StoryFn<typeof OrSortHeader> = (args) => ({
         v-model="model"
         v-bind="args"
         @update:modelValue="onUpdateModelValue"
-        @input="onInput"
         @focus="onFocus"
         @blur="onBlur"
       >
@@ -109,9 +103,8 @@ const Template: StoryFn<typeof OrSortHeader> = (args) => ({
 
       <OrSortHeader
         v-model="model"
-        input-value="column-2"
+        value="column-2"
         @update:modelValue="onUpdateModelValue"
-        @input="onInput"
         @focus="onFocus"
         @blur="onBlur"
       >
@@ -128,5 +121,5 @@ Default.args = {
   default: 'Column 1',
 
   // Props
-  inputValue: 'column-1',
+  value: 'column-1',
 };

package/src/components/or-sort-header-v3/OrSortHeader.vue

@@ -1,7 +1,6 @@
 <template>
   <div
     ref="root"
-    v-bind="$attrs"
     :class="rootStyles"
     :activated="activated ? '' : null"
     @click.stop="toggleDirection()"
@@ -19,7 +18,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 { SortHeaderRoot } from './styles';
 import { SortHeaderModel } from './types';
@@ -31,7 +29,10 @@ export default defineComponent({
     OrIcon,
   },
 
-  inheritAttrs: false,
+  model: {
+    prop: 'modelValue',
+    event: 'update:modelValue',
+  },
 
   props: {
     modelValue: {
@@ -39,12 +40,7 @@ export default defineComponent({
       default: undefined,
     },
 
-    value: { // TODO: Remove Vue 2 fallback
-      type: Object as PropType<SortHeaderModel>,
-      default: undefined,
-    },
-
-    inputValue: { // TODO: Rename to `value` after complete migration to Vue 3
+    value: {
       type: String,
       required: true,
     },
@@ -53,7 +49,6 @@ export default defineComponent({
   emits: [
     'update:modelValue',
 
-    'input',
     'focus',
     'blur',
   ],
@@ -67,34 +62,28 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
-    const classAttribute = useClassAttribute();
-
     const rootStyles = computed(() => [
       'or-sort-header',
       ...SortHeaderRoot,
-      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);
       },
     });
 
     const activated = computed(() => {
-      return proxyModelValue.value?.column === props.inputValue;
+      return proxyModelValue.value?.column === props.value;
     });
 
     // Methods
     function toggleDirection(): void {
       proxyModelValue.value = {
-        column: props.inputValue,
+        column: props.value,
         direction: proxyModelValue.value?.direction === 'asc' ? 'desc' : 'asc',
       };
     }

package/src/components/or-switch-v3/OrSwitch.stories3.ts

@@ -26,11 +26,7 @@ export default {
       control: { type: 'object' },
     },
 
-    value: { // TODO: Remove Vue 2 fallback
-      table: { disable: true },
-    },
-
-    inputValue: { // TODO: Rename to `value` after complete migration to Vue 3
+    value: {
       control: { type: 'text' },
     },
 
@@ -116,7 +112,6 @@ const Template: StoryFn<typeof OrSwitch> = (args) => ({
       args,
       model,
       onUpdateModelValue: action('update:modelValue'),
-      onInput: action('input'),
       onFocus: action('focus'),
       onBlur: action('blur'),
     };
@@ -128,7 +123,6 @@ const Template: StoryFn<typeof OrSwitch> = (args) => ({
         v-model="model"
         v-bind="args"
         @update:modelValue="onUpdateModelValue"
-        @input="onInput"
         @focus="onFocus"
         @blur="onBlur"
       >
@@ -139,10 +133,9 @@ const Template: StoryFn<typeof OrSwitch> = (args) => ({
 
       <OrSwitch
         v-model="model"
-        input-value="switch-2"
+        value="switch-2"
         label="Switch 2"
         @update:modelValue="onUpdateModelValue"
-        @input="onInput"
         @focus="onFocus"
         @blur="onBlur"
       />
@@ -157,6 +150,6 @@ Switch.args = {
   addon: '<OrIcon icon="info" />',
 
   // Props
-  inputValue: 'switch-1',
+  value: 'switch-1',
   label: 'Switch 1',
 };

package/src/components/or-switch-v3/OrSwitch.vue

@@ -5,12 +5,12 @@
   >
     <template v-if="!loading">
       <input
-        v-bind="$attrs"
-        :id="controlId"
+        ref="control"
         v-model="proxyModelValue"
+        v-bind="controlAttributes"
         :class="controlStyles"
         type="checkbox"
-        :value="inputValue"
+        :value="value"
         :required="required"
         :disabled="disabled"
         @focus="$emit('focus', $event)"
@@ -33,7 +33,7 @@
 
     <template v-if="$slots.default || label">
       <OrLabel
-        :control-id="controlId"
+        :control-id="controlAttributes.id"
         :variant="labelVariant"
         :required="required"
         :disabled="disabled"
@@ -49,8 +49,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 { OrLoaderV3 as OrLoader } from '../or-loader-v3';
 import { SwitchControl, SwitchControlHandle, SwitchLoader, SwitchLoaderHandle, SwitchRoot } from './styles';
@@ -63,7 +63,10 @@ export default defineComponent({
     OrLoader,
   },
 
-  inheritAttrs: false,
+  model: {
+    prop: 'modelValue',
+    event: 'update:modelValue',
+  },
 
   props: {
     modelValue: {
@@ -71,12 +74,7 @@ export default defineComponent({
       default: undefined,
     },
 
-    value: { // TODO: Remove Vue 2 fallback
-      type: [Boolean, Array] as PropType<boolean | string[]>,
-      default: undefined,
-    },
-
-    inputValue: { // TODO: Rename to `value` after complete migration to Vue 3
+    value: {
       type: String,
       default: undefined,
     },
@@ -110,28 +108,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-switch',
       ...SwitchRoot,
-      classAttribute.value,
     ]);
 
     const controlStyles = computed(() => [
@@ -145,26 +141,38 @@ 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,
       loaderStyles,
-      controlId,
+      controlAttributes,
       proxyModelValue,
+      focus,
+      blur,
     };
   },
 });

package/src/components/or-tab-v3/OrTab.vue

@@ -1,7 +1,6 @@
 <template>
   <div
     ref="root"
-    v-bind="$attrs"
     :class="rootStyles"
     :tabindex="0"
     :selected="selected ? '' : null"
@@ -15,14 +14,11 @@
 
 <script lang="ts">
 import { computed, defineComponent, ref } from 'vue-demi';
-import { useClassAttribute } from '../../hooks';
 import { TabRoot } from './styles';
 
 export default defineComponent({
   name: 'OrTab',
 
-  inheritAttrs: false,
-
   props: {
     selected: {
       type: Boolean,
@@ -45,12 +41,9 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
-    const classAttribute = useClassAttribute();
-
     const rootStyles = computed(() => [
       'or-tab',
       ...TabRoot,
-      classAttribute.value,
     ]);
 
     return {

package/src/components/or-tabs-v3/OrTabs.stories3.ts

@@ -25,10 +25,6 @@ export default {
       control: { type: 'text' },
     },
 
-    value: { // TODO: Remove Vue 2 fallback
-      table: { disable: true },
-    },
-
     variant: {
       control: { type: 'select' },
       options: Object.values(TabsVariant),
@@ -74,7 +70,6 @@ const Template: StoryFn<typeof OrTabs> = (args) => ({
       args,
       model,
       onUpdateModelValue: action('update:modelValue'),
-      onInput: action('input'),
     };
   },
 
@@ -83,7 +78,6 @@ const Template: StoryFn<typeof OrTabs> = (args) => ({
       v-model="model"
       v-bind="args"
       @update:modelValue="onUpdateModelValue"
-      @input="onInput"
     >
       <template v-for="item in args.items" #[item.value]>
         {{ item.label }} Content