Fix React warning while unmounting slots (#23365)

WordPress · Jun 23, 2020 · 960dd92 · 960dd92
1 parent 4a4de28
commit 960dd92
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/packages/components/src/slot-fill/slot.js b/packages/components/src/slot-fill/slot.js
@@ -22,6 +22,7 @@ class SlotComponent extends Component {
 	constructor() {
 		super( ...arguments );
 
+		this.isUnmounted = false;
 		this.bindNode = this.bindNode.bind( this );
 	}
 
@@ -33,7 +34,7 @@ class SlotComponent extends Component {
 
 	componentWillUnmount() {
 		const { unregisterSlot } = this.props;
-
+		this.isUnmounted = true;
 		unregisterSlot( this.props.name, this );
 	}
 
@@ -50,6 +51,13 @@ class SlotComponent extends Component {
 		this.node = node;
 	}
 
+	forceUpdate() {
+		if ( this.isUnmounted ) {
+			return;
+		}
+		super.forceUpdate();
+	}
+
 	render() {
 		const { children, name, fillProps = {}, getFills } = this.props;