From 0e55e1063e32ece09843fdf6d96ac9f5af545e1e Mon Sep 17 00:00:00 2001
From: Ryan Welcher <ryan.welcher@10up.com>
Date: Mon, 1 Jul 2019 16:35:51 -0400
Subject: [PATCH 01/25] Adds priority to context

---
 .../sidebar/plugin-sidebar/index.js           | 170 ++++++++++++++++++
 .../src/components/plugin-context/index.js    |  36 ++++
 2 files changed, 206 insertions(+)
 create mode 100644 packages/edit-post/src/components/sidebar/plugin-sidebar/index.js
 create mode 100644 packages/plugins/src/components/plugin-context/index.js

diff --git a/packages/edit-post/src/components/sidebar/plugin-sidebar/index.js b/packages/edit-post/src/components/sidebar/plugin-sidebar/index.js
new file mode 100644
index 0000000000000..91e16e6d606ad
--- /dev/null
+++ b/packages/edit-post/src/components/sidebar/plugin-sidebar/index.js
@@ -0,0 +1,170 @@
+/**
+ * WordPress dependencies
+ */
+import { Button, Panel } from '@wordpress/components';
+import { withDispatch, withSelect } from '@wordpress/data';
+import { __ } from '@wordpress/i18n';
+import { withPluginContext } from '@wordpress/plugins';
+import { compose } from '@wordpress/compose';
+
+/**
+ * Internal dependencies
+ */
+import PinnedPlugins from '../../header/pinned-plugins';
+import Sidebar from '../';
+import SidebarHeader from '../sidebar-header';
+
+function PluginSidebar( props ) {
+	const {
+		children,
+		className,
+		icon,
+		isActive,
+		isPinnable = true,
+		isPinned,
+		sidebarName,
+		title,
+		togglePin,
+		toggleSidebar,
+	} = props;
+
+	return (
+		<>
+			{ isPinnable && (
+				<PinnedPlugins>
+					{ isPinned && <Button
+						icon={ icon }
+						label={ title }
+						onClick={ toggleSidebar }
+						isPressed={ isActive }
+						aria-expanded={ isActive }
+					/> }
+				</PinnedPlugins>
+			) }
+			<Sidebar name={ sidebarName }>
+				<SidebarHeader
+					closeLabel={ __( 'Close plugin' ) }
+				>
+					<strong>{ title }</strong>
+					{ isPinnable && (
+						<Button
+							icon={ isPinned ? 'star-filled' : 'star-empty' }
+							label={ isPinned ? __( 'Unpin from toolbar' ) : __( 'Pin to toolbar' ) }
+							onClick={ togglePin }
+							isPressed={ isPinned }
+							aria-expanded={ isPinned }
+						/>
+					) }
+				</SidebarHeader>
+				<Panel className={ className }>
+					{ children }
+				</Panel>
+			</Sidebar>
+		</>
+	);
+}
+
+/**
+ * Renders a sidebar when activated. The contents within the `PluginSidebar` will appear as content within the sidebar.
+ * If you wish to display the sidebar, you can with use the `PluginSidebarMoreMenuItem` component or the `wp.data.dispatch` API:
+ *
+ * ```js
+ * wp.data.dispatch( 'core/edit-post' ).openGeneralSidebar( 'plugin-name/sidebar-name' );
+ * ```
+ *
+ * @see PluginSidebarMoreMenuItem
+ *
+ * @param {Object} props Element props.
+ * @param {string} props.name A string identifying the sidebar. Must be unique for every sidebar registered within the scope of your plugin.
+ * @param {string} [props.className] An optional class name added to the sidebar body.
+ * @param {string} props.title Title displayed at the top of the sidebar.
+ * @param {boolean} [props.isPinnable=true] Whether to allow to pin sidebar to toolbar.
+ * @param {WPBlockTypeIconRender} [props.icon=inherits from the plugin] The [Dashicon](https://developer.wordpress.org/resource/dashicons/) icon slug string, or an SVG WP element, to be rendered when the sidebar is pinned to toolbar.
+ *
+ * @example <caption>ES5</caption>
+ * ```js
+ * // Using ES5 syntax
+ * var __ = wp.i18n.__;
+ * var el = wp.element.createElement;
+ * var PanelBody = wp.components.PanelBody;
+ * var PluginSidebar = wp.editPost.PluginSidebar;
+ *
+ * function MyPluginSidebar() {
+ * 	return el(
+ * 			PluginSidebar,
+ * 			{
+ * 				name: 'my-sidebar',
+ * 				title: 'My sidebar title',
+ * 				icon: 'smiley',
+ * 			},
+ * 			el(
+ * 				PanelBody,
+ * 				{},
+ * 				__( 'My sidebar content' )
+ * 			)
+ * 	);
+ * }
+ * ```
+ *
+ * @example <caption>ESNext</caption>
+ * ```jsx
+ * // Using ESNext syntax
+ * const { __ } = wp.i18n;
+ * const { PanelBody } = wp.components;
+ * const { PluginSidebar } = wp.editPost;
+ *
+ * const MyPluginSidebar = () => (
+ * 	<PluginSidebar
+ * 		name="my-sidebar"
+ * 		title="My sidebar title"
+ * 		icon="smiley"
+ * 	>
+ * 		<PanelBody>
+ * 			{ __( 'My sidebar content' ) }
+ * 		</PanelBody>
+ * 	</PluginSidebar>
+ * );
+ * ```
+ *
+ * @return {WPComponent} Plugin sidebar component.
+ */
+export default compose(
+	withPluginContext( ( context, ownProps ) => {
+		return {
+			icon: ownProps.icon || context.icon,
+			sidebarName: `${ context.name }/${ ownProps.name }`,
+			priority: ownProps.priority || context.priority,
+		};
+	} ),
+	withSelect( ( select, { sidebarName } ) => {
+		const {
+			getActiveGeneralSidebarName,
+			isPluginItemPinned,
+		} = select( 'core/edit-post' );
+
+		return {
+			isActive: getActiveGeneralSidebarName() === sidebarName,
+			isPinned: isPluginItemPinned( sidebarName ),
+		};
+	} ),
+	withDispatch( ( dispatch, { isActive, sidebarName } ) => {
+		const {
+			closeGeneralSidebar,
+			openGeneralSidebar,
+			togglePinnedPluginItem,
+		} = dispatch( 'core/edit-post' );
+
+		return {
+			togglePin() {
+				togglePinnedPluginItem( sidebarName );
+			},
+			toggleSidebar() {
+				if ( isActive ) {
+					closeGeneralSidebar();
+				} else {
+					openGeneralSidebar( sidebarName );
+				}
+			},
+		};
+	} ),
+)( PluginSidebar );
diff --git a/packages/plugins/src/components/plugin-context/index.js b/packages/plugins/src/components/plugin-context/index.js
new file mode 100644
index 0000000000000..975d19b6faca5
--- /dev/null
+++ b/packages/plugins/src/components/plugin-context/index.js
@@ -0,0 +1,36 @@
+/**
+ * WordPress dependencies
+ */
+import { createContext } from '@wordpress/element';
+import { createHigherOrderComponent } from '@wordpress/compose';
+
+const { Consumer, Provider } = createContext( {
+	name: null,
+	icon: null,
+	priority: 10,
+} );
+
+export { Provider as PluginContextProvider };
+
+/**
+ * A Higher Order Component used to inject Plugin context to the
+ * wrapped component.
+ *
+ * @param {Function} mapContextToProps Function called on every context change,
+ *                                     expected to return object of props to
+ *                                     merge with the component's own props.
+ *
+ * @return {WPComponent} Enhanced component with injected context as props.
+ */
+export const withPluginContext = ( mapContextToProps ) => createHigherOrderComponent( ( OriginalComponent ) => {
+	return ( props ) => (
+		<Consumer>
+			{ ( context ) => (
+				<OriginalComponent
+					{ ...props }
+					{ ...mapContextToProps( context, props ) }
+				/>
+			) }
+		</Consumer>
+	);
+}, 'withPluginContext' );

