mirror of https://github.com/apache/superset.git
fix: process color scheme configs correctly (#17786)
This commit is contained in:
parent
cac704d43b
commit
de3d3973a2
|
@ -22,9 +22,13 @@ import * as CategoricalColorNamespace from './CategoricalColorNamespace';
|
|||
export { CategoricalColorNamespace };
|
||||
export { default as CategoricalColorScale } from './CategoricalColorScale';
|
||||
export { default as CategoricalScheme } from './CategoricalScheme';
|
||||
export * from './CategoricalScheme';
|
||||
export { default as getCategoricalSchemeRegistry } from './CategoricalSchemeRegistrySingleton';
|
||||
export { default as ColorScheme } from './ColorScheme';
|
||||
export * from './ColorScheme';
|
||||
export { default as getSequentialSchemeRegistry } from './SequentialSchemeRegistrySingleton';
|
||||
export { default as SequentialScheme } from './SequentialScheme';
|
||||
export * from './SequentialScheme';
|
||||
export { default as ColorSchemeRegistry } from './ColorSchemeRegistry';
|
||||
export * from './colorSchemes';
|
||||
export * from './utils';
|
||||
|
|
|
@ -18,9 +18,12 @@
|
|||
*/
|
||||
import {
|
||||
CategoricalScheme,
|
||||
ColorScheme,
|
||||
ColorSchemeConfig,
|
||||
getCategoricalSchemeRegistry,
|
||||
getSequentialSchemeRegistry,
|
||||
SequentialScheme,
|
||||
SequentialSchemeConfig,
|
||||
CategoricalAirbnb,
|
||||
CategoricalD3,
|
||||
CategoricalEcharts,
|
||||
|
@ -33,9 +36,9 @@ import {
|
|||
ColorSchemeRegistry,
|
||||
} from '@superset-ui/core';
|
||||
|
||||
function registerColorSchemes(
|
||||
registry: ColorSchemeRegistry<unknown>,
|
||||
colorSchemes: (CategoricalScheme | SequentialScheme)[],
|
||||
function registerColorSchemes<T extends ColorScheme>(
|
||||
registry: ColorSchemeRegistry<T>,
|
||||
colorSchemes: T[],
|
||||
standardDefaultKey: string,
|
||||
) {
|
||||
colorSchemes.forEach(scheme => {
|
||||
|
@ -48,9 +51,15 @@ function registerColorSchemes(
|
|||
}
|
||||
|
||||
export default function setupColors(
|
||||
extraCategoricalColorSchemes: CategoricalScheme[] = [],
|
||||
extraSequentialColorSchemes: SequentialScheme[] = [],
|
||||
extraCategoricalColorSchemeConfigs: ColorSchemeConfig[] = [],
|
||||
extraSequentialColorSchemeConfigs: SequentialSchemeConfig[] = [],
|
||||
) {
|
||||
const extraCategoricalColorSchemes = extraCategoricalColorSchemeConfigs.map(
|
||||
config => new CategoricalScheme(config),
|
||||
);
|
||||
const extraSequentialColorSchemes = extraSequentialColorSchemeConfigs.map(
|
||||
config => new SequentialScheme(config),
|
||||
);
|
||||
registerColorSchemes(
|
||||
// @ts-ignore
|
||||
getCategoricalSchemeRegistry(),
|
||||
|
|
Loading…
Reference in New Issue