@onereach/ui-components 2.71.1-beta.2232.0 → 2.72.0-beta.2234.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-label-v3/OrLabel.vue

@@ -1,6 +1,7 @@
 <template>
   <div
     ref="root"
+    v-bind="$attrs"
     :class="rootStyles"
     :disabled="disabled ? '' : null"
   >
@@ -21,12 +22,15 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType, ref } from 'vue-demi';
+import { useClassAttribute } from '../../hooks';
 import { LabelVariant } from './props';
 import { LabelAddon, LabelRoot, LabelRootVariants, LabelText } from './styles';
 
 export default defineComponent({
   name: 'OrLabel',
 
+  inheritAttrs: false,
+
   props: {
     controlId: {
       type: String,
@@ -58,10 +62,13 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
+    const classAttribute = useClassAttribute();
+
     const rootStyles = computed(() => [
       'or-label',
       ...LabelRoot,
       ...LabelRootVariants[props.variant],
+      classAttribute.value,
     ]);
 
     const textStyles = computed(() => [

package/src/components/or-link-v3/OrLink.vue

@@ -1,6 +1,7 @@
 <template>
   <a
     ref="root"
+    v-bind="$attrs"
     :class="rootStyles"
     :href="href"
     :disabled="disabled ? '' : null"
@@ -17,12 +18,15 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType, ref } from 'vue-demi';
+import { useClassAttribute } from '../../hooks';
 import { LinkColor } from './props';
 import { LinkRoot, LinkRootColors } from './styles';
 
 export default defineComponent({
   name: 'OrLink',
 
+  inheritAttrs: false,
+
   props: {
     href: {
       type: String,
@@ -64,12 +68,15 @@ export default defineComponent({
     const root = ref<HTMLButtonElement>();
 
     // Styles
+    const classAttribute = useClassAttribute();
+
     const rootStyles = computed(() => [
       'or-link',
       ...LinkRoot,
       ...LinkRootColors[`${props.color}`],
       props.loading && 'interactivity-none',
       props.underlined && 'underline hover:no-underline',
+      classAttribute.value,
     ]);
 
     return {

package/src/components/or-loader-v3/OrLoader.vue

@@ -1,6 +1,7 @@
 <template>
   <div
     ref="root"
+    v-bind="$attrs"
     :class="rootStyles"
   >
     <template v-if="title">
@@ -80,12 +81,15 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType, ref } from 'vue-demi';
+import { useClassAttribute } from '../../hooks';
 import { LoaderColor, LoaderSize, LoaderVariant } from './props';
-import { LoaderContainer, LoaderDescription, LoaderRoot, LoaderRootColors, LoaderTitle } from './styles';
+import { LoaderRoot, LoaderRootColors, LoaderTitle, LoaderDescription, LoaderContainer } from './styles';
 
 export default defineComponent({
   name: 'OrLoader',
 
+  inheritAttrs: false,
+
   props: {
     variant: {
       type: String as PropType<LoaderVariant>,
@@ -122,10 +126,13 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
+    const classAttribute = useClassAttribute();
+
     const rootStyles = computed(() => [
       'or-loader',
       ...LoaderRoot,
       ...LoaderRootColors[props.color],
+      classAttribute.value,
     ]);
 
     const titleStyles = computed(() => [

package/src/components/or-menu-item-v3/OrMenuItem.vue

@@ -1,6 +1,7 @@
 <template>
   <div
     ref="root"
+    v-bind="$attrs"
     :class="rootStyles"
     :tabindex="!disabled ? 0 : null"
     :selected="selected ? '' : null"
@@ -21,6 +22,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 { MenuItemRoot } from './styles';
 
@@ -31,6 +33,8 @@ export default defineComponent({
     OrIcon,
   },
 
+  inheritAttrs: false,
+
   props: {
     icon: {
       type: [String, Object] as PropType<string | InstanceType<typeof OrIcon>['$props']>,
@@ -63,9 +67,12 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
+    const classAttribute = useClassAttribute();
+
     const rootStyles = computed(() => [
       'or-menu-item',
       ...MenuItemRoot,
+      classAttribute.value,
     ]);
 
     return {

package/src/components/or-menu-v3/OrMenu.vue

@@ -1,6 +1,7 @@
 <template>
   <div
     ref="root"
+    v-bind="$attrs"
     :class="rootStyles"
   >
     <OrPopover
@@ -24,6 +25,7 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType, ref } from 'vue-demi';
+import { useClassAttribute } from '../../hooks';
 import { OrPopoverV3 as OrPopover } from '../or-popover-v3';
 import { MenuPlacement } from './props';
 import { MenuBody, MenuRoot } from './styles';
@@ -35,6 +37,8 @@ export default defineComponent({
     OrPopover,
   },
 
+  inheritAttrs: false,
+
   props: {
     trigger: {
       type: HTMLElement,
@@ -68,9 +72,12 @@ export default defineComponent({
     const isOpen = computed(() => popover.value?.isOpen);
 
     // Styles
+    const classAttribute = useClassAttribute();
+
     const rootStyles = computed(() => [
       'or-menu',
       ...MenuRoot,
+      classAttribute.value,
     ]);
 
     const bodyStyles = computed(() => [

package/src/components/or-modal-v3/OrModal.vue

@@ -31,6 +31,7 @@
 
 <script lang="ts">
 import { computed, defineComponent, PropType, ref, watch } from 'vue-demi';
+import { useClassAttribute } from '../../hooks';
 import { OrIconButtonV3 as OrIconButton } from '../or-icon-button-v3';
 import { OrOverlayV3 as OrOverlay } from '../or-overlay-v3';
 import { ModalSize } from './props';
@@ -74,10 +75,13 @@ export default defineComponent({
     const root = ref<HTMLElement>();
 
     // Styles
+    const classAttribute = useClassAttribute();
+
     const rootStyles = computed(() => [
       'or-modal',
       ...ModalRoot,
       ...ModalRootSizes[props.size],
+      classAttribute.value,
     ]);
 
     const headerStyles = computed(() => [

package/src/components/or-notification/OrNotification.vue

@@ -115,7 +115,6 @@ export default defineComponent({
     warning: ($c-warning, $c-warning-lighten-45),
     success: ($c-success, $c-success-lighten-45),
   );
-
   /** TODO: Override when mobile design is ready to guarantee alignment of icons with first text row */
   --alignment-height: #{$lh-1};
 
@@ -178,4 +177,30 @@ export default defineComponent({
     }
   }
 }
+
+[data-theme="dark"] {
+  .or-notification {
+    $notification-types: (
+      info: ($c-neutral-6, $c-primary-darken-45),
+      error: ($c-neutral-6, $c-error-darken-45),
+      warning: ($c-neutral-6, $c-warning-darken-45),
+      success: ($c-neutral-6, $c-success-darken-45),
+    );
+
+    .or-icon {
+      color: $c-neutral-1;
+    }
+
+    @each $type, $colors in $notification-types {
+      &.is-type-#{$type} {
+        background-color: list.nth($colors, 2);
+        color: list.nth($colors, 1);
+
+        a {
+          color: list.nth($colors, 1);
+        }
+      }
+    }
+  }
+}
 </style>