@onereach/ui-components 2.69.7-beta.2181.0 → 2.69.7-beta.2182.0

package/src/components/or-combined-input-v3/OrCombinedInput.vue

@@ -0,0 +1,134 @@
+<template>
+  <div
+    ref="root"
+    v-bind="$attrs"
+    :class="rootStyles"
+  >
+    <template v-if="label">
+      <OrLabel
+        :variant="'input'"
+        :required="required"
+        :disabled="disabled"
+      >
+        {{ label }}
+
+        <template v-slot:addon>
+          <slot name="addon" />
+        </template>
+      </OrLabel>
+    </template>
+
+    <div :class="controlGroup">
+      <slot
+        :size="size"
+        :required="required"
+        :readonly="readonly"
+        :disabled="disabled"
+        :disable-default-styles="disableDefaultStyles"
+      />
+    </div>
+
+    <template v-if="!invalid">
+      <template v-if="hint">
+        <OrHint :disabled="disabled">
+          {{ hint }}
+        </OrHint>
+      </template>
+    </template>
+
+    <template v-else>
+      <OrError :disabled="disabled">
+        {{ error }}
+      </OrError>
+    </template>
+  </div>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent, 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 { OrLabelV3 as OrLabel } from '../or-label-v3';
+import { CombinedInputSize } from './props';
+import { CombinedInputControlGroup, CombinedInputRoot } from './styles';
+
+export default defineComponent({
+  name: 'OrCombinedInput',
+
+  components: {
+    OrError,
+    OrHint,
+    OrLabel,
+  },
+
+  inheritAttrs: false,
+
+  props: {
+    size: {
+      type: String as PropType<CombinedInputSize>,
+      default: CombinedInputSize.M,
+    },
+
+    label: {
+      type: String,
+      default: undefined,
+    },
+
+    hint: {
+      type: String,
+      default: undefined,
+    },
+
+    error: {
+      type: String,
+      default: undefined,
+    },
+
+    required: {
+      type: Boolean,
+      default: false,
+    },
+
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+
+    disableDefaultStyles: {
+      type: Boolean,
+      default: false,
+    },
+  },
+
+  setup(props, context) {
+    // Refs
+    const root = ref<HTMLElement>();
+
+    // Styles
+    const classAttribute = useClassAttribute();
+
+    const rootStyles = computed(() => [
+      'or-combined-input',
+      ...CombinedInputRoot,
+      classAttribute.value,
+    ]);
+
+    const controlGroup = computed(() => [
+      ...CombinedInputControlGroup,
+    ]);
+
+    // State
+    const invalid = computed(() => !!props.error);
+    const readonly = computed(() => context.attrs.readonly as boolean);
+
+    return {
+      root,
+      rootStyles,
+      controlGroup,
+      invalid,
+      readonly,
+    };
+  },
+});
+</script>

package/src/components/or-combined-input-v3/index.ts

@@ -0,0 +1,2 @@
+export { default as OrCombinedInputV3 } from './OrCombinedInput.vue';
+export * from './props';

package/src/components/or-combined-input-v3/props.ts

@@ -0,0 +1 @@
+export { InputBoxSize as CombinedInputSize } from '../or-input-box-v3';

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

@@ -0,0 +1,25 @@
+export const CombinedInputRoot: string[] = [
+  // Layout
+  'layout-column',
+
+  // Spacing
+  'gap-xs',
+];
+
+export const CombinedInputControlGroup: string[] = [
+  // Layout
+  'layout-row',
+
+  // Box
+  'w-full',
+
+  // Shape (.or-input-box)
+  '[&_.or-input-box]:first-child:rounded-r-0',
+  '[&_.or-input-box]:intermediate-child:rounded-0',
+  '[&_.or-input-box]:last-child:rounded-l-0',
+
+  // Spacing (.or-input-box)
+  '[&_.or-input-box]:first-child:mr-[-1px]',
+  '[&_.or-input-box]:intermediate-child:border-x-0',
+  '[&_.or-input-box]:last-child:ml-[-1px]',
+];

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/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-v3/OrInput.vue

@@ -1,6 +1,7 @@
 <template>
   <div
     ref="root"
+    v-bind="$attrs"
     :class="rootStyles"
   >
     <template v-if="label">
@@ -29,46 +30,51 @@
         :id="controlId"
         ref="input"
         v-model="proxyModelValue"
-        v-bind="$attrs"
         :class="controlStyles"
         :type="type === 'password' && disclosed ? 'text' : type"
         :placeholder="placeholder"
         :required="required"
         :disabled="disabled"
+
+        :readonly="readonly"
+        :maxlength="maxLength"
+
         @keydown="$emit('keydown', $event)"
         @keyup="$emit('keyup', $event)"
         @focus="$emit('focus', $event)"
         @blur="$emit('blur', $event)"
       >
 
