@onereach/ui-components 2.69.7-beta.2155.0 → 2.69.7-beta.2168.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onereach/ui-components",
-  "version": "2.69.7-beta.2155.0",
+  "version": "2.69.7-beta.2168.0",
   "description": "Vue components library for v2/3",
   "sideEffects": false,
   "main": "./dist/auto/index.js",
@@ -38,7 +38,7 @@
     "@codemirror/lang-json": "6.0.0",
     "@codemirror/lang-markdown": "6.0.1",
     "@floating-ui/dom": "0.3.1",
-    "@onereach/styles": "^2.33.0",
+    "@onereach/styles": "^2.33.1-beta.2168.0",
     "@splidejs/splide": "4.0.6",
     "@types/lodash": "4.14.173",
     "@types/sortablejs": "1.10.7",

package/src/components/index.ts

@@ -53,7 +53,6 @@ export * from './or-notification-v3';
 export * from './or-overflow-menu';
 export * from './or-overlay';
 export * from './or-overlay-v3';
-export * from './or-pagination-v3';
 export * from './or-popover-v3';
 export * from './or-progress';
 export * from './or-progress-v3';

package/src/components/or-button-v3/OrButton.stories3.ts

@@ -36,10 +36,6 @@ export default {
       options: Object.values(ButtonColor),
     },
 
-    activated: {
-      table: { disable: true },
-    },
-
     disabled: {
       control: { type: 'boolean' },
     },

package/src/components/or-button-v3/OrButton.vue

@@ -4,7 +4,6 @@
     v-bind="$attrs"
     :class="rootStyles"
     :type="type"
-    :activated="activated ? '' : null"
     :disabled="disabled"
     @click="$emit('click', $event)"
     @focus="$emit('focus', $event)"
