Set state based on previous state correctly

WordPress · Jun 5, 2017 · 9d61284 · 9d61284
1 parent 58c4735
commit 9d61284
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/blocks/library/freeform/freeform-block.js b/blocks/library/freeform/freeform-block.js
@@ -107,11 +107,12 @@ export default class FreeformBlock extends wp.element.Component {
 	}
 
 	setButtonActive( id, active ) {
-		const activeButtons = {
-			...this.state.activeButtons,
-			[ id ]: active,
-		};
-		this.setState( { activeButtons } );
+		this.setState( ( prevState ) => ( {
+			activeButtons: {
+				...prevState.activeButtons,
+				[ id ]: active,
+			},
+		} ) );
 	}
 
 	onSetup( editor ) {
@@ -217,7 +218,6 @@ export default class FreeformBlock extends wp.element.Component {
 
 	render() {
 		const { content, focus } = this.props;
-
 		return [
 			focus && (
 				<BlockControls