Skip to content

Clear selected block when clicking outside in the template part focus mode #35816

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
kevin940726 merged 1 commit into from
Oct 21, 2021
Merged

Clear selected block when clicking outside in the template part focus mode #35816

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
8 changes: 8 additions & 0 deletions packages/edit-site/src/components/block-editor/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
BlockTools,
__unstableBlockSettingsMenuFirstItem,
__unstableUseTypingObserver as useTypingObserver,
store as blockEditorStore,
} from '@wordpress/block-editor';
import { useMergeRefs, useViewportMatch } from '@wordpress/compose';

Expand Down Expand Up @@ -54,6 +55,7 @@ export default function BlockEditor( { setIsInserterOpen } ) {
const contentRef = useRef();
const mergedRefs = useMergeRefs( [ contentRef, useTypingObserver() ] );
const isMobileViewport = useViewportMatch( 'small', '<' );
const { clearSelectedBlock } = useDispatch( blockEditorStore );

const isTemplatePart = templateType === 'wp_template_part';

Expand Down Expand Up @@ -87,6 +89,12 @@ export default function BlockEditor( { setIsInserterOpen } ) {
'is-focus-mode': isTemplatePart,
} ) }
__unstableContentRef={ contentRef }
onClick={ ( event ) => {
// Clear selected block when clicking on the gray background.
if ( event.target === event.currentTarget ) {
clearSelectedBlock();
}
} }
>
<BackButton />

Expand Down
6 changes: 3 additions & 3 deletions packages/edit-site/src/components/block-editor/resize-handle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ export default function ResizeHandle( { direction, resizeWidthBy } ) {
}

return (
<div className={ `resizable-editor__drag-handle is-${ direction }` }>
<>
<button
className="resizable-editor__drag-handle-button"
className={ `resizable-editor__drag-handle is-${ direction }` }
aria-label={ __( 'Drag to resize' ) }
aria-describedby={ `resizable-editor__resize-help-${ direction }` }
onKeyDown={ handleKeyDown }
Expand All @@ -35,6 +35,6 @@ export default function ResizeHandle( { direction, resizeWidthBy } ) {
>
{ __( 'Use left and right arrow keys to resize the canvas.' ) }
</VisuallyHidden>
</div>
</>
);
}
27 changes: 10 additions & 17 deletions packages/edit-site/src/components/block-editor/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,27 +41,12 @@
}

.resizable-editor__drag-handle {
$height: 100px;
position: absolute;
top: 0;
bottom: 0;
width: $grid-unit-60;

&.is-left {
left: -$grid-unit-60;
}

&.is-right {
right: -$grid-unit-60;
}
}

.resizable-editor__drag-handle-button {
$height: 100px;
position: absolute;
top: calc(50% - #{math.div($height, 2)});
left: 50%;
transform: translateX(-$grid-unit-05);
padding: 0;
margin: auto 0;
width: $grid-unit-10;
height: $height;
appearance: none;
Expand All @@ -71,6 +56,14 @@
border-radius: 4px;
border: 0;

&.is-left {
left: #{-$grid-unit-30 - $grid-unit-05};
}

&.is-right {
right: #{-$grid-unit-30 - $grid-unit-05};
}

&:hover {
background: $gray-600;
}
Expand Down