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.

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

Add an API to add a plugin sidebar #4109

Closed
wants to merge 30 commits into from
Closed
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
f3d3daf
Add an API to add a plugin sidebar
atimmer Dec 20, 2017
2864974
Merge branch 'master' into add/api-add-plugin-sidebar
Jan 3, 2018
b4fa154
Applied minor codestyle changes to sidebar.js
Jan 3, 2018
ba05cd8
Applied minor codestyle changes to plugins header
Jan 3, 2018
506fd15
Merge branch 'master' of https://github.com/WordPress/gutenberg into …
Jan 3, 2018
9caaf8e
Fixed broken dependency after merging wordpress/gutenberg
Jan 3, 2018
53579b3
Initial attempt at rendering plugins in a separate sidebar
Jan 5, 2018
9428aa9
Removed accidentally added IDE file
Jan 8, 2018
7241609
Initial changes
Jan 9, 2018
8870121
removed .idea
Jan 9, 2018
cc0b124
Updated actions, reducers and selectors
Jan 10, 2018
b3aa610
finished implementing new actions, reducers and selectors
Jan 10, 2018
c7b36b3
Fixed last build errors
Jan 10, 2018
e4b9df3
Merge branch 'master' into add/api-add-plugin-sidebar
xyfi Jan 11, 2018
693e5a8
Add renderSidebar function
IreneStr Jan 12, 2018
04d6e2b
Add renderSidebar function
IreneStr Jan 17, 2018
aa3c84b
Remove console.logs and unneeded argument
IreneStr Jan 18, 2018
ed6ea39
Alter class name to enable plugin sidebar-specific styling
IreneStr Jan 19, 2018
3af2240
Unexpose activateSidebar and registerSidebar
IreneStr Jan 22, 2018
10529c8
Fix console error syntax and remove unnecessary error
IreneStr Jan 22, 2018
fd057e8
Rename viewMode to viewportType
IreneStr Jan 22, 2018
af1cc84
Merge branch 'master' into add/api-add-plugin-sidebar
IreneStr Jan 22, 2018
c7daa63
Add SET_VIEWPORT_TYPE to reducers
IreneStr Jan 23, 2018
a5ffe6c
Fix unittests part 1
IreneStr Jan 23, 2018
ec870c3
Fix unittests part 2
IreneStr Jan 24, 2018
b34991d
Remove unneeded padding
IreneStr Jan 25, 2018
06950bd
Remove mobile middleware
IreneStr Jan 25, 2018
fce3ddd
Close sidebar when switching to mobile view
IreneStr Jan 25, 2018
02cc074
Unexpose activateSidebar
IreneStr Jan 25, 2018
0072e66
Fix codestyle
IreneStr Jan 25, 2018
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
6 changes: 6 additions & 0 deletions editor/api/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export {
registerSidebar,
renderSidebar,
activateSidebar,
getSidebar
} from './sidebar';
123 changes: 123 additions & 0 deletions editor/api/sidebar.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
/* eslint no-console: [ 'error', { allow: [ 'error' ] } ] */

/* External dependencies */
import { isFunction } from 'lodash';

/* Internal dependencies */
import store from '../store';
import { setGeneralSidebarActivePanel, openGeneralSidebar } from '../store/actions';
import { applyFilters } from '@wordpress/hooks';

const sidebars = {};

/**
* Registers a sidebar to the editor.
*
* A button will be shown in the settings menu to open the sidebar. The sidebar
* can be manually opened by calling the `activateSidebar` function.
*
* @param {string} name The name of the sidebar. Should be in
* `[plugin]/[sidebar]` format.
* @param {Object} settings The settings for this sidebar.
* @param {string} settings.title The name to show in the settings menu.
* @param {Function} settings.render The function that renders the sidebar.
*
* @returns {Object} The final sidebar settings object.
Copy link
Member

Choose a reason for hiding this comment

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

TIL @returns and @return are equally valid and equivalent JSDoc tags. Noting that we've conventionally used @return elsewhere.

Copy link
Member Author

@atimmer atimmer Jan 3, 2018

Choose a reason for hiding this comment

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

In the WordPress JavaScript documentation standards we go with @returns.

*/
export function registerSidebar( name, settings ) {
settings = {
name,
...settings,
};

if ( typeof name !== 'string' ) {
console.error(
'Sidebar names must be strings.'
);
return null;
}
if ( ! /^[a-z][a-z0-9-]*\/[a-z][a-z0-9-]*$/.test( name ) ) {
console.error(
'Sidebar names must contain a namespace prefix, include only lowercase alphanumeric characters or dashes, and start with a letter. Example: my-plugin/my-custom-sidebar'
Copy link
Member

Choose a reason for hiding this comment

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

Missing period

);
return null;
}
if ( ! settings || ! isFunction( settings.render ) ) {
console.error(
'The "render" property must be specified and must be a valid function.'
);
return null;
}
if ( sidebars[ name ] ) {
console.error(
'Sidebar "' + name + '" is already registered.'
);
Copy link
Member

Choose a reason for hiding this comment

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

Missing return

Copy link
Contributor

Choose a reason for hiding this comment

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

This might be intentional to overwrite a plugin?

Copy link
Member

Choose a reason for hiding this comment

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

Minor: Normally we avoid + operator to concatenate strings Maybe we can use Sidebar "${ name }" is already registered..

}

if ( ! settings.title ) {
console.error(
'The sidebar "' + name + '" must have a title.'
);
return null;
}
if ( typeof settings.title !== 'string' ) {
console.error(
'Sidebar titles must be strings.'
);
return null;
}

settings = applyFilters( 'editor.registerSidebar', settings, name );

return sidebars[ name ] = settings;
}

