From 520a4991d7b273eeafb3536cfbc2cc6aeac6a47e Mon Sep 17 00:00:00 2001 From: Xiaoji Chen Date: Fri, 4 Jun 2021 13:43:52 -0700 Subject: [PATCH] Remove extra props in GeolocateControl callback (#1480) --- src/components/geolocate-control.js | 6 +----- src/utils/transition-manager.d.ts | 4 ++-- src/utils/transition-manager.js | 4 +--- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/components/geolocate-control.js b/src/components/geolocate-control.js index 0239f03c..dfe61c5c 100644 --- a/src/components/geolocate-control.js +++ b/src/components/geolocate-control.js @@ -6,15 +6,11 @@ import {document} from '../utils/globals'; import mapboxgl from '../utils/mapboxgl'; import MapState from '../utils/map-state'; -import TransitionManager from '../utils/transition-manager'; +import {LINEAR_TRANSITION_PROPS} from '../utils/map-controller'; import {isGeolocationSupported} from '../utils/geolocate-utils'; import useMapControl, {mapControlDefaultProps, mapControlPropTypes} from './use-map-control'; -const LINEAR_TRANSITION_PROPS = Object.assign({}, TransitionManager.defaultProps, { - transitionDuration: 500 -}); - const noop = () => {}; const propTypes = Object.assign({}, mapControlPropTypes, { diff --git a/src/utils/transition-manager.d.ts b/src/utils/transition-manager.d.ts index 4fffb9ef..22bb92a0 100644 --- a/src/utils/transition-manager.d.ts +++ b/src/utils/transition-manager.d.ts @@ -5,8 +5,8 @@ export type ViewportProps = MapStateProps & { onTransitionStart: Function, onTransitionInterrupt: Function, onTransitionEnd: Function, - onViewportChange: Function, - onStateChange: Function + onViewportChange?: Function, + onStateChange?: Function }; type TransitionState = { diff --git a/src/utils/transition-manager.js b/src/utils/transition-manager.js index cde4e12a..b8bd6217 100644 --- a/src/utils/transition-manager.js +++ b/src/utils/transition-manager.js @@ -26,9 +26,7 @@ const DEFAULT_PROPS = { transitionInterruption: TRANSITION_EVENTS.BREAK, onTransitionStart: noop, onTransitionInterrupt: noop, - onTransitionEnd: noop, - onViewportChange: noop, - onStateChange: noop + onTransitionEnd: noop }; export default class TransitionManager {