-
Notifications
You must be signed in to change notification settings - Fork 4.3k
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
Try: Extensibility: Enable hook-based Slot/Fill registration #3321
Closed
Closed
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
/** | ||
* External dependencies | ||
*/ | ||
import { noop } from 'lodash'; | ||
|
||
export default ( WrappedComponent ) => { | ||
function HooksComponent( props, context ) { | ||
return ( | ||
<WrappedComponent | ||
{ ...props } | ||
{ ...context } /> | ||
); | ||
} | ||
|
||
// Derive display name from original component | ||
const { displayName = WrappedComponent.name || 'Component' } = WrappedComponent; | ||
HooksComponent.displayName = `hooks(${ displayName })`; | ||
|
||
HooksComponent.contextTypes = { | ||
hooks: noop, | ||
}; | ||
|
||
return HooksComponent; | ||
}; |
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,31 @@ | ||
/** | ||
* External dependencies | ||
*/ | ||
import { noop } from 'lodash'; | ||
|
||
/** | ||
* WordPress dependencies | ||
*/ | ||
import createHooks from '@wordpress/hooks'; | ||
import { Component } from '@wordpress/element'; | ||
|
||
export default class HooksProvider extends Component { | ||
constructor() { | ||
super( ...arguments ); | ||
|
||
this.hooks = createHooks(); | ||
} | ||
|
||
getChildContext() { | ||
const { hooks } = this; | ||
return { hooks }; | ||
} | ||
|
||
render() { | ||
return this.props.children; | ||
} | ||
} | ||
|
||
HooksProvider.childContextTypes = { | ||
hooks: noop, | ||
}; |
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 |
---|---|---|
@@ -0,0 +1,58 @@ | ||
/** | ||
* External dependencies | ||
*/ | ||
import { map } from 'lodash'; | ||
|
||
/** | ||
* WordPress dependencies | ||
*/ | ||
import { Fill, withHooks } from '@wordpress/components'; | ||
import { Component } from '@wordpress/element'; | ||
|
||
class PluginFills extends Component { | ||
constructor() { | ||
super( ...arguments ); | ||
|
||
this.registerFill = this.registerFill.bind( this ); | ||
|
||
this.state = { | ||
fills: {}, | ||
}; | ||
} | ||
|
||
componentDidMount() { | ||
this.props.hooks.addAction( 'registerFill', 'core\plugin-fills-register', this.registerFill ); | ||
} | ||
|
||
componentWillUnmount() { | ||
this.props.hooks.removeAction( 'registerFill', 'core\plugin-fills-register' ); | ||
} | ||
|
||
registerFill( name, FillComponent ) { | ||
this.setState( ( prevState ) => { | ||
const { fills } = prevState; | ||
|
||
return { | ||
fills: { | ||
...fills, | ||
[ name ]: [ | ||
...( fills[ name ] || [] ), | ||
FillComponent, | ||
], | ||
}, | ||
}; | ||
} ); | ||
} | ||
|
||
render() { | ||
return map( this.state.fills, ( components, name ) => ( | ||
<Fill key={ name } name={ name }> | ||
{ map( components, ( FillComponent, index ) => ( | ||
<FillComponent key={ index } /> | ||
) ) } | ||
</Fill> | ||
) ); | ||
} | ||
} | ||
|
||
export default withHooks( PluginFills ); |
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Was it tested with the recently added recreate editor instance feature?
createHooks()
makes me think that there is going to be a new object created with a fresh state, so we might lose all registered hooks.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
2nd thing we should figure out pretty soon is how it relates to
createHooks()
call for blocks: https://github.com/WordPress/gutenberg/blob/master/blocks/hooks/index.js#L11.Unless
createHooks
uses singletone pattern and it isn't an issue at all :)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think it does @gziolo - did you ever look into this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It doesn't use singletone . It's fine as it is, we took a completely different approach anyways :)