Skip to content

Commit 4e6990b

Browse files
committed
fix chakra CheckboxesWidget value assign
1 parent 78c4706 commit 4e6990b

File tree

2 files changed

+2
-22
lines changed

2 files changed

+2
-22
lines changed

packages/chakra-ui/src/CheckboxesWidget/CheckboxesWidget.tsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { CheckboxGroup, Text, Stack, FieldsetRoot } from '@chakra-ui/react';
33
import {
44
ariaDescribedByIds,
55
enumOptionsIndexForValue,
6-
enumOptionsIsSelected,
76
enumOptionsValueForIndex,
87
labelValue,
98
optionId,
@@ -35,7 +34,6 @@ export default function CheckboxesWidget<
3534
} = props;
3635
const { enumOptions, enumDisabled, emptyValue } = options;
3736
// const chakraProps = getChakra({ uiSchema });
38-
const checkboxesValues = Array.isArray(value) ? value : [value];
3937

4038
const _onBlur = ({ target }: FocusEvent<HTMLInputElement | any>) =>
4139
onBlur(id, enumOptionsValueForIndex<S>(target && target.value, enumOptions, emptyValue));
@@ -54,7 +52,7 @@ export default function CheckboxesWidget<
5452
>
5553
<CheckboxGroup
5654
onValueChange={(option) => onChange(enumOptionsValueForIndex<S>(option, enumOptions, emptyValue))}
57-
defaultValue={selectedIndexes}
55+
value={selectedIndexes}
5856
aria-describedby={ariaDescribedByIds<T>(id)}
5957
readOnly={readonly}
6058
required={required}
@@ -63,15 +61,13 @@ export default function CheckboxesWidget<
6361
<Stack direction={row ? 'row' : 'column'}>
6462
{Array.isArray(enumOptions) &&
6563
enumOptions.map((option, index) => {
66-
const checked = enumOptionsIsSelected<S>(option.value, checkboxesValues);
6764
const itemDisabled = Array.isArray(enumDisabled) && enumDisabled.indexOf(option.value) !== -1;
6865
return (
6966
<Checkbox
7067
key={index}
7168
id={optionId(id, index)}
7269
name={id}
7370
value={String(index)}
74-
checked={checked}
7571
disabled={disabled || itemDisabled || readonly}
7672
onBlur={_onBlur}
7773
onFocus={_onFocus}

packages/chakra-ui/src/FieldTemplate/FieldTemplate.tsx

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import {
66
RJSFSchema,
77
StrictRJSFSchema,
88
} from '@rjsf/utils';
9-
import { Text } from '@chakra-ui/react';
10-
import { Field } from '../components/ui/field';
119

1210
export default function FieldTemplate<
1311
T = any,
@@ -20,19 +18,13 @@ export default function FieldTemplate<
2018
classNames,
2119
style,
2220
disabled,
23-
displayLabel,
2421
hidden,
2522
label,
2623
onDropPropertyClick,
2724
onKeyChange,
2825
readonly,
2926
registry,
3027
required,
31-
rawErrors = [],
32-
errors,
33-
help,
34-
description,
35-
rawDescription,
3628
schema,
3729
uiSchema,
3830
} = props;
@@ -62,15 +54,7 @@ export default function FieldTemplate<
6254
uiSchema={uiSchema}
6355
registry={registry}
6456
>
65-
<Field
66-
required={required}
67-
invalid={rawErrors && rawErrors.length > 0}
68-
label={displayLabel && rawDescription ? <Text mt={2}>{description}</Text> : null}
69-
helperText={help}
70-
errorText={errors}
71-
>
72-
{children}
73-
</Field>
57+
{children}
7458
</WrapIfAdditionalTemplate>
7559
);
7660
}

0 commit comments

Comments
 (0)