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

package/src/components/or-avatar-v3/OrAvatar.vue

@@ -1,6 +1,7 @@
 <template>
   <div
     ref="root"
+    v-bind="$attrs"
     :class="rootStyles"
   >
     <slot>
@@ -21,18 +22,20 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType, ref, watchPostEffect } from 'vue-demi';
+import { useClassAttribute } from '../../hooks';
 import { generateHslFromString, hslToColorString } from '../../utils/functions/color';
-import { OrIconV3 as OrIcon } from '../or-icon-v3';
 import { AvatarColor, AvatarSize } from './props';
-import { AvatarImage, AvatarRoot, AvatarRootAbbreviationSizes, AvatarRootColors, AvatarRootIconSizes, AvatarRootSizes } from './styles';
+import { AvatarImage, AvatarRoot, AvatarRootColors, AvatarRootSizes, AvatarRootAbbreviationSizes, AvatarRootIconSizes } from './styles';
+import { OrIconV3 as OrIcon } from '../or-icon-v3';
 
 export default defineComponent({
   name: 'OrAvatar',
-
   components: {
     OrIcon,
   },
 
+  inheritAttrs: false,
+
   props: {
     src: {
       type: String,
@@ -72,6 +75,8 @@ export default defineComponent({
       return !props.icon;
     });
     // Styles
+    const classAttribute = useClassAttribute();
+
     const rootStyles = computed(() => [
       'or-avatar',
       ...AvatarRoot,
@@ -81,6 +86,7 @@ export default defineComponent({
         ? AvatarRootAbbreviationSizes[props.size]
         : AvatarRootIconSizes[props.size]
       ),
+      classAttribute.value,
     ]);
 
     const imageStyles = computed(() => [

package/src/components/or-bottom-sheet-v3/OrBottomSheet.vue

@@ -24,6 +24,7 @@
 <script lang="ts">
 import { onClickOutside, SwipeDirection, usePointerSwipe } from '@vueuse/core';
 import { computed, defineComponent, ref, unref, watch } from 'vue-demi';
+import { useClassAttribute } from '../../hooks';
 import { OrOverlayV3 as OrOverlay } from '../or-overlay-v3';
 import { BottomSheetHandle, BottomSheetHeader, BottomSheetRoot } from './styles';
 
@@ -51,9 +52,12 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
+    const classAttribute = useClassAttribute();
+
     const rootStyles = computed(() => [
       'or-bottom-sheet',
       ...BottomSheetRoot,
+      classAttribute.value,
     ]);
 
     const handleStyles = computed(() => [

package/src/components/or-button-v3/OrButton.vue

@@ -1,6 +1,7 @@
 <template>
   <button
     ref="root"
+    v-bind="$attrs"
     :class="rootStyles"
     :type="type"
     :activated="activated ? '' : null"
@@ -33,6 +34,7 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType, ref } from 'vue-demi';
+import { useClassAttribute } from '../../hooks';
 import { OrLoaderV3 as OrLoader } from '../or-loader-v3';
 import { ButtonColor, ButtonType, ButtonVariant } from './props';
 import { ButtonRoot, ButtonRootColors, ButtonRootVariants } from './styles';
@@ -44,6 +46,8 @@ export default defineComponent({
     OrLoader,
   },
 
+  inheritAttrs: false,
+
   props: {
     type: {
       type: String as PropType<ButtonType>,
@@ -96,12 +100,15 @@ export default defineComponent({
     const root = ref<HTMLButtonElement>();
 
     // Styles
+    const classAttribute = useClassAttribute();
+
     const rootStyles = computed(() => [
       'or-button',
       ...ButtonRoot,
       ...ButtonRootVariants[props.variant],
       ...ButtonRootColors[`${props.color}-${props.variant}`],
       props.loading && 'interactivity-none',
+      classAttribute.value,
     ]);
 
     return {

package/src/components/or-card-collection/OrCardCollection.vue

@@ -73,7 +73,7 @@ import { defineComponent, PropType, ref } from 'vue-demi';
 import { CARD_COLLECTION_LAYOUT } from './constants';
 import { OrCard } from '../or-card';
 import { OrIcon } from '../or-icon';
-import { OrSearch } from '../or-inputs';
+import { OrSearch } from '../or-search';
 import { OrIconButton } from '../or-button-v2';
 import { LayoutOption, SortableColumn } from './types';
 
@@ -177,9 +177,9 @@ export default defineComponent({
 .or-card-collection {
   .or-card-collection-toolbar {
     display: flex;
-    justify-content: space-between;
-    align-items: center;
     column-gap: $s-4;
+    align-items: center;
+    justify-content: space-between;
     margin: 0 $s-4;
 
     .or-card-collection-sorting {
@@ -189,21 +189,21 @@ export default defineComponent({
       .or-card-collection-sorting-column {
         display: inline-flex;
         margin: $s-2 $s-6;
-        text-transform: capitalize;
-        color: $c-neutral-4;
         font-size: $fs-0;
         font-weight: $fw-0;
-        letter-spacing: 0;
         line-height: $lh-0;
+        color: $c-neutral-4;
+        text-transform: capitalize;
+        letter-spacing: 0;
         user-select: none;
 
         &.sorting-selected {
-          color: $c-neutral-6;
           font-weight: bold;
+          color: $c-neutral-6;
 
           .or-card-collection-sort-direction {
-            height: 14px;
             width: 14px;
+            height: 14px;
             margin-left: $s-1;
           }
         }

package/src/components/or-card-collection-v3/OrCardCollection.vue

@@ -1,6 +1,7 @@
 <template>
   <div
     ref="root"
+    v-bind="$attrs"
     :class="rootStyles"
   >
     <div :class="toolbarStyles">
@@ -56,7 +57,6 @@
         </div>
       </div>
     </div>
-
     <slot
       name="header"
       v-bind="{
@@ -64,7 +64,6 @@
         mode: proxyView,
       }"
     />
-
     <slot
       v-if="items.length"
       :name="proxyView"
@@ -82,7 +81,6 @@
         </template>
       </OrCardCollectionView>
     </slot>
-
     <slot
       v-else-if="items.length === 0 && proxySearch.length > 0"
       name="noSearchResults"
@@ -95,16 +93,21 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType, ref, watch } from 'vue-demi';
-import { OrButtonV3 as OrButton } from '../or-button-v3';
+import { useClassAttribute } from '../../hooks';
 import { OrIconButtonV3 as OrIconButton } from '../or-icon-button-v3';
-import { OrIconV3 as OrIcon } from '../or-icon-v3';
-import { OrMenuItemV3 as OrMenuItem } from '../or-menu-item-v3';
 import { OrMenuV3 as OrMenu } from '../or-menu-v3';
-import { OrSearchV3 as OrSearch } from '../or-search-v3';
+import { OrMenuItemV3 as OrMenuItem } from '../or-menu-item-v3';
+import { OrIconV3 as OrIcon } from '../or-icon-v3';
+import {
+  CardCollectionRoot,
+  CardCollectionToolbar,
+  CardCollectionToolbarPanel,
+} from './styles';
+import { CardCollectionItem, SortOption, ViewMode } from './types';
 import OrCardCollectionView from './OrCardCollectionView.vue3.vue';
+import { OrButtonV3 as OrButton } from '../or-button-v3';
+import { OrSearchV3 as OrSearch } from '../or-search-v3';
 import { defaultViewModes, gridView } from './props';
-import { CardCollectionRoot, CardCollectionToolbar, CardCollectionToolbarPanel } from './styles';
-import { CardCollectionItem, SortOption, ViewMode } from './types';
 
 export default defineComponent({
   name: 'OrCardCollection',
@@ -119,6 +122,8 @@ export default defineComponent({
     OrSearch,
   },
 
+  inheritAttrs: false,
+
   props: {
     items: {
       type: Array as PropType<CardCollectionItem[]>,
@@ -178,9 +183,12 @@ export default defineComponent({
     const sortButton = ref<typeof OrButton>();
 
     // Styles
+    const classAttribute = useClassAttribute();
+
     const rootStyles = computed(() => [
       'or-card-collection',
       ...CardCollectionRoot,
+      classAttribute.value,
     ]);
 
     const toolbarStyles = computed(() => [

package/src/components/or-card-v3/OrCard.vue

@@ -1,6 +1,7 @@
 <template>
   <div
     ref="root"
+    v-bind="$attrs"
     :class="rootStyles"
   >
     <slot />
@@ -9,11 +10,14 @@
 
 <script lang="ts">
 import { computed, defineComponent, ref } from 'vue-demi';
+import { useClassAttribute } from '../../hooks';
 import { CardRoot } from './styles';
 
 export default defineComponent({
   name: 'OrCard',
 
+  inheritAttrs: false,
+
   expose: [
     'root',
   ],
@@ -23,9 +27,12 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
+    const classAttribute = useClassAttribute();
+
     const rootStyles = computed(() => [
       'or-card',
       ...CardRoot,
+      classAttribute.value,
     ]);
 
     return {

package/src/components/or-checkbox-v3/OrCheckbox.stories3.ts

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

package/src/components/or-checkbox-v3/OrCheckbox.vue

@@ -4,12 +4,12 @@
     :class="rootStyles"
   >
     <input
-      ref="control"
+      v-bind="$attrs"
+      :id="controlId"
       v-model="proxyModelValue"
-      v-bind="controlAttributes"
       :class="controlStyles"
-      :type="'checkbox'"
-      :value="value"
+      type="checkbox"
+      :value="inputValue"
       :indeterminate="indeterminate"
       :required="required"
       :disabled="disabled"
@@ -19,7 +19,7 @@
 
     <template v-if="$slots.default || label">
       <OrLabel
-        :control-id="controlAttributes.id"
+        :control-id="controlId"
         :variant="labelVariant"
         :required="required"
         :disabled="disabled"
@@ -35,8 +35,8 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, PropType, reactive, ref } from 'vue-demi';
-import { useControlAttributes, useIdAttribute } from '../../hooks';
+import { computed, defineComponent, getCurrentInstance, PropType, ref } from 'vue-demi';
+import { useClassAttribute } from '../../hooks';
 import { LabelVariant, OrLabelV3 as OrLabel } from '../or-label-v3';
 import { CheckboxControl, CheckboxControlHandle, CheckboxRoot } from './styles';
 
@@ -47,10 +47,7 @@ export default defineComponent({
     OrLabel,
   },
 
-  model: {
-    prop: 'modelValue',
-    event: 'update:modelValue',
-  },
+  inheritAttrs: false,
 
   props: {
     modelValue: {
@@ -58,7 +55,12 @@ export default defineComponent({
       default: undefined,
     },
 
-    value: {
+    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
       type: String,
       default: undefined,
     },
@@ -92,26 +94,28 @@ 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-checkbox',
       ...CheckboxRoot,
+      classAttribute.value,
     ]);
 
     const controlStyles = computed(() => [
@@ -120,37 +124,25 @@ export default defineComponent({
     ]);
 
     // State
-    const controlAttributes = reactive({
-      id: useIdAttribute(),
-      ...useControlAttributes(),
-    });
+    const controlId = ref(context.attrs.id as string ?? currentInstance.uid.toString());
 
     const proxyModelValue = computed({
-      get: () => props.modelValue,
+      get: () => {
+        return props.modelValue ?? props.value; // TODO: Remove Vue 2 fallback
+      },
 
       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,
-      controlAttributes,
+      controlId,
       proxyModelValue,
-      focus,
-      blur,
     };
   },
 });

package/src/components/or-confirm/OrConfirm.vue

@@ -53,7 +53,7 @@
 import { computed, defineComponent, PropType, ref } from 'vue-demi';
 import { OrButtonV2 as OrButton, BUTTON_COLOR } from '../or-button-v2';
 import { OrModal, OrModalSizes } from '../or-modal';
-import { OrInput } from '../or-inputs';
+import { OrInput } from '../or-input';
 import { useActiveElement, useMagicKeys, whenever } from '@vueuse/core';
 import { logicAnd } from '@vueuse/math';
 

package/src/components/or-confirm-v3/OrConfirm.vue

@@ -72,80 +72,70 @@ import { ButtonColor, OrButtonV3 as OrButton } from '../or-button-v3';
 import { OrInputV3 as OrInput } from '../or-input-v3';
 import { OrOverlayV3 as OrOverlay } from '../or-overlay-v3';
 import { ConfirmType } from './props';
-import { ConfirmFooter, ConfirmFooterButtons, ConfirmFooterTypes, ConfirmHeader, ConfirmInput, ConfirmRoot } from './styles';
+import {
+ConfirmFooter, ConfirmFooterButtons, ConfirmFooterTypes, ConfirmHeader,
+ConfirmInput,
+ConfirmRoot
+} from './styles';
 
 export default defineComponent({
   name: 'OrConfirm',
-
   components: {
     OrOverlay,
     OrButton,
     OrInput,
   },
-
-  inheritAttrs: false,
-
   props: {
     titleText: {
       type: String,
       required: false,
       default: null,
     },
-
     confirmButtonText: {
       type: String,
       required: false,
       default: 'Confirm',
     },
-
     cancelButtonText: {
       type: String,
       required: false,
       default: 'Cancel',
     },
-
     confirmType: {
       type: String as PropType<ConfirmType>,
       required: false,
       default: ConfirmType.C,
     },
-
     loading: {
       type: Boolean,
       required: false,
       default: false,
     },
-
     disabled: {
       type: Boolean,
       required: false,
       default: false,
     },
-
     confirmationText: {
       type: String,
       required: false,
       default: null,
     },
-
     textConfirmationLabel: {
       type: String,
       required: false,
       default: null,
     },
-
     textConfirmationPlaceholder: {
       type: String,
       required: false,
       default: null,
     },
-
     textConfirmationError: {
       type: String,
       required: false,
       default: null,
     },
-
     isOpen: {
       type: Boolean,
       default: false,

package/src/components/or-error-tag-v3/OrErrorTag.vue

@@ -1,6 +1,7 @@
 <template>
   <div
     ref="root"
+    v-bind="$attrs"
     :class="rootStyles"
   >
     <div :class="['layout-row', 'm-[-4px] md:m-[-2px]']">
@@ -16,6 +17,7 @@
 
 <script lang="ts">
 import { computed, defineComponent, ref } from 'vue-demi';
+import { useClassAttribute } from '../../hooks';
 import { OrIconV3 as OrIcon } from '../or-icon-v3';
 import { ErrorTagRoot } from './styles';
 
@@ -26,6 +28,8 @@ export default defineComponent({
     OrIcon,
   },
 
+  inheritAttrs: false,
+
   expose: [
     'root',
   ],
@@ -35,9 +39,12 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
+    const classAttribute = useClassAttribute();
+
     const rootStyles = computed(() => [
       'or-error-tag',
       ...ErrorTagRoot,
+      classAttribute.value,
     ]);
 
     return {

package/src/components/or-error-v3/OrError.vue

@@ -1,6 +1,7 @@
 <template>
   <div
     ref="root"
+    v-bind="$attrs"
     :class="rootStyles"
     :disabled="disabled ? '' : null"
   >
@@ -16,11 +17,14 @@
 
 <script lang="ts">
 import { computed, defineComponent, ref } from 'vue-demi';
+import { useClassAttribute } from '../../hooks';
 import { ErrorAddon, ErrorRoot, ErrorText } from './styles';
 
 export default defineComponent({
   name: 'OrError',
 
+  inheritAttrs: false,
+
   props: {
     disabled: {
       type: Boolean,
@@ -37,9 +41,12 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
+    const classAttribute = useClassAttribute();
+
     const rootStyles = computed(() => [
       'or-error',
       ...ErrorRoot,
+      classAttribute.value,
     ]);
 
     const textStyles = computed(() => [

package/src/components/or-expansion-panel-v3/OrExpansionPanel.vue

@@ -1,6 +1,7 @@
 <template>
   <div
     ref="root"
+    v-bind="$attrs"
     :class="rootStyles"
     :disabled="disabled ? '' : null"
   >
@@ -33,6 +34,7 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType, ref, watch } from 'vue-demi';
+import { useClassAttribute } from '../../hooks';
 import { OrIconV3 as OrIcon } from '../or-icon-v3';
 import { ExpansionPanelColor, ExpansionPanelVariant } from './props';
 import { ExpansionPanelAddon, ExpansionPanelHeader, ExpansionPanelHeaderColors, ExpansionPanelRoot, ExpansionPanelRootVariants } from './styles';
@@ -44,6 +46,8 @@ export default defineComponent({
     OrIcon,
   },
 
+  inheritAttrs: false,
+
   props: {
     label: {
       type: String,
@@ -87,10 +91,13 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
+    const classAttribute = useClassAttribute();
+
     const rootStyles = computed(() => [
       'or-expansion-panel',
       ...ExpansionPanelRoot,
       ...ExpansionPanelRootVariants[props.variant],
+      classAttribute.value,
     ]);
 
     const headerStyles = computed(() => [

package/src/components/or-fab-v3/OrFab.vue

@@ -1,6 +1,7 @@
 <template>
   <button
     ref="root"
+    v-bind="$attrs"
     :class="rootStyles"
     :type="'button'"
     :disabled="disabled"
@@ -25,6 +26,8 @@ export default defineComponent({
     OrIcon,
   },
 
+  inheritAttrs: false,
+
   props: {
     icon: {
       type: String,