fix post rebase

WordPress · Feb 24, 2020 · 91fdca1 · 91fdca1
1 parent b1f3a9d
commit 91fdca1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/packages/edit-post/src/components/header/header-toolbar/index.js b/packages/edit-post/src/components/header/header-toolbar/index.js
@@ -33,8 +33,8 @@ function HeaderToolbar() {
 			isTextModeEnabled:
 				select( 'core/edit-post' ).getEditorMode() === 'text',
 			previewDeviceType: select(
-				'core/block-editor'
-			).getPreviewDeviceType(),
+				'core/edit-post'
+			).__experimentalGetPreviewDeviceType(),
 		} ),
 		[]
 	);

diff --git a/packages/edit-post/src/editor.js b/packages/edit-post/src/editor.js
@@ -145,16 +145,19 @@ class Editor extends Component {
 
 export default compose( [
 	withSelect( ( select, { postId, postType } ) => {
-		const { isFeatureActive, getPreference } = select( 'core/edit-post' );
+		const {
+			isFeatureActive,
+			getPreference,
+			__experimentalGetPreviewDeviceType,
+		} = select( 'core/edit-post' );
 		const { getEntityRecord } = select( 'core' );
 		const { getBlockTypes } = select( 'core/blocks' );
-		const { getPreviewDeviceType } = select( 'core/block-editor' );
 
 		return {
 			showInserterHelpPanel: isFeatureActive( 'showInserterHelpPanel' ),
 			hasFixedToolbar:
 				isFeatureActive( 'fixedToolbar' ) ||
-				getPreviewDeviceType() !== 'Desktop',
+				__experimentalGetPreviewDeviceType() !== 'Desktop',
 			focusMode: isFeatureActive( 'focusMode' ),
 			post: getEntityRecord( 'postType', postType, postId ),
 			preferredStyleVariations: getPreference(

diff --git a/packages/edit-post/src/editor.native.js b/packages/edit-post/src/editor.native.js
@@ -143,16 +143,18 @@ class Editor extends Component {
 
 export default compose( [
 	withSelect( ( select ) => {
-		const { isFeatureActive, getEditorMode, getPreference } = select(
-			'core/edit-post'
-		);
+		const {
+			isFeatureActive,
+			getEditorMode,
+			getPreference,
+			__experimentalGetPreviewDeviceType,
+		} = select( 'core/edit-post' );
 		const { getBlockTypes } = select( 'core/blocks' );
-		const { getPreviewDeviceType } = select( 'core/block-editor' );
 
 		return {
 			hasFixedToolbar:
 				isFeatureActive( 'fixedToolbar' ) ||
-				getPreviewDeviceType() !== 'Desktop',
+				__experimentalGetPreviewDeviceType() !== 'Desktop',
 			focusMode: isFeatureActive( 'focusMode' ),
 			mode: getEditorMode(),
 			hiddenBlockTypes: getPreference( 'hiddenBlockTypes' ),