@cdx-ui/utils 0.0.1-beta.7 → 0.0.1-beta.70
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/README.md +45 -22
- package/lib/commonjs/common/mergeRefs.js +39 -1
- package/lib/commonjs/common/mergeRefs.js.map +1 -1
- package/lib/commonjs/form-control/index.js +6 -0
- package/lib/commonjs/form-control/index.js.map +1 -1
- package/lib/commonjs/form-control/useFormControl.js +33 -0
- package/lib/commonjs/form-control/useFormControl.js.map +1 -1
- package/lib/module/common/mergeRefs.js +39 -1
- package/lib/module/common/mergeRefs.js.map +1 -1
- package/lib/module/form-control/index.js +1 -1
- package/lib/module/form-control/index.js.map +1 -1
- package/lib/module/form-control/useFormControl.js +33 -0
- package/lib/module/form-control/useFormControl.js.map +1 -1
- package/lib/typescript/common/mergeRefs.d.ts +8 -0
- package/lib/typescript/common/mergeRefs.d.ts.map +1 -1
- package/lib/typescript/form-control/index.d.ts +1 -1
- package/lib/typescript/form-control/index.d.ts.map +1 -1
- package/lib/typescript/form-control/useFormControl.d.ts +28 -3
- package/lib/typescript/form-control/useFormControl.d.ts.map +1 -1
- package/package.json +4 -2
- package/src/common/accessibilityUtils.test.ts +12 -0
- package/src/common/cn.test.ts +19 -0
- package/src/common/composeEventHandlers.test.ts +35 -0
- package/src/common/getSpacedChild.test.tsx +64 -0
- package/src/common/mergeRefs.test.ts +148 -0
- package/src/common/mergeRefs.ts +45 -2
- package/src/common/useControllableState.test.tsx +90 -0
- package/src/context/createContext.test.tsx +31 -0
- package/src/form-control/index.ts +2 -0
- package/src/form-control/useFormControl.test.tsx +214 -0
- package/src/form-control/useFormControl.tsx +48 -4
- package/src/style/context/index.test.tsx +31 -0
- package/src/style/withStyleContext/index.test.tsx +55 -0
package/README.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# @cdx-ui/utils
|
|
2
2
|
|
|
3
|
-
Shared utilities used across
|
|
3
|
+
Shared utilities used across FDS packages.
|
|
4
4
|
|
|
5
5
|
Provides common helpers for styling, event handling, state management, and context propagation used by [`@cdx-ui/primitives`](../primitives/) and [`@cdx-ui/components`](../components/).
|
|
6
6
|
|
|
@@ -14,42 +14,65 @@ pnpm add @cdx-ui/utils
|
|
|
14
14
|
|
|
15
15
|
### Common helpers
|
|
16
16
|
|
|
17
|
-
| Export
|
|
18
|
-
|
|
|
19
|
-
| `cn(...inputs)`
|
|
20
|
-
| `composeEventHandlers(...handlers)` | Chains multiple event callbacks into a single handler; skips `null`/`undefined` entries.
|
|
21
|
-
| `useControllableState(params)`
|
|
22
|
-
| `mergeRefs(...refs)`
|
|
23
|
-
| `flattenChildren(children)`
|
|
24
|
-
| `ariaAttr(condition)`
|
|
17
|
+
| Export | Description |
|
|
18
|
+
| ----------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------ |
|
|
19
|
+
| `cn(...inputs)` | Merges class names with `clsx` + `tailwind-merge` — conditionals and conflict resolution in one call. |
|
|
20
|
+
| `composeEventHandlers(...handlers)` | Chains multiple event callbacks into a single handler; skips `null`/`undefined` entries. |
|
|
21
|
+
| `useControllableState(params)` | Hook that supports both controlled and uncontrolled modes for a single value. Derives `isControlled` from whether the prop is `undefined`. |
|
|
22
|
+
| `mergeRefs(...refs)` | Combines multiple refs (callback or object) into one ref callback. |
|
|
23
|
+
| `flattenChildren(children)` | Recursively flattens React `children` (including Fragments) into a flat array with re-keyed elements. |
|
|
24
|
+
| `ariaAttr(condition)` | Returns `true` (boolean) or `undefined` — shorthand for boolean ARIA attribute values. |
|
|
25
25
|
|
|
26
26
|
### Context
|
|
27
27
|
|
|
28
|
-
| Export
|
|
29
|
-
|
|
|
28
|
+
| Export | Description |
|
|
29
|
+
| ---------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
|
30
30
|
| `createContext(displayName)` | Wrapper around React's `createContext` that returns a `[Provider, useHook]` tuple. The hook throws a descriptive error if called outside the provider — eliminates silent `undefined` bugs. |
|
|
31
31
|
|
|
32
32
|
### Style context
|
|
33
33
|
|
|
34
34
|
Used internally by `@cdx-ui/components` to propagate variant props (size, color, etc.) from a compound root to its sub-components.
|
|
35
35
|
|
|
36
|
-
| Export
|
|
37
|
-
|
|
|
36
|
+
| Export | Description |
|
|
37
|
+
| ------------------------------------- | ---------------------------------------------------------------------------------- |
|
|
38
38
|
| `withStyleContext(Component, scope?)` | HOC that adds a `context` prop and provides it to descendants via `ParentContext`. |
|
|
39
|
-
| `useStyleContext(scope?)`
|
|
40
|
-
| `useParentContext()`
|
|
41
|
-
| `ParentContext` | The raw React context (rarely needed directly). |
|
|
39
|
+
| `useStyleContext(scope?)` | Reads the style context set by the nearest `withStyleContext` wrapper. |
|
|
40
|
+
| `useParentContext()` | Reads the full `StyleContextMap` from the nearest provider. |
|
|
42
41
|
|
|
43
42
|
### Form control
|
|
44
43
|
|
|
45
44
|
Low-level form-field state used by the `Field` and `Input` primitives.
|
|
46
45
|
|
|
47
|
-
| Export
|
|
48
|
-
|
|
|
49
|
-
| `useFormControlRoot(props)`
|
|
50
|
-
| `useFormControl(props)`
|
|
51
|
-
| `useFormControlContext()`
|
|
52
|
-
| `
|
|
46
|
+
| Export | Description |
|
|
47
|
+
| ------------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
|
48
|
+
| `useFormControlRoot(props)` | Creates the root state object for a form field (id generation, tracks `hasFeedbackText`/`hasHelpText` for describedby assembly). |
|
|
49
|
+
| `useFormControl(props)` | Merges component-level props with inherited form-control context. Assembles `aria-describedby` from feedback/help text ids. |
|
|
50
|
+
| `useFormControlContext()` | Reads form-control state from the nearest provider. |
|
|
51
|
+
| `useReportFormControlLabelFocus(isActive)` | Reports focus/active state to the parent `FormControlContext` — used by `Input`/`Select.Trigger` to trigger `isFocused` styling on the associated label. |
|
|
52
|
+
| `FormControlContext` | The React context object for form-control state propagation. |
|
|
53
|
+
|
|
54
|
+
## Exported types
|
|
55
|
+
|
|
56
|
+
| Type | Source |
|
|
57
|
+
| ---------------------------- | ------------ |
|
|
58
|
+
| `UseControllableStateParams` | common |
|
|
59
|
+
| `FormControlContextValue` | form-control |
|
|
60
|
+
| `FormControlFieldProps` | form-control |
|
|
61
|
+
| `FormControlRootProps` | form-control |
|
|
62
|
+
| `FormControlRootReturn` | form-control |
|
|
63
|
+
| `FormControlState` | form-control |
|
|
64
|
+
| `StyleContextMap` | style |
|
|
65
|
+
| `WithStyleContextProps` | style |
|
|
66
|
+
|
|
67
|
+
## Testing
|
|
68
|
+
|
|
69
|
+
Tests are colocated next to source files (`*.test.{ts,tsx}`). Run via the `utils` Jest project:
|
|
70
|
+
|
|
71
|
+
```bash
|
|
72
|
+
pnpm nx run @cdx-ui/utils:test
|
|
73
|
+
```
|
|
74
|
+
|
|
75
|
+
All runtime exports have test coverage using `@testing-library/react-native` (`renderHook`, `act`).
|
|
53
76
|
|
|
54
77
|
## Further reading
|
|
55
78
|
|
|
@@ -4,15 +4,53 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.mergeRefs = mergeRefs;
|
|
7
|
+
/**
|
|
8
|
+
* Merges multiple refs (object or callback) into a single callback ref.
|
|
9
|
+
*
|
|
10
|
+
* Supports React 19 ref-cleanup semantics: if an inner callback ref returns a
|
|
11
|
+
* cleanup function, that cleanup is captured and invoked when the merged ref is
|
|
12
|
+
* detached — either via the returned cleanup (React 19) or via a subsequent
|
|
13
|
+
* call with `null` (React 18 backward-compat path).
|
|
14
|
+
*/
|
|
7
15
|
function mergeRefs(...refs) {
|
|
8
16
|
return value => {
|
|
17
|
+
if (value === null) {
|
|
18
|
+
for (const ref of refs) {
|
|
19
|
+
if (typeof ref === 'function') {
|
|
20
|
+
ref(null);
|
|
21
|
+
} else if (ref != null) {
|
|
22
|
+
ref.current = null;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
return undefined;
|
|
26
|
+
}
|
|
27
|
+
const cleanups = [];
|
|
9
28
|
for (const ref of refs) {
|
|
10
29
|
if (typeof ref === 'function') {
|
|
11
|
-
ref(value);
|
|
30
|
+
cleanups.push(ref(value));
|
|
12
31
|
} else if (ref != null) {
|
|
13
32
|
ref.current = value;
|
|
33
|
+
cleanups.push(undefined);
|
|
34
|
+
} else {
|
|
35
|
+
cleanups.push(undefined);
|
|
14
36
|
}
|
|
15
37
|
}
|
|
38
|
+
return () => {
|
|
39
|
+
for (let i = 0; i < refs.length; i++) {
|
|
40
|
+
const ref = refs[i];
|
|
41
|
+
if (ref == null) continue;
|
|
42
|
+
if (typeof ref === 'function') {
|
|
43
|
+
const refCleanup = cleanups[i];
|
|
44
|
+
if (typeof refCleanup === 'function') {
|
|
45
|
+
refCleanup();
|
|
46
|
+
} else {
|
|
47
|
+
ref(null);
|
|
48
|
+
}
|
|
49
|
+
} else {
|
|
50
|
+
ref.current = null;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
};
|
|
16
54
|
};
|
|
17
55
|
}
|
|
18
56
|
//# sourceMappingURL=mergeRefs.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["mergeRefs","refs","value","ref","current"],"sourceRoot":"../../../src","sources":["common/mergeRefs.ts"],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"names":["mergeRefs","refs","value","ref","current","undefined","cleanups","push","i","length","refCleanup"],"sourceRoot":"../../../src","sources":["common/mergeRefs.ts"],"mappings":";;;;;;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAASA,SAASA,CAAI,GAAGC,IAA4B,EAAkB;EAC5E,OAAQC,KAAe,IAA4B;IACjD,IAAIA,KAAK,KAAK,IAAI,EAAE;MAClB,KAAK,MAAMC,GAAG,IAAIF,IAAI,EAAE;QACtB,IAAI,OAAOE,GAAG,KAAK,UAAU,EAAE;UAC7BA,GAAG,CAAC,IAAI,CAAC;QACX,CAAC,MAAM,IAAIA,GAAG,IAAI,IAAI,EAAE;UACtBA,GAAG,CAACC,OAAO,GAAG,IAAI;QACpB;MACF;MACA,OAAOC,SAAS;IAClB;IAEA,MAAMC,QAAmC,GAAG,EAAE;IAC9C,KAAK,MAAMH,GAAG,IAAIF,IAAI,EAAE;MACtB,IAAI,OAAOE,GAAG,KAAK,UAAU,EAAE;QAC7BG,QAAQ,CAACC,IAAI,CAACJ,GAAG,CAACD,KAAK,CAA0B,CAAC;MACpD,CAAC,MAAM,IAAIC,GAAG,IAAI,IAAI,EAAE;QACtBA,GAAG,CAACC,OAAO,GAAGF,KAAK;QACnBI,QAAQ,CAACC,IAAI,CAACF,SAAS,CAAC;MAC1B,CAAC,MAAM;QACLC,QAAQ,CAACC,IAAI,CAACF,SAAS,CAAC;MAC1B;IACF;IAEA,OAAO,MAAM;MACX,KAAK,IAAIG,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGP,IAAI,CAACQ,MAAM,EAAED,CAAC,EAAE,EAAE;QACpC,MAAML,GAAG,GAAGF,IAAI,CAACO,CAAC,CAAC;QACnB,IAAIL,GAAG,IAAI,IAAI,EAAE;QAEjB,IAAI,OAAOA,GAAG,KAAK,UAAU,EAAE;UAC7B,MAAMO,UAAU,GAAGJ,QAAQ,CAACE,CAAC,CAAC;UAC9B,IAAI,OAAOE,UAAU,KAAK,UAAU,EAAE;YACpCA,UAAU,CAAC,CAAC;UACd,CAAC,MAAM;YACLP,GAAG,CAAC,IAAI,CAAC;UACX;QACF,CAAC,MAAM;UACLA,GAAG,CAACC,OAAO,GAAG,IAAI;QACpB;MACF;IACF,CAAC;EACH,CAAC;AACH","ignoreList":[]}
|
|
@@ -27,5 +27,11 @@ Object.defineProperty(exports, "useFormControlRoot", {
|
|
|
27
27
|
return _useFormControl.useFormControlRoot;
|
|
28
28
|
}
|
|
29
29
|
});
|
|
30
|
+
Object.defineProperty(exports, "useReportFormControlLabelFocus", {
|
|
31
|
+
enumerable: true,
|
|
32
|
+
get: function () {
|
|
33
|
+
return _useFormControl.useReportFormControlLabelFocus;
|
|
34
|
+
}
|
|
35
|
+
});
|
|
30
36
|
var _useFormControl = require("./useFormControl");
|
|
31
37
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_useFormControl","require"],"sourceRoot":"../../../src","sources":["form-control/index.ts"],"mappings":"
|
|
1
|
+
{"version":3,"names":["_useFormControl","require"],"sourceRoot":"../../../src","sources":["form-control/index.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,eAAA,GAAAC,OAAA","ignoreList":[]}
|
|
@@ -7,10 +7,21 @@ exports.FormControlContext = void 0;
|
|
|
7
7
|
exports.useFormControl = useFormControl;
|
|
8
8
|
exports.useFormControlContext = void 0;
|
|
9
9
|
exports.useFormControlRoot = useFormControlRoot;
|
|
10
|
+
exports.useReportFormControlLabelFocus = useReportFormControlLabelFocus;
|
|
10
11
|
var _react = _interopRequireDefault(require("react"));
|
|
11
12
|
var _reactNative = require("react-native");
|
|
12
13
|
var _accessibilityUtils = require("../common/accessibilityUtils");
|
|
13
14
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
15
|
+
/**
|
|
16
|
+
* Minimal contract for any control registered on `FormControlContextValue.inputRef`.
|
|
17
|
+
*
|
|
18
|
+
* `Field.Label` / `focusInput()` only need to call `.focus()` on the registered node;
|
|
19
|
+
* narrower control-specific shapes (`TextInput`, `HTMLInputElement`, custom focus
|
|
20
|
+
* bridges like `Select.Trigger`'s) all satisfy this contract. Consumers that need
|
|
21
|
+
* more (e.g. reading `.value`) should cast locally — keeping the context type
|
|
22
|
+
* minimal avoids a typed lie when a non-input bridge is registered.
|
|
23
|
+
*/
|
|
24
|
+
|
|
14
25
|
const FormControlContext = exports.FormControlContext = /*#__PURE__*/_react.default.createContext({});
|
|
15
26
|
|
|
16
27
|
/** Props for the FormControl root; known fields plus passthrough to the styled root box. */
|
|
@@ -46,6 +57,7 @@ function useFormControlRoot(props) {
|
|
|
46
57
|
* We use this to append its id the the `aria-describedby` of the `input`.
|
|
47
58
|
*/
|
|
48
59
|
const [hasHelpText, setHasHelpText] = _react.default.useState(false);
|
|
60
|
+
const [isLabelFocused, setIsLabelFocused] = _react.default.useState(false);
|
|
49
61
|
const inputRef = _react.default.useRef(null);
|
|
50
62
|
const focusInput = _react.default.useCallback(() => {
|
|
51
63
|
const node = inputRef.current;
|
|
@@ -68,6 +80,8 @@ function useFormControlRoot(props) {
|
|
|
68
80
|
feedbackId,
|
|
69
81
|
helpTextId,
|
|
70
82
|
htmlProps,
|
|
83
|
+
isLabelFocused,
|
|
84
|
+
setIsLabelFocused,
|
|
71
85
|
...(_reactNative.Platform.OS !== 'web' ? {
|
|
72
86
|
inputRef,
|
|
73
87
|
focusInput
|
|
@@ -76,6 +90,25 @@ function useFormControlRoot(props) {
|
|
|
76
90
|
return context;
|
|
77
91
|
}
|
|
78
92
|
|
|
93
|
+
/**
|
|
94
|
+
* Reports focus/active state from `Input` / `Select.Trigger` to the parent `Field` for label styling.
|
|
95
|
+
* No-ops outside a `Field` (no `setIsLabelFocused` on context).
|
|
96
|
+
*/
|
|
97
|
+
function useReportFormControlLabelFocus(isActive) {
|
|
98
|
+
const {
|
|
99
|
+
setIsLabelFocused
|
|
100
|
+
} = useFormControlContext();
|
|
101
|
+
_react.default.useLayoutEffect(() => {
|
|
102
|
+
if (typeof setIsLabelFocused !== 'function') {
|
|
103
|
+
return undefined;
|
|
104
|
+
}
|
|
105
|
+
setIsLabelFocused(isActive);
|
|
106
|
+
return () => {
|
|
107
|
+
setIsLabelFocused(false);
|
|
108
|
+
};
|
|
109
|
+
}, [isActive, setIsLabelFocused]);
|
|
110
|
+
}
|
|
111
|
+
|
|
79
112
|
/**
|
|
80
113
|
* Hook that merges local field props with the nearest form field context
|
|
81
114
|
* and returns normalised HTML / ARIA attributes for input elements.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_accessibilityUtils","e","__esModule","default","FormControlContext","exports","React","createContext","useFormControlRoot","props","id","idProp","name","isRequired","isInvalid","isDisabled","isReadOnly","htmlProps","reactId","useId","labelId","feedbackId","helpTextId","hasFeedbackText","setHasFeedbackText","useState","hasHelpText","setHasHelpText","inputRef","useRef","focusInput","useCallback","node","current","focus","context","Boolean","Platform","OS","
|
|
1
|
+
{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_accessibilityUtils","e","__esModule","default","FormControlContext","exports","React","createContext","useFormControlRoot","props","id","idProp","name","isRequired","isInvalid","isDisabled","isReadOnly","htmlProps","reactId","useId","labelId","feedbackId","helpTextId","hasFeedbackText","setHasFeedbackText","useState","hasHelpText","setHasHelpText","isLabelFocused","setIsLabelFocused","inputRef","useRef","focusInput","useCallback","node","current","focus","context","Boolean","Platform","OS","useReportFormControlLabelFocus","isActive","useFormControlContext","useLayoutEffect","undefined","useFormControl","field","describedBy","push","ariaDescribedBy","join","cleanProps","disabled","readOnly","required","ariaAttr","useContext"],"sourceRoot":"../../../src","sources":["form-control/useFormControl.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -1,14 +1,52 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
+
/**
|
|
4
|
+
* Merges multiple refs (object or callback) into a single callback ref.
|
|
5
|
+
*
|
|
6
|
+
* Supports React 19 ref-cleanup semantics: if an inner callback ref returns a
|
|
7
|
+
* cleanup function, that cleanup is captured and invoked when the merged ref is
|
|
8
|
+
* detached — either via the returned cleanup (React 19) or via a subsequent
|
|
9
|
+
* call with `null` (React 18 backward-compat path).
|
|
10
|
+
*/
|
|
3
11
|
export function mergeRefs(...refs) {
|
|
4
12
|
return value => {
|
|
13
|
+
if (value === null) {
|
|
14
|
+
for (const ref of refs) {
|
|
15
|
+
if (typeof ref === 'function') {
|
|
16
|
+
ref(null);
|
|
17
|
+
} else if (ref != null) {
|
|
18
|
+
ref.current = null;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
return undefined;
|
|
22
|
+
}
|
|
23
|
+
const cleanups = [];
|
|
5
24
|
for (const ref of refs) {
|
|
6
25
|
if (typeof ref === 'function') {
|
|
7
|
-
ref(value);
|
|
26
|
+
cleanups.push(ref(value));
|
|
8
27
|
} else if (ref != null) {
|
|
9
28
|
ref.current = value;
|
|
29
|
+
cleanups.push(undefined);
|
|
30
|
+
} else {
|
|
31
|
+
cleanups.push(undefined);
|
|
10
32
|
}
|
|
11
33
|
}
|
|
34
|
+
return () => {
|
|
35
|
+
for (let i = 0; i < refs.length; i++) {
|
|
36
|
+
const ref = refs[i];
|
|
37
|
+
if (ref == null) continue;
|
|
38
|
+
if (typeof ref === 'function') {
|
|
39
|
+
const refCleanup = cleanups[i];
|
|
40
|
+
if (typeof refCleanup === 'function') {
|
|
41
|
+
refCleanup();
|
|
42
|
+
} else {
|
|
43
|
+
ref(null);
|
|
44
|
+
}
|
|
45
|
+
} else {
|
|
46
|
+
ref.current = null;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
};
|
|
12
50
|
};
|
|
13
51
|
}
|
|
14
52
|
//# sourceMappingURL=mergeRefs.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["mergeRefs","refs","value","ref","current"],"sourceRoot":"../../../src","sources":["common/mergeRefs.ts"],"mappings":";;
|
|
1
|
+
{"version":3,"names":["mergeRefs","refs","value","ref","current","undefined","cleanups","push","i","length","refCleanup"],"sourceRoot":"../../../src","sources":["common/mergeRefs.ts"],"mappings":";;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASA,SAASA,CAAI,GAAGC,IAA4B,EAAkB;EAC5E,OAAQC,KAAe,IAA4B;IACjD,IAAIA,KAAK,KAAK,IAAI,EAAE;MAClB,KAAK,MAAMC,GAAG,IAAIF,IAAI,EAAE;QACtB,IAAI,OAAOE,GAAG,KAAK,UAAU,EAAE;UAC7BA,GAAG,CAAC,IAAI,CAAC;QACX,CAAC,MAAM,IAAIA,GAAG,IAAI,IAAI,EAAE;UACtBA,GAAG,CAACC,OAAO,GAAG,IAAI;QACpB;MACF;MACA,OAAOC,SAAS;IAClB;IAEA,MAAMC,QAAmC,GAAG,EAAE;IAC9C,KAAK,MAAMH,GAAG,IAAIF,IAAI,EAAE;MACtB,IAAI,OAAOE,GAAG,KAAK,UAAU,EAAE;QAC7BG,QAAQ,CAACC,IAAI,CAACJ,GAAG,CAACD,KAAK,CAA0B,CAAC;MACpD,CAAC,MAAM,IAAIC,GAAG,IAAI,IAAI,EAAE;QACtBA,GAAG,CAACC,OAAO,GAAGF,KAAK;QACnBI,QAAQ,CAACC,IAAI,CAACF,SAAS,CAAC;MAC1B,CAAC,MAAM;QACLC,QAAQ,CAACC,IAAI,CAACF,SAAS,CAAC;MAC1B;IACF;IAEA,OAAO,MAAM;MACX,KAAK,IAAIG,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGP,IAAI,CAACQ,MAAM,EAAED,CAAC,EAAE,EAAE;QACpC,MAAML,GAAG,GAAGF,IAAI,CAACO,CAAC,CAAC;QACnB,IAAIL,GAAG,IAAI,IAAI,EAAE;QAEjB,IAAI,OAAOA,GAAG,KAAK,UAAU,EAAE;UAC7B,MAAMO,UAAU,GAAGJ,QAAQ,CAACE,CAAC,CAAC;UAC9B,IAAI,OAAOE,UAAU,KAAK,UAAU,EAAE;YACpCA,UAAU,CAAC,CAAC;UACd,CAAC,MAAM;YACLP,GAAG,CAAC,IAAI,CAAC;UACX;QACF,CAAC,MAAM;UACLA,GAAG,CAACC,OAAO,GAAG,IAAI;QACpB;MACF;IACF,CAAC;EACH,CAAC;AACH","ignoreList":[]}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
export { FormControlContext, useFormControl, useFormControlContext, useFormControlRoot } from './useFormControl';
|
|
3
|
+
export { FormControlContext, useFormControl, useFormControlContext, useFormControlRoot, useReportFormControlLabelFocus } from './useFormControl';
|
|
4
4
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["FormControlContext","useFormControl","useFormControlContext","useFormControlRoot"],"sourceRoot":"../../../src","sources":["form-control/index.ts"],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"names":["FormControlContext","useFormControl","useFormControlContext","useFormControlRoot","useReportFormControlLabelFocus"],"sourceRoot":"../../../src","sources":["form-control/index.ts"],"mappings":";;AAAA,SAOEA,kBAAkB,EAClBC,cAAc,EACdC,qBAAqB,EACrBC,kBAAkB,EAClBC,8BAA8B,QACzB,kBAAkB","ignoreList":[]}
|
|
@@ -3,6 +3,17 @@
|
|
|
3
3
|
import React from 'react';
|
|
4
4
|
import { Platform } from 'react-native';
|
|
5
5
|
import { ariaAttr } from '../common/accessibilityUtils';
|
|
6
|
+
|
|
7
|
+
/**
|
|
8
|
+
* Minimal contract for any control registered on `FormControlContextValue.inputRef`.
|
|
9
|
+
*
|
|
10
|
+
* `Field.Label` / `focusInput()` only need to call `.focus()` on the registered node;
|
|
11
|
+
* narrower control-specific shapes (`TextInput`, `HTMLInputElement`, custom focus
|
|
12
|
+
* bridges like `Select.Trigger`'s) all satisfy this contract. Consumers that need
|
|
13
|
+
* more (e.g. reading `.value`) should cast locally — keeping the context type
|
|
14
|
+
* minimal avoids a typed lie when a non-input bridge is registered.
|
|
15
|
+
*/
|
|
16
|
+
|
|
6
17
|
export const FormControlContext = /*#__PURE__*/React.createContext({});
|
|
7
18
|
|
|
8
19
|
/** Props for the FormControl root; known fields plus passthrough to the styled root box. */
|
|
@@ -38,6 +49,7 @@ export function useFormControlRoot(props) {
|
|
|
38
49
|
* We use this to append its id the the `aria-describedby` of the `input`.
|
|
39
50
|
*/
|
|
40
51
|
const [hasHelpText, setHasHelpText] = React.useState(false);
|
|
52
|
+
const [isLabelFocused, setIsLabelFocused] = React.useState(false);
|
|
41
53
|
const inputRef = React.useRef(null);
|
|
42
54
|
const focusInput = React.useCallback(() => {
|
|
43
55
|
const node = inputRef.current;
|
|
@@ -60,6 +72,8 @@ export function useFormControlRoot(props) {
|
|
|
60
72
|
feedbackId,
|
|
61
73
|
helpTextId,
|
|
62
74
|
htmlProps,
|
|
75
|
+
isLabelFocused,
|
|
76
|
+
setIsLabelFocused,
|
|
63
77
|
...(Platform.OS !== 'web' ? {
|
|
64
78
|
inputRef,
|
|
65
79
|
focusInput
|
|
@@ -68,6 +82,25 @@ export function useFormControlRoot(props) {
|
|
|
68
82
|
return context;
|
|
69
83
|
}
|
|
70
84
|
|
|
85
|
+
/**
|
|
86
|
+
* Reports focus/active state from `Input` / `Select.Trigger` to the parent `Field` for label styling.
|
|
87
|
+
* No-ops outside a `Field` (no `setIsLabelFocused` on context).
|
|
88
|
+
*/
|
|
89
|
+
export function useReportFormControlLabelFocus(isActive) {
|
|
90
|
+
const {
|
|
91
|
+
setIsLabelFocused
|
|
92
|
+
} = useFormControlContext();
|
|
93
|
+
React.useLayoutEffect(() => {
|
|
94
|
+
if (typeof setIsLabelFocused !== 'function') {
|
|
95
|
+
return undefined;
|
|
96
|
+
}
|
|
97
|
+
setIsLabelFocused(isActive);
|
|
98
|
+
return () => {
|
|
99
|
+
setIsLabelFocused(false);
|
|
100
|
+
};
|
|
101
|
+
}, [isActive, setIsLabelFocused]);
|
|
102
|
+
}
|
|
103
|
+
|
|
71
104
|
/**
|
|
72
105
|
* Hook that merges local field props with the nearest form field context
|
|
73
106
|
* and returns normalised HTML / ARIA attributes for input elements.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","Platform","ariaAttr","FormControlContext","createContext","useFormControlRoot","props","id","idProp","name","isRequired","isInvalid","isDisabled","isReadOnly","htmlProps","reactId","useId","labelId","feedbackId","helpTextId","hasFeedbackText","setHasFeedbackText","useState","hasHelpText","setHasHelpText","inputRef","useRef","focusInput","useCallback","node","current","focus","context","Boolean","OS","
|
|
1
|
+
{"version":3,"names":["React","Platform","ariaAttr","FormControlContext","createContext","useFormControlRoot","props","id","idProp","name","isRequired","isInvalid","isDisabled","isReadOnly","htmlProps","reactId","useId","labelId","feedbackId","helpTextId","hasFeedbackText","setHasFeedbackText","useState","hasHelpText","setHasHelpText","isLabelFocused","setIsLabelFocused","inputRef","useRef","focusInput","useCallback","node","current","focus","context","Boolean","OS","useReportFormControlLabelFocus","isActive","useFormControlContext","useLayoutEffect","undefined","useFormControl","field","describedBy","push","ariaDescribedBy","join","cleanProps","disabled","readOnly","required","useContext"],"sourceRoot":"../../../src","sources":["form-control/useFormControl.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -1,3 +1,11 @@
|
|
|
1
1
|
import type { Ref, RefCallback } from 'react';
|
|
2
|
+
/**
|
|
3
|
+
* Merges multiple refs (object or callback) into a single callback ref.
|
|
4
|
+
*
|
|
5
|
+
* Supports React 19 ref-cleanup semantics: if an inner callback ref returns a
|
|
6
|
+
* cleanup function, that cleanup is captured and invoked when the merged ref is
|
|
7
|
+
* detached — either via the returned cleanup (React 19) or via a subsequent
|
|
8
|
+
* call with `null` (React 18 backward-compat path).
|
|
9
|
+
*/
|
|
2
10
|
export declare function mergeRefs<T>(...refs: (Ref<T> | undefined)[]): RefCallback<T>;
|
|
3
11
|
//# sourceMappingURL=mergeRefs.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergeRefs.d.ts","sourceRoot":"","sources":["../../../src/common/mergeRefs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"mergeRefs.d.ts","sourceRoot":"","sources":["../../../src/common/mergeRefs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAI9C;;;;;;;GAOG;AACH,wBAAgB,SAAS,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC,CA2C5E"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export { type FormControlContextValue, type FormControlFieldProps, type FormControlRootProps, type FormControlRootReturn, type FormControlState, FormControlContext, useFormControl, useFormControlContext, useFormControlRoot, } from './useFormControl';
|
|
1
|
+
export { type Focusable, type FormControlContextValue, type FormControlFieldProps, type FormControlRootProps, type FormControlRootReturn, type FormControlState, FormControlContext, useFormControl, useFormControlContext, useFormControlRoot, useReportFormControlLabelFocus, } from './useFormControl';
|
|
2
2
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/form-control/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,uBAAuB,EAC5B,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,EAC1B,KAAK,gBAAgB,EACrB,kBAAkB,EAClB,cAAc,EACd,qBAAqB,EACrB,kBAAkB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/form-control/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,SAAS,EACd,KAAK,uBAAuB,EAC5B,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,EAC1B,KAAK,gBAAgB,EACrB,kBAAkB,EAClB,cAAc,EACd,qBAAqB,EACrB,kBAAkB,EAClB,8BAA8B,GAC/B,MAAM,kBAAkB,CAAC"}
|
|
@@ -1,6 +1,17 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { type TextInput } from 'react-native';
|
|
3
2
|
type HTMLProps = Record<string, unknown>;
|
|
3
|
+
/**
|
|
4
|
+
* Minimal contract for any control registered on `FormControlContextValue.inputRef`.
|
|
5
|
+
*
|
|
6
|
+
* `Field.Label` / `focusInput()` only need to call `.focus()` on the registered node;
|
|
7
|
+
* narrower control-specific shapes (`TextInput`, `HTMLInputElement`, custom focus
|
|
8
|
+
* bridges like `Select.Trigger`'s) all satisfy this contract. Consumers that need
|
|
9
|
+
* more (e.g. reading `.value`) should cast locally — keeping the context type
|
|
10
|
+
* minimal avoids a typed lie when a non-input bridge is registered.
|
|
11
|
+
*/
|
|
12
|
+
export interface Focusable {
|
|
13
|
+
focus(): void;
|
|
14
|
+
}
|
|
4
15
|
export interface FormControlState {
|
|
5
16
|
isRequired: boolean;
|
|
6
17
|
isInvalid: boolean;
|
|
@@ -21,9 +32,16 @@ export interface FormControlContextValue extends FormControlState {
|
|
|
21
32
|
/**
|
|
22
33
|
* @platform native — set by `Input.Field` / `Select.Trigger` for label press-to-focus.
|
|
23
34
|
* On web, use `<label htmlFor>` with a labelable control (`input`, `button`, `select`, …).
|
|
35
|
+
*
|
|
36
|
+
* Typed as `Focusable` so any control (TextInput, HTMLInputElement, custom focus
|
|
37
|
+
* bridge) can register without a cast at the assignment site. Consumers that need
|
|
38
|
+
* the narrower shape cast locally.
|
|
24
39
|
*/
|
|
25
|
-
inputRef?: React.RefObject<
|
|
40
|
+
inputRef?: React.RefObject<Focusable | null>;
|
|
26
41
|
focusInput?: () => void;
|
|
42
|
+
/** True when the primary child control is focused or (for Select) open — drives `Field.Label` styling. */
|
|
43
|
+
isLabelFocused?: boolean;
|
|
44
|
+
setIsLabelFocused?: React.Dispatch<React.SetStateAction<boolean>>;
|
|
27
45
|
}
|
|
28
46
|
export declare const FormControlContext: React.Context<Partial<FormControlContextValue>>;
|
|
29
47
|
export interface FormControlFieldProps extends Partial<FormControlState> {
|
|
@@ -49,14 +67,21 @@ export interface FormControlRootReturn {
|
|
|
49
67
|
feedbackId: string;
|
|
50
68
|
helpTextId: string;
|
|
51
69
|
htmlProps: HTMLProps;
|
|
52
|
-
inputRef?: React.RefObject<
|
|
70
|
+
inputRef?: React.RefObject<Focusable | null>;
|
|
53
71
|
focusInput?: () => void;
|
|
72
|
+
isLabelFocused: boolean;
|
|
73
|
+
setIsLabelFocused: React.Dispatch<React.SetStateAction<boolean>>;
|
|
54
74
|
}
|
|
55
75
|
/**
|
|
56
76
|
* Builds state and ids for a `Form` primitive root (`createFormRoot`). Pass the returned object
|
|
57
77
|
* (minus `htmlProps`) to `FormControlContext.Provider` — this is not a React context consumer hook.
|
|
58
78
|
*/
|
|
59
79
|
export declare function useFormControlRoot(props: FormControlRootProps): FormControlRootReturn;
|
|
80
|
+
/**
|
|
81
|
+
* Reports focus/active state from `Input` / `Select.Trigger` to the parent `Field` for label styling.
|
|
82
|
+
* No-ops outside a `Field` (no `setIsLabelFocused` on context).
|
|
83
|
+
*/
|
|
84
|
+
export declare function useReportFormControlLabelFocus(isActive: boolean): void;
|
|
60
85
|
/**
|
|
61
86
|
* Hook that merges local field props with the nearest form field context
|
|
62
87
|
* and returns normalised HTML / ARIA attributes for input elements.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useFormControl.d.ts","sourceRoot":"","sources":["../../../src/form-control/useFormControl.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"useFormControl.d.ts","sourceRoot":"","sources":["../../../src/form-control/useFormControl.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,KAAK,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEzC;;;;;;;;GAQG;AACH,MAAM,WAAW,SAAS;IACxB,KAAK,IAAI,IAAI,CAAC;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,uBAAwB,SAAQ,gBAAgB;IAC/D,eAAe,EAAE,OAAO,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;IACrB,kBAAkB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IAClE,cAAc,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IAC9D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,SAAS,CAAC;IACrB;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC;IAC7C,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB,0GAA0G;IAC1G,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,iBAAiB,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;CACnE;AAED,eAAO,MAAM,kBAAkB,iDAA4D,CAAC;AAE5F,MAAM,WAAW,qBAAsB,SAAQ,OAAO,CAAC,gBAAgB,CAAC;IACtE,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAED,4FAA4F;AAC5F,MAAM,MAAM,oBAAoB,GAAG,OAAO,CAAC,gBAAgB,CAAC,GAAG;IAC7D,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,SAAS,CAAC;AAEd,MAAM,WAAW,qBAAqB;IACpC,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,eAAe,EAAE,OAAO,CAAC;IACzB,kBAAkB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IAClE,WAAW,EAAE,OAAO,CAAC;IACrB,cAAc,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;IAC9D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC;IAC7C,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;CAClE;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,oBAAoB,GAAG,qBAAqB,CAsDrF;AAED;;;GAGG;AACH,wBAAgB,8BAA8B,CAAC,QAAQ,EAAE,OAAO,QAY/D;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,qBAAqB;;;;;;;;;;;EA4B1D;AAED,eAAO,MAAM,qBAAqB,wCAEjC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cdx-ui/utils",
|
|
3
|
-
"version": "0.0.1-beta.
|
|
3
|
+
"version": "0.0.1-beta.70",
|
|
4
4
|
"main": "lib/commonjs/index.js",
|
|
5
5
|
"module": "lib/module/index.js",
|
|
6
6
|
"react-native": "src/index.ts",
|
|
@@ -22,6 +22,7 @@
|
|
|
22
22
|
"react-native-builder-bob": {
|
|
23
23
|
"source": "src",
|
|
24
24
|
"output": "lib",
|
|
25
|
+
"exclude": "**/{__tests__/**,__fixtures__/**,__mocks__/**,*.test.ts,*.test.tsx,*.spec.ts,*.spec.tsx}",
|
|
25
26
|
"targets": [
|
|
26
27
|
"commonjs",
|
|
27
28
|
"module",
|
|
@@ -67,6 +68,7 @@
|
|
|
67
68
|
},
|
|
68
69
|
"scripts": {
|
|
69
70
|
"build": "bob build",
|
|
70
|
-
"lint": "eslint src/"
|
|
71
|
+
"lint": "eslint src/",
|
|
72
|
+
"test": "jest --config ../../jest.config.js --selectProjects utils"
|
|
71
73
|
}
|
|
72
74
|
}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { ariaAttr } from './accessibilityUtils';
|
|
2
|
+
|
|
3
|
+
describe('ariaAttr', () => {
|
|
4
|
+
it('returns true when condition is true', () => {
|
|
5
|
+
expect(ariaAttr(true)).toBe(true);
|
|
6
|
+
});
|
|
7
|
+
|
|
8
|
+
it('returns undefined when condition is false or undefined', () => {
|
|
9
|
+
expect(ariaAttr(false)).toBeUndefined();
|
|
10
|
+
expect(ariaAttr(undefined)).toBeUndefined();
|
|
11
|
+
});
|
|
12
|
+
});
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { cn } from './cn';
|
|
2
|
+
|
|
3
|
+
describe('cn', () => {
|
|
4
|
+
it('merges conflicting Tailwind classes', () => {
|
|
5
|
+
expect(cn('px-2', 'px-4')).toBe('px-4');
|
|
6
|
+
});
|
|
7
|
+
|
|
8
|
+
it('joins non-conflicting classes', () => {
|
|
9
|
+
expect(cn('px-2', 'py-1')).toBe('px-2 py-1');
|
|
10
|
+
});
|
|
11
|
+
|
|
12
|
+
it('ignores falsy inputs', () => {
|
|
13
|
+
expect(cn('foo', undefined, null, false, '')).toBe('foo');
|
|
14
|
+
});
|
|
15
|
+
|
|
16
|
+
it('returns empty string when called with no inputs', () => {
|
|
17
|
+
expect(cn()).toBe('');
|
|
18
|
+
});
|
|
19
|
+
});
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { composeEventHandlers } from './composeEventHandlers';
|
|
2
|
+
|
|
3
|
+
describe('composeEventHandlers', () => {
|
|
4
|
+
it('calls handlers in order', () => {
|
|
5
|
+
const order: number[] = [];
|
|
6
|
+
const first = jest.fn(() => {
|
|
7
|
+
order.push(1);
|
|
8
|
+
});
|
|
9
|
+
const second = jest.fn(() => {
|
|
10
|
+
order.push(2);
|
|
11
|
+
});
|
|
12
|
+
|
|
13
|
+
composeEventHandlers(first, second)({ type: 'press' });
|
|
14
|
+
|
|
15
|
+
expect(order).toEqual([1, 2]);
|
|
16
|
+
expect(first).toHaveBeenCalledWith({ type: 'press' });
|
|
17
|
+
expect(second).toHaveBeenCalledWith({ type: 'press' });
|
|
18
|
+
});
|
|
19
|
+
|
|
20
|
+
it('skips null and undefined handlers', () => {
|
|
21
|
+
const handler = jest.fn();
|
|
22
|
+
|
|
23
|
+
composeEventHandlers(null, undefined, handler)({});
|
|
24
|
+
|
|
25
|
+
expect(handler).toHaveBeenCalledTimes(1);
|
|
26
|
+
});
|
|
27
|
+
|
|
28
|
+
it('returns a no-op when no handlers are provided', () => {
|
|
29
|
+
const handleEvent = composeEventHandlers();
|
|
30
|
+
|
|
31
|
+
expect(() => {
|
|
32
|
+
handleEvent({});
|
|
33
|
+
}).not.toThrow();
|
|
34
|
+
});
|
|
35
|
+
});
|