gcg/static-cms
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: list markdown widgets (#4492)

Browse Source
This commit is contained in:
Bartholomew 2020-11-26 13:54:41 +01:00 committed by GitHub
parent b8adb92931
commit 4789d20538
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/netlify-cms-widget-list/src/ListControl.js
View File

@ -321,13 +321,12 @@ export default class ListControl extends React.Component {
};
}
handleRemove = (index, key, event) => {
handleRemove = (index, event) => {
event.preventDefault();
const { itemsCollapsed, keys } = this.state;
const { itemsCollapsed } = this.state;
const { value, metadata, onChange, field, clearFieldErrors } = this.props;
const collectionName = field.get('name');
const isSingleField = this.getValueType() === valueTypes.SINGLE;
const validations = this.validations;
const metadataRemovePath = isSingleField ? value.get(index) : value.get(index).valueSeq();
const parsedMetadata =
@ -336,17 +335,16 @@ export default class ListControl extends React.Component {
: metadata;
itemsCollapsed.splice(index, 1);
keys.splice(index, 1);
// clear validations
this.validations = [];
this.setState({ itemsCollapsed: [...itemsCollapsed], keys: [...keys] });
this.setState({
itemsCollapsed: [...itemsCollapsed],
keys: Array.from({ length: value.size - 1 }, () => uuid()),
});
onChange(value.remove(index), parsedMetadata);
clearFieldErrors();
// Remove deleted item object validation
if (validations) {
this.validations = validations.filter(item => item.key !== key);
}
};
handleItemCollapseToggle = (index, event) => {
@ -490,7 +488,7 @@ export default class ListControl extends React.Component {
<StyledListItemTopBar
collapsed={collapsed}
onCollapseToggle={partial(this.handleItemCollapseToggle, index)}
onRemove={partial(this.handleRemove, index, key)}
onRemove={partial(this.handleRemove, index)}
dragHandleHOC={SortableHandle}
data-testid={`styled-list-item-top-bar-${key}`}
/>

8
packages/netlify-cms-widget-list/src/__tests__/__snapshots__/ListControl.spec.js.snap
View File

@ -689,7 +689,7 @@ exports[`ListControl should remove from list when remove button is clicked 2`] =
<mock-list-item-top-bar
classname="css-1e1b0lr-StyledListItemTopBar e14bfka81"
collapsed="true"
data-testid="styled-list-item-top-bar-1"
data-testid="styled-list-item-top-bar-2"
>
<button>
Remove
@ -703,12 +703,12 @@ exports[`ListControl should remove from list when remove button is clicked 2`] =
<mock-object-control
classnamewrapper="classNameWrapper css-1pznrxi"
collapsed="true"
data-testid="object-control-1"
data-testid="object-control-2"
field="Map { \\"name\\": \\"list\\", \\"label\\": \\"List\\", \\"collapsed\\": false, \\"minimize_collapsed\\": true, \\"fields\\": List [ Map { \\"label\\": \\"String\\", \\"name\\": \\"string\\", \\"widget\\": \\"string\\" } ] }"
fieldserrors="Map {}"
forlist="true"
parentids="forID,1"
validationkey="1"
parentids="forID,2"
validationkey="2"
value="Map { \\"string\\": \\"item 2\\" }"
/>
</div>