@gooddata/sdk-ui-geo 11.23.0-alpha.4 → 11.23.0
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/components/RenderGeoChart.d.ts.map +1 -1
- package/esm/next/components/RenderGeoChart.js +23 -2
- package/esm/next/components/RenderGeoChart.js.map +1 -1
- package/esm/next/components/multiLayerLegend/GeoChartLegendOverlay.d.ts +4 -1
- package/esm/next/components/multiLayerLegend/GeoChartLegendOverlay.d.ts.map +1 -1
- package/esm/next/components/multiLayerLegend/GeoChartLegendOverlay.js +3 -2
- package/esm/next/components/multiLayerLegend/GeoChartLegendOverlay.js.map +1 -1
- package/esm/next/components/multiLayerLegend/LayerToggleSwitch.d.ts.map +1 -1
- package/esm/next/components/multiLayerLegend/LayerToggleSwitch.js +2 -8
- package/esm/next/components/multiLayerLegend/LayerToggleSwitch.js.map +1 -1
- package/esm/next/components/multiLayerLegend/LegendGroupColor.d.ts +4 -10
- package/esm/next/components/multiLayerLegend/LegendGroupColor.d.ts.map +1 -1
- package/esm/next/components/multiLayerLegend/LegendGroupColor.js +83 -8
- package/esm/next/components/multiLayerLegend/LegendGroupColor.js.map +1 -1
- package/esm/next/components/multiLayerLegend/LegendGroupColorScale.d.ts +13 -0
- package/esm/next/components/multiLayerLegend/LegendGroupColorScale.d.ts.map +1 -1
- package/esm/next/components/multiLayerLegend/LegendGroupColorScale.js +13 -5
- package/esm/next/components/multiLayerLegend/LegendGroupColorScale.js.map +1 -1
- package/esm/next/components/multiLayerLegend/LegendGroupContainer.d.ts +16 -0
- package/esm/next/components/multiLayerLegend/LegendGroupContainer.d.ts.map +1 -0
- package/esm/next/components/multiLayerLegend/LegendGroupContainer.js +16 -0
- package/esm/next/components/multiLayerLegend/LegendGroupContainer.js.map +1 -0
- package/esm/next/components/multiLayerLegend/LegendGroupSize.d.ts +8 -0
- package/esm/next/components/multiLayerLegend/LegendGroupSize.d.ts.map +1 -1
- package/esm/next/components/multiLayerLegend/LegendGroupSize.js +18 -9
- package/esm/next/components/multiLayerLegend/LegendGroupSize.js.map +1 -1
- package/esm/next/components/multiLayerLegend/MultiLayerLegendPanel.d.ts +13 -0
- package/esm/next/components/multiLayerLegend/MultiLayerLegendPanel.d.ts.map +1 -1
- package/esm/next/components/multiLayerLegend/MultiLayerLegendPanel.js +76 -11
- package/esm/next/components/multiLayerLegend/MultiLayerLegendPanel.js.map +1 -1
- package/esm/next/components/multiLayerLegend/MultiLayerLegendSection.d.ts +10 -1
- package/esm/next/components/multiLayerLegend/MultiLayerLegendSection.d.ts.map +1 -1
- package/esm/next/components/multiLayerLegend/MultiLayerLegendSection.js +38 -15
- package/esm/next/components/multiLayerLegend/MultiLayerLegendSection.js.map +1 -1
- package/esm/next/components/multiLayerLegend/legendMessages.d.ts +6 -0
- package/esm/next/components/multiLayerLegend/legendMessages.d.ts.map +1 -0
- package/esm/next/components/multiLayerLegend/legendMessages.js +20 -0
- package/esm/next/components/multiLayerLegend/legendMessages.js.map +1 -0
- package/esm/next/hooks/map/useMapInitialization.d.ts +5 -2
- package/esm/next/hooks/map/useMapInitialization.d.ts.map +1 -1
- package/esm/next/hooks/map/useMapInitialization.js +107 -4
- package/esm/next/hooks/map/useMapInitialization.js.map +1 -1
- package/esm/next/hooks/pushData/useGeoPushData.d.ts +2 -1
- package/esm/next/hooks/pushData/useGeoPushData.d.ts.map +1 -1
- package/esm/next/hooks/pushData/useGeoPushData.js +29 -3
- package/esm/next/hooks/pushData/useGeoPushData.js.map +1 -1
- package/esm/next/layers/common/computeLegend.d.ts.map +1 -1
- package/esm/next/layers/common/computeLegend.js +3 -3
- package/esm/next/layers/common/computeLegend.js.map +1 -1
- package/esm/next/layers/common/mapFacade.d.ts +5 -0
- package/esm/next/layers/common/mapFacade.d.ts.map +1 -1
- package/esm/next/layers/common/mapFacade.js +5 -0
- package/esm/next/layers/common/mapFacade.js.map +1 -1
- package/esm/next/map/MapController.d.ts +4 -1
- package/esm/next/map/MapController.d.ts.map +1 -1
- package/esm/next/map/MapController.js +2 -2
- package/esm/next/map/MapController.js.map +1 -1
- package/esm/next/map/runtime/mapConfig.d.ts +23 -0
- package/esm/next/map/runtime/mapConfig.d.ts.map +1 -1
- package/esm/next/map/runtime/mapConfig.js +24 -0
- package/esm/next/map/runtime/mapConfig.js.map +1 -1
- package/esm/next/map/runtime/mapInitialization.d.ts +8 -1
- package/esm/next/map/runtime/mapInitialization.d.ts.map +1 -1
- package/esm/next/map/runtime/mapInitialization.js +9 -3
- package/esm/next/map/runtime/mapInitialization.js.map +1 -1
- package/esm/next/types/config/areaChart.d.ts +13 -0
- package/esm/next/types/config/areaChart.d.ts.map +1 -1
- package/esm/next/types/config/pushpinChart.d.ts +13 -0
- package/esm/next/types/config/pushpinChart.d.ts.map +1 -1
- package/esm/next/types/config/unified.d.ts +13 -0
- package/esm/next/types/config/unified.d.ts.map +1 -1
- package/esm/next/utils/alphabeticalSorting.d.ts +13 -0
- package/esm/next/utils/alphabeticalSorting.d.ts.map +1 -0
- package/esm/next/utils/alphabeticalSorting.js +22 -0
- package/esm/next/utils/alphabeticalSorting.js.map +1 -0
- package/esm/next/utils/mapCanvasAccessibility.d.ts +31 -0
- package/esm/next/utils/mapCanvasAccessibility.d.ts.map +1 -0
- package/esm/next/utils/mapCanvasAccessibility.js +60 -0
- package/esm/next/utils/mapCanvasAccessibility.js.map +1 -0
- package/esm/sdk-ui-geo.d.ts +39 -0
- package/package.json +11 -11
- package/styles/css/main.css +75 -5
- package/styles/css/main.css.map +1 -1
- package/styles/scss/_geo-multi-layer-legend.scss +91 -4
- package/styles/scss/geo-chart-next.scss +5 -0
- package/styles/scss/main.scss +1 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MultiLayerLegendPanel.d.ts","sourceRoot":"","sources":["../../../../src/next/components/multiLayerLegend/MultiLayerLegendPanel.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MultiLayerLegendPanel.d.ts","sourceRoot":"","sources":["../../../../src/next/components/multiLayerLegend/MultiLayerLegendPanel.tsx"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAEjE,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAElE,OAAO,EACH,KAAK,YAAY,EAGpB,MAAM,6BAA6B,CAAC;AA8GrC;;;;GAIG;AACH,MAAM,WAAW,2BAA2B;IACxC;;OAEG;IACH,KAAK,EAAE,YAAY,CAAC;IAEpB;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;OAEG;IACH,QAAQ,CAAC,EAAE,YAAY,CAAC;IAExB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAE3B;;;OAGG;IACH,uBAAuB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAEpD;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAErD;;OAEG;IACH,8BAA8B,CAAC,EAAE,OAAO,CAAC;IAEzC;;OAEG;IACH,aAAa,CAAC,EAAE,sBAAsB,CAAC;IAEvC;;OAEG;IACH,kBAAkB,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,KAAK,IAAI,CAAC;CACjE;AA2BD,eAAO,MAAM,qBAAqB,mEAwMhC,CAAC"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { jsx as _jsx } from "react/jsx-runtime";
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
// (C) 2025-2026 GoodData Corporation
|
|
3
|
-
import { memo, useCallback, useId, useLayoutEffect, useMemo, useRef, useState, } from "react";
|
|
3
|
+
import { memo, useCallback, useEffect, useId, useLayoutEffect, useMemo, useRef, useState, } from "react";
|
|
4
4
|
import cx from "classnames";
|
|
5
5
|
import { MultiLayerLegendSection } from "./MultiLayerLegendSection.js";
|
|
6
|
+
import { isLegendColorCategoryItem, } from "../../types/legend/model.js";
|
|
6
7
|
// Section header height (matches CSS variable --gd-geo-multi-layer-legend__section-header-height)
|
|
7
8
|
const COLLAPSED_SECTION_HEIGHT = 34;
|
|
8
9
|
// Matches the 10px top + 10px bottom spacing from `_geo-multi-layer-legend.scss`
|
|
@@ -114,32 +115,92 @@ function initializeExpandedState(model) {
|
|
|
114
115
|
* @internal
|
|
115
116
|
*/
|
|
116
117
|
const EMPTY_HIDDEN_LAYERS = new Set();
|
|
117
|
-
export const MultiLayerLegendPanel = memo(function MultiLayerLegendPanel({ model, enabled = true, position = "right", maxHeightPx, hiddenLayers = EMPTY_HIDDEN_LAYERS, onLayerVisibilityChange, onItemClick, }) {
|
|
118
|
+
export const MultiLayerLegendPanel = memo(function MultiLayerLegendPanel({ model, enabled = true, position = "right", maxHeightPx, hiddenLayers = EMPTY_HIDDEN_LAYERS, onLayerVisibilityChange, onItemClick, enableGeoChartA11yImprovements = false, formatMessage, setPanelElementRef, }) {
|
|
118
119
|
const panelId = useId();
|
|
119
120
|
// Render legend sections in reverse order so the first defined layer appears on top.
|
|
120
121
|
// This is purely a presentation concern - underlying layer order stays unchanged.
|
|
121
122
|
const sections = useMemo(() => [...model.sections].reverse(), [model.sections]);
|
|
122
123
|
// Manage expanded/collapsed state for each section
|
|
123
124
|
const [expandedState, setExpandedState] = useState(() => initializeExpandedState(model));
|
|
125
|
+
// Live region announcement for screen readers
|
|
126
|
+
const [announcement, setAnnouncement] = useState("");
|
|
127
|
+
const announcementFrameIdRef = useRef(null);
|
|
128
|
+
// Clear-then-set pattern so screen readers pick up repeated identical messages
|
|
129
|
+
const announce = useCallback((msg) => {
|
|
130
|
+
if (announcementFrameIdRef.current !== null) {
|
|
131
|
+
cancelAnimationFrame(announcementFrameIdRef.current);
|
|
132
|
+
}
|
|
133
|
+
setAnnouncement("");
|
|
134
|
+
announcementFrameIdRef.current = requestAnimationFrame(() => {
|
|
135
|
+
setAnnouncement(msg);
|
|
136
|
+
announcementFrameIdRef.current = null;
|
|
137
|
+
});
|
|
138
|
+
}, []);
|
|
139
|
+
useEffect(() => {
|
|
140
|
+
return () => {
|
|
141
|
+
if (announcementFrameIdRef.current !== null) {
|
|
142
|
+
cancelAnimationFrame(announcementFrameIdRef.current);
|
|
143
|
+
}
|
|
144
|
+
};
|
|
145
|
+
}, []);
|
|
146
|
+
const formatLegendMessage = useCallback((id, values) => {
|
|
147
|
+
return formatMessage?.(id, values) ?? "";
|
|
148
|
+
}, [formatMessage]);
|
|
149
|
+
const layerTitleById = useMemo(() => {
|
|
150
|
+
return Object.fromEntries(model.sections.map((section) => [section.layerId, section.layerTitle]));
|
|
151
|
+
}, [model.sections]);
|
|
124
152
|
// Flexible height management
|
|
125
153
|
const { containerRef, getSectionRef, setSectionRef, containerHeight, flexibleSections } = useFlexibleHeightSections(sections, expandedState);
|
|
154
|
+
const setRootPanelRef = useCallback((element) => {
|
|
155
|
+
containerRef.current = element;
|
|
156
|
+
setPanelElementRef?.(element);
|
|
157
|
+
}, [containerRef, setPanelElementRef]);
|
|
126
158
|
const handleExpandedChange = useCallback((layerId, expanded) => {
|
|
127
159
|
setExpandedState((prev) => ({
|
|
128
160
|
...prev,
|
|
129
161
|
[layerId]: expanded,
|
|
130
162
|
}));
|
|
131
163
|
}, []);
|
|
132
|
-
const
|
|
133
|
-
//
|
|
134
|
-
// When showing a layer, also expand it
|
|
135
|
-
const isCurrentlyHidden = hiddenLayers.has(layerId);
|
|
136
|
-
const willBeVisible = isCurrentlyHidden;
|
|
164
|
+
const syncExpandedStateWithVisibility = useCallback((layerId, visible) => {
|
|
165
|
+
// Keep section expand/collapse in sync with visibility intent from the switch interaction.
|
|
137
166
|
setExpandedState((prev) => ({
|
|
138
167
|
...prev,
|
|
139
|
-
[layerId]:
|
|
168
|
+
[layerId]: visible,
|
|
140
169
|
}));
|
|
170
|
+
}, []);
|
|
171
|
+
const announceLayerVisibilityChange = useCallback((layerId, visible) => {
|
|
172
|
+
if (!enableGeoChartA11yImprovements) {
|
|
173
|
+
return;
|
|
174
|
+
}
|
|
175
|
+
const layerTitle = layerTitleById[layerId] ?? layerId;
|
|
176
|
+
const messageId = visible ? "geochart.legend.layer.shown" : "geochart.legend.layer.hidden";
|
|
177
|
+
announce(formatLegendMessage(messageId, { name: layerTitle }));
|
|
178
|
+
}, [announce, enableGeoChartA11yImprovements, formatLegendMessage, layerTitleById]);
|
|
179
|
+
const handleVisibilityChange = useCallback((layerId, visible) => {
|
|
180
|
+
announceLayerVisibilityChange(layerId, visible);
|
|
181
|
+
syncExpandedStateWithVisibility(layerId, visible);
|
|
141
182
|
onLayerVisibilityChange?.(layerId);
|
|
142
|
-
}, [
|
|
183
|
+
}, [announceLayerVisibilityChange, onLayerVisibilityChange, syncExpandedStateWithVisibility]);
|
|
184
|
+
const handleItemClick = useCallback((layerId, uri) => {
|
|
185
|
+
const section = model.sections.find((s) => s.layerId === layerId);
|
|
186
|
+
if (!section) {
|
|
187
|
+
onItemClick?.(layerId, uri);
|
|
188
|
+
return;
|
|
189
|
+
}
|
|
190
|
+
for (const group of section.groups) {
|
|
191
|
+
for (const item of group.items) {
|
|
192
|
+
if (isLegendColorCategoryItem(item) && item.uri === uri) {
|
|
193
|
+
const messageId = item.isVisible
|
|
194
|
+
? "geochart.legend.item.hidden"
|
|
195
|
+
: "geochart.legend.item.shown";
|
|
196
|
+
announce(formatLegendMessage(messageId, { name: item.label }));
|
|
197
|
+
onItemClick?.(layerId, uri);
|
|
198
|
+
return;
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
onItemClick?.(layerId, uri);
|
|
203
|
+
}, [model.sections, announce, onItemClick, formatLegendMessage]);
|
|
143
204
|
if (!enabled || sections.length === 0) {
|
|
144
205
|
return null;
|
|
145
206
|
}
|
|
@@ -160,6 +221,10 @@ export const MultiLayerLegendPanel = memo(function MultiLayerLegendPanel({ model
|
|
|
160
221
|
...(containerHeight && { height: containerHeight }),
|
|
161
222
|
...(maxHeightPx && { maxHeight: maxHeightPx, overflowY: "auto" }),
|
|
162
223
|
};
|
|
163
|
-
return (
|
|
224
|
+
return (_jsxs("div", { ref: setRootPanelRef, className: panelClassName, style: panelStyle, role: "group", "aria-label": model.title ?? "Map legend", "data-testid": "gd-geo-multi-layer-legend", children: [sections.map((section, index) => (_jsx(MultiLayerLegendSection, { setSectionRef: setSectionRef(section.layerId), sectionElement: getSectionRef(section.layerId), section: section, sectionId: `${panelId}-section-${index}`, isExpanded: expandedState[section.layerId] ?? true, isVisible: !hiddenLayers.has(section.layerId), showToggle: !isSingleLayer, isFlexible: flexibleSections.includes(section.layerId), onExpandedChange: handleExpandedChange, onVisibilityChange: handleVisibilityChange, onItemClick: enableGeoChartA11yImprovements
|
|
225
|
+
? onItemClick
|
|
226
|
+
? handleItemClick
|
|
227
|
+
: undefined
|
|
228
|
+
: onItemClick, enableGeoChartA11yImprovements: enableGeoChartA11yImprovements, formatMessage: formatLegendMessage }, section.layerId))), enableGeoChartA11yImprovements ? (_jsx("div", { "aria-live": "polite", "aria-atomic": "true", className: "sr-only", "data-testid": "gd-geo-legend-live-region", children: announcement })) : null] }));
|
|
164
229
|
});
|
|
165
230
|
//# sourceMappingURL=MultiLayerLegendPanel.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MultiLayerLegendPanel.js","sourceRoot":"","sources":["../../../../src/next/components/multiLayerLegend/MultiLayerLegendPanel.tsx"],"names":[],"mappings":";AAAA,qCAAqC;AAErC,OAAO,EAEH,IAAI,EACJ,WAAW,EACX,KAAK,EACL,eAAe,EACf,OAAO,EACP,MAAM,EACN,QAAQ,GACX,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"MultiLayerLegendPanel.js","sourceRoot":"","sources":["../../../../src/next/components/multiLayerLegend/MultiLayerLegendPanel.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type LegendMessageFormatter } from "./legendMessages.js";
|
|
1
2
|
import { type ILegendSection } from "../../types/legend/model.js";
|
|
2
3
|
/**
|
|
3
4
|
* Props for MultiLayerLegendSection component.
|
|
@@ -50,7 +51,7 @@ export interface IMultiLayerLegendSectionProps {
|
|
|
50
51
|
* Callback when visibility toggle is clicked.
|
|
51
52
|
* Toggles the layer visibility state.
|
|
52
53
|
*/
|
|
53
|
-
onVisibilityChange?: (layerId: string) => void;
|
|
54
|
+
onVisibilityChange?: (layerId: string, visible: boolean) => void;
|
|
54
55
|
/**
|
|
55
56
|
* Callback when a legend item is clicked.
|
|
56
57
|
* Used to toggle individual category items.
|
|
@@ -59,6 +60,14 @@ export interface IMultiLayerLegendSectionProps {
|
|
|
59
60
|
* @param uri - The URI of the clicked item
|
|
60
61
|
*/
|
|
61
62
|
onItemClick?: (layerId: string, uri: string) => void;
|
|
63
|
+
/**
|
|
64
|
+
* Enables enhanced a11y semantics for section header and group content.
|
|
65
|
+
*/
|
|
66
|
+
enableGeoChartA11yImprovements?: boolean;
|
|
67
|
+
/**
|
|
68
|
+
* Optional formatter for accessibility labels/messages.
|
|
69
|
+
*/
|
|
70
|
+
formatMessage?: LegendMessageFormatter;
|
|
62
71
|
}
|
|
63
72
|
/**
|
|
64
73
|
* Multi-layer legend section for a single layer.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MultiLayerLegendSection.d.ts","sourceRoot":"","sources":["../../../../src/next/components/multiLayerLegend/MultiLayerLegendSection.tsx"],"names":[],"mappings":"AAoBA,OAAO,EAAqB,KAAK,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAErF;;;;GAIG;AACH,MAAM,WAAW,6BAA6B;IAC1C;;OAEG;IACH,OAAO,EAAE,cAAc,CAAC;IAExB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;OAGG;IACH,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,KAAK,IAAI,CAAC;IAEzD;;;OAGG;IACH,cAAc,CAAC,EAAE,cAAc,CAAC;IAEhC;;OAEG;IACH,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAC;IAEhE;;;OAGG;IACH,kBAAkB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"MultiLayerLegendSection.d.ts","sourceRoot":"","sources":["../../../../src/next/components/multiLayerLegend/MultiLayerLegendSection.tsx"],"names":[],"mappings":"AAoBA,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAqB,KAAK,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAErF;;;;GAIG;AACH,MAAM,WAAW,6BAA6B;IAC1C;;OAEG;IACH,OAAO,EAAE,cAAc,CAAC;IAExB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;;;OAIG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;OAGG;IACH,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,GAAG,IAAI,KAAK,IAAI,CAAC;IAEzD;;;OAGG;IACH,cAAc,CAAC,EAAE,cAAc,CAAC;IAEhC;;OAEG;IACH,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,KAAK,IAAI,CAAC;IAEhE;;;OAGG;IACH,kBAAkB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;IAEjE;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAErD;;OAEG;IACH,8BAA8B,CAAC,EAAE,OAAO,CAAC;IAEzC;;OAEG;IACH,aAAa,CAAC,EAAE,sBAAsB,CAAC;CAC1C;AAwFD;;;;;;;;GAQG;AACH,eAAO,MAAM,uBAAuB,qEA4PlC,CAAC"}
|
|
@@ -7,17 +7,33 @@ import { LayerToggleSwitch } from "./LayerToggleSwitch.js";
|
|
|
7
7
|
import { LegendGroupColor } from "./LegendGroupColor.js";
|
|
8
8
|
import { LegendGroupColorScale } from "./LegendGroupColorScale.js";
|
|
9
9
|
import { LegendGroupSize } from "./LegendGroupSize.js";
|
|
10
|
+
function getSectionContentAccessibilityState({ enableGeoChartA11yImprovements, isExpanded, isVisible, onItemClick, handleItemClick, }) {
|
|
11
|
+
const isSectionContentAccessible = isExpanded && isVisible;
|
|
12
|
+
const isItemInteractionEnabled = enableGeoChartA11yImprovements ? isSectionContentAccessible : isVisible;
|
|
13
|
+
const itemClickHandler = isItemInteractionEnabled && onItemClick ? handleItemClick : undefined;
|
|
14
|
+
return {
|
|
15
|
+
isSectionContentAccessible,
|
|
16
|
+
itemClickHandler,
|
|
17
|
+
contentA11yProps: enableGeoChartA11yImprovements
|
|
18
|
+
? {
|
|
19
|
+
"aria-hidden": !isSectionContentAccessible || undefined,
|
|
20
|
+
}
|
|
21
|
+
: {
|
|
22
|
+
"aria-disabled": !isVisible,
|
|
23
|
+
},
|
|
24
|
+
};
|
|
25
|
+
}
|
|
10
26
|
/**
|
|
11
27
|
* Renders a legend group based on its kind.
|
|
12
28
|
*/
|
|
13
|
-
function renderGroup(group, groupIndex, onItemClick) {
|
|
29
|
+
function renderGroup(group, groupIndex, isFocusable, enableGeoChartA11yImprovements, formatMessage, onItemClick) {
|
|
14
30
|
switch (group.kind) {
|
|
15
31
|
case "size":
|
|
16
|
-
return _jsx(LegendGroupSize, { group: group }, groupIndex);
|
|
32
|
+
return (_jsx(LegendGroupSize, { group: group, isFocusable: isFocusable, enableGeoChartA11yImprovements: enableGeoChartA11yImprovements }, groupIndex));
|
|
17
33
|
case "color":
|
|
18
|
-
return _jsx(LegendGroupColor, { group: group, onItemClick: onItemClick }, groupIndex);
|
|
34
|
+
return (_jsx(LegendGroupColor, { group: group, onItemClick: onItemClick, enableGeoChartA11yImprovements: enableGeoChartA11yImprovements }, groupIndex));
|
|
19
35
|
case "colorScale":
|
|
20
|
-
return _jsx(LegendGroupColorScale, { group: group }, groupIndex);
|
|
36
|
+
return (_jsx(LegendGroupColorScale, { group: group, isFocusable: isFocusable, enableGeoChartA11yImprovements: enableGeoChartA11yImprovements, formatMessage: formatMessage }, groupIndex));
|
|
21
37
|
default:
|
|
22
38
|
return _jsx(_Fragment, {});
|
|
23
39
|
}
|
|
@@ -31,7 +47,7 @@ function renderGroup(group, groupIndex, onItemClick) {
|
|
|
31
47
|
*
|
|
32
48
|
* @internal
|
|
33
49
|
*/
|
|
34
|
-
export const MultiLayerLegendSection = memo(function MultiLayerLegendSection({ section, sectionId, isExpanded = true, isVisible = true, showToggle = true, isFlexible = false, setSectionRef, sectionElement, onExpandedChange, onVisibilityChange, onItemClick, }) {
|
|
50
|
+
export const MultiLayerLegendSection = memo(function MultiLayerLegendSection({ section, sectionId, isExpanded = true, isVisible = true, showToggle = true, isFlexible = false, setSectionRef, sectionElement, onExpandedChange, onVisibilityChange, onItemClick, enableGeoChartA11yImprovements = false, formatMessage, }) {
|
|
35
51
|
const displayTitle = section.layerTitle;
|
|
36
52
|
const titleId = `${sectionId}-title`;
|
|
37
53
|
const toggleId = `${sectionId}-toggle`;
|
|
@@ -42,9 +58,14 @@ export const MultiLayerLegendSection = memo(function MultiLayerLegendSection({ s
|
|
|
42
58
|
const handleItemClick = useCallback((uri) => {
|
|
43
59
|
onItemClick?.(section.layerId, uri);
|
|
44
60
|
}, [onItemClick, section.layerId]);
|
|
45
|
-
//
|
|
46
|
-
|
|
47
|
-
|
|
61
|
+
// Section content is operable only when expanded + visible.
|
|
62
|
+
const { isSectionContentAccessible, itemClickHandler, contentA11yProps } = getSectionContentAccessibilityState({
|
|
63
|
+
enableGeoChartA11yImprovements,
|
|
64
|
+
isExpanded,
|
|
65
|
+
isVisible,
|
|
66
|
+
onItemClick,
|
|
67
|
+
handleItemClick,
|
|
68
|
+
});
|
|
48
69
|
/**
|
|
49
70
|
* Scroll is enabled only after the expand animation completes.
|
|
50
71
|
* This avoids showing scrollbar during the expand transition and works reliably across browsers
|
|
@@ -110,11 +131,11 @@ export const MultiLayerLegendSection = memo(function MultiLayerLegendSection({ s
|
|
|
110
131
|
const handleExpandClick = () => {
|
|
111
132
|
onExpandedChange?.(section.layerId, !isExpanded);
|
|
112
133
|
};
|
|
113
|
-
// LayerToggleSwitch calls onChange with the new checked value
|
|
114
|
-
const handleVisibilityChange = (
|
|
115
|
-
onVisibilityChange?.(section.layerId);
|
|
134
|
+
// LayerToggleSwitch calls onChange with the new checked value.
|
|
135
|
+
const handleVisibilityChange = (visible) => {
|
|
136
|
+
onVisibilityChange?.(section.layerId, visible);
|
|
116
137
|
};
|
|
117
|
-
const
|
|
138
|
+
const handleLegacyHeaderKeyDown = (event) => {
|
|
118
139
|
if (event.key === "Enter" || event.key === " ") {
|
|
119
140
|
event.preventDefault();
|
|
120
141
|
handleExpandClick();
|
|
@@ -142,9 +163,11 @@ export const MultiLayerLegendSection = memo(function MultiLayerLegendSection({ s
|
|
|
142
163
|
"gd-geo-multi-layer-legend__section--hidden": !isVisible,
|
|
143
164
|
"gd-geo-multi-layer-legend__section--flexible": isFlexible && isExpanded,
|
|
144
165
|
});
|
|
145
|
-
return (_jsxs("div", { className: sectionClassName, role: "group", "aria-labelledby": titleId, "data-testid": `gd-geo-legend-section-${section.layerId}`, onTransitionEnd: handleSectionTransitionEnd, ref: setSectionRef, children: [
|
|
146
|
-
|
|
147
|
-
|
|
166
|
+
return (_jsxs("div", { className: sectionClassName, role: "group", "aria-labelledby": titleId, "data-testid": `gd-geo-legend-section-${section.layerId}`, onTransitionEnd: handleSectionTransitionEnd, ref: setSectionRef, children: [enableGeoChartA11yImprovements ? (_jsxs("div", { className: "gd-geo-multi-layer-legend__section-header", children: [
|
|
167
|
+
_jsxs("button", { type: "button", className: "gd-geo-multi-layer-legend__section-header-btn", onClick: handleExpandClick, "aria-expanded": isExpanded, "aria-controls": `${sectionId}-content`, children: [
|
|
168
|
+
_jsx("span", { className: "gd-geo-multi-layer-legend__section-chevron", children: _jsx(ChevronIcon, { isExpanded: isExpanded }) }), _jsx("span", { id: titleId, className: "gd-geo-multi-layer-legend__section-title", children: displayTitle })
|
|
169
|
+
] }), showToggle ? (_jsx("span", { className: "gd-geo-multi-layer-legend__section-toggle", children: _jsx(LayerToggleSwitch, { id: toggleId, checked: isVisible, onChange: handleVisibilityChange, ariaLabel: `Toggle ${displayTitle} visibility` }) })) : null] })) : (_jsxs("div", { className: "gd-geo-multi-layer-legend__section-header", onClick: handleExpandClick, onKeyDown: handleLegacyHeaderKeyDown, role: "button", tabIndex: 0, "aria-expanded": isExpanded, "aria-controls": `${sectionId}-content`, children: [
|
|
170
|
+
_jsx("span", { className: "gd-geo-multi-layer-legend__section-chevron", children: _jsx(ChevronIcon, { isExpanded: isExpanded }) }), _jsx("span", { id: titleId, className: "gd-geo-multi-layer-legend__section-title", title: displayTitle, children: displayTitle }), showToggle ? (_jsx("span", { className: "gd-geo-multi-layer-legend__section-toggle", onClick: (e) => e.stopPropagation(), onKeyDown: (e) => e.stopPropagation(), children: _jsx(LayerToggleSwitch, { id: toggleId, checked: isVisible, onChange: handleVisibilityChange, ariaLabel: `Toggle ${displayTitle} visibility` }) })) : null] })), _jsx("div", { className: "gd-geo-multi-layer-legend__section-content-wrapper", children: _jsx("div", { id: `${sectionId}-content`, className: "gd-geo-multi-layer-legend__section-content", ...contentA11yProps, children: section.groups.map((group, index) => renderGroup(group, index, isSectionContentAccessible, enableGeoChartA11yImprovements, formatMessage, itemClickHandler)) }) })
|
|
148
171
|
] }));
|
|
149
172
|
});
|
|
150
173
|
//# sourceMappingURL=MultiLayerLegendSection.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MultiLayerLegendSection.js","sourceRoot":"","sources":["../../../../src/next/components/multiLayerLegend/MultiLayerLegendSection.tsx"],"names":[],"mappings":";AAAA,qCAAqC;AAErC,OAAO,EAIH,IAAI,EACJ,WAAW,EACX,SAAS,EACT,MAAM,EACN,QAAQ,GACX,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"MultiLayerLegendSection.js","sourceRoot":"","sources":["../../../../src/next/components/multiLayerLegend/MultiLayerLegendSection.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { type MessageDescriptor } from "react-intl";
|
|
2
|
+
export type LegendMessageId = "geochart.legend.layer.hidden" | "geochart.legend.layer.shown" | "geochart.legend.item.hidden" | "geochart.legend.item.shown" | "geochart.legend.colorScale.label";
|
|
3
|
+
export type LegendMessageValues = Record<string, string | number | undefined>;
|
|
4
|
+
export type LegendMessageFormatter = (id: LegendMessageId, values?: LegendMessageValues) => string;
|
|
5
|
+
export declare const legendMessagesById: Record<LegendMessageId, MessageDescriptor>;
|
|
6
|
+
//# sourceMappingURL=legendMessages.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"legendMessages.d.ts","sourceRoot":"","sources":["../../../../src/next/components/multiLayerLegend/legendMessages.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,iBAAiB,EAAkB,MAAM,YAAY,CAAC;AAEpE,MAAM,MAAM,eAAe,GACrB,8BAA8B,GAC9B,6BAA6B,GAC7B,6BAA6B,GAC7B,4BAA4B,GAC5B,kCAAkC,CAAC;AAEzC,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,CAAC;AAE9E,MAAM,MAAM,sBAAsB,GAAG,CAAC,EAAE,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,mBAAmB,KAAK,MAAM,CAAC;AAEnG,eAAO,MAAM,kBAAkB,EAAE,MAAM,CAAC,eAAe,EAAE,iBAAiB,CAgBxE,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
// (C) 2026 GoodData Corporation
|
|
2
|
+
import { defineMessages } from "react-intl";
|
|
3
|
+
export const legendMessagesById = defineMessages({
|
|
4
|
+
"geochart.legend.layer.hidden": {
|
|
5
|
+
id: "geochart.legend.layer.hidden",
|
|
6
|
+
},
|
|
7
|
+
"geochart.legend.layer.shown": {
|
|
8
|
+
id: "geochart.legend.layer.shown",
|
|
9
|
+
},
|
|
10
|
+
"geochart.legend.item.hidden": {
|
|
11
|
+
id: "geochart.legend.item.hidden",
|
|
12
|
+
},
|
|
13
|
+
"geochart.legend.item.shown": {
|
|
14
|
+
id: "geochart.legend.item.shown",
|
|
15
|
+
},
|
|
16
|
+
"geochart.legend.colorScale.label": {
|
|
17
|
+
id: "geochart.legend.colorScale.label",
|
|
18
|
+
},
|
|
19
|
+
});
|
|
20
|
+
//# sourceMappingURL=legendMessages.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"legendMessages.js","sourceRoot":"","sources":["../../../../src/next/components/multiLayerLegend/legendMessages.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAEhC,OAAO,EAA0B,cAAc,EAAE,MAAM,YAAY,CAAC;AAapE,MAAM,CAAC,MAAM,kBAAkB,GAA+C,cAAc,CAAC;IACzF,8BAA8B,EAAE;QAC5B,EAAE,EAAE,8BAA8B;KACrC;IACD,6BAA6B,EAAE;QAC3B,EAAE,EAAE,6BAA6B;KACpC;IACD,6BAA6B,EAAE;QAC3B,EAAE,EAAE,6BAA6B;KACpC;IACD,4BAA4B,EAAE;QAC1B,EAAE,EAAE,4BAA4B;KACnC;IACD,kCAAkC,EAAE;QAChC,EAAE,EAAE,kCAAkC;KACzC;CACJ,CAAC,CAAC"}
|
|
@@ -45,12 +45,15 @@ export interface IUseMapInitializationResult {
|
|
|
45
45
|
* - Supports cooperative gestures with localized messages
|
|
46
46
|
*
|
|
47
47
|
* @param containerRef - Ref to the map container element
|
|
48
|
-
* @param intl - react-intl instance for translations
|
|
49
48
|
* @param config - Geo configuration (optional)
|
|
50
49
|
* @param initialViewport - Pre-calculated viewport from data (optional)
|
|
50
|
+
* @param backend - Backend used to resolve map style when not provided inline (optional)
|
|
51
|
+
* @param mapInstructionsId - ID of screen-reader-only map instructions element (optional)
|
|
52
|
+
* @param mapCanvasTitle - Optional title used for map canvas accessible name
|
|
53
|
+
* @param legendPanelRef - Optional ref to legend root element rendered by React
|
|
51
54
|
* @returns Map instance, tooltip, ready state, and error
|
|
52
55
|
*
|
|
53
56
|
* @internal
|
|
54
57
|
*/
|
|
55
|
-
export declare function useMapInitialization(containerRef: RefObject<HTMLDivElement | null>, config?: IGeoChartConfig, initialViewport?: Partial<IMapViewport> | null, backend?: IAnalyticalBackend): IUseMapInitializationResult;
|
|
58
|
+
export declare function useMapInitialization(containerRef: RefObject<HTMLDivElement | null>, config?: IGeoChartConfig, initialViewport?: Partial<IMapViewport> | null, backend?: IAnalyticalBackend, mapInstructionsId?: string, mapCanvasTitle?: string, legendPanelRef?: RefObject<HTMLDivElement | null>): IUseMapInitializationResult;
|
|
56
59
|
//# sourceMappingURL=useMapInitialization.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMapInitialization.d.ts","sourceRoot":"","sources":["../../../../src/next/hooks/map/useMapInitialization.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,SAAS,EAAwC,MAAM,OAAO,CAAC;AAI7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,OAAO,EACH,KAAK,UAAU,EACf,KAAK,YAAY,EAKpB,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"useMapInitialization.d.ts","sourceRoot":"","sources":["../../../../src/next/hooks/map/useMapInitialization.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,SAAS,EAAwC,MAAM,OAAO,CAAC;AAI7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,OAAO,EACH,KAAK,UAAU,EACf,KAAK,YAAY,EAKpB,MAAM,kCAAkC,CAAC;AAG1C,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAKhE;;;;GAIG;AACH,MAAM,WAAW,2BAA2B;IACxC;;OAEG;IACH,GAAG,EAAE,UAAU,GAAG,IAAI,CAAC;IAEvB;;OAEG;IACH,OAAO,EAAE,YAAY,GAAG,IAAI,CAAC;IAE7B;;OAEG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,KAAK,EAAE,KAAK,GAAG,IAAI,CAAC;CACvB;AAwED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,oBAAoB,CAChC,YAAY,EAAE,SAAS,CAAC,cAAc,GAAG,IAAI,CAAC,EAC9C,MAAM,CAAC,EAAE,eAAe,EACxB,eAAe,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,IAAI,EAC9C,OAAO,CAAC,EAAE,kBAAkB,EAC5B,iBAAiB,CAAC,EAAE,MAAM,EAC1B,cAAc,CAAC,EAAE,MAAM,EACvB,cAAc,CAAC,EAAE,SAAS,CAAC,cAAc,GAAG,IAAI,CAAC,GAClD,2BAA2B,CA2L7B"}
|
|
@@ -2,7 +2,9 @@
|
|
|
2
2
|
import { useEffect, useMemo, useRef, useState } from "react";
|
|
3
3
|
import { useIntl } from "react-intl";
|
|
4
4
|
import { createMapFacade, createPopupFacade, } from "../../layers/common/mapFacade.js";
|
|
5
|
+
import { resolveMapInteractionOptions } from "../../map/runtime/mapConfig.js";
|
|
5
6
|
import { initializeMapLibreMap } from "../../map/runtime/mapInitialization.js";
|
|
7
|
+
import { getMapCanvasRuntimeCapabilities } from "../../utils/mapCanvasAccessibility.js";
|
|
6
8
|
import { generateMapLibreLocale } from "../../utils/mapLocale.js";
|
|
7
9
|
/**
|
|
8
10
|
* Cleanup map resources
|
|
@@ -20,6 +22,38 @@ function cleanupMapResources(map, tooltip) {
|
|
|
20
22
|
tooltip?.remove();
|
|
21
23
|
map?.remove();
|
|
22
24
|
}
|
|
25
|
+
const MAP_FOCUSABLE_SELECTOR = "a, button, summary, [tabindex]";
|
|
26
|
+
function ensureLegendBeforeMapCanvas(container, canvasContainer, legend) {
|
|
27
|
+
// Keep legend controls before the map canvas in tab order.
|
|
28
|
+
if (legend &&
|
|
29
|
+
canvasContainer &&
|
|
30
|
+
legend.parentElement === container &&
|
|
31
|
+
canvasContainer.parentElement === container &&
|
|
32
|
+
legend.nextElementSibling !== canvasContainer) {
|
|
33
|
+
container.insertBefore(legend, canvasContainer);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
function disableNonLegendTabStops(container, canvas, legend) {
|
|
37
|
+
// Only legend controls and canvas should be in widget tab sequence.
|
|
38
|
+
const focusables = container.querySelectorAll(MAP_FOCUSABLE_SELECTOR);
|
|
39
|
+
focusables.forEach((element) => {
|
|
40
|
+
if (element === canvas) {
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
if (legend?.contains(element)) {
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
46
|
+
if (element.tabIndex !== -1) {
|
|
47
|
+
element.tabIndex = -1;
|
|
48
|
+
}
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
function normalizeMapCanvasA11yDom(container, map, legend) {
|
|
52
|
+
const canvas = map.getCanvas();
|
|
53
|
+
const canvasContainer = map.getCanvasContainer?.() ?? canvas.parentElement;
|
|
54
|
+
ensureLegendBeforeMapCanvas(container, canvasContainer, legend);
|
|
55
|
+
disableNonLegendTabStops(container, canvas, legend);
|
|
56
|
+
}
|
|
23
57
|
/**
|
|
24
58
|
* Initialize map instance
|
|
25
59
|
*
|
|
@@ -39,14 +73,17 @@ function cleanupMapResources(map, tooltip) {
|
|
|
39
73
|
* - Supports cooperative gestures with localized messages
|
|
40
74
|
*
|
|
41
75
|
* @param containerRef - Ref to the map container element
|
|
42
|
-
* @param intl - react-intl instance for translations
|
|
43
76
|
* @param config - Geo configuration (optional)
|
|
44
77
|
* @param initialViewport - Pre-calculated viewport from data (optional)
|
|
78
|
+
* @param backend - Backend used to resolve map style when not provided inline (optional)
|
|
79
|
+
* @param mapInstructionsId - ID of screen-reader-only map instructions element (optional)
|
|
80
|
+
* @param mapCanvasTitle - Optional title used for map canvas accessible name
|
|
81
|
+
* @param legendPanelRef - Optional ref to legend root element rendered by React
|
|
45
82
|
* @returns Map instance, tooltip, ready state, and error
|
|
46
83
|
*
|
|
47
84
|
* @internal
|
|
48
85
|
*/
|
|
49
|
-
export function useMapInitialization(containerRef, config, initialViewport, backend) {
|
|
86
|
+
export function useMapInitialization(containerRef, config, initialViewport, backend, mapInstructionsId, mapCanvasTitle, legendPanelRef) {
|
|
50
87
|
const intl = useIntl();
|
|
51
88
|
const [map, setMap] = useState(null);
|
|
52
89
|
const [tooltip, setTooltip] = useState(null);
|
|
@@ -74,21 +111,28 @@ export function useMapInitialization(containerRef, config, initialViewport, back
|
|
|
74
111
|
}, [cooperativeGestures, intl]);
|
|
75
112
|
const isExportMode = config?.isExportMode ?? false;
|
|
76
113
|
const isViewportFrozen = Boolean(config?.viewport?.frozen);
|
|
114
|
+
const interactionOptions = useMemo(() => resolveMapInteractionOptions({ interactive: !isViewportFrozen }), [isViewportFrozen]);
|
|
77
115
|
const maxZoom = config?.maxZoomLevel;
|
|
78
116
|
const tileset = config?.tileset ?? "default";
|
|
117
|
+
const isGeoChartA11yImprovementsEnabled = config?.enableGeoChartA11yImprovements ?? false;
|
|
118
|
+
const { isKeyboardInteractionEnabled, isKeyboardRotationEnabled } = useMemo(() => getMapCanvasRuntimeCapabilities(config, interactionOptions), [config, interactionOptions]);
|
|
79
119
|
useEffect(() => {
|
|
80
120
|
const container = containerRef.current;
|
|
81
121
|
if (!container) {
|
|
82
122
|
return;
|
|
83
123
|
}
|
|
84
124
|
let isMounted = true;
|
|
125
|
+
let handleFocus = null;
|
|
126
|
+
let handleBlur = null;
|
|
127
|
+
let domA11yObserver = null;
|
|
128
|
+
let isDomA11yObserverActive = false;
|
|
85
129
|
initializeMapLibreMap({
|
|
86
130
|
container,
|
|
87
131
|
bounds: initialViewportRef.current.bounds,
|
|
88
132
|
center: initialViewportRef.current.center,
|
|
89
133
|
zoom: initialViewportRef.current.zoom,
|
|
90
134
|
cooperativeGestures,
|
|
91
|
-
interactive:
|
|
135
|
+
interactive: interactionOptions.interactive,
|
|
92
136
|
preserveDrawingBuffer: isExportMode,
|
|
93
137
|
maxZoom,
|
|
94
138
|
style: config?.mapStyle,
|
|
@@ -98,6 +142,44 @@ export function useMapInitialization(containerRef, config, initialViewport, back
|
|
|
98
142
|
if (isMounted) {
|
|
99
143
|
mapInstanceRef.current = result.map;
|
|
100
144
|
tooltipInstanceRef.current = result.tooltip;
|
|
145
|
+
if (isGeoChartA11yImprovementsEnabled) {
|
|
146
|
+
const canvas = result.map.getCanvas();
|
|
147
|
+
canvas.tabIndex = 0;
|
|
148
|
+
const label = mapCanvasTitle
|
|
149
|
+
? intl.formatMessage({ id: "geochart.map.canvas.label" }, { title: mapCanvasTitle })
|
|
150
|
+
: intl.formatMessage({ id: "geochart.map.canvas.label.fallback" });
|
|
151
|
+
canvas.setAttribute("aria-label", label);
|
|
152
|
+
if (mapInstructionsId) {
|
|
153
|
+
canvas.setAttribute("aria-describedby", mapInstructionsId);
|
|
154
|
+
}
|
|
155
|
+
normalizeMapCanvasA11yDom(container, result.map, legendPanelRef?.current ?? null);
|
|
156
|
+
if (typeof MutationObserver !== "undefined") {
|
|
157
|
+
domA11yObserver = new MutationObserver(() => {
|
|
158
|
+
if (!isMounted ||
|
|
159
|
+
!isDomA11yObserverActive ||
|
|
160
|
+
mapInstanceRef.current !== result.map) {
|
|
161
|
+
return;
|
|
162
|
+
}
|
|
163
|
+
normalizeMapCanvasA11yDom(container, result.map, legendPanelRef?.current ?? null);
|
|
164
|
+
});
|
|
165
|
+
isDomA11yObserverActive = true;
|
|
166
|
+
domA11yObserver.observe(container, { childList: true, subtree: true });
|
|
167
|
+
}
|
|
168
|
+
result.map.keyboard.disable();
|
|
169
|
+
handleFocus = () => {
|
|
170
|
+
if (isKeyboardInteractionEnabled) {
|
|
171
|
+
result.map.keyboard.enable();
|
|
172
|
+
if (!isKeyboardRotationEnabled) {
|
|
173
|
+
result.map.keyboard.disableRotation();
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
};
|
|
177
|
+
handleBlur = () => {
|
|
178
|
+
result.map.keyboard.disable();
|
|
179
|
+
};
|
|
180
|
+
canvas.addEventListener("focus", handleFocus);
|
|
181
|
+
canvas.addEventListener("blur", handleBlur);
|
|
182
|
+
}
|
|
101
183
|
setMap(createMapFacade(result.map));
|
|
102
184
|
setTooltip(createPopupFacade(result.tooltip));
|
|
103
185
|
setIsMapReady(true);
|
|
@@ -115,6 +197,20 @@ export function useMapInitialization(containerRef, config, initialViewport, back
|
|
|
115
197
|
return () => {
|
|
116
198
|
isMounted = false;
|
|
117
199
|
setIsMapReady(false);
|
|
200
|
+
// Clean up a11y focus/blur listeners
|
|
201
|
+
const canvas = mapInstanceRef.current?.getCanvas();
|
|
202
|
+
if (canvas) {
|
|
203
|
+
if (handleFocus) {
|
|
204
|
+
canvas.removeEventListener("focus", handleFocus);
|
|
205
|
+
}
|
|
206
|
+
if (handleBlur) {
|
|
207
|
+
canvas.removeEventListener("blur", handleBlur);
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
isDomA11yObserverActive = false;
|
|
211
|
+
domA11yObserver?.takeRecords();
|
|
212
|
+
domA11yObserver?.disconnect();
|
|
213
|
+
domA11yObserver = null;
|
|
118
214
|
// Clean up resources
|
|
119
215
|
cleanupMapResources(mapInstanceRef.current, tooltipInstanceRef.current);
|
|
120
216
|
mapInstanceRef.current = null;
|
|
@@ -124,12 +220,19 @@ export function useMapInitialization(containerRef, config, initialViewport, back
|
|
|
124
220
|
containerRef,
|
|
125
221
|
config?.mapStyle,
|
|
126
222
|
cooperativeGestures,
|
|
127
|
-
|
|
223
|
+
interactionOptions,
|
|
128
224
|
isExportMode,
|
|
225
|
+
isGeoChartA11yImprovementsEnabled,
|
|
226
|
+
isKeyboardInteractionEnabled,
|
|
227
|
+
isKeyboardRotationEnabled,
|
|
129
228
|
locale,
|
|
130
229
|
backend,
|
|
131
230
|
maxZoom,
|
|
132
231
|
tileset,
|
|
232
|
+
intl,
|
|
233
|
+
mapInstructionsId,
|
|
234
|
+
mapCanvasTitle,
|
|
235
|
+
legendPanelRef,
|
|
133
236
|
]);
|
|
134
237
|
return { map, tooltip, isMapReady, error };
|
|
135
238
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMapInitialization.js","sourceRoot":"","sources":["../../../../src/next/hooks/map/useMapInitialization.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,OAAO,EAAkB,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE7E,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAIrC,OAAO,EAKH,eAAe,EACf,iBAAiB,GACpB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAI/E,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AA6BlE;;;;;;;;;;;GAWG;AACH,SAAS,mBAAmB,CAAC,GAAe,EAAE,OAAqB,EAAQ;IACvE,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,GAAG,EAAE,MAAM,EAAE,CAAC;AAAA,CACjB;AAED
|
|
1
|
+
{"version":3,"file":"useMapInitialization.js","sourceRoot":"","sources":["../../../../src/next/hooks/map/useMapInitialization.ts"],"names":[],"mappings":"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"}
|