@onereach/ui-components 2.75.2-beta.2393.0 → 2.75.2-beta.2399.0

package/dist/esm/v3/components/or-select-v3/OrSelect.vue.d.ts

@@ -24,7 +24,6 @@ declare const _default: import("vue").ComponentOptions<import("vue").default, im
     noSearchResultsStyles: import("@vue/composition-api").ComputedRef<string[]>;
     controlId: import("@vue/composition-api").Ref<string>;
     proxyModelValue: import("@vue/composition-api").WritableComputedRef<string | number | (string | number)[]>;
-    invalid: import("@vue/composition-api").ComputedRef<boolean>;
     readonly: import("@vue/composition-api").ComputedRef<boolean>;
     selection: import("@vue/composition-api").ComputedRef<SelectOption | (SelectOption | undefined)[] | undefined>;
     searchText: import("@vue/composition-api").Ref<string>;
@@ -73,7 +72,7 @@ declare const _default: import("vue").ComponentOptions<import("vue").default, im
         default: undefined;
     };
     error: {
-        type: StringConstructor;
+        type: (BooleanConstructor | StringConstructor)[];
         default: undefined;
     };
     required: {
@@ -138,7 +137,7 @@ declare const _default: import("vue").ComponentOptions<import("vue").default, im
         default: undefined;
     };
     error: {
-        type: StringConstructor;
+        type: (BooleanConstructor | StringConstructor)[];
         default: undefined;
     };
     required: {
@@ -178,7 +177,7 @@ declare const _default: import("vue").ComponentOptions<import("vue").default, im
     size: SelectSize;
     placeholder: string;
     hint: string;
-    error: string;
+    error: string | boolean;
     required: boolean;
     disabled: boolean;
     disableDefaultStyles: boolean;
@@ -211,7 +210,6 @@ declare const _default: import("vue").ComponentOptions<import("vue").default, im
     noSearchResultsStyles: import("@vue/composition-api").ComputedRef<string[]>;
     controlId: import("@vue/composition-api").Ref<string>;
     proxyModelValue: import("@vue/composition-api").WritableComputedRef<string | number | (string | number)[]>;
-    invalid: import("@vue/composition-api").ComputedRef<boolean>;
     readonly: import("@vue/composition-api").ComputedRef<boolean>;
     selection: import("@vue/composition-api").ComputedRef<SelectOption | (SelectOption | undefined)[] | undefined>;
     searchText: import("@vue/composition-api").Ref<string>;
@@ -235,7 +233,7 @@ declare const _default: import("vue").ComponentOptions<import("vue").default, im
     size: SelectSize;
     placeholder: string;
     hint: string;
-    error: string;
+    error: string | boolean;
     required: boolean;
     disabled: boolean;
     disableDefaultStyles: boolean;
@@ -254,7 +252,7 @@ declare const _default: import("vue").ComponentOptions<import("vue").default, im
     size: SelectSize;
     placeholder: string;
     hint: string;
-    error: string;
+    error: string | boolean;
     required: boolean;
     disabled: boolean;
     disableDefaultStyles: boolean;

package/dist/esm/v3/components/or-select-v3/index.js

@@ -1,4 +1,4 @@
-export { s as OrSelectV3 } from '../../OrSelect-96bf9b63.js';
+export { s as OrSelectV3 } from '../../OrSelect-19c2e7d2.js';
 export { a as SelectSize } from '../../OrInputBox-2467d7e4.js';
 import 'vue-demi';
 import '../../dropdown-open-0d314aa4.js';
@@ -13,7 +13,7 @@ import '../../OrError-19198748.js';
 import '../../OrExpansionPanel-541cc4c1.js';
 import '../../OrIcon-ea40e58c.js';
 import '../../OrHint-6863124f.js';
-import '../../OrInput-ae9f6871.js';
+import '../../OrInput-b3939d15.js';
 import '../../useResponsive-a02e95b7.js';
 import '../../useValidationAttributes-d1abbe34.js';
 import '../../OrIconButton-385e997c.js';

package/dist/esm/v3/components/or-textarea-v3/OrTextarea.vue.d.ts

@@ -21,7 +21,6 @@ declare const _default: import("vue").ComponentOptions<import("vue").default, im
     proxyModelValue: import("@vue/composition-api").WritableComputedRef<string>;
     currentLength: import("@vue/composition-api").ComputedRef<number>;
     maxLength: import("@vue/composition-api").ComputedRef<number | undefined>;
-    invalid: import("@vue/composition-api").ComputedRef<boolean>;
     focus: () => void;
     blur: () => void;
 }> & import("@vue/composition-api").Data, {}, {}, {
@@ -46,7 +45,7 @@ declare const _default: import("vue").ComponentOptions<import("vue").default, im
         default: undefined;
     };
     error: {
-        type: StringConstructor;
+        type: (BooleanConstructor | StringConstructor)[];
         default: undefined;
     };
     required: {
@@ -83,7 +82,7 @@ declare const _default: import("vue").ComponentOptions<import("vue").default, im
         default: undefined;
     };
     error: {
-        type: StringConstructor;
+        type: (BooleanConstructor | StringConstructor)[];
         default: undefined;
     };
     required: {
@@ -104,7 +103,7 @@ declare const _default: import("vue").ComponentOptions<import("vue").default, im
     label: string;
     placeholder: string;
     hint: string;
-    error: string;
+    error: string | boolean;
     required: boolean;
     readonly: boolean;
     disabled: boolean;
@@ -131,7 +130,6 @@ declare const _default: import("vue").ComponentOptions<import("vue").default, im
     proxyModelValue: import("@vue/composition-api").WritableComputedRef<string>;
     currentLength: import("@vue/composition-api").ComputedRef<number>;
     maxLength: import("@vue/composition-api").ComputedRef<number | undefined>;
-    invalid: import("@vue/composition-api").ComputedRef<boolean>;
     focus: () => void;
     blur: () => void;
 }>, import("@vue/composition-api").Data, {}, {}, {}, {}, string[], {
@@ -140,7 +138,7 @@ declare const _default: import("vue").ComponentOptions<import("vue").default, im
     label: string;
     placeholder: string;
     hint: string;
-    error: string;
+    error: string | boolean;
     required: boolean;
     readonly: boolean;
     disabled: boolean;
@@ -152,7 +150,7 @@ declare const _default: import("vue").ComponentOptions<import("vue").default, im
     label: string;
     placeholder: string;
     hint: string;
-    error: string;
+    error: string | boolean;
     required: boolean;
     readonly: boolean;
     disabled: boolean;

package/dist/esm/v3/components/or-textarea-v3/index.js

@@ -1,4 +1,4 @@
-export { s as OrTextareaV3 } from '../../OrTextarea-42d21f77.js';
+export { s as OrTextareaV3 } from '../../OrTextarea-dfc6a453.js';
 export { a as TextareaSize } from '../../OrInputBox-2467d7e4.js';
 import 'vue-demi';
 import '../../useIdAttribute-859439f0.js';

package/dist/esm/v3/index.js

@@ -6,7 +6,7 @@ export { b as BUTTON_COLOR, d as BUTTON_LOADER_TYPE, c as BUTTON_SIZE, B as BUTT
 export { a as ButtonColor, b as ButtonType, B as ButtonVariant, s as OrButtonV3 } from './OrButton-9f059df6.js';
 export { s as OrCard } from './OrCard-e3a5aea4.js';
 export { C as CARD_COLLECTION_LAYOUT, s as OrCardCollection } from './OrCardCollection-1258cd45.js';
-export { D as DefaultCardCollectionViews, s as OrCardCollectionV3, d as defaultViewModes, g as gridView, l as listView } from './OrCardCollection-4cb41408.js';
+export { D as DefaultCardCollectionViews, s as OrCardCollectionV3, d as defaultViewModes, g as gridView, l as listView } from './OrCardCollection-5c0d53e0.js';
 export { s as OrCardV3 } from './OrCard-cd6af82e.js';
 export { a as OrCarousel, s as OrCarouselItem } from './OrCarouselItem-a3a855e8.js';
 export { s as OrCheckbox } from './OrCheckbox-8d8887ea.js';
@@ -16,7 +16,7 @@ export { s as OrCode, O as OrCodeLanguages } from './OrCode-fe49ca8e.js';
 export { s as OrCollapse } from './OrCollapse-37a52e8f.js';
 export { s as OrColorPicker, h as amber, n as black, b as blue, m as blueGrey, k as brown, c as cyan, j as deepOrange, d as deepPurple, g as green, i as indigo, l as lightBlue, e as lightGreen, f as lime, o as orange, p as pink, a as purple, r as red, t as teal, w as white, y as yellow } from './OrColorPicker-9a149e6b.js';
 export { s as OrConfirm } from './OrConfirm-45796889.js';
-export { C as ConfirmType, s as OrConfirmV3 } from './OrConfirm-19da64d1.js';
+export { C as ConfirmType, s as OrConfirmV3 } from './OrConfirm-c7304c10.js';
 export { D as DEFAULT_TEXT, s as OrDateTimePicker, a as OrDateTimePickerItemTypes, O as OrDateTimePickerTypes } from './OrDateTimePicker-efd8aae7.js';
 export { s as OrError } from './OrError-f90296db.js';
 export { s as OrErrorTagV3 } from './OrErrorTag-0025b17c.js';
@@ -31,11 +31,11 @@ export { s as OrIcon, O as OrIconColors, a as OrIconType } from './OrIcon-ed3e10
 export { I as IconButtonColor, s as OrIconButtonV3 } from './OrIconButton-385e997c.js';
 export { I as IconButtonSize, I as IconSize, a as IconVariant, s as OrIconV3 } from './OrIcon-ea40e58c.js';
 export { I as InlineInputBoxSize, I as InlineInputSize, s as OrInlineInputBoxV3 } from './OrInlineInputBox-09b33e18.js';
-export { I as InlineInputType, s as OrInlineInputV3 } from './OrInlineInput-cd3753ee.js';
+export { I as InlineInputType, s as OrInlineInputV3 } from './OrInlineInput-651c9155.js';
 export { a as InlineTextEditTrimmingTypes, I as InlineTextEditTypes, s as OrInlineTextEdit } from './OrInlineTextEdit-adf71cc1.js';
-export { s as OrInlineTextareaV3 } from './OrInlineTextarea-4c5b0390.js';
+export { s as OrInlineTextareaV3 } from './OrInlineTextarea-d16af66a.js';
 export { a as InputBoxSize, I as InputBoxVariant, a as InputSize, s as OrInputBoxV3, a as SearchSize, a as SelectSize, a as TextareaSize } from './OrInputBox-2467d7e4.js';
-export { I as InputType, s as OrInputV3 } from './OrInput-ae9f6871.js';
+export { I as InputType, s as OrInputV3 } from './OrInput-b3939d15.js';
 export { s as OrInput } from './OrInput-0dbd5a01.js';
 export { s as OrLabel } from './OrLabel-876f8729.js';
 export { L as LabelVariant, s as OrLabelV3 } from './OrLabel-f700f9fb.js';
@@ -63,10 +63,10 @@ export { s as OrRadio } from './OrRadio-c3ab11f2.js';
 export { s as OrRadioGroup } from './OrRadioGroup-00785e41.js';
 export { s as OrRadioV3 } from './OrRadio-97fb105f.js';
 export { s as OrSearch } from './OrSearch-4a5c943b.js';
-export { s as OrSearchV3 } from './OrSearch-6f6b4fcd.js';
+export { s as OrSearchV3 } from './OrSearch-d16d0331.js';
 export { s as OrSegmentedControlV3, S as SegmentedControlSize } from './OrSegmentedControl-880b4911.js';
 export { s as OrSelect } from './OrSelect-88e5dfaf.js';
-export { s as OrSelectV3 } from './OrSelect-96bf9b63.js';
+export { s as OrSelectV3 } from './OrSelect-19c2e7d2.js';
 export { s as OrSidebar, O as OrSidebarSide } from './OrSidebar-375c85a3.js';
 export { s as OrSidebarV3 } from './OrSidebar-64703ef6.js';
 export { O as OrSidebarPlacement } from './OrSidebarCollapseButton-506fc73c.js';
@@ -88,7 +88,7 @@ export { s as OrTeleport } from './OrTeleport.vue3-9bce0c02.js';
 export { s as OrTeleportV3 } from './OrTeleport.vue3-8099178c.js';
 export { s as OrTextV3 } from './OrText-a3b00048.js';
 export { s as OrTextarea } from './OrTextarea-de1ecb0f.js';
-export { s as OrTextareaV3 } from './OrTextarea-42d21f77.js';
+export { s as OrTextareaV3 } from './OrTextarea-dfc6a453.js';
 export { s as OrTextbox, T as TextboxTypes } from './OrTextbox-5c1cf735.js';
 export { s as OrToast, a as OrToastContainer } from './OrToastContainer-11a58425.js';
 export { P as PositionsX, b as PositionsY, c as ToastType, T as TransitionType, a as useQueue, u as useToast } from './useToast-4fbe0e5a.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onereach/ui-components",
-  "version": "2.75.2-beta.2393.0",
+  "version": "2.75.2-beta.2399.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.36.2-beta.2393.0",
+    "@onereach/styles": "^2.36.2-beta.2399.0",
     "@splidejs/splide": "4.0.6",
     "@types/lodash": "4.14.173",
     "@types/sortablejs": "1.10.7",

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,201 @@
+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: {
+    // 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' },
+    },
+
+    readonly: {
+      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,133 @@
+<template>
+  <div
+    ref="root"
+    :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"
+        :error="!!error"
+        :required="required"
+        :readonly="readonly"
+        :disabled="disabled"
+        :disable-default-styles="disableDefaultStyles"
+      />
+    </div>
+
+    <div
+      v-show="!error"
+      :class="['contents']"
+    >
+      <template v-if="hint">
+        <OrHint :disabled="disabled">
+          {{ hint }}
+        </OrHint>
+      </template>
+    </div>
+
+    <div
+      v-show="typeof error === 'string'"
+      :class="['contents']"
+    >
+      <OrError :disabled="disabled">
+        {{ error }}
+      </OrError>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent, PropType, ref } from 'vue-demi';
+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,
+  },
+
+  props: {
+    size: {
+      type: String as PropType<CombinedInputSize>,
+      default: CombinedInputSize.M,
+    },
+
+    label: {
+      type: String,
+      default: undefined,
+    },
+
+    hint: {
+      type: String,
+      default: undefined,
+    },
+
+    error: {
+      type: [String, Boolean],
+      default: undefined,
+    },
+
+    required: {
+      type: Boolean,
+      default: false,
+    },
+
+    readonly: {
+      type: Boolean,
+      default: false,
+    },
+
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+
+    disableDefaultStyles: {
+      type: Boolean,
+      default: false,
+    },
+  },
+
+  setup(props, context) {
+    // Refs
+    const root = ref<HTMLElement>();
+
+    // Styles
+    const rootStyles = computed(() => [
+      'or-combined-input',
+      ...CombinedInputRoot,
+    ]);
+
+    const controlGroup = computed(() => [
+      ...CombinedInputControlGroup,
+    ]);
+
+    return {
+      root,
+      rootStyles,
+      controlGroup,
+    };
+  },
+});
+</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/OrInlineInput.vue

