vjrj
229b2cb233
The 4 class components on UNSAFE_componentWillReceiveProps converted: - FromNow, FireStats: state is a pure mirror of props -> getDerivedStateFromProps - Fires: split the derived state (getDerivedStateFromProps) from the URL- canonicalization side effect (componentDidUpdate, guarded by prevProps) so the side effect never runs inside the pure gDSFP - SelectionMap: marker is also locally draggable, so gDSFP would clobber a drag -> componentDidUpdate guarded on a real center/distance value change (no clobber, no setState loop), merged with the existing fit() Browser-verified: /fires count, fire detail + FromNow, active-fire URL canonicalizes to /fire/archive/:id, home SelectionMap renders stably (no render loop). No UNSAFE_ warnings remain from our code. REST smoke byte-identical.
61 lines
1.5 KiB
JavaScript
61 lines
1.5 KiB
JavaScript
/* eslint-disable react/jsx-indent-props */
|
|
/* eslint-disable import/no-absolute-path */
|
|
|
|
import React, { Component } from 'react';
|
|
import PropTypes from 'prop-types';
|
|
import { withTracker } from 'meteor/react-meteor-data';
|
|
import Chronos from '/imports/ui/components/Chronos/Chronos';
|
|
import { withTranslation } from 'react-i18next';
|
|
import { dateLongFormat } from '/imports/api/Common/dates';
|
|
|
|
import './FromNow.scss';
|
|
|
|
class FromNow extends Component {
|
|
constructor(props) {
|
|
super(props);
|
|
this.state = {
|
|
when: props.when
|
|
};
|
|
}
|
|
|
|
// state.when just mirrors props.when (was UNSAFE_componentWillReceiveProps)
|
|
static getDerivedStateFromProps(props, state) {
|
|
return props.when !== state.when ? { when: props.when } : null;
|
|
}
|
|
|
|
shouldComponentUpdate(nextProps, nextState) {
|
|
return !(nextState.when === this.state.when);
|
|
}
|
|
|
|
thatIs() {
|
|
return this.props.t('esDecirTalDia', { date: dateLongFormat(this.props.whenDate) });
|
|
}
|
|
|
|
render() {
|
|
return (
|
|
<span data-toggle="tooltip" className="from-now" title={this.thatIs()}>{this.state.when}</span>
|
|
);
|
|
}
|
|
}
|
|
|
|
FromNow.propTypes = {
|
|
t: PropTypes.func.isRequired,
|
|
when: PropTypes.string,
|
|
whenDate: PropTypes.instanceOf(Date)
|
|
};
|
|
|
|
/*
|
|
* const FromNowContainer = withTracker((props) => {
|
|
*
|
|
* })(FromNow);
|
|
*
|
|
* export default FromNowContainer;
|
|
* */
|
|
|
|
export default withTranslation()(withTracker((props) => {
|
|
const whenDate = props.when;
|
|
return {
|
|
when: whenDate ? Chronos.moment(whenDate).fromNow() : null,
|
|
whenDate
|
|
};
|
|
})(FromNow));
|