Interactive interface for browsing global, full-resolution satellite imagery
modernized mobile date picker
VictorSc920f0d60d75
diff --git a/web/js/components/timeline/mobile-date-picker.js b/web/js/components/timeline/mobile-date-picker.jsindex e7f49b235..c471fc227 100644--- a/web/js/components/timeline/mobile-date-picker.js+++ b/web/js/components/timeline/mobile-date-picker.js@@ -1,4 +1,4 @@-import React, { Component } from 'react';+import React, { useEffect, useState } from 'react';import PropTypes from 'prop-types';import DatePicker from 'react-mobile-datepicker';import { getDisplayDate, getISODateFormatted } from './date-util';@@ -52,139 +52,99 @@ const subDailyDateConfig = {},};-class MobileDatePicker extends Component {- constructor(props) {- super(props);- this.state = {- time: '',- minDate: '',- maxDate: '',- isOpen: false,- };- }-- componentDidMount() {- this.setInitDates();- }-- componentDidUpdate(prevProps) {- const { date, endDateLimit } = this.props;- // update on new endDateLimit or changed date- if (prevProps.endDateLimit !== endDateLimit || prevProps.date !== date) {- this.setInitDates();- }- }-- handleClickDateButton = () => {- this.setState({- isOpen: true,- });- };+ // change to UTC offset time for date picker controls+const convertToUTCDateObject = (dateString) => {+ const date = new Date(dateString);+ const dateUTC = new Date(date.getTime() + (date.getTimezoneOffset() * 60000));+ return dateUTC;+};- handleCancel = () => {- const {- date,- } = this.props;- this.setState({- isOpen: false,- time: this.convertToUTCDateObject(date),- });- };+// change to offset time used in parent component date setting functions+const convertToLocalDateObject = (date) => {+ const dateLocal = new Date(date.getTime() - (date.getTimezoneOffset() * 60000));+ return dateLocal;+};- handleChange = (date) => {- this.setState({- time: date,- });+const MobileDatePicker = function ({+ date,+ startDateLimit,+ endDateLimit,+ onDateChange,+ hasSubdailyLayers+}) {+ const [time, setTime] = useState(convertToUTCDateObject(date))+ const [minDate, setMinDate] = useState(convertToUTCDateObject(startDateLimit));+ const [maxDate, setMaxDate] = useState(convertToUTCDateObject(endDateLimit));+ const [isOpen, setIsOpen] = useState(false);++ useEffect(() => {+ setInitDates();+ }, [endDateLimit, date]);++ const handleClickDateButton = () => {+ setIsOpen(true);};- handleSelect = (time) => {- const { onDateChange } = this.props;- this.setState({- isOpen: false,- time,- });- // convert date back to local time- const date = this.convertToLocalDateObject(time);- onDateChange(getISODateFormatted(date));+ const handleCancel = () => {+ setTime(convertToUTCDateObject(date));+ setIsOpen(false);};- // used for init mount- setInitDates = () => {- const {- date,- startDateLimit,- endDateLimit,- } = this.props;- this.setState({- time: this.convertToUTCDateObject(date),- minDate: this.convertToUTCDateObject(startDateLimit),- maxDate: this.convertToUTCDateObject(endDateLimit),- });+ const handleChange = (date) => {+ setTime(date);};- // change to UTC offset time for date picker controls- convertToUTCDateObject = (dateString) => {- const date = new Date(dateString);- const dateUTC = new Date(date.getTime() + (date.getTimezoneOffset() * 60000));- return dateUTC;+ const handleSelect = (time) => {+ setIsOpen(false);+ setTime(time);++ // convert date back to local time+ const date = convertToLocalDateObject(time);+ onDateChange(getISODateFormatted(date));};- // change to offset time used in parent component date setting functions- convertToLocalDateObject = (date) => {- const dateLocal = new Date(date.getTime() - (date.getTimezoneOffset() * 60000));- return dateLocal;+ const setInitDates = () => {+ setTime(convertToUTCDateObject(date));+ setMinDate(convertToUTCDateObject(startDateLimit));+ setMaxDate(convertToUTCDateObject(endDateLimit));};- getHeaderTime = (time, isSubdaily) => (+ const getHeaderTime = (time, isSubdaily) => (<div className="datepicker-header">- {getDisplayDate(new Date(this.convertToLocalDateObject(time)), isSubdaily)}+ {getDisplayDate(new Date(convertToLocalDateObject(time)), isSubdaily)}</div>);- render() {- const {- time,- minDate,- maxDate,- isOpen,- } = this.state;- const {- date,- hasSubdailyLayers,- } = this.props;- const displayDate = getDisplayDate(date, hasSubdailyLayers);-- return (- time && (- <>- <div- className="mobile-date-picker-select-btn"- onClick={this.handleClickDateButton}- >- <div className="mobile-date-picker-select-btn-text">- <span>{displayDate}</span>- </div>+ return (+ time && (+ <>+ <div+ className="mobile-date-picker-select-btn"+ onClick={handleClickDateButton}+ >+ <div className="mobile-date-picker-select-btn-text">+ <span>{getDisplayDate(date, hasSubdailyLayers)}</span></div>- <DatePicker- dateConfig={hasSubdailyLayers ? subDailyDateConfig : defaultDateConfig}- showCaption- theme="android-dark"- customHeader={this.getHeaderTime(time, hasSubdailyLayers)}- confirmText="OK"- cancelText="CANCEL"- min={minDate}- max={maxDate}- value={time}- isOpen={isOpen}- onCancel={this.handleCancel}- onChange={this.handleChange}- onSelect={this.handleSelect}- />- </>- )- );- }-}+ </div>+ <DatePicker+ dateConfig={hasSubdailyLayers ? subDailyDateConfig : defaultDateConfig}+ showCaption+ theme="android-dark"+ customHeader={getHeaderTime(time, hasSubdailyLayers)}+ confirmText="OK"+ cancelText="CANCEL"+ min={minDate}+ max={maxDate}+ value={time}+ isOpen={isOpen}+ onCancel={handleCancel}+ onChange={handleChange}+ onSelect={handleSelect}+ />+ </>+ )+ );+};MobileDatePicker.propTypes = {date: PropTypes.object,