Skip to content
Merged
Changes from all commits
Commits
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
12 changes: 7 additions & 5 deletions x-pack/plugins/reporting/export_types/common/lib/screenshots.js
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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),
Expand Down