@onereach/ui-components 2.71.3-beta.2245.0 → 2.72.0-beta.2247.0

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-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-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"

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

@@ -5,7 +5,7 @@
   >
     <template v-if="label">
       <OrLabel
-        :control-id="controlAttributes.id"
+        :control-id="controlId"
         :variant="'input'"
         :required="required"
         :disabled="disabled"
@@ -26,14 +26,14 @@
       :disabled="disabled"
     >
       <input
-        ref="control"
+        :id="controlId"
+        ref="input"
         v-model="proxyModelValue"
-        v-bind="controlAttributes"
+        v-bind="$attrs"
         :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 +56,7 @@
             <OrIconButton
               :icon="'close'"
               :color="'inherit'"
-              :disabled="readonly || disabled"
+              :disabled="disabled"
               @click.stop="$emit('update:modelValue', '')"
             />
           </template>
@@ -102,8 +102,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 { OrIconButtonV3 as OrIconButton } from '../or-icon-button-v3';
@@ -125,10 +125,7 @@ export default defineComponent({
     OrLabel,
   },
 
-  model: {
-    prop: 'modelValue',
-    event: 'update:modelValue',
-  },
+  inheritAttrs: false,
 
   props: {
     modelValue: {
@@ -136,6 +133,11 @@ export default defineComponent({
       default: undefined,
     },
 
+    value: { // TODO: Remove Vue 2 fallback
+      type: [String, Number],
+      default: undefined,
+    },
+
     type: {
       type: String as PropType<InputType>,
       default: InputType.Text,
@@ -171,11 +173,6 @@ export default defineComponent({
       default: false,
     },
 
-    readonly: {
-      type: Boolean,
-      default: false,
-    },
-
     disabled: {
       type: Boolean,
       default: false,
@@ -190,6 +187,7 @@ export default defineComponent({
   emits: [
     'update:modelValue',
 
+    'input',
     'keydown',
     'keyup',
     'focus',
@@ -198,20 +196,23 @@ export default defineComponent({
 
   expose: [
     'root',
-
     'focus',
-    'blur',
   ],
 
   setup(props, context) {
+    const currentInstance = getCurrentInstance()!;
+
     // Refs
     const root = ref<HTMLElement>();
-    const control = ref<HTMLInputElement>();
+    const input = ref<HTMLInputElement>();
 
     // Styles
+    const classAttribute = useClassAttribute();
+
     const rootStyles = computed(() => [
       'or-input',
       ...InputRoot,
+      classAttribute.value,
     ]);
 
     const controlStyles = computed(() => [
@@ -219,49 +220,45 @@ 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);
+
+    const currentLength = computed(() => proxyModelValue.value?.toString().length ?? 0);
+    const maxLength = computed(() => context.attrs.maxlength as number | undefined);
 
     const disclosed = ref(false);
 
     // Methods
     function focus(): void {
-      control.value?.focus();
-    }
-
-    function blur(): void {
-      control.value?.blur();
+      input.value?.focus();
     }
 
     return {
       root,
-      control,
+      input,
       rootStyles,
       controlStyles,
-      controlAttributes,
+      controlId,
       proxyModelValue,
+      invalid,
+      readonly,
       currentLength,
       maxLength,
-      invalid,
       disclosed,
       focus,
-      blur,
     };
   },
 });

package/src/components/{or-number-input → or-inputs}/OrNumberInput.vue

@@ -62,7 +62,7 @@
 </template>
 <script lang="ts">
 import { defineComponent, ref } from 'vue-demi';
-import { OrInput } from '../or-input';
+import OrInput from './OrInput.vue';
 
 export default defineComponent({
   name: 'OrNumberInput',

package/src/components/{or-password → or-inputs}/OrPassword.vue

@@ -64,8 +64,8 @@
 </template>
 <script lang="ts">
 import { defineComponent, ref } from 'vue-demi';
+import OrInput from './OrInput.vue';
 import { useVModel } from '@vueuse/core';
-import { OrInput } from '../or-input';
 import { useToggle } from '../../hooks';
 import { BUTTON_SIZE, OrIconButton } from '../or-button-v2';
 

package/src/components/{or-search → or-inputs}/OrSearch.vue

@@ -66,7 +66,7 @@
 </template>
 <script lang="ts">
 import { defineComponent, ref } from 'vue-demi';
-import { OrInput } from '../or-input';
+import OrInput from './OrInput.vue';
 import { debouncedWatch } from '@vueuse/core';
 import { BUTTON_SIZE, OrIconButton } from '../or-button-v2';
 

package/src/components/{or-textarea → or-inputs}/OrTextarea.vue

@@ -114,7 +114,11 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, getCurrentInstance } from 'vue-demi';
+import {
+  defineComponent,
+  ref,
+  getCurrentInstance,
+} from 'vue-demi';
 import { pxToRem } from '../../utils/functions/px-to-rem';
 import {
   cancelAF,
@@ -315,228 +319,5 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-@use "~@onereach/styles/src/global" as *;
-
-.or-textbox {
-  display: flex;
-  align-items: flex-start;
-  justify-content: flex-start;
-  width: 100%;
-
-  &.is-show-info.has-label {
-    align-items: center;
-  }
-
-  &.has-label {
-    align-items: flex-end;
-  }
-
-  .or-label {
-    margin-bottom: $s-1;
-  }
-
-  &--append,
-  &--prepend {
-    position: relative;
-    display: flex;
-    align-items: center;
-    height: px-to-rem(36);
-  }
-
-  &--append {
-    margin-left: px-to-rem(10);
-  }
-
-  &--prepend {
-    margin-right: px-to-rem(10);
-  }
-
-  &--wrapper {
-    width: 100%;
-  }
-
-  &--input {
-    width: 100%;
-    min-width: px-to-rem(114);
-    height: px-to-rem(36);
-    padding: px-to-rem(10);
-    font-family: inherit;
-    font-size: $fs-1;
-    background-color: $c-neutral-1;
-    border: 1px solid $c-neutral-2;
-    border-radius: $s-2;
-    outline: none;
-
-    @include transition(border-color, background-color, -webkit-box-shadow);
-
-    &-textarea {
-      /* stylelint-disable-next-line scss/at-extend-no-missing-placeholder */
-      @extend .or-textbox--input;
-
-      min-height: px-to-rem(79);
-      max-height: px-to-rem(142);
-      overflow-x: hidden;
-      overflow-y: auto;
-      resize: none;
-    }
-
-    &-wrapper {
-      position: relative;
-      width: 100%;
-    }
-
-    &::placeholder {
-      color: $c-neutral-4;
-
-      @include transition(opacity);
-    }
-
-    &:-webkit-autofill {
-      -webkit-box-shadow: inset 0 0 0 50px $c-neutral-1;
-
-      @include focus {
-        -webkit-box-shadow: inset 0 0 0 50px $c-white;
-      }
-    }
-
-    @include hover {
-      background-color: $c-white;
-      border-color: $c-neutral-2-darken-3;
-      -webkit-box-shadow: inset 0 0 0 50px $c-white;
-    }
-
-    @include active {
-      &:not(:focus) {
-        border-color: $c-neutral-2-darken-5;
-      }
-    }
-
-    @include focus {
-      background-color: $c-white;
-      border-color: $c-primary;
-
-      &::placeholder {
-        opacity: 0;
-      }
-    }
-
-    @include disabled {
-      background-color: $c-neutral-2;
-      border-color: $c-neutral-2;
-    }
-
-    @include has-error {
-      border-color: $c-error;
-
-      @include hover {
-        border-color: $c-error-darken-3;
-      }
-
-      @include focus {
-        border-color: $c-error-darken-5;
-      }
-
-      @include disabled {
-        border-color: $c-error-lighten-20;
-      }
-    }
-  }
-
-  &--textarea {
-    /* stylelint-disable-next-line scss/at-extend-no-missing-placeholder */
-    @extend .or-textbox--input;
-
-    min-height: px-to-rem(79);
-    max-height: px-to-rem(142);
-    overflow-x: hidden;
-    overflow-y: auto;
-    resize: none;
-  }
-
-  &--info {
-    width: 100%;
-    margin: 0;
-
-    @include transition(height, opacity);
-  }
-
-  &--counter {
-    flex-shrink: 0;
-    margin-left: auto;
-    font-size: $fs-0;
-    line-height: px-to-rem(14);
-    color: $c-neutral-4;
-  }
-
-  &--hint,
-  &-error {
-    flex-shrink: 1;
-
-    @include transition(height, opacity);
-  }
-
-  &.is-small {
-    .or-textbox {
-      &--input {
-        height: px-to-rem(30);
-        padding: px-to-rem(8) px-to-rem(10);
-        font-size: $fs-0;
-
-        &-toggle-btn {
-          .material-icons {
-            font-size: $fs-1;
-          }
-        }
-      }
-    }
-  }
-
-  &.has-counter {
-    .or-textbox {
-      &--hint,
-      &--error {
-        padding-right: px-to-rem(15);
-      }
-    }
-  }
-
-  &.is-show-info {
-    .or-textbox {
-      &--info {
-        display: flex;
-        align-items: flex-start;
-        justify-content: space-between;
-        padding-top: px-to-rem(4);
-      }
-    }
-  }
-
-  @include disabled {
-    .or-textbox {
-      &--input-toggle-btn {
-        pointer-events: none;
-      }
-    }
-  }
-
-  @include has-error {
-    .or-textbox {
-      &--input {
-        border-color: $c-error;
-
-        @include hover {
-          border-color: $c-error-darken-3;
-        }
-
-        @include focus {
-          border-color: $c-error-darken-5;
-        }
-
-        @include disabled {
-          border-color: $c-error;
-        }
-      }
-    }
-  }
-}
+@import "./styles.scss";
 </style>

package/src/components/or-inputs/index.ts

@@ -0,0 +1,5 @@
+export { default as OrTextarea } from './OrTextarea.vue';
+export { default as OrInput } from './OrInput.vue';
+export { default as OrNumberInput } from './OrNumberInput.vue';
+export { default as OrPassword } from './OrPassword.vue';
+export { default as OrSearch } from './OrSearch.vue';