-      <div :class="['layout-row']">
-        <template v-if="type === 'password'">
-          <OrIconButton
-            :icon="{ icon: disclosed ? 'visibility_off' : 'visibility', variant: 'filled' }"
-            :color="'inherit'"
-            :disabled="disabled"
-            @click.stop="disclosed = !disclosed"
-          />
-        </template>
-
-        <template v-if="type === 'search'">
-          <template v-if="modelValue">
+      <template v-if="type !== 'text'">
+        <div :class="['layout-row']">
+          <template v-if="type === 'password'">
             <OrIconButton
-              :icon="'close'"
+              :icon="{ icon: disclosed ? 'visibility_off' : 'visibility', variant: 'filled' }"
               :color="'inherit'"
               :disabled="disabled"
-              @click.stop="$emit('update:modelValue', '')"
+              @click.stop="disclosed = !disclosed"
             />
           </template>
 
-          <template v-else>
-            <OrIcon
-              :icon="'search'"
-              :variant="'outlined'"
-            />
+          <template v-if="type === 'search'">
+            <template v-if="modelValue">
+              <OrIconButton
+                :icon="'close'"
+                :color="'inherit'"
+                :disabled="disabled"
+                @click.stop="$emit('update:modelValue', '')"
+              />
+            </template>
+
+            <template v-else>
+              <OrIcon
+                :icon="'search'"
+                :variant="'outlined'"
+              />
+            </template>
           </template>
-        </template>
-      </div>
+        </div>
+      </template>
     </OrInputBox>
 
     <template v-if="!invalid">

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

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

package/src/components/or-radio-v3/OrRadio.vue

@@ -4,9 +4,9 @@
     :class="rootStyles"
   >
     <input
-      v-bind="$attrs"
       :id="controlId"
       v-model="proxyModelValue"
+      v-bind="$attrs"
       :class="controlStyles"
       type="radio"
       :value="inputValue"

package/src/components/or-select-v3/OrSelect.stories3.ts

@@ -108,6 +108,10 @@ export default {
       control: { type: 'boolean' },
     },
 
+    disableDefaultStyles: {
+      control: { type: 'boolean' },
+    },
+
     enableSearch: {
       control: { type: 'boolean' },
     },

package/src/components/or-select-v3/OrSelect.vue

@@ -24,6 +24,7 @@
       v-dropdown-open="toggle"
       v-dropdown-close="close"
       :class="[popoverState === 'open' && 'rounded-b-0']"
+      :variant="disableDefaultStyles ? 'unstyled' : 'styled'"
       :size="size"
       :invalid="invalid"
       :readonly="readonly"
@@ -314,6 +315,11 @@ export default defineComponent({
       default: false,
     },
 
+    disableDefaultStyles: {
+      type: Boolean,
+      default: false,
+    },
+
     enableSearch: {
       type: Boolean,
       default: false,

package/src/components/or-select-v3/styles.ts

@@ -8,7 +8,10 @@ export const SelectRoot: string[] = [
 
 export const SelectControl: string[] = [
   // Layout
-  'layout-row grow',
+  'layout-row',
+
+  // Box
+  'w-full',
 
   // Overflow
   'overflow-hidden',

package/src/components/or-switch-v3/OrSwitch.vue

@@ -5,9 +5,9 @@
   >
     <template v-if="!loading">
       <input
-        v-bind="$attrs"
         :id="controlId"
         v-model="proxyModelValue"
+        v-bind="$attrs"
         :class="controlStyles"
         type="checkbox"
         :value="inputValue"

package/src/components/or-tag-v3/OrTag.vue

@@ -48,7 +48,7 @@ export default defineComponent({
 
     color: {
       type: String as PropType<TagColor | string>,
-      default: TagColor.Default,
+      default: TagColor.Primary,
     },
 
     disabled: {

package/src/components/or-tag-v3/props.ts

@@ -5,6 +5,6 @@ export enum TagVariant {
 }
 
 export enum TagColor {
-  Default = 'default',
+  Primary = 'primary',
   Danger = 'danger',
 }

package/src/components/or-tag-v3/styles.ts

@@ -45,13 +45,10 @@ export const TagRootVariants: Record<TagVariant, string[]> = {
 };
 
 export const TagRootColors: Record<TagColor, string[]> = {
-  'default': [
+  'primary': [
     // Theme
     'theme-preset-2-primary',
     'dark:theme-preset-2-primary-dark',
-
-    'theme-foreground-default',
-    'dark:theme-foreground-default-dark',
   ],
 
   'danger': [

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

@@ -1,6 +1,7 @@
 <template>
   <div
     ref="root"
+    v-bind="$attrs"
     :class="rootStyles"
   >
     <template v-if="label">
@@ -27,11 +28,14 @@
       <textarea
         :id="controlId"
         v-model="proxyModelValue"
-        v-bind="$attrs"
         :class="controlStyles"
         :placeholder="placeholder"
         :required="required"
         :disabled="disabled"
+
+        :readonly="readonly"
+        :maxlength="maxLength"
+
         @keydown="$emit('keydown', $event)"
         @keyup="$emit('keyup', $event)"
         @focus="$emit('focus', $event)"

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

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