-
Notifications
You must be signed in to change notification settings - Fork 4.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Block Library: enhance the author block (#19894)
* revert bad merge * removed author storage we also set post author on change from the block itself. * linting * use sizes to label avatar size this aloows us to use the sizes as the API serves them * adds some review suggestions props @ockham * removes null coalescing operator
- Loading branch information
1 parent
87d4b10
commit 2c69473
Showing
12 changed files
with
565 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
86 changes: 86 additions & 0 deletions
86
packages/block-editor/src/components/color-style-selector/index.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
/** | ||
* WordPress dependencies | ||
*/ | ||
import { | ||
Button, | ||
Dropdown, | ||
ToolbarGroup, | ||
SVG, | ||
Path, | ||
} from '@wordpress/components'; | ||
import { __ } from '@wordpress/i18n'; | ||
import { DOWN } from '@wordpress/keycodes'; | ||
|
||
const ColorSelectorSVGIcon = () => ( | ||
<SVG xmlns="https://www.w3.org/2000/svg" viewBox="0 0 20 20"> | ||
<Path d="M7.434 5l3.18 9.16H8.538l-.692-2.184H4.628l-.705 2.184H2L5.18 5h2.254zm-1.13 1.904h-.115l-1.148 3.593H7.44L6.304 6.904zM14.348 7.006c1.853 0 2.9.876 2.9 2.374v4.78h-1.79v-.914h-.114c-.362.64-1.123 1.022-2.031 1.022-1.346 0-2.292-.826-2.292-2.108 0-1.27.972-2.006 2.71-2.107l1.696-.102V9.38c0-.584-.42-.914-1.18-.914-.667 0-1.112.228-1.264.647h-1.701c.12-1.295 1.307-2.107 3.066-2.107zm1.079 4.1l-1.416.09c-.793.056-1.18.342-1.18.844 0 .52.45.837 1.091.837.857 0 1.505-.545 1.505-1.256v-.515z" /> | ||
</SVG> | ||
); | ||
|
||
/** | ||
* Color Selector Icon component. | ||
* | ||
* @param {Object} colorControlProps colorControl properties. | ||
* @return {*} React Icon component. | ||
*/ | ||
const ColorSelectorIcon = ( { style, className } ) => { | ||
return ( | ||
<div className="block-library-colors-selector__icon-container"> | ||
<div | ||
className={ `${ className } block-library-colors-selector__state-selection` } | ||
style={ style } | ||
> | ||
<ColorSelectorSVGIcon /> | ||
</div> | ||
</div> | ||
); | ||
}; | ||
|
||
/** | ||
* Renders the Colors Selector Toolbar with the icon button. | ||
* | ||
* @param {Object} colorControlProps colorControl properties. | ||
* @return {*} React toggle button component. | ||
*/ | ||
const renderToggleComponent = ( { TextColor, BackgroundColor } ) => ( { | ||
onToggle, | ||
isOpen, | ||
} ) => { | ||
const openOnArrowDown = ( event ) => { | ||
if ( ! isOpen && event.keyCode === DOWN ) { | ||
event.preventDefault(); | ||
event.stopPropagation(); | ||
onToggle(); | ||
} | ||
}; | ||
|
||
return ( | ||
<ToolbarGroup> | ||
<Button | ||
className="components-toolbar__control block-library-colors-selector__toggle" | ||
label={ __( 'Open Colors Selector' ) } | ||
onClick={ onToggle } | ||
onKeyDown={ openOnArrowDown } | ||
icon={ | ||
<BackgroundColor> | ||
<TextColor> | ||
<ColorSelectorIcon /> | ||
</TextColor> | ||
</BackgroundColor> | ||
} | ||
/> | ||
</ToolbarGroup> | ||
); | ||
}; | ||
|
||
const BlockColorsStyleSelector = ( { children, ...other } ) => ( | ||
<Dropdown | ||
position="bottom right" | ||
className="block-library-colors-selector" | ||
contentClassName="block-library-colors-selector__popover" | ||
renderToggle={ renderToggleComponent( other ) } | ||
renderContent={ () => children } | ||
/> | ||
); | ||
|
||
export default BlockColorsStyleSelector; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,33 @@ | ||
{ | ||
"name": "core/post-author", | ||
"category": "layout" | ||
"category": "layout", | ||
"attributes": { | ||
"align": { | ||
"type": "string" | ||
}, | ||
"avatarSize": { | ||
"type": "number" | ||
}, | ||
"showAvatar": { | ||
"type": "boolean" | ||
}, | ||
"showBio": { | ||
"type": "boolean" | ||
}, | ||
"byline": { | ||
"type": "string" | ||
}, | ||
"backgroundColor": { | ||
"type": "string" | ||
}, | ||
"textColor": { | ||
"type": "string" | ||
}, | ||
"customBackgroundColor": { | ||
"type": "string" | ||
}, | ||
"customTextColor": { | ||
"type": "string" | ||
} | ||
} | ||
} |
Oops, something went wrong.