Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

POC: Animate the editor areas (sidebar, footer) #60423

Closed
wants to merge 1 commit into from
+61 −52
Closed

POC: Animate the editor areas (sidebar, footer) #60423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 6 additions & 26 deletions packages/edit-post/src/components/layout/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import {
privateApis as blockEditorPrivateApis,
store as blockEditorStore,
} from '@wordpress/block-editor';
import { Button, ScrollLock } from '@wordpress/components';
import { ScrollLock } from '@wordpress/components';
import { useViewportMatch } from '@wordpress/compose';
import { PluginArea } from '@wordpress/plugins';
import { __, _x, sprintf } from '@wordpress/i18n';
Expand Down Expand Up @@ -139,8 +139,7 @@ function Layout( { initialPost } ) {
const isWideViewport = useViewportMatch( 'large' );
const isLargeViewport = useViewportMatch( 'medium' );

const { openGeneralSidebar, closeGeneralSidebar } =
useDispatch( editPostStore );
const { closeGeneralSidebar } = useDispatch( editPostStore );
const { createErrorNotice } = useDispatch( noticesStore );
const { setIsInserterOpened } = useDispatch( editorStore );
const {
Expand Down Expand Up @@ -206,11 +205,6 @@ function Layout( { initialPost } ) {

const styles = useEditorStyles();

const openSidebarPanel = () =>
openGeneralSidebar(
hasBlockSelected ? 'edit-post/block' : 'edit-post/document'
);

// Inserter and Sidebars are mutually exclusive
useEffect( () => {
if ( sidebarIsOpened && ! isHugeViewport ) {
Expand Down Expand Up @@ -314,24 +308,10 @@ function Layout( { initialPost } ) {
secondarySidebar={ secondarySidebar() }
sidebar={
( ( isMobileViewport && sidebarIsOpened ) ||
( ! isMobileViewport && ! isDistractionFree ) ) && (
<>
{ ! isMobileViewport && ! sidebarIsOpened && (
<div className="edit-post-layout__toggle-sidebar-panel">
<Button
variant="secondary"
className="edit-post-layout__toggle-sidebar-panel-button"
onClick={ openSidebarPanel }
aria-expanded={ false }
>
{ hasBlockSelected
? __( 'Open block settings' )
: __( 'Open document settings' ) }
</Button>
</div>
) }
<ComplementaryArea.Slot scope="core/edit-post" />
</>
( ! isMobileViewport &&
sidebarIsOpened &&
! isDistractionFree ) ) && (
<ComplementaryArea.Slot scope="core/edit-post" />
)
}
notices={ <EditorSnackbars /> }
Expand Down
1 change: 0 additions & 1 deletion packages/edit-site/src/components/editor/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,6 @@ export default function Editor( { isLoading, onClick } ) {
( shouldShowListView && <ListViewSidebar /> ) )
}
sidebar={
! isDistractionFree &&
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

man, we really meant to make sure ! isDistractionFree 😂

isEditMode &&
isRightSidebarOpen &&
! isDistractionFree && (
Expand Down
80 changes: 55 additions & 25 deletions packages/interface/src/components/interface-skeleton/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,18 @@ import { forwardRef, useEffect } from '@wordpress/element';
import {
__unstableUseNavigateRegions as useNavigateRegions,
__unstableMotion as motion,
__unstableAnimatePresence as AnimatePresence,
} from '@wordpress/components';
import { __, _x } from '@wordpress/i18n';
import { useMergeRefs } from '@wordpress/compose';
import { useMergeRefs, useReducedMotion } from '@wordpress/compose';

/**
* Internal dependencies
*/
import NavigableRegion from '../navigable-region';

const ANIMATION_DURATION = 0.2;

function useHTMLClass( className ) {
useEffect( () => {
const element =
Expand Down Expand Up @@ -62,7 +65,13 @@ function InterfaceSkeleton(
},
ref
) {
const disableMotion = useReducedMotion();
const navigateRegionsProps = useNavigateRegions( shortcuts );
const defaultTransition = {
type: 'tween',
duration: disableMotion ? 0 : ANIMATION_DURATION,
ease: 'easeOut',
};

useHTMLClass( 'interface-interface-skeleton__html-container' );

Expand Down Expand Up @@ -134,14 +143,21 @@ function InterfaceSkeleton(
</div>
) }
<div className="interface-interface-skeleton__body">
{ !! secondarySidebar && (
<NavigableRegion
className="interface-interface-skeleton__secondary-sidebar"
ariaLabel={ mergedLabels.secondarySidebar }
>
{ secondarySidebar }
</NavigableRegion>
) }
<AnimatePresence initial={ false }>
{ !! secondarySidebar && (
<NavigableRegion
className="interface-interface-skeleton__secondary-sidebar"
ariaLabel={ mergedLabels.secondarySidebar }
as={ motion.div }
initial={ { x: '-100%' } }
animate={ { x: 0 } }
exit={ { x: '-100%' } }
transition={ defaultTransition }
>
{ secondarySidebar }
</NavigableRegion>
) }
</AnimatePresence>
{ !! notices && (
<div className="interface-interface-skeleton__notices">
{ notices }
Expand All @@ -153,14 +169,21 @@ function InterfaceSkeleton(
>
{ content }
</NavigableRegion>
{ !! sidebar && (
<NavigableRegion
className="interface-interface-skeleton__sidebar"
ariaLabel={ mergedLabels.sidebar }
>
{ sidebar }
</NavigableRegion>
) }
<AnimatePresence initial={ false }>
{ !! sidebar && (
<NavigableRegion
className="interface-interface-skeleton__sidebar"
ariaLabel={ mergedLabels.sidebar }
as={ motion.div }
initial={ { x: '100%' } }
animate={ { x: 0 } }
exit={ { x: '100%' } }
transition={ defaultTransition }
>
{ sidebar }
</NavigableRegion>
) }
</AnimatePresence>
{ !! actions && (
<NavigableRegion
className="interface-interface-skeleton__actions"
Expand All @@ -171,14 +194,21 @@ function InterfaceSkeleton(
) }
</div>
</div>
{ !! footer && (
<NavigableRegion
className="interface-interface-skeleton__footer"
ariaLabel={ mergedLabels.footer }
>
{ footer }
</NavigableRegion>
) }
<AnimatePresence initial={ false }>
{ !! footer && (
<NavigableRegion
className="interface-interface-skeleton__footer"
ariaLabel={ mergedLabels.footer }
as={ motion.div }
initial={ { y: '100%' } }
animate={ { y: 0 } }
exit={ { y: '100%' } }
transition={ defaultTransition }
>
{ footer }
</NavigableRegion>
) }
</AnimatePresence>
</div>
);
}
Expand Down
Loading