@jobber/components 6.103.1 → 6.103.2-JOB-140609-fafe469.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/Autocomplete/Autocomplete.types.d.ts +12 -1
- package/dist/Autocomplete/index.cjs +0 -12
- package/dist/Autocomplete/index.mjs +0 -12
- package/dist/Checkbox/Checkbox.types.d.ts +2 -9
- package/dist/Checkbox/index.cjs +3 -2
- package/dist/Checkbox/index.mjs +3 -2
- package/dist/Chips/InternalChipDismissible/hooks/index.cjs +2 -2
- package/dist/Chips/InternalChipDismissible/hooks/index.mjs +2 -2
- package/dist/Chips/InternalChipDismissible/index.cjs +2 -2
- package/dist/Chips/InternalChipDismissible/index.mjs +2 -2
- package/dist/Chips/index.cjs +2 -2
- package/dist/Chips/index.mjs +2 -2
- package/dist/DataList/components/DataListSearch/index.cjs +1 -12
- package/dist/DataList/components/DataListSearch/index.mjs +1 -12
- package/dist/DataList/index.cjs +0 -8
- package/dist/DataList/index.mjs +0 -8
- package/dist/DataTable/index.cjs +2 -2
- package/dist/DataTable/index.mjs +2 -2
- package/dist/DatePicker/index.cjs +2 -2
- package/dist/DatePicker/index.mjs +2 -2
- package/dist/FormField/FormFieldTypes.d.ts +195 -0
- package/dist/FormField-cjs.js +0 -1
- package/dist/FormField-es.js +1 -1
- package/dist/InputDate/index.cjs +8 -4
- package/dist/InputDate/index.mjs +8 -4
- package/dist/InputDate/useInputDateActivatorActions.d.ts +2 -2
- package/dist/InputEmail/InputEmail.types.d.ts +28 -21
- package/dist/InputEmail/hooks/useInputEmailActions.d.ts +1 -1
- package/dist/InputEmail/index.cjs +10 -45
- package/dist/InputEmail/index.mjs +10 -45
- package/dist/InputNumber/InputNumber.rebuilt.types.d.ts +30 -1
- package/dist/InputNumber/index.cjs +10 -2
- package/dist/InputNumber/index.mjs +10 -2
- package/dist/InputPhoneNumber/InputPhoneNumber.types.d.ts +25 -24
- package/dist/InputPhoneNumber/hooks/useInputPhoneActions.d.ts +1 -1
- package/dist/InputPhoneNumber/index.cjs +24 -36
- package/dist/InputPhoneNumber/index.mjs +24 -36
- package/dist/InputText/InputText.d.ts +2 -2
- package/dist/InputText/InputText.types.d.ts +39 -24
- package/dist/InputText/index.cjs +26 -55
- package/dist/InputText/index.mjs +27 -56
- package/dist/InputText/useInputTextActions.d.ts +1 -1
- package/dist/InputTime/InputTime.rebuilt.d.ts +1 -1
- package/dist/InputTime/InputTime.types.d.ts +29 -1
- package/dist/InputTime/index.cjs +32 -25
- package/dist/InputTime/index.d.ts +1 -1
- package/dist/InputTime/index.mjs +34 -27
- package/dist/List/index.cjs +2 -2
- package/dist/List/index.mjs +2 -2
- package/dist/RecurringSelect/index.cjs +2 -2
- package/dist/RecurringSelect/index.mjs +2 -2
- package/dist/Select/Select.rebuilt.d.ts +1 -1
- package/dist/Select/Select.types.d.ts +18 -1
- package/dist/Select/hooks/useSelectActions.d.ts +5 -5
- package/dist/Select/index.cjs +27 -41
- package/dist/Select/index.d.ts +7 -5
- package/dist/Select/index.mjs +29 -43
- package/dist/_baseEach-cjs.js +12 -12
- package/dist/_baseEach-es.js +1 -1
- package/dist/_baseFlatten-cjs.js +2 -2
- package/dist/_baseFlatten-es.js +1 -1
- package/dist/{_baseGet-cjs.js → _getAllKeys-cjs.js} +181 -181
- package/dist/{_baseGet-es.js → _getAllKeys-es.js} +182 -182
- package/dist/index.cjs +2 -2
- package/dist/index.mjs +2 -2
- package/dist/omit-cjs.js +14 -14
- package/dist/omit-es.js +1 -1
- package/dist/useScrollToActive-cjs.js +3 -3
- package/dist/useScrollToActive-es.js +1 -1
- package/package.json +2 -2
- package/dist/InputEmail/hooks/useInputEmailFormField.d.ts +0 -32
- package/dist/InputPhoneNumber/hooks/useInputPhoneFormField.d.ts +0 -71
- package/dist/InputText/useInputTextFormField.d.ts +0 -352
- package/dist/Select/hooks/useSelectFormField.d.ts +0 -34
|
@@ -113,7 +113,7 @@ const DEFAULT_PATTERN = "(***) ***-****";
|
|
|
113
113
|
function useInputPhoneActions({ onChange, inputRef, onFocus, onBlur, onKeyDown, onEnter, }) {
|
|
114
114
|
function handleClear() {
|
|
115
115
|
var _a;
|
|
116
|
-
|
|
116
|
+
// Don't call blur handler when programmatically clearing
|
|
117
117
|
onChange && onChange("");
|
|
118
118
|
(_a = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
|
|
119
119
|
}
|
|
@@ -147,28 +147,27 @@ function useInputPhoneActions({ onChange, inputRef, onFocus, onBlur, onKeyDown,
|
|
|
147
147
|
};
|
|
148
148
|
}
|
|
149
149
|
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
*/
|
|
154
|
-
function useInputPhoneFormField(_a) {
|
|
155
|
-
var { id, name, description, inline, handleChange, handleBlur, handleFocus, handleKeyDown, error, disabled, autofocus, value, readonly } = _a, rest = __rest(_a, ["id", "name", "description", "inline", "handleChange", "handleBlur", "handleFocus", "handleKeyDown", "error", "disabled", "autofocus", "value", "readonly"]);
|
|
156
|
-
const descriptionIdentifier = `descriptionUUID--${id}`;
|
|
157
|
-
const fieldProps = Object.assign(Object.assign(Object.assign(Object.assign({}, rest), { id,
|
|
158
|
-
name,
|
|
159
|
-
disabled, autoFocus: autofocus, onChange: handleChange, onBlur: handleBlur, onFocus: handleFocus, onKeyDown: handleKeyDown, value, invalid: error || rest.invalid ? "true" : undefined }), (description &&
|
|
160
|
-
!inline && { "aria-describedby": descriptionIdentifier })), { readOnly: readonly });
|
|
161
|
-
return { fieldProps, descriptionIdentifier };
|
|
162
|
-
}
|
|
163
|
-
|
|
164
|
-
const InputPhoneNumberRebuilt = forwardRef(function InputPhoneNumberInternal(_a, ref) {
|
|
150
|
+
const InputPhoneNumberRebuilt = forwardRef(
|
|
151
|
+
// eslint-disable-next-line max-statements
|
|
152
|
+
function InputPhoneNumberInternal(_a, ref) {
|
|
165
153
|
var _b, _c, _d, _e;
|
|
166
154
|
var { pattern = DEFAULT_PATTERN } = _a, props = __rest(_a, ["pattern"]);
|
|
167
155
|
const inputPhoneNumberRef = (_b = ref) !== null && _b !== void 0 ? _b : React__default.useRef(null);
|
|
168
156
|
const wrapperRef = React__default.useRef(null);
|
|
169
|
-
const { inputStyle } = useFormFieldWrapperStyles(
|
|
157
|
+
const { inputStyle } = useFormFieldWrapperStyles({
|
|
158
|
+
size: props.size,
|
|
159
|
+
align: props.align,
|
|
160
|
+
placeholder: props.placeholder,
|
|
161
|
+
value: props.value,
|
|
162
|
+
invalid: props.invalid,
|
|
163
|
+
error: props.error,
|
|
164
|
+
maxLength: undefined, // v2: maxLength not used for width styling
|
|
165
|
+
disabled: props.disabled,
|
|
166
|
+
inline: props.inline,
|
|
167
|
+
type: "tel",
|
|
168
|
+
});
|
|
170
169
|
const generatedId = useId();
|
|
171
|
-
const id = props.id || generatedId;
|
|
170
|
+
const id = props.identifier || props.id || generatedId;
|
|
172
171
|
const { name } = useAtlantisFormFieldName({
|
|
173
172
|
nameProp: props.name,
|
|
174
173
|
id: id,
|
|
@@ -186,25 +185,14 @@ const InputPhoneNumberRebuilt = forwardRef(function InputPhoneNumberInternal(_a,
|
|
|
186
185
|
onEnter: props.onEnter,
|
|
187
186
|
inputRef: inputPhoneNumberRef,
|
|
188
187
|
});
|
|
189
|
-
const
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
handleKeyDown,
|
|
196
|
-
autofocus: props.autoFocus,
|
|
197
|
-
disabled: props.disabled,
|
|
198
|
-
readonly: props.readonly,
|
|
199
|
-
invalid: props.invalid,
|
|
200
|
-
error: props.error,
|
|
201
|
-
description: props.description,
|
|
202
|
-
inline: props.inline,
|
|
203
|
-
});
|
|
204
|
-
return (React__default.createElement(FormFieldWrapper, { disabled: props.disabled, size: props.size, inline: props.inline, wrapperRef: wrapperRef, error: (_c = props.error) !== null && _c !== void 0 ? _c : "", invalid: Boolean(props.error || props.invalid), identifier: id, descriptionIdentifier: descriptionIdentifier, description: props.description, clearable: (_d = props.clearable) !== null && _d !== void 0 ? _d : "never", onClear: handleClear, type: "tel", placeholder: props.placeholder, value: formattedValue, prefix: props.prefix, suffix: props.suffix, readonly: props.readonly, loading: props.loading },
|
|
205
|
-
React__default.createElement("input", Object.assign({ type: "tel" }, fieldProps, { ref: inputPhoneNumberRef, className: classnames(inputStyle, {
|
|
188
|
+
const descriptionIdentifier = `descriptionUUID--${id}`;
|
|
189
|
+
const hasDescription = props.description && !props.inline;
|
|
190
|
+
const isInvalid = Boolean(props["aria-invalid"] || props.error || props.invalid);
|
|
191
|
+
const effectiveReadOnly = props.readonly || props.readOnly;
|
|
192
|
+
return (React__default.createElement(FormFieldWrapper, { disabled: props.disabled, size: props.size, inline: props.inline, wrapperRef: wrapperRef, error: (_c = props.error) !== null && _c !== void 0 ? _c : "", invalid: Boolean(props.error || props.invalid), identifier: id, descriptionIdentifier: descriptionIdentifier, description: props.description, clearable: (_d = props.clearable) !== null && _d !== void 0 ? _d : "never", onClear: handleClear, type: "tel", placeholder: props.placeholder, value: formattedValue, prefix: props.prefix, suffix: props.suffix, readonly: effectiveReadOnly, loading: props.loading },
|
|
193
|
+
React__default.createElement("input", { id: id, name: name, type: "tel", ref: inputPhoneNumberRef, className: classnames(inputStyle, {
|
|
206
194
|
[styles.emptyValue]: inputValue.length === 0 && pattern[0] === "(",
|
|
207
|
-
}), value: formattedValue })
|
|
195
|
+
}), value: formattedValue, disabled: props.disabled, readOnly: effectiveReadOnly, required: props.required, autoFocus: props.autoFocus, autoComplete: props.autoComplete, inputMode: props.inputMode, tabIndex: props.tabIndex, role: props.role, "aria-label": props["aria-label"], "aria-describedby": hasDescription ? descriptionIdentifier : props["aria-describedby"], "aria-invalid": isInvalid ? true : undefined, "aria-controls": props["aria-controls"], "aria-expanded": props["aria-expanded"], "aria-activedescendant": props["aria-activedescendant"], "aria-autocomplete": props["aria-autocomplete"], "aria-required": props["aria-required"], onChange: handleChange, onBlur: handleBlur, onFocus: handleFocus, onKeyDown: handleKeyDown }),
|
|
208
196
|
React__default.createElement(MaskElement, { isMasking: isMasking, formattedValue: formattedValue, placeholderMask: placeholderMask }),
|
|
209
197
|
React__default.createElement(FormFieldPostFix, { variation: "spinner", visible: (_e = props.loading) !== null && _e !== void 0 ? _e : false })));
|
|
210
198
|
});
|
|
@@ -24,11 +24,11 @@ export declare const InputText: React.ForwardRefExoticComponent<({
|
|
|
24
24
|
readonly toolbar?: React.ReactNode;
|
|
25
25
|
readonly defaultValue?: (string | Date) | undefined;
|
|
26
26
|
readonly prefix?: import("../FormField").Affix | undefined;
|
|
27
|
+
readonly maxLength?: number | undefined;
|
|
27
28
|
readonly autofocus?: boolean | undefined;
|
|
28
29
|
readonly autocomplete?: (boolean | import("../FormField").AutocompleteTypes) | undefined;
|
|
29
30
|
inputRef?: React.RefObject<HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement> | undefined;
|
|
30
31
|
readonly keyboard?: ("numeric" | "decimal") | undefined;
|
|
31
|
-
readonly maxLength?: number | undefined;
|
|
32
32
|
readonly suffix?: import("ts-xor").XOR<import("../FormField").Affix, import("../FormField").Suffix> | undefined;
|
|
33
33
|
onEnter?: ((event: React.KeyboardEvent) => void) | undefined;
|
|
34
34
|
readonly readonly?: boolean | undefined;
|
|
@@ -58,11 +58,11 @@ export declare const InputText: React.ForwardRefExoticComponent<({
|
|
|
58
58
|
readonly toolbar?: React.ReactNode;
|
|
59
59
|
readonly defaultValue?: (string | Date) | undefined;
|
|
60
60
|
readonly prefix?: import("../FormField").Affix | undefined;
|
|
61
|
+
readonly maxLength?: number | undefined;
|
|
61
62
|
readonly autofocus?: boolean | undefined;
|
|
62
63
|
readonly autocomplete?: (boolean | import("../FormField").AutocompleteTypes) | undefined;
|
|
63
64
|
inputRef?: React.RefObject<HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement> | undefined;
|
|
64
65
|
readonly keyboard?: ("numeric" | "decimal") | undefined;
|
|
65
|
-
readonly maxLength?: number | undefined;
|
|
66
66
|
readonly suffix?: import("ts-xor").XOR<import("../FormField").Affix, import("../FormField").Suffix> | undefined;
|
|
67
67
|
onEnter?: ((event: React.KeyboardEvent) => void) | undefined;
|
|
68
68
|
readonly readonly?: boolean | undefined;
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import type { Clearable } from "@jobber/hooks";
|
|
2
1
|
import type { XOR } from "ts-xor";
|
|
3
|
-
import type {
|
|
2
|
+
import type { CommonFormFieldProps, FocusEvents, FormFieldProps, FormFieldTypes, HTMLInputBaseProps, KeyboardEvents, RebuiltInputCommonProps } from "../FormField";
|
|
4
3
|
export interface RowRange {
|
|
5
4
|
min: number;
|
|
6
5
|
max: number;
|
|
@@ -10,15 +9,7 @@ export type InputTextVersion = 1 | 2 | undefined;
|
|
|
10
9
|
* Experimental version 2 of the InputText component.
|
|
11
10
|
* Do not use unless you have talked with Atlantis first.
|
|
12
11
|
*/
|
|
13
|
-
export interface InputTextRebuiltProps extends
|
|
14
|
-
readonly error?: string;
|
|
15
|
-
readonly invalid?: boolean;
|
|
16
|
-
readonly identifier?: string;
|
|
17
|
-
readonly autocomplete?: boolean | AutocompleteTypes;
|
|
18
|
-
readonly loading?: boolean;
|
|
19
|
-
readonly onKeyUp?: (event: React.KeyboardEvent<HTMLInputElement>) => void;
|
|
20
|
-
readonly children?: React.ReactNode;
|
|
21
|
-
readonly clearable?: Clearable;
|
|
12
|
+
export interface InputTextRebuiltProps extends HTMLInputBaseProps, FocusEvents<HTMLInputElement | HTMLTextAreaElement>, KeyboardEvents<HTMLInputElement | HTMLTextAreaElement>, RebuiltInputCommonProps {
|
|
22
13
|
/**
|
|
23
14
|
* Use this when you're expecting a long answer.
|
|
24
15
|
*/
|
|
@@ -30,24 +21,48 @@ export interface InputTextRebuiltProps extends Omit<React.InputHTMLAttributes<HT
|
|
|
30
21
|
* maximum number of visible rows.
|
|
31
22
|
*/
|
|
32
23
|
readonly rows?: number | RowRange;
|
|
24
|
+
/**
|
|
25
|
+
* Determines what kind of form field should the component give you.
|
|
26
|
+
*/
|
|
33
27
|
readonly type?: FormFieldTypes;
|
|
34
28
|
/**
|
|
35
|
-
*
|
|
29
|
+
* Toolbar to render content below the input.
|
|
30
|
+
*/
|
|
31
|
+
readonly toolbar?: React.ReactNode;
|
|
32
|
+
/**
|
|
33
|
+
* Determines the visibility of the toolbar.
|
|
34
|
+
*/
|
|
35
|
+
readonly toolbarVisibility?: "always" | "while-editing";
|
|
36
|
+
/**
|
|
37
|
+
* The current value of the input.
|
|
38
|
+
*/
|
|
39
|
+
readonly value: string;
|
|
40
|
+
/**
|
|
41
|
+
* Custom onChange handler that provides the new value as the first argument.
|
|
36
42
|
*/
|
|
37
|
-
readonly version: 2;
|
|
38
43
|
readonly onChange?: (newValue: string, event?: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => void;
|
|
44
|
+
/**
|
|
45
|
+
* A callback to handle "Enter" keypress. This will only run
|
|
46
|
+
* if Enter is the only key. Will not run if Shift or Control
|
|
47
|
+
* are being held.
|
|
48
|
+
*/
|
|
39
49
|
readonly onEnter?: FormFieldProps["onEnter"];
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
readonly
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
readonly
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
50
|
+
/**
|
|
51
|
+
* @deprecated Use `id` instead. This prop will be removed in a future version.
|
|
52
|
+
*/
|
|
53
|
+
readonly identifier?: string;
|
|
54
|
+
/**
|
|
55
|
+
* @deprecated Use `autoComplete` with string values instead. This prop will be removed in a future version.
|
|
56
|
+
*/
|
|
57
|
+
readonly autocomplete?: never;
|
|
58
|
+
/**
|
|
59
|
+
* @deprecated Use `aria-label` instead. This prop will be removed in a future version.
|
|
60
|
+
*/
|
|
61
|
+
readonly ariaLabel?: never;
|
|
62
|
+
/**
|
|
63
|
+
* @deprecated Use `readOnly` instead. This prop will be removed in a future version.
|
|
64
|
+
*/
|
|
65
|
+
readonly readonly?: never;
|
|
51
66
|
}
|
|
52
67
|
interface BaseProps extends CommonFormFieldProps, Pick<FormFieldProps, "autofocus" | "maxLength" | "readonly" | "autocomplete" | "keyboard" | "onEnter" | "onFocus" | "onBlur" | "onChange" | "inputRef" | "validations" | "defaultValue" | "prefix" | "suffix" | "toolbar" | "toolbarVisibility" | "version"> {
|
|
53
68
|
multiline?: boolean;
|
package/dist/InputText/index.cjs
CHANGED
|
@@ -4,12 +4,11 @@ var React = require('react');
|
|
|
4
4
|
var jobberHooks = require('@jobber/hooks');
|
|
5
5
|
var FormField = require('../FormField-cjs.js');
|
|
6
6
|
require('classnames');
|
|
7
|
-
|
|
7
|
+
require('../tslib.es6-cjs.js');
|
|
8
8
|
require('react-hook-form');
|
|
9
9
|
require('framer-motion');
|
|
10
10
|
require('@jobber/design');
|
|
11
11
|
require('../Button-cjs.js');
|
|
12
|
-
var omit = require('../omit-cjs.js');
|
|
13
12
|
require('../Icon-cjs.js');
|
|
14
13
|
require('../Text-cjs.js');
|
|
15
14
|
require('../Typography-cjs.js');
|
|
@@ -17,17 +16,6 @@ require('../useFormFieldFocus-cjs.js');
|
|
|
17
16
|
require('../InputValidation-cjs.js');
|
|
18
17
|
require('../Spinner-cjs.js');
|
|
19
18
|
require('react-router-dom');
|
|
20
|
-
require('../_commonjsHelpers-cjs.js');
|
|
21
|
-
require('../_baseGet-cjs.js');
|
|
22
|
-
require('../isTypedArray-cjs.js');
|
|
23
|
-
require('../isObjectLike-cjs.js');
|
|
24
|
-
require('../identity-cjs.js');
|
|
25
|
-
require('../_getTag-cjs.js');
|
|
26
|
-
require('../isSymbol-cjs.js');
|
|
27
|
-
require('../keysIn-cjs.js');
|
|
28
|
-
require('../_baseAssignValue-cjs.js');
|
|
29
|
-
require('../_baseFlatten-cjs.js');
|
|
30
|
-
require('../_setToString-cjs.js');
|
|
31
19
|
|
|
32
20
|
/**
|
|
33
21
|
* Hook for resizing a textarea based on its content. The textarea will grow up to the max number of rows specified.
|
|
@@ -162,7 +150,7 @@ function insertAtCursor(input, newText) {
|
|
|
162
150
|
function useInputTextActions({ onChange, inputRef, onEnter, onFocus, onBlur, onKeyDown, }) {
|
|
163
151
|
function handleClear() {
|
|
164
152
|
var _a;
|
|
165
|
-
|
|
153
|
+
// Don't call blur handler when programmatically clearing
|
|
166
154
|
onChange && onChange("");
|
|
167
155
|
(_a = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
|
|
168
156
|
}
|
|
@@ -196,23 +184,10 @@ function useInputTextActions({ onChange, inputRef, onEnter, onFocus, onBlur, onK
|
|
|
196
184
|
};
|
|
197
185
|
}
|
|
198
186
|
|
|
199
|
-
/**
|
|
200
|
-
* Provides the props for the html fields rendered by the html input.
|
|
201
|
-
* DO not repeat this pattern. We are doing this as a proof of concept relating to the refactoring of Form inputs to see what can be removed.
|
|
202
|
-
*/
|
|
203
|
-
function useInputTextFormField(_a) {
|
|
204
|
-
var { id, name, description, inline, handleChange, handleBlur, handleFocus, handleKeyDown, error } = _a, rest = tslib_es6.__rest(_a, ["id", "name", "description", "inline", "handleChange", "handleBlur", "handleFocus", "handleKeyDown", "error"]);
|
|
205
|
-
const descriptionIdentifier = `descriptionUUID--${id}`;
|
|
206
|
-
const fieldProps = Object.assign(Object.assign(Object.assign(Object.assign({}, rest), { id, className: FormField.styles.input, name, disabled: rest.disabled, inputMode: rest.inputMode, onChange: handleChange, onBlur: handleBlur, onFocus: handleFocus }), (description &&
|
|
207
|
-
!inline && { "aria-describedby": descriptionIdentifier })), { "aria-invalid": rest["aria-invalid"] || error || rest.invalid ? true : undefined, autoFocus: rest.autoFocus, invalid: error || rest.invalid ? "true" : undefined, onKeyDown: handleKeyDown });
|
|
208
|
-
return { fieldProps, descriptionIdentifier };
|
|
209
|
-
}
|
|
210
|
-
|
|
211
187
|
const InputTextSPAR = React.forwardRef(function InputTextInternal(props, inputRefs) {
|
|
212
188
|
var _a, _b, _c;
|
|
213
189
|
const inputTextRef = React.useRef(null);
|
|
214
190
|
const wrapperRef = React.useRef(null);
|
|
215
|
-
const legacyPropHelper = Object.assign(Object.assign({}, props), { version: 1 });
|
|
216
191
|
const id = useInputTextId(props);
|
|
217
192
|
const { rowRange } = useTextAreaResize({
|
|
218
193
|
rows: props.rows,
|
|
@@ -220,8 +195,19 @@ const InputTextSPAR = React.forwardRef(function InputTextInternal(props, inputRe
|
|
|
220
195
|
inputRef: inputTextRef,
|
|
221
196
|
wrapperRef: wrapperRef,
|
|
222
197
|
});
|
|
223
|
-
const
|
|
224
|
-
|
|
198
|
+
const { inputStyle } = FormField.useFormFieldWrapperStyles({
|
|
199
|
+
size: props.size,
|
|
200
|
+
align: props.align,
|
|
201
|
+
placeholder: props.placeholder,
|
|
202
|
+
value: props.value,
|
|
203
|
+
invalid: props.invalid,
|
|
204
|
+
error: props.error,
|
|
205
|
+
max: typeof props.max === "string" ? parseFloat(props.max) : props.max,
|
|
206
|
+
maxLength: undefined, // v2: maxLength is for HTML validation only, not for width styling
|
|
207
|
+
type: props.multiline ? "textarea" : "text",
|
|
208
|
+
disabled: props.disabled,
|
|
209
|
+
inline: props.inline,
|
|
210
|
+
});
|
|
225
211
|
const { name } = FormField.useAtlantisFormFieldName({
|
|
226
212
|
nameProp: props.name,
|
|
227
213
|
id: id,
|
|
@@ -234,40 +220,25 @@ const InputTextSPAR = React.forwardRef(function InputTextInternal(props, inputRe
|
|
|
234
220
|
onEnter: props.onEnter,
|
|
235
221
|
inputRef: inputTextRef,
|
|
236
222
|
});
|
|
237
|
-
const
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
"onFocus",
|
|
241
|
-
"onEnter",
|
|
242
|
-
"size",
|
|
243
|
-
"placeholder",
|
|
244
|
-
"multiline",
|
|
245
|
-
"prefix",
|
|
246
|
-
"suffix",
|
|
247
|
-
"version",
|
|
248
|
-
]);
|
|
249
|
-
const { fieldProps, descriptionIdentifier } = useInputTextFormField(Object.assign(Object.assign({}, inputProps), { id,
|
|
250
|
-
name,
|
|
251
|
-
handleChange,
|
|
252
|
-
handleBlur,
|
|
253
|
-
handleFocus,
|
|
254
|
-
handleKeyDown }));
|
|
223
|
+
const descriptionIdentifier = `descriptionUUID--${id}`;
|
|
224
|
+
const hasDescription = props.description && !props.inline;
|
|
225
|
+
const isInvalid = Boolean(props["aria-invalid"] || props.error || props.invalid);
|
|
255
226
|
return (React.createElement(FormField.FormFieldWrapper, { disabled: props.disabled, size: props.size, align: props.align, inline: props.inline, autofocus: props.autoFocus, name: name, wrapperRef: wrapperRef, error: (_a = props.error) !== null && _a !== void 0 ? _a : "", invalid: Boolean(props.error || props.invalid), identifier: id, descriptionIdentifier: descriptionIdentifier, description: props.description, clearable: (_b = props.clearable) !== null && _b !== void 0 ? _b : "never", onClear: handleClear, type: props.multiline ? "textarea" : "text", placeholder: props.placeholder, value: props.value, prefix: props.prefix, suffix: props.suffix, rows: rowRange.min, toolbar: props.toolbar, toolbarVisibility: props.toolbarVisibility },
|
|
256
227
|
React.createElement(React.Fragment, null,
|
|
257
|
-
|
|
228
|
+
props.multiline ? (React.createElement(TextArea, { id: id, name: name, className: inputStyle, value: props.value, rows: rowRange.min, disabled: props.disabled, readOnly: props.readOnly, required: props.required, autoFocus: props.autoFocus, autoComplete: props.autoComplete, maxLength: props.maxLength, minLength: props.minLength, inputMode: props.inputMode, tabIndex: props.tabIndex, role: props.role, "aria-label": props["aria-label"], "aria-describedby": hasDescription ? descriptionIdentifier : props["aria-describedby"], "aria-invalid": isInvalid ? true : undefined, "aria-controls": props["aria-controls"], "aria-expanded": props["aria-expanded"], "aria-activedescendant": props["aria-activedescendant"], "aria-autocomplete": props["aria-autocomplete"], "aria-required": props["aria-required"], invalid: isInvalid ? "true" : undefined, onChange: handleChange, onBlur: handleBlur, onFocus: handleFocus, onKeyDown: handleKeyDown, onKeyUp: props.onKeyUp, ref: FormField.mergeRefs([inputRefs, inputTextRef]) })) : (React.createElement(TextInput, { id: id, name: name, className: inputStyle, value: props.value, disabled: props.disabled, readOnly: props.readOnly, required: props.required, autoFocus: props.autoFocus, autoComplete: props.autoComplete, maxLength: props.maxLength, minLength: props.minLength, max: props.max, min: props.min, pattern: props.pattern, inputMode: props.inputMode, tabIndex: props.tabIndex, role: props.role, "aria-label": props["aria-label"], "aria-describedby": hasDescription ? descriptionIdentifier : props["aria-describedby"], "aria-invalid": isInvalid ? true : undefined, "aria-controls": props["aria-controls"], "aria-expanded": props["aria-expanded"], "aria-activedescendant": props["aria-activedescendant"], "aria-autocomplete": props["aria-autocomplete"], "aria-required": props["aria-required"], invalid: isInvalid ? "true" : undefined, onChange: handleChange, onBlur: handleBlur, onFocus: handleFocus, onKeyDown: handleKeyDown, onKeyUp: props.onKeyUp, ref: FormField.mergeRefs([inputRefs, inputTextRef]) })),
|
|
258
229
|
React.createElement(FormField.FormFieldPostFix, { variation: "spinner", visible: (_c = props.loading) !== null && _c !== void 0 ? _c : false }),
|
|
259
230
|
props.children)));
|
|
260
231
|
});
|
|
261
232
|
function useInputTextId(props) {
|
|
262
233
|
const generatedId = React.useId();
|
|
263
|
-
return props.id || generatedId;
|
|
264
|
-
}
|
|
265
|
-
function TextArea({ fieldProps, rowRange, inputRefs, value, inputStyle, }) {
|
|
266
|
-
return (React.createElement("textarea", Object.assign({}, fieldProps, { rows: rowRange.min, ref: FormField.mergeRefs(inputRefs), className: inputStyle, value: value })));
|
|
267
|
-
}
|
|
268
|
-
function TextInput({ fieldProps, inputRefs, value, inputStyle, }) {
|
|
269
|
-
return (React.createElement("input", Object.assign({}, fieldProps, { ref: FormField.mergeRefs(inputRefs), className: inputStyle, value: value })));
|
|
234
|
+
return props.identifier || props.id || generatedId;
|
|
270
235
|
}
|
|
236
|
+
const TextArea = React.forwardRef(function TextArea(props, ref) {
|
|
237
|
+
return React.createElement("textarea", Object.assign({}, props, { ref: ref }));
|
|
238
|
+
});
|
|
239
|
+
const TextInput = React.forwardRef(function TextInput(props, ref) {
|
|
240
|
+
return React.createElement("input", Object.assign({}, props, { ref: ref }));
|
|
241
|
+
});
|
|
271
242
|
|
|
272
243
|
function isNewInputTextProps(props) {
|
|
273
244
|
return props.version === 2;
|
package/dist/InputText/index.mjs
CHANGED
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
import React__default, { forwardRef, useRef, useImperativeHandle, useId } from 'react';
|
|
2
2
|
import { useSafeLayoutEffect } from '@jobber/hooks';
|
|
3
|
-
import { k as FormField,
|
|
3
|
+
import { k as FormField, j as useFormFieldWrapperStyles, b as useAtlantisFormFieldName, f as FormFieldWrapper, m as mergeRefs, l as FormFieldPostFix } from '../FormField-es.js';
|
|
4
4
|
import 'classnames';
|
|
5
|
-
import
|
|
5
|
+
import '../tslib.es6-es.js';
|
|
6
6
|
import 'react-hook-form';
|
|
7
7
|
import 'framer-motion';
|
|
8
8
|
import '@jobber/design';
|
|
9
9
|
import '../Button-es.js';
|
|
10
|
-
import { o as omit } from '../omit-es.js';
|
|
11
10
|
import '../Icon-es.js';
|
|
12
11
|
import '../Text-es.js';
|
|
13
12
|
import '../Typography-es.js';
|
|
@@ -15,17 +14,6 @@ import '../useFormFieldFocus-es.js';
|
|
|
15
14
|
import '../InputValidation-es.js';
|
|
16
15
|
import '../Spinner-es.js';
|
|
17
16
|
import 'react-router-dom';
|
|
18
|
-
import '../_commonjsHelpers-es.js';
|
|
19
|
-
import '../_baseGet-es.js';
|
|
20
|
-
import '../isTypedArray-es.js';
|
|
21
|
-
import '../isObjectLike-es.js';
|
|
22
|
-
import '../identity-es.js';
|
|
23
|
-
import '../_getTag-es.js';
|
|
24
|
-
import '../isSymbol-es.js';
|
|
25
|
-
import '../keysIn-es.js';
|
|
26
|
-
import '../_baseAssignValue-es.js';
|
|
27
|
-
import '../_baseFlatten-es.js';
|
|
28
|
-
import '../_setToString-es.js';
|
|
29
17
|
|
|
30
18
|
/**
|
|
31
19
|
* Hook for resizing a textarea based on its content. The textarea will grow up to the max number of rows specified.
|
|
@@ -160,7 +148,7 @@ function insertAtCursor(input, newText) {
|
|
|
160
148
|
function useInputTextActions({ onChange, inputRef, onEnter, onFocus, onBlur, onKeyDown, }) {
|
|
161
149
|
function handleClear() {
|
|
162
150
|
var _a;
|
|
163
|
-
|
|
151
|
+
// Don't call blur handler when programmatically clearing
|
|
164
152
|
onChange && onChange("");
|
|
165
153
|
(_a = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === null || _a === void 0 ? void 0 : _a.focus();
|
|
166
154
|
}
|
|
@@ -194,23 +182,10 @@ function useInputTextActions({ onChange, inputRef, onEnter, onFocus, onBlur, onK
|
|
|
194
182
|
};
|
|
195
183
|
}
|
|
196
184
|
|
|
197
|
-
/**
|
|
198
|
-
* Provides the props for the html fields rendered by the html input.
|
|
199
|
-
* DO not repeat this pattern. We are doing this as a proof of concept relating to the refactoring of Form inputs to see what can be removed.
|
|
200
|
-
*/
|
|
201
|
-
function useInputTextFormField(_a) {
|
|
202
|
-
var { id, name, description, inline, handleChange, handleBlur, handleFocus, handleKeyDown, error } = _a, rest = __rest(_a, ["id", "name", "description", "inline", "handleChange", "handleBlur", "handleFocus", "handleKeyDown", "error"]);
|
|
203
|
-
const descriptionIdentifier = `descriptionUUID--${id}`;
|
|
204
|
-
const fieldProps = Object.assign(Object.assign(Object.assign(Object.assign({}, rest), { id, className: styles.input, name, disabled: rest.disabled, inputMode: rest.inputMode, onChange: handleChange, onBlur: handleBlur, onFocus: handleFocus }), (description &&
|
|
205
|
-
!inline && { "aria-describedby": descriptionIdentifier })), { "aria-invalid": rest["aria-invalid"] || error || rest.invalid ? true : undefined, autoFocus: rest.autoFocus, invalid: error || rest.invalid ? "true" : undefined, onKeyDown: handleKeyDown });
|
|
206
|
-
return { fieldProps, descriptionIdentifier };
|
|
207
|
-
}
|
|
208
|
-
|
|
209
185
|
const InputTextSPAR = forwardRef(function InputTextInternal(props, inputRefs) {
|
|
210
186
|
var _a, _b, _c;
|
|
211
187
|
const inputTextRef = React__default.useRef(null);
|
|
212
188
|
const wrapperRef = React__default.useRef(null);
|
|
213
|
-
const legacyPropHelper = Object.assign(Object.assign({}, props), { version: 1 });
|
|
214
189
|
const id = useInputTextId(props);
|
|
215
190
|
const { rowRange } = useTextAreaResize({
|
|
216
191
|
rows: props.rows,
|
|
@@ -218,8 +193,19 @@ const InputTextSPAR = forwardRef(function InputTextInternal(props, inputRefs) {
|
|
|
218
193
|
inputRef: inputTextRef,
|
|
219
194
|
wrapperRef: wrapperRef,
|
|
220
195
|
});
|
|
221
|
-
const
|
|
222
|
-
|
|
196
|
+
const { inputStyle } = useFormFieldWrapperStyles({
|
|
197
|
+
size: props.size,
|
|
198
|
+
align: props.align,
|
|
199
|
+
placeholder: props.placeholder,
|
|
200
|
+
value: props.value,
|
|
201
|
+
invalid: props.invalid,
|
|
202
|
+
error: props.error,
|
|
203
|
+
max: typeof props.max === "string" ? parseFloat(props.max) : props.max,
|
|
204
|
+
maxLength: undefined, // v2: maxLength is for HTML validation only, not for width styling
|
|
205
|
+
type: props.multiline ? "textarea" : "text",
|
|
206
|
+
disabled: props.disabled,
|
|
207
|
+
inline: props.inline,
|
|
208
|
+
});
|
|
223
209
|
const { name } = useAtlantisFormFieldName({
|
|
224
210
|
nameProp: props.name,
|
|
225
211
|
id: id,
|
|
@@ -232,40 +218,25 @@ const InputTextSPAR = forwardRef(function InputTextInternal(props, inputRefs) {
|
|
|
232
218
|
onEnter: props.onEnter,
|
|
233
219
|
inputRef: inputTextRef,
|
|
234
220
|
});
|
|
235
|
-
const
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
"onFocus",
|
|
239
|
-
"onEnter",
|
|
240
|
-
"size",
|
|
241
|
-
"placeholder",
|
|
242
|
-
"multiline",
|
|
243
|
-
"prefix",
|
|
244
|
-
"suffix",
|
|
245
|
-
"version",
|
|
246
|
-
]);
|
|
247
|
-
const { fieldProps, descriptionIdentifier } = useInputTextFormField(Object.assign(Object.assign({}, inputProps), { id,
|
|
248
|
-
name,
|
|
249
|
-
handleChange,
|
|
250
|
-
handleBlur,
|
|
251
|
-
handleFocus,
|
|
252
|
-
handleKeyDown }));
|
|
221
|
+
const descriptionIdentifier = `descriptionUUID--${id}`;
|
|
222
|
+
const hasDescription = props.description && !props.inline;
|
|
223
|
+
const isInvalid = Boolean(props["aria-invalid"] || props.error || props.invalid);
|
|
253
224
|
return (React__default.createElement(FormFieldWrapper, { disabled: props.disabled, size: props.size, align: props.align, inline: props.inline, autofocus: props.autoFocus, name: name, wrapperRef: wrapperRef, error: (_a = props.error) !== null && _a !== void 0 ? _a : "", invalid: Boolean(props.error || props.invalid), identifier: id, descriptionIdentifier: descriptionIdentifier, description: props.description, clearable: (_b = props.clearable) !== null && _b !== void 0 ? _b : "never", onClear: handleClear, type: props.multiline ? "textarea" : "text", placeholder: props.placeholder, value: props.value, prefix: props.prefix, suffix: props.suffix, rows: rowRange.min, toolbar: props.toolbar, toolbarVisibility: props.toolbarVisibility },
|
|
254
225
|
React__default.createElement(React__default.Fragment, null,
|
|
255
|
-
|
|
226
|
+
props.multiline ? (React__default.createElement(TextArea, { id: id, name: name, className: inputStyle, value: props.value, rows: rowRange.min, disabled: props.disabled, readOnly: props.readOnly, required: props.required, autoFocus: props.autoFocus, autoComplete: props.autoComplete, maxLength: props.maxLength, minLength: props.minLength, inputMode: props.inputMode, tabIndex: props.tabIndex, role: props.role, "aria-label": props["aria-label"], "aria-describedby": hasDescription ? descriptionIdentifier : props["aria-describedby"], "aria-invalid": isInvalid ? true : undefined, "aria-controls": props["aria-controls"], "aria-expanded": props["aria-expanded"], "aria-activedescendant": props["aria-activedescendant"], "aria-autocomplete": props["aria-autocomplete"], "aria-required": props["aria-required"], invalid: isInvalid ? "true" : undefined, onChange: handleChange, onBlur: handleBlur, onFocus: handleFocus, onKeyDown: handleKeyDown, onKeyUp: props.onKeyUp, ref: mergeRefs([inputRefs, inputTextRef]) })) : (React__default.createElement(TextInput, { id: id, name: name, className: inputStyle, value: props.value, disabled: props.disabled, readOnly: props.readOnly, required: props.required, autoFocus: props.autoFocus, autoComplete: props.autoComplete, maxLength: props.maxLength, minLength: props.minLength, max: props.max, min: props.min, pattern: props.pattern, inputMode: props.inputMode, tabIndex: props.tabIndex, role: props.role, "aria-label": props["aria-label"], "aria-describedby": hasDescription ? descriptionIdentifier : props["aria-describedby"], "aria-invalid": isInvalid ? true : undefined, "aria-controls": props["aria-controls"], "aria-expanded": props["aria-expanded"], "aria-activedescendant": props["aria-activedescendant"], "aria-autocomplete": props["aria-autocomplete"], "aria-required": props["aria-required"], invalid: isInvalid ? "true" : undefined, onChange: handleChange, onBlur: handleBlur, onFocus: handleFocus, onKeyDown: handleKeyDown, onKeyUp: props.onKeyUp, ref: mergeRefs([inputRefs, inputTextRef]) })),
|
|
256
227
|
React__default.createElement(FormFieldPostFix, { variation: "spinner", visible: (_c = props.loading) !== null && _c !== void 0 ? _c : false }),
|
|
257
228
|
props.children)));
|
|
258
229
|
});
|
|
259
230
|
function useInputTextId(props) {
|
|
260
231
|
const generatedId = useId();
|
|
261
|
-
return props.id || generatedId;
|
|
262
|
-
}
|
|
263
|
-
function TextArea({ fieldProps, rowRange, inputRefs, value, inputStyle, }) {
|
|
264
|
-
return (React__default.createElement("textarea", Object.assign({}, fieldProps, { rows: rowRange.min, ref: mergeRefs(inputRefs), className: inputStyle, value: value })));
|
|
265
|
-
}
|
|
266
|
-
function TextInput({ fieldProps, inputRefs, value, inputStyle, }) {
|
|
267
|
-
return (React__default.createElement("input", Object.assign({}, fieldProps, { ref: mergeRefs(inputRefs), className: inputStyle, value: value })));
|
|
232
|
+
return props.identifier || props.id || generatedId;
|
|
268
233
|
}
|
|
234
|
+
const TextArea = forwardRef(function TextArea(props, ref) {
|
|
235
|
+
return React__default.createElement("textarea", Object.assign({}, props, { ref: ref }));
|
|
236
|
+
});
|
|
237
|
+
const TextInput = forwardRef(function TextInput(props, ref) {
|
|
238
|
+
return React__default.createElement("input", Object.assign({}, props, { ref: ref }));
|
|
239
|
+
});
|
|
269
240
|
|
|
270
241
|
function isNewInputTextProps(props) {
|
|
271
242
|
return props.version === 2;
|
|
@@ -12,5 +12,5 @@ export declare function useInputTextActions({ onChange, inputRef, onEnter, onFoc
|
|
|
12
12
|
handleChange: (event: ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) => void;
|
|
13
13
|
handleKeyDown: (event: KeyboardEvent<HTMLInputElement | HTMLTextAreaElement>) => void;
|
|
14
14
|
handleFocus: (event: FocusEvent<HTMLInputElement | HTMLTextAreaElement>) => void;
|
|
15
|
-
handleBlur: (event
|
|
15
|
+
handleBlur: (event: FocusEvent<HTMLInputElement | HTMLTextAreaElement>) => void;
|
|
16
16
|
};
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import React from "react";
|
|
2
2
|
import type { InputTimeRebuiltProps } from "./InputTime.types";
|
|
3
|
-
export declare
|
|
3
|
+
export declare const InputTimeRebuilt: React.ForwardRefExoticComponent<InputTimeRebuiltProps & React.RefAttributes<HTMLInputElement>>;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { CommonFormFieldProps, FormFieldProps } from "../FormField";
|
|
2
|
+
import type { AriaInputProps, FocusEvents, KeyboardEvents } from "../FormField/FormFieldTypes";
|
|
2
3
|
export interface InputTimeProps extends Pick<CommonFormFieldProps, "id" | "align" | "description" | "disabled" | "invalid" | "inline" | "loading" | "name" | "onValidation" | "placeholder" | "size" | "clearable">, Pick<FormFieldProps, "maxLength" | "readonly" | "autocomplete" | "max" | "min" | "onEnter" | "onFocus" | "onBlur" | "inputRef" | "validations"> {
|
|
3
4
|
/**
|
|
4
5
|
* Intial value of the input. Only use this when you need to prepopulate the
|
|
@@ -18,10 +19,37 @@ export interface InputTimeProps extends Pick<CommonFormFieldProps, "id" | "align
|
|
|
18
19
|
export interface InputTimeLegacyProps extends InputTimeProps {
|
|
19
20
|
version?: 1;
|
|
20
21
|
}
|
|
21
|
-
export interface InputTimeRebuiltProps extends Omit<InputTimeProps, "defaultValue" | "version" | "validations" | "onValidation"> {
|
|
22
|
+
export interface InputTimeRebuiltProps extends Omit<InputTimeProps, "defaultValue" | "version" | "validations" | "onValidation" | "readonly" | "autocomplete" | "inputRef" | "onFocus" | "onBlur" | "onEnter">, AriaInputProps, FocusEvents<HTMLInputElement>, KeyboardEvents<HTMLInputElement> {
|
|
22
23
|
/**
|
|
23
24
|
* Version 2 is highly experimental, avoid using it unless you have talked with Atlantis first.
|
|
24
25
|
*/
|
|
25
26
|
version: 2;
|
|
27
|
+
/**
|
|
28
|
+
* Error message to display.
|
|
29
|
+
*/
|
|
26
30
|
error?: string;
|
|
31
|
+
/**
|
|
32
|
+
* @deprecated Use `readOnly` (camelCase) instead.
|
|
33
|
+
*/
|
|
34
|
+
readonly readonly?: boolean;
|
|
35
|
+
/**
|
|
36
|
+
* Whether the input is read-only.
|
|
37
|
+
*/
|
|
38
|
+
readonly readOnly?: boolean;
|
|
39
|
+
/**
|
|
40
|
+
* @deprecated Use `autoComplete` (camelCase) instead.
|
|
41
|
+
*/
|
|
42
|
+
readonly autocomplete?: boolean;
|
|
43
|
+
/**
|
|
44
|
+
* HTML autocomplete attribute for browser autofill.
|
|
45
|
+
*/
|
|
46
|
+
readonly autoComplete?: string;
|
|
47
|
+
/**
|
|
48
|
+
* @deprecated Use `ref` instead. Note: `ref` support requires React 18+ forwardRef.
|
|
49
|
+
*/
|
|
50
|
+
readonly inputRef?: FormFieldProps["inputRef"];
|
|
51
|
+
/**
|
|
52
|
+
* @deprecated Use `onKeyDown` or `onKeyUp` instead.
|
|
53
|
+
*/
|
|
54
|
+
readonly onEnter?: FormFieldProps["onEnter"];
|
|
27
55
|
}
|