@deck.gl/core 9.2.11 → 9.3.0-alpha.2

package/src/views/orthographic-view.ts

@@ -6,16 +6,50 @@ import View, {CommonViewState, CommonViewProps} from './view';
 import OrthographicViewport from '../viewports/orthographic-viewport';
 import OrthographicController from '../controllers/orthographic-controller';
 
+/** independent zoom levels for X and Y axes
+ * @deprecated use `zoomX` and `zoomY` instead */
+type Deprecated2DZoom = [number, number];
+
 export type OrthographicViewState = {
   /** The world position at the center of the viewport. Default `[0, 0, 0]`. */
   target?: [number, number, number] | [number, number];
   /**  The zoom level of the viewport. `zoom: 0` maps one unit distance to one pixel on screen, and increasing `zoom` by `1` scales the same object to twice as large.
-   *   To apply independent zoom levels to the X and Y axes, supply an array `[zoomX, zoomY]`. Default `0`. */
-  zoom?: number | [number, number];
-  /** The min zoom level of the viewport. Default `-Infinity`. */
+   *   To apply independent zoom levels to the X and Y axes, use `zoomX` and `zoomY`.
+   * @default 0
+   */
+  zoom?: number | Deprecated2DZoom;
+  /** Which axes to apply zoom to. One of 'X', 'Y' or 'all'
+   * @default 'all'
+   */
+  zoomAxis?: 'X' | 'Y' | 'all';
+  /** The zoom level along X axis. Overrides `zoom` if supplied. */
+  zoomX?: number;
+  /** The zoom level along Y axis. Overrides `zoom` if supplied. */
+  zoomY?: number;
+  /** The min zoom level of the viewport.
+   * @default -Infinity
+   */
   minZoom?: number;
-  /** The max zoom level of the viewport. Default `Infinity`. */
+  /** The max zoom level of the viewport.
+   * @default Infinity
+   */
   maxZoom?: number;
+  /** The min zoom level along X axis.
+   * @default `minZoom`
+   */
+  maxZoomX?: number;
+  /** The max zoom level along X axis.
+   * @default `maxZoom`
+   */
+  minZoomX?: number;
+  /** The min zoom level along Y axis.
+   * @default `minZoom`
+   */
+  maxZoomY?: number;
+  /** The max zoom level along Y axis.
+   * @default `maxZoom`
+   */
+  minZoomY?: number;
 } & CommonViewState;
 
 export type OrthographicViewProps = {

package/src/views/view.ts

@@ -5,6 +5,7 @@
 import Viewport from '../viewports/viewport';
 import {parsePosition, getPosition, LayoutExpression} from '../utils/positions';
 import {deepEqual} from '../utils/deep-equal';
+import {deepMergeViewState} from '../utils/deep-merge';
 import type Controller from '../controllers/controller';
 import type {ControllerOptions} from '../controllers/controller';
 import type {TransitionProps} from '../controllers/transition-manager';
@@ -148,14 +149,7 @@ export default abstract class View<
         return this.props.viewState as ViewState;
       }
 
-      // Merge in all props from View's viewState, except id
-      const newViewState = {...viewState};
-      for (const key in this.props.viewState) {
-        if (key !== 'id') {
-          newViewState[key] = this.props.viewState[key];
-        }
-      }
-      return newViewState;
+      return deepMergeViewState<ViewState>(viewState, this.props.viewState as ViewState);
     }
 
     return viewState;