/**
* Retrieves the sidebar settings object.
*
* @param {string} name The name of the sidebar to retrieve the settings for.
*
* @returns {Object} The settings object of the sidebar. Or null if the
* sidebar doesn't exist.
*/
export function getSidebarSettings( name ) {
console.log("getSidebarSettings", sidebars)
if ( ! sidebars.hasOwnProperty( name ) ) {
return null;
}
return sidebars[ name ];
}

/**
* Renders a plugin sidebar.
*
* @param {string} name The name of the plugin sidebar.
* @param {Object} settings The settings for this sidebar.
* @param {string} settings.title The name to show in the settings menu.
* @param {Function} settings.render The function that renders the sidebar.
*
* @returns {void}
Copy link
Member

Choose a reason for hiding this comment

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

To my knowledge, there's no concept of a void type in JavaScript†. Would we need this JSDoc tag at all? More accurately this would have an undefined return value.

† There is a void operator

Copy link
Member Author

@atimmer atimmer Jan 17, 2018

Choose a reason for hiding this comment

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

The void return 'type' is meant to signify that a function is not intended to return something. And that you shouldn't use the return value of the function.

*/
export function renderSidebar( name, settings ) {
registerSidebar( name, settings );
activateSidebar( name, settings );
/*
let render = getSidebarSettings( name ).render;
render();*/
}

/**
* Activates the given sidebar.
*
* @param {string} name The name of the sidebar to activate.
* @return {void}
*/
export function activateSidebar( name ) {
if ( ! sidebars[ name ] ) {
console.error(
'Sidebar "' + name + '" is not registered yet.'
);
}
store.dispatch( openGeneralSidebar( 'plugins' ) );
store.dispatch( setGeneralSidebarActivePanel( 'plugins', name ) );
}
36 changes: 12 additions & 24 deletions editor/components/block-settings-menu/block-inspector-button.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,58 +13,46 @@ import { IconButton, withSpokenMessages } from '@wordpress/components';
/**
* Internal dependencies
*/
import { getActivePanel, isSidebarOpened } from '../../store/selectors';
import { toggleSidebar, setActivePanel } from '../../store/actions';
import { getActiveEditorPanel, isGeneralSidebarPanelOpened } from '../../store/selectors';
import { openGeneralSidebar } from '../../store/actions';