From 578e6d7cbb3663add39f5e673d5810ffa55a9d68 Mon Sep 17 00:00:00 2001
From: Ryan Welcher <ryan.welcher@10up.com>
Date: Mon, 1 Jul 2019 21:52:38 -0400
Subject: [PATCH 02/25] Adds priority property to the settings object with a
 default of 10. Sorts the registered plugins by priority before rendering them
 in PluginArea

---
 packages/plugins/README.md                    |   8 +
 packages/plugins/src/api/index.js             | 222 ++++++++++++++++++
 .../src/components/plugin-area/index.js       | 105 +++++++++
 .../src/components/plugin-context/index.js    |   2 +-
 4 files changed, 336 insertions(+), 1 deletion(-)
 create mode 100644 packages/plugins/src/api/index.js
 create mode 100644 packages/plugins/src/components/plugin-area/index.js

diff --git a/packages/plugins/README.md b/packages/plugins/README.md
index bbf70fed553d3..835d1bbfcd283 100644
--- a/packages/plugins/README.md
+++ b/packages/plugins/README.md
@@ -117,7 +117,11 @@ function Component() {
 registerPlugin( 'plugin-name', {
 	icon: moreIcon,
 	render: Component,
+<<<<<<< HEAD
 	scope: 'my-page',
+=======
+	priority: 5
+>>>>>>> 0950f3cb07 (Adds priority property to the settings object with a default of 10. Sorts the registered plugins by priority before rendering them in PluginArea)
 } );
 ```
 
@@ -141,7 +145,11 @@ const Component = () => (
 registerPlugin( 'plugin-name', {
 	icon: more,
 	render: Component,
+<<<<<<< HEAD
 	scope: 'my-page',
+=======
+	priority: 5
+>>>>>>> 0950f3cb07 (Adds priority property to the settings object with a default of 10. Sorts the registered plugins by priority before rendering them in PluginArea)
 } );
 ```
 
diff --git a/packages/plugins/src/api/index.js b/packages/plugins/src/api/index.js
new file mode 100644
index 0000000000000..ae9743c691157
--- /dev/null
+++ b/packages/plugins/src/api/index.js
@@ -0,0 +1,222 @@
+/* eslint no-console: [ 'error', { allow: [ 'error' ] } ] */
+
+/**
+ * WordPress dependencies
+ */
+import { applyFilters, doAction } from '@wordpress/hooks';
+
+/**
+ * External dependencies
+ */
+import { isFunction } from 'lodash';
+
+/**
+ * Defined behavior of a plugin type.
+ *
+ * @typedef {Object} WPPlugin
+ *
+ * @property {string}                    name     A string identifying the plugin. Must be
+ *                                                unique across all registered plugins.
+ *                                                unique across all registered plugins.
+ * @property {string|WPElement|Function} icon     An icon to be shown in the UI. It can
+ *                                                be a slug of the Dashicon, or an element
+ *                                                (or function returning an element) if you
+ *                                                choose to render your own SVG.
+ * @property {Function}                  render   A component containing the UI elements
+ *                                                to be rendered.
+ * @property {number}                    priority Allows for controlling the display order of this plugin.
+ *                                                Default is 10.
+ */
+
+/**
+ * Plugin definitions keyed by plugin name.
+ *
+ * @type {Object.<string,WPPlugin>}
+ */
+const plugins = {};
+
+/**
+ * Registers a plugin to the editor.
+ *
+ * @param {string}   name     A string identifying the plugin.Must be
+ *                            unique across all registered plugins.
+ * @param {WPPlugin} settings The settings for this plugin.
+ *
+ * @example <caption>ES5</caption>
+ * ```js
+ * // Using ES5 syntax
+ * var el = wp.element.createElement;
+ * var Fragment = wp.element.Fragment;
+ * var PluginSidebar = wp.editPost.PluginSidebar;
+ * var PluginSidebarMoreMenuItem = wp.editPost.PluginSidebarMoreMenuItem;
+ * var registerPlugin = wp.plugins.registerPlugin;
+ *
+ * function Component() {
+ * 	return el(
+ * 		Fragment,
+ * 		{},
+ * 		el(
+ * 			PluginSidebarMoreMenuItem,
+ * 			{
+ * 				target: 'sidebar-name',
+ * 			},
+ * 			'My Sidebar'
+ * 		),
+ * 		el(
+ * 			PluginSidebar,
+ * 			{
+ * 				name: 'sidebar-name',
+ * 				title: 'My Sidebar',
+ * 			},
+ * 			'Content of the sidebar'
+ * 		)
+ * 	);
+ * }
+ * registerPlugin( 'plugin-name', {
+ * 	icon: 'smiley',
+ * 	render: Component,
+ * 	priority: 5
+ * } );
+ * ```
+ *
+ * @example <caption>ESNext</caption>
+ * ```js
+ * // Using ESNext syntax
+ * const { PluginSidebar, PluginSidebarMoreMenuItem } = wp.editPost;
+ * const { registerPlugin } = wp.plugins;
+ *
+ * const Component = () => (
+ * 	<>
+ * 		<PluginSidebarMoreMenuItem
+ * 			target="sidebar-name"
+ * 		>
+ * 			My Sidebar
+ * 		</PluginSidebarMoreMenuItem>
+ * 		<PluginSidebar
+ * 			name="sidebar-name"
+ * 			title="My Sidebar"
+ * 		>
+ * 			Content of the sidebar
+ * 		</PluginSidebar>
+ * 	</>
+ * );
+ *
+ * registerPlugin( 'plugin-name', {
+ * 	icon: 'smiley',
+ * 	render: Component,
+ * 	priority: 5
+ * } );
+ * ```
+ *
+ * @return {WPPlugin} The final plugin settings object.
+ */
+export function registerPlugin( name, settings ) {
+	if ( typeof settings !== 'object' ) {
+		console.error(
+			'No settings object provided!'
+		);
+		return null;
+	}
+	if ( typeof name !== 'string' ) {
+		console.error(
+			'Plugin names must be strings.'
+		);
+		return null;
+	}
+	if ( settings.priority && typeof settings.priority !== 'number' ) {
+		console.error(
+			'The "priority" property must be a number'
+		);
+		return null;
+	}
+	if ( ! /^[a-z][a-z0-9-]*$/.test( name ) ) {
+		console.error(
+			'Plugin names must include only lowercase alphanumeric characters or dashes, and start with a letter. Example: "my-plugin".'
+		);
+		return null;
+	}
+	if ( plugins[ name ] ) {
+		console.error(
+			`Plugin "${ name }" is already registered.`
+		);
+	}
+
+	settings = applyFilters( 'plugins.registerPlugin', settings, name );
+
+	if ( ! isFunction( settings.render ) ) {
+		console.error(
+			'The "render" property must be specified and must be a valid function.'
+		);
+		return null;
+	}
+
+	plugins[ name ] = {
+		name,
+		icon: 'admin-plugins',
+		priority: 10,
+		...settings,
+	};
+
+	doAction( 'plugins.pluginRegistered', settings, name );
+
+	return settings;
+}
+
+/**
+ * Unregisters a plugin by name.
+ *
+ * @param {string} name Plugin name.
+ *
+ * @example <caption>ES5</caption>
+ * ```js
+ * // Using ES5 syntax
+ * var unregisterPlugin = wp.plugins.unregisterPlugin;
+ *
+ * unregisterPlugin( 'plugin-name' );
+ * ```
+ *
+ * @example <caption>ESNext</caption>
+ * ```js
+ * // Using ESNext syntax
+ * const { unregisterPlugin } = wp.plugins;
+ *
+ * unregisterPlugin( 'plugin-name' );
+ * ```
+ *
+ * @return {?WPPlugin} The previous plugin settings object, if it has been
+ *                     successfully unregistered; otherwise `undefined`.
+ */
+export function unregisterPlugin( name ) {
+	if ( ! plugins[ name ] ) {
+		console.error(
+			'Plugin "' + name + '" is not registered.'
+		);
+		return;
+	}
+	const oldPlugin = plugins[ name ];
+	delete plugins[ name ];
+
+	doAction( 'plugins.pluginUnregistered', oldPlugin, name );
+
+	return oldPlugin;
+}
+
+/**
+ * Returns a registered plugin settings.
+ *
+ * @param {string} name Plugin name.
+ *
+ * @return {?WPPlugin} Plugin setting.
+ */
+export function getPlugin( name ) {
+	return plugins[ name ];
+}
+
+/**
+ * Returns all registered plugins.
+ *
+ * @return {WPPlugin[]} Plugin settings.
+ */
+export function getPlugins() {
+	return Object.values( plugins );
+}
diff --git a/packages/plugins/src/components/plugin-area/index.js b/packages/plugins/src/components/plugin-area/index.js
new file mode 100644
index 0000000000000..7846b0a2bf589
--- /dev/null
+++ b/packages/plugins/src/components/plugin-area/index.js
@@ -0,0 +1,105 @@
+/**
+ * External dependencies
+ */
+import { map, sortBy } from 'lodash';
+
+/**
+ * WordPress dependencies
+ */
+import { Component } from '@wordpress/element';
+import { addAction, removeAction } from '@wordpress/hooks';
+
+/**
+ * Internal dependencies
+ */
+import { PluginContextProvider } from '../plugin-context';
+import { getPlugins } from '../../api';
+
+/**
+ * A component that renders all plugin fills in a hidden div.
+ *
+ * @example <caption>ES5</caption>
+ * ```js
+ * // Using ES5 syntax
+ * var el = wp.element.createElement;
+ * var PluginArea = wp.plugins.PluginArea;
+ *
+ * function Layout() {
+ * 	return el(
+ * 		'div',
+ * 		{},
+ * 		'Content of the page',
+ * 		PluginArea
+ * 	);
+ * }
+ * ```
+ *
+ * @example <caption>ESNext</caption>
+ * ```js
+ * // Using ESNext syntax
+ * const { PluginArea } = wp.plugins;
+ *
+ * const Layout = () => (
+ * 	<div>
+ * 		Content of the page
+ * 		<PluginArea />
+ * 	</div>
+ * );
+ * ```
+ *
+ * @return {WPComponent} The component to be rendered.
+ */
+class PluginArea extends Component {
+	constructor() {
+		super( ...arguments );
+
+		this.setPlugins = this.setPlugins.bind( this );
+		this.state = this.getCurrentPluginsState();
+	}
+
+	getCurrentPluginsState() {
+		return {
+			plugins: map( sortBy( getPlugins(), [ 'priority' ] ), ( { icon, name, render, priority } ) => {
+				return {
+					Plugin: render,
+					context: {
+						name,
+						icon,
+						priority,
+					},
+				};
+			} ),
+		};
+	}
+
+	componentDidMount() {
+		addAction( 'plugins.pluginRegistered', 'core/plugins/plugin-area/plugins-registered', this.setPlugins );
+		addAction( 'plugins.pluginUnregistered', 'core/plugins/plugin-area/plugins-unregistered', this.setPlugins );
+	}
+
+	componentWillUnmount() {
+		removeAction( 'plugins.pluginRegistered', 'core/plugins/plugin-area/plugins-registered' );
+		removeAction( 'plugins.pluginUnregistered', 'core/plugins/plugin-area/plugins-unregistered' );
+	}
+
+	setPlugins() {
+		this.setState( this.getCurrentPluginsState );
+	}
+
+	render() {
+		return (
+			<div style={ { display: 'none' } }>
+				{ map( this.state.plugins, ( { context, Plugin } ) => (
+					<PluginContextProvider
+						key={ context.name }
+						value={ context }
+					>
+						<Plugin />
+					</PluginContextProvider>
+				) ) }
+			</div>
+		);
+	}
+}
+
+export default PluginArea;
diff --git a/packages/plugins/src/components/plugin-context/index.js b/packages/plugins/src/components/plugin-context/index.js
index 975d19b6faca5..ebb448806c665 100644
--- a/packages/plugins/src/components/plugin-context/index.js
+++ b/packages/plugins/src/components/plugin-context/index.js
@@ -7,7 +7,7 @@ import { createHigherOrderComponent } from '@wordpress/compose';
 const { Consumer, Provider } = createContext( {
 	name: null,
 	icon: null,
-	priority: 10,
+	priority: null,
 } );
 
 export { Provider as PluginContextProvider };

From 927b0a150669a2e3ec7ad308cf8c93313fb24316 Mon Sep 17 00:00:00 2001
From: Ryan Welcher <ryan.welcher@10up.com>
Date: Tue, 2 Jul 2019 07:58:57 -0400
Subject: [PATCH 03/25] Adds better data validation and new unit tests

---
 packages/plugins/src/api/index.js      |  6 ++++--
 packages/plugins/src/api/test/index.js | 25 +++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/packages/plugins/src/api/index.js b/packages/plugins/src/api/index.js
index ae9743c691157..6035ba4de9629 100644
--- a/packages/plugins/src/api/index.js
+++ b/packages/plugins/src/api/index.js
@@ -123,7 +123,9 @@ export function registerPlugin( name, settings ) {
 		);
 		return null;
 	}
