@carto/ps-react-maps 1.6.0 → 2.0.0

package/dist/types/common-stories/maps/google-maps.component.d.ts

@@ -1,3 +1,3 @@
 import { GoogleMapsProps } from '@/map-provider';
 export declare function GoogleMapsComponent(props: GoogleMapsProps): import("react/jsx-runtime").JSX.Element;
-export declare function GoogleMap({ apiKey, basemap, instanceRef, layers, overlayRef, initialViewState, viewState, controller, height, id, language, mapId, mapOptions, style, version, width, getTooltip, onResize, onViewStateChange, ...rest }: GoogleMapsProps): import("react/jsx-runtime").JSX.Element;
+export declare function GoogleMap({ apiKey, basemap, instanceRef, layers, overlayRef, initialViewState, viewState, controller, id, language, mapId, mapOptions, style, version, getTooltip, onResize, onViewStateChange, ...rest }: GoogleMapsProps): import("react/jsx-runtime").JSX.Element;

package/dist/types/map-measurement-tool/custom-editable-geojson-layer.class.d.ts

@@ -1,4 +1,4 @@
-import { EditableGeoJsonLayer } from '@nebula.gl/layers';
+import { EditableGeoJsonLayer } from '@deck.gl-community/editable-layers';
 import { EventManager } from 'mjolnir.js';
 import type { CustomEditableLayerProps } from './map-measurement-tool.types';
 export declare class CustomEditableGeojsonLayer extends EditableGeoJsonLayer {

package/dist/types/map-measurement-tool/custom-measurement-distance-mode.class.d.ts

@@ -1,5 +1,5 @@
-import { FeatureCollection, MeasureDistanceMode, type ModeProps } from '@nebula.gl/edit-modes';
-import type { BasePointerEvent } from '@nebula.gl/edit-modes/dist-types/types';
+import { FeatureCollection, MeasureDistanceMode, type ModeProps } from '@deck.gl-community/editable-layers';
+import type { BasePointerEvent } from '@deck.gl-community/editable-layers/dist/edit-modes/types';
 export declare class CustomMeasureDistanceMode extends MeasureDistanceMode {
     handleClick(event: BasePointerEvent, props: ModeProps<FeatureCollection>): void;
     handleKeyUp(event: KeyboardEvent, props: ModeProps<FeatureCollection>): void;

package/dist/types/map-measurement-tool/map-measurement-tool.layer.d.ts

@@ -1,4 +1,4 @@
-import { Layer } from '@deck.gl/core/typed';
+import { Layer } from '@deck.gl/core';
 import { type MapMeasurementToolsLayerProps } from './map-measurement-tool.types';
 /**
  * Renders the map measurement tools layer.

package/dist/types/map-measurement-tool/map-measurement-tool.types.d.ts

@@ -1,7 +1,7 @@
-import type { EditableGeojsonLayerProps } from '@nebula.gl/layers/dist-types/layers/editable-geojson-layer';
 import type { EventManager } from 'mjolnir.js';
 import type { ReactNode } from 'react';
 import type { Tooltip } from '@/map-provider';
+import type { EditableGeojsonLayerProps } from '@deck.gl-community/editable-layers/dist/editable-layers/editable-geojson-layer';
 export declare enum MapMeasurementUnit {
     milimeter = "milimeter",
     centimeter = "centimeter",

package/dist/types/map-measurement-tool/map-measurement-tool.util.d.ts

@@ -1,6 +1,6 @@
 import { MapMeasurementUnit } from './map-measurement-tool.types';
 import type { MapsProps } from '@/map-provider';
-import type { ControllerOptions } from '@deck.gl/core/typed/controllers/controller';
+import type { ControllerOptions } from '@deck.gl/core/dist/controllers/controller';
 export declare function convertMetersTo(distance: number, unit: MapMeasurementUnit): number;
 export declare function getTextLayerFormattedDistance({ meters, unit, locale, }: {
     meters: number;

package/dist/types/map-provider/map-provider.hook.d.ts

@@ -1,5 +1,5 @@
-import type { DeckGLMapsProps, MapProviderMapProps, MapReferences, MapResize, OverlayMapRef, ViewportRect } from './map-provider.types';
-import type { Deck, WebMercatorViewport } from '@deck.gl/core/typed';
+import type { DeckGLMapsProps, MapProviderMapProps, MapReferences, MapResize, MapViewState, OverlayMapRef, ViewportRect } from './map-provider.types';
+import type { Deck, WebMercatorViewport } from '@deck.gl/core';
 /**
  * Custom hook that retrieves the map configuration for a given ID.
  * @param id - The ID of the map.
@@ -27,7 +27,7 @@ export declare function useMapReferences(id: string): MapReferences & {
 export declare function useMapActions(id: string): {
     setBasemap: (basemap: any) => void;
     setResize: (props: MapResize) => void;
-    setViewState: (viewState: DeckGLMapsProps['viewState']) => void;
+    setViewState: (viewState: MapViewState) => void;
     setZoom: (zoom: number) => void;
     setLoaded: (loaded: boolean) => void;
     fitBounds: (bounds: Parameters<WebMercatorViewport['fitBounds']>[0], { boundsOptions, viewStateOptions, }?: {
@@ -47,9 +47,20 @@ export declare function useMapByID(id: string): MapProviderMapProps;
  * @deprecated Use `useMapReferences` with id param instead.
  */
 export declare function useMapReferencesByID(id: string): MapReferences & {
-    getDeckInstance: () => Deck | undefined;
+    getDeckInstance: () => Deck<null> | undefined;
     getOverlayInstance: () => OverlayMapRef | undefined;
-    getViewState: () => any;
+    getViewState: () => ({
+        longitude: number;
+        latitude: number;
+        zoom: number;
+        pitch?: number | undefined;
+        bearing?: number | undefined;
+        minZoom?: number | undefined;
+        maxZoom?: number | undefined;
+        minPitch?: number | undefined;
+        maxPitch?: number | undefined;
+        position?: number[] | undefined;
+    } & import("@deck.gl/core/dist/controllers/transition-manager").TransitionProps) | undefined;
     getViewports: (rect?: ViewportRect | undefined) => WebMercatorViewport[];
     getViewport: (index?: number | undefined, rect?: ViewportRect | undefined) => WebMercatorViewport;
 };
@@ -59,7 +70,7 @@ export declare function useMapReferencesByID(id: string): MapReferences & {
 export declare function useMapActionsByID(id: string): {
     setBasemap: (basemap: any) => void;
     setResize: (props: MapResize) => void;
-    setViewState: (viewState: any) => void;
+    setViewState: (viewState: import("@deck.gl/core").MapViewState) => void;
     setZoom: (zoom: number) => void;
     setLoaded: (loaded: boolean) => void;
     fitBounds: (bounds: [[number, number], [number, number]], { boundsOptions, viewStateOptions, }?: {
@@ -68,7 +79,7 @@ export declare function useMapActionsByID(id: string): {
             height?: number | undefined;
             minExtent?: number | undefined;
             maxZoom?: number | undefined;
-            padding?: number | Required<import("@deck.gl/core/typed/viewports/viewport").Padding> | undefined;
+            padding?: number | Required<import("@deck.gl/core/dist/viewports/viewport").Padding> | undefined;
             offset?: number[] | undefined;
         } | undefined;
         viewStateOptions?: any;

package/dist/types/map-provider/map-provider.reducer.d.ts

@@ -1,4 +1,4 @@
-import type { MapsProps, MapState } from './map-provider.types';
+import type { MapResize, MapsProps, MapState, MapViewState } from './map-provider.types';
 export declare enum Actions {
     SetViewState = "SetViewState",
     SetBasemap = "SetBasemap",
@@ -8,7 +8,11 @@ export declare enum Actions {
 }
 type Action = {
     type: Actions;
-    payload: MapsProps;
+    payload: MapsProps | MapResize | {
+        viewState: MapViewState;
+    } | {
+        zoom: MapViewState['zoom'];
+    } | boolean;
 };
 /**
  * Reducer function for the MapProvider component.

package/dist/types/map-provider/map-provider.types.d.ts

@@ -1,19 +1,20 @@
 /// <reference types="google.maps" />
-import type { PickingInfo } from '@deck.gl/core/typed';
-import type { ControllerOptions } from '@deck.gl/core/typed/controllers/controller';
-import type { GoogleMapsOverlay, GoogleMapsOverlayProps } from '@deck.gl/google-maps/typed';
-import type { DeckGLProps, DeckGLRef } from '@deck.gl/react/typed';
+import type { MapViewState as _MapViewState, PickingInfo } from '@deck.gl/core';
+import type { GoogleMapsOverlay, GoogleMapsOverlayProps } from '@deck.gl/google-maps';
+import type { DeckGLProps, DeckGLRef } from '@deck.gl/react';
 import type { Properties } from 'csstype';
 import type { MutableRefObject, ReactNode } from 'react';
 import type { MapRef } from 'react-map-gl';
 import { CartoBasemapsNames, GMapsBasemap } from './map-provider.const';
 import type { Actions } from './map-provider.reducer';
+import type { ControllerOptions } from '@deck.gl/core/dist/controllers/controller';
+export type MapViewState = _MapViewState;
 export type MapProviderMapProps = {
     id: MapsProps['id'];
     basemap: MapsProps['basemap'];
-    viewState: MapsProps['viewState'];
+    viewState: MapViewState;
     isLoaded?: boolean;
-};
+} & Partial<MapResize>;
 /**
  * Props for the MapProvider component.
  */
@@ -24,11 +25,8 @@ export type MapProviderProps = {
 };
 export type ExternalSync = (data: ExternalSyncProps) => void;
 export type ExternalSyncProps = {
-    type: Actions.SetViewState;
-    payload: MapsProps['viewState'];
-} | {
-    type: Actions.SetResize;
-    payload: MapResize;
+    type: Actions.SetViewState | Actions.SetResize;
+    payload: MapViewState | MapResize;
 };
 /**
  * State for the MapProvider component.
@@ -40,8 +38,8 @@ export type MapState = {
  * Resize properties for the map.
  */
 export type MapResize = {
-    width: number | string;
-    height: number | string;
+    width: MapsProps['width'];
+    height: MapsProps['height'];
 };
 export type MapReferences = {
     instanceRef: MutableRefObject<InstanceMapRef>;
@@ -52,7 +50,7 @@ export type MapReferencesState = Record<MapsProps['id'], MapReferences>;
  * Actions that can be performed on the map.
  */
 export type MapActionsState = {
-    setViewState: (viewState: DeckGLMapsProps['viewState'], id: MapsProps['id']) => void;
+    setViewState: (viewState: MapViewState, id: MapsProps['id']) => void;
     setResize: (props: MapResize, id: MapsProps['id']) => void;
     setBasemap: (basemap: Basemap, id: MapsProps['id']) => void;
     setZoom: (zoom: number, id: MapsProps['id']) => void;
@@ -76,6 +74,8 @@ export type Basemap = (typeof GMapsBasemap)[keyof typeof GMapsBasemap] | (typeof
 export type CommonProps = {
     id: string;
     basemap: Basemap;
+    viewState?: MapViewState;
+    initialViewState?: MapViewState;
     controller?: ControllerOptions;
 } & DeckGLProps & Partial<MapReferences>;
 /**
@@ -99,13 +99,11 @@ export type DeckGLMapsProps = CommonProps;
  */
 export type GoogleMapsProps = {
     apiKey?: string;
-    height?: string | undefined;
     language?: string;
     mapId?: string;
     mapOptions?: Record<string, number | string>;
     style?: Properties;
     version?: string;
-    width?: string | undefined;
 } & CommonProps & GoogleMapsOverlayProps;
 /**
  * Tooltip properties.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carto/ps-react-maps",
-  "version": "1.6.0",
+  "version": "2.0.0",
   "description": "CARTO's Professional Service React Maps library",
   "files": [
     "dist"
@@ -29,24 +29,22 @@
     "storybook:build": "storybook build"
   },
   "dependencies": {
-    "@nebula.gl/edit-modes": "1.0.4",
-    "@nebula.gl/layers": "1.0.4",
+    "@deck.gl-community/editable-layers": "9.0.0-alpha.1",
     "convert-units": "3.0.0-beta.6",
     "mjolnir.js": "2.7.1"
   },
   "devDependencies": {
-    "@deck.gl/google-maps": "8.9.35",
-    "@deck.gl/react": "8.9.35",
+    "@deck.gl/google-maps": "9.0.10",
+    "@deck.gl/react": "9.0.10",
     "@react-google-maps/api": "2.19.3",
-    "@types/google.maps": "3.55.4",
-    "maplibre-gl": "3.6.2",
+    "@types/google.maps": "3.55.7",
+    "maplibre-gl": "4.1.3",
     "react-map-gl": "7.1.7"
   },
   "peerDependencies": {
-    "@deck.gl/core": "8.x",
-    "@deck.gl/layers": "8.x",
-    "@nebula.gl/edit-modes": "1.x",
-    "@nebula.gl/layers": "1.x",
+    "@deck.gl/core": "9.x",
+    "@deck.gl/layers": "9.x",
+    "@deck.gl-community/editable-layers": "9.x",
     "convert-units": "3.x",
     "mjolnir.js": "2.x",
     "react": "17.x || 18.x",