From f378df4f9242595a2aa58a6ee1dbf2ebb41bef5b Mon Sep 17 00:00:00 2001 From: Jiri Tomasek Date: Mon, 5 Feb 2018 13:41:00 +0100 Subject: [PATCH] Prevent OverlayLoader content re-renders OverlayLoader should not cause re-render of content it covers. This behavior is different from other Loaders. This change removes use of BaseLoader from OverlayLoader and makes it just add additional markup when loader is active Closes-Bug: 1747635 Change-Id: Idb3a5291f6d8697f29c0273c9aa0244ea221292e --- src/js/components/ui/Loader.js | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/js/components/ui/Loader.js b/src/js/components/ui/Loader.js index fa361a01..13e3a143 100644 --- a/src/js/components/ui/Loader.js +++ b/src/js/components/ui/Loader.js @@ -157,20 +157,14 @@ export const OverlayLoader = ({ children, className, component, - componentProps, containerClassName, content, loaded, ...rest }) => ( - -
- {children} +
+ {children} + {!loaded && (
e.stopPropagation()} @@ -179,9 +173,9 @@ export const OverlayLoader = ({ {content &&
{content}
}
-
-
- + )} +
+
); OverlayLoader.propTypes = { ...defaultLoaderPropTypes,