-
Notifications
You must be signed in to change notification settings - Fork 380
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(react-core): implement dependencies support for PluginContainer (#…
…237)
- Loading branch information
Showing
16 changed files
with
454 additions
and
183 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
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,13 +1,16 @@ | ||
| export const sortPlugins = (plugins) => { | ||
| const result = plugins.slice(); | ||
| result.sort((a, b) => { | ||
| const aPosition = a.position(); | ||
| const bPosition = b.position(); | ||
| for (let i = 0; i < Math.min(aPosition.length, bPosition.length); i += 1) { | ||
| if (aPosition[i] < bPosition[i]) return -1; | ||
| if (aPosition[i] > bPosition[i]) return 1; | ||
| } | ||
| return aPosition.length - bPosition.length; | ||
| }); | ||
| const compare = (a, b) => { | ||
| const aPosition = a.position(); | ||
| const bPosition = b.position(); | ||
| for (let i = 0; i < Math.min(aPosition.length, bPosition.length); i += 1) { | ||
| if (aPosition[i] < bPosition[i]) return -1; | ||
| if (aPosition[i] > bPosition[i]) return 1; | ||
| } | ||
| return aPosition.length - bPosition.length; | ||
| }; | ||
|
|
||
| export const insertPlugin = (array, newItem) => { | ||
| const result = array.slice(); | ||
| const targetIndex = array.findIndex(item => compare(newItem, item) < 0); | ||
| result.splice(targetIndex < 0 ? array.length : targetIndex, 0, newItem); | ||
| return result; | ||
| }; |
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,26 +1,25 @@ | ||
| import { sortPlugins } from './utils'; | ||
| import { insertPlugin } from './utils'; | ||
|
|
||
| describe('utils', () => { | ||
| describe('sortPlugins', () => { | ||
| it('should work', () => { | ||
| const plugins = [{ | ||
| position: () => [1, 0], | ||
| }, { | ||
| position: () => [10], | ||
| }, { | ||
| position: () => [3], | ||
| }, { | ||
| position: () => [1, 1], | ||
| }, { | ||
| position: () => [2, 0, 12], | ||
| }, { | ||
| position: () => [2, 0, 0], | ||
| }, { | ||
| position: () => [0], | ||
| }]; | ||
| describe('#insertPlugin', () => { | ||
| const mapPlugins = plugins => plugins.map(p => p.position().join()); | ||
|
|
||
| expect(sortPlugins(plugins).map(plugin => plugin.position().join())) | ||
| .toEqual(['0', '1,0', '1,1', '2,0,0', '2,0,12', '3', '10']); | ||
| it('should work correctly', () => { | ||
| const plugins = [ | ||
| { position: () => [1] }, | ||
| { position: () => [5, 3] }, | ||
| ]; | ||
|
|
||
| expect(mapPlugins(insertPlugin(plugins, { position: () => [0] }))) | ||
| .toEqual(['0', '1', '5,3']); | ||
| expect(mapPlugins(insertPlugin(plugins, { position: () => [3, 2, 0] }))) | ||
| .toEqual(['1', '3,2,0', '5,3']); | ||
| expect(mapPlugins(insertPlugin(plugins, { position: () => [5, 2] }))) | ||
| .toEqual(['1', '5,2', '5,3']); | ||
| expect(mapPlugins(insertPlugin(plugins, { position: () => [5, 3, 1] }))) | ||
| .toEqual(['1', '5,3', '5,3,1']); | ||
| expect(mapPlugins(insertPlugin(plugins, { position: () => [7] }))) | ||
| .toEqual(['1', '5,3', '7']); | ||
| }); | ||
| }); | ||
| }); |
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
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,73 +1,50 @@ | ||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import { Getter } from './getter'; | ||
| import { Action } from './action'; | ||
| import { Template } from './template'; | ||
|
|
||
| const CONTAINER_CONTEXT = 'pluginContainerContext'; | ||
|
|
||
| export const PluginContainer = ( | ||
| { children }, | ||
| { [CONTAINER_CONTEXT]: containerContext }, | ||
| ) => ( | ||
| <div style={{ display: 'none' }}> | ||
| { | ||
| React.Children.map(children, (child, index) => { | ||
| if (!child || !child.type) return child; | ||
|
|
||
| const childPosition = () => { | ||
| const calculatedPosition = | ||
| (containerContext && containerContext()) || []; | ||
| return [...calculatedPosition, index]; | ||
| }; | ||
|
|
||
| if (child.type === Getter || | ||
| child.type === Action || | ||
| child.type === Template) { | ||
| return React.cloneElement(child, { position: childPosition }); | ||
| } | ||
|
|
||
| return ( | ||
| <PluginContainerContext position={childPosition}> | ||
| {child} | ||
| </PluginContainerContext> | ||
| ); | ||
| }) | ||
| } | ||
| </div> | ||
| ); | ||
|
|
||
| PluginContainer.defaultProps = { | ||
| children: null, | ||
| }; | ||
|
|
||
| PluginContainer.propTypes = { | ||
| children: PropTypes.oneOfType([ | ||
| PropTypes.arrayOf(PropTypes.node), | ||
| PropTypes.node, | ||
| ]), | ||
| }; | ||
|
|
||
| PluginContainer.contextTypes = { | ||
| [CONTAINER_CONTEXT]: PropTypes.func, | ||
| }; | ||
|
|
||
| class PluginContainerContext extends React.Component { | ||
| getChildContext() { | ||
| return { | ||
| [CONTAINER_CONTEXT]: this.props.position, | ||
| import { PluginIndexer } from './indexer'; | ||
|
|
||
| export class PluginContainer extends React.PureComponent { | ||
| componentWillMount() { | ||
| const { pluginHost, positionContext: position } = this.context; | ||
| const { pluginName, dependencies } = this.props; | ||
| this.plugin = { | ||
| position, | ||
| pluginName, | ||
| dependencies, | ||
| container: true, | ||
| }; | ||
| pluginHost.registerPlugin(this.plugin); | ||
| } | ||
| componentWillUnmount() { | ||
| const { pluginHost } = this.context; | ||
| pluginHost.unregisterPlugin(this.plugin); | ||
| } | ||
| render() { | ||
| return this.props.children; | ||
| const { children } = this.props; | ||
| return ( | ||
| <PluginIndexer> | ||
| {children} | ||
| </PluginIndexer> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| PluginContainerContext.propTypes = { | ||
| position: PropTypes.func.isRequired, | ||
| PluginContainer.propTypes = { | ||
| children: PropTypes.node.isRequired, | ||
| pluginName: PropTypes.string, | ||
| dependencies: PropTypes.arrayOf( | ||
| PropTypes.shape({ | ||
| pluginName: PropTypes.string, | ||
| optional: PropTypes.bool, | ||
| }), | ||
| ), | ||
| }; | ||
|
|
||
| PluginContainerContext.childContextTypes = { | ||
| [CONTAINER_CONTEXT]: PropTypes.func, | ||
| PluginContainer.defaultProps = { | ||
| pluginName: '', | ||
| dependencies: [], | ||
| }; | ||
|
|
||
| PluginContainer.contextTypes = { | ||
| pluginHost: PropTypes.object.isRequired, | ||
| positionContext: PropTypes.func.isRequired, | ||
| }; |
Oops, something went wrong.