@onereach/ui-components 2.70.2-beta.2207.0 → 2.70.2-beta.2216.0

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

@@ -17,10 +17,6 @@ export default {
       control: { type: 'text' },
     },
 
-    readonly: {
-      control: { type: 'boolean' },
-    },
-
     maxlength: {
       control: { type: 'number' },
     },
@@ -74,6 +70,10 @@ export default {
       control: { type: 'boolean' },
     },
 
+    readonly: {
+      control: { type: 'boolean' },
+    },
+
     disabled: {
       control: { type: 'boolean' },
     },

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

@@ -1,11 +1,12 @@
 <template>
   <div
     ref="root"
+    v-bind="$attrs"
     :class="rootStyles"
   >
     <template v-if="label">
       <OrLabel
-        :control-id="controlId"
+        :control-id="controlAttributes.id"
         :variant="'input'"
         :required="required"
         :disabled="disabled"
@@ -26,14 +27,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 +57,7 @@
             <OrIconButton
               :icon="'close'"
               :color="'inherit'"
-              :disabled="disabled"
+              :disabled="readonly || disabled"
               @click.stop="$emit('update:modelValue', '')"
             />
           </template>
@@ -102,8 +103,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';
@@ -173,6 +174,11 @@ export default defineComponent({
       default: false,
     },
 
+    readonly: {
+      type: Boolean,
+      default: false,
+    },
+
     disabled: {
       type: Boolean,
       default: false,
@@ -196,23 +202,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,7 +223,11 @@ 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: () => {
@@ -233,32 +240,35 @@ export default defineComponent({
       },
     });
 
-    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

@@ -22,7 +22,6 @@
 
 <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';
 
@@ -62,13 +61,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

@@ -18,7 +18,6 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType, ref } from 'vue-demi';
-import { useClassAttribute } from '../../hooks';
 import { LinkColor } from './props';
 import { LinkRoot, LinkRootColors } from './styles';
 
@@ -68,15 +67,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

@@ -81,9 +81,8 @@
 
 <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',
@@ -126,13 +125,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

@@ -22,7 +22,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';
 
@@ -67,12 +66,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

@@ -25,7 +25,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';
@@ -72,12 +71,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

@@ -25,7 +25,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';
@@ -57,13 +56,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.vue

@@ -71,7 +71,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';
@@ -134,12 +133,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(() => [
@@ -231,7 +227,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

@@ -98,23 +98,12 @@
 </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',
@@ -216,13 +205,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.vue

@@ -1,12 +1,13 @@
 <template>
   <div
     ref="root"
+    v-bind="$attrs"
     :class="rootStyles"
   >
     <input
-      v-bind="$attrs"
-      :id="controlId"
+      ref="control"
       v-model="proxyModelValue"
+      v-bind="controlAttributes"
       :class="controlStyles"
       type="radio"
       :value="inputValue"
@@ -18,7 +19,7 @@
 
     <template v-if="$slots.default || label">
       <OrLabel
-        :control-id="controlId"
+        :control-id="controlAttributes.id"
         :variant="labelVariant"
         :required="required"
         :disabled="disabled"
@@ -34,8 +35,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';
 
@@ -95,21 +96,20 @@ export default defineComponent({
 
   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,7 +118,10 @@ 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: () => {
@@ -131,12 +134,24 @@ export default defineComponent({
       },
     });
 
+    // 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.vue

@@ -19,9 +19,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';
 
@@ -88,11 +87,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.vue

@@ -19,8 +19,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';
@@ -76,13 +75,10 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
-    const classAttribute = useClassAttribute();
-
     const rootStyles = computed(() => [
       'or-segmented-control',
       ...SegmentedControlRoot,
       ...SegmentedControlRootSizes[props.size],
-      classAttribute.value,
     ]);
 
     // State

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

@@ -15,7 +15,6 @@
 
 <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';
 
@@ -46,13 +45,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.vue

@@ -220,7 +220,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';
@@ -380,12 +380,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(() => [

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

@@ -8,10 +8,9 @@
 </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({
@@ -41,15 +40,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(() => {