Skip to content
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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issue with wrongly applied colors with Pandas styler #4940

Merged
merged 3 commits into from Jul 7, 2022
Merged

Fix issue with wrongly applied colors with Pandas styler #4940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d77d82
Fix extraction issue
LukasMasuch Jul 7, 2022
6abe481
Revert changes
LukasMasuch Jul 7, 2022
cf36291
Fix unsupported function
LukasMasuch Jul 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion frontend/src/components/widgets/DataFrame/DataFrameCells.test.tsx
View file
Open in desktop
Expand Up @@ -23,7 +23,8 @@ test("extractCssProperty should extract the correct property value", () => {
#T_f116e_row0_col1, #T_f116e_row1_col0 { color: white; background-color: pink }
#T_f116e_row0_col2 { color: red; opacity: 20% }
#T_f116e_row2_col2, #T_f116e_row5_col1 { opacity: 20% }
#T_f116e_row3_col3, #T_f116e_row12_col1 { color: white; background-color: darkblue; color: white; background-color: pink }`
#T_f116e_row3_col3, #T_f116e_row12_col1 { color: white; background-color: darkblue; color: white; background-color: pink }
#T_f116e_row11_col10, #T_f116e_row11_col10 { background-color: darkblue }`

const cssStyle2 = `
#T_7e5cc_row6_col0 { background-color: #f8fcc9; color: #000000 }
Expand Down Expand Up @@ -51,6 +52,13 @@ test("extractCssProperty should extract the correct property value", () => {
expect(extractCssProperty("#T_f116e_row0_col2", "color", cssStyle1)).toBe(
"red"
)
expect(
extractCssProperty("#T_f116e_row11_col10", "background-color", cssStyle1)
).toBe("darkblue")
// Should not extract if it only partly matches:
expect(
extractCssProperty("#T_f116e_row11_col1", "background-color", cssStyle1)
).toBe(undefined)

expect(
extractCssProperty("#T_7e5cc_row6_col0", "background-color", cssStyle2)
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/components/widgets/DataFrame/DataFrameCells.tsx
View file
Open in desktop
Expand Up @@ -87,9 +87,11 @@ export function extractCssProperty(
// This regex is supposed to extract the value of a CSS property
// for a specified HTML element ID from a CSS style string:
const regex = new RegExp(
`${htmlElementId}[^{]*{(?:[^}]*[\\s;]{1})?${property}:\\s*([^;\\s]+)[;]?.*}`,
`${htmlElementId}[,\\s].*{(?:[^}]*[\\s;]{1})?${property}:\\s*([^;\\s]+)[;]?.*}`,
"gm"
)
// Makes the regex simpler to match the element correctly:
cssStyle = cssStyle.replace(/{/g, " {")

const match = regex.exec(cssStyle)
if (match) {
Expand Down