@onereach/ui-components 2.71.1-beta.2237.0 → 2.71.2-beta.2238.0

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

@@ -5,7 +5,7 @@
   >
     <template v-if="label">
       <OrLabel
-        :control-id="controlId"
+        :control-id="controlAttributes.id"
         :variant="'input'"
         :required="required"
         :disabled="disabled"
@@ -25,12 +25,13 @@
       :disabled="disabled"
     >
       <textarea
-        :id="controlId"
+        ref="control"
         v-model="proxyModelValue"
-        v-bind="$attrs"
+        v-bind="controlAttributes"
         :class="controlStyles"
         :placeholder="placeholder"
         :required="required"
+        :readonly="readonly"
         :disabled="disabled"
         @keydown="$emit('keydown', $event)"
         @keyup="$emit('keyup', $event)"
@@ -70,8 +71,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 { OrInputBoxV3 as OrInputBox } from '../or-input-box-v3';
@@ -89,7 +90,10 @@ export default defineComponent({
     OrLabel,
   },
 
-  inheritAttrs: false,
+  model: {
+    prop: 'modelValue',
+    event: 'update:modelValue',
+  },
 
   props: {
     modelValue: {
@@ -97,11 +101,6 @@ export default defineComponent({
       default: undefined,
     },
 
-    value: { // TODO: Remove Vue 2 fallback
-      type: String,
-      default: undefined,
-    },
-
     size: {
       type: String as PropType<TextareaSize>,
       default: TextareaSize.M,
@@ -132,6 +131,11 @@ export default defineComponent({
       default: false,
     },
 
+    readonly: {
+      type: Boolean,
+      default: false,
+    },
+
     disabled: {
       type: Boolean,
       default: false,
@@ -141,7 +145,6 @@ export default defineComponent({
   emits: [
     'update:modelValue',
 
-    'input',
     'keydown',
     'keyup',
     'focus',
@@ -150,21 +153,20 @@ 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(() => [
@@ -172,35 +174,46 @@ 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: () => {
-        return props.modelValue ?? props.value; // TODO: Remove Vue 2 fallback
-      },
+      get: () => props.modelValue,
 
       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);
+    // Methods
+    function focus(): void {
+      control.value?.focus();
+    }
+
+    function blur(): void {
+      control.value?.blur();
+    }
 
     return {
       root,
+      control,
       rootStyles,
       controlStyles,
-      controlId,
+      controlAttributes,
       proxyModelValue,
-      invalid,
-      readonly,
       currentLength,
       maxLength,
+      invalid,
+      focus,
+      blur,
     };
   },
 });

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

@@ -1,7 +1,6 @@
 <template>
   <div
     ref="root"
-    v-bind="$attrs"
     :class="rootStyles"
   >
     <slot />
@@ -27,7 +26,6 @@
 <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';
@@ -39,8 +37,6 @@ export default defineComponent({
     OrPopover,
   },
 
-  inheritAttrs: false,
-
   props: {
     text: {
       type: String,
@@ -71,12 +67,9 @@ export default defineComponent({
     const popoverRoot = computed(() => popover.value?.root);
 
     // Styles
-    const classAttribute = useClassAttribute();
-
     const rootStyles = computed(() => [
       'or-tooltip',
       ...TooltipRoot,
-      classAttribute.value,
     ]);
 
     const bodyStyles = computed(() => [

package/src/hooks/index.ts

@@ -1,5 +1,7 @@
-export { useClassAttribute } from './useClassAttribute';
+export { useControlAttributes } from './useControlAttributes';
 export { useElevation } from './useElevation';
+export { useIdAttribute } from './useIdAttribute';
 export { useOverflow } from './useOverflow';
 export { useResponsive } from './useResponsive';
 export { default as useToggle } from './useToggle';
+export { useValidationAttributes } from './useValidationAttributes';

package/src/hooks/useControlAttributes.ts

@@ -0,0 +1,19 @@
+import { computed, ComputedRef, useAttrs } from 'vue-demi';
+
+interface ControlAttributes {
+  readonly: ComputedRef<boolean | undefined>;
+  disabled: ComputedRef<boolean | undefined>;
+
+  'force-state': ComputedRef<string | undefined>;
+}
+
+export function useControlAttributes(): ControlAttributes {
+  const attributes = useAttrs();
+
+  return {
+    readonly: computed(() => attributes['readonly'] as boolean | undefined),
+    disabled: computed(() => attributes['disabled'] as boolean | undefined),
+
+    'force-state': computed(() => attributes['force-state'] as string | undefined),
+  };
+}

package/src/hooks/useIdAttribute.ts

@@ -0,0 +1,9 @@
+import { computed, ComputedRef, getCurrentInstance, useAttrs } from 'vue-demi';
+
+export function useIdAttribute(): ComputedRef<string | undefined> {
+  const attributes = useAttrs(), component = getCurrentInstance();
+
+  return computed(() => {
+    return attributes['id'] as string | undefined ?? component?.uid.toString();
+  });
+}

package/src/hooks/useValidationAttributes.ts

@@ -0,0 +1,25 @@
+import { computed, ComputedRef, useAttrs } from 'vue-demi';
+
+interface ValidationAttributes {
+  required: ComputedRef<boolean | undefined>;
+  minlength: ComputedRef<number | undefined>;
+  maxlength: ComputedRef<number | undefined>;
+  pattern: ComputedRef<string | undefined>;
+  min: ComputedRef<number | undefined>;
+  max: ComputedRef<number | undefined>;
+  step: ComputedRef<number | undefined>;
+}
+
+export function useValidationAttributes(): ValidationAttributes {
+  const attributes = useAttrs();
+
+  return {
+    required: computed(() => attributes['required'] as boolean | undefined),
+    minlength: computed(() => attributes['minlength'] as number | undefined),
+    maxlength: computed(() => attributes['maxlength'] as number | undefined),
+    pattern: computed(() => attributes['pattern'] as string | undefined),
+    min: computed(() => attributes['min'] as number | undefined),
+    max: computed(() => attributes['max'] as number | undefined),
+    step: computed(() => attributes['step'] as number | undefined),
+  };
+}

package/dist/bundled/v2/components/or-inputs/index.d.ts

@@ -1,5 +0,0 @@
-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';

package/dist/bundled/v2/hooks/useClassAttribute.d.ts

@@ -1,3 +0,0 @@
-import { ComputedRef } from 'vue-demi';
-export declare type UseClassAttributeReturn = ComputedRef<string | undefined>;
-export declare function useClassAttribute(): UseClassAttributeReturn;

package/dist/bundled/v2/useClassAttribute-9bf33346.js

@@ -1,33 +0,0 @@
-import './index-fa6eb4ca.js';
-import { getCurrentInstance, computed } from '@vue/composition-api/dist/vue-composition-api.mjs';
-
-function useClassAttribute() {
-  const currentInstance = getCurrentInstance();
-  // Functions
-  function composeClass() {
-    var _a;
-    const {
-      staticClass = '',
-      class: classProperty
-    } = (_a = (currentInstance === null || currentInstance === void 0 ? void 0 : currentInstance.vnode).data) !== null && _a !== void 0 ? _a : {};
-    if (!classProperty) {
-      return staticClass || undefined;
-    }
-    switch (true) {
-      case classProperty.constructor === Object:
-        return Object.entries(classProperty).filter(([, value]) => !!value).map(([className]) => className).reduce((classList, className) => `${classList} ${className}`, staticClass).trim();
-      case Array.isArray(classProperty):
-        return `${staticClass} ${classProperty.join(' ')}`.trim();
-      default:
-        return `${staticClass} ${classProperty}`.trim();
-    }
-  }
-  return computed(() => {
-    var _a;
-    {
-      return (_a = currentInstance === null || currentInstance === void 0 ? void 0 : currentInstance.attrs.class) !== null && _a !== void 0 ? _a : composeClass();
-    }
-  });
-}
-
-export { useClassAttribute as u };

package/dist/bundled/v3/OrIcon-d878b768.js

@@ -1,13 +0,0 @@
-import { s as script } from './OrIcon.vue_vue_type_script_lang-a119a715.js';
-import { openBlock, createElementBlock, mergeProps, toDisplayString } from 'vue';
-
-function render(_ctx, _cache, $props, $setup, $data, $options) {
-  return openBlock(), createElementBlock("div", mergeProps({
-    ref: "root"
-  }, _ctx.$attrs, {
-    class: _ctx.rootStyles
-  }), toDisplayString(_ctx.icon), 17 /* TEXT, FULL_PROPS */);
-}
-
-script.render = render;
-script.__file = "src/components/or-icon-v3/OrIcon.vue";