@cdx-ui/primitives 0.0.1-beta.172 → 0.0.1-beta.174

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.
Files changed (10) hide show
  1. package/lib/commonjs/checkbox/CheckboxGroup.js +15 -2
  2. package/lib/commonjs/checkbox/CheckboxGroup.js.map +1 -1
  3. package/lib/module/checkbox/CheckboxGroup.js +16 -3
  4. package/lib/module/checkbox/CheckboxGroup.js.map +1 -1
  5. package/lib/typescript/checkbox/CheckboxGroup.d.ts.map +1 -1
  6. package/lib/typescript/checkbox/types.d.ts +1 -0
  7. package/lib/typescript/checkbox/types.d.ts.map +1 -1
  8. package/package.json +3 -3
  9. package/src/checkbox/CheckboxGroup.tsx +23 -5
  10. package/src/checkbox/types.ts +1 -0
package/lib/commonjs/checkbox/CheckboxGroup.js CHANGED
@@ -19,6 +19,16 @@ const CheckboxGroup = exports.CheckboxGroup = /*#__PURE__*/(0, _react.forwardRef
19
19
  style,
20
20
  ...props
21
21
  }, ref) => {
22
+ const formControlContext = (0, _utils.useFormControlContext)();
23
+ const formControlProps = (0, _utils.useFormControl)({
24
+ isDisabled: props.isDisabled,
25
+ isRequired: props.isRequired,
26
+ isInvalid: props.isInvalid,
27
+ isReadOnly: props.isReadOnly
28
+ });
29
+ const ariaLabel = props['aria-label'];
30
+ const ariaLabelledBy = props['aria-labelledby'] ?? formControlProps['aria-labelledby'];
31
+ const ariaDescribedBy = formControlProps['aria-describedby'];
22
32
  const state = (0, _checkbox2.useCheckboxGroupState)({
23
33
  ...props,
24
34
  validationState: props.isInvalid ? 'invalid' : 'valid'
@@ -27,9 +37,9 @@ const CheckboxGroup = exports.CheckboxGroup = /*#__PURE__*/(0, _react.forwardRef
27
37
  groupProps
28
38
  } = (0, _checkbox.useCheckboxGroup)({
29
39
  ...props,
30
- 'aria-label': props['aria-label']
40
+ 'aria-label': ariaLabel,
41
+ 'aria-labelledby': ariaLabelledBy
31
42
  }, state);
32
- const formControlContext = (0, _utils.useFormControlContext)();
33
43
  const contextValue = (0, _react.useMemo)(() => ({
34
44
  state: {
35
45
  ...formControlContext,
@@ -41,6 +51,9 @@ const CheckboxGroup = exports.CheckboxGroup = /*#__PURE__*/(0, _react.forwardRef
41
51
  value: contextValue,
42
52
  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Comp, {
43
53
  ...groupProps,
54
+ "aria-label": ariaLabel,
55
+ "aria-labelledby": ariaLabelledBy,
56
+ "aria-describedby": ariaDescribedBy,
44
57
  className: className,
45
58
  style: style,
46
59
  ref: ref,
package/lib/commonjs/checkbox/CheckboxGroup.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["_react","require","_reactNative","_utils","_checkbox","_checkbox2","_slot","_context","_jsxRuntime","CheckboxGroup","exports","forwardRef","asChild","children","className","style","props","ref","state","useCheckboxGroupState","validationState","isInvalid","groupProps","useCheckboxGroup","formControlContext","useFormControlContext","contextValue","useMemo","Comp","Slot","View","jsx","CheckboxGroupContext","Provider","value","displayName"],"sourceRoot":"../../../src","sources":["checkbox/CheckboxGroup.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAF,OAAA;AACA,IAAAG,SAAA,GAAAH,OAAA;AACA,IAAAI,UAAA,GAAAJ,OAAA;AACA,IAAAK,KAAA,GAAAL,OAAA;AACA,IAAAM,QAAA,GAAAN,OAAA;AAAiD,IAAAO,WAAA,GAAAP,OAAA;AAS1C,MAAMQ,aAAa,GAAAC,OAAA,CAAAD,aAAA,gBAAG,IAAAE,iBAAU,EACrC,CAAC;EAAEC,OAAO;EAAEC,QAAQ;EAAEC,SAAS;EAAEC,KAAK;EAAE,GAAGC;AAAM,CAAC,EAAEC,GAAG,KAAK;EAC1D,MAAMC,KAAK,GAAG,IAAAC,gCAAqB,EAAC;IAClC,GAAGH,KAAK;IACRI,eAAe,EAAEJ,KAAK,CAACK,SAAS,GAAG,SAAS,GAAG;EACjD,CAAC,CAAC;EAEF,MAAM;IAAEC;EAAW,CAAC,GAAG,IAAAC,0BAAgB,EACrC;IACE,GAAGP,KAAK;IACR,YAAY,EAAEA,KAAK,CAAC,YAAY;EAClC,CAAC,EACDE,KACF,CAAC;EAED,MAAMM,kBAAkB,GAAG,IAAAC,4BAAqB,EAAC,CAAC;EAElD,MAAMC,YAAY,GAAG,IAAAC,cAAO,EAC1B,OAAO;IAAET,KAAK,EAAE;MAAE,GAAGM,kBAAkB;MAAE,GAAGN;IAAM;EAAE,CAAC,CAAC,EACtD,CAACM,kBAAkB,EAAEN,KAAK,CAC5B,CAAC;EAED,MAAMU,IAAI,GAAGhB,OAAO,GAAGiB,UAAI,GAAGC,iBAAI;EAElC,oBACE,IAAAtB,WAAA,CAAAuB,GAAA,EAACxB,QAAA,CAAAyB,oBAAoB,CAACC,QAAQ;IAACC,KAAK,EAAER,YAAa;IAAAb,QAAA,eACjD,IAAAL,WAAA,CAAAuB,GAAA,EAACH,IAAI;MAAA,GAAKN,UAAU;MAAER,SAAS,EAAEA,SAAU;MAACC,KAAK,EAAEA,KAAM;MAACE,GAAG,EAAEA,GAAI;MAAAJ,QAAA,EAChEA;IAAQ,CACL;EAAC,CACsB,CAAC;AAEpC,CACF,CAAC;AAEDJ,aAAa,CAAC0B,WAAW,GAAG,eAAe","ignoreList":[]}
1
+ {"version":3,"names":["_react","require","_reactNative","_utils","_checkbox","_checkbox2","_slot","_context","_jsxRuntime","CheckboxGroup","exports","forwardRef","asChild","children","className","style","props","ref","formControlContext","useFormControlContext","formControlProps","useFormControl","isDisabled","isRequired","isInvalid","isReadOnly","ariaLabel","ariaLabelledBy","ariaDescribedBy","state","useCheckboxGroupState","validationState","groupProps","useCheckboxGroup","contextValue","useMemo","Comp","Slot","View","jsx","CheckboxGroupContext","Provider","value","displayName"],"sourceRoot":"../../../src","sources":["checkbox/CheckboxGroup.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAF,OAAA;AACA,IAAAG,SAAA,GAAAH,OAAA;AACA,IAAAI,UAAA,GAAAJ,OAAA;AACA,IAAAK,KAAA,GAAAL,OAAA;AACA,IAAAM,QAAA,GAAAN,OAAA;AAAiD,IAAAO,WAAA,GAAAP,OAAA;AAS1C,MAAMQ,aAAa,GAAAC,OAAA,CAAAD,aAAA,gBAAG,IAAAE,iBAAU,EACrC,CAAC;EAAEC,OAAO;EAAEC,QAAQ;EAAEC,SAAS;EAAEC,KAAK;EAAE,GAAGC;AAAM,CAAC,EAAEC,GAAG,KAAK;EAC1D,MAAMC,kBAAkB,GAAG,IAAAC,4BAAqB,EAAC,CAAC;EAClD,MAAMC,gBAAgB,GAAG,IAAAC,qBAAc,EAAC;IACtCC,UAAU,EAAEN,KAAK,CAACM,UAAU;IAC5BC,UAAU,EAAEP,KAAK,CAACO,UAAU;IAC5BC,SAAS,EAAER,KAAK,CAACQ,SAAS;IAC1BC,UAAU,EAAET,KAAK,CAACS;EACpB,CAAC,CAAC;EACF,MAAMC,SAAS,GAAGV,KAAK,CAAC,YAAY,CAAC;EACrC,MAAMW,cAAc,GAAGX,KAAK,CAAC,iBAAiB,CAAC,IAAII,gBAAgB,CAAC,iBAAiB,CAAC;EACtF,MAAMQ,eAAe,GAAGR,gBAAgB,CAAC,kBAAkB,CAAC;EAE5D,MAAMS,KAAK,GAAG,IAAAC,gCAAqB,EAAC;IAClC,GAAGd,KAAK;IACRe,eAAe,EAAEf,KAAK,CAACQ,SAAS,GAAG,SAAS,GAAG;EACjD,CAAC,CAAC;EAEF,MAAM;IAAEQ;EAAW,CAAC,GAAG,IAAAC,0BAAgB,EACrC;IACE,GAAGjB,KAAK;IACR,YAAY,EAAEU,SAAS;IACvB,iBAAiB,EAAEC;EACrB,CAAC,EACDE,KACF,CAAC;EAED,MAAMK,YAAY,GAAG,IAAAC,cAAO,EAC1B,OAAO;IAAEN,KAAK,EAAE;MAAE,GAAGX,kBAAkB;MAAE,GAAGW;IAAM;EAAE,CAAC,CAAC,EACtD,CAACX,kBAAkB,EAAEW,KAAK,CAC5B,CAAC;EAED,MAAMO,IAAI,GAAGxB,OAAO,GAAGyB,UAAI,GAAGC,iBAAI;EAElC,oBACE,IAAA9B,WAAA,CAAA+B,GAAA,EAAChC,QAAA,CAAAiC,oBAAoB,CAACC,QAAQ;IAACC,KAAK,EAAER,YAAa;IAAArB,QAAA,eACjD,IAAAL,WAAA,CAAA+B,GAAA,EAACH,IAAI;MAAA,GACCJ,UAAU;MACd,cAAYN,SAAU;MACtB,mBAAiBC,cAAe;MAChC,oBAAkBC,eAAgB;MAClCd,SAAS,EAAEA,SAAU;MACrBC,KAAK,EAAEA,KAAM;MACbE,GAAG,EAAEA,GAAI;MAAAJ,QAAA,EAERA;IAAQ,CACL;EAAC,CACsB,CAAC;AAEpC,CACF,CAAC;AAEDJ,aAAa,CAACkC,WAAW,GAAG,eAAe","ignoreList":[]}
package/lib/module/checkbox/CheckboxGroup.js CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  import { forwardRef, useMemo } from 'react';
4
4
  import { View } from 'react-native';
5
- import { useFormControlContext } from '@cdx-ui/utils';
5
+ import { useFormControl, useFormControlContext } from '@cdx-ui/utils';
6
6
  import { useCheckboxGroup } from '@react-native-aria/checkbox';
7
7
  import { useCheckboxGroupState } from '@react-stately/checkbox';
8
8
  import { Slot } from '../slot';
@@ -15,6 +15,16 @@ export const CheckboxGroup = /*#__PURE__*/forwardRef(({
15
15
  style,
16
16
  ...props
17
17
  }, ref) => {
18
+ const formControlContext = useFormControlContext();
19
+ const formControlProps = useFormControl({
20
+ isDisabled: props.isDisabled,
21
+ isRequired: props.isRequired,
22
+ isInvalid: props.isInvalid,
23
+ isReadOnly: props.isReadOnly
24
+ });
25
+ const ariaLabel = props['aria-label'];
26
+ const ariaLabelledBy = props['aria-labelledby'] ?? formControlProps['aria-labelledby'];
27
+ const ariaDescribedBy = formControlProps['aria-describedby'];
18
28
  const state = useCheckboxGroupState({
19
29
  ...props,
20
30
  validationState: props.isInvalid ? 'invalid' : 'valid'
@@ -23,9 +33,9 @@ export const CheckboxGroup = /*#__PURE__*/forwardRef(({
23
33
  groupProps
24
34
  } = useCheckboxGroup({
25
35
  ...props,
26
- 'aria-label': props['aria-label']
36
+ 'aria-label': ariaLabel,
37
+ 'aria-labelledby': ariaLabelledBy
27
38
  }, state);
28
- const formControlContext = useFormControlContext();
29
39
  const contextValue = useMemo(() => ({
30
40
  state: {
31
41
  ...formControlContext,
@@ -37,6 +47,9 @@ export const CheckboxGroup = /*#__PURE__*/forwardRef(({
37
47
  value: contextValue,
38
48
  children: /*#__PURE__*/_jsx(Comp, {
39
49
  ...groupProps,
50
+ "aria-label": ariaLabel,
51
+ "aria-labelledby": ariaLabelledBy,
52
+ "aria-describedby": ariaDescribedBy,
40
53
  className: className,
41
54
  style: style,
42
55
  ref: ref,
package/lib/module/checkbox/CheckboxGroup.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["forwardRef","useMemo","View","useFormControlContext","useCheckboxGroup","useCheckboxGroupState","Slot","CheckboxGroupContext","jsx","_jsx","CheckboxGroup","asChild","children","className","style","props","ref","state","validationState","isInvalid","groupProps","formControlContext","contextValue","Comp","Provider","value","displayName"],"sourceRoot":"../../../src","sources":["checkbox/CheckboxGroup.tsx"],"mappings":";;AAAA,SAASA,UAAU,EAAEC,OAAO,QAAQ,OAAO;AAC3C,SAASC,IAAI,QAAwB,cAAc;AACnD,SAASC,qBAAqB,QAAQ,eAAe;AACrD,SAASC,gBAAgB,QAAQ,6BAA6B;AAC9D,SAASC,qBAAqB,QAAQ,yBAAyB;AAC/D,SAASC,IAAI,QAAQ,SAAS;AAC9B,SAASC,oBAAoB,QAAQ,WAAW;AAAC,SAAAC,GAAA,IAAAC,IAAA;AASjD,OAAO,MAAMC,aAAa,gBAAGV,UAAU,CACrC,CAAC;EAAEW,OAAO;EAAEC,QAAQ;EAAEC,SAAS;EAAEC,KAAK;EAAE,GAAGC;AAAM,CAAC,EAAEC,GAAG,KAAK;EAC1D,MAAMC,KAAK,GAAGZ,qBAAqB,CAAC;IAClC,GAAGU,KAAK;IACRG,eAAe,EAAEH,KAAK,CAACI,SAAS,GAAG,SAAS,GAAG;EACjD,CAAC,CAAC;EAEF,MAAM;IAAEC;EAAW,CAAC,GAAGhB,gBAAgB,CACrC;IACE,GAAGW,KAAK;IACR,YAAY,EAAEA,KAAK,CAAC,YAAY;EAClC,CAAC,EACDE,KACF,CAAC;EAED,MAAMI,kBAAkB,GAAGlB,qBAAqB,CAAC,CAAC;EAElD,MAAMmB,YAAY,GAAGrB,OAAO,CAC1B,OAAO;IAAEgB,KAAK,EAAE;MAAE,GAAGI,kBAAkB;MAAE,GAAGJ;IAAM;EAAE,CAAC,CAAC,EACtD,CAACI,kBAAkB,EAAEJ,KAAK,CAC5B,CAAC;EAED,MAAMM,IAAI,GAAGZ,OAAO,GAAGL,IAAI,GAAGJ,IAAI;EAElC,oBACEO,IAAA,CAACF,oBAAoB,CAACiB,QAAQ;IAACC,KAAK,EAAEH,YAAa;IAAAV,QAAA,eACjDH,IAAA,CAACc,IAAI;MAAA,GAAKH,UAAU;MAAEP,SAAS,EAAEA,SAAU;MAACC,KAAK,EAAEA,KAAM;MAACE,GAAG,EAAEA,GAAI;MAAAJ,QAAA,EAChEA;IAAQ,CACL;EAAC,CACsB,CAAC;AAEpC,CACF,CAAC;AAEDF,aAAa,CAACgB,WAAW,GAAG,eAAe","ignoreList":[]}
1
+ {"version":3,"names":["forwardRef","useMemo","View","useFormControl","useFormControlContext","useCheckboxGroup","useCheckboxGroupState","Slot","CheckboxGroupContext","jsx","_jsx","CheckboxGroup","asChild","children","className","style","props","ref","formControlContext","formControlProps","isDisabled","isRequired","isInvalid","isReadOnly","ariaLabel","ariaLabelledBy","ariaDescribedBy","state","validationState","groupProps","contextValue","Comp","Provider","value","displayName"],"sourceRoot":"../../../src","sources":["checkbox/CheckboxGroup.tsx"],"mappings":";;AAAA,SAASA,UAAU,EAAEC,OAAO,QAAQ,OAAO;AAC3C,SAASC,IAAI,QAAwB,cAAc;AACnD,SAASC,cAAc,EAAEC,qBAAqB,QAAQ,eAAe;AACrE,SAASC,gBAAgB,QAAQ,6BAA6B;AAC9D,SAASC,qBAAqB,QAAQ,yBAAyB;AAC/D,SAASC,IAAI,QAAQ,SAAS;AAC9B,SAASC,oBAAoB,QAAQ,WAAW;AAAC,SAAAC,GAAA,IAAAC,IAAA;AASjD,OAAO,MAAMC,aAAa,gBAAGX,UAAU,CACrC,CAAC;EAAEY,OAAO;EAAEC,QAAQ;EAAEC,SAAS;EAAEC,KAAK;EAAE,GAAGC;AAAM,CAAC,EAAEC,GAAG,KAAK;EAC1D,MAAMC,kBAAkB,GAAGd,qBAAqB,CAAC,CAAC;EAClD,MAAMe,gBAAgB,GAAGhB,cAAc,CAAC;IACtCiB,UAAU,EAAEJ,KAAK,CAACI,UAAU;IAC5BC,UAAU,EAAEL,KAAK,CAACK,UAAU;IAC5BC,SAAS,EAAEN,KAAK,CAACM,SAAS;IAC1BC,UAAU,EAAEP,KAAK,CAACO;EACpB,CAAC,CAAC;EACF,MAAMC,SAAS,GAAGR,KAAK,CAAC,YAAY,CAAC;EACrC,MAAMS,cAAc,GAAGT,KAAK,CAAC,iBAAiB,CAAC,IAAIG,gBAAgB,CAAC,iBAAiB,CAAC;EACtF,MAAMO,eAAe,GAAGP,gBAAgB,CAAC,kBAAkB,CAAC;EAE5D,MAAMQ,KAAK,GAAGrB,qBAAqB,CAAC;IAClC,GAAGU,KAAK;IACRY,eAAe,EAAEZ,KAAK,CAACM,SAAS,GAAG,SAAS,GAAG;EACjD,CAAC,CAAC;EAEF,MAAM;IAAEO;EAAW,CAAC,GAAGxB,gBAAgB,CACrC;IACE,GAAGW,KAAK;IACR,YAAY,EAAEQ,SAAS;IACvB,iBAAiB,EAAEC;EACrB,CAAC,EACDE,KACF,CAAC;EAED,MAAMG,YAAY,GAAG7B,OAAO,CAC1B,OAAO;IAAE0B,KAAK,EAAE;MAAE,GAAGT,kBAAkB;MAAE,GAAGS;IAAM;EAAE,CAAC,CAAC,EACtD,CAACT,kBAAkB,EAAES,KAAK,CAC5B,CAAC;EAED,MAAMI,IAAI,GAAGnB,OAAO,GAAGL,IAAI,GAAGL,IAAI;EAElC,oBACEQ,IAAA,CAACF,oBAAoB,CAACwB,QAAQ;IAACC,KAAK,EAAEH,YAAa;IAAAjB,QAAA,eACjDH,IAAA,CAACqB,IAAI;MAAA,GACCF,UAAU;MACd,cAAYL,SAAU;MACtB,mBAAiBC,cAAe;MAChC,oBAAkBC,eAAgB;MAClCZ,SAAS,EAAEA,SAAU;MACrBC,KAAK,EAAEA,KAAM;MACbE,GAAG,EAAEA,GAAI;MAAAJ,QAAA,EAERA;IAAQ,CACL;EAAC,CACsB,CAAC;AAEpC,CACF,CAAC;AAEDF,aAAa,CAACuB,WAAW,GAAG,eAAe","ignoreList":[]}
package/lib/typescript/checkbox/CheckboxGroup.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"CheckboxGroup.d.ts","sourceRoot":"","sources":["../../../src/checkbox/CheckboxGroup.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAMpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAEnD,MAAM,WAAW,sBAAuB,SAAQ,mBAAmB;IACjE,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;CAC5B;AAED,eAAO,MAAM,aAAa,yGAgCzB,CAAC"}
1
+ {"version":3,"file":"CheckboxGroup.d.ts","sourceRoot":"","sources":["../../../src/checkbox/CheckboxGroup.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAMpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAEnD,MAAM,WAAW,sBAAuB,SAAQ,mBAAmB;IACjE,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;CAC5B;AAED,eAAO,MAAM,aAAa,yGAkDzB,CAAC"}
package/lib/typescript/checkbox/types.d.ts CHANGED
@@ -24,6 +24,7 @@ export interface ICheckboxGroupProps {
24
24
  isReadOnly?: boolean;
25
25
  isRequired?: boolean;
26
26
  'aria-label'?: string;
27
+ 'aria-labelledby'?: string;
27
28
  }
28
29
  export type ICheckboxProps = InterfaceCheckbox;
29
30
  export interface ICheckboxContextValue {
package/lib/typescript/checkbox/types.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/checkbox/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD,MAAM,WAAW,iBAAkB,SAAQ,cAAc;IACvD,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,CAAC,UAAU,EAAE,OAAO,KAAK,IAAI,CAAC;IACzC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACtC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,MAAM,cAAc,GAAG,iBAAiB,CAAC;AAE/C,MAAM,WAAW,qBAAqB;IACpC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/checkbox/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD,MAAM,WAAW,iBAAkB,SAAQ,cAAc;IACvD,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,CAAC,UAAU,EAAE,OAAO,KAAK,IAAI,CAAC;IACzC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACtC,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,MAAM,cAAc,GAAG,iBAAiB,CAAC;AAE/C,MAAM,WAAW,qBAAqB;IACpC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cdx-ui/primitives",
3
- "version": "0.0.1-beta.172",
3
+ "version": "0.0.1-beta.174",
4
4
  "license": "MIT",
5
5
  "repository": {
6
6
  "type": "git",
@@ -69,8 +69,8 @@
69
69
  "@react-stately/disclosure": "3.1.1",
70
70
  "@react-stately/radio": "3.12.0",
71
71
  "@react-stately/toggle": "3.9.4",
72
- "@cdx-ui/formatters": "0.0.1-beta.172",
73
- "@cdx-ui/utils": "0.0.1-beta.172"
72
+ "@cdx-ui/utils": "0.0.1-beta.174",
73
+ "@cdx-ui/formatters": "0.0.1-beta.174"
74
74
  },
75
75
  "devDependencies": {
76
76
  "@types/react": "19.1.17",
package/src/checkbox/CheckboxGroup.tsx CHANGED
@@ -1,6 +1,6 @@
1
1
  import { forwardRef, useMemo } from 'react';
2
2
  import { View, type ViewProps } from 'react-native';
3
- import { useFormControlContext } from '@cdx-ui/utils';
3
+ import { useFormControl, useFormControlContext } from '@cdx-ui/utils';
4
4
  import { useCheckboxGroup } from '@react-native-aria/checkbox';
5
5
  import { useCheckboxGroupState } from '@react-stately/checkbox';
6
6
  import { Slot } from '../slot';
@@ -15,6 +15,17 @@ export interface CheckboxGroupRootProps extends ICheckboxGroupProps {
15
15
 
16
16
  export const CheckboxGroup = forwardRef<View, CheckboxGroupRootProps>(
17
17
  ({ asChild, children, className, style, ...props }, ref) => {
18
+ const formControlContext = useFormControlContext();
19
+ const formControlProps = useFormControl({
20
+ isDisabled: props.isDisabled,
21
+ isRequired: props.isRequired,
22
+ isInvalid: props.isInvalid,
23
+ isReadOnly: props.isReadOnly,
24
+ });
25
+ const ariaLabel = props['aria-label'];
26
+ const ariaLabelledBy = props['aria-labelledby'] ?? formControlProps['aria-labelledby'];
27
+ const ariaDescribedBy = formControlProps['aria-describedby'];
28
+
18
29
  const state = useCheckboxGroupState({
19
30
  ...props,
20
31
  validationState: props.isInvalid ? 'invalid' : 'valid',
@@ -23,13 +34,12 @@ export const CheckboxGroup = forwardRef<View, CheckboxGroupRootProps>(
23
34
  const { groupProps } = useCheckboxGroup(
24
35
  {
25
36
  ...props,
26
- 'aria-label': props['aria-label'],
37
+ 'aria-label': ariaLabel,
38
+ 'aria-labelledby': ariaLabelledBy,
27
39
  },
28
40
  state,
29
41
  );
30
42
 
31
- const formControlContext = useFormControlContext();
32
-
33
43
  const contextValue = useMemo(
34
44
  () => ({ state: { ...formControlContext, ...state } }),
35
45
  [formControlContext, state],
@@ -39,7 +49,15 @@ export const CheckboxGroup = forwardRef<View, CheckboxGroupRootProps>(
39
49
 
40
50
  return (
41
51
  <CheckboxGroupContext.Provider value={contextValue}>
42
- <Comp {...groupProps} className={className} style={style} ref={ref}>
52
+ <Comp
53
+ {...groupProps}
54
+ aria-label={ariaLabel}
55
+ aria-labelledby={ariaLabelledBy}
56
+ aria-describedby={ariaDescribedBy}
57
+ className={className}
58
+ style={style}
59
+ ref={ref}
60
+ >
43
61
  {children}
44
62
  </Comp>
45
63
  </CheckboxGroupContext.Provider>
package/src/checkbox/types.ts CHANGED
@@ -26,6 +26,7 @@ export interface ICheckboxGroupProps {
26
26
  isReadOnly?: boolean;
27
27
  isRequired?: boolean;
28
28
  'aria-label'?: string;
29
+ 'aria-labelledby'?: string;
29
30
  }
30
31
 
31
32
  export type ICheckboxProps = InterfaceCheckbox;