Skip to content

Improve dropcap behavior #28685

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
jasmussen merged 2 commits into from
Mar 1, 2021
Merged

Improve dropcap behavior #28685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb214fb
Try: Fix dropcap behavior.
jasmussen Feb 3, 2021
801f614
Remove comments.
jasmussen Mar 1, 2021
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
49 changes: 2 additions & 47 deletions packages/block-library/src/paragraph/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,11 @@ import {
InspectorControls,
RichText,
useBlockProps,
getFontSize,
__experimentalUseEditorFeature as useEditorFeature,
store as blockEditorStore,
} from '@wordpress/block-editor';
import { createBlock } from '@wordpress/blocks';
import { useSelect } from '@wordpress/data';
import { useEffect, useRef, useState } from '@wordpress/element';
import { formatLtr } from '@wordpress/icons';

function getComputedStyle( node, pseudo ) {
return node.ownerDocument.defaultView.getComputedStyle( node, pseudo );
}

const name = 'core/paragraph';

function ParagraphRTLToolbar( { direction, setDirection } ) {
Expand All @@ -50,23 +42,6 @@ function ParagraphRTLToolbar( { direction, setDirection } ) {
);
}

function useDropCapMinHeight( ref, isDisabled, dependencies ) {
const [ minHeight, setMinHeight ] = useState();

useEffect( () => {
if ( isDisabled ) {
setMinHeight();
return;
}

setMinHeight(
getComputedStyle( ref.current, 'first-letter' ).lineHeight
);
}, [ isDisabled, ...dependencies ] );

return minHeight;
}

function ParagraphBlock( {
attributes,
mergeBlocks,
Expand All @@ -75,34 +50,14 @@ function ParagraphBlock( {
setAttributes,
clientId,
} ) {
const {
align,
content,
direction,
dropCap,
placeholder,
fontSize,
style,
} = attributes;
const { align, content, direction, dropCap, placeholder } = attributes;
const isDropCapFeatureEnabled = useEditorFeature( 'typography.dropCap' );
const ref = useRef();
const inlineFontSize = style?.fontSize;
const size = useSelect(
( select ) => {
const { fontSizes } = select( blockEditorStore ).getSettings();
return getFontSize( fontSizes, fontSize, inlineFontSize ).size;
},
[ fontSize, inlineFontSize ]
);
const hasDropCap = isDropCapFeatureEnabled && dropCap;
const minHeight = useDropCapMinHeight( ref, ! hasDropCap, [ size ] );
const blockProps = useBlockProps( {
ref,
className: classnames( {
'has-drop-cap': dropCap,
[ `has-text-align-${ align }` ]: align,
} ),
style: { direction, minHeight },
style: { direction },
} );

return (
Expand Down
5 changes: 5 additions & 0 deletions packages/block-library/src/paragraph/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@
font-style: normal;
}

// Prevent the dropcap from breaking out of the box when a background is applied.
p.has-drop-cap.has-background {
Copy link
Member

@ellatrix ellatrix Mar 1, 2021

Choose a reason for hiding this comment

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

Shouldn't this happen regardless of background?

Copy link
Contributor Author

@jasmussen jasmussen Mar 1, 2021

Choose a reason for hiding this comment

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

We've been a bit back and forth on this one. If we do this, then it ends up looking like this:

But I would argue that the 2nd paragraph should be allowed to wrap around the dropcap, like this:

By limiting it to a paragraph that has a background, at least we allow this:

Screenshot 2021-03-01 at 11 49 21

overflow: hidden;
}

p.has-background {
padding: $block-bg-padding--v $block-bg-padding--h;
}
Expand Down