From 844df40edba536b4d83f5d3d2dd093b014d8e0fe Mon Sep 17 00:00:00 2001 From: Marko Andrijasevic Date: Mon, 16 Nov 2020 13:13:35 +0100 Subject: [PATCH 1/2] Site Editor: remove unused FullscreenModeClose component --- .../slotfills/main-dashboard-button.md | 4 +- .../header/fullscreen-mode-close/index.js | 63 ------------------ .../header/fullscreen-mode-close/style.scss | 33 ---------- .../fullscreen-mode-close/test/index.js | 66 ------------------- 4 files changed, 2 insertions(+), 164 deletions(-) delete mode 100644 packages/edit-site/src/components/header/fullscreen-mode-close/index.js delete mode 100644 packages/edit-site/src/components/header/fullscreen-mode-close/style.scss delete mode 100644 packages/edit-site/src/components/header/fullscreen-mode-close/test/index.js diff --git a/docs/designers-developers/developers/slotfills/main-dashboard-button.md b/docs/designers-developers/developers/slotfills/main-dashboard-button.md index 5003872264aa68..43b3730a35bcf4 100644 --- a/docs/designers-developers/developers/slotfills/main-dashboard-button.md +++ b/docs/designers-developers/developers/slotfills/main-dashboard-button.md @@ -32,7 +32,7 @@ the post editor, that can be achieved in the following way: import { registerPlugin } from '@wordpress/plugins'; import { __experimentalFullscreenModeClose as FullscreenModeClose, -} from '@wordpress/edit-site'; +} from '@wordpress/edit-post'; import { __experimentalMainDashboardButton as MainDashboardButton, } from '@wordpress/interface'; @@ -74,4 +74,4 @@ const MainDashboardButtonIconTest = () => ( registerPlugin( 'main-dashboard-button-icon-test', { render: MainDashboardButtonIconTest, } ); -``` \ No newline at end of file +``` diff --git a/packages/edit-site/src/components/header/fullscreen-mode-close/index.js b/packages/edit-site/src/components/header/fullscreen-mode-close/index.js deleted file mode 100644 index 83a07089580491..00000000000000 --- a/packages/edit-site/src/components/header/fullscreen-mode-close/index.js +++ /dev/null @@ -1,63 +0,0 @@ -/** - * WordPress dependencies - */ -import { useSelect } from '@wordpress/data'; -import { Button, Icon } from '@wordpress/components'; -import { __ } from '@wordpress/i18n'; -import { wordpress } from '@wordpress/icons'; - -function FullscreenModeClose( { icon } ) { - const { isActive, isRequestingSiteIcon, siteIconUrl } = useSelect( - ( select ) => { - const { isFeatureActive } = select( 'core/edit-site' ); - const { getEntityRecord } = select( 'core' ); - const { isResolving } = select( 'core/data' ); - const siteData = - getEntityRecord( 'root', '__unstableBase', undefined ) || {}; - - return { - isActive: isFeatureActive( 'fullscreenMode' ), - isRequestingSiteIcon: isResolving( 'core', 'getEntityRecord', [ - 'root', - '__unstableBase', - undefined, - ] ), - siteIconUrl: siteData.site_icon_url, - }; - }, - [] - ); - - if ( ! isActive ) { - return null; - } - - let buttonIcon = ; - - if ( siteIconUrl ) { - buttonIcon = ( - { - ); - } else if ( isRequestingSiteIcon ) { - buttonIcon = null; - } else if ( icon ) { - buttonIcon = ; - } - - return ( - - ); -} - -export default FullscreenModeClose; diff --git a/packages/edit-site/src/components/header/fullscreen-mode-close/style.scss b/packages/edit-site/src/components/header/fullscreen-mode-close/style.scss deleted file mode 100644 index 01e648374d8ab1..00000000000000 --- a/packages/edit-site/src/components/header/fullscreen-mode-close/style.scss +++ /dev/null @@ -1,33 +0,0 @@ -.edit-site-fullscreen-mode-close.has-icon { - // Do not show the toolbar icon on small screens, - // when Fullscreen Mode is not an option in the "More" menu. - display: none; - - @include break-medium() { - display: flex; - align-items: center; - align-self: stretch; - border: none; - background: #23282e; // WP-admin gray. - color: $white; - border-radius: 0; - height: $header-height; - min-width: $header-height; - - &.has-icon { - &:hover { - background: #32373d; // WP-admin light-gray. - } - &:active { - color: $white; - } - &:focus { - box-shadow: inset 0 0 0 $border-width-focus var(--wp-admin-theme-color), inset 0 0 0 3px $white; - } - } - } -} - -.edit-site-fullscreen-mode-close_site-icon { - width: 36px; -} diff --git a/packages/edit-site/src/components/header/fullscreen-mode-close/test/index.js b/packages/edit-site/src/components/header/fullscreen-mode-close/test/index.js deleted file mode 100644 index ee9eddcaf163e0..00000000000000 --- a/packages/edit-site/src/components/header/fullscreen-mode-close/test/index.js +++ /dev/null @@ -1,66 +0,0 @@ -/** - * External dependencies - */ -import { render } from '@testing-library/react'; - -/** - * WordPress dependencies - */ -import { useSelect } from '@wordpress/data'; - -/** - * Internal dependencies - */ -import FullscreenModeClose from '../'; - -jest.mock( '@wordpress/data/src/components/use-select', () => { - // This allows us to tweak the returned value on each test - const mock = jest.fn(); - return mock; -} ); - -jest.mock( '@wordpress/core-data' ); - -describe( 'FullscreenModeClose', () => { - describe( 'when in full screen mode', () => { - it( 'should display a user uploaded site icon if it exists', () => { - useSelect.mockImplementation( ( cb ) => { - return cb( () => ( { - isResolving: () => false, - isFeatureActive: () => true, - getEntityRecord: () => ( { - site_icon_url: 'https://fakeUrl.com', - } ), - } ) ); - } ); - - const { container } = render( ); - const siteIcon = container.querySelector( - '.edit-site-fullscreen-mode-close_site-icon' - ); - - expect( siteIcon ).toBeTruthy(); - } ); - - it( 'should display a default site icon if no user uploaded site icon exists', () => { - useSelect.mockImplementation( ( cb ) => { - return cb( () => ( { - isResolving: () => false, - isFeatureActive: () => true, - getEntityRecord: () => ( { - site_icon_url: '', - } ), - } ) ); - } ); - - const { container } = render( ); - const siteIcon = container.querySelector( - '.edit-site-fullscreen-mode-close_site-icon' - ); - const defaultIcon = container.querySelector( 'svg' ); - - expect( siteIcon ).toBeFalsy(); - expect( defaultIcon ).toBeTruthy(); - } ); - } ); -} ); From 7eca33c4e81be5f567cdd4c4a0d95d76f7cd0034 Mon Sep 17 00:00:00 2001 From: Marko Andrijasevic Date: Mon, 16 Nov 2020 13:23:25 +0100 Subject: [PATCH 2/2] Remove exports and imports --- packages/edit-site/src/index.js | 1 - packages/edit-site/src/style.scss | 1 - 2 files changed, 2 deletions(-) diff --git a/packages/edit-site/src/index.js b/packages/edit-site/src/index.js index e3febadf3b7e2a..67f6e15128d3a4 100644 --- a/packages/edit-site/src/index.js +++ b/packages/edit-site/src/index.js @@ -67,5 +67,4 @@ export function initialize( id, settings ) { render( , document.getElementById( id ) ); } -export { default as __experimentalFullscreenModeClose } from './components/header/fullscreen-mode-close'; export { default as __experimentalNavigationToggle } from './components/navigation-sidebar/navigation-toggle'; diff --git a/packages/edit-site/src/style.scss b/packages/edit-site/src/style.scss index bebde8c076bc14..70c908a1deabff 100644 --- a/packages/edit-site/src/style.scss +++ b/packages/edit-site/src/style.scss @@ -3,7 +3,6 @@ @import "./components/block-editor/style.scss"; @import "./components/header/style.scss"; @import "./components/header/document-actions/style.scss"; -@import "./components/header/fullscreen-mode-close/style.scss"; @import "./components/header/more-menu/style.scss"; @import "./components/navigation-sidebar/navigation-toggle/style.scss"; @import "./components/navigation-sidebar/navigation-panel/style.scss";