@gooddata/sdk-ui-geo 11.23.0-alpha.3 → 11.23.0-alpha.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm/next/layers/common/computeLegend.d.ts.map +1 -1
- package/esm/next/layers/common/computeLegend.js +15 -0
- package/esm/next/layers/common/computeLegend.js.map +1 -1
- package/esm/next/utils/legend/computeAreaLegend.d.ts.map +1 -1
- package/esm/next/utils/legend/computeAreaLegend.js +6 -3
- package/esm/next/utils/legend/computeAreaLegend.js.map +1 -1
- package/esm/next/utils/legend/computePushpinLegend.d.ts.map +1 -1
- package/esm/next/utils/legend/computePushpinLegend.js +6 -3
- package/esm/next/utils/legend/computePushpinLegend.js.map +1 -1
- package/package.json +11 -11
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"computeLegend.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/common/computeLegend.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAGnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"computeLegend.d.ts","sourceRoot":"","sources":["../../../../src/next/layers/common/computeLegend.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAGnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAoBpE;;;;GAIG;AACH,MAAM,WAAW,qBAAqB;IAClC;;OAEG;IACH,SAAS,EAAE,SAAS,GAAG,MAAM,CAAC;IAE9B;;OAEG;IACH,WAAW,EAAE,OAAO,CAAC;CACxB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,aAAa,CACzB,OAAO,EAAE,cAAc,EACvB,aAAa,EAAE,cAAc,EAC7B,OAAO,EAAE,qBAAqB,GAC/B,gBAAgB,CA2ClB"}
|
|
@@ -1,5 +1,19 @@
|
|
|
1
1
|
// (C) 2025-2026 GoodData Corporation
|
|
2
2
|
import { isResultAttributeHeader } from "@gooddata/sdk-model";
|
|
3
|
+
const legendItemNameCollator = new Intl.Collator("en", { sensitivity: "base", numeric: true });
|
|
4
|
+
function sortLegendItemsAlphabetically(items) {
|
|
5
|
+
return [...items].sort((left, right) => {
|
|
6
|
+
const nameComparison = legendItemNameCollator.compare(left.name, right.name);
|
|
7
|
+
if (nameComparison !== 0) {
|
|
8
|
+
return nameComparison;
|
|
9
|
+
}
|
|
10
|
+
const uriComparison = left.uri.localeCompare(right.uri);
|
|
11
|
+
if (uriComparison !== 0) {
|
|
12
|
+
return uriComparison;
|
|
13
|
+
}
|
|
14
|
+
return left.legendIndex - right.legendIndex;
|
|
15
|
+
});
|
|
16
|
+
}
|
|
3
17
|
/**
|
|
4
18
|
* Computes legend data from geo data and color strategy.
|
|
5
19
|
*
|
|
@@ -45,6 +59,7 @@ export function computeLegend(geoData, colorStrategy, options) {
|
|
|
45
59
|
isVisible: true,
|
|
46
60
|
};
|
|
47
61
|
});
|
|
62
|
+
items = sortLegendItemsAlphabetically(items);
|
|
48
63
|
}
|
|
49
64
|
const available = {
|
|
50
65
|
hasCategoryLegend: items.length > 0,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"computeLegend.js","sourceRoot":"","sources":["../../../../src/next/layers/common/computeLegend.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"computeLegend.js","sourceRoot":"","sources":["../../../../src/next/layers/common/computeLegend.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"computeAreaLegend.d.ts","sourceRoot":"","sources":["../../../../src/next/utils/legend/computeAreaLegend.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AACvF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAGH,KAAK,cAAc,EACtB,MAAM,6BAA6B,CAAC;AAoBrC;;;;GAIG;AACH,MAAM,WAAW,wBAAwB;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,YAAY,CAAC;IACtB,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B,gBAAgB,EAAE,iBAAiB,CAAC;IACpC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAChC;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,wBAAwB,GAAG,cAAc,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"computeAreaLegend.d.ts","sourceRoot":"","sources":["../../../../src/next/utils/legend/computeAreaLegend.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AACvF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAGH,KAAK,cAAc,EACtB,MAAM,6BAA6B,CAAC;AAoBrC;;;;GAIG;AACH,MAAM,WAAW,wBAAwB;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,YAAY,CAAC;IACtB,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B,gBAAgB,EAAE,iBAAiB,CAAC;IACpC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAChC;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,wBAAwB,GAAG,cAAc,GAAG,IAAI,CAuDzF"}
|
|
@@ -35,8 +35,9 @@ function convertToColorCategories(legendItems) {
|
|
|
35
35
|
export function computeAreaLegend(params) {
|
|
36
36
|
const { layerId, layerName, geoData, legendItems, availableLegends, numericSymbols, colorScaleBaseColor, } = params;
|
|
37
37
|
const groups = [];
|
|
38
|
+
const hasCategoryLegend = availableLegends.hasCategoryLegend && legendItems.length > 0;
|
|
38
39
|
// Add categorical color legend group if available (segment attribute)
|
|
39
|
-
if (
|
|
40
|
+
if (hasCategoryLegend) {
|
|
40
41
|
const colorCategories = convertToColorCategories(legendItems);
|
|
41
42
|
groups.push({
|
|
42
43
|
kind: "color",
|
|
@@ -44,8 +45,10 @@ export function computeAreaLegend(params) {
|
|
|
44
45
|
items: colorCategories,
|
|
45
46
|
});
|
|
46
47
|
}
|
|
47
|
-
// Add numeric color scale group if available (color measure)
|
|
48
|
-
|
|
48
|
+
// Add numeric color scale group if available (color measure).
|
|
49
|
+
// Segment/category legend has precedence over gradient, so we only render the
|
|
50
|
+
// color scale when no category legend is present.
|
|
51
|
+
if (availableLegends.hasColorLegend && geoData.color && !hasCategoryLegend) {
|
|
49
52
|
const colorScale = computeColorScale(geoData.color.data, geoData.color.format, numericSymbols, colorScaleBaseColor, { allowFlatScale: true });
|
|
50
53
|
if (colorScale) {
|
|
51
54
|
groups.push({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"computeAreaLegend.js","sourceRoot":"","sources":["../../../../src/next/utils/legend/computeAreaLegend.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAS3D;;;;;;;GAOG;AACH,SAAS,wBAAwB,CAAC,WAA6B,EAA8B;IACzF,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC9B,IAAI,EAAE,eAAwB;QAC9B,KAAK,EAAE,IAAI,CAAC,IAAI;QAChB,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,MAAM,EAAE,+BAA+B;QAC5D,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,SAAS,EAAE,IAAI,CAAC,SAAS;KAC5B,CAAC,CAAC,CAAC;AAAA,CACP;AAiBD;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,iBAAiB,CAAC,MAAgC,EAAyB;IACvF,MAAM,EACF,OAAO,EACP,SAAS,EACT,OAAO,EACP,WAAW,EACX,gBAAgB,EAChB,cAAc,EACd,mBAAmB,GACtB,GAAG,MAAM,CAAC;IAEX,MAAM,MAAM,GAAmB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"computeAreaLegend.js","sourceRoot":"","sources":["../../../../src/next/utils/legend/computeAreaLegend.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAS3D;;;;;;;GAOG;AACH,SAAS,wBAAwB,CAAC,WAA6B,EAA8B;IACzF,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC9B,IAAI,EAAE,eAAwB;QAC9B,KAAK,EAAE,IAAI,CAAC,IAAI;QAChB,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,MAAM,EAAE,+BAA+B;QAC5D,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,SAAS,EAAE,IAAI,CAAC,SAAS;KAC5B,CAAC,CAAC,CAAC;AAAA,CACP;AAiBD;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,iBAAiB,CAAC,MAAgC,EAAyB;IACvF,MAAM,EACF,OAAO,EACP,SAAS,EACT,OAAO,EACP,WAAW,EACX,gBAAgB,EAChB,cAAc,EACd,mBAAmB,GACtB,GAAG,MAAM,CAAC;IAEX,MAAM,MAAM,GAAmB,EAAE,CAAC;IAClC,MAAM,iBAAiB,GAAG,gBAAgB,CAAC,iBAAiB,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;IAEvF,sEAAsE;IACtE,IAAI,iBAAiB,EAAE,CAAC;QACpB,MAAM,eAAe,GAAG,wBAAwB,CAAC,WAAW,CAAC,CAAC;QAC9D,MAAM,CAAC,IAAI,CAAC;YACR,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,OAAO,CAAC,OAAO,EAAE,IAAI,IAAI,OAAO;YACvC,KAAK,EAAE,eAAe;SACzB,CAAC,CAAC;IACP,CAAC;IAED,8DAA8D;IAC9D,8EAA8E;IAC9E,kDAAkD;IAClD,IAAI,gBAAgB,CAAC,cAAc,IAAI,OAAO,CAAC,KAAK,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzE,MAAM,UAAU,GAAG,iBAAiB,CAChC,OAAO,CAAC,KAAK,CAAC,IAAI,EAClB,OAAO,CAAC,KAAK,CAAC,MAAM,EACpB,cAAc,EACd,mBAAmB,EACnB,EAAE,cAAc,EAAE,IAAI,EAAE,CAC3B,CAAC;QACF,IAAI,UAAU,EAAE,CAAC;YACb,MAAM,CAAC,IAAI,CAAC;gBACR,IAAI,EAAE,YAAY;gBAClB,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI;gBACzB,KAAK,EAAE,CAAC,UAAU,CAAC;aACtB,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED,uEAAuE;IACvE,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO;QACH,OAAO;QACP,UAAU,EAAE,SAAS;QACrB,SAAS,EAAE,MAAM;QACjB,MAAM;KACT,CAAC;AAAA,CACL"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"computePushpinLegend.d.ts","sourceRoot":"","sources":["../../../../src/next/utils/legend/computePushpinLegend.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AACvF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EACH,KAAK,wBAAwB,EAE7B,KAAK,cAAc,EACnB,KAAK,qBAAqB,EAC7B,MAAM,6BAA6B,CAAC;AAwBrC;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAC9B,OAAO,EAAE,eAAe,EACxB,cAAc,CAAC,EAAE,MAAM,EAAE,GAC1B,qBAAqB,EAAE,CAuDzB;AAED;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,cAAc,EAAE,GAAG,wBAAwB,EAAE,CAQlG;AAED;;;;GAIG;AACH,MAAM,WAAW,2BAA2B;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,eAAe,CAAC;IACzB,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B,gBAAgB,EAAE,iBAAiB,CAAC;IACpC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAChC;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,2BAA2B,GAAG,cAAc,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"computePushpinLegend.d.ts","sourceRoot":"","sources":["../../../../src/next/utils/legend/computePushpinLegend.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AACvF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EACH,KAAK,wBAAwB,EAE7B,KAAK,cAAc,EACnB,KAAK,qBAAqB,EAC7B,MAAM,6BAA6B,CAAC;AAwBrC;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAC9B,OAAO,EAAE,eAAe,EACxB,cAAc,CAAC,EAAE,MAAM,EAAE,GAC1B,qBAAqB,EAAE,CAuDzB;AAED;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,cAAc,EAAE,GAAG,wBAAwB,EAAE,CAQlG;AAED;;;;GAIG;AACH,MAAM,WAAW,2BAA2B;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,eAAe,CAAC;IACzB,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B,gBAAgB,EAAE,iBAAiB,CAAC;IACpC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAChC;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,2BAA2B,GAAG,cAAc,GAAG,IAAI,CAmE/F"}
|
|
@@ -116,6 +116,7 @@ export function convertToColorCategories(legendItems) {
|
|
|
116
116
|
export function computePushpinLegend(params) {
|
|
117
117
|
const { layerId, layerName, geoData, legendItems, availableLegends, numericSymbols, colorScaleBaseColor, } = params;
|
|
118
118
|
const groups = [];
|
|
119
|
+
const hasCategoryLegend = availableLegends.hasCategoryLegend && legendItems.length > 0;
|
|
119
120
|
// Add size legend group if available
|
|
120
121
|
if (availableLegends.hasSizeLegend) {
|
|
121
122
|
const sizeAnchors = computeSizeAnchors(geoData, numericSymbols);
|
|
@@ -127,9 +128,11 @@ export function computePushpinLegend(params) {
|
|
|
127
128
|
});
|
|
128
129
|
}
|
|
129
130
|
}
|
|
130
|
-
// Add numeric color scale group if available
|
|
131
|
+
// Add numeric color scale group if available.
|
|
132
|
+
// Segment/category legend has precedence over gradient, so we only render the
|
|
133
|
+
// color scale when no category legend is present.
|
|
131
134
|
// Order: Size -> Metric-Color -> Segment By
|
|
132
|
-
if (availableLegends.hasColorLegend && geoData.color) {
|
|
135
|
+
if (availableLegends.hasColorLegend && geoData.color && !hasCategoryLegend) {
|
|
133
136
|
const colorScale = computeColorScale(geoData.color.data, geoData.color.format, numericSymbols, colorScaleBaseColor);
|
|
134
137
|
if (colorScale) {
|
|
135
138
|
groups.push({
|
|
@@ -140,7 +143,7 @@ export function computePushpinLegend(params) {
|
|
|
140
143
|
}
|
|
141
144
|
}
|
|
142
145
|
// Add category legend group if available (Segment By)
|
|
143
|
-
if (
|
|
146
|
+
if (hasCategoryLegend) {
|
|
144
147
|
const colorCategories = convertToColorCategories(legendItems);
|
|
145
148
|
groups.push({
|
|
146
149
|
kind: "color",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"computePushpinLegend.js","sourceRoot":"","sources":["../../../../src/next/utils/legend/computePushpinLegend.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"computePushpinLegend.js","sourceRoot":"","sources":["../../../../src/next/utils/legend/computePushpinLegend.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@gooddata/sdk-ui-geo",
|
|
3
|
-
"version": "11.23.0-alpha.
|
|
3
|
+
"version": "11.23.0-alpha.4",
|
|
4
4
|
"description": "GoodData.UI SDK - Geo Charts",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "GoodData Corporation",
|
|
@@ -43,12 +43,12 @@
|
|
|
43
43
|
"ts-invariant": "0.10.3",
|
|
44
44
|
"tslib": "2.8.1",
|
|
45
45
|
"uuid": "11.1.0",
|
|
46
|
-
"@gooddata/sdk-backend-spi": "11.23.0-alpha.
|
|
47
|
-
"@gooddata/sdk-ui": "11.23.0-alpha.
|
|
48
|
-
"@gooddata/sdk-ui-kit": "11.23.0-alpha.
|
|
49
|
-
"@gooddata/sdk-
|
|
50
|
-
"@gooddata/sdk-
|
|
51
|
-
"@gooddata/sdk-ui-vis-commons": "11.23.0-alpha.
|
|
46
|
+
"@gooddata/sdk-backend-spi": "11.23.0-alpha.4",
|
|
47
|
+
"@gooddata/sdk-ui": "11.23.0-alpha.4",
|
|
48
|
+
"@gooddata/sdk-ui-kit": "11.23.0-alpha.4",
|
|
49
|
+
"@gooddata/sdk-ui-theme-provider": "11.23.0-alpha.4",
|
|
50
|
+
"@gooddata/sdk-model": "11.23.0-alpha.4",
|
|
51
|
+
"@gooddata/sdk-ui-vis-commons": "11.23.0-alpha.4"
|
|
52
52
|
},
|
|
53
53
|
"devDependencies": {
|
|
54
54
|
"@microsoft/api-documenter": "^7.17.0",
|
|
@@ -91,10 +91,10 @@
|
|
|
91
91
|
"typescript": "5.9.3",
|
|
92
92
|
"vitest": "4.0.8",
|
|
93
93
|
"vitest-dom": "0.1.1",
|
|
94
|
-
"@gooddata/
|
|
95
|
-
"@gooddata/
|
|
96
|
-
"@gooddata/sdk-backend-mockingbird": "11.23.0-alpha.
|
|
97
|
-
"@gooddata/stylelint-config": "11.23.0-alpha.
|
|
94
|
+
"@gooddata/oxlint-config": "11.23.0-alpha.4",
|
|
95
|
+
"@gooddata/eslint-config": "11.23.0-alpha.4",
|
|
96
|
+
"@gooddata/sdk-backend-mockingbird": "11.23.0-alpha.4",
|
|
97
|
+
"@gooddata/stylelint-config": "11.23.0-alpha.4"
|
|
98
98
|
},
|
|
99
99
|
"peerDependencies": {
|
|
100
100
|
"react": "^18.0.0 || ^19.0.0",
|