@gooddata/sdk-ui-geo 11.41.0-alpha.0 → 11.41.0-alpha.2

package/esm/next/hooks/layers/useLayersTooltipData.js

@@ -1,12 +1,7 @@
 // (C) 2026 GoodData Corporation
 import { useMemo } from "react";
-import { defineMessages } from "react-intl";
 import { useTooltipLookupExecutions } from "@gooddata/sdk-ui-vis-commons";
 import { getLayerAdapter } from "../../layers/registry/adapterRegistry.js";
-const customTooltipMessages = defineMessages({
-    noData: { id: "richText.no_data" },
-    multipleItems: { id: "richText.multiple_data" },
-});
 const EMPTY_RESULT = { tooltipLookups: new Map() };
 function planTooltipExecutions(layerExecutions, layerDataViews, backend, workspace, config, execConfig, intl) {
     const planned = [];
@@ -43,7 +38,6 @@ function planTooltipExecutions(layerExecutions, layerDataViews, backend, workspa
         planned.push({
             key: record.layerId,
             execution: built.execution,
-            meta: built.meta,
             context: built.buildFeatureKey,
         });
     }
@@ -67,11 +61,7 @@ export function useLayersTooltipData(params) {
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [tooltipEnabled, layerExecutions, layerDataViews, backend, workspace, tooltipContent]);
     const separators = config?.separators;
-    const localizedStrings = useMemo(() => ({
-        noData: `(${intl.formatMessage(customTooltipMessages.noData)})`,
-        multipleItems: `(${intl.formatMessage(customTooltipMessages.multipleItems)})`,
-    }), [intl]);
-    const lookupResults = useTooltipLookupExecutions(planned, separators, localizedStrings);
+    const lookupResults = useTooltipLookupExecutions(planned, separators);
     // Lookup-table construction is downstream of the cancelable promise so a
     // separators-only change rebuilds the cached strings without a backend call.
     // No stale-guard needed here: `useTooltipLookupExecutions` clears its result

package/esm/next/layers/area/adapter.js

@@ -112,7 +112,7 @@ function buildAreaTooltipExecution(layer, context, mainDefinition) {
         }
         return buildKeySegment(areaAttrId, areaUri);
     };
