-
Notifications
You must be signed in to change notification settings - Fork 77
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #200 from Automattic/fix/toolbar-code-selection
Fix toolbar code selection for latest Gutenberg versions
- Loading branch information
Showing
8 changed files
with
144 additions
and
38 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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,8 +1 @@ | ||
| .wp-block-syntaxhighlighter { | ||
|
|
||
| &__language_toolbar { | ||
| .components-dropdown-menu__menu-item.is-active { | ||
| font-weight: bold; | ||
| } | ||
| } | ||
| } | ||
| @import '../toolbar-dropdown/style' |
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,27 +1,17 @@ | ||
| import { | ||
| ToolbarGroup, | ||
| } from '@wordpress/components'; | ||
| import { __ } from '@wordpress/i18n'; | ||
|
|
||
| import ToolbarDropdown from '../toolbar-dropdown'; | ||
|
|
||
| export default ( { attributes, setAttributes, options } ) => { | ||
| const { language } = attributes; | ||
|
|
||
| const languageControl = ( { label, value } ) => ( { | ||
| title: label, | ||
| onClick: () => setAttributes( { language: value } ), | ||
| isActive: value === language, | ||
| } ); | ||
|
|
||
| const selectedLanguage = options.find( o => o.value === language ); | ||
|
|
||
| return <ToolbarGroup | ||
| isCollapsed={ true } | ||
| noIcons={ true } | ||
| label={ __( 'Code Language', 'syntaxhighlighter' ) } | ||
| icon={ null } | ||
| menuProps={ { className: 'wp-block-syntaxhighlighter__language_toolbar' } } | ||
| toggleProps={ { children: <b> { selectedLanguage.label } </b> } } | ||
| controls={ options.map( languageControl ) } | ||
| > | ||
| </ToolbarGroup>; | ||
| return ( | ||
| <ToolbarDropdown | ||
| key="code-language" | ||
| options={ options } | ||
| optionsLabel={ __( 'Code Language', 'syntaxhighlighter' ) } | ||
| value={ language } | ||
| onChange={ ( value ) => setAttributes( { language: value } ) } | ||
| /> | ||
| ); | ||
| }; |
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,91 @@ | ||
| import classnames from 'classnames'; | ||
| import { | ||
| Button, | ||
| Dropdown, | ||
| MenuGroup, | ||
| MenuItem, | ||
| NavigableMenu, | ||
| } from '@wordpress/components'; | ||
|
|
||
| /** | ||
| * @typedef {Object} DropdownOption | ||
| * | ||
| * @property {string} label Option label. | ||
| * @property {string} value Option value. | ||
| */ | ||
| /** | ||
| * Dropdown for the editor toolbar. | ||
| * | ||
| * @param {Object} props Component props. | ||
| * @param {DropdownOption[]} props.options Dropdown options. | ||
| * @param {string} [props.optionsLabel] Options label. | ||
| * @param {Object} [props.icon] Icon for the toolbar. | ||
| * @param {string} props.value Current dropdown value. | ||
| * @param {Function} props.onChange Dropdown change callback, which receive the new value as argument. | ||
| * | ||
| * @return {Object} React component. | ||
| */ | ||
| const ToolbarDropdown = ( { | ||
| options, | ||
| optionsLabel, | ||
| icon, | ||
| value, | ||
| onChange, | ||
| ...props | ||
| } ) => { | ||
| const selectedOption = options.find( ( option ) => value === option.value ); | ||
|
|
||
| return ( | ||
| <Dropdown | ||
| className="syntaxhighlighter-toolbar-dropdown" | ||
| popoverProps={ { | ||
| isAlternate: true, | ||
| position: 'bottom right left', | ||
| focusOnMount: true, | ||
| className: classnames( | ||
| 'syntaxhighlighter-toolbar-dropdown__popover' | ||
| ), | ||
| } } | ||
| renderToggle={ ( { isOpen, onToggle } ) => ( | ||
| <Button | ||
| onClick={ onToggle } | ||
| icon={ icon } | ||
| aria-expanded={ isOpen } | ||
| aria-haspopup="true" | ||
| children={ | ||
| selectedOption ? selectedOption.label : '' | ||
| } | ||
| /> | ||
| ) } | ||
| renderContent={ ( { onClose } ) => ( | ||
| <NavigableMenu role="menu" stopNavigationEvents> | ||
| <MenuGroup label={ optionsLabel }> | ||
| { options.map( ( option ) => { | ||
| const isSelected = | ||
| option.value === selectedOption.value; | ||
| return ( | ||
| <MenuItem | ||
| key={ option.value } | ||
| role="menuitemradio" | ||
| isSelected={ isSelected } | ||
| className={ classnames( | ||
| 'syntaxhighlighter-toolbar-dropdown__option', | ||
| { 'is-selected': isSelected }, | ||
| ) } | ||
| onClick={ () => { | ||
| onChange( option.value ); | ||
| onClose(); | ||
| } } | ||
| children={ option.label } | ||
| /> | ||
| ); | ||
| } ) } | ||
| </MenuGroup> | ||
| </NavigableMenu> | ||
| ) } | ||
| { ...props } | ||
| /> | ||
| ); | ||
| }; | ||
|
|
||
| export default ToolbarDropdown; |
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,23 @@ | ||
| .syntaxhighlighter-toolbar-dropdown { | ||
| &__popover.components-popover[data-x-axis='right'] { | ||
| .components-popover__content { | ||
| margin-left: 0; | ||
| min-width: 300px; | ||
| } | ||
| } | ||
|
|
||
| &__option { | ||
| text-align: left; | ||
| height: auto; | ||
| min-height: 32px; | ||
| border-radius: 2px; | ||
|
|
||
| .components-menu-item__item { | ||
| white-space: normal; | ||
| } | ||
|
|
||
| &.is-selected { | ||
| background-color: #f0f0f0; | ||
| } | ||
| } | ||
| } |