payload 0.13.4 → 0.13.5
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/CHANGELOG.md +7 -0
- package/dist/admin/components/forms/field-types/Select/Input.d.ts +1 -1
- package/dist/admin/components/forms/field-types/Select/Input.js +8 -2
- package/dist/admin/components/forms/field-types/Select/index.js +4 -18
- package/dist/fields/config/types.d.ts +0 -2
- package/dist/fields/config/types.js +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
## [0.13.5](https://github.com/payloadcms/payload/compare/v0.13.4...v0.13.5) (2021-11-30)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* select component rendered value ([ecabf13](https://github.com/payloadcms/payload/commit/ecabf130fd1b4b87c45196d4bdf675e76b20c9e3))
|
|
7
|
+
|
|
1
8
|
## [0.13.4](https://github.com/payloadcms/payload/compare/v0.13.3...v0.13.4) (2021-11-30)
|
|
2
9
|
|
|
3
10
|
|
|
@@ -9,7 +9,7 @@ export declare type SelectInputProps = Omit<SelectField, 'type' | 'value' | 'opt
|
|
|
9
9
|
readOnly?: boolean;
|
|
10
10
|
path?: string;
|
|
11
11
|
required?: boolean;
|
|
12
|
-
value?: string;
|
|
12
|
+
value?: string | string[];
|
|
13
13
|
description?: Description;
|
|
14
14
|
onChange?: (value: ReactSelectValue) => void;
|
|
15
15
|
style?: React.CSSProperties;
|
|
@@ -13,14 +13,20 @@ const SelectInput = (props) => {
|
|
|
13
13
|
showError && 'error',
|
|
14
14
|
readOnly && 'read-only',
|
|
15
15
|
].filter(Boolean).join(' ');
|
|
16
|
-
|
|
16
|
+
let valueToRender;
|
|
17
|
+
if (hasMany && Array.isArray(value)) {
|
|
18
|
+
valueToRender = value.map((val) => options.find((option) => option.value === val));
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
valueToRender = options.find((option) => option.value === value);
|
|
22
|
+
}
|
|
17
23
|
return (React.createElement("div", { className: classes, style: {
|
|
18
24
|
...style,
|
|
19
25
|
width,
|
|
20
26
|
} },
|
|
21
27
|
React.createElement(Error, { showError: showError, message: errorMessage }),
|
|
22
28
|
React.createElement(Label, { htmlFor: path, label: label, required: required }),
|
|
23
|
-
React.createElement(ReactSelect, { onChange: onChange, value:
|
|
29
|
+
React.createElement(ReactSelect, { onChange: onChange, value: valueToRender, showError: showError, isDisabled: readOnly, options: options, isMulti: hasMany }),
|
|
24
30
|
React.createElement(FieldDescription, { value: value, description: description })));
|
|
25
31
|
};
|
|
26
32
|
export default SelectInput;
|
|
@@ -13,14 +13,14 @@ const formatOptions = (options) => options.map((option) => {
|
|
|
13
13
|
};
|
|
14
14
|
});
|
|
15
15
|
const Select = (props) => {
|
|
16
|
-
const { path: pathFromProps, name, required, validate = select, label, options: optionsFromProps, hasMany, admin: { readOnly, style, width, description, condition, } = {},
|
|
16
|
+
const { path: pathFromProps, name, required, validate = select, label, options: optionsFromProps, hasMany, admin: { readOnly, style, width, description, condition, } = {}, } = props;
|
|
17
17
|
const path = pathFromProps || name;
|
|
18
18
|
const [options] = useState(formatOptions(optionsFromProps));
|
|
19
19
|
const memoizedValidate = useCallback((value) => {
|
|
20
20
|
const validationResult = validate(value, { required, options });
|
|
21
21
|
return validationResult;
|
|
22
22
|
}, [validate, required, options]);
|
|
23
|
-
const { value
|
|
23
|
+
const { value, showError, setValue, errorMessage, } = useField({
|
|
24
24
|
path,
|
|
25
25
|
validate: memoizedValidate,
|
|
26
26
|
condition,
|
|
@@ -39,27 +39,13 @@ const Select = (props) => {
|
|
|
39
39
|
else {
|
|
40
40
|
newValue = selectedOption.value;
|
|
41
41
|
}
|
|
42
|
-
|
|
43
|
-
onChangeFromProps(newValue);
|
|
44
|
-
}
|
|
45
|
-
else {
|
|
46
|
-
setValue(newValue);
|
|
47
|
-
}
|
|
42
|
+
setValue(newValue);
|
|
48
43
|
}
|
|
49
44
|
}, [
|
|
50
45
|
readOnly,
|
|
51
46
|
hasMany,
|
|
52
|
-
onChangeFromProps,
|
|
53
47
|
setValue,
|
|
54
48
|
]);
|
|
55
|
-
|
|
56
|
-
const value = valueFromProps || valueFromContext || '';
|
|
57
|
-
if (hasMany && Array.isArray(value)) {
|
|
58
|
-
valueToRender = value.map((val) => options.find((option) => option.value === val));
|
|
59
|
-
}
|
|
60
|
-
else {
|
|
61
|
-
valueToRender = options.find((option) => option.value === value);
|
|
62
|
-
}
|
|
63
|
-
return (React.createElement(SelectInput, { onChange: onChange, value: valueToRender, name: name, options: options, label: label, showError: showError, errorMessage: errorMessage, description: description, style: style, width: width, hasMany: hasMany }));
|
|
49
|
+
return (React.createElement(SelectInput, { onChange: onChange, value: value, name: name, options: options, label: label, showError: showError, errorMessage: errorMessage, description: description, style: style, width: width, hasMany: hasMany }));
|
|
64
50
|
};
|
|
65
51
|
export default withCondition(Select);
|
|
@@ -162,8 +162,6 @@ export declare type SelectField = FieldBase & {
|
|
|
162
162
|
type: 'select';
|
|
163
163
|
options: Option[];
|
|
164
164
|
hasMany?: boolean;
|
|
165
|
-
value?: string;
|
|
166
|
-
onChange?: (value: string) => void;
|
|
167
165
|
};
|
|
168
166
|
export declare type RelationshipField = FieldBase & {
|
|
169
167
|
type: 'relationship';
|
|
@@ -41,4 +41,4 @@ function fieldAffectsData(field) {
|
|
|
41
41
|
return 'name' in field && !fieldIsPresentationalOnly(field);
|
|
42
42
|
}
|
|
43
43
|
exports.fieldAffectsData = fieldAffectsData;
|
|
44
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
44
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvZmllbGRzL2NvbmZpZy90eXBlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFvVkEsU0FBZ0IsaUJBQWlCLENBQUMsS0FBWTtJQUM1QyxPQUFPLENBQUMsS0FBSyxDQUFDLElBQUksS0FBSyxPQUFPLElBQUksS0FBSyxDQUFDLElBQUksS0FBSyxPQUFPLElBQUksS0FBSyxDQUFDLElBQUksS0FBSyxLQUFLLENBQUMsQ0FBQztBQUNwRixDQUFDO0FBRkQsOENBRUM7QUFFRCxTQUFnQixnQkFBZ0IsQ0FBQyxLQUFZO0lBQzNDLE9BQU8sS0FBSyxDQUFDLElBQUksS0FBSyxPQUFPLENBQUM7QUFDaEMsQ0FBQztBQUZELDRDQUVDO0FBRUQsU0FBZ0IsZ0JBQWdCLENBQUMsS0FBWTtJQUMzQyxPQUFPLEtBQUssQ0FBQyxJQUFJLEtBQUssUUFBUSxDQUFDO0FBQ2pDLENBQUM7QUFGRCw0Q0FFQztBQUVELFNBQWdCLGNBQWMsQ0FBQyxNQUFjO0lBQzNDLE9BQU8sT0FBTyxNQUFNLEtBQUssUUFBUSxDQUFDO0FBQ3BDLENBQUM7QUFGRCx3Q0FFQztBQUVELFNBQWdCLGlCQUFpQixDQUFDLE9BQWlCO0lBQ2pELE9BQU8sS0FBSyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxPQUFPLENBQUEsT0FBTyxhQUFQLE9BQU8sdUJBQVAsT0FBTyxDQUFHLENBQUMsQ0FBQyxDQUFBLEtBQUssUUFBUSxDQUFDO0FBQ3BFLENBQUM7QUFGRCw4Q0FFQztBQUVELFNBQWdCLGFBQWEsQ0FBQyxNQUFjO0lBQzFDLE9BQU8sT0FBTyxNQUFNLEtBQUssUUFBUSxDQUFDO0FBQ3BDLENBQUM7QUFGRCxzQ0FFQztBQUVELFNBQWdCLGlCQUFpQixDQUFDLEtBQVk7SUFDNUMsT0FBTyxLQUFLLENBQUMsSUFBSSxLQUFLLFFBQVEsSUFBSSxLQUFLLENBQUMsSUFBSSxLQUFLLGNBQWMsQ0FBQztBQUNsRSxDQUFDO0FBRkQsOENBRUM7QUFFRCxTQUFnQixnQkFBZ0IsQ0FBQyxLQUFZO0lBQzNDLE9BQU8sQ0FBQyxLQUFLLENBQUMsSUFBSSxLQUFLLFFBQVEsSUFBSSxLQUFLLENBQUMsSUFBSSxLQUFLLGNBQWMsQ0FBQyxJQUFJLE9BQU8sS0FBSyxDQUFDLFFBQVEsS0FBSyxRQUFRLENBQUM7QUFDMUcsQ0FBQztBQUZELDRDQUVDO0FBRUQsU0FBZ0IseUJBQXlCLENBQUMsS0FBWTtJQUNwRCxPQUFPLEtBQUssQ0FBQyxJQUFJLEtBQUssSUFBSSxDQUFDO0FBQzdCLENBQUM7QUFGRCw4REFFQztBQUVELFNBQWdCLGdCQUFnQixDQUFDLEtBQVk7SUFDM0MsT0FBTyxNQUFNLElBQUksS0FBSyxJQUFJLENBQUMseUJBQXlCLENBQUMsS0FBSyxDQUFDLENBQUM7QUFDOUQsQ0FBQztBQUZELDRDQUVDIn0=
|