Skip to content

feat(color-picker): consolidate remaining legacy color selectors onto ColorPickerControl - #42910

Open
rusackas wants to merge 6 commits into
masterfrom
feat/color-picker-consolidation
Open

rusackas wants to merge 6 commits into
masterfrom
feat/color-picker-consolidation

Conversation

@rusackas

@rusackas rusackas commented Aug 8, 2026

Copy link
Copy Markdown
Member

SUMMARY

Follow-up to #42053, which upgraded ColorPickerControl (custom presets, resolveThemeTokens, outputFormat) and used it to fix ConditionalFormattingControl. This PR finds and fixes the four remaining places in the app that still used a legacy/degraded color-selection UI instead of the shared picker, one commit per item.

1. Gauge chart interval colors

Gauge/controlPanel.tsx's "Interval colors" control asked users to type comma-separated 1-indexed positions into the chosen color scheme (e.g. 1,2,4), with zero visual feedback and silent discarding of malformed input.

Replaced with IntervalColorsControl: one ColorPickerControl per interval bound (parsed from the existing intervals control), storing real hex colors in a new interval_colors field, positionally matched to those bounds.

Design decision: bounds stay owned by the existing intervals text control rather than being folded into the new control's own row list (which the row-list add/remove pattern in the task brief technically implied). This keeps a single source of truth for bounds and avoids needing two-way sync between two independent controls — the new control's row count simply tracks whatever intervals currently contains.

Backward compatibility: charts saved before this control existed only have interval_color_indices (the old index strings). getIntervalBoundsAndColors in transformProps.ts still resolves those indices against the categorical scheme at render time whenever interval_colors is empty, so existing dashboards render identically with no migration. The control also resolves legacy indices to real colors for display the first time such a chart's panel is reopened (editor convenience only, not required for correct rendering).

Gauge: new Interval colors control + rendered chart

2. Bullet chart band colors

Bullet chart background bands were hardcoded to a 4-step theme-token ramp with no color control at all — a genuinely new feature, not a swap.

Added an optional range_colors control (BulletRangeColorsControl): one ColorPickerControl per threshold parsed from the existing ranges control, each starting unset ("use default") with a "Use default" link to clear a customization. transformProps.ts captures each range's chosen color by its original (pre-sort) position in ranges before the existing largest-first band sort reorders them for nested drawing, so colors stay pinned to the correct threshold regardless of draw order.

Backward compatible by construction: range_colors is optional and defaults to empty, so charts saved before this control existed have no such field and keep rendering with the exact default ramp.

Bullet: new Range colors control + rendered chart with custom band colors

3. Big Number Period-over-Period comparison colors

The comparison-color control was a 2-choice SelectControl ("Green for increase, red for decrease" / reverse) bound directly to theme.colorSuccess/theme.colorError.

Replaced with two ColorPickerControls, increase_color / decrease_color, using the exact resolveThemeTokens + outputFormat="hex" pattern #42053 introduced: picking the Green/Red preset swatch stores the token name (so it still reads the same as before for users who just want the classic behavior), while any other pick stores a literal hex color. Exported SPECIAL_COLORS/SpecialColorKey from ColorPickerControl.tsx so this call site doesn't redefine the Green/Red mapping.

The color→style resolution moved into two small, independently unit-tested pure functions in utils.ts (resolveComparisonColorKeys, getComparisonColorTokens) rather than living inline in PopKPI's render body — jsdom doesn't reliably expose emotion's injected styles to toHaveStyle for direct component assertions, so the logic needed to be testable on its own.

Backward compatibility: resolveComparisonColorKeys falls back to the legacy comparisonColorScheme field (kept, @deprecated in types.ts) whenever the new fields are absent — including correctly reversing increase/decrease for charts saved with the old "Red for increase, green for decrease" choice, the case a naive default-to-Green migration would have silently broken.

Big Number PoP: new Color for increase/decrease pickers + rendered comparison

4. Admin Theme editor curated colors