-    return { ...built, buildFeatureKey };
+    return { execution: built, buildFeatureKey };
 }
 export const areaAdapter = {
     type: "area",

package/esm/next/layers/area/tooltip/tooltipManagement.js

@@ -1,4 +1,5 @@
 // (C) 2025-2026 GoodData Corporation
+import { buildTooltipLocalizedStrings } from "@gooddata/sdk-ui-vis-commons";
 import { buildCustomTooltipPieces, composeTooltipBody } from "../../common/customTooltipSection.js";
 import { dedupeAttributePayloadsByAttrId, formatAttributeHtml, formatMeasureHtml, getTooltipProperties, parseTooltipPayload, } from "../../common/tooltipUtils.js";
 function escapeHtml(str) {
@@ -20,9 +21,7 @@ function buildAreaTooltipHtml(rawProperties, locationName, color, segment, strok
     const measureItem = formatMeasureHtml(color, separators, tooltipFormatConfig);
     const items = [...attributeItems, ...(measureItem ? [measureItem] : [])];
     const defaultItemsHtml = items.join("");
-    const fallbackText = `(${intl.formatMessage({ id: "richText.no_fetch" })})`;
-    const noDataLabel = `(${intl.formatMessage({ id: "richText.no_data" })})`;
-    const customPieces = buildCustomTooltipPieces(rawProperties, customConfig, referenceMaps, separators, fallbackText, noDataLabel, tooltipLookup);
+    const customPieces = buildCustomTooltipPieces(rawProperties, customConfig, referenceMaps, separators, buildTooltipLocalizedStrings(intl), tooltipLookup);
     // Suppress the tooltip entirely only when there's nothing to show in
     // either the default or the custom section.
     if (items.length === 0 && !customPieces.sectionHtml) {

package/esm/next/layers/common/customTooltipExecution.d.ts

@@ -1,5 +1,5 @@
 import { type IAttribute, type IExecutionDefinition } from "@gooddata/sdk-model";
-import { type IResolvedReferenceValues, type ITooltipExecutionBundle } from "@gooddata/sdk-ui-vis-commons";
+import { type IResolvedReferenceValues, type ITooltipExecution } from "@gooddata/sdk-ui-vis-commons";
 import { type JsonValue } from "../../utils/guards.js";
 /**
  * Returns the lookup key for a hovered feature in the same format
@@ -12,7 +12,8 @@ export type BuildFeatureKey = (properties: GeoJSON.GeoJsonProperties) => string
 /**
  * @internal
  */
-export interface IGeoLayerCustomTooltipExecution extends ITooltipExecutionBundle {
+export interface IGeoLayerCustomTooltipExecution {
+    execution: ITooltipExecution;
     buildFeatureKey: BuildFeatureKey;
 }
 /**

package/esm/next/layers/common/customTooltipSection.d.ts

@@ -1,5 +1,5 @@
 import { type ISeparators } from "@gooddata/sdk-model";
-import { type ICustomTooltipConfig } from "@gooddata/sdk-ui-vis-commons";
+import { type ICustomTooltipConfig, type ITooltipLocalizedStrings } from "@gooddata/sdk-ui-vis-commons";
 import { type ITooltipReferenceMaps } from "../registry/adapterTypes.js";
 import { type IGeoLayerTooltipLookup } from "./customTooltipExecution.js";
 interface ICustomTooltipPieces {
@@ -16,7 +16,7 @@ interface ICustomTooltipPieces {
  *
  * @internal
  */
-export declare function buildCustomTooltipPieces(properties: GeoJSON.GeoJsonProperties, customConfig: ICustomTooltipConfig | undefined, referenceMaps: ITooltipReferenceMaps | undefined, separators: ISeparators | undefined, fallbackText: string, noDataLabel: string, tooltipLookup?: IGeoLayerTooltipLookup): ICustomTooltipPieces;
+export declare function buildCustomTooltipPieces(properties: GeoJSON.GeoJsonProperties, customConfig: ICustomTooltipConfig | undefined, referenceMaps: ITooltipReferenceMaps | undefined, separators: ISeparators | undefined, localizedStrings: ITooltipLocalizedStrings, tooltipLookup?: IGeoLayerTooltipLookup): ICustomTooltipPieces;
 /**
  * Splice custom-tooltip pieces into the default tooltip body.
  *

package/esm/next/layers/common/customTooltipSection.js

@@ -1,5 +1,5 @@
 // (C) 2026 GoodData Corporation
-import { composeCustomTooltipSectionHtml } from "@gooddata/sdk-ui-vis-commons";
+import { composeCustomTooltipSectionHtml, } from "@gooddata/sdk-ui-vis-commons";
 import { resolveReferencesFromGeoFeature } from "./resolveReferencesFromGeoFeature.js";
 /**
  * Build the custom-tooltip section + separator HTML pieces for a hovered feature.
@@ -9,12 +9,12 @@ import { resolveReferencesFromGeoFeature } from "./resolveReferencesFromGeoFeatu
  *
  * @internal
  */
-export function buildCustomTooltipPieces(properties, customConfig, referenceMaps, separators, fallbackText, noDataLabel, tooltipLookup) {
+export function buildCustomTooltipPieces(properties, customConfig, referenceMaps, separators, localizedStrings, tooltipLookup) {
     if (!customConfig?.enabled || !customConfig.content) {
         return { sectionHtml: "", separatorHtml: "" };
     }
     // In-chart values from the rendered feature's properties.
-    const pointLocal = resolveReferencesFromGeoFeature(properties, referenceMaps, separators, noDataLabel);
+    const pointLocal = resolveReferencesFromGeoFeature(properties, referenceMaps, separators);
     // External values from the precomputed lookup (refs not on the feature).
     let externalValues = {};
     if (tooltipLookup) {
@@ -23,7 +23,7 @@ export function buildCustomTooltipPieces(properties, customConfig, referenceMaps
             externalValues = tooltipLookup.lookup.get(featureKey) ?? {};
         }
     }
-    const sectionHtml = composeCustomTooltipSectionHtml(customConfig.content, pointLocal, externalValues, fallbackText);
+    const sectionHtml = composeCustomTooltipSectionHtml(customConfig.content, pointLocal, externalValues, localizedStrings);
     // Replace mode shows only the custom section, so no separator is needed.
     const separatorHtml = customConfig.placement === "replace" ? "" : `<div class="gd-viz-tooltip-custom-separator"></div>`;
     return { sectionHtml, separatorHtml };

package/esm/next/layers/common/resolveReferencesFromGeoFeature.d.ts

@@ -17,4 +17,4 @@ import { type ITooltipReferenceMaps } from "../registry/adapterTypes.js";
  *
  * @internal
  */
-export declare function resolveReferencesFromGeoFeature(properties: GeoJSON.GeoJsonProperties, referenceMaps: ITooltipReferenceMaps | undefined, separators: ISeparators | undefined, noDataLabel: string): IResolvedReferenceValues;
+export declare function resolveReferencesFromGeoFeature(properties: GeoJSON.GeoJsonProperties, referenceMaps: ITooltipReferenceMaps | undefined, separators: ISeparators | undefined): IResolvedReferenceValues;

package/esm/next/layers/common/resolveReferencesFromGeoFeature.js

@@ -1,5 +1,5 @@
 // (C) 2026 GoodData Corporation
-import { ClientFormatterFacade } from "@gooddata/number-formatter";
+import { labelKey, labelReference, measureReference, metricKey, } from "@gooddata/sdk-ui-vis-commons";
 import { getTooltipProperties, parseTooltipPayload } from "./tooltipUtils.js";
 /**
  * Builds the resolver lookup table for a hovered GeoJSON feature.
@@ -17,7 +17,7 @@ import { getTooltipProperties, parseTooltipPayload } from "./tooltipUtils.js";
  *
  * @internal
  */
-export function resolveReferencesFromGeoFeature(properties, referenceMaps, separators, noDataLabel) {
+export function resolveReferencesFromGeoFeature(properties, referenceMaps, separators) {
     const values = {};
     if (!properties) {
         return values;
@@ -29,19 +29,19 @@ export function resolveReferencesFromGeoFeature(properties, referenceMaps, separ
         if (!payload?.attrId || payload.value === undefined) {
             return;
         }
-        const text = String(payload.value);
-        const displayFormKey = `label/${payload.attrId}`;
+        const status = labelReference(String(payload.value));
+        const displayFormKey = labelKey(payload.attrId);
         if (values[displayFormKey] === undefined) {
-            values[displayFormKey] = text;
+            values[displayFormKey] = status;
         }
         // When `attrId` and the parent attribute id are equal, `attributeKey`
         // collapses onto `displayFormKey` and the second write is a no-op
         // under first-wins — no self-equality check needed.
         const attributeId = attributeIdByDisplayFormId[payload.attrId];
         if (attributeId) {
-            const attributeKey = `label/${attributeId}`;
+            const attributeKey = labelKey(attributeId);
             if (values[attributeKey] === undefined) {
-                values[attributeKey] = text;
+                values[attributeKey] = status;
             }
         }
     };
@@ -53,29 +53,14 @@ export function resolveReferencesFromGeoFeature(properties, referenceMaps, separ
         if (!ldmId) {
             return;
         }
-        const key = `metric/${ldmId}`;
+        const key = metricKey(ldmId);
         if (values[key] !== undefined) {
             return; // first-wins precedence
         }
+        // Geo payloads (via JSON) can be non-numeric/NaN; normalize to null (→ "No data") first.
         const rawValue = payload.value;
-        if (typeof rawValue !== "number" || !Number.isFinite(rawValue)) {
-            // Null / undefined / NaN on the rendered feature — emit the no-data
-            // sentinel so the custom section reads "(No data)" instead of falling
-            // through to the resolution-failure fallback text.
-            values[key] = noDataLabel;
-            return;
-        }
-        // Use the raw formatted value without HTML escaping. The resolved
-        // content goes through `markdownToHtml`, which escapes once at render
-        // time — pre-escaping here would produce double-escaped output (`&` →
-        // `&`). Matches Highcharts' `resolveReferencesFromPoint`.
-        if (payload.format) {
-            const { formattedValue } = ClientFormatterFacade.formatValue(rawValue, payload.format, separators);
-            values[key] = formattedValue;
-        }
-        else {
-            values[key] = String(rawValue);
-        }
+        const numeric = typeof rawValue === "number" && Number.isFinite(rawValue) ? rawValue : null;
+        values[key] = measureReference(numeric, payload.format, separators);
     };
     // Walk in default-tooltip render order so `{metric/foo}` resolves to the
     // value users see above the custom section when the same metric appears

package/esm/next/layers/pushpin/adapter.js

@@ -234,7 +234,7 @@ function buildPushpinTooltipExecution(layer, context, mainDefinition) {
         }
         return joinKeySegments(parts);
     };
-    return { ...built, buildFeatureKey };
+    return { execution: built, buildFeatureKey };
 }
 export const pushpinAdapter = {
     type: "pushpin",

package/esm/next/layers/pushpin/tooltip/tooltipManagement.js

@@ -1,5 +1,6 @@
 // (C) 2025-2026 GoodData Corporation
 import { escape, isEmpty } from "lodash-es";
+import { buildTooltipLocalizedStrings } from "@gooddata/sdk-ui-vis-commons";
 import { getTooltipContentWidth } from "../../../map/style/tooltipFormatting.js";
 import { isGeoJsonPoint, isLngLatTuple, isRecord, } from "../../../utils/guards.js";
 import { buildCustomTooltipPieces, composeTooltipBody } from "../../common/customTooltipSection.js";
@@ -124,9 +125,7 @@ export function getTooltipHtml(geoProperties, tooltipStroke, maxWidth, separator
     ]
         .filter((item) => item !== null)
         .join("");
-    const fallbackText = `(${intl.formatMessage({ id: "richText.no_fetch" })})`;
-    const noDataLabel = `(${intl.formatMessage({ id: "richText.no_data" })})`;
-    const customPieces = buildCustomTooltipPieces(geoProperties, customConfig, referenceMaps, separators, fallbackText, noDataLabel, tooltipLookup);
+    const customPieces = buildCustomTooltipPieces(geoProperties, customConfig, referenceMaps, separators, buildTooltipLocalizedStrings(intl), tooltipLookup);
     const itemsBody = composeTooltipBody(tooltipItems, customPieces, customConfig?.placement);
     const strokeHtml = showStroke
         ? `<span class="gd-viz-tooltip-stroke" style="border-top-color: ${tooltipStroke}"></span>`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddata/sdk-ui-geo",
-  "version": "11.41.0-alpha.0",
+  "version": "11.41.0-alpha.2",
   "description": "GoodData.UI SDK - Geo Charts",
   "license": "MIT",
   "author": "GoodData Corporation",
@@ -43,12 +43,12 @@
     "ts-invariant": "0.10.3",
     "tslib": "2.8.1",
     "uuid": "11.1.0",
-    "@gooddata/sdk-model": "11.41.0-alpha.0",
-    "@gooddata/sdk-backend-spi": "11.41.0-alpha.0",
-    "@gooddata/sdk-ui": "11.41.0-alpha.0",
-    "@gooddata/sdk-ui-theme-provider": "11.41.0-alpha.0",
-    "@gooddata/sdk-ui-kit": "11.41.0-alpha.0",
-    "@gooddata/sdk-ui-vis-commons": "11.41.0-alpha.0"
+    "@gooddata/sdk-backend-spi": "11.41.0-alpha.2",
+    "@gooddata/sdk-model": "11.41.0-alpha.2",
+    "@gooddata/sdk-ui": "11.41.0-alpha.2",
+    "@gooddata/sdk-ui-theme-provider": "11.41.0-alpha.2",
+    "@gooddata/sdk-ui-kit": "11.41.0-alpha.2",
+    "@gooddata/sdk-ui-vis-commons": "11.41.0-alpha.2"
   },
   "devDependencies": {
     "@microsoft/api-documenter": "^7.17.0",
@@ -91,10 +91,10 @@
     "typescript": "5.9.3",
     "vitest": "4.1.8",
     "vitest-dom": "0.1.1",
-    "@gooddata/eslint-config": "11.41.0-alpha.0",
-    "@gooddata/oxlint-config": "11.41.0-alpha.0",
-    "@gooddata/sdk-backend-mockingbird": "11.41.0-alpha.0",
-    "@gooddata/stylelint-config": "11.41.0-alpha.0"
+    "@gooddata/eslint-config": "11.41.0-alpha.2",
+    "@gooddata/oxlint-config": "11.41.0-alpha.2",
+    "@gooddata/sdk-backend-mockingbird": "11.41.0-alpha.2",
+    "@gooddata/stylelint-config": "11.41.0-alpha.2"
   },
   "peerDependencies": {
     "react": "^18.0.0 || ^19.0.0",