Skip to content

Backport #1603 fix: background color of figure was not computed properly (#1603) #1606

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
martinRenou merged 1 commit into from
Jul 11, 2023
Merged

Backport #1603 fix: background color of figure was not computed properly (#1603) #1606

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions js/src/Figure.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import { Scale, ScaleModel } from 'bqscales';

import * as popperreference from './PopperReference';
import popper from 'popper.js';
import { applyAttrs, applyStyles } from './utils';
import { applyAttrs, applyStyles, getEffectiveBackgroundColor } from './utils';
import { AxisModel } from './AxisModel';
import { Mark } from './Mark';
import { MarkModel } from './MarkModel';
Expand Down Expand Up @@ -1105,7 +1105,7 @@ export class Figure extends DOMWidgetView {
svg.setAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink');
svg.setAttribute('width', this.width);
svg.setAttribute('height', this.height);
svg.style.background = window.getComputedStyle(document.body).background;
svg.style.background = getEffectiveBackgroundColor(this.el);

const computedStyle = window.getComputedStyle(this.el);
const cssCode =
Expand Down
20 changes: 20 additions & 0 deletions js/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,3 +124,23 @@ export function d3GetEvent() {
export function getLuminoWidget(ipywidget: DOMWidgetView) {
return ipywidget.pWidget ? ipywidget.pWidget : ipywidget.luminoWidget;
}

export function getEffectiveBackgroundColor(element) {
if (!element) {
// If no element provided or we have traversed beyond the body or html,
// we default to white as the background color.
return 'rgb(255, 255, 255)';
}

const style = window.getComputedStyle(element);
const bgColor = style.backgroundColor;
const hasBackgroundImage = style.backgroundImage !== 'none';
const isTransparent =
bgColor === 'transparent' || bgColor === 'rgba(0, 0, 0, 0)';

if (!isTransparent || hasBackgroundImage) {
return bgColor;
}

return getEffectiveBackgroundColor(element.parentElement);
}