@navikt/ds-react 0.16.14 → 0.16.17
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/cjs/form/checkbox/Checkbox.js +1 -0
- package/cjs/form/checkbox/useCheckbox.js +3 -4
- package/esm/form/checkbox/Checkbox.d.ts +1 -1
- package/esm/form/checkbox/Checkbox.js +1 -0
- package/esm/form/checkbox/Checkbox.js.map +1 -1
- package/esm/form/checkbox/CheckboxGroup.d.ts +6 -6
- package/esm/form/checkbox/CheckboxGroup.js.map +1 -1
- package/esm/form/checkbox/useCheckbox.js +3 -4
- package/esm/form/checkbox/useCheckbox.js.map +1 -1
- package/esm/form/radio/Radio.d.ts +1 -1
- package/esm/form/radio/RadioGroup.d.ts +6 -6
- package/package.json +3 -3
- package/src/form/checkbox/Checkbox.tsx +2 -1
- package/src/form/checkbox/CheckboxGroup.tsx +8 -10
- package/src/form/checkbox/useCheckbox.ts +3 -5
- package/src/form/radio/Radio.tsx +1 -1
- package/src/form/radio/RadioGroup.tsx +6 -6
|
@@ -39,6 +39,7 @@ const Checkbox = (0, react_1.forwardRef)((props, ref) => {
|
|
|
39
39
|
"error",
|
|
40
40
|
"description",
|
|
41
41
|
"hideLabel",
|
|
42
|
+
"indeterminate",
|
|
42
43
|
]), inputProps, { type: "checkbox", className: "navds-checkbox__input", "aria-checked": props.indeterminate ? "mixed" : inputProps.checked, ref: (el) => {
|
|
43
44
|
var _a;
|
|
44
45
|
if (el) {
|
|
@@ -30,14 +30,13 @@ const useCheckbox = (_a) => {
|
|
|
30
30
|
console.warn("A <Checkbox> element within a <CheckboxGroup> requires a `value` property.");
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
|
-
const value = props.value;
|
|
34
33
|
return Object.assign(Object.assign({}, rest), { inputProps: Object.assign(Object.assign({}, inputProps), { checked: (checkboxGroup === null || checkboxGroup === void 0 ? void 0 : checkboxGroup.value)
|
|
35
|
-
? checkboxGroup.value.includes(value)
|
|
34
|
+
? checkboxGroup.value.includes(props.value)
|
|
36
35
|
: props.checked, defaultChecked: (checkboxGroup === null || checkboxGroup === void 0 ? void 0 : checkboxGroup.defaultValue)
|
|
37
|
-
? checkboxGroup.defaultValue.includes(value)
|
|
36
|
+
? checkboxGroup.defaultValue.includes(props.value)
|
|
38
37
|
: props.defaultChecked, onChange: (e) => {
|
|
39
38
|
props.onChange && props.onChange(e);
|
|
40
|
-
checkboxGroup && checkboxGroup.toggleValue(value);
|
|
39
|
+
checkboxGroup && checkboxGroup.toggleValue(props.value);
|
|
41
40
|
} }) });
|
|
42
41
|
};
|
|
43
42
|
exports.default = useCheckbox;
|
|
@@ -17,7 +17,7 @@ export interface CheckboxProps extends Omit<FormFieldProps, "errorId">, Omit<Inp
|
|
|
17
17
|
/**
|
|
18
18
|
* The value of the HTML element.
|
|
19
19
|
*/
|
|
20
|
-
value?:
|
|
20
|
+
value?: any;
|
|
21
21
|
/**
|
|
22
22
|
* Specify whether the Checkbox is in an indeterminate state
|
|
23
23
|
* @default false
|
|
@@ -15,6 +15,7 @@ const Checkbox = forwardRef((props, ref) => {
|
|
|
15
15
|
"error",
|
|
16
16
|
"description",
|
|
17
17
|
"hideLabel",
|
|
18
|
+
"indeterminate",
|
|
18
19
|
]), inputProps, { type: "checkbox", className: "navds-checkbox__input", "aria-checked": props.indeterminate ? "mixed" : inputProps.checked, ref: (el) => {
|
|
19
20
|
var _a;
|
|
20
21
|
if (el) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Checkbox.js","sourceRoot":"","sources":["../../../src/form/checkbox/Checkbox.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAuB,MAAM,OAAO,CAAC;AAC/D,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,WAAW,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AA6BhD,MAAM,QAAQ,GAAG,UAAU,CAAkC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;IAC1E,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IAE1D,MAAM,WAAW,GAAG,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;IAE3D,OAAO,CACL,6BACE,SAAS,EAAE,EAAE,CACX,KAAK,CAAC,SAAS,EACf,gBAAgB,EAChB,mBAAmB,IAAI,EAAE,EACzB;YACE,uBAAuB,EAAE,QAAQ;YACjC,0BAA0B,EAAE,UAAU,CAAC,QAAQ;SAChD,CACF;QAED,+CACM,IAAI,CAAC,KAAK,EAAE;YACd,UAAU;YACV,MAAM;YACN,OAAO;YACP,aAAa;YACb,WAAW;
|
|
1
|
+
{"version":3,"file":"Checkbox.js","sourceRoot":"","sources":["../../../src/form/checkbox/Checkbox.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAuB,MAAM,OAAO,CAAC;AAC/D,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,WAAW,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AA6BhD,MAAM,QAAQ,GAAG,UAAU,CAAkC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;IAC1E,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;IAE1D,MAAM,WAAW,GAAG,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;IAE3D,OAAO,CACL,6BACE,SAAS,EAAE,EAAE,CACX,KAAK,CAAC,SAAS,EACf,gBAAgB,EAChB,mBAAmB,IAAI,EAAE,EACzB;YACE,uBAAuB,EAAE,QAAQ;YACjC,0BAA0B,EAAE,UAAU,CAAC,QAAQ;SAChD,CACF;QAED,+CACM,IAAI,CAAC,KAAK,EAAE;YACd,UAAU;YACV,MAAM;YACN,OAAO;YACP,aAAa;YACb,WAAW;YACX,eAAe;SAChB,CAAC,EACE,UAAU,IACd,IAAI,EAAC,UAAU,EACf,SAAS,EAAC,uBAAuB,kBACnB,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,EAChE,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE;;gBACV,IAAI,EAAE,EAAE;oBACN,EAAE,CAAC,aAAa,GAAG,MAAA,KAAK,CAAC,aAAa,mCAAI,KAAK,CAAC;iBACjD;gBAED,IAAI,OAAO,GAAG,KAAK,UAAU,EAAE;oBAC7B,GAAG,CAAC,EAAE,CAAC,CAAC;iBACT;qBAAM,IAAI,GAAG,IAAI,IAAI,EAAE;oBACtB,GAAG,CAAC,OAAO,GAAG,EAAE,CAAC;iBAClB;YACH,CAAC,IACD;QACF,+BAAO,OAAO,EAAE,UAAU,CAAC,EAAE,EAAE,SAAS,EAAC,uBAAuB;YAC9D,6BACE,SAAS,EAAE,EAAE,CAAC,yBAAyB,EAAE;oBACvC,eAAe,EAAE,KAAK,CAAC,SAAS;iBACjC,CAAC;gBAEF,oBAAC,SAAS,IAAC,EAAE,EAAC,KAAK,EAAC,IAAI,EAAE,IAAI,IAC3B,KAAK,CAAC,QAAQ,CACL;gBACX,KAAK,CAAC,WAAW,IAAI,CACpB,oBAAC,WAAW,IACV,EAAE,EAAC,KAAK,EACR,IAAI,EAAC,OAAO,EACZ,SAAS,EAAC,6BAA6B,IAEtC,KAAK,CAAC,WAAW,CACN,CACf,CACG,CACA,CACJ,CACP,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,eAAe,QAAQ,CAAC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import React from "react";
|
|
2
2
|
import { FieldsetProps } from "..";
|
|
3
3
|
export interface CheckboxGroupState {
|
|
4
|
-
readonly defaultValue?:
|
|
5
|
-
readonly value?:
|
|
6
|
-
toggleValue(value:
|
|
4
|
+
readonly defaultValue?: readonly any[];
|
|
5
|
+
readonly value?: readonly any[];
|
|
6
|
+
toggleValue(value: any): void;
|
|
7
7
|
}
|
|
8
8
|
export declare const CheckboxGroupContext: React.Context<CheckboxGroupState | null>;
|
|
9
9
|
export interface CheckboxGroupProps extends Omit<FieldsetProps, "onChange" | "errorPropagation" | "defaultValue"> {
|
|
@@ -14,15 +14,15 @@ export interface CheckboxGroupProps extends Omit<FieldsetProps, "onChange" | "er
|
|
|
14
14
|
/**
|
|
15
15
|
* Controlled state for group
|
|
16
16
|
*/
|
|
17
|
-
value?:
|
|
17
|
+
value?: any[];
|
|
18
18
|
/**
|
|
19
19
|
* Default checked checkboxes on render
|
|
20
20
|
*/
|
|
21
|
-
defaultValue?:
|
|
21
|
+
defaultValue?: any[];
|
|
22
22
|
/**
|
|
23
23
|
* Returns current checked checkboxes in group
|
|
24
24
|
*/
|
|
25
|
-
onChange?: (value:
|
|
25
|
+
onChange?: (value: any[]) => void;
|
|
26
26
|
}
|
|
27
27
|
declare const CheckboxGroup: React.ForwardRefExoticComponent<CheckboxGroupProps & React.RefAttributes<HTMLFieldSetElement>>;
|
|
28
28
|
export default CheckboxGroup;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CheckboxGroup.js","sourceRoot":"","sources":["../../../src/form/checkbox/CheckboxGroup.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC/E,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAiB,eAAe,EAAE,MAAM,IAAI,CAAC;AAQ9D,MAAM,CAAC,MAAM,oBAAoB,GAAG,aAAa,CAC/C,IAAI,CACL,CAAC;AAyBF,MAAM,aAAa,GAAG,UAAU,CAC9B,CACE,EAA0E,EAC1E,GAAG,EACH,EAAE;;QAFF,EAAE,KAAK,EAAE,YAAY,EAAE,QAAQ,GAAG,GAAG,EAAE,GAAE,CAAC,EAAE,QAAQ,EAAE,SAAS,OAAW,EAAN,IAAI,cAAxE,8DAA0E,CAAF;IAGxE,MAAM,QAAQ,GAAG,UAAU,CAAC,eAAe,CAAC,CAAC;IAE7C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,
|
|
1
|
+
{"version":3,"file":"CheckboxGroup.js","sourceRoot":"","sources":["../../../src/form/checkbox/CheckboxGroup.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC/E,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAiB,eAAe,EAAE,MAAM,IAAI,CAAC;AAQ9D,MAAM,CAAC,MAAM,oBAAoB,GAAG,aAAa,CAC/C,IAAI,CACL,CAAC;AAyBF,MAAM,aAAa,GAAG,UAAU,CAC9B,CACE,EAA0E,EAC1E,GAAG,EACH,EAAE;;QAFF,EAAE,KAAK,EAAE,YAAY,EAAE,QAAQ,GAAG,GAAG,EAAE,GAAE,CAAC,EAAE,QAAQ,EAAE,SAAS,OAAW,EAAN,IAAI,cAAxE,8DAA0E,CAAF;IAGxE,MAAM,QAAQ,GAAG,UAAU,CAAC,eAAe,CAAC,CAAC;IAE7C,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAQ,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,EAAE,CAAC,CAAC;IAE9D,MAAM,WAAW,GAAG,CAAC,CAAM,EAAE,EAAE;QAC7B,MAAM,QAAQ,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,KAAK,CAAC;QAChC,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;YACnC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;YACjC,CAAC,CAAC,CAAC,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC;QAErB,KAAK,KAAK,SAAS,IAAI,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAC1C,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACrB,CAAC,CAAC;IAEF,OAAO,CACL,oBAAC,QAAQ,oBACH,IAAI,IACR,GAAG,EAAE,GAAG,EACR,SAAS,EAAE,EAAE,CACX,SAAS,EACT,sBAAsB,EACtB,yBAAyB,MAAA,MAAA,IAAI,CAAC,IAAI,mCAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,mCAAI,QAAQ,EAAE,CACnE;QAED,oBAAC,oBAAoB,CAAC,QAAQ,IAC5B,KAAK,EAAE;gBACL,KAAK;gBACL,YAAY;gBACZ,WAAW;aACZ;YAED,6BAAK,SAAS,EAAC,kBAAkB,IAAE,QAAQ,CAAO,CACpB,CACvB,CACZ,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,eAAe,aAAa,CAAC"}
|
|
@@ -28,14 +28,13 @@ const useCheckbox = (_a) => {
|
|
|
28
28
|
console.warn("A <Checkbox> element within a <CheckboxGroup> requires a `value` property.");
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
|
-
const value = props.value;
|
|
32
31
|
return Object.assign(Object.assign({}, rest), { inputProps: Object.assign(Object.assign({}, inputProps), { checked: (checkboxGroup === null || checkboxGroup === void 0 ? void 0 : checkboxGroup.value)
|
|
33
|
-
? checkboxGroup.value.includes(value)
|
|
32
|
+
? checkboxGroup.value.includes(props.value)
|
|
34
33
|
: props.checked, defaultChecked: (checkboxGroup === null || checkboxGroup === void 0 ? void 0 : checkboxGroup.defaultValue)
|
|
35
|
-
? checkboxGroup.defaultValue.includes(value)
|
|
34
|
+
? checkboxGroup.defaultValue.includes(props.value)
|
|
36
35
|
: props.defaultChecked, onChange: (e) => {
|
|
37
36
|
props.onChange && props.onChange(e);
|
|
38
|
-
checkboxGroup && checkboxGroup.toggleValue(value);
|
|
37
|
+
checkboxGroup && checkboxGroup.toggleValue(props.value);
|
|
39
38
|
} }) });
|
|
40
39
|
};
|
|
41
40
|
export default useCheckbox;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useCheckbox.js","sourceRoot":"","sources":["../../../src/form/checkbox/useCheckbox.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAEnC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAE7B;;GAEG;AACH,MAAM,WAAW,GAAG,CAAC,EAAqC,EAAE,EAAE;QAAzC,EAAE,QAAQ,OAA2B,EAAtB,KAAK,cAApB,YAAsB,CAAF;IACvC,MAAM,aAAa,GAAG,UAAU,CAAC,oBAAoB,CAAC,CAAC;IAEvD,MAAM,KAA0B,YAAY,CAC1C,IAAI,CAAC,KAAK,EAAE,CAAC,aAAa,CAAC,CAAC,EAC5B,UAAU,CACX,EAHK,EAAE,UAAU,OAGjB,EAHsB,IAAI,cAArB,cAAuB,CAG5B,CAAC;IAEF,IAAI,aAAa,EAAE;QACjB,IAAI,KAAK,CAAC,OAAO,EAAE;YACjB,OAAO,CAAC,IAAI,CACV,8IAA8I,CAC/I,CAAC;SACH;QACD,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,EAAE;YAC7B,OAAO,CAAC,IAAI,CACV,4EAA4E,CAC7E,CAAC;SACH;KACF;IAED,
|
|
1
|
+
{"version":3,"file":"useCheckbox.js","sourceRoot":"","sources":["../../../src/form/checkbox/useCheckbox.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAEnC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAE7B;;GAEG;AACH,MAAM,WAAW,GAAG,CAAC,EAAqC,EAAE,EAAE;QAAzC,EAAE,QAAQ,OAA2B,EAAtB,KAAK,cAApB,YAAsB,CAAF;IACvC,MAAM,aAAa,GAAG,UAAU,CAAC,oBAAoB,CAAC,CAAC;IAEvD,MAAM,KAA0B,YAAY,CAC1C,IAAI,CAAC,KAAK,EAAE,CAAC,aAAa,CAAC,CAAC,EAC5B,UAAU,CACX,EAHK,EAAE,UAAU,OAGjB,EAHsB,IAAI,cAArB,cAAuB,CAG5B,CAAC;IAEF,IAAI,aAAa,EAAE;QACjB,IAAI,KAAK,CAAC,OAAO,EAAE;YACjB,OAAO,CAAC,IAAI,CACV,8IAA8I,CAC/I,CAAC;SACH;QACD,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,EAAE;YAC7B,OAAO,CAAC,IAAI,CACV,4EAA4E,CAC7E,CAAC;SACH;KACF;IAED,uCACK,IAAI,KACP,UAAU,kCACL,UAAU,KACb,OAAO,EAAE,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,KAAK;gBAC3B,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC;gBAC3C,CAAC,CAAC,KAAK,CAAC,OAAO,EACjB,cAAc,EAAE,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,YAAY;gBACzC,CAAC,CAAC,aAAa,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC;gBAClD,CAAC,CAAC,KAAK,CAAC,cAAc,EACxB,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE;gBACd,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACpC,aAAa,IAAI,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC1D,CAAC,OAEH;AACJ,CAAC,CAAC;AAEF,eAAe,WAAW,CAAC"}
|
|
@@ -8,7 +8,7 @@ export interface RadioProps extends Omit<FormFieldProps, "error" | "errorId">, O
|
|
|
8
8
|
/**
|
|
9
9
|
* The value of the HTML element
|
|
10
10
|
*/
|
|
11
|
-
value:
|
|
11
|
+
value: any;
|
|
12
12
|
}
|
|
13
13
|
declare const Radio: React.ForwardRefExoticComponent<RadioProps & React.RefAttributes<HTMLInputElement>>;
|
|
14
14
|
export default Radio;
|
|
@@ -2,9 +2,9 @@ import React from "react";
|
|
|
2
2
|
import { FieldsetProps } from "..";
|
|
3
3
|
export interface RadioGroupContextProps {
|
|
4
4
|
name: string;
|
|
5
|
-
defaultValue?:
|
|
6
|
-
value?:
|
|
7
|
-
onChange: (value:
|
|
5
|
+
defaultValue?: any;
|
|
6
|
+
value?: any;
|
|
7
|
+
onChange: (value: any) => void;
|
|
8
8
|
required?: boolean;
|
|
9
9
|
}
|
|
10
10
|
export declare const RadioGroupContext: React.Context<RadioGroupContextProps | null>;
|
|
@@ -20,15 +20,15 @@ export interface RadioGroupProps extends Omit<FieldsetProps, "onChange" | "error
|
|
|
20
20
|
/**
|
|
21
21
|
* Default checked radiobutton
|
|
22
22
|
*/
|
|
23
|
-
defaultValue?:
|
|
23
|
+
defaultValue?: any;
|
|
24
24
|
/**
|
|
25
25
|
* Controlled state for Radiobutton
|
|
26
26
|
*/
|
|
27
|
-
value?:
|
|
27
|
+
value?: any;
|
|
28
28
|
/**
|
|
29
29
|
* Returns current checked radiobutton in group
|
|
30
30
|
*/
|
|
31
|
-
onChange?: (value:
|
|
31
|
+
onChange?: (value: any) => void;
|
|
32
32
|
/**
|
|
33
33
|
* Tells Fieldset if group is required
|
|
34
34
|
*/
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@navikt/ds-react",
|
|
3
|
-
"version": "0.16.
|
|
3
|
+
"version": "0.16.17",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "NAV designsystem react components",
|
|
6
6
|
"author": "NAV Designsystem team",
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
"@material-ui/core": "^4.12.3",
|
|
38
38
|
"@navikt/ds-icons": "^0.8.4",
|
|
39
39
|
"@popperjs/core": "^2.10.1",
|
|
40
|
-
"@radix-ui/react-toggle-group": "
|
|
40
|
+
"@radix-ui/react-toggle-group": "0.1.4",
|
|
41
41
|
"classnames": "^2.2.6",
|
|
42
42
|
"react-collapse": "^5.1.0",
|
|
43
43
|
"react-merge-refs": "^1.1.0",
|
|
@@ -65,5 +65,5 @@
|
|
|
65
65
|
"@types/react": "^17.0.30",
|
|
66
66
|
"react": "^17.0.0"
|
|
67
67
|
},
|
|
68
|
-
"gitHead": "
|
|
68
|
+
"gitHead": "9c86becab0a0f5d4cd2d9086e4c2c65812eb71fc"
|
|
69
69
|
}
|
|
@@ -23,7 +23,7 @@ export interface CheckboxProps
|
|
|
23
23
|
/**
|
|
24
24
|
* The value of the HTML element.
|
|
25
25
|
*/
|
|
26
|
-
value?:
|
|
26
|
+
value?: any;
|
|
27
27
|
/**
|
|
28
28
|
* Specify whether the Checkbox is in an indeterminate state
|
|
29
29
|
* @default false
|
|
@@ -55,6 +55,7 @@ const Checkbox = forwardRef<HTMLInputElement, CheckboxProps>((props, ref) => {
|
|
|
55
55
|
"error",
|
|
56
56
|
"description",
|
|
57
57
|
"hideLabel",
|
|
58
|
+
"indeterminate",
|
|
58
59
|
])}
|
|
59
60
|
{...inputProps}
|
|
60
61
|
type="checkbox"
|
|
@@ -3,9 +3,9 @@ import cl from "classnames";
|
|
|
3
3
|
import { Fieldset, FieldsetProps, FieldsetContext } from "..";
|
|
4
4
|
|
|
5
5
|
export interface CheckboxGroupState {
|
|
6
|
-
readonly defaultValue?:
|
|
7
|
-
readonly value?:
|
|
8
|
-
toggleValue(value:
|
|
6
|
+
readonly defaultValue?: readonly any[];
|
|
7
|
+
readonly value?: readonly any[];
|
|
8
|
+
toggleValue(value: any): void;
|
|
9
9
|
}
|
|
10
10
|
|
|
11
11
|
export const CheckboxGroupContext = createContext<CheckboxGroupState | null>(
|
|
@@ -24,15 +24,15 @@ export interface CheckboxGroupProps
|
|
|
24
24
|
/**
|
|
25
25
|
* Controlled state for group
|
|
26
26
|
*/
|
|
27
|
-
value?:
|
|
27
|
+
value?: any[];
|
|
28
28
|
/**
|
|
29
29
|
* Default checked checkboxes on render
|
|
30
30
|
*/
|
|
31
|
-
defaultValue?:
|
|
31
|
+
defaultValue?: any[];
|
|
32
32
|
/**
|
|
33
33
|
* Returns current checked checkboxes in group
|
|
34
34
|
*/
|
|
35
|
-
onChange?: (value:
|
|
35
|
+
onChange?: (value: any[]) => void;
|
|
36
36
|
}
|
|
37
37
|
|
|
38
38
|
const CheckboxGroup = forwardRef<HTMLFieldSetElement, CheckboxGroupProps>(
|
|
@@ -42,11 +42,9 @@ const CheckboxGroup = forwardRef<HTMLFieldSetElement, CheckboxGroupProps>(
|
|
|
42
42
|
) => {
|
|
43
43
|
const fieldset = useContext(FieldsetContext);
|
|
44
44
|
|
|
45
|
-
const [state, setState] = useState<
|
|
46
|
-
defaultValue ?? []
|
|
47
|
-
);
|
|
45
|
+
const [state, setState] = useState<any[]>(defaultValue ?? []);
|
|
48
46
|
|
|
49
|
-
const toggleValue = (v:
|
|
47
|
+
const toggleValue = (v: any) => {
|
|
50
48
|
const newValue = value ?? state;
|
|
51
49
|
const newState = newValue.includes(v)
|
|
52
50
|
? newValue.filter((x) => x !== v)
|
|
@@ -28,21 +28,19 @@ const useCheckbox = ({ children, ...props }: CheckboxProps) => {
|
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
30
|
|
|
31
|
-
const value = props.value as string | number | boolean;
|
|
32
|
-
|
|
33
31
|
return {
|
|
34
32
|
...rest,
|
|
35
33
|
inputProps: {
|
|
36
34
|
...inputProps,
|
|
37
35
|
checked: checkboxGroup?.value
|
|
38
|
-
? checkboxGroup.value.includes(value)
|
|
36
|
+
? checkboxGroup.value.includes(props.value)
|
|
39
37
|
: props.checked,
|
|
40
38
|
defaultChecked: checkboxGroup?.defaultValue
|
|
41
|
-
? checkboxGroup.defaultValue.includes(value)
|
|
39
|
+
? checkboxGroup.defaultValue.includes(props.value)
|
|
42
40
|
: props.defaultChecked,
|
|
43
41
|
onChange: (e) => {
|
|
44
42
|
props.onChange && props.onChange(e);
|
|
45
|
-
checkboxGroup && checkboxGroup.toggleValue(value);
|
|
43
|
+
checkboxGroup && checkboxGroup.toggleValue(props.value);
|
|
46
44
|
},
|
|
47
45
|
},
|
|
48
46
|
};
|
package/src/form/radio/Radio.tsx
CHANGED
|
@@ -5,9 +5,9 @@ import { useId } from "../..";
|
|
|
5
5
|
|
|
6
6
|
export interface RadioGroupContextProps {
|
|
7
7
|
name: string;
|
|
8
|
-
defaultValue?:
|
|
9
|
-
value?:
|
|
10
|
-
onChange: (value:
|
|
8
|
+
defaultValue?: any;
|
|
9
|
+
value?: any;
|
|
10
|
+
onChange: (value: any) => void;
|
|
11
11
|
required?: boolean;
|
|
12
12
|
}
|
|
13
13
|
|
|
@@ -31,15 +31,15 @@ export interface RadioGroupProps
|
|
|
31
31
|
/**
|
|
32
32
|
* Default checked radiobutton
|
|
33
33
|
*/
|
|
34
|
-
defaultValue?:
|
|
34
|
+
defaultValue?: any;
|
|
35
35
|
/**
|
|
36
36
|
* Controlled state for Radiobutton
|
|
37
37
|
*/
|
|
38
|
-
value?:
|
|
38
|
+
value?: any;
|
|
39
39
|
/**
|
|
40
40
|
* Returns current checked radiobutton in group
|
|
41
41
|
*/
|
|
42
|
-
onChange?: (value:
|
|
42
|
+
onChange?: (value: any) => void;
|
|
43
43
|
/**
|
|
44
44
|
* Tells Fieldset if group is required
|
|
45
45
|
*/
|