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

Jump to bottom

Framework: split RichText component (part 1) #15212

Merged
merged 12 commits into from
Jun 25, 2019
Merged

Framework: split RichText component (part 1) #15212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
43d6e82
Framework: move RichText component to rich-text package
ellatrix Jun 9, 2019
5dc9cd6
Add style attr
ellatrix Jun 17, 2019
40e9d6c
Fix deprecated matcher
ellatrix Jun 17, 2019
43b1c3e
Simplify
ellatrix Jun 17, 2019
c920d1c
Remove dead code
ellatrix Jun 17, 2019
909ca0d
Mark block related props unstable
ellatrix Jun 17, 2019
f35859a
Mark block related props unstable
ellatrix Jun 17, 2019
201ecbc
Clean up
ellatrix Jun 18, 2019
6c3528f
Add inline doc
ellatrix Jun 18, 2019
02946d5
Move doc block to export statement
ellatrix Jun 25, 2019
302fde5
Do not mutate props
ellatrix Jun 25, 2019
140d0a1
Move rich text native to separate package (#16219)
SergioEstevao Jun 25, 2019
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
10 changes: 10 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/block-editor/src/components/rich-text/format-toolbar/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import { orderBy } from 'lodash';
import { __ } from '@wordpress/i18n';
import { Toolbar, Slot, DropdownMenu } from '@wordpress/components';

const FormatToolbar = ( { controls } ) => {
const FormatToolbar = () => {
return (
<div className="editor-format-toolbar block-editor-format-toolbar">
<Toolbar>
{ controls.map( ( format ) =>
{ [ 'bold', 'italic', 'link' ].map( ( format ) =>
Copy link
Contributor

Choose a reason for hiding this comment

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

Forgot to ask, why is this hardcoded now?

Copy link
Member Author

Choose a reason for hiding this comment

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

Ah, good question! These names are kind of hardcoded already in the formatting library. You cannot really add anything else here. But I forgot about the case where you'd remove the controls by setting an empty array. That case was already only partially working in master, see #14542. Let's try to correct it there again.

Copy link
Member Author

Choose a reason for hiding this comment

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

Now fixed in #14542.

<Slot name={ `RichText.ToolbarControls.${ format }` } key={ format } />
) }
<Slot name="RichText.ToolbarControls">
Expand Down
4 changes: 2 additions & 2 deletions packages/block-editor/src/components/rich-text/format-toolbar/index.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

import { Toolbar, Slot } from '@wordpress/components';

const FormatToolbar = ( { controls } ) => {
const FormatToolbar = () => {
return (
<Toolbar>
{ controls.map( ( format ) =>
{ [ 'bold', 'italic', 'link' ].map( ( format ) =>
<Slot name={ `RichText.ToolbarControls.${ format }` } key={ format } />
) }
<Slot name="RichText.ToolbarControls" />
Expand Down
Loading