@@ -6,7 +6,7 @@
     <div :class="['layout-row', 'gap-sm+']">
       <OrInlineInputBox
         :size="size"
-        :invalid="invalid"
+        :invalid="!!error"
       >
         <input
           ref="control"
@@ -40,7 +40,10 @@
       </template>
     </div>
 
-    <template v-if="!invalid">
+    <div
+      v-show="!error"
+      :class="['contents']"
+    >
       <template v-if="hint || maxLength">
         <OrHint>
           {{ hint }}
@@ -53,9 +56,12 @@
           </template>
         </OrHint>
       </template>
-    </template>
+    </div>
 
-    <template v-else>
+    <div
+      v-show="typeof error === 'string'"
+      :class="['contents']"
+    >
       <OrError>
         {{ error }}
 
@@ -66,7 +72,7 @@
           {{ currentLength }} / {{ maxLength }}
         </template>
       </OrError>
-    </template>
+    </div>
   </div>
 </template>
 
@@ -127,7 +133,7 @@ export default defineComponent({
     },
 
     error: {
-      type: String,
+      type: [String, Boolean],
       default: undefined,
     },
   },
@@ -188,8 +194,6 @@ export default defineComponent({
     const currentLength = computed(() => draftModelValue.value?.toString().length ?? 0);
     const maxLength = computed(() => controlAttributes.maxlength);
 
-    const invalid = computed(() => !!props.error);
-
     const activated = ref(false);
 
     // Handlers
@@ -248,7 +252,6 @@ export default defineComponent({
       draftModelValue,
       currentLength,
       maxLength,
-      invalid,
       activated,
       onFocus,
       onBlur,

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',