export function BlockInspectorButton( {
isDefaultSidebarOpened,
isGeneralSidebarEditorOpened,
onOpenGeneralSidebarEditor,
panel,
toggleDefaultSidebar,
onShowInspector,
onClick = noop,
small = false,
speak,
} ) {
const toggleInspector = () => {
onShowInspector();
if ( ! isDefaultSidebarOpened || panel === 'block' ) {
toggleDefaultSidebar();
}
};

const speakMessage = () => {
if ( ! isDefaultSidebarOpened || ( isDefaultSidebarOpened && panel !== 'block' ) ) {
if ( ! isGeneralSidebarEditorOpened || ( isGeneralSidebarEditorOpened && panel !== 'block' ) ) {
speak( __( 'Additional settings are now available in the Editor advanced settings sidebar' ) );
} else {
speak( __( 'Advanced settings closed' ) );
}
};

const label = ( isDefaultSidebarOpened && panel === 'block' ) ? __( 'Hide Advanced Settings' ) : __( 'Show Advanced Settings' );
const label = ( isGeneralSidebarEditorOpened && panel === 'block' ) ? __( 'Hide Advanced Settings' ) : __( 'Show Advanced Settings' );

return (
<IconButton
className="editor-block-settings-menu__control"
onClick={ flow( toggleInspector, speakMessage, onClick ) }
onClick={ flow( onOpenGeneralSidebarEditor, speakMessage, onClick ) }
icon="admin-generic"
label={ small ? label : undefined }
>
label={ small ? label : undefined } >
{ ! small && label }
</IconButton>
);
}

export default connect(
( state ) => ( {
isDefaultSidebarOpened: isSidebarOpened( state ),
panel: getActivePanel( state ),
isGeneralSidebarEditorOpened: isGeneralSidebarPanelOpened( state, 'editor' ),
panel: getActiveEditorPanel( state ),
} ),
( dispatch ) => ( {
onShowInspector() {
dispatch( setActivePanel( 'block' ) );
},
toggleDefaultSidebar() {
dispatch( toggleSidebar() );
onOpenGeneralSidebarEditor() {
dispatch( openGeneralSidebar( 'editor', 'block' ) );
},
} )
)( withSpokenMessages( BlockInspectorButton ) );
1 change: 1 addition & 0 deletions editor/components/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export { default as MetaBoxes } from './meta-boxes';
export { default as PageAttributesCheck } from './page-attributes/check';
export { default as PageAttributesOrder } from './page-attributes/order';
export { default as PageAttributesParent } from './page-attributes/parent';
export { default as PluginsPanel } from './plugins-panel';
export { default as PostAuthor } from './post-author';
export { default as PostAuthorCheck } from './post-author/check';
export { default as PostComments } from './post-comments';
Expand Down
83 changes: 83 additions & 0 deletions editor/components/plugins-panel/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
/**
* External dependencies
*/
import { connect } from 'react-redux';

/**
* WordPress dependencies
*/
import { __, sprintf } from '@wordpress/i18n';
import { compose } from '@wordpress/element';
import { Panel, PanelBody, IconButton, withFocusReturn } from '@wordpress/components';

/**
* Internal Dependencies
*/
import './style.scss';
import { getSidebarSettings } from '../../api/sidebar';
import { getActivePlugin } from '../../store/selectors';
import { closeGeneralSidebar } from '../../store/actions';

/**
* Returns the sidebar that should be rendered in the sidebar registered by
* plugins.
*
* @param {string} plugin The currently active plugin.
*
* @returns {Object} The React element to render as a panel.
*/
export function getPluginSidebar( plugin ) {
const pluginSidebar = getSidebarSettings( plugin );
console.log( "pluginSidebar", pluginSidebar );
console.log( "plugin", plugin );

if ( ! pluginSidebar ) {
return {
title: __( 'Error: Unregistered plugin requested.' ),
render: () => {
return <Panel>
<PanelBody>
{ sprintf( __( 'No matching plugin sidebar found for plugin "%s"' ), plugin ) }
</PanelBody>
</Panel>;
},
};
}
return pluginSidebar;
}

function PluginsPanel( { onClose, plugin } ) {
const {
title,
render,
} = getPluginSidebar( plugin );
return (
<div
className="editor-sidebar"
role="region"
aria-label={ __( 'Editor plugins' ) }
tabIndex="-1">
<div className="components-panel__header editor-sidebar__panel-tabs">
<h3>{ title }</h3>
<IconButton
onClick={ onClose }
icon="no-alt"
label={ __( 'Close settings' ) }
/>
</div>
<div className="editor-plugins-panel__content">
{ render() }
</div>
</div>
);
}

export default connect(
( state ) => {
return {
plugin: getActivePlugin( state ),
};
}, {
onClose: closeGeneralSidebar,
}
)( withFocusReturn( PluginsPanel ) );
49 changes: 49 additions & 0 deletions editor/components/plugins-panel/style.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
.editor-plugins-panel {
position: fixed;
top: 0;
right: 0;
bottom: 0;
width: $sidebar-width;
border-left: 1px solid $light-gray-500;
background: $light-gray-300;
color: $dark-gray-500;
height: 100vh;
overflow: hidden;

@include break-small() {
top: $admin-bar-height-big + $header-height;
z-index: auto;
height: auto;
overflow: auto;
-webkit-overflow-scrolling: touch;
}

@include break-medium() {
top: $admin-bar-height + $header-height;
}

> .components-panel .components-panel__header {
position: fixed;
z-index: z-index( '.components-panel__header' );
top: 0;
left: 0;
right: 0;
height: $panel-header-height;

@include break-small() {
position: inherit;
top: auto;
left: auto;
right: auto;
}
}
}

.editor-plugins-panel__header {
padding-left: 16px;
height: $header-height;
border-bottom: 1px solid $light-gray-500;
display: flex;
align-items: center;
align-content: space-between;
}
Loading