@gooddata/sdk-ui-geo 11.24.0-alpha.3 → 11.24.0-alpha.5
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/index.d.ts +1 -1
- package/esm/index.d.ts.map +1 -1
- package/esm/index.js.map +1 -1
- package/esm/internal/index.d.ts +1 -0
- package/esm/internal/index.d.ts.map +1 -1
- package/esm/internal/index.js +1 -0
- package/esm/internal/index.js.map +1 -1
- package/esm/next/hooks/map/useApplyViewportOnConfigChange.d.ts.map +1 -1
- package/esm/next/hooks/map/useApplyViewportOnConfigChange.js +21 -3
- package/esm/next/hooks/map/useApplyViewportOnConfigChange.js.map +1 -1
- package/esm/next/hooks/map/useMapInitialization.d.ts.map +1 -1
- package/esm/next/hooks/map/useMapInitialization.js +140 -60
- package/esm/next/hooks/map/useMapInitialization.js.map +1 -1
- package/esm/next/map/runtime/mapInitialization.d.ts +1 -1
- package/esm/next/map/runtime/mapInitialization.d.ts.map +1 -1
- package/esm/next/map/runtime/mapInitialization.js +39 -2
- package/esm/next/map/runtime/mapInitialization.js.map +1 -1
- package/esm/next/map/viewport/viewportPresets.js +2 -1
- package/esm/next/map/viewport/viewportPresets.js.map +1 -1
- package/esm/next/map/viewport/viewportResolution.d.ts +5 -4
- package/esm/next/map/viewport/viewportResolution.d.ts.map +1 -1
- package/esm/next/map/viewport/viewportResolution.js +21 -7
- package/esm/next/map/viewport/viewportResolution.js.map +1 -1
- package/esm/next/types/config/areaChart.d.ts +12 -0
- package/esm/next/types/config/areaChart.d.ts.map +1 -1
- package/esm/next/types/config/pushpinChart.d.ts +12 -0
- package/esm/next/types/config/pushpinChart.d.ts.map +1 -1
- package/esm/next/types/config/unified.d.ts +12 -0
- package/esm/next/types/config/unified.d.ts.map +1 -1
- package/esm/next/types/config/viewport.d.ts +38 -1
- package/esm/next/types/config/viewport.d.ts.map +1 -1
- package/esm/next/types/config/viewport.js +24 -11
- package/esm/next/types/config/viewport.js.map +1 -1
- package/esm/next/types/map/provider.d.ts +9 -0
- package/esm/next/types/map/provider.d.ts.map +1 -1
- package/esm/next/utils/layerConversion.d.ts.map +1 -1
- package/esm/next/utils/layerConversion.js +5 -1
- package/esm/next/utils/layerConversion.js.map +1 -1
- package/esm/next/utils/mapCanvasAccessibility.d.ts +2 -2
- package/esm/next/utils/mapCanvasAccessibility.d.ts.map +1 -1
- package/esm/next/utils/mapCanvasAccessibility.js +11 -2
- package/esm/next/utils/mapCanvasAccessibility.js.map +1 -1
- package/esm/sdk-ui-geo.d.ts +61 -1
- package/package.json +11 -11
package/esm/index.d.ts
CHANGED
|
@@ -28,7 +28,7 @@ export { createAreaLayer } from "./next/layers/area/layerFactory.js";
|
|
|
28
28
|
export { createPushpinLayer } from "./next/layers/pushpin/layerFactory.js";
|
|
29
29
|
export type { IGeoCommonExecutionProps, IGeoSingleLayerWrapperProps } from "./next/types/props/shared.js";
|
|
30
30
|
export type { IGeoChartLegendConfig } from "./next/types/config/legend.js";
|
|
31
|
-
export { isValidViewportArea, type IGeoChartViewport, type IGeoChartViewportArea, } from "./next/types/config/viewport.js";
|
|
31
|
+
export { isValidViewportArea, type IGeoChartViewportNavigation, type IGeoChartViewport, type IGeoChartViewportArea, } from "./next/types/config/viewport.js";
|
|
32
32
|
export { isValidPushpinSizeOption, type GeoChartPushpinSizeOption, type IGeoChartPointsConfig, } from "./next/types/config/points.js";
|
|
33
33
|
export type { StyleSpecification } from "./next/layers/common/mapFacade.js";
|
|
34
34
|
export { MapboxTokenProvider, useMapboxToken, useMapboxTokenStrict, withMapboxToken, enrichMapboxToken, } from "./core/MapboxTokenProvider.js";
|
package/esm/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;GAUG;AAEH,YAAY,EACR,UAAU,EACV,kBAAkB,EAClB,gBAAgB,EAChB,sBAAsB,EACtB,iBAAiB,EACjB,gBAAgB,EAChB,QAAQ,EACR,iBAAiB,EACjB,gBAAgB,EAChB,eAAe,EACf,eAAe,EACf,YAAY,EACZ,+BAA+B,EAC/B,4CAA4C,EAC5C,2BAA2B,GAC9B,MAAM,eAAe,CAAC;AACvB,YAAY,EACR,yBAAyB,EACzB,sCAAsC,EACtC,6BAA6B,EAC7B,qBAAqB,GACxB,MAAM,2CAA2C,CAAC;AACnD,YAAY,EACR,6BAA6B,EAC7B,UAAU,EACV,gBAAgB,EAChB,mBAAmB,GACtB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAEpF,YAAY,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAElF,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,YAAY,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAC5E,YAAY,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEtE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,YAAY,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AACzG,YAAY,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,YAAY,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAEpE,YAAY,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EACH,cAAc,EACd,iBAAiB,EACjB,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,SAAS,EACd,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,gBAAgB,GACxB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,YAAY,EAAE,wBAAwB,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAE1G,YAAY,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EACH,mBAAmB,EACnB,KAAK,iBAAiB,EACtB,KAAK,qBAAqB,GAC7B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACH,wBAAwB,EACxB,KAAK,yBAAyB,EAC9B,KAAK,qBAAqB,GAC7B,MAAM,+BAA+B,CAAC;AAEvC,YAAY,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAE5E,OAAO,EACH,mBAAmB,EACnB,cAAc,EACd,oBAAoB,EACpB,eAAe,EACf,iBAAiB,GACpB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,YAAY,EACR,mBAAmB,EACnB,kBAAkB,EAClB,qBAAqB,GACxB,MAAM,kCAAkC,CAAC;AAC1C,YAAY,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAClF,YAAY,EAAE,4BAA4B,EAAE,MAAM,2CAA2C,CAAC;AAG9F,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;GAUG;AAEH,YAAY,EACR,UAAU,EACV,kBAAkB,EAClB,gBAAgB,EAChB,sBAAsB,EACtB,iBAAiB,EACjB,gBAAgB,EAChB,QAAQ,EACR,iBAAiB,EACjB,gBAAgB,EAChB,eAAe,EACf,eAAe,EACf,YAAY,EACZ,+BAA+B,EAC/B,4CAA4C,EAC5C,2BAA2B,GAC9B,MAAM,eAAe,CAAC;AACvB,YAAY,EACR,yBAAyB,EACzB,sCAAsC,EACtC,6BAA6B,EAC7B,qBAAqB,GACxB,MAAM,2CAA2C,CAAC;AACnD,YAAY,EACR,6BAA6B,EAC7B,UAAU,EACV,gBAAgB,EAChB,mBAAmB,GACtB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAEpF,YAAY,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAElF,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,YAAY,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAC5E,YAAY,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEtE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,YAAY,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AACzG,YAAY,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,YAAY,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAEpE,YAAY,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EACH,cAAc,EACd,iBAAiB,EACjB,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,SAAS,EACd,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,gBAAgB,GACxB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAC3E,YAAY,EAAE,wBAAwB,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAE1G,YAAY,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EACH,mBAAmB,EACnB,KAAK,2BAA2B,EAChC,KAAK,iBAAiB,EACtB,KAAK,qBAAqB,GAC7B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACH,wBAAwB,EACxB,KAAK,yBAAyB,EAC9B,KAAK,qBAAqB,GAC7B,MAAM,+BAA+B,CAAC;AAEvC,YAAY,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAE5E,OAAO,EACH,mBAAmB,EACnB,cAAc,EACd,oBAAoB,EACpB,eAAe,EACf,iBAAiB,GACpB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,YAAY,EACR,mBAAmB,EACnB,kBAAkB,EAClB,qBAAqB,GACxB,MAAM,kCAAkC,CAAC;AAC1C,YAAY,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAClF,YAAY,EAAE,4BAA4B,EAAE,MAAM,2CAA2C,CAAC;AAG9F,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC"}
|
package/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,qCAAqC;AA6CrC,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAIpF,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAI9C,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAMtD,OAAO,EACH,cAAc,EACd,iBAAiB,GAOpB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAI3E,OAAO,EACH,mBAAmB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,qCAAqC;AA6CrC,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAIpF,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAI9C,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAMtD,OAAO,EACH,cAAc,EACd,iBAAiB,GAOpB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAI3E,OAAO,EACH,mBAAmB,GAItB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACH,wBAAwB,GAG3B,MAAM,+BAA+B,CAAC;AAIvC,OAAO,EACH,mBAAmB,EACnB,cAAc,EACd,oBAAoB,EACpB,eAAe,EACf,iBAAiB,GACpB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAStD,4HAA4H;AAC5H,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC"}
|
package/esm/internal/index.d.ts
CHANGED
|
@@ -13,4 +13,5 @@ export type { ICoreGeoChartProps } from "../next/types/props/geoChart/internal.j
|
|
|
13
13
|
export { AREA_LAYER_ID } from "../next/layers/area/layerFactory.js";
|
|
14
14
|
export { PUSHPIN_LAYER_ID } from "../next/layers/pushpin/layerFactory.js";
|
|
15
15
|
export { GEO_LAYER_TYPES, insightLayerToGeoLayer, insightLayersToGeoLayers, geoLayerToInsightLayer, geoLayersToInsightLayers, } from "../next/utils/layerConversion.js";
|
|
16
|
+
export { isConcreteViewportPreset } from "../next/types/config/viewport.js";
|
|
16
17
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/internal/index.ts"],"names":[],"mappings":"AAIA;;;;;;;GAOG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AACtF,YAAY,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAClF,YAAY,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EACH,eAAe,EACf,sBAAsB,EACtB,wBAAwB,EACxB,sBAAsB,EACtB,wBAAwB,GAC3B,MAAM,kCAAkC,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/internal/index.ts"],"names":[],"mappings":"AAIA;;;;;;;GAOG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AACtF,YAAY,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAClF,YAAY,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EACH,eAAe,EACf,sBAAsB,EACtB,wBAAwB,EACxB,sBAAsB,EACtB,wBAAwB,GAC3B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC"}
|
package/esm/internal/index.js
CHANGED
|
@@ -13,4 +13,5 @@ export { buildLayerExecution } from "../next/layers/execution/buildLayerExecutio
|
|
|
13
13
|
export { AREA_LAYER_ID } from "../next/layers/area/layerFactory.js";
|
|
14
14
|
export { PUSHPIN_LAYER_ID } from "../next/layers/pushpin/layerFactory.js";
|
|
15
15
|
export { GEO_LAYER_TYPES, insightLayerToGeoLayer, insightLayersToGeoLayers, geoLayerToInsightLayer, geoLayersToInsightLayers, } from "../next/utils/layerConversion.js";
|
|
16
|
+
export { isConcreteViewportPreset } from "../next/types/config/viewport.js";
|
|
16
17
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/internal/index.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAEhC,oDAAoD;AAEpD;;;;;;;GAOG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAGtF,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EACH,eAAe,EACf,sBAAsB,EACtB,wBAAwB,EACxB,sBAAsB,EACtB,wBAAwB,GAC3B,MAAM,kCAAkC,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/internal/index.ts"],"names":[],"mappings":"AAAA,gCAAgC;AAEhC,oDAAoD;AAEpD;;;;;;;GAOG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iDAAiD,CAAC;AAGtF,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC1E,OAAO,EACH,eAAe,EACf,sBAAsB,EACtB,wBAAwB,EACxB,sBAAsB,EACtB,wBAAwB,GAC3B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useApplyViewportOnConfigChange.d.ts","sourceRoot":"","sources":["../../../../src/next/hooks/map/useApplyViewportOnConfigChange.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAGnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGhE;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,8BAA8B,CAC1C,GAAG,EAAE,UAAU,GAAG,IAAI,EACtB,UAAU,EAAE,OAAO,EACnB,MAAM,EAAE,eAAe,GAAG,SAAS,EACnC,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,IAAI,GAC3C,IAAI,
|
|
1
|
+
{"version":3,"file":"useApplyViewportOnConfigChange.d.ts","sourceRoot":"","sources":["../../../../src/next/hooks/map/useApplyViewportOnConfigChange.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAGnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGhE;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,8BAA8B,CAC1C,GAAG,EAAE,UAAU,GAAG,IAAI,EACtB,UAAU,EAAE,OAAO,EACnB,MAAM,EAAE,eAAe,GAAG,SAAS,EACnC,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,IAAI,GAC3C,IAAI,CAgDN"}
|
|
@@ -20,7 +20,25 @@ import { prefersReducedMotion } from "../../utils/prefersReducedMotion.js";
|
|
|
20
20
|
* @internal
|
|
21
21
|
*/
|
|
22
22
|
export function useApplyViewportOnConfigChange(map, isMapReady, config, dataViewport) {
|
|
23
|
-
const
|
|
23
|
+
const hasConfig = config !== undefined;
|
|
24
|
+
const center = config?.center;
|
|
25
|
+
const zoom = config?.zoom;
|
|
26
|
+
const applyViewportNavigation = config?.applyViewportNavigation;
|
|
27
|
+
const area = config?.viewport?.area;
|
|
28
|
+
const viewportConfig = useMemo(() => {
|
|
29
|
+
if (!hasConfig) {
|
|
30
|
+
return undefined;
|
|
31
|
+
}
|
|
32
|
+
return {
|
|
33
|
+
center,
|
|
34
|
+
zoom,
|
|
35
|
+
applyViewportNavigation,
|
|
36
|
+
viewport: {
|
|
37
|
+
area,
|
|
38
|
+
},
|
|
39
|
+
};
|
|
40
|
+
}, [hasConfig, center, zoom, applyViewportNavigation, area]);
|
|
41
|
+
const configKey = useMemo(() => getViewportConfigKey(viewportConfig), [viewportConfig]);
|
|
24
42
|
const previousConfigKeyRef = useRef(null);
|
|
25
43
|
useEffect(() => {
|
|
26
44
|
if (!map || !isMapReady) {
|
|
@@ -35,11 +53,11 @@ export function useApplyViewportOnConfigChange(map, isMapReady, config, dataView
|
|
|
35
53
|
if (previousKey === configKey) {
|
|
36
54
|
return;
|
|
37
55
|
}
|
|
38
|
-
const viewportToApply = computeViewportFromConfig(
|
|
56
|
+
const viewportToApply = computeViewportFromConfig(viewportConfig, dataViewport);
|
|
39
57
|
if (!viewportToApply) {
|
|
40
58
|
return;
|
|
41
59
|
}
|
|
42
60
|
applyViewport(map, viewportToApply, !prefersReducedMotion());
|
|
43
|
-
}, [map, isMapReady, configKey,
|
|
61
|
+
}, [map, isMapReady, configKey, viewportConfig, dataViewport]);
|
|
44
62
|
}
|
|
45
63
|
//# sourceMappingURL=useApplyViewportOnConfigChange.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useApplyViewportOnConfigChange.js","sourceRoot":"","sources":["../../../../src/next/hooks/map/useApplyViewportOnConfigChange.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAGnD,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAC1E,OAAO,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAG3G,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,8BAA8B,CAC1C,GAAsB,EACtB,UAAmB,EACnB,MAAmC,EACnC,YAA0C,EACtC;IACJ,MAAM,SAAS,GAAG,
|
|
1
|
+
{"version":3,"file":"useApplyViewportOnConfigChange.js","sourceRoot":"","sources":["../../../../src/next/hooks/map/useApplyViewportOnConfigChange.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAErC,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAGnD,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAC1E,OAAO,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAG3G,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,8BAA8B,CAC1C,GAAsB,EACtB,UAAmB,EACnB,MAAmC,EACnC,YAA0C,EACtC;IACJ,MAAM,SAAS,GAAG,MAAM,KAAK,SAAS,CAAC;IACvC,MAAM,MAAM,GAAG,MAAM,EAAE,MAAM,CAAC;IAC9B,MAAM,IAAI,GAAG,MAAM,EAAE,IAAI,CAAC;IAC1B,MAAM,uBAAuB,GAAG,MAAM,EAAE,uBAAuB,CAAC;IAChE,MAAM,IAAI,GAAG,MAAM,EAAE,QAAQ,EAAE,IAAI,CAAC;IAEpC,MAAM,cAAc,GAAG,OAAO,CAA8B,GAAG,EAAE,CAAC;QAC9D,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,OAAO,SAAS,CAAC;QACrB,CAAC;QAED,OAAO;YACH,MAAM;YACN,IAAI;YACJ,uBAAuB;YACvB,QAAQ,EAAE;gBACN,IAAI;aACP;SACJ,CAAC;IAAA,CACL,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,uBAAuB,EAAE,IAAI,CAAC,CAAC,CAAC;IAE7D,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,oBAAoB,CAAC,cAAc,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;IACxF,MAAM,oBAAoB,GAAG,MAAM,CAAgB,IAAI,CAAC,CAAC;IAEzD,SAAS,CAAC,GAAG,EAAE,CAAC;QACZ,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YACtB,OAAO;QACX,CAAC;QAED,MAAM,WAAW,GAAG,oBAAoB,CAAC,OAAO,CAAC;QACjD,oBAAoB,CAAC,OAAO,GAAG,SAAS,CAAC;QAEzC,6EAA6E;QAC7E,IAAI,WAAW,KAAK,IAAI,EAAE,CAAC;YACvB,OAAO;QACX,CAAC;QAED,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC5B,OAAO;QACX,CAAC;QAED,MAAM,eAAe,GAAG,yBAAyB,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;QAChF,IAAI,CAAC,eAAe,EAAE,CAAC;YACnB,OAAO;QACX,CAAC;QACD,aAAa,CAAC,GAAG,EAAE,eAAe,EAAE,CAAC,oBAAoB,EAAE,CAAC,CAAC;IAAA,CAChE,EAAE,CAAC,GAAG,EAAE,UAAU,EAAE,SAAS,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC;AAAA,CAClE"}
|
|
@@ -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;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;
|
|
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;AAsOD;;;;;;;;;;;;;;;;;;;;;;;;;;;;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,CAsK7B"}
|
|
@@ -6,6 +6,24 @@ import { resolveMapInteractionOptions } from "../../map/runtime/mapConfig.js";
|
|
|
6
6
|
import { initializeMapLibreMap } from "../../map/runtime/mapInitialization.js";
|
|
7
7
|
import { getMapCanvasRuntimeCapabilities } from "../../utils/mapCanvasAccessibility.js";
|
|
8
8
|
import { generateMapLibreLocale } from "../../utils/mapLocale.js";
|
|
9
|
+
const ZOOM_IN_KEYS = new Set(["=", "+", "Add"]);
|
|
10
|
+
const ZOOM_OUT_KEYS = new Set(["-", "_", "Subtract"]);
|
|
11
|
+
const PAN_KEYS = new Set(["ArrowLeft", "ArrowRight", "ArrowUp", "ArrowDown"]);
|
|
12
|
+
function isKeyboardZoomKey(event) {
|
|
13
|
+
return ZOOM_IN_KEYS.has(event.key) || ZOOM_OUT_KEYS.has(event.key);
|
|
14
|
+
}
|
|
15
|
+
function isKeyboardPanKey(event) {
|
|
16
|
+
// Shift + arrows is used by MapLibre for rotation/pitch, not pan.
|
|
17
|
+
return !event.shiftKey && PAN_KEYS.has(event.key);
|
|
18
|
+
}
|
|
19
|
+
function resolveInitialNavigationConfig(applyViewportNavigation, pan, zoom) {
|
|
20
|
+
const shouldApplyViewportNavigation = applyViewportNavigation ?? true;
|
|
21
|
+
return {
|
|
22
|
+
applyViewportNavigation: shouldApplyViewportNavigation,
|
|
23
|
+
pan: shouldApplyViewportNavigation ? (pan ?? true) : true,
|
|
24
|
+
zoom: shouldApplyViewportNavigation ? (zoom ?? true) : true,
|
|
25
|
+
};
|
|
26
|
+
}
|
|
9
27
|
/**
|
|
10
28
|
* Cleanup map resources
|
|
11
29
|
*
|
|
@@ -54,6 +72,84 @@ function normalizeMapCanvasA11yDom(container, map, legend) {
|
|
|
54
72
|
ensureLegendBeforeMapCanvas(container, canvasContainer, legend);
|
|
55
73
|
disableNonLegendTabStops(container, canvas, legend);
|
|
56
74
|
}
|
|
75
|
+
function setupMapA11y(params) {
|
|
76
|
+
const { container, map, mapInstanceRef, legendPanelRef, mapCanvasTitle, mapInstructionsId, intl, isKeyboardInteractionEnabled, isKeyboardRotationEnabled, isKeyboardPanEnabled, isKeyboardZoomEnabled, isMountedRef, } = params;
|
|
77
|
+
const canvas = map.getCanvas();
|
|
78
|
+
canvas.tabIndex = 0;
|
|
79
|
+
const label = mapCanvasTitle
|
|
80
|
+
? intl.formatMessage({ id: "geochart.map.canvas.label" }, { title: mapCanvasTitle })
|
|
81
|
+
: intl.formatMessage({ id: "geochart.map.canvas.label.fallback" });
|
|
82
|
+
canvas.setAttribute("aria-label", label);
|
|
83
|
+
if (mapInstructionsId) {
|
|
84
|
+
canvas.setAttribute("aria-describedby", mapInstructionsId);
|
|
85
|
+
}
|
|
86
|
+
normalizeMapCanvasA11yDom(container, map, legendPanelRef?.current ?? null);
|
|
87
|
+
let isDomA11yObserverActive = false;
|
|
88
|
+
let observer = null;
|
|
89
|
+
if (typeof MutationObserver !== "undefined") {
|
|
90
|
+
observer = new MutationObserver(() => {
|
|
91
|
+
if (!isMountedRef.current || !isDomA11yObserverActive || mapInstanceRef.current !== map) {
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
94
|
+
normalizeMapCanvasA11yDom(container, map, legendPanelRef?.current ?? null);
|
|
95
|
+
});
|
|
96
|
+
isDomA11yObserverActive = true;
|
|
97
|
+
observer.observe(container, { childList: true, subtree: true });
|
|
98
|
+
}
|
|
99
|
+
map.keyboard.disable();
|
|
100
|
+
const handleFocus = () => {
|
|
101
|
+
if (isKeyboardInteractionEnabled) {
|
|
102
|
+
map.keyboard.enable();
|
|
103
|
+
if (!isKeyboardRotationEnabled) {
|
|
104
|
+
map.keyboard.disableRotation();
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
};
|
|
108
|
+
const handleBlur = () => {
|
|
109
|
+
map.keyboard.disable();
|
|
110
|
+
};
|
|
111
|
+
const handleKeyDown = (event) => {
|
|
112
|
+
if (event.altKey || event.ctrlKey || event.metaKey) {
|
|
113
|
+
return;
|
|
114
|
+
}
|
|
115
|
+
const shouldBlockPan = !isKeyboardPanEnabled && isKeyboardPanKey(event);
|
|
116
|
+
const shouldBlockZoom = !isKeyboardZoomEnabled && isKeyboardZoomKey(event);
|
|
117
|
+
if (!shouldBlockPan && !shouldBlockZoom) {
|
|
118
|
+
return;
|
|
119
|
+
}
|
|
120
|
+
event.preventDefault();
|
|
121
|
+
event.stopPropagation();
|
|
122
|
+
event.stopImmediatePropagation();
|
|
123
|
+
};
|
|
124
|
+
canvas.addEventListener("focus", handleFocus);
|
|
125
|
+
canvas.addEventListener("blur", handleBlur);
|
|
126
|
+
canvas.addEventListener("keydown", handleKeyDown, true);
|
|
127
|
+
return {
|
|
128
|
+
handleFocus,
|
|
129
|
+
handleBlur,
|
|
130
|
+
handleKeyDown,
|
|
131
|
+
observer,
|
|
132
|
+
setObserverActive: (active) => {
|
|
133
|
+
isDomA11yObserverActive = active;
|
|
134
|
+
},
|
|
135
|
+
};
|
|
136
|
+
}
|
|
137
|
+
function cleanupMapA11y(canvas, a11ySetup) {
|
|
138
|
+
if (canvas && a11ySetup) {
|
|
139
|
+
if (a11ySetup.handleFocus) {
|
|
140
|
+
canvas.removeEventListener("focus", a11ySetup.handleFocus);
|
|
141
|
+
}
|
|
142
|
+
if (a11ySetup.handleBlur) {
|
|
143
|
+
canvas.removeEventListener("blur", a11ySetup.handleBlur);
|
|
144
|
+
}
|
|
145
|
+
if (a11ySetup.handleKeyDown) {
|
|
146
|
+
canvas.removeEventListener("keydown", a11ySetup.handleKeyDown, true);
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
a11ySetup?.setObserverActive(false);
|
|
150
|
+
a11ySetup?.observer?.takeRecords();
|
|
151
|
+
a11ySetup?.observer?.disconnect();
|
|
152
|
+
}
|
|
57
153
|
/**
|
|
58
154
|
* Initialize map instance
|
|
59
155
|
*
|
|
@@ -89,6 +185,11 @@ export function useMapInitialization(containerRef, config, initialViewport, back
|
|
|
89
185
|
const [tooltip, setTooltip] = useState(null);
|
|
90
186
|
const [isMapReady, setIsMapReady] = useState(false);
|
|
91
187
|
const [error, setError] = useState(null);
|
|
188
|
+
const isViewportConfigEnabled = config?.enableGeoChartsViewportConfig ?? false;
|
|
189
|
+
const applyViewportNavigation = config?.applyViewportNavigation;
|
|
190
|
+
const shouldApplyViewportNavigation = applyViewportNavigation ?? true;
|
|
191
|
+
const panNavigation = shouldApplyViewportNavigation ? config?.viewport?.navigation?.pan : undefined;
|
|
192
|
+
const zoomNavigation = shouldApplyViewportNavigation ? config?.viewport?.navigation?.zoom : undefined;
|
|
92
193
|
const mapInstanceRef = useRef(null);
|
|
93
194
|
const tooltipInstanceRef = useRef(null);
|
|
94
195
|
const initialViewportRef = useRef({
|
|
@@ -96,6 +197,7 @@ export function useMapInitialization(containerRef, config, initialViewport, back
|
|
|
96
197
|
zoom: initialViewport?.zoom ?? config?.zoom,
|
|
97
198
|
bounds: initialViewport?.bounds,
|
|
98
199
|
});
|
|
200
|
+
const navigationConfig = useMemo(() => resolveInitialNavigationConfig(applyViewportNavigation, panNavigation, zoomNavigation), [applyViewportNavigation, panNavigation, zoomNavigation]);
|
|
99
201
|
useEffect(() => {
|
|
100
202
|
if (!mapInstanceRef.current) {
|
|
101
203
|
initialViewportRef.current = {
|
|
@@ -115,17 +217,20 @@ export function useMapInitialization(containerRef, config, initialViewport, back
|
|
|
115
217
|
const maxZoom = config?.maxZoomLevel;
|
|
116
218
|
const tileset = config?.tileset ?? "default";
|
|
117
219
|
const isGeoChartA11yImprovementsEnabled = config?.enableGeoChartA11yImprovements ?? false;
|
|
118
|
-
const { isKeyboardInteractionEnabled, isKeyboardRotationEnabled } = useMemo(() => getMapCanvasRuntimeCapabilities(
|
|
220
|
+
const { isKeyboardInteractionEnabled, isKeyboardRotationEnabled } = useMemo(() => getMapCanvasRuntimeCapabilities({
|
|
221
|
+
viewport: {
|
|
222
|
+
frozen: isViewportFrozen,
|
|
223
|
+
},
|
|
224
|
+
}, interactionOptions), [isViewportFrozen, interactionOptions]);
|
|
225
|
+
const isKeyboardPanEnabled = !navigationConfig.applyViewportNavigation || navigationConfig.pan;
|
|
226
|
+
const isKeyboardZoomEnabled = !navigationConfig.applyViewportNavigation || navigationConfig.zoom;
|
|
119
227
|
useEffect(() => {
|
|
120
228
|
const container = containerRef.current;
|
|
121
229
|
if (!container) {
|
|
122
230
|
return;
|
|
123
231
|
}
|
|
124
|
-
|
|
125
|
-
let
|
|
126
|
-
let handleBlur = null;
|
|
127
|
-
let domA11yObserver = null;
|
|
128
|
-
let isDomA11yObserverActive = false;
|
|
232
|
+
const isMountedRef = { current: true };
|
|
233
|
+
let a11ySetup = null;
|
|
129
234
|
initializeMapLibreMap({
|
|
130
235
|
container,
|
|
131
236
|
bounds: initialViewportRef.current.bounds,
|
|
@@ -133,52 +238,37 @@ export function useMapInitialization(containerRef, config, initialViewport, back
|
|
|
133
238
|
zoom: initialViewportRef.current.zoom,
|
|
134
239
|
cooperativeGestures,
|
|
135
240
|
interactive: interactionOptions.interactive,
|
|
241
|
+
enableGeoChartsViewportConfig: isViewportConfigEnabled,
|
|
242
|
+
navigation: navigationConfig.applyViewportNavigation
|
|
243
|
+
? {
|
|
244
|
+
pan: navigationConfig.pan,
|
|
245
|
+
zoom: navigationConfig.zoom,
|
|
246
|
+
}
|
|
247
|
+
: undefined,
|
|
136
248
|
preserveDrawingBuffer: isExportMode,
|
|
137
249
|
maxZoom,
|
|
138
250
|
style: config?.mapStyle,
|
|
139
251
|
tileset,
|
|
140
252
|
}, locale, backend)
|
|
141
253
|
.then((result) => {
|
|
142
|
-
if (
|
|
254
|
+
if (isMountedRef.current) {
|
|
143
255
|
mapInstanceRef.current = result.map;
|
|
144
256
|
tooltipInstanceRef.current = result.tooltip;
|
|
145
257
|
if (isGeoChartA11yImprovementsEnabled) {
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
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);
|
|
258
|
+
a11ySetup = setupMapA11y({
|
|
259
|
+
container,
|
|
260
|
+
map: result.map,
|
|
261
|
+
mapInstanceRef,
|
|
262
|
+
legendPanelRef,
|
|
263
|
+
mapCanvasTitle,
|
|
264
|
+
mapInstructionsId,
|
|
265
|
+
intl,
|
|
266
|
+
isKeyboardInteractionEnabled,
|
|
267
|
+
isKeyboardRotationEnabled,
|
|
268
|
+
isKeyboardPanEnabled,
|
|
269
|
+
isKeyboardZoomEnabled,
|
|
270
|
+
isMountedRef,
|
|
271
|
+
});
|
|
182
272
|
}
|
|
183
273
|
setMap(createMapFacade(result.map));
|
|
184
274
|
setTooltip(createPopupFacade(result.tooltip));
|
|
@@ -189,29 +279,15 @@ export function useMapInitialization(containerRef, config, initialViewport, back
|
|
|
189
279
|
}
|
|
190
280
|
})
|
|
191
281
|
.catch((err) => {
|
|
192
|
-
if (
|
|
282
|
+
if (isMountedRef.current) {
|
|
193
283
|
console.error("[useMapInitialization] Failed to initialize map:", err);
|
|
194
284
|
setError(err);
|
|
195
285
|
}
|
|
196
286
|
});
|
|
197
287
|
return () => {
|
|
198
|
-
|
|
288
|
+
isMountedRef.current = false;
|
|
199
289
|
setIsMapReady(false);
|
|
200
|
-
|
|
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;
|
|
214
|
-
// Clean up resources
|
|
290
|
+
cleanupMapA11y(mapInstanceRef.current?.getCanvas(), a11ySetup);
|
|
215
291
|
cleanupMapResources(mapInstanceRef.current, tooltipInstanceRef.current);
|
|
216
292
|
mapInstanceRef.current = null;
|
|
217
293
|
tooltipInstanceRef.current = null;
|
|
@@ -221,9 +297,13 @@ export function useMapInitialization(containerRef, config, initialViewport, back
|
|
|
221
297
|
config?.mapStyle,
|
|
222
298
|
cooperativeGestures,
|
|
223
299
|
interactionOptions,
|
|
300
|
+
isViewportConfigEnabled,
|
|
301
|
+
navigationConfig,
|
|
224
302
|
isExportMode,
|
|
225
303
|
isGeoChartA11yImprovementsEnabled,
|
|
226
304
|
isKeyboardInteractionEnabled,
|
|
305
|
+
isKeyboardPanEnabled,
|
|
306
|
+
isKeyboardZoomEnabled,
|
|
227
307
|
isKeyboardRotationEnabled,
|
|
228
308
|
locale,
|
|
229
309
|
backend,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMapInitialization.js","sourceRoot":"","sources":["../../../../src/next/hooks/map/useMapInitialization.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"useMapInitialization.js","sourceRoot":"","sources":["../../../../src/next/hooks/map/useMapInitialization.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,6 +33,6 @@ interface IMapInitializationOptions extends IMapOptions {
|
|
|
33
33
|
*
|
|
34
34
|
* @internal
|
|
35
35
|
*/
|
|
36
|
-
export declare function initializeMapLibreMap({ container, center, zoom, bounds, interactive, dragRotate, pitchWithRotate, touchZoomRotate, preserveDrawingBuffer, cooperativeGestures, maxZoom, style, tileset }: IMapInitializationOptions, locale?: IMapLibreLocale, backend?: IAnalyticalBackend): Promise<IMapInitResult>;
|
|
36
|
+
export declare function initializeMapLibreMap({ container, center, zoom, bounds, interactive, dragRotate, pitchWithRotate, touchZoomRotate, navigation, enableGeoChartsViewportConfig, preserveDrawingBuffer, cooperativeGestures, maxZoom, style, tileset }: IMapInitializationOptions, locale?: IMapLibreLocale, backend?: IAnalyticalBackend): Promise<IMapInitResult>;
|
|
37
37
|
export {};
|
|
38
38
|
//# sourceMappingURL=mapInitialization.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapInitialization.d.ts","sourceRoot":"","sources":["../../../../src/next/map/runtime/mapInitialization.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,OAAO,EAGH,KAAK,sBAAsB,EAE9B,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAGR,GAAG,IAAI,WAAW,EAElB,KAAK,EACR,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"mapInitialization.d.ts","sourceRoot":"","sources":["../../../../src/next/map/runtime/mapInitialization.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,OAAO,EAGH,KAAK,sBAAsB,EAE9B,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAGR,GAAG,IAAI,WAAW,EAElB,KAAK,EACR,MAAM,kCAAkC,CAAC;AAE1C,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAGhE;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC3B,GAAG,EAAE,WAAW,CAAC;IACjB,OAAO,EAAE,KAAK,CAAC;IAEf,UAAU,EAAE,cAAc,aAAa,CAAC,CAAC;CAC5C;AAED,UAAU,yBAA0B,SAAQ,WAAW;IACnD,UAAU,CAAC,EAAE,sBAAsB,CAAC,YAAY,CAAC,CAAC;IAClD,eAAe,CAAC,EAAE,sBAAsB,CAAC,iBAAiB,CAAC,CAAC;IAC5D,eAAe,CAAC,EAAE,sBAAsB,CAAC,iBAAiB,CAAC,CAAC;CAC/D;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,qBAAqB,CACvC,EACI,SAAS,EACT,MAAM,EACN,IAAI,EACJ,MAAM,EACN,WAAkB,EAClB,UAAU,EACV,eAAe,EACf,eAAe,EACf,UAAU,EACV,6BAAqC,EACrC,qBAA6B,EAC7B,mBAA0B,EAC1B,OAAO,EACP,KAAK,EACL,OAAO,EACV,EAAE,yBAAyB,EAC5B,MAAM,CAAC,EAAE,eAAe,EACxB,OAAO,CAAC,EAAE,kBAAkB,GAC7B,OAAO,CAAC,cAAc,CAAC,CAmGzB"}
|
|
@@ -16,7 +16,7 @@ import { fetchMapStyle } from "../style/styleEndpoint.js";
|
|
|
16
16
|
*
|
|
17
17
|
* @internal
|
|
18
18
|
*/
|
|
19
|
-
export async function initializeMapLibreMap({ container, center, zoom, bounds, interactive = true, dragRotate, pitchWithRotate, touchZoomRotate, preserveDrawingBuffer = false, cooperativeGestures = true, maxZoom, style, tileset, }, locale, backend) {
|
|
19
|
+
export async function initializeMapLibreMap({ container, center, zoom, bounds, interactive = true, dragRotate, pitchWithRotate, touchZoomRotate, navigation, enableGeoChartsViewportConfig = false, preserveDrawingBuffer = false, cooperativeGestures = true, maxZoom, style, tileset, }, locale, backend) {
|
|
20
20
|
const maplibregl = await import("maplibre-gl");
|
|
21
21
|
const styleSpecification = style ?? (backend ? await fetchMapStyle(backend, tileset) : undefined);
|
|
22
22
|
if (!styleSpecification) {
|
|
@@ -33,6 +33,7 @@ export async function initializeMapLibreMap({ container, center, zoom, bounds, i
|
|
|
33
33
|
...interactionOptions,
|
|
34
34
|
style: styleSpecification,
|
|
35
35
|
container,
|
|
36
|
+
...getNavigationOptions(navigation, interactionOptions),
|
|
36
37
|
cooperativeGestures,
|
|
37
38
|
preserveDrawingBuffer,
|
|
38
39
|
...(cooperativeGestures && locale ? { locale } : {}),
|
|
@@ -53,11 +54,20 @@ export async function initializeMapLibreMap({ container, center, zoom, bounds, i
|
|
|
53
54
|
else if (center) {
|
|
54
55
|
const mapCenter = [center.lng, center.lat];
|
|
55
56
|
mapOptions.center = mapCenter;
|
|
57
|
+
if (enableGeoChartsViewportConfig && typeof zoom === "number") {
|
|
58
|
+
mapOptions.zoom = zoom;
|
|
59
|
+
}
|
|
56
60
|
}
|
|
57
|
-
else if (zoom) {
|
|
61
|
+
else if (typeof zoom === "number") {
|
|
58
62
|
mapOptions.zoom = zoom;
|
|
59
63
|
}
|
|
60
64
|
const map = new maplibregl.Map(mapOptions);
|
|
65
|
+
if (navigation !== undefined &&
|
|
66
|
+
interactionOptions.interactive &&
|
|
67
|
+
(navigation?.zoom ?? true) &&
|
|
68
|
+
mapOptions.touchZoomRotate !== false) {
|
|
69
|
+
map.touchZoomRotate.disableRotation();
|
|
70
|
+
}
|
|
61
71
|
const tooltip = new maplibregl.Popup(DEFAULT_TOOLTIP_OPTIONS);
|
|
62
72
|
return new Promise((resolve, reject) => {
|
|
63
73
|
let isSettled = false;
|
|
@@ -99,6 +109,33 @@ export async function initializeMapLibreMap({ container, center, zoom, bounds, i
|
|
|
99
109
|
tryResolveFromCurrentState();
|
|
100
110
|
});
|
|
101
111
|
}
|
|
112
|
+
function getNavigationOptions(navigation, interactionOptions) {
|
|
113
|
+
if (!interactionOptions.interactive) {
|
|
114
|
+
return {};
|
|
115
|
+
}
|
|
116
|
+
const isPanEnabled = navigation?.pan ?? true;
|
|
117
|
+
const isZoomEnabled = navigation?.zoom ?? true;
|
|
118
|
+
const navigationOptions = {};
|
|
119
|
+
// Keep native MapLibre defaults when enabled; override only disabled capabilities.
|
|
120
|
+
if (!isPanEnabled) {
|
|
121
|
+
navigationOptions.dragPan = false;
|
|
122
|
+
}
|
|
123
|
+
if (!isZoomEnabled) {
|
|
124
|
+
navigationOptions.scrollZoom = false;
|
|
125
|
+
navigationOptions.doubleClickZoom = false;
|
|
126
|
+
navigationOptions.boxZoom = false;
|
|
127
|
+
navigationOptions.touchZoomRotate = false;
|
|
128
|
+
}
|
|
129
|
+
else if (interactionOptions.touchZoomRotate !== false) {
|
|
130
|
+
// Preserve explicit touch override when provided (defaults remain untouched otherwise).
|
|
131
|
+
navigationOptions.touchZoomRotate = interactionOptions.touchZoomRotate;
|
|
132
|
+
}
|
|
133
|
+
// Keyboard controls include both pan and zoom, so disable them when either is turned off.
|
|
134
|
+
if (!isPanEnabled || !isZoomEnabled) {
|
|
135
|
+
navigationOptions.keyboard = false;
|
|
136
|
+
}
|
|
137
|
+
return navigationOptions;
|
|
138
|
+
}
|
|
102
139
|
function getMaplibreErrorMessage(event) {
|
|
103
140
|
const message = event.error?.message;
|
|
104
141
|
return typeof message === "string" && message.length > 0 ? message : "Unknown error";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapInitialization.js","sourceRoot":"","sources":["../../../../src/next/map/runtime/mapInitialization.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAIrC,OAAO,EACH,wBAAwB,EACxB,uBAAuB,EAEvB,4BAA4B,GAC/B,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"mapInitialization.js","sourceRoot":"","sources":["../../../../src/next/map/runtime/mapInitialization.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
// (C) 2025-2026 GoodData Corporation
|
|
2
|
+
import { isConcreteViewportPreset } from "../../types/config/viewport.js";
|
|
2
3
|
import { DEFAULT_CENTER, DEFAULT_WORLD_BOUNDS, DEFAULT_ZOOM, VIEWPORTS } from "../runtime/mapConfig.js";
|
|
3
4
|
/**
|
|
4
5
|
* Get viewport options based on data and configuration
|
|
@@ -14,7 +15,7 @@ export function getViewportOptions(data, config) {
|
|
|
14
15
|
const zoom = config?.zoom ?? DEFAULT_ZOOM;
|
|
15
16
|
const { area } = config?.viewport ?? {};
|
|
16
17
|
if (!center) {
|
|
17
|
-
if (area
|
|
18
|
+
if (isConcreteViewportPreset(area)) {
|
|
18
19
|
const [southWest, northEast] = VIEWPORTS[area];
|
|
19
20
|
const bounds = [southWest, northEast];
|
|
20
21
|
return { bounds };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viewportPresets.js","sourceRoot":"","sources":["../../../../src/next/map/viewport/viewportPresets.ts"],"names":[],"mappings":"AAAA,qCAAqC;
|
|
1
|
+
{"version":3,"file":"viewportPresets.js","sourceRoot":"","sources":["../../../../src/next/map/viewport/viewportPresets.ts"],"names":[],"mappings":"AAAA,qCAAqC;AAKrC,OAAO,EAA0B,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAClG,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAaxG;;;;;;;;GAQG;AACH,MAAM,UAAU,kBAAkB,CAAC,IAAkB,EAAE,MAA8B,EAAgB;IACjG,MAAM,MAAM,GAA2B,MAAM,EAAE,MAAM,CAAC;IACtD,MAAM,IAAI,GAAW,MAAM,EAAE,IAAI,IAAI,YAAY,CAAC;IAClD,MAAM,EAAE,IAAI,EAAE,GAAsB,MAAM,EAAE,QAAQ,IAAI,EAAE,CAAC;IAE3D,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,IAAI,wBAAwB,CAAC,IAAI,CAAC,EAAE,CAAC;YACjC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;YAC/C,MAAM,MAAM,GAAqB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;YACxD,OAAO,EAAE,MAAM,EAAE,CAAC;QACtB,CAAC;aAAM,CAAC;YACJ,MAAM,YAAY,GAAiC,eAAe,CAAC,IAAI,CAAC,CAAC;YACzE,IAAI,YAAY,EAAE,CAAC;gBACf,MAAM,MAAM,GAAqB;oBAC7B,CAAC,YAAY,CAAC,SAAS,CAAC,GAAG,EAAE,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC;oBACxD,CAAC,YAAY,CAAC,SAAS,CAAC,GAAG,EAAE,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC;iBAC3D,CAAC;gBACF,OAAO,EAAE,MAAM,EAAE,CAAC;YACtB,CAAC;YAED,OAAO;gBACH,MAAM,EAAE,cAAc;gBACtB,IAAI;aACP,CAAC;QACN,CAAC;IACL,CAAC;IAED,OAAO;QACH,MAAM;QACN,IAAI;KACP,CAAC;AAAA,CACL;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,UAAU,eAAe,CAAC,OAAqB,EAAgC;IACjF,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;QACnB,OAAO;IACX,CAAC;IAED,OAAO,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,SAAS,CAAC,IAAI,oBAAoB,CAAC;AAAA,CAChF;AAED,SAAS,kBAAkB,CAAC,MAAoC,EAAE,MAAkB,EAAoB;IACpG,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,OAAO,MAAM,IAAI,oBAAoB,CAAC;IAC1C,CAAC;IAED,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,OAAO;YACH,SAAS,EAAE,MAAM;YACjB,SAAS,EAAE,MAAM;SACpB,CAAC;IACN,CAAC;IAED,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;IACxC,OAAO;QACH,SAAS,EAAE;YACP,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC;YACxC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC;SAC3C;QACD,SAAS,EAAE;YACP,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC;YACxC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,CAAC;SAC3C;KACJ,CAAC;AAAA,CACL"}
|
|
@@ -4,10 +4,11 @@ import type { IMapViewport } from "../../types/map/provider.js";
|
|
|
4
4
|
* Resolves the map viewport from configuration, falling back to a data-derived viewport.
|
|
5
5
|
*
|
|
6
6
|
* Priority order (highest wins):
|
|
7
|
-
* 1.
|
|
8
|
-
* 2. `config.
|
|
9
|
-
* 3. `
|
|
10
|
-
* 4.
|
|
7
|
+
* 1. AD-only override: preset `config.viewport.area` (when `applyViewportNavigation === false`)
|
|
8
|
+
* 2. `config.center` + `config.zoom` (explicit center/zoom)
|
|
9
|
+
* 3. `config.viewport.area` (preset area like "continent_eu")
|
|
10
|
+
* 4. `dataViewport` (computed from layer data; used for `"auto"`)
|
|
11
|
+
* 5. Default fallback
|
|
11
12
|
*
|
|
12
13
|
* @remarks
|
|
13
14
|
* This function is intentionally pure and cycle-free so it can be reused both:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"viewportResolution.d.ts","sourceRoot":"","sources":["../../../../src/next/map/viewport/viewportResolution.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"viewportResolution.d.ts","sourceRoot":"","sources":["../../../../src/next/map/viewport/viewportResolution.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAErE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAGhE;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,yBAAyB,CACrC,MAAM,EAAE,eAAe,GAAG,SAAS,EACnC,YAAY,GAAE,OAAO,CAAC,YAAY,CAAC,GAAG,IAAW,GAClD,OAAO,CAAC,YAAY,CAAC,GAAG,IAAI,CAmC9B;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,eAAe,GAAG,SAAS,GAAG,MAAM,CAchF"}
|