Skip to content

PWA manifest: icon: fix error when admin bar is gone #33702

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
ellatrix merged 1 commit into from
Jul 26, 2021
Merged

PWA manifest: icon: fix error when admin bar is gone #33702

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 14 additions & 2 deletions packages/admin-manifest/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,19 @@ function createIcon( { svgElement, size, color, backgroundColor, circle } ) {
} );
}

function getAdminBarColors() {
const adminBarDummy = document.createElement( 'div' );
adminBarDummy.id = 'wpadminbar';
document.body.appendChild( adminBarDummy );
const { color, backgroundColor } = window.getComputedStyle( adminBarDummy );
document.body.removeChild( adminBarDummy );
// Fall back to black and white if no admin/color stylesheet was loaded.
return {
color: color || 'white',
backgroundColor: backgroundColor || 'black',
};
}

// eslint-disable-next-line @wordpress/no-global-event-listener
window.addEventListener( 'load', () => {
if ( ! ( 'serviceWorker' in window.navigator ) ) {
Expand All @@ -106,8 +119,7 @@ window.addEventListener( 'load', () => {
icons: [],
};

const adminBar = document.getElementById( 'wpadminbar' );
const { color, backgroundColor } = window.getComputedStyle( adminBar );
const { color, backgroundColor } = getAdminBarColors();
const svgElement = createSvgElement( logo );

Promise.all( [
Expand Down