@onereach/ui-components 2.70.2-beta.2219.0 → 2.70.2

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

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

package/src/components/or-switch-v3/OrSwitch.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' },
     },
 
@@ -135,7 +139,7 @@ const Template: StoryFn<typeof OrSwitch> = (args) => ({
 
       <OrSwitch
         v-model="model"
-        value="switch-2"
+        input-value="switch-2"
         label="Switch 2"
         @update:modelValue="onUpdateModelValue"
         @input="onInput"
@@ -153,6 +157,6 @@ Switch.args = {
   addon: '<OrIcon icon="info" />',
 
   // Props
-  value: 'switch-1',
+  inputValue: 'switch-1',
   label: 'Switch 1',
 };

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

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

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

@@ -1,6 +1,7 @@
 <template>
   <div
     ref="root"
+    v-bind="$attrs"
     :class="rootStyles"
     :tabindex="0"
     :selected="selected ? '' : null"
@@ -14,11 +15,14 @@
 
 <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,
@@ -41,9 +45,12 @@ 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,6 +25,10 @@ export default {
       control: { type: 'text' },
     },
 
+    value: { // TODO: Remove Vue 2 fallback
+      table: { disable: true },
+    },
+
     variant: {
       control: { type: 'select' },
       options: Object.values(TabsVariant),

package/src/components/or-tabs-v3/OrTabs.vue

@@ -47,6 +47,7 @@
 <script lang="ts">
 import { useResizeObserver } from '@vueuse/core';
 import { computed, defineComponent, nextTick, onMounted, PropType, reactive, ref, watch } from 'vue-demi';
+import { useClassAttribute } from '../../hooks';
 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';
@@ -67,11 +68,6 @@ export default defineComponent({
 
   inheritAttrs: false,
 
-  model: {
-    prop: 'modelValue',
-    event: 'update:modelValue',
-  },
-
   props: {
     items: {
       type: Array as PropType<TabsItem[]>,
@@ -83,6 +79,11 @@ export default defineComponent({
       default: undefined,
     },
 
+    value: { // TODO: Remove Vue 2 fallback
+      type: [String, Number],
+      default: undefined,
+    },
+
     variant: {
       type: String as PropType<TabsVariant>,
       default: TabsVariant.Default,
@@ -91,6 +92,8 @@ export default defineComponent({
 
   emits: [
     'update:modelValue',
+
+    'input',
   ],
 
   expose: [
@@ -108,10 +111,13 @@ export default defineComponent({
     const overflowMenuRoot = computed(() => overflowMenu.value?.root);
 
     // Styles
+    const classAttribute = useClassAttribute();
+
     const rootStyles = computed(() => [
       'or-tabs',
       ...TabsRoot,
       ...TabsRootVariants[props.variant],
+      classAttribute.value,
     ]);
 
     // State
@@ -121,16 +127,19 @@ export default defineComponent({
     });
 
     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);
       },
     });
 
     const activeTab = computed(() => props.items.find(({ value }) => value === proxyModelValue.value)!);
 
-    // Methods
+    // Functions
     function rearrangeTabs(items: TabsItem[], activeTab: TabsItem, rootElement: Element): typeof tabs {
       const { children } = rootElement;
 

package/src/components/or-tag-v3/OrTag.vue

@@ -1,6 +1,7 @@
 <template>
   <div
     ref="root"
+    v-bind="$attrs"
     :class="rootStyles"
     :tabindex="!disabled && variant === 'button' ? 0 : null"
     :disabled="disabled ? '' : null"
@@ -25,6 +26,7 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType, ref, unref, watchPostEffect } from 'vue-demi';
+import { useClassAttribute } from '../../hooks';
 import { OrIconButtonV3 as OrIconButton } from '../or-icon-button-v3';
 import { TagColor, TagVariant } from './props';
 import { TagRoot, TagRootColors, TagRootVariants } from './styles';
@@ -36,6 +38,8 @@ export default defineComponent({
     OrIconButton,
   },
 
+  inheritAttrs: false,
+
   props: {
     variant: {
       type: String as PropType<TagVariant>,
@@ -70,11 +74,14 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
+    const classAttribute = useClassAttribute();
+
     const rootStyles = computed(() => [
       'or-tag',
       ...TagRoot,
       ...TagRootVariants[props.variant],
       ...!custom.value ? TagRootColors[props.color as TagColor] : [],
+      classAttribute.value,
     ]);
 
     // State

package/src/components/or-tag-v3/styles.ts

@@ -49,6 +49,9 @@ export const TagRootColors: Record<TagColor, string[]> = {
     // Theme
     'theme-preset-2-primary',
     'dark:theme-preset-2-primary-dark',
+
+    'theme-foreground-default',
+    'dark:theme-foreground-default-dark',
   ],
 
   'danger': [

package/src/components/or-text-v3/OrText.vue

@@ -1,6 +1,7 @@
 <template>
   <div
     ref="root"
+    v-bind="$attrs"
     :class="rootStyles"
   >
     <div :class="mainTextStyles">
@@ -15,11 +16,14 @@
 
 <script lang="ts">
 import { computed, defineComponent, ref } from 'vue-demi';
+import { useClassAttribute } from '../../hooks';
 import { MainText, RestText, TextRoot } from './styles';
 
 export default defineComponent({
   name: 'OrText',
 
+  inheritAttrs: false,
+
   props: {
     text: {
       type: String,
@@ -41,9 +45,12 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
+    const classAttribute = useClassAttribute();
+
     const rootStyles = computed(() => [
       'or-text',
       ...TextRoot,
+      classAttribute.value,
     ]);
 
     const mainTextStyles = computed(() => [

package/src/components/or-textarea-v3/OrTextarea.stories3.ts

@@ -16,6 +16,10 @@ export default {
       control: { type: 'text' },
     },
 
+    readonly: {
+      control: { type: 'boolean' },
+    },
+
     maxlength: {
       control: { type: 'number' },
     },
@@ -35,6 +39,10 @@ export default {
       control: { type: 'text' },
     },
 
+    value: { // TODO: Remove Vue 2 fallback
+      table: { disable: true },
+    },
+
     size: {
       control: { type: 'select' },
       options: Object.values(TextareaSize),
@@ -60,10 +68,6 @@ export default {
       control: { type: 'boolean' },
     },
 
-    readonly: {
-      control: { type: 'boolean' },
-    },
-
     disabled: {
       control: { type: 'boolean' },
     },

package/src/components/or-textarea-v3/OrTextarea.vue

@@ -5,7 +5,7 @@
   >
     <template v-if="label">
       <OrLabel
-        :control-id="controlAttributes.id"
+        :control-id="controlId"
         :variant="'input'"
         :required="required"
         :disabled="disabled"
@@ -25,13 +25,12 @@
       :disabled="disabled"
     >
       <textarea
-        ref="control"
+        :id="controlId"
         v-model="proxyModelValue"
-        v-bind="controlAttributes"
+        v-bind="$attrs"
         :class="controlStyles"
         :placeholder="placeholder"
         :required="required"
-        :readonly="readonly"
         :disabled="disabled"
         @keydown="$emit('keydown', $event)"
         @keyup="$emit('keyup', $event)"
@@ -71,8 +70,8 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, PropType, reactive, ref } from 'vue-demi';
-import { useControlAttributes, useIdAttribute, useValidationAttributes } from '../../hooks';
+import { computed, defineComponent, getCurrentInstance, PropType, ref } from 'vue-demi';
+import { useClassAttribute } from '../../hooks';
 import { OrErrorV3 as OrError } from '../or-error-v3';
 import { OrHintV3 as OrHint } from '../or-hint-v3';
 import { OrInputBoxV3 as OrInputBox } from '../or-input-box-v3';
@@ -90,10 +89,7 @@ export default defineComponent({
     OrLabel,
   },
 
-  model: {
-    prop: 'modelValue',
-    event: 'update:modelValue',
-  },
+  inheritAttrs: false,
 
   props: {
     modelValue: {
@@ -101,6 +97,11 @@ export default defineComponent({
       default: undefined,
     },
 
+    value: { // TODO: Remove Vue 2 fallback
+      type: String,
+      default: undefined,
+    },
+
     size: {
       type: String as PropType<TextareaSize>,
       default: TextareaSize.M,
@@ -131,11 +132,6 @@ export default defineComponent({
       default: false,
     },
 
-    readonly: {
-      type: Boolean,
-      default: false,
-    },
-
     disabled: {
       type: Boolean,
       default: false,
@@ -145,6 +141,7 @@ export default defineComponent({
   emits: [
     'update:modelValue',
 
+    'input',
     'keydown',
     'keyup',
     'focus',
@@ -153,20 +150,21 @@ export default defineComponent({
 
   expose: [
     'root',
-
-    'focus',
-    'blur',
   ],
 
   setup(props, context) {
+    const currentInstance = getCurrentInstance()!;
+
     // Refs
     const root = ref<HTMLElement>();
-    const control = ref<HTMLTextAreaElement>();
 
     // Styles
+    const classAttribute = useClassAttribute();
+
     const rootStyles = computed(() => [
       'or-textarea',
       ...TextareaRoot,
+      classAttribute.value,
     ]);
 
     const controlStyles = computed(() => [
@@ -174,46 +172,35 @@ export default defineComponent({
     ]);
 
     // State
-    const controlAttributes = reactive({
-      id: useIdAttribute(),
-      ...useControlAttributes(),
-      ...useValidationAttributes(),
-    });
+    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);
       },
     });
 
-    const currentLength = computed(() => proxyModelValue.value?.toString().length ?? 0);
-    const maxLength = computed(() => controlAttributes.maxlength);
-
     const invalid = computed(() => !!props.error);
+    const readonly = computed(() => context.attrs.readonly as boolean);
 
-    // Methods
-    function focus(): void {
-      control.value?.focus();
-    }
-
-    function blur(): void {
-      control.value?.blur();
-    }
+    const currentLength = computed(() => proxyModelValue.value?.toString().length ?? 0);
+    const maxLength = computed(() => context.attrs.maxlength as number | undefined);
 
     return {
       root,
-      control,
       rootStyles,
       controlStyles,
-      controlAttributes,
+      controlId,
       proxyModelValue,
+      invalid,
+      readonly,
       currentLength,
       maxLength,
-      invalid,
-      focus,
-      blur,
     };
   },
 });

package/src/components/or-tooltip-v3/OrTooltip.vue

@@ -1,6 +1,7 @@
 <template>
   <div
     ref="root"
+    v-bind="$attrs"
     :class="rootStyles"
   >
     <slot />
@@ -26,6 +27,7 @@
 <script lang="ts">
 import { useDebounceFn, useElementHover } from '@vueuse/core';
 import { computed, defineComponent, PropType, ref, watch } from 'vue-demi';
+import { useClassAttribute } from '../../hooks';
 import { OrPopoverV3 as OrPopover } from '../or-popover-v3';
 import { TooltipPlacement } from './props';
 import { TooltipBody, TooltipBodyPlacements, TooltipRoot } from './styles';
@@ -37,6 +39,8 @@ export default defineComponent({
     OrPopover,
   },
 
+  inheritAttrs: false,
+
   props: {
     text: {
       type: String,
@@ -67,9 +71,12 @@ export default defineComponent({
     const popoverRoot = computed(() => popover.value?.root);
 
     // Styles
+    const classAttribute = useClassAttribute();
+
     const rootStyles = computed(() => [
       'or-tooltip',
       ...TooltipRoot,
+      classAttribute.value,
     ]);
 
     const bodyStyles = computed(() => [