-	if ( settings.priority && typeof settings.priority !== 'number' ) {
+
+	const { priority = 10 } = settings;
+	if ( priority !== 0 && ( priority.length === 0 || typeof priority !== 'number' ) ) {
 		console.error(
 			'The "priority" property must be a number'
 		);
@@ -153,7 +155,7 @@ export function registerPlugin( name, settings ) {
 	plugins[ name ] = {
 		name,
 		icon: 'admin-plugins',
-		priority: 10,
+		priority,
 		...settings,
 	};
 
diff --git a/packages/plugins/src/api/test/index.js b/packages/plugins/src/api/test/index.js
index bc1f7a5f63607..4fc16e79f95d0 100644
--- a/packages/plugins/src/api/test/index.js
+++ b/packages/plugins/src/api/test/index.js
@@ -24,6 +24,7 @@ describe( 'registerPlugin', () => {
 			name,
 			render: Component,
 			icon,
+			priority: 10,
 		} );
 	} );
 
@@ -121,4 +122,28 @@ describe( 'getPlugins', () => {
 		expect( scopedPlugins ).toHaveLength( 1 );
 		expect( scopedPlugins[ 0 ].name ).toBe( 'scoped' );
 	} );
+
+	it( 'fails to register a plugin with a priority set to an empty string', () => {
+		registerPlugin( 'priority-as-string', {
+			render: () => {},
+			priority: '',
+		} );
+		expect( console ).toHaveErroredWith( 'The "priority" property must be a number' );
+	} );
+
+	it( 'fails to register a plugin with a priority set to boolean true', () => {
+		registerPlugin( 'priority-as-string', {
+			render: () => {},
+			priority: true,
+		} );
+		expect( console ).toHaveErroredWith( 'The "priority" property must be a number' );
+	} );
+
+	it( 'fails to register a plugin with a priority set to boolean false', () => {
+		registerPlugin( 'priority-as-string', {
+			render: () => {},
+			priority: false,
+		} );
+		expect( console ).toHaveErroredWith( 'The "priority" property must be a number' );
+	} );
 } );

