-
Notifications
You must be signed in to change notification settings - Fork 42
Fix observations #101
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
Closed
stephencookdev
wants to merge
1
commit into
reactive-elements:master
from
stephencookdev:feature/observer-fix
Closed
Fix observations #101
Changes from all commits
Commits
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 hidden or 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 |
|---|---|---|
|
|
@@ -33,9 +33,12 @@ function reactiveElements(elementName, ReactComponent, options) { | |
| if (useShadowDom) self.attachShadow({ mode: 'open' }); | ||
|
|
||
| const observer = new MutationObserver(() => { | ||
| ReactDOM.unmountComponentAtNode(getRenderRoot(self, useShadowDom)); | ||
| const props = utils.getProps(self); | ||
| props.children = utils.getChildren(self); | ||
| // we reuse the `childrenFragment`, rather than creating a new fragment, | ||
| // as this will cause a mutation in the current React component (because | ||
| // of the way that DOM nodes must be unique) | ||
| // but the fragment is a reference, so this is fine to keep a hold of | ||
| props.children = this.childrenFragment; | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The mutation observer also watches for changes to the slot/ |
||
| create(self, props); | ||
| }); | ||
|
|
||
|
|
@@ -49,7 +52,9 @@ function reactiveElements(elementName, ReactComponent, options) { | |
|
|
||
| connectedCallback() { | ||
| const props = utils.getProps(this); | ||
| props.children = utils.getChildren(this); | ||
| // save a `childrenFragment` to reuse later, on mutations (this is okay | ||
| // because the fragment is effectively a reference to the children) | ||
| this.childrenFragment = props.children = utils.getChildren(this); | ||
| let reactElement = create(this, props); | ||
|
|
||
| if (reactElement !== null) { | ||
|
|
||
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.
can we get rid of
utils.getChildrennow ? :)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.
No, it's used in the initial render (where we do want it to be destructive, as we're about to move the DOM elements from the current DOM node they're in, to React for it to render)
I think very possibly
getChildrenas a name could stand to be improved, though, to make its destructive nature a bit clearer. Open to naming suggestions there, though