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

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(() => [

package/src/hooks/index.ts

@@ -1,7 +1,5 @@
-export { useControlAttributes } from './useControlAttributes';
+export { useClassAttribute } from './useClassAttribute';
 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/useClassAttribute.ts

@@ -0,0 +1,39 @@
+import { computed, ComputedRef, getCurrentInstance, isVue2, UnwrapRef, VNode } from 'vue-demi';
+
+export type UseClassAttributeReturn = ComputedRef<string | undefined>;
+
+export function useClassAttribute(): UseClassAttributeReturn {
+  const currentInstance = getCurrentInstance();
+
+  // Functions
+  function composeClass(): UnwrapRef<UseClassAttributeReturn> {
+    const { staticClass = '', class: classProperty } = (currentInstance?.vnode as unknown as VNode).data ?? {};
+
+    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(() => {
+    if (isVue2) {
+      return currentInstance?.attrs.class as UnwrapRef<UseClassAttributeReturn> ?? composeClass();
+    }
+  });
+}

package/dist/bundled/v2/OrNumberInput-face8ccc.js

@@ -1,227 +0,0 @@
-import './index-fa6eb4ca.js';
-import { O as OrInput } from './OrInput-df1a14fa.js';
-import { defineComponent, ref } from '@vue/composition-api/dist/vue-composition-api.mjs';
-import { n as normalizeComponent } from './normalize-component-6e8e3d80.js';
-
-var script = defineComponent({
-  name: 'OrNumberInput',
-  components: {
-    OrInput
-  },
-  model: {
-    prop: 'modelValue',
-    event: 'update:modelValue'
-  },
-  props: {
-    modelValue: {
-      type: Number,
-      default: undefined,
-      required: false
-    },
-    htmlId: {
-      type: String,
-      default: '',
-      required: false
-    },
-    placeholder: {
-      type: String,
-      default: '',
-      required: false
-    },
-    label: {
-      type: String,
-      default: '',
-      required: false
-    },
-    error: {
-      type: String,
-      default: '',
-      required: false
-    },
-    hint: {
-      type: String,
-      default: '',
-      required: false
-    },
-    minValue: {
-      type: Number,
-      default: undefined,
-      required: false
-    },
-    maxValue: {
-      type: Number,
-      default: undefined,
-      required: false
-    },
-    stepValue: {
-      type: Number,
-      default: undefined,
-      required: false
-    },
-    isSmall: Boolean,
-    isRequired: Boolean,
-    isDisabled: Boolean,
-    isReadonly: Boolean,
-    isInvalid: Boolean
-  },
-  emits: ['focus', 'blur', 'update:modelValue', 'input', 'keypress', 'keyup', 'keydown'],
-  setup(props, {
-    emit
-  }) {
-    const inputRef = ref();
-    if (props.modelValue) {
-      if (props.minValue !== undefined && props.modelValue < props.minValue) {
-        emit('update:modelValue', props.minValue);
-      } else if (props.maxValue !== undefined && props.modelValue > props.maxValue) {
-        emit('update:modelValue', props.maxValue);
-      }
-    }
-    return {
-      inputRef
-    };
-  },
-  computed: {
-    htmlInputAttrs() {
-      return {
-        min: this.minValue,
-        max: this.maxValue,
-        step: this.stepValue
-      };
-    },
-    localValue: {
-      get() {
-        var _a;
-        return ((_a = this.modelValue) !== null && _a !== void 0 ? _a : '') + '';
-      },
-      set(val) {
-        if (val === undefined || val === '') {
-          this.$emit('update:modelValue', undefined);
-          return;
-        }
-        const numVal = +val;
-        if (this.minValue !== undefined && numVal < this.minValue) {
-          this.$emit('update:modelValue', this.minValue);
-        } else if (this.maxValue !== undefined && numVal > this.maxValue) {
-          this.$emit('update:modelValue', this.maxValue);
-        } else {
-          this.$emit('update:modelValue', numVal);
-        }
-      }
-    }
-  }
-});
-
-/* script */
-const __vue_script__ = script;
-
-/* template */
-var __vue_render__ = function () {
-  var _vm = this;
-  var _h = _vm.$createElement;
-  var _c = _vm._self._c || _h;
-  return _c('or-input', {
-    ref: "inputRef",
-    staticClass: "or-password",
-    attrs: {
-      "html-id": _vm.htmlId,
-      "placeholder": _vm.placeholder,
-      "html-type": "number",
-      "html-input-attrs": _vm.htmlInputAttrs,
-      "label": _vm.label,
-      "error": _vm.error,
-      "hint": _vm.hint,
-      "is-small": _vm.isSmall,
-      "is-required": _vm.isRequired,
-      "is-disabled": _vm.isDisabled,
-      "is-readonly": _vm.isReadonly,
-      "is-invalid": _vm.isInvalid
-    },
-    on: {
-      "focus": function ($event) {
-        return _vm.$emit('focus', $event);
-      },
-      "blur": function ($event) {
-        return _vm.$emit('blur', $event);
-      },
-      "input": function ($event) {
-        return _vm.$emit('input', $event);
-      },
-      "keypress": function ($event) {
-        return _vm.$emit('keypress', $event);
-      },
-      "keyup": function ($event) {
-        return _vm.$emit('keyup', $event);
-      },
-      "keydown": function ($event) {
-        return _vm.$emit('keydown', $event);
-      }
-    },
-    scopedSlots: _vm._u([_vm.$slots.prepend ? {
-      key: "prepend",
-      fn: function () {
-        return [_vm._t("prepend")];
-      },
-      proxy: true
-    } : null, _vm.$slots['label-default'] ? {
-      key: "label-default",
-      fn: function () {
-        return [_vm._t("label-default")];
-      },
-      proxy: true
-    } : null, _vm.$slots['label-append'] ? {
-      key: "label-append",
-      fn: function () {
-        return [_vm._t("label-append")];
-      },
-      proxy: true
-    } : null, _vm.$slots['wrapper-end'] ? {
-      key: "wrapper-end",
-      fn: function () {
-        return [_vm._t("wrapper-end")];
-      },
-      proxy: true
-    } : null, _vm.$slots['input-end'] ? {
-      key: "input-end",
-      fn: function () {
-        return [_vm._t("input-end")];
-      },
-      proxy: true
-    } : null, _vm.$slots.append ? {
-      key: "append",
-      fn: function () {
-        return [_vm._t("append")];
-      },
-      proxy: true
-    } : null], null, true),
-    model: {
-      value: _vm.localValue,
-      callback: function ($$v) {
-        _vm.localValue = $$v;
-      },
-      expression: "localValue"
-    }
-  });
-};
-var __vue_staticRenderFns__ = [];
-
-/* style */
-const __vue_inject_styles__ = undefined;
-/* scoped */
-const __vue_scope_id__ = undefined;
-/* module identifier */
-const __vue_module_identifier__ = undefined;
-/* functional template */
-const __vue_is_functional_template__ = false;
-/* style inject */
-
-/* style inject SSR */
-
-/* style inject shadow dom */
-
-const __vue_component__ = /*#__PURE__*/normalizeComponent({
-  render: __vue_render__,
-  staticRenderFns: __vue_staticRenderFns__
-}, __vue_inject_styles__, __vue_script__, __vue_scope_id__, __vue_is_functional_template__, __vue_module_identifier__, false, undefined, undefined, undefined);
-var __vue_component__$1 = __vue_component__;
-
-export { __vue_component__$1 as _ };

package/dist/bundled/v2/OrPassword-a818e7b5.js

@@ -1,227 +0,0 @@
-import './index-fa6eb4ca.js';
-import { useVModel } from '@vueuse/core';
-import { O as OrInput } from './OrInput-df1a14fa.js';
-import { O as OrIconButton } from './OrIconButton-65962c1c.js';
-import { u as useToggle } from './useToggle-6166bd53.js';
-import { b as BUTTON_SIZE } from './constants-c5d1139f.js';
-import { defineComponent, ref } from '@vue/composition-api/dist/vue-composition-api.mjs';
-import { n as normalizeComponent } from './normalize-component-6e8e3d80.js';
-import { c as createInjector } from './browser-82dea9ed.js';
-
-var script = defineComponent({
-  name: 'OrPassword',
-  components: {
-    OrInput,
-    OrIconButton
-  },
-  model: {
-    prop: 'modelValue',
-    event: 'update:modelValue'
-  },
-  props: {
-    modelValue: {
-      type: String,
-      default: '',
-      required: false
-    },
-    htmlId: {
-      type: String,
-      default: '',
-      required: false
-    },
-    placeholder: {
-      type: String,
-      default: '',
-      required: false
-    },
-    label: {
-      type: String,
-      default: '',
-      required: false
-    },
-    error: {
-      type: String,
-      default: '',
-      required: false
-    },
-    hint: {
-      type: String,
-      default: '',
-      required: false
-    },
-    maxLength: {
-      type: Number,
-      default: undefined,
-      required: false
-    },
-    isSmall: Boolean,
-    isRequired: Boolean,
-    isDisabled: Boolean,
-    isReadonly: Boolean,
-    isInvalid: Boolean
-  },
-  emits: ['focus', 'blur', 'update:modelValue', 'input', 'keypress', 'keyup', 'keydown'],
-  setup(props, {
-    emit
-  }) {
-    const inputRef = ref();
-    const localValue = useVModel(props, 'modelValue', emit);
-    const {
-      isActiveToggle,
-      toggle
-    } = useToggle();
-    return {
-      inputRef,
-      localValue,
-      isActiveToggle,
-      toggle
-    };
-  },
-  computed: {
-    currentButtonIcon() {
-      return this.isActiveToggle ? 'visibility' : 'visibility_off';
-    },
-    type() {
-      return this.isActiveToggle ? 'text' : 'password';
-    },
-    size() {
-      return this.isSmall ? BUTTON_SIZE.SMALL : BUTTON_SIZE.DEFAULT;
-    }
-  },
-  methods: {
-    onClick() {
-      var _a;
-      this.toggle();
-      (_a = this.inputRef) === null || _a === void 0 ? void 0 : _a.focus();
-    }
-  }
-});
-
-/* script */
-const __vue_script__ = script;
-
-/* template */
-var __vue_render__ = function () {
-  var _vm = this;
-  var _h = _vm.$createElement;
-  var _c = _vm._self._c || _h;
-  return _c('or-input', {
-    ref: "inputRef",
-    staticClass: "or-password",
-    attrs: {
-      "html-id": _vm.htmlId,
-      "placeholder": _vm.placeholder,
-      "html-type": _vm.type,
-      "label": _vm.label,
-      "error": _vm.error,
-      "hint": _vm.hint,
-      "max-length": _vm.maxLength,
-      "is-small": _vm.isSmall,
-      "is-required": _vm.isRequired,
-      "is-disabled": _vm.isDisabled,
-      "is-readonly": _vm.isReadonly,
-      "is-invalid": _vm.isInvalid
-    },
-    on: {
-      "focus": function ($event) {
-        return _vm.$emit('focus', $event);
-      },
-      "blur": function ($event) {
-        return _vm.$emit('blur', $event);
-      },
-      "input": function ($event) {
-        return _vm.$emit('input', $event);
-      },
-      "keypress": function ($event) {
-        return _vm.$emit('keypress', $event);
-      },
-      "keyup": function ($event) {
-        return _vm.$emit('keyup', $event);
-      },
-      "keydown": function ($event) {
-        return _vm.$emit('keydown', $event);
-      }
-    },
-    scopedSlots: _vm._u([_vm.$slots.prepend ? {
-      key: "prepend",
-      fn: function () {
-        return [_vm._t("prepend")];
-      },
-      proxy: true
-    } : null, _vm.$slots['label-default'] ? {
-      key: "label-default",
-      fn: function () {
-        return [_vm._t("label-default")];
-      },
-      proxy: true
-    } : null, _vm.$slots['label-append'] ? {
-      key: "label-append",
-      fn: function () {
-        return [_vm._t("label-append")];
-      },
-      proxy: true
-    } : null, {
-      key: "wrapper-end",
-      fn: function () {
-        return [_c('or-icon-button', {
-          attrs: {
-            "icon": _vm.currentButtonIcon,
-            "icon-color": "neutral-4",
-            "size": _vm.size
-          },
-          on: {
-            "click": _vm.onClick
-          }
-        })];
-      },
-      proxy: true
-    }, _vm.$slots['input-end'] ? {
-      key: "input-end",
-      fn: function () {
-        return [_vm._t("input-end")];
-      },
-      proxy: true
-    } : null, _vm.$slots.append ? {
-      key: "append",
-      fn: function () {
-        return [_vm._t("append")];
-      },
-      proxy: true
-    } : null], null, true),
-    model: {
-      value: _vm.localValue,
-      callback: function ($$v) {
-        _vm.localValue = $$v;
-      },
-      expression: "localValue"
-    }
-  });
-};
-var __vue_staticRenderFns__ = [];
-
-/* style */
-const __vue_inject_styles__ = function (inject) {
-  if (!inject) return;
-  inject("data-v-c5297b48_0", {
-    source: "@keyframes spinAround-data-v-c5297b48{from{transform:rotate(0)}to{transform:rotate(359deg)}}@keyframes fade-data-v-c5297b48{from{opacity:1}to{opacity:0}}.or-password .or-icon-button-root[data-v-c5297b48]{position:absolute;top:50%;right:0;z-index:1;transform:translate(-.625rem,-50%)}.or-password[data-v-c5297b48]  .or-textbox--input{padding-right:calc(.625rem + 1.625rem)}.or-password.is-small[data-v-c5297b48]  .or-textbox--input{padding-right:calc(.625rem + 1.5rem)}",
-    map: undefined,
-    media: undefined
-  });
-};
-/* scoped */
-const __vue_scope_id__ = "data-v-c5297b48";
-/* module identifier */
-const __vue_module_identifier__ = undefined;
-/* functional template */
-const __vue_is_functional_template__ = false;
-/* style inject SSR */
-
-/* style inject shadow dom */
-
-const __vue_component__ = /*#__PURE__*/normalizeComponent({
-  render: __vue_render__,
-  staticRenderFns: __vue_staticRenderFns__
-}, __vue_inject_styles__, __vue_script__, __vue_scope_id__, __vue_is_functional_template__, __vue_module_identifier__, false, createInjector, undefined, undefined);
-var __vue_component__$1 = __vue_component__;
-
-export { __vue_component__$1 as _ };

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

@@ -1 +0,0 @@
-export { default as OrInput } from './OrInput.vue';