diff --git a/package-lock.json b/package-lock.json index e4496d10cc..fc63a5d648 100644 --- a/package-lock.json +++ b/package-lock.json @@ -80,7 +80,7 @@ "@types/memoizee": "^0.4.5", "@types/node": "^24.8.0", "@types/papaparse": "5.3.2", - "@types/plotly.js": "^3.0.0", + "@types/plotly.js": "^3.0.8", "@types/pouchdb-browser": "^6.1.3", "@types/react": "^18.3.12", "@types/react-dom": "^18.3.1", @@ -10583,10 +10583,11 @@ "integrity": "sha512-j3pOPiEcWZ34R6a6mN07mUkM4o4Lwf6hPNt8eilOeZhTFbxFXmKhvXl9Y28jotFPaI1bpPDJsbCprUoNke6OrA==" }, "node_modules/@types/plotly.js": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/plotly.js/-/plotly.js-3.0.3.tgz", - "integrity": "sha512-9CENH8hh2diOML3o4lEd4H0nwQ4uECEE9mZQc+zriGEdd0zK8ru75t7qFhaMQmiWFFPGWqI4FpodBZFTmWpdbQ==", - "dev": true + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/@types/plotly.js/-/plotly.js-3.0.9.tgz", + "integrity": "sha512-nHKn7czWIPN7rT5wWI5qhML2O1Prm/Gx0NNe1MVr5GUL1zuzxbvIDmG7hlKMMtDsEtNfNQLMlMwk0CRtd3uqhg==", + "dev": true, + "license": "MIT" }, "node_modules/@types/pouchdb-adapter-http": { "version": "6.1.6", diff --git a/package.json b/package.json index 4ac0789fb6..8a92f56da9 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "@types/memoizee": "^0.4.5", "@types/node": "^24.8.0", "@types/papaparse": "5.3.2", - "@types/plotly.js": "^3.0.0", + "@types/plotly.js": "^3.0.8", "@types/pouchdb-browser": "^6.1.3", "@types/react": "^18.3.12", "@types/react-dom": "^18.3.1", diff --git a/packages/chart/src/ChartTheme.module.scss b/packages/chart/src/ChartTheme.module.scss index 049bc17c99..418fe48e94 100644 --- a/packages/chart/src/ChartTheme.module.scss +++ b/packages/chart/src/ChartTheme.module.scss @@ -26,4 +26,7 @@ indicator-increasing: var(--dh-color-chart-indicator-increase); indicator-decreasing: var(--dh-color-chart-indicator-decrease); indicator-gauge: var(--dh-color-chart-indicator-gauge); + + /* Map */ + map-style: var(--dh-color-chart-map-style); } diff --git a/packages/chart/src/ChartTheme.ts b/packages/chart/src/ChartTheme.ts index 8e47ffae51..c5f32cd188 100644 --- a/packages/chart/src/ChartTheme.ts +++ b/packages/chart/src/ChartTheme.ts @@ -33,6 +33,9 @@ export interface ChartTheme { indicator_increasing: string; indicator_decreasing: string; indicator_gauge: string; + + // Map + map_style: string; } export function defaultChartTheme(): Readonly { @@ -74,6 +77,8 @@ export function defaultChartTheme(): Readonly { indicator_increasing: chartTheme['indicator-increasing'], indicator_decreasing: chartTheme['indicator-decreasing'], indicator_gauge: chartTheme['indicator-gauge'], + // Map + map_style: chartTheme['map-style'], }); } diff --git a/packages/chart/src/ChartUtils.ts b/packages/chart/src/ChartUtils.ts index d395d75724..e784b1474d 100644 --- a/packages/chart/src/ChartUtils.ts +++ b/packages/chart/src/ChartUtils.ts @@ -2142,6 +2142,7 @@ class ChartUtils { ocean_color, lake_color, river_color, + map_style, /* eslint-disable camelcase */ } = theme; @@ -2196,6 +2197,9 @@ class ChartUtils { lakecolor: lake_color, rivercolor: river_color, }, + map: { + style: map_style, + }, }; layout.datarevision = 0; diff --git a/packages/chart/src/__snapshots__/ChartTheme.test.ts.snap b/packages/chart/src/__snapshots__/ChartTheme.test.ts.snap index fbf1cf48bf..0e728c8480 100644 --- a/packages/chart/src/__snapshots__/ChartTheme.test.ts.snap +++ b/packages/chart/src/__snapshots__/ChartTheme.test.ts.snap @@ -13,6 +13,7 @@ exports[`defaultChartTheme should create the default chart theme 1`] = ` "land_color": "chartTheme['land-color']", "legend_color": "chartTheme['legend-color']", "linecolor": "chartTheme['linecolor']", + "map_style": "chartTheme['map-style']", "ocean_color": "chartTheme['ocean-color']", "ohlc_decreasing": "chartTheme['ohlc-decreasing']", "ohlc_increasing": "chartTheme['ohlc-increasing']", diff --git a/packages/chart/src/__snapshots__/ChartUtils.test.ts.snap b/packages/chart/src/__snapshots__/ChartUtils.test.ts.snap index f794c18cf1..e6599d439c 100644 --- a/packages/chart/src/__snapshots__/ChartUtils.test.ts.snap +++ b/packages/chart/src/__snapshots__/ChartUtils.test.ts.snap @@ -104,6 +104,9 @@ exports[`makeDefaultTemplate should create a default template 1`] = ` "color": "ChartTheme['title_color']", }, }, + "map": { + "style": "ChartTheme['map_style']", + }, "margin": { "b": 60, "l": 60, diff --git a/packages/code-studio/src/styleguide/colorUtils.ts b/packages/code-studio/src/styleguide/colorUtils.ts index ab5a78f795..77517e0acf 100644 --- a/packages/code-studio/src/styleguide/colorUtils.ts +++ b/packages/code-studio/src/styleguide/colorUtils.ts @@ -189,6 +189,11 @@ export function buildColorGroups( group = groupRemap[group] ?? group; + // Skip maps as there is no swatch to show currently + if (group === 'map') { + return acc; + } + if (acc[group] == null) { acc[group] = []; } diff --git a/packages/components/src/theme/theme-dark/theme-dark-semantic-chart.css b/packages/components/src/theme/theme-dark/theme-dark-semantic-chart.css index 1d58afcb1f..a866da47d4 100644 --- a/packages/components/src/theme/theme-dark/theme-dark-semantic-chart.css +++ b/packages/components/src/theme/theme-dark/theme-dark-semantic-chart.css @@ -52,4 +52,7 @@ --dh-color-chart-indicator-increase: var(--dh-color-visual-green); --dh-color-chart-indicator-decrease: var(--dh-color-visual-red); --dh-color-chart-indicator-gauge: var(--dh-color-green-1000); + + /* Map */ + --dh-color-chart-map-style: dark; } diff --git a/packages/components/src/theme/theme-light/theme-light-semantic-chart.css b/packages/components/src/theme/theme-light/theme-light-semantic-chart.css index bc35501fd8..49121dca10 100644 --- a/packages/components/src/theme/theme-light/theme-light-semantic-chart.css +++ b/packages/components/src/theme/theme-light/theme-light-semantic-chart.css @@ -52,4 +52,7 @@ --dh-color-chart-indicator-increase: var(--dh-color-visual-green); --dh-color-chart-indicator-decrease: var(--dh-color-visual-red); --dh-color-chart-indicator-gauge: var(--dh-color-green-1000); + + /* Map */ + --dh-color-chart-map-style: light; }