Skip to content

Hide timed-out children instead of deleting them so their state is preserved #13823

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.

Sign up for GitHub

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

Merged
merged 13 commits into from
Oct 18, 2018
Merged

Hide timed-out children instead of deleting them so their state is preserved #13823

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9d0122c
Store the start time on `updateQueue` instead of `stateNode`
acdlite Oct 9, 2018
af0b219
Use fragment fibers to keep the primary and fallback children separate
acdlite Oct 11, 2018
dd9c5c5
Use `memoizedState` to store various pieces of SuspenseComponent's state
acdlite Oct 11, 2018
1c0091d
Include `hidden` prop in noop renderer's output
acdlite Oct 12, 2018
41bde6a
Hide timed-out Suspense children
acdlite Jun 30, 2018
d3b6c13
Implement hide/unhide host config methods for DOM renderer
acdlite Oct 12, 2018
e8e52e7
Implement hide/unhide host config methods for Art renderer
acdlite Oct 12, 2018
48dbc03
Create DOM fixture that tests state preservation of timed out content
acdlite Oct 15, 2018
06be328
Account for class components that suspend outside concurrent mode
acdlite Oct 17, 2018
cf648d5
Fork appendAllChildren between persistent and mutation mode
acdlite Oct 17, 2018
8615ab4
Remove redundant check for existence of el.style
acdlite Oct 18, 2018
62a3dbe
Schedule placement effect on indeterminate components
acdlite Oct 18, 2018
f06c005
Pass null instead of current everywhere in mountIndeterminateComponent
acdlite Oct 18, 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
Prev Previous commit
Next Next commit
Remove redundant check for existence of el.style
  • Loading branch information
@acdlite
acdlite committed Oct 18, 2018
commit 8615ab47abfeff00b7a3711d562c0c9cd9dc993b
24 changes: 10 additions & 14 deletions packages/react-dom/src/client/ReactDOMHostConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,9 +420,7 @@ export function hideInstance(instance: Instance): void {
// TODO: Does this work for all element types? What about MathML? Should we
// pass host context to this method?
instance = ((instance: any): HTMLElement);
if (instance.style !== undefined && instance.style !== null) {
instance.style.display = 'none';
}
instance.style.display = 'none';
}

export function hideTextInstance(textInstance: TextInstance): void {
Expand All @@ -431,17 +429,15 @@ export function hideTextInstance(textInstance: TextInstance): void {

export function unhideInstance(instance: Instance, props: Props): void {
instance = ((instance: any): HTMLElement);
if (instance.style !== undefined && instance.style !== null) {
let display = null;
if (props[STYLE] !== undefined && props[STYLE] !== null) {
const styleProp = props[STYLE];
if (styleProp.hasOwnProperty('display')) {
display = styleProp.display;
}
}
// $FlowFixMe Setting a style property to null is the valid way to reset it.
instance.style.display = display;
}
const styleProp = props[STYLE];
const display =
styleProp !== undefined &&
styleProp !== null &&
styleProp.hasOwnProperty('display')
? styleProp.display
: null;
// $FlowFixMe Setting a style property to null is the valid way to reset it.
instance.style.display = display;
}

export function unhideTextInstance(
Expand Down