Merge remote-tracking branch 'origin/dev'

Author: juzser

src/components/Checkbox/Checkbox.vue

@@ -46,7 +46,7 @@ import { UseUniqueId } from '@/use';
 import MinusMinor from '@icons/MinusMinor.svg';
 import TickSmallMinor from '@icons/TickSmallMinor.svg';
 import styles from '@/classes/Checkbox.json';
-import type { ErrorType } from '@/utilities/type';
+import type { Error } from '@/utilities/type';
 import { Key } from '../KeypressListener/utils';
 import { errorTextID } from '../InlineError/utils';
 import { Choice } from '../Choice';
@@ -73,7 +73,7 @@ interface Props {
   /** Value for v-model binding */
   modelValue?: string | boolean;
   /** Display an error message */
-  error?: ErrorType | boolean;
+  error?: Error;
 }
 
 const isWithinListbox = inject<boolean>('withinListboxContext', false);

src/components/Choice/Choice.vue

@@ -39,7 +39,7 @@ label(
 import { computed } from 'vue';
 import { classNames } from 'polaris/polaris-react/src/utilities/css';
 import styles from '@/classes/Choice.json';
-import type { ErrorType } from '@/utilities/type';
+import type { Error } from '@/utilities/type';
 import { helpTextID } from './utils';
 import { InlineError } from '../InlineError';
 
@@ -49,7 +49,7 @@ interface Props {
   /** Whether the associated form control is disabled */
   disabled?: boolean;
   /** Display an error message */
-  error?: ErrorType | boolean;
+  error?: Error;
   /** Visually hide the label */
   labelHidden?: boolean;
 }

src/components/Combobox/components/TextField/TextField.vue

@@ -33,7 +33,7 @@ PolarisTextField(
 import { inject, computed, watch } from 'vue';
 import { UseUniqueId } from '@/use';
 import type { ComboboxTextFieldType } from '@/utilities/interface';
-import type { ErrorType } from '@/utilities/type';
+import type { Error } from '@/utilities/type';
 import type { LabelledProps } from '../../../Labelled/utils'
 import { labelID } from '../../../Label/utils';
 import { TextField as PolarisTextField } from '../../../TextField';
@@ -89,7 +89,7 @@ interface TextFieldProps {
   /** Allow for multiple lines of input */
   multiline?: boolean | number;
   /** Error to display beneath the label */
-  error?: ErrorType | boolean;
+  error?: Error;
   /** Determine type of input */
   type?: Type;
   /** Name of the input */

src/components/Labelled/Labelled.vue

@@ -42,7 +42,7 @@ div(:class="className")
 import { computed } from 'vue';
 import { classNames } from 'polaris/polaris-react/src/utilities/css';
 import styles from '@/classes/Labelled.json';
-import type { Action, ErrorType } from '@/utilities/type';
+import type { Action, Error } from '@/utilities/type';
 import { ButtonFrom } from '@/components';
 import type { LabelProps } from '../Label/utils';
 import { Label } from '../Label';
@@ -53,7 +53,7 @@ interface LabelledProps {
   /** A unique identifier for the label */
   id: LabelProps['id'];
   /** Error to display beneath the label */
-  error?: ErrorType | boolean;
+  error?: Error;
   /** An action */
   action?: Action;
   /** Visually hide the label */

src/components/Labelled/utils.ts

@@ -1,4 +1,4 @@
-import type { Action, ErrorType } from '@/utilities/type';
+import type { Action, Error } from '@/utilities/type';
 import { labelID } from '../Label/utils';
 import type { LabelProps } from "../Label/utils";
 
@@ -16,7 +16,7 @@ export interface LabelledProps {
   /** A unique identifier for the label */
   id: LabelProps['id'];
   /** Error to display beneath the label */
-  error?: ErrorType | boolean;
+  error?: Error;
   /** An action */
   action?: Action;
   /** Visually hide the label */

src/components/Select/Select.vue

@@ -81,7 +81,7 @@ Labelled(
 
 <script setup lang="ts">
 import { computed, useSlots } from 'vue';
-import type { Action, ErrorType } from '@/utilities/type';
+import type { Action, Error } from '@/utilities/type';
 import { classNames } from 'polaris/polaris-react/src/utilities/css';
 import { UseUniqueId } from '@/use';
 import styles from '@/classes/Select.json';
@@ -115,7 +115,7 @@ interface SelectProps {
   /** Value for form input */
   value?: string;
   /** Display an error state */
-  error?: ErrorType | boolean;
+  error?: Error;
   /** Visual required indicator, add an asterisk to label */
   requiredIndicator?: boolean;
   /** Value for v-model binding */

src/components/TextField/TextField.vue

@@ -163,7 +163,7 @@ import { UseUniqueId } from '@/use';
 import styles from '@/classes/TextField.json';
 import CircleCancelMinor from '@icons/CircleCancelMinor.svg';
 import type { LabelledProps } from '../Labelled/utils';
-import type { ErrorType } from '@/utilities/type';
+import type { Error } from '@/utilities/type';
 import { helpTextID, labelID } from '../Labelled/utils';
 import { Resizer, Spinner as TextFieldSpinner } from './components';
 import { Connected } from '../Connected';
@@ -222,7 +222,7 @@ interface NonMutuallyExclusiveProps {
   /** Allow for multiple lines of input */
   multiline?: boolean | number;
   /** Error to display beneath the label */
-  error?: ErrorType | boolean;
+  error?: Error;
   /** Determine type of input */
   type?: Type;
   /** Name of the input */

src/utilities/type.ts

@@ -4,6 +4,8 @@ export type IconSource = VueElementConstructor | 'placeholder' | string;
 
 export type ErrorType = string | VueElementConstructor | (string | VueElementConstructor)[];
 
+export type Error = ErrorType | boolean;
+
 export type HeadingTagName = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6' | 'p';
 
 export type Action = {