@@ -64,11 +63,6 @@ export default defineComponent({
       default: ButtonColor.Primary,
     },
 
-    activated: {
-      type: Boolean,
-      default: false,
-    },
-
     disabled: {
       type: Boolean,
       default: false,

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

@@ -116,19 +116,5 @@ export const ButtonRootColors: Record<`${ButtonColor}-${ButtonVariant}`, string[
     'dark:theme-preset-4-error-dark',
   ],
 
-  'inherit-link': [
-    // Typography
-    'typography-caption-regular',
-
-    // Typography (activated)
-    'activated:typography-caption-bold',
-
-    // Theme
-    'theme-foreground-inherit',
-    'dark:theme-foreground-inherit',
-
-    // Theme (activated)
-    'activated:theme-foreground-default',
-    'dark:activated:theme-foreground-default-dark',
-  ],
+  'inherit-link': [],
 };

package/src/components/or-checkbox-v3/OrCheckbox.vue

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

package/src/components/or-combined-input-v3/OrCombinedInput.docs.mdx

@@ -0,0 +1,7 @@
+import { DocsPage } from '@storybook/addon-docs';
+
+```ts
+import { OrCombinedInputV3 as OrCombinedInput } from '@onereach/ui-components';
+```
+
+<DocsPage />

package/src/components/or-combined-input-v3/OrCombinedInput.stories3.ts

@@ -0,0 +1,202 @@
+import { Meta, StoryFn } from '@storybook/vue3';
+import { ref, watch } from 'vue-demi';
+import { OrIconV3 as OrIcon } from '../or-icon-v3';
+import { OrInputV3 as OrInput } from '../or-input-v3';
+import { OrSelectV3 as OrSelect, SelectOption } from '../or-select-v3';
+import OrCombinedInputDocs from './OrCombinedInput.docs.mdx';
+import OrCombinedInput from './OrCombinedInput.vue';
+import { CombinedInputSize } from './props';
+
+export default {
+  title: 'Components/Forms/Combined Input',
+  component: OrCombinedInput,
+
+  argTypes: {
+    // Attrs
+    readonly: {
+      control: { type: 'boolean' },
+    },
+
+    // Slots
+    default: {
+      type: {
+        name: 'string',
+        required: true,
+      },
+
+      control: { type: 'text' },
+    },
+
+    addon: {
+      type: {
+        name: 'string',
+        required: false,
+      },
+
+      control: { type: 'text' },
+    },
+
+    // Props
+    size: {
+      control: { type: 'select' },
+      options: Object.values(CombinedInputSize),
+    },
+
+    label: {
+      control: { type: 'text' },
+    },
+
+    hint: {
+      control: { type: 'text' },
+    },
+
+    error: {
+      control: { type: 'text' },
+    },
+
+    required: {
+      control: { type: 'boolean' },
+    },
+
+    disabled: {
+      control: { type: 'boolean' },
+    },
+
+    disableDefaultStyles: {
+      control: { type: 'boolean' },
+    },
+  },
+
+  parameters: {
+    docs: {
+      page: OrCombinedInputDocs,
+    },
+
+    design: {
+      type: 'figma',
+      url: 'https://www.figma.com/file/o7DdkaznUW2PtX4wiSuhhQ/Core?node-id=4423%3A39753&t=grpHUrgJi4X2W67L-4',
+    },
+  },
+} as Meta<typeof OrCombinedInput>;
+
+const Template: StoryFn<typeof OrCombinedInput> = (args) => ({
+  components: {
+    OrCombinedInput,
+    OrIcon,
+    OrInput,
+    OrSelect,
+  },
+
+  setup() {
+    // State
+    const options = Array.from<string, SelectOption>([
+      'Alfa',
+      'Bravo',
+      'Charlie',
+      'Delta',
+      'Echo',
+      'Foxtrot',
+      'Golf',
+      'Hotel',
+      'India',
+      'Juliett',
+      'Kilo',
+      'Lima',
+      'Mike',
+      'November',
+      'Oscar',
+      'Papa',
+      'Quebec',
+      'Romeo',
+      'Sierra',
+      'Tango',
+      'Uniform',
+      'Victor',
+      'Whiskey',
+      'X-Ray',
+      'Yankee',
+      'Zulu',
+    ], (item) => ({
+      value: item.toLowerCase(),
+      label: item,
+    }));
+
+    const selectModel = ref<string>();
+    const inputModel = ref<string>();
+
+    // Effects
+    watch([selectModel, inputModel], (values) => {
+      console.debug(values);
+    });
+
+    return {
+      args,
+      options,
+      selectModel,
+      inputModel,
+    };
+  },
+
+  template: `
+    <OrCombinedInput v-bind="args">
+      ${args.default}
+      ${args.addon}
+    </OrCombinedInput>
+  `,
+});
+
+export const Default = Template.bind({});
+
+Default.args = {
+  // Slots
+  default: `
+    <template v-slot="props">
+      <OrSelect
+        class="basis-1/4"
+        v-model="selectModel"
+        v-bind="props"
+        :options="options"
+      />
+
+      <OrInput
+        class="basis-3/4"
+        v-model="inputModel"
+        v-bind="props"
+      />
+    </template>
+  `,
+
+  // Props
+  label: 'Combined Input',
+};
+
+export const Addon = Template.bind({});
+
+Addon.args = {
+  ...Default.args,
+
+  // Slots
+  addon: `
+    <template v-slot:addon>
+      <OrIcon icon="info" />
+    </template>
+  `,
+};
+
+export const Hint = Template.bind({});
+
+Hint.args = {
+  ...Default.args,
+
+  // Props
+  hint: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+};
+
+export const Error = Template.bind({});
+
+Error.args = {
+  ...Default.args,
+
+  // Props
+  error: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+};

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"
@@ -38,7 +39,7 @@
         @focus="$emit('focus', $event)"
         @blur="$emit('blur', $event)"
       >
-        <template v-if="proxyModelValue !== undefined">
+        <template v-if="proxyModelValue && proxyModelValue.length > 0">
           <template v-if="multiple">
             <slot
               name="valueTemplate"
@@ -265,12 +266,12 @@ export default defineComponent({
     },
 
     modelValue: {
-      type: [String, Number, Array] as PropType<string | number | (string | number)[]>,
+      type: [String, Array] as PropType<string | string[]>,
       default: undefined,
     },
 
     value: { // TODO: Remove Vue 2 fallback
-      type: [String, Number, Array] as PropType<string | number | (string | number)[]>,
+      type: [String, Array] as PropType<string | string[]>,
       default: undefined,
     },
 
@@ -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/index.ts

@@ -1,3 +1,2 @@
 export { default as OrSelectV3 } from './OrSelect.vue';
 export * from './props';
-export * from './types';

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-select-v3/types.ts

@@ -1,5 +1,5 @@
 export interface SelectOption {
-  value: string | number;
+  value: string;
   label: string;
 }