ThemeModal.tsx only exposed antd theming as a single JSON textarea, requiring admins to paste in a whole token object from an external tool to change even one color.

Added a "Colors" section (ThemeColorPickers) above the JSON textarea with one ColorPickerControl per curated antd token — the 5 SEED colors (colorPrimary, colorSuccess, colorWarning, colorError, colorInfo) plus 6 load-bearing map/alias tokens (colorLink, colorText, colorTextSecondary, colorBgBase, colorBgContainer, colorBorder). This intentionally does not attempt the full 100+ token surface — everything else stays fully editable via the JSON textarea, which remains the source of truth. Names are taken directly from antd's own SeedToken/MapToken types, not invented.

Sync is two-way, via two small pure functions (tryParseThemeJson, patchThemeJsonToken):

  • Picker → JSON: patches just that key into the JSON's token object and re-serializes with the modal's existing 2-space indent, preserving every other key (curated or not).
  • JSON → pickers: each render re-parses the textarea's current value and re-derives picker values from it.
  • Invalid/mid-edit JSON: tryParseThemeJson returns null instead of throwing (matching the file's existing isValidJson convention); the section shows a small notice and pickers stop persisting edits until the JSON is valid again.

The section is hidden for read-only system themes, matching the existing Format/Apply button visibility.

No backward-compat concern — additive UI over the same JSON, nothing about existing saved themes changes.

Theme editor: curated Colors section synced from JSON

TESTING INSTRUCTIONS

  • npm run test in superset-frontend/ — new/updated suites:
    • plugins/plugin-chart-echarts/test/Gauge/transformProps.test.ts
    • src/explore/components/controls/IntervalColorsControl/IntervalColorsControl.test.tsx
    • plugins/plugin-chart-echarts/test/Bullet/transformProps.test.ts
    • src/explore/components/controls/BulletRangeColorsControl/BulletRangeColorsControl.test.tsx
    • plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/{utils,PopKPI}.test.tsx
    • src/features/themes/{ThemeModal,ThemeColorPickers}.test.tsx
  • Manually: create/edit a Gauge chart, expand Customize → Intervals; create/edit a Bullet chart, expand Customize → Range colors; create/edit a Big Number w/ Time Comparison chart with "Add color for positive/negative change" enabled; open Settings → Themes → + Theme.
  • Backward compatibility: open an existing Gauge chart saved with interval_color_indices only, an existing Bullet chart with no range_colors, and a Big Number PoP chart saved with only comparison_color_scheme (including the Red value) — all three should render identically to before this PR.

ADDITIONAL INFORMATION

  • Has associated issue:
  • Required feature flags:
  • Changes UI
  • Includes DB Migration (follow approval process in SIP-59)
    • Migration is atomic, supports rollback & is backwards-compatible
    • Confirm DB migration upgrade and downgrade tested
    • Runtime estimates and downtime expectations provided
  • Introduces new feature or API
  • Removes existing feature or API

@codecov

codecov Bot commented Aug 8, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 94.91525% with 9 lines in your changes missing coverage. Please review.
✅ Project coverage is 79.29%. Comparing base (b310f46) to head (9b6b41e).
⚠️ Report is 444 commits behind head on master.

Files with missing lines Patch % Lines
...s/plugin-chart-echarts/src/Bullet/controlPanel.tsx 0.00% 3 Missing ⚠️
...ns/plugin-chart-echarts/src/Gauge/controlPanel.tsx 0.00% 2 Missing ⚠️
...omponents/controls/IntervalColorsControl/index.tsx 95.00% 2 Missing ⚠️
...igNumber/BigNumberPeriodOverPeriod/controlPanel.ts 0.00% 1 Missing ⚠️
...s/plugin-chart-echarts/src/Gauge/transformProps.ts 87.50% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master   #42910      +/-   ##
==========================================
+ Coverage   79.22%   79.29%   +0.06%     
==========================================
  Files        2888     2890       +2     
  Lines      166415   166373      -42     
  Branches    38514    38519       +5     
==========================================
+ Hits       131842   131919      +77     
+ Misses      32080    31971     -109     
+ Partials     2493     2483      -10     
Flag Coverage Δ
javascript 74.84% <94.91%> (+0.14%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@sha174n

sha174n commented Aug 13, 2026

Copy link
Copy Markdown
Contributor

Nice consolidation, and the one-commit-per-item structure keeps it bisectable with real backward-compat handling on each swap (legacy interval_color_indices / comparison_color_scheme fallbacks, additive optional fields). One process question: this bundles four unrelated areas (Gauge, Bullet, Big Number PoP, Theme editor), each with its own new control dir and backward-compat surface — might be worth confirming maintainers are fine reviewing it as a single PR vs splitting per area. Minor: ThemeColorPickers re-parses the JSON textarea on each render (the useMemo keyed on jsonData mitigates it).

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Consolidates legacy chart and theme color selection onto the shared ColorPickerControl.

Changes:

  • Adds per-interval Gauge and per-range Bullet color controls.
  • Adds independent Big Number comparison colors with legacy fallback logic.
  • Adds curated theme-token pickers and related tests.

Reviewed changes

Copilot reviewed 27 out of 27 changed files in this pull request and generated 5 comments.

Show a summary per file
File Description
src/features/themes/ThemeModal.tsx Integrates curated theme color pickers.
src/features/themes/ThemeModal.test.tsx Tests modal/picker synchronization.
src/features/themes/ThemeColorPickers.tsx Implements theme token color editing.
src/features/themes/ThemeColorPickers.test.tsx Tests parsing, patching, and interactions.
src/explore/components/controls/IntervalColorsControl/types.ts Defines Gauge color-control props.
src/explore/components/controls/IntervalColorsControl/IntervalColorsControl.test.tsx Tests Gauge interval color UI.
src/explore/components/controls/IntervalColorsControl/index.tsx Implements Gauge interval color UI.
src/explore/components/controls/index.ts Registers the new controls.
src/explore/components/controls/ColorPickerControl.tsx Exports semantic color definitions.
src/explore/components/controls/BulletRangeColorsControl/types.ts Defines Bullet color-control props.
src/explore/components/controls/BulletRangeColorsControl/index.tsx Implements Bullet range color UI.
src/explore/components/controls/BulletRangeColorsControl/BulletRangeColorsControl.test.tsx Tests Bullet range color UI.
plugins/plugin-chart-echarts/test/Gauge/transformProps.test.ts Tests Gauge color rendering and fallback.
plugins/plugin-chart-echarts/test/Bullet/transformProps.test.ts Tests Bullet custom band colors.
plugins/plugin-chart-echarts/src/Gauge/types.ts Adds Gauge interval color form data.
plugins/plugin-chart-echarts/src/Gauge/transformProps.ts Applies Gauge colors with legacy fallback.
plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx Replaces the legacy Gauge color field.
plugins/plugin-chart-echarts/src/Bullet/types.ts Adds Bullet range color form data.
plugins/plugin-chart-echarts/src/Bullet/transformProps.ts Applies colors to sorted Bullet bands.
plugins/plugin-chart-echarts/src/Bullet/controlPanel.tsx Adds the Bullet range color control.
plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/utils.ts Adds comparison color resolution helpers.
plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/utils.test.ts Tests comparison color resolution.
plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/types.ts Adds new comparison color properties.
plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/transformProps.ts Passes comparison colors to the component.
plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/PopKPI.tsx Applies customizable comparison colors.
plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/PopKPI.test.tsx Tests comparison rendering variants.
plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/controlPanel.ts Adds increase/decrease color pickers.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment thread superset-frontend/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx Outdated
@netlify

netlify Bot commented Aug 29, 2026

Copy link
Copy Markdown

Deploy Preview for superset-docs-preview ready!

Name Link
🔨 Latest commit 90192cf
🔍 Latest deploy log https://app.netlify.com/projects/superset-docs-preview/deploys/6a9489ae0bda800008aa1d44
😎 Deploy Preview https://deploy-preview-42910--superset-docs-preview.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.
🤖 Make changes Run an agent on this branch

To edit notification comments on pull requests, go to your Netlify project configuration.

@rusackas
rusackas force-pushed the feat/color-picker-consolidation branch from 96ba402 to 43e60b5 Compare August 30, 2026 00:46
@rusackas
rusackas marked this pull request as ready for review August 30, 2026 19:51
@dosubot dosubot Bot added change:frontend Requires changing the frontend explore:colors Related to the color scheme in Explore global:theming Related to theming Superset viz:charts:bignumber Related to BigNumber charts viz:charts:gauge Related to the Gauge chart labels Aug 30, 2026
Comment thread superset-frontend/src/features/themes/ThemeColorPickers.tsx Outdated
@rusackas

Copy link
Copy Markdown
Member Author

Heya @sha174n, thanks for the read-through! Given each swap already lands as its own bisectable commit with its own backward-compat handling, I'm inclined to keep this bundled rather than split it four ways at this point. Happy to reconsider if another maintainer feels strongly about it.

And yeah, the useMemo already covers the re-parse cost, as you noted.

@bito-code-review

bito-code-review Bot commented Aug 30, 2026

Copy link
Copy Markdown
Contributor

Code Review Agent Run #c05116

Actionable Suggestions - 0
Additional Suggestions - 7
  • superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/PopKPI.tsx - 1
    • Duplicated color resolution · Line 188-192
      The `colorValue` selection (`percentDifferenceNumber > 0 ? resolvedIncreaseColor : resolvedDecreaseColor`) plus `getComparisonColorTokens` is duplicated in `getArrowIndicatorColor` and the `useMemo`. If the sign logic changes in one place, arrow and pill colors diverge. Consider extracting one shared helper.
  • superset-frontend/plugins/plugin-chart-echarts/src/Gauge/types.ts - 1
    • Deprecated tag on required field · Line 53-59
      `intervalColorIndices` is still a required property and is still actively read as the legacy fallback in `getIntervalBoundsAndColors` and `controlPanel.tsx`. Marking a required, still-used field `@deprecated` is contradictory: IDEs will strikethrough and warn on every legitimate usage, and it implies the field can be removed when it cannot. Consider dropping the tag or making the field optional.
  • superset-frontend/src/features/themes/ThemeColorPickers.tsx - 1
    • Unused disabled prop · Line 125-125
      The `disabled` prop is declared, defaulted, and checked in `handleTokenChange`, but the only consumer (`ThemeModal` line 504) renders `` without it and hides the whole Colors section when read-only. This is dead API surface introduced by the diff. Wire it up or drop it.
  • superset-frontend/src/features/themes/ThemeColorPickers.test.tsx - 1
    • Brittle antd-internal test · Line 148-183
      This interaction test depends on antd ColorPicker internal DOM classes (`.ant-color-picker-trigger`, `.ant-color-picker-input input`) and internal event behavior (typing hex + Enter firing `onChangeComplete`). The sibling `ColorPickerControl.test.tsx` explicitly avoids this, noting it "would require more complex mocking as it uses complex internal components." These internals aren't part of antd's public API and can change between versions, making the test brittle/flaky. Consider mocking `ColorPickerControl` to invoke `onChange` directly.
  • superset-frontend/src/explore/components/controls/IntervalColorsControl/IntervalColorsControl.test.tsx - 1
    • Test coupled to global default · Line 116-142
      This test asserts the picked preset is `#1f77b4`, but `IntervalColorsControl` never forwards `colorScheme` to `ColorPickerControl`, which builds presets from `getCategoricalSchemeRegistry().get()` (no key → global default `SUPERSET_DEFAULT`). The assertion only passes because `testScheme`'s first color coincidentally equals the default's. Set `testScheme` as default in `beforeAll` (as `ColorPickerControl.test.tsx` does) to make the test self-contained.
  • superset-frontend/src/explore/components/controls/IntervalColorsControl/index.tsx - 1
    • Type-only import · Line 25-25
      `IntervalColorsControlProps` is an interface used only as a type annotation (line 95), yet it is imported as a value while line 24 uses `import type` for the same kind of type-only import. Use `import type { IntervalColorsControlProps } from './types';` for consistency with the codebase's type-safety convention.
  • superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/utils.ts - 1
    • Object injection via bracket notation · Line 153-153
      The use of bracket notation `themeColors[colorValue]` is flagged as a potential object injection sink (CWE-1321). Although `hasOwnProperty.call` is used to validate the key, the linter still flags the access. Consider using a `Map` instead of a plain object to avoid prototype pollution risks. Note: A similar issue exists at line 77 (unchanged code) for `comparisonFontSizesMapping[proportionValue]`.
Review Details
  • Files reviewed - 28 · Commit Range: 8fa21e0..9b6b41e
    • superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/PopKPI.test.tsx
    • superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/PopKPI.tsx
    • superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/controlPanel.ts
    • superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/transformProps.ts
    • superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/types.ts
    • superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/utils.test.ts
    • superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/utils.ts
    • superset-frontend/plugins/plugin-chart-echarts/src/Bullet/controlPanel.tsx
    • superset-frontend/plugins/plugin-chart-echarts/src/Bullet/transformProps.ts
    • superset-frontend/plugins/plugin-chart-echarts/src/Bullet/types.ts
    • superset-frontend/plugins/plugin-chart-echarts/src/Bullet/utils.ts
    • superset-frontend/plugins/plugin-chart-echarts/src/Gauge/controlPanel.tsx
    • superset-frontend/plugins/plugin-chart-echarts/src/Gauge/transformProps.ts
    • superset-frontend/plugins/plugin-chart-echarts/src/Gauge/types.ts
    • superset-frontend/plugins/plugin-chart-echarts/test/Bullet/transformProps.test.ts
    • superset-frontend/plugins/plugin-chart-echarts/test/Gauge/transformProps.test.ts
    • superset-frontend/src/explore/components/controls/BulletRangeColorsControl/BulletRangeColorsControl.test.tsx
    • superset-frontend/src/explore/components/controls/BulletRangeColorsControl/index.tsx
    • superset-frontend/src/explore/components/controls/BulletRangeColorsControl/types.ts
    • superset-frontend/src/explore/components/controls/ColorPickerControl.tsx
    • superset-frontend/src/explore/components/controls/IntervalColorsControl/IntervalColorsControl.test.tsx
    • superset-frontend/src/explore/components/controls/IntervalColorsControl/index.tsx
    • superset-frontend/src/explore/components/controls/IntervalColorsControl/types.ts
    • superset-frontend/src/explore/components/controls/index.ts
    • superset-frontend/src/features/themes/ThemeColorPickers.test.tsx
    • superset-frontend/src/features/themes/ThemeColorPickers.tsx
    • superset-frontend/src/features/themes/ThemeModal.test.tsx
    • superset-frontend/src/features/themes/ThemeModal.tsx
  • Files skipped - 0
  • Tools
    • Whispers (Secret Scanner) - ✔︎ Successful
    • Detect-secrets (Secret Scanner) - ✔︎ Successful
    • Eslint (Linter) - ✔︎ Successful

Bito Usage Guide

Commands

Type the following command in the pull request comment and save the comment.

  • /review - Manually triggers an incremental AI Review.

  • /review full - Manually triggers a full AI Review.

  • /pause - Pauses automatic reviews on this pull request.

  • /resume - Resumes automatic reviews.

  • /resolve - Marks all Bito-posted review comments as resolved.

  • /abort - Cancels all in-progress reviews.

Refer to the documentation for additional commands.

Configuration

This repository uses Superset You can customize the agent settings here or contact your Bito workspace admin at evan@preset.io.

Documentation & Help

AI Code Review powered by Bito Logo

@github-actions github-actions Bot added the requires:rebase Requires rebasing on top of current master label Sep 16, 2026
claude and others added 5 commits September 16, 2026 15:22
The Gauge chart's "Interval colors" control asked users to enter
comma-separated 1-indexed positions into the chosen color scheme (e.g.
"1,2,4"), forcing them to count swatches by hand with no visual
feedback and silently discarding malformed input.

Replace it with IntervalColorsControl, a new control that renders one
ColorPickerControl per interval bound (parsed from the existing
`intervals` control) and stores real hex colors in a new
`interval_colors` form-data field, positionally matched to those
bounds.

Backward compatibility: charts saved before this control existed only
have `interval_color_indices` (the old scheme-index strings).
`Gauge/transformProps.ts#getIntervalBoundsAndColors` still resolves
those indices against the chart's categorical scheme at render time
whenever `interval_colors` is absent or empty, so existing dashboards
render identically without a data migration. The new control also
resolves legacy indices to real colors for display the first time such
a chart's control panel is opened, purely as an editor convenience.

Design note: bounds stay owned by the existing `intervals` text
control rather than being folded into the new control's row list, so
there's a single source of truth for bounds and no risk of the two
controls drifting out of sync.
The Bullet chart's background range bands were hardcoded to a 4-step
theme-token ramp (colorFillQuaternary -> colorFill) with no way to
customize them, unlike the rest of the chart (ranges, markers, marker
lines) which are all user-configurable.

Add an optional `range_colors` control (BulletRangeColorsControl) that
renders one ColorPickerControl per threshold parsed from the existing
`ranges` control. Each row starts unset ("use default") with a "Use
default" link to clear a customization once made; unset rows keep
using the theme-token ramp exactly as before.

`Bullet/transformProps.ts` captures each range's chosen color
(matched by its original, pre-sort position in `ranges`) before the
existing largest-first band sort reorders them for nested drawing, so
colors stay pinned to the correct threshold regardless of draw order.

Backward compatible by construction: `range_colors` is optional and
defaults to empty, so Bullet charts saved before this control existed
have no such field and render with the exact same default ramp.
The Period-over-Period Big Number's "color scheme for comparison"
control only offered two fixed choices ("Green for increase, red for
decrease" and its reverse), bound directly to theme.colorSuccess /
theme.colorError with no room for a brand-specific color.

Replace it with two ColorPickerControls, `increase_color` and
`decrease_color` (defaulting to the 'Green' / 'Red' semantic tokens,
matching the historical default), using the same resolveThemeTokens +
outputFormat="hex" pattern #42053 introduced for
FormattingPopoverContent: picking the "Green"/"Red" preset swatch
stores the token name (so the UI still reads the same as before for
users who just want the classic behavior), while any other pick stores
a literal hex color.

`increaseColor`/`decreaseColor` and the color->style resolution move
to two small, independently unit-tested pure functions in utils.ts
(`resolveComparisonColorKeys`, `getComparisonColorTokens`) rather than
living inline in PopKPI's render body, since jsdom doesn't reliably
expose emotion's injected styles to `toHaveStyle` for direct
component-level assertions.

Backward compatibility: `resolveComparisonColorKeys` falls back to the
legacy `comparisonColorScheme` field (still read, marked @deprecated in
types.ts) whenever the new fields are absent, including correctly
reversing increase/decrease for charts saved with the old "Red for
increase, green for decrease" choice -- the case a naive
default-to-Green migration would have silently broken.

Also exports `SPECIAL_COLORS/SpecialColorKey` from ColorPickerControl
so other call sites (like this one) don't need to redefine the
Green/Red semantic color mapping.
The admin Theme editor (ThemeModal) only exposed antd theming as a
single JSON textarea, requiring admins to paste in a whole token
object generated by an external tool just to change, say, the brand
color.

Add a "Colors" section (ThemeColorPickers) above the JSON textarea
with one ColorPickerControl per curated antd token: the 5 SEED colors
(colorPrimary, colorSuccess, colorWarning, colorError, colorInfo) plus
6 load-bearing map/alias tokens (colorLink, colorText,
colorTextSecondary, colorBgBase, colorBgContainer, colorBorder). This
intentionally does not attempt to cover the full 100+ token surface --
anything else stays fully editable via the JSON textarea, which
remains the source of truth. Token names are taken directly from
antd's own SeedToken/MapToken types, not invented.

Sync is two-way and implemented as two small, independently tested
pure functions (`tryParseThemeJson`, `patchThemeJsonToken`):
- Picker -> JSON: patches just that one key into the JSON's `token`
  object and re-serializes with the same 2-space indent used
  elsewhere in this modal, preserving every other key (curated or
  not) and their values.
- JSON -> pickers: each render re-parses the JSON textarea's current
  value and re-derives picker values from it, so typing in the
  textarea updates the matching swatches live.
- Invalid/mid-edit JSON: `tryParseThemeJson` returns null instead of
  throwing (matching the file's existing `isValidJson` convention);
  the section shows a small notice and pickers stop persisting edits
  until the JSON is valid again, rather than crashing or silently
  clobbering the textarea.

The section is hidden for read-only system themes, matching the
existing Format/Apply button visibility, and both directions of sync,
invalid-JSON handling, and "uncurated token survives a picker edit"
are covered in ThemeColorPickers.test.tsx (unit) and ThemeModal.test.tsx
(integration).
- Drop the static default on increase_color/decrease_color so the legacy
  comparison_color_scheme fallback in resolveComparisonColorKeys still
  applies to old dashboards instead of getting preempted by
  applyDefaultFormData.
- Read the legacy interval_color_indices field from form_data instead of
  state.controls in Gauge's IntervalColorsControl mapStateToProps, since
  it's no longer a registered control.
- Resolve theme token names and strip pre-existing hex alpha before tinting
  in getComparisonColorTokens, so it stays valid CSS for both.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
…ange colors

tokenizeToNumericArray only dropped NaN, so a range value overflowing to
Infinity survived while BulletRangeColorsControl's own parser (which
sets up one color row per range) already dropped it -- shifting later
range_colors entries onto the wrong band. Filter on Number.isFinite in
both places so the two stay index-aligned.

Also reject a non-object `token` in ThemeColorPickers' tryParseThemeJson;
patchThemeJsonToken spreads it, so a malformed `token` (a string or
array) was silently rewritten into numeric-keyed junk on the next picker
edit instead of surfacing the existing invalid-JSON notice.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
@rusackas
rusackas force-pushed the feat/color-picker-consolidation branch from 9b6b41e to 5ec5ad2 Compare September 16, 2026 22:26
@rusackas rusackas removed the requires:rebase Requires rebasing on top of current master label Sep 16, 2026
@bito-code-review

Copy link
Copy Markdown
Contributor

AI Code Review is in progress (usually takes 3 to 15 minutes unless it's a very large PR).

Bito Usage Guide

Commands

Type the following command in the pull request comment and save the comment.

  • /review - Manually triggers an incremental AI Review.

  • /review full - Manually triggers a full AI Review.

  • /pause - Pauses automatic reviews on this pull request.

  • /resume - Resumes automatic reviews.

  • /resolve - Marks all Bito-posted review comments as resolved.

  • /abort - Cancels all in-progress reviews.

Refer to the documentation for additional commands.

Configuration

This repository uses Superset You can customize the agent settings here or contact your Bito workspace admin at evan@preset.io.

Documentation & Help

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

change:frontend Requires changing the frontend explore:colors Related to the color scheme in Explore global:theming Related to theming Superset plugins preset-io size/XXL viz:charts:bignumber Related to BigNumber charts viz:charts:gauge Related to the Gauge chart

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants