@onereach/ui-components 2.71.1-beta.2221.0 → 2.71.1-beta.2222.0

package/src/components/or-inline-input-box-v3/OrInlineInputBox.vue

@@ -1,6 +1,7 @@
 <template>
   <div
     ref="root"
+    v-bind="$attrs"
     :class="rootStyles"
     :invalid="invalid ? '' : null"
   >
@@ -10,12 +11,15 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType, ref } from 'vue-demi';
+import { useClassAttribute } from '../../hooks';
 import { InlineInputBoxSize } from './props';
 import { InlineInputBoxRoot, InlineInputBoxRootSizes } from './styles';
 
 export default defineComponent({
   name: 'OrInlineInputBox',
 
+  inheritAttrs: false,
+
   props: {
     size: {
       type: String as PropType<InlineInputBoxSize>,
@@ -37,10 +41,13 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
+    const classAttribute = useClassAttribute();
+
     const rootStyles = computed(() => [
       'or-inline-input-box',
       ...InlineInputBoxRoot,
       ...InlineInputBoxRootSizes[props.size],
+      classAttribute.value,
     ]);
 
     return {

package/src/components/or-inline-input-v3/OrInlineInput.stories3.ts

@@ -24,6 +24,10 @@ export default {
       control: { type: 'text' },
     },
 
+    value: { // TODO: Remove Vue 2 fallback
+      table: { disable: true },
+    },
+
     saveOnBlur: {
       control: { type: 'boolean' },
     },
@@ -108,6 +112,7 @@ const Template: StoryFn<typeof OrInlineInput> = (args) => ({
       args,
       model,
       onUpdateModelValue: action('update:modelValue'),
+      onInput: action('input'),
       onKeydown: action('keydown'),
       onKeyup: action('keyup'),
       onFocus: action('focus'),
@@ -120,6 +125,7 @@ const Template: StoryFn<typeof OrInlineInput> = (args) => ({
       v-model="model"
       v-bind="args"
       @update:modelValue="onUpdateModelValue"
+      @input="onInput"
       @keydown="onKeydown"
       @keyup="onKeyup"
       @focus="onFocus"

package/src/components/or-inline-input-v3/OrInlineInput.vue

@@ -9,9 +9,9 @@
         :invalid="invalid"
       >
         <input
-          ref="control"
+          :id="controlId"
           v-model="draftModelValue"
-          v-bind="controlAttributes"
+          v-bind="$attrs"
           :class="controlStyles"
           :type="type"
           :placeholder="placeholder"
@@ -71,8 +71,8 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, PropType, reactive, ref, watch } from 'vue-demi';
-import { useControlAttributes, useIdAttribute, useValidationAttributes } from '../../hooks';
+import { computed, defineComponent, getCurrentInstance, PropType, ref, watch } from 'vue-demi';
+import { useClassAttribute } 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';
@@ -90,10 +90,7 @@ export default defineComponent({
     OrInlineInputBox,
   },
 
-  model: {
-    prop: 'modelValue',
-    event: 'update:modelValue',
-  },
+  inheritAttrs: false,
 
   props: {
     modelValue: {
@@ -101,6 +98,11 @@ export default defineComponent({
       default: undefined,
     },
 
+    value: { // TODO: Remove Vue 2 fallback
+      type: [String, Number],
+      default: undefined,
+    },
+
     saveOnBlur: {
       type: Boolean,
       default: false,
@@ -135,6 +137,7 @@ export default defineComponent({
   emits: [
     'update:modelValue',
 
+    'input',
     'keydown',
     'keyup',
     'focus',
@@ -143,20 +146,21 @@ 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-inline-input',
       ...InlineInputRoot,
+      classAttribute.value,
     ]);
 
     const controlStyles = computed(() => [
@@ -169,28 +173,26 @@ 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 draftModelValue = ref<string | number>('');
 
-    const currentLength = computed(() => draftModelValue.value?.toString().length ?? 0);
-    const maxLength = computed(() => controlAttributes.maxlength);
-
+    const activated = ref(false);
     const invalid = computed(() => !!props.error);
 
-    const activated = ref(false);
+    const currentLength = computed(() => draftModelValue.value?.toString().length ?? 0);
+    const maxLength = computed(() => context.attrs.maxlength as number | undefined);
 
     // Handlers
     function onFocus(event: Event): void {
@@ -208,14 +210,6 @@ export default defineComponent({
     }
 
     // Methods
-    function focus(): void {
-      control.value?.focus();
-    }
-
-    function blur(): void {
-      control.value?.blur();
-    }
-
     function apply(): void {
       if (draftModelValue.value !== proxyModelValue.value) {
         proxyModelValue.value = draftModelValue.value;
@@ -239,21 +233,18 @@ export default defineComponent({
 
     return {
       root,
-      control,
       rootStyles,
       controlStyles,
       actionStyles,
-      controlAttributes,
+      controlId,
       proxyModelValue,
       draftModelValue,
+      activated,
+      invalid,
       currentLength,
       maxLength,
-      invalid,
-      activated,
       onFocus,
       onBlur,
-      focus,
-      blur,
       apply,
       reset,
     };

package/src/components/or-inline-input-v3/styles.ts

@@ -9,8 +9,8 @@ export const InlineInputRoot: string[] = [
 ];
 
 export const InlineInputControl: string[] = [
-  // Layout
-  'grow',
+  // Box
+  'w-full',
 
   // Typography
   'typography-inherit',

package/src/components/or-inline-textarea-v3/OrInlineTextarea.stories3.ts

@@ -23,6 +23,10 @@ export default {
       control: { type: 'text' },
     },
 
+    value: { // TODO: Remove Vue 2 fallback
+      table: { disable: true },
+    },
+
     saveOnBlur: {
       control: { type: 'boolean' },
     },
@@ -97,6 +101,7 @@ const Template: StoryFn<typeof OrInlineTextarea> = (args) => ({
       args,
       model,
       onUpdateModelValue: action('update:modelValue'),
+      onInput: action('input'),
       onKeydown: action('keydown'),
       onKeyup: action('keyup'),
       onFocus: action('focus'),
@@ -109,6 +114,7 @@ const Template: StoryFn<typeof OrInlineTextarea> = (args) => ({
       v-model="model"
       v-bind="args"
       @update:modelValue="onUpdateModelValue"
+      @input="onInput"
       @keydown="onKeydown"
       @keyup="onKeyup"
       @focus="onFocus"

package/src/components/or-inline-textarea-v3/OrInlineTextarea.vue

@@ -9,9 +9,9 @@
         :invalid="invalid"
       >
         <textarea
-          ref="control"
+          :id="controlId"
           v-model="draftModelValue"
-          v-bind="controlAttributes"
+          v-bind="$attrs"
           :class="controlStyles"
           :placeholder="placeholder"
           :activated="activated ? '' : null"
@@ -70,8 +70,8 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, reactive, ref, watch } from 'vue-demi';
-import { useControlAttributes, useIdAttribute, useValidationAttributes } from '../../hooks';
+import { computed, defineComponent, getCurrentInstance, ref, watch } from 'vue-demi';
+import { useClassAttribute } 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';
@@ -88,10 +88,7 @@ export default defineComponent({
     OrInlineInputBox,
   },
 
-  model: {
-    prop: 'modelValue',
-    event: 'update:modelValue',
-  },
+  inheritAttrs: false,
 
   props: {
     modelValue: {
@@ -99,6 +96,11 @@ export default defineComponent({
       default: undefined,
     },
 
+    value: { // TODO: Remove Vue 2 fallback
+      type: String,
+      default: undefined,
+    },
+
     saveOnBlur: {
       type: Boolean,
       default: false,
@@ -123,6 +125,7 @@ export default defineComponent({
   emits: [
     'update:modelValue',
 
+    'input',
     'keydown',
     'keyup',
     'focus',
@@ -131,20 +134,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-inline-textarea',
       ...InlineTextareaRoot,
+      classAttribute.value,
     ]);
 
     const controlStyles = computed(() => [
@@ -156,28 +160,26 @@ 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 draftModelValue = ref<string>('');
 
-    const currentLength = computed(() => draftModelValue.value?.toString().length ?? 0);
-    const maxLength = computed(() => controlAttributes.maxlength);
-
+    const activated = ref(false);
     const invalid = computed(() => !!props.error);
 
-    const activated = ref(false);
+    const currentLength = computed(() => draftModelValue.value?.toString().length ?? 0);
+    const maxLength = computed(() => context.attrs.maxlength as number | undefined);
 
     // Handlers
     function onFocus(event: Event): void {
@@ -195,14 +197,6 @@ export default defineComponent({
     }
 
     // Methods
-    function focus(): void {
-      control.value?.focus();
-    }
-
-    function blur(): void {
-      control.value?.blur();
-    }
-
     function apply(): void {
       if (draftModelValue.value !== proxyModelValue.value) {
         proxyModelValue.value = draftModelValue.value;
@@ -226,21 +220,18 @@ export default defineComponent({
 
     return {
       root,
-      control,
       rootStyles,
       controlStyles,
       actionStyles,
-      controlAttributes,
+      controlId,
       proxyModelValue,
       draftModelValue,
+      activated,
+      invalid,
       currentLength,
       maxLength,
-      invalid,
-      activated,
       onFocus,
       onBlur,
-      focus,
-      blur,
       apply,
       reset,
     };

package/src/components/or-inline-textarea-v3/styles.ts

@@ -7,8 +7,8 @@ export const InlineTextareaRoot: string[] = [
 ];
 
 export const InlineTextareaControl: string[] = [
-  // Layout
-  'grow',
+  // Box
+  'w-full',
 
   // Typography
   'typography-inherit',

package/src/components/or-input-box-v3/OrInputBox.vue

@@ -1,6 +1,7 @@
 <template>
   <div
     ref="root"
+    v-bind="$attrs"
     :class="rootStyles"
     :invalid="invalid ? '' : null"
     :readonly="readonly ? '' : null"
@@ -12,12 +13,15 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType, ref } from 'vue-demi';
+import { useClassAttribute } from '../../hooks';
 import { InputBoxSize, InputBoxVariant } from './props';
 import { InputBoxRoot, InputBoxRootSizes, InputBoxRootVariants } from './styles';
 
 export default defineComponent({
   name: 'OrInputBox',
 
+  inheritAttrs: false,
+
   props: {
     variant: {
       type: String as PropType<InputBoxVariant>,
@@ -54,11 +58,14 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
+    const classAttribute = useClassAttribute();
+
     const rootStyles = computed(() => [
       'or-input-box',
       ...InputBoxRoot,
       ...InputBoxRootVariants[props.variant],
       ...InputBoxRootSizes[props.size],
+      classAttribute.value,
     ]);
 
     return {

package/src/components/or-input-box-v3/styles.ts

@@ -90,7 +90,7 @@ export const InputBoxRootVariants: Record<InputBoxVariant, string[]> = {
 export const InputBoxRootSizes: Record<InputBoxSize, string[]> = {
   'm': [
     // Box
-    'children:min-h-[34px]',
+    'children:min-h-[46px] children:md:min-h-[34px]',
 
     // Spacing
     'first-child:pl-md first-child:md:pl-sm+',

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

@@ -17,6 +17,10 @@ export default {
       control: { type: 'text' },
     },
 
+    readonly: {
+      control: { type: 'boolean' },
+    },
+
     maxlength: {
       control: { type: 'number' },
     },
@@ -36,6 +40,10 @@ export default {
       control: { type: 'text' },
     },
 
+    value: { // TODO: Remove Vue 2 fallback
+      table: { disable: true },
+    },
+
     type: {
       control: { type: 'select' },
       options: Object.values(InputType),
@@ -66,10 +74,6 @@ export default {
       control: { type: 'boolean' },
     },
 
-    readonly: {
-      control: { type: 'boolean' },
-    },
-
     disabled: {
       control: { type: 'boolean' },
     },
@@ -137,6 +141,7 @@ const Template: StoryFn<typeof OrInput> = (args) => ({
       args,
       model,
       onUpdateModelValue: action('update:modelValue'),
+      onInput: action('input'),
       onKeydown: action('keydown'),
       onKeyup: action('keyup'),
       onFocus: action('focus'),
@@ -149,6 +154,7 @@ const Template: StoryFn<typeof OrInput> = (args) => ({
       v-model="model"
       v-bind="args"
       @update:modelValue="onUpdateModelValue"
+      @input="onInput"
       @keydown="onKeydown"
       @keyup="onKeyup"
       @focus="onFocus"