Skip to content

Small refactoring to the NavigableRegion component #45849

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

Merged
youknowriad merged 1 commit into from
Nov 17, 2022
Merged

Small refactoring to the NavigableRegion component #45849

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
16 changes: 9 additions & 7 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 @@ -7,7 +7,10 @@ import classnames from 'classnames';
* WordPress dependencies
*/
import { forwardRef, useEffect } from '@wordpress/element';
import { __unstableUseNavigateRegions as useNavigateRegions } from '@wordpress/components';
import {
__unstableUseNavigateRegions as useNavigateRegions,
__unstableMotion as motion,
} from '@wordpress/components';
import { __ } from '@wordpress/i18n';
import { useMergeRefs } from '@wordpress/compose';

Expand Down Expand Up @@ -101,14 +104,13 @@ function InterfaceSkeleton(
<div className="interface-interface-skeleton__editor">
{ !! header && isDistractionFree && (
<NavigableRegion
as={ motion.div }
className="interface-interface-skeleton__header"
aria-label={ mergedLabels.header }
motionProps={ {
initial: isDistractionFree ? 'hidden' : 'hover',
whileHover: 'hover',
variants: headerVariants,
transition: { type: 'tween', delay: 0.8 },
} }
initial={ isDistractionFree ? 'hidden' : 'hover' }
whileHover="hover"
variants={ headerVariants }
transition={ { type: 'tween', delay: 0.8 } }
>
{ header }
</NavigableRegion>
Expand Down
12 changes: 3 additions & 9 deletions packages/interface/src/components/navigable-region/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,20 @@
*/
import classnames from 'classnames';

/**
* WordPress dependencies
*/
import { __unstableMotion as motion } from '@wordpress/components';

export default function NavigableRegion( {
children,
className,
ariaLabel,
motionProps = {},
as: Tag = 'div',
...props
} ) {
const Tag = Object.keys( motionProps ).length ? motion.div : 'div';

return (
<Tag
className={ classnames( 'interface-navigable-region', className ) }
aria-label={ ariaLabel }
role="region"
tabIndex="-1"
{ ...motionProps }
{ ...props }
>
<div className="interface-navigable-region__stacker">
{ children }
Expand Down