Fix model after rebasing master

WordPress · Apr 18, 2018 · 82b5cc5 · 82b5cc5
1 parent 33c029e
commit 82b5cc5
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 855 deletions.
diff --git a/edit-post/components/plugin-screen-takeover/editor-screen-takeover.js b/edit-post/components/plugin-screen-takeover/editor-screen-takeover.js
@@ -42,9 +42,9 @@ export default class EditorScreenTakeover extends Component {
 
 	render() {
 		const { height } = this.state;
-		const { icon, title, children, isOpen, onClose } = this.props;
+		const { icon, title, children, onClose } = this.props;
 		return <Modal
-			isOpen={ isOpen }
+			isOpen={ true }
 			className={ 'edit-post-plugin-screen-takeover__editor-screen-takeover' }
 			overlayClassName={ 'edit-post-plugin-screen-takeover__editor-screen-takeover-overlay' }
 			parentSelector={ () => document.getElementsByClassName( 'gutenberg' )[ 0 ] }

diff --git a/edit-post/components/plugin-screen-takeover/index.js b/edit-post/components/plugin-screen-takeover/index.js
@@ -2,8 +2,9 @@
  * WordPress dependencies
  */
 import { compose } from '@wordpress/element';
-import { Slot, Fill, withContext } from '@wordpress/components';
+import { Slot, Fill } from '@wordpress/components';
 import { withDispatch, withSelect } from '@wordpress/data';
+import { PluginContext } from '@wordpress/plugins';
 
 /**
  * Internal dependencies
@@ -18,28 +19,31 @@ import EditorScreenTakeover from './editor-screen-takeover';
  */
 const SLOT_NAME = 'PluginScreenTakeover';
 
-let PluginScreenTakeover = ( { pluginName, name, icon, children, isOpen, onClose } ) => (
-	<Fill name={ [ SLOT_NAME, pluginName, name ].join( '/' ) }>
-		<EditorScreenTakeover
-			icon={ icon }
-			title={ 'Screen Takeover Title' }
-			isOpen={ isOpen }
-			onClose={ onClose }
-		>
-			{ children }
-		</EditorScreenTakeover>
-	</Fill>
+let PluginScreenTakeover = ( { name, icon, children, onClose, title } ) => (
+	<PluginContext.Consumer>
+		{ ( { pluginName } ) => {
+			return (
+				<Fill name={ [ SLOT_NAME, pluginName, name ].join( '/' ) }>
+					<EditorScreenTakeover
+						icon={ icon }
+						title={ title }
+						onClose={ onClose }
+					>
+						{ children }
+					</EditorScreenTakeover>
+				</Fill>
+			);
+		} }
+	</PluginContext.Consumer>
 );
 
 PluginScreenTakeover = compose( [
-	withContext( 'pluginName' )(),
 	withDispatch( ( dispatch ) => ( {
 		onClose: dispatch( 'core/edit-post' ).closeScreenTakeover,
 	} ) ),
-	withSelect( ( select, ownProps ) => {
-		const { name, pluginName } = ownProps;
+	withSelect( ( select ) => {
 		return {
-			isOpen: select( 'core/edit-post' ).getActiveScreenTakeoverName() === `${ pluginName }/${ name }`,
+			activeScreenTakeoverName: select( 'core/edit-post' ).getActiveScreenTakeoverName(),
 		};
 	} ),
 ] )( PluginScreenTakeover );
@@ -52,4 +56,4 @@ PluginScreenTakeover.Slot = withSelect( select => ( {
 	activeScreenTakeoverName: select( 'core/edit-post' ).getActiveScreenTakeoverName(),
 } ) )( PluginScreenTakeover.Slot );
 
-export default PluginScreenTakeover;
+export default PluginScreenTakeover;