From 8b9f3f18f1000950acf7cfcd1446937076c530b3 Mon Sep 17 00:00:00 2001
From: Ryan Welcher <ryan.welcher@10up.com>
Date: Tue, 2 Jul 2019 08:36:45 -0400
Subject: [PATCH 04/25] using compose to sort the plugins

---
 packages/plugins/src/components/plugin-area/index.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/plugins/src/components/plugin-area/index.js b/packages/plugins/src/components/plugin-area/index.js
index 7846b0a2bf589..9e59ba7152a82 100644
--- a/packages/plugins/src/components/plugin-area/index.js
+++ b/packages/plugins/src/components/plugin-area/index.js
@@ -8,6 +8,7 @@ import { map, sortBy } from 'lodash';
  */
 import { Component } from '@wordpress/element';
 import { addAction, removeAction } from '@wordpress/hooks';
+import { compose } from '@wordpress/compose';
 
 /**
  * Internal dependencies
@@ -58,8 +59,8 @@ class PluginArea extends Component {
 	}
 
 	getCurrentPluginsState() {
-		return {
-			plugins: map( sortBy( getPlugins(), [ 'priority' ] ), ( { icon, name, render, priority } ) => {
+		const plugins = compose(
+			( list ) => map( list, ( { icon, name, render, priority } ) => {
 				return {
 					Plugin: render,
 					context: {
@@ -69,6 +70,11 @@ class PluginArea extends Component {
 					},
 				};
 			} ),
+			( list ) => sortBy( list, [ 'priority' ] ),
+		)( getPlugins() );
+
+		return {
+			plugins,
 		};
 	}
 

From a1891d8f4b0778b1b8850a4b5a299c5b36117c7b Mon Sep 17 00:00:00 2001
From: Ryan Welcher <ryan.welcher@10up.com>
Date: Mon, 1 Jul 2019 16:35:51 -0400
Subject: [PATCH 05/25] Adds priority to context

---
 packages/plugins/src/components/plugin-context/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/plugins/src/components/plugin-context/index.js b/packages/plugins/src/components/plugin-context/index.js
index ebb448806c665..975d19b6faca5 100644
--- a/packages/plugins/src/components/plugin-context/index.js
+++ b/packages/plugins/src/components/plugin-context/index.js
@@ -7,7 +7,7 @@ import { createHigherOrderComponent } from '@wordpress/compose';
 const { Consumer, Provider } = createContext( {
 	name: null,
 	icon: null,
-	priority: null,
+	priority: 10,
 } );
 
 export { Provider as PluginContextProvider };

From b82dc0aeca077c1023d553d06da9835235bb7a5a Mon Sep 17 00:00:00 2001
From: Ryan Welcher <ryan.welcher@10up.com>
Date: Mon, 1 Jul 2019 21:52:38 -0400
Subject: [PATCH 06/25] Adds priority property to the settings object with a
 default of 10. Sorts the registered plugins by priority before rendering them
 in PluginArea

---
 packages/plugins/src/api/index.js                       | 2 --
 packages/plugins/src/components/plugin-area/index.js    | 4 +++-
 packages/plugins/src/components/plugin-context/index.js | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/plugins/src/api/index.js b/packages/plugins/src/api/index.js
index 6035ba4de9629..51c220530ba15 100644
--- a/packages/plugins/src/api/index.js
+++ b/packages/plugins/src/api/index.js
@@ -123,7 +123,6 @@ export function registerPlugin( name, settings ) {
 		);
 		return null;
 	}
-
 	const { priority = 10 } = settings;
 	if ( priority !== 0 && ( priority.length === 0 || typeof priority !== 'number' ) ) {
 		console.error(
@@ -156,7 +155,6 @@ export function registerPlugin( name, settings ) {
 		name,
 		icon: 'admin-plugins',
 		priority,
-		...settings,
 	};
 
 	doAction( 'plugins.pluginRegistered', settings, name );
diff --git a/packages/plugins/src/components/plugin-area/index.js b/packages/plugins/src/components/plugin-area/index.js
index 9e59ba7152a82..242a3c9c3c7cf 100644
--- a/packages/plugins/src/components/plugin-area/index.js
+++ b/packages/plugins/src/components/plugin-area/index.js
@@ -60,7 +60,9 @@ class PluginArea extends Component {
 
 	getCurrentPluginsState() {
 		const plugins = compose(
-			( list ) => map( list, ( { icon, name, render, priority } ) => {
+
+		return {
+			plugins: map( sortBy( getPlugins(), [ 'priority' ] ), ( { icon, name, render, priority } ) => {
 				return {
 					Plugin: render,
 					context: {
diff --git a/packages/plugins/src/components/plugin-context/index.js b/packages/plugins/src/components/plugin-context/index.js
index 975d19b6faca5..ebb448806c665 100644
--- a/packages/plugins/src/components/plugin-context/index.js
+++ b/packages/plugins/src/components/plugin-context/index.js
@@ -7,7 +7,7 @@ import { createHigherOrderComponent } from '@wordpress/compose';
 const { Consumer, Provider } = createContext( {
 	name: null,
 	icon: null,
-	priority: 10,
+	priority: null,
 } );
 
 export { Provider as PluginContextProvider };

From 46cab70937ab1902e7ee77362148c9613abc11ad Mon Sep 17 00:00:00 2001
From: Ryan Welcher <ryan.welcher@10up.com>
Date: Tue, 2 Jul 2019 07:58:57 -0400
Subject: [PATCH 07/25] Adds better data validation and new unit tests

---
 packages/plugins/src/api/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/plugins/src/api/index.js b/packages/plugins/src/api/index.js
index 51c220530ba15..a2fd24f56f335 100644
--- a/packages/plugins/src/api/index.js
+++ b/packages/plugins/src/api/index.js
@@ -155,6 +155,7 @@ export function registerPlugin( name, settings ) {
 		name,
 		icon: 'admin-plugins',
 		priority,
+		...settings,
 	};
 
 	doAction( 'plugins.pluginRegistered', settings, name );

From a09381005c082cb97f2949c59eb19058fcd9aa7e Mon Sep 17 00:00:00 2001
From: Ryan Welcher <ryan.welcher@10up.com>
Date: Tue, 2 Jul 2019 08:36:45 -0400
Subject: [PATCH 08/25] using compose to sort the plugins

---
 packages/plugins/src/components/plugin-area/index.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/plugins/src/components/plugin-area/index.js b/packages/plugins/src/components/plugin-area/index.js
index 242a3c9c3c7cf..9e59ba7152a82 100644
--- a/packages/plugins/src/components/plugin-area/index.js
+++ b/packages/plugins/src/components/plugin-area/index.js
@@ -60,9 +60,7 @@ class PluginArea extends Component {
 
 	getCurrentPluginsState() {
 		const plugins = compose(
-
-		return {
-			plugins: map( sortBy( getPlugins(), [ 'priority' ] ), ( { icon, name, render, priority } ) => {
+			( list ) => map( list, ( { icon, name, render, priority } ) => {
 				return {
 					Plugin: render,
 					context: {

From 055d60b2918e145f030d4bbc22b9a6f09c0c0c10 Mon Sep 17 00:00:00 2001
From: Ryan Welcher <ryan.welcher@10up.com>
Date: Tue, 29 Oct 2019 09:37:42 -0400
Subject: [PATCH 09/25] Use Number.isInteger() instead to check the priority

---
 packages/plugins/src/api/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/plugins/src/api/index.js b/packages/plugins/src/api/index.js
index a2fd24f56f335..21641b79df2da 100644
--- a/packages/plugins/src/api/index.js
+++ b/packages/plugins/src/api/index.js
@@ -124,7 +124,7 @@ export function registerPlugin( name, settings ) {
 		return null;
 	}
 	const { priority = 10 } = settings;
-	if ( priority !== 0 && ( priority.length === 0 || typeof priority !== 'number' ) ) {
+	if ( ! Number.isInteger( priority ) ) {
 		console.error(
 			'The "priority" property must be a number'
 		);

From 0a164626121e9c9b68d875e7775f683a151f7dff Mon Sep 17 00:00:00 2001
From: Ryan Welcher <ryan.welcher@10up.com>
Date: Tue, 29 Oct 2019 09:39:01 -0400
Subject: [PATCH 10/25] Adds 10 as the default priority

---
 packages/plugins/src/components/plugin-context/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/plugins/src/components/plugin-context/index.js b/packages/plugins/src/components/plugin-context/index.js
index ebb448806c665..975d19b6faca5 100644
--- a/packages/plugins/src/components/plugin-context/index.js
+++ b/packages/plugins/src/components/plugin-context/index.js
@@ -7,7 +7,7 @@ import { createHigherOrderComponent } from '@wordpress/compose';
 const { Consumer, Provider } = createContext( {
 	name: null,
 	icon: null,
-	priority: null,
+	priority: 10,
 } );
 
 export { Provider as PluginContextProvider };

From 4b388f9b77083ceaa7868395df331d41a5d342d3 Mon Sep 17 00:00:00 2001
From: Ryan Welcher <ryan.welcher@10up.com>
Date: Tue, 29 Oct 2019 09:41:15 -0400
Subject: [PATCH 11/25] Remove priority from plugin-sidebar implementation

---
 .../edit-post/src/components/sidebar/plugin-sidebar/index.js     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/edit-post/src/components/sidebar/plugin-sidebar/index.js b/packages/edit-post/src/components/sidebar/plugin-sidebar/index.js
index 91e16e6d606ad..e0977effb87a9 100644
--- a/packages/edit-post/src/components/sidebar/plugin-sidebar/index.js
+++ b/packages/edit-post/src/components/sidebar/plugin-sidebar/index.js
@@ -133,7 +133,6 @@ export default compose(
 		return {
 			icon: ownProps.icon || context.icon,
 			sidebarName: `${ context.name }/${ ownProps.name }`,
-			priority: ownProps.priority || context.priority,
 		};
 	} ),
 	withSelect( ( select, { sidebarName } ) => {

From 53e25886883167bdb0c407619cc06b625c4370fe Mon Sep 17 00:00:00 2001
From: Ryan Welcher <ryan.welcher@10up.com>
Date: Mon, 1 Jul 2019 16:35:51 -0400
Subject: [PATCH 12/25] Adds priority to context

---
 .../edit-post/src/components/sidebar/plugin-sidebar/index.js     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/edit-post/src/components/sidebar/plugin-sidebar/index.js b/packages/edit-post/src/components/sidebar/plugin-sidebar/index.js
index e0977effb87a9..91e16e6d606ad 100644
--- a/packages/edit-post/src/components/sidebar/plugin-sidebar/index.js
+++ b/packages/edit-post/src/components/sidebar/plugin-sidebar/index.js
@@ -133,6 +133,7 @@ export default compose(
 		return {
 			icon: ownProps.icon || context.icon,
 			sidebarName: `${ context.name }/${ ownProps.name }`,
+			priority: ownProps.priority || context.priority,
 		};
 	} ),
 	withSelect( ( select, { sidebarName } ) => {

From 8a87daad4ef49a69c1eb775c5fac6e5f0248dcc7 Mon Sep 17 00:00:00 2001
From: Ryan Welcher <ryan.welcher@10up.com>
Date: Mon, 1 Jul 2019 21:52:38 -0400
Subject: [PATCH 13/25] Adds priority property to the settings object with a
 default of 10. Sorts the registered plugins by priority before rendering them
 in PluginArea

---
 packages/plugins/README.md                    | 15 ++++++++
 packages/plugins/src/api/index.js             | 34 +++++++------------
 .../src/components/plugin-area/index.js       |  4 +--
 .../src/components/plugin-context/index.js    |  2 +-
 4 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/packages/plugins/README.md b/packages/plugins/README.md
index 835d1bbfcd283..1aa6a24cc49f3 100644
--- a/packages/plugins/README.md
+++ b/packages/plugins/README.md
@@ -117,11 +117,15 @@ function Component() {
 registerPlugin( 'plugin-name', {
 	icon: moreIcon,
 	render: Component,
+<<<<<<< HEAD
 <<<<<<< HEAD
 	scope: 'my-page',
 =======
 	priority: 5
 >>>>>>> 0950f3cb07 (Adds priority property to the settings object with a default of 10. Sorts the registered plugins by priority before rendering them in PluginArea)
+=======
+	priority: 5
+>>>>>>> f5ea38a261 (Adds priority property to the settings object with a default of 10. Sorts the registered plugins by priority before rendering them in PluginArea)
 } );
 ```
 
@@ -145,18 +149,29 @@ const Component = () => (
 registerPlugin( 'plugin-name', {
 	icon: more,
 	render: Component,
+<<<<<<< HEAD
 <<<<<<< HEAD
 	scope: 'my-page',
 =======
 	priority: 5
 >>>>>>> 0950f3cb07 (Adds priority property to the settings object with a default of 10. Sorts the registered plugins by priority before rendering them in PluginArea)
+=======
+	priority: 5
+>>>>>>> f5ea38a261 (Adds priority property to the settings object with a default of 10. Sorts the registered plugins by priority before rendering them in PluginArea)
 } );
 ```
 
 _Parameters_
 
 -   _name_ `string`: A string identifying the plugin. Must be unique across all registered plugins.
+<<<<<<< HEAD
 -   _settings_ `PluginSettings`: The settings for this plugin.
+=======
+-   _settings_ `Object`: The settings for this plugin.
+-   _settings.icon_ `(string|WPElement|Function)`: An icon to be shown in the UI. It can be a slug of the Dashicon, or an element (or function returning an element) if you choose to render your own SVG.
+-   _settings.render_ `Function`: A component containing the UI elements to be rendered.
+-   _settings.priority_ `number`: Allows for controlling the display order of this plugin. Default is 10.
+>>>>>>> f5ea38a261 (Adds priority property to the settings object with a default of 10. Sorts the registered plugins by priority before rendering them in PluginArea)
 
 _Returns_
 
diff --git a/packages/plugins/src/api/index.js b/packages/plugins/src/api/index.js
index 21641b79df2da..44c7a2abab8f0 100644
--- a/packages/plugins/src/api/index.js
+++ b/packages/plugins/src/api/index.js
@@ -38,9 +38,12 @@ const plugins = {};
 /**
  * Registers a plugin to the editor.
  *
- * @param {string}   name     A string identifying the plugin.Must be
- *                            unique across all registered plugins.
- * @param {WPPlugin} settings The settings for this plugin.
+ * @param {string}                    name            A string identifying the plugin. Must be unique across all registered plugins.
+ * @param {Object}                    settings        The settings for this plugin.
+ * @param {string|WPElement|Function} settings.icon   An icon to be shown in the UI. It can be a slug of the Dashicon,
+ * or an element (or function returning an element) if you choose to render your own SVG.
+ * @param {Function}                  settings.render A component containing the UI elements to be rendered.
+ * @param {number}                       settings.priority Allows for controlling the display order of this plugin. Default is 10.
  *
  * @example <caption>ES5</caption>
  * ```js
@@ -112,22 +115,15 @@ const plugins = {};
  */
 export function registerPlugin( name, settings ) {
 	if ( typeof settings !== 'object' ) {
-		console.error(
-			'No settings object provided!'
-		);
+		console.error( 'No settings object provided!' );
 		return null;
 	}
 	if ( typeof name !== 'string' ) {
-		console.error(
-			'Plugin names must be strings.'
-		);
+		console.error( 'Plugin names must be strings.' );
 		return null;
 	}
-	const { priority = 10 } = settings;
-	if ( ! Number.isInteger( priority ) ) {
-		console.error(
-			'The "priority" property must be a number'
-		);
+	if ( settings.priority && typeof settings.priority !== 'number' ) {
+		console.error( 'The "priority" property must be a number' );
 		return null;
 	}
 	if ( ! /^[a-z][a-z0-9-]*$/.test( name ) ) {
@@ -137,9 +133,7 @@ export function registerPlugin( name, settings ) {
 		return null;
 	}
 	if ( plugins[ name ] ) {
-		console.error(
-			`Plugin "${ name }" is already registered.`
-		);
+		console.error( `Plugin "${ name }" is already registered.` );
 	}
 
 	settings = applyFilters( 'plugins.registerPlugin', settings, name );
@@ -154,7 +148,7 @@ export function registerPlugin( name, settings ) {
 	plugins[ name ] = {
 		name,
 		icon: 'admin-plugins',
-		priority,
+		priority: 10,
 		...settings,
 	};
 
@@ -189,9 +183,7 @@ export function registerPlugin( name, settings ) {
  */
 export function unregisterPlugin( name ) {
 	if ( ! plugins[ name ] ) {
-		console.error(
-			'Plugin "' + name + '" is not registered.'
-		);
+		console.error( 'Plugin "' + name + '" is not registered.' );
 		return;
 	}
 	const oldPlugin = plugins[ name ];
diff --git a/packages/plugins/src/components/plugin-area/index.js b/packages/plugins/src/components/plugin-area/index.js
index 9e59ba7152a82..20631b2675bef 100644
--- a/packages/plugins/src/components/plugin-area/index.js
+++ b/packages/plugins/src/components/plugin-area/index.js
@@ -59,8 +59,8 @@ class PluginArea extends Component {
 	}
 
 	getCurrentPluginsState() {
-		const plugins = compose(
-			( list ) => map( list, ( { icon, name, render, priority } ) => {
+		return {
+			plugins: map( sortBy( getPlugins(), [ 'priority' ] ), ( { icon, name, render, priority } ) => {
 				return {
 					Plugin: render,
 					context: {
diff --git a/packages/plugins/src/components/plugin-context/index.js b/packages/plugins/src/components/plugin-context/index.js
index 975d19b6faca5..ebb448806c665 100644
--- a/packages/plugins/src/components/plugin-context/index.js
+++ b/packages/plugins/src/components/plugin-context/index.js
@@ -7,7 +7,7 @@ import { createHigherOrderComponent } from '@wordpress/compose';
 const { Consumer, Provider } = createContext( {
 	name: null,
 	icon: null,
-	priority: 10,
+	priority: null,
 } );
 
 export { Provider as PluginContextProvider };

From 5efbdd781e7ea4be476b817e8ab83f88d9f9c528 Mon Sep 17 00:00:00 2001
From: Ryan Welcher <ryan.welcher@10up.com>
Date: Tue, 2 Jul 2019 07:58:57 -0400
Subject: [PATCH 14/25] Adds better data validation and new unit tests

---
 packages/plugins/src/api/index.js      |  9 +++++++--
 packages/plugins/src/api/test/index.js | 24 ++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/packages/plugins/src/api/index.js b/packages/plugins/src/api/index.js
index 44c7a2abab8f0..c7edd9acc3603 100644
--- a/packages/plugins/src/api/index.js
+++ b/packages/plugins/src/api/index.js
@@ -122,7 +122,12 @@ export function registerPlugin( name, settings ) {
 		console.error( 'Plugin names must be strings.' );
 		return null;
 	}
-	if ( settings.priority && typeof settings.priority !== 'number' ) {
+
+	const { priority = 10 } = settings;
+	if (
+		priority !== 0 &&
+		( priority.length === 0 || typeof priority !== 'number' )
+	) {
 		console.error( 'The "priority" property must be a number' );
 		return null;
 	}
@@ -148,7 +153,7 @@ export function registerPlugin( name, settings ) {
 	plugins[ name ] = {
 		name,
 		icon: 'admin-plugins',
-		priority: 10,
+		priority,
 		...settings,
 	};
 
diff --git a/packages/plugins/src/api/test/index.js b/packages/plugins/src/api/test/index.js
index 4fc16e79f95d0..67cef2192bff0 100644
--- a/packages/plugins/src/api/test/index.js
+++ b/packages/plugins/src/api/test/index.js
@@ -146,4 +146,28 @@ describe( 'getPlugins', () => {
 		} );
 		expect( console ).toHaveErroredWith( 'The "priority" property must be a number' );
 	} );
+
+	it( 'fails to register a plugin with a priority set to an empty string', () => {
+		registerPlugin( 'priority-as-string', {
+			render: () => {},
+			priority: '',
+		} );
+		expect( console ).toHaveErroredWith( 'The "priority" property must be a number' );
+	} );
+
+	it( 'fails to register a plugin with a priority set to boolean true', () => {
+		registerPlugin( 'priority-as-string', {
+			render: () => {},
+			priority: true,
+		} );
+		expect( console ).toHaveErroredWith( 'The "priority" property must be a number' );
+	} );
+
+	it( 'fails to register a plugin with a priority set to boolean false', () => {
+		registerPlugin( 'priority-as-string', {
+			render: () => {},
+			priority: false,
+		} );
+		expect( console ).toHaveErroredWith( 'The "priority" property must be a number' );
+	} );
 } );

From fec9df9250f360b4fcb2a12e0be91d83c2cb6e67 Mon Sep 17 00:00:00 2001
From: Ryan Welcher <ryan.welcher@10up.com>
Date: Tue, 2 Jul 2019 08:36:45 -0400
Subject: [PATCH 15/25] using compose to sort the plugins

---
 packages/plugins/src/components/plugin-area/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/plugins/src/components/plugin-area/index.js b/packages/plugins/src/components/plugin-area/index.js
index 20631b2675bef..9e59ba7152a82 100644
--- a/packages/plugins/src/components/plugin-area/index.js
+++ b/packages/plugins/src/components/plugin-area/index.js
@@ -59,8 +59,8 @@ class PluginArea extends Component {
 	}
 
 	getCurrentPluginsState() {
-		return {
-			plugins: map( sortBy( getPlugins(), [ 'priority' ] ), ( { icon, name, render, priority } ) => {
+		const plugins = compose(
+			( list ) => map( list, ( { icon, name, render, priority } ) => {
 				return {
 					Plugin: render,
 					context: {

From 62d959147ce28f0fa47e394ddf2a52bb36237d0a Mon Sep 17 00:00:00 2001
From: Ryan Welcher <ryan.welcher@10up.com>
Date: Mon, 1 Jul 2019 16:35:51 -0400
Subject: [PATCH 16/25] Adds priority to context

---
 packages/plugins/src/components/plugin-context/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/plugins/src/components/plugin-context/index.js b/packages/plugins/src/components/plugin-context/index.js
index ebb448806c665..975d19b6faca5 100644
--- a/packages/plugins/src/components/plugin-context/index.js
+++ b/packages/plugins/src/components/plugin-context/index.js
@@ -7,7 +7,7 @@ import { createHigherOrderComponent } from '@wordpress/compose';
 const { Consumer, Provider } = createContext( {
 	name: null,
 	icon: null,
-	priority: null,
+	priority: 10,
 } );
 
 export { Provider as PluginContextProvider };

From 2fd2c1d6a50da13feef09bc4650c4c42400ba6b3 Mon Sep 17 00:00:00 2001
From: Ryan Welcher <ryan.welcher@10up.com>
Date: Mon, 1 Jul 2019 21:52:38 -0400
Subject: [PATCH 17/25] Adds priority property to the settings object with a
 default of 10. Sorts the registered plugins by priority before rendering them
 in PluginArea

---
 packages/plugins/src/api/index.js                       | 2 --
 packages/plugins/src/components/plugin-area/index.js    | 4 +++-
 packages/plugins/src/components/plugin-context/index.js | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/plugins/src/api/index.js b/packages/plugins/src/api/index.js
index c7edd9acc3603..279fe4f2827b4 100644
--- a/packages/plugins/src/api/index.js
+++ b/packages/plugins/src/api/index.js
@@ -122,7 +122,6 @@ export function registerPlugin( name, settings ) {
 		console.error( 'Plugin names must be strings.' );
 		return null;
 	}
-
 	const { priority = 10 } = settings;
 	if (
 		priority !== 0 &&
@@ -154,7 +153,6 @@ export function registerPlugin( name, settings ) {
 		name,
 		icon: 'admin-plugins',
 		priority,
-		...settings,
 	};
 
 	doAction( 'plugins.pluginRegistered', settings, name );
diff --git a/packages/plugins/src/components/plugin-area/index.js b/packages/plugins/src/components/plugin-area/index.js
index 9e59ba7152a82..242a3c9c3c7cf 100644
--- a/packages/plugins/src/components/plugin-area/index.js
+++ b/packages/plugins/src/components/plugin-area/index.js
@@ -60,7 +60,9 @@ class PluginArea extends Component {
 
 	getCurrentPluginsState() {
 		const plugins = compose(
-			( list ) => map( list, ( { icon, name, render, priority } ) => {
+
+		return {
+			plugins: map( sortBy( getPlugins(), [ 'priority' ] ), ( { icon, name, render, priority } ) => {
 				return {
 					Plugin: render,
 					context: {
diff --git a/packages/plugins/src/components/plugin-context/index.js b/packages/plugins/src/components/plugin-context/index.js
index 975d19b6faca5..ebb448806c665 100644
--- a/packages/plugins/src/components/plugin-context/index.js
+++ b/packages/plugins/src/components/plugin-context/index.js
@@ -7,7 +7,7 @@ import { createHigherOrderComponent } from '@wordpress/compose';
 const { Consumer, Provider } = createContext( {
 	name: null,
 	icon: null,
-	priority: 10,
+	priority: null,
 } );
 
 export { Provider as PluginContextProvider };

From f429005d3287f2533c4d8ea141187b9dbad26a99 Mon Sep 17 00:00:00 2001
From: Ryan Welcher <ryan.welcher@10up.com>
Date: Tue, 2 Jul 2019 07:58:57 -0400
Subject: [PATCH 18/25] Adds better data validation and new unit tests

---
 packages/plugins/src/api/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/plugins/src/api/index.js b/packages/plugins/src/api/index.js
index 279fe4f2827b4..0f710b924846c 100644
--- a/packages/plugins/src/api/index.js
+++ b/packages/plugins/src/api/index.js
@@ -153,6 +153,7 @@ export function registerPlugin( name, settings ) {
 		name,
 		icon: 'admin-plugins',
 		priority,
+		...settings,
 	};
 
 	doAction( 'plugins.pluginRegistered', settings, name );

From b98384c226255a0b39880225f0dbb47104305305 Mon Sep 17 00:00:00 2001
From: Ryan Welcher <ryan.welcher@10up.com>
Date: Tue, 2 Jul 2019 08:36:45 -0400
Subject: [PATCH 19/25] using compose to sort the plugins

---
 packages/plugins/src/components/plugin-area/index.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/plugins/src/components/plugin-area/index.js b/packages/plugins/src/components/plugin-area/index.js
index 242a3c9c3c7cf..9e59ba7152a82 100644
--- a/packages/plugins/src/components/plugin-area/index.js
+++ b/packages/plugins/src/components/plugin-area/index.js
@@ -60,9 +60,7 @@ class PluginArea extends Component {
 
 	getCurrentPluginsState() {
 		const plugins = compose(
-
-		return {
-			plugins: map( sortBy( getPlugins(), [ 'priority' ] ), ( { icon, name, render, priority } ) => {
+			( list ) => map( list, ( { icon, name, render, priority } ) => {
 				return {
 					Plugin: render,
 					context: {

From 3eb81d5b7edc5cfce4e9cabbb226f3500806fbcc Mon Sep 17 00:00:00 2001
From: Ryan Welcher <ryan.welcher@10up.com>
Date: Tue, 29 Oct 2019 09:37:42 -0400
Subject: [PATCH 20/25] Use Number.isInteger() instead to check the priority

---
 packages/plugins/src/api/index.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/plugins/src/api/index.js b/packages/plugins/src/api/index.js
index 0f710b924846c..aa10ec4698995 100644
--- a/packages/plugins/src/api/index.js
+++ b/packages/plugins/src/api/index.js
@@ -123,10 +123,7 @@ export function registerPlugin( name, settings ) {
 		return null;
 	}
 	const { priority = 10 } = settings;
-	if (
-		priority !== 0 &&
-		( priority.length === 0 || typeof priority !== 'number' )
-	) {
+	if ( ! Number.isInteger( priority ) ) {
 		console.error( 'The "priority" property must be a number' );
 		return null;
 	}

From 6dc902249aa97d38a35bb604fb067a3d37c5ec61 Mon Sep 17 00:00:00 2001
From: Ryan Welcher <ryan.welcher@10up.com>
Date: Tue, 29 Oct 2019 09:39:01 -0400
Subject: [PATCH 21/25] Adds 10 as the default priority

---
 packages/plugins/src/components/plugin-context/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/plugins/src/components/plugin-context/index.js b/packages/plugins/src/components/plugin-context/index.js
index ebb448806c665..975d19b6faca5 100644
--- a/packages/plugins/src/components/plugin-context/index.js
+++ b/packages/plugins/src/components/plugin-context/index.js
@@ -7,7 +7,7 @@ import { createHigherOrderComponent } from '@wordpress/compose';
 const { Consumer, Provider } = createContext( {
 	name: null,
 	icon: null,
-	priority: null,
+	priority: 10,
 } );
 
 export { Provider as PluginContextProvider };

From 21b220db058018b1815ab7691781311c1b52b5ce Mon Sep 17 00:00:00 2001
From: Ryan Welcher <ryan.welcher@10up.com>
Date: Tue, 29 Oct 2019 09:41:15 -0400
Subject: [PATCH 22/25] Remove priority from plugin-sidebar implementation

---
 .../edit-post/src/components/sidebar/plugin-sidebar/index.js     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/edit-post/src/components/sidebar/plugin-sidebar/index.js b/packages/edit-post/src/components/sidebar/plugin-sidebar/index.js
index 91e16e6d606ad..e0977effb87a9 100644
--- a/packages/edit-post/src/components/sidebar/plugin-sidebar/index.js
+++ b/packages/edit-post/src/components/sidebar/plugin-sidebar/index.js
@@ -133,7 +133,6 @@ export default compose(
 		return {
 			icon: ownProps.icon || context.icon,
 			sidebarName: `${ context.name }/${ ownProps.name }`,
-			priority: ownProps.priority || context.priority,
 		};
 	} ),
 	withSelect( ( select, { sidebarName } ) => {

From a16f0f535057f9ac95d838901d4038d5c0ed3c81 Mon Sep 17 00:00:00 2001
From: Ryan Welcher <ryan.welcher@10up.com>
Date: Mon, 31 May 2021 12:15:39 -0400
Subject: [PATCH 23/25] Adding missed test file

---
 packages/plugins/src/api/test/index.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/plugins/src/api/test/index.js b/packages/plugins/src/api/test/index.js
index 67cef2192bff0..b9b1f117992bf 100644
--- a/packages/plugins/src/api/test/index.js
+++ b/packages/plugins/src/api/test/index.js
@@ -128,7 +128,9 @@ describe( 'getPlugins', () => {
 			render: () => {},
 			priority: '',
 		} );
-		expect( console ).toHaveErroredWith( 'The "priority" property must be a number' );
+		expect( console ).toHaveErroredWith(
+			'The "priority" property must be a number'
+		);
 	} );
 
 	it( 'fails to register a plugin with a priority set to boolean true', () => {
@@ -136,7 +138,9 @@ describe( 'getPlugins', () => {
 			render: () => {},
 			priority: true,
 		} );
-		expect( console ).toHaveErroredWith( 'The "priority" property must be a number' );
+		expect( console ).toHaveErroredWith(
+			'The "priority" property must be a number'
+		);
 	} );
 
 	it( 'fails to register a plugin with a priority set to boolean false', () => {
@@ -144,7 +148,9 @@ describe( 'getPlugins', () => {
 			render: () => {},
 			priority: false,
 		} );
-		expect( console ).toHaveErroredWith( 'The "priority" property must be a number' );
+		expect( console ).toHaveErroredWith(
+			'The "priority" property must be a number'
+		);
 	} );
 
 	it( 'fails to register a plugin with a priority set to an empty string', () => {

From 43f9368ae1f76c9a7311e388614c04235b86cdf1 Mon Sep 17 00:00:00 2001
From: Ryan Welcher <ryan.welcher@10up.com>
Date: Mon, 31 May 2021 12:47:41 -0400
Subject: [PATCH 24/25] Add correct sorting.

---
 .../src/components/plugin-area/index.js       | 67 ++++++++++++++-----
 1 file changed, 51 insertions(+), 16 deletions(-)

diff --git a/packages/plugins/src/components/plugin-area/index.js b/packages/plugins/src/components/plugin-area/index.js
index 9e59ba7152a82..d99f718ad54db 100644
--- a/packages/plugins/src/components/plugin-area/index.js
+++ b/packages/plugins/src/components/plugin-area/index.js
@@ -55,37 +55,72 @@ class PluginArea extends Component {
 		super( ...arguments );
 
 		this.setPlugins = this.setPlugins.bind( this );
+		this.memoizedContext = memoize( ( name, icon, priority ) => {
+			return {
+				name,
+				icon,
+				priority,
+			};
+		} );
 		this.state = this.getCurrentPluginsState();
 	}
 
 	getCurrentPluginsState() {
 		const plugins = compose(
-			( list ) => map( list, ( { icon, name, render, priority } ) => {
-				return {
-					Plugin: render,
-					context: {
-						name,
-						icon,
-						priority,
-					},
-				};
-			} ),
-			( list ) => sortBy( list, [ 'priority' ] ),
+			( list ) =>
+				map( list, ( { icon, name, render, priority } ) => {
+					return {
+						Plugin: render,
+						context: {
+							name,
+							icon,
+							priority,
+						},
+					};
+				} ),
+			( list ) => sortBy( list, [ 'priority' ] )
 		)( getPlugins() );
 
 		return {
-			plugins,
+			plugins: compose(
+				( list ) =>
+					map( list, ( { icon, name, render, priority } ) => {
+						return {
+							Plugin: render,
+							context: this.memoizedContext(
+								name,
+								icon,
+								priority
+							),
+						};
+					} ),
+				( list ) => sortBy( list, [ 'priority' ] )
+			)( getPlugins( this.props.scope ) ),
 		};
 	}
 
 	componentDidMount() {
-		addAction( 'plugins.pluginRegistered', 'core/plugins/plugin-area/plugins-registered', this.setPlugins );
-		addAction( 'plugins.pluginUnregistered', 'core/plugins/plugin-area/plugins-unregistered', this.setPlugins );
+		addAction(
+			'plugins.pluginRegistered',
+			'core/plugins/plugin-area/plugins-registered',
+			this.setPlugins
+		);
+		addAction(
+			'plugins.pluginUnregistered',
+			'core/plugins/plugin-area/plugins-unregistered',
+			this.setPlugins
+		);
 	}
 
 	componentWillUnmount() {
-		removeAction( 'plugins.pluginRegistered', 'core/plugins/plugin-area/plugins-registered' );
-		removeAction( 'plugins.pluginUnregistered', 'core/plugins/plugin-area/plugins-unregistered' );
+		removeAction(
+			'plugins.pluginRegistered',
+			'core/plugins/plugin-area/plugins-registered'
+		);
+		removeAction(
+			'plugins.pluginUnregistered',
+			'core/plugins/plugin-area/plugins-unregistered'
+		);
 	}
 
 	setPlugins() {

From e590e6955547c4644956bb53e57217f8985f326a Mon Sep 17 00:00:00 2001
From: Ryan Welcher <ryan.welcher@10up.com>
Date: Mon, 31 May 2021 12:48:29 -0400
Subject: [PATCH 25/25] Update docs.

---
 packages/plugins/src/api/index.js | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/packages/plugins/src/api/index.js b/packages/plugins/src/api/index.js
index aa10ec4698995..6a7314c9548ec 100644
--- a/packages/plugins/src/api/index.js
+++ b/packages/plugins/src/api/index.js
@@ -15,17 +15,18 @@ import { isFunction } from 'lodash';
  *
  * @typedef {Object} WPPlugin
  *
- * @property {string}                    name     A string identifying the plugin. Must be
- *                                                unique across all registered plugins.
- *                                                unique across all registered plugins.
- * @property {string|WPElement|Function} icon     An icon to be shown in the UI. It can
- *                                                be a slug of the Dashicon, or an element
- *                                                (or function returning an element) if you
- *                                                choose to render your own SVG.
- * @property {Function}                  render   A component containing the UI elements
- *                                                to be rendered.
- * @property {number}                    priority Allows for controlling the display order of this plugin.
- *                                                Default is 10.
+ * @property {string}                    name       A string identifying the plugin. Must be
+ *                                                  unique across all registered plugins.
+ * @property {string|WPElement|Function} [icon]     An icon to be shown in the UI. It can
+ *                                                  be a slug of the Dashicon, or an element
+ *                                                  (or function returning an element) if you
+ *                                                  choose to render your own SVG.
+ * @property {Function}                  render     A component containing the UI elements
+ *                                                  to be rendered.
+ * @property {string}                    [scope]    The optional scope to be used when rendering inside
+ *                                                  a plugin area. No scope by default.
+ * @property {number}                    [priority] Allows for controlling the display order of this
+ *                                                  plugin. Default is 10.
  */
 
 /**