From 84a0579d4e15cf4c958b2fa47d4cab83aed26cd2 Mon Sep 17 00:00:00 2001 From: Joel Griffith Date: Tue, 26 Feb 2019 13:47:45 -0800 Subject: [PATCH] Fixes data points on maps not showing up in reports (#31949) (#32071) * Fixes data points on maps not showing up in reports --- .../reporting/export_types/common/lib/screenshots.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/x-pack/plugins/reporting/export_types/common/lib/screenshots.js b/x-pack/plugins/reporting/export_types/common/lib/screenshots.js index 2ef6740bb2050d..2b3ce9f139b3d6 100644 --- a/x-pack/plugins/reporting/export_types/common/lib/screenshots.js +++ b/x-pack/plugins/reporting/export_types/common/lib/screenshots.js @@ -266,11 +266,6 @@ export function screenshotsObservableFactory(server) { browser => openUrl(browser, url, conditionalHeaders), browser => browser ), - tap(() => logger.debug('injecting custom css')), - mergeMap( - browser => injectCustomCss(browser, layout), - browser => browser - ), tap(() => logger.debug('waiting for elements or items count attribute; or not found to interrupt')), mergeMap( browser => Rx.race( @@ -294,6 +289,13 @@ export function screenshotsObservableFactory(server) { ({ browser, itemsCount }) => waitForElementsToBeInDOM(browser, itemsCount, layout), ({ browser, itemsCount }) => ({ browser, itemsCount }) ), + // Waiting till _after_ elements have rendered before injecting our CSS + // allows for them to be displayed properly in many cases + tap(() => logger.debug('injecting custom css')), + mergeMap( + ({ browser }) => injectCustomCss(browser, layout), + ({ browser }) => ({ browser }) + ), tap(() => logger.debug('positioning elements')), mergeMap( ({ browser }) => positionElements(browser, layout),