@jetbrains/ring-ui 7.0.0-beta.8 → 7.0.0

package/components/date-picker/date-popup.js

@@ -10,7 +10,7 @@ import DateInput from './date-input';
 import Months from './months';
 import Years from './years';
 import Weekdays from './weekdays';
-import { parseTime } from './consts';
+import { parseTime, } from './consts';
 import styles from './date-picker.css';
 const scrollExpDelay = 10;
 export default class DatePopup extends Component {
@@ -21,14 +21,14 @@ export default class DatePopup extends Component {
         return next === prev;
     }
     static defaultProps = {
-        onChange() { }
+        onChange() { },
     };
     constructor(props) {
         super(props);
         const defaultState = {
             text: null,
             hoverDate: null,
-            scrollDate: null
+            scrollDate: null,
         };
         const { range, withTime } = props;
         if (!range) {
@@ -63,7 +63,7 @@ export default class DatePopup extends Component {
     }
     _scrollDate;
     _scrollTS;
-    isInTimeMode = () => !this.props.range && this.props.withTime || false;
+    isInTimeMode = () => (!this.props.range && this.props.withTime) || false;
     componentRef = React.createRef();
     handleWheel = (e) => {
         if (e.cancelable) {
@@ -82,13 +82,14 @@ export default class DatePopup extends Component {
         if (!range && !withTime) {
             this.setState({
                 text: null,
-                scrollDate: null
-            });
-            const adjustedDate = changes.date && set(new Date(), {
-                year: changes.date.getFullYear(),
-                month: changes.date.getMonth(),
-                date: changes.date.getDate()
+                scrollDate: null,
             });
+            const adjustedDate = changes.date &&
+                set(new Date(), {
+                    year: changes.date.getFullYear(),
+                    month: changes.date.getMonth(),
+                    date: changes.date.getDate(),
+                });
             this.props.onChange(adjustedDate);
             this.props.onComplete();
         }
@@ -97,23 +98,22 @@ export default class DatePopup extends Component {
             const time = this.parse(this.props.time, 'time');
             const changeToSubmit = {
                 date: changes.date || date,
-                time: changes.time || time
+                time: changes.time || time,
             };
             this.setState({
                 active: changes.date ? 'time' : 'date',
                 text: null,
-                scrollDate: null
+                scrollDate: null,
             });
             this.props.onChange(changeToSubmit);
-            if (!changes.date && prevActive === 'time' &&
-                changeToSubmit.date && changeToSubmit.time) {
+            if (!changes.date && prevActive === 'time' && changeToSubmit.date && changeToSubmit.time) {
                 this.props.onComplete();
             }
         }
         else {
             let { from, to } = {
                 ...this.props,
-                ...changes
+                ...changes,
             };
             from = this.parse(from, 'from');
             to = this.parse(to, 'to');
@@ -139,7 +139,7 @@ export default class DatePopup extends Component {
             this.setState({
                 active,
                 hoverDate: null,
-                text: null
+                text: null,
             });
             this.props.onChange({ from, to });
             if (complete) {
@@ -163,26 +163,23 @@ export default class DatePopup extends Component {
             }
         }
         this.select({
-            [name]: result
+            [name]: result,
         });
     }
     isValidDate = (parsedText) => {
         const minDate = this.parse(this.props.minDate, 'date');
         const maxDate = this.parse(this.props.maxDate, 'date');
         if (parsedText) {
-            return (!(minDate && isBefore(parsedText, minDate) ||
-                maxDate && isAfter(parsedText, maxDate)));
+            return !((minDate && isBefore(parsedText, minDate)) || (maxDate && isAfter(parsedText, maxDate)));
         }
         return false;
     };
     scheduleScroll = () => {
-        const current = this.state.scrollDate && this.parse(this.state.scrollDate, 'date') ||
+        const current = (this.state.scrollDate && this.parse(this.state.scrollDate, 'date')) ||
             this.parse(this.props[this.state.active], 'date') ||
             new Date();
         const goal = this._scrollDate;
-        if (!current ||
-            !goal ||
-            DatePopup.sameDay(goal, current)) {
+        if (!current || !goal || DatePopup.sameDay(goal, current)) {
             this._scrollDate = null;
             this._scrollTS = null;
             return;
@@ -190,7 +187,7 @@ export default class DatePopup extends Component {
         if (this._scrollTS) {
             const diff = goal - Number(current);
             const dt = Date.now() - this._scrollTS;
-            const next = goal - diff * (Math.E ** (-dt / scrollExpDelay));
+            const next = goal - diff * Math.E ** (-dt / scrollExpDelay);
             this.setState({ scrollDate: next });
         }
         this._scrollTS = Date.now();
@@ -213,14 +210,14 @@ export default class DatePopup extends Component {
         }
         this.setState({
             text,
-            hoverDate: null
+            hoverDate: null,
         });
     };
     handleConfirm = memoize((name) => () => this.confirm(name));
     selectHandler = (date) => {
         if (this.isInTimeMode()) {
             this.setState({
-                active: 'time'
+                active: 'time',
             }, () => this.select({ date }));
         }
         else {
@@ -233,12 +230,12 @@ export default class DatePopup extends Component {
         if (this.props.range) {
             changes = {
                 from: null,
-                to: null
+                to: null,
             };
         }
         else {
             changes = {
-                date: null
+                date: null,
             };
         }
         this.select(changes);
@@ -255,14 +252,13 @@ export default class DatePopup extends Component {
             const value = this.props[key];
             return {
                 ...obj,
-                [key]: this.parse(value, key)
+                [key]: this.parse(value, key),
             };
         }, {});
         const activeDate = this.state.active !== 'time'
-            ? this.state.hoverDate ||
-                (this.state.text != null ? this.parse(this.state.text, 'date') : null)
+            ? this.state.hoverDate || (this.state.text != null ? this.parse(this.state.text, 'date') : null)
             : this.state.hoverDate || null;
-        const currentRange = range && dates.from && dates.to && [dates.from, dates.to] || null;
+        const currentRange = (range && dates.from && dates.to && [dates.from, dates.to]) || null;
         let activeRange = null;
         if (range && activeDate) {
             switch (this.state.active) {
@@ -297,7 +293,7 @@ export default class DatePopup extends Component {
             currentRange,
             activeRange,
             onScroll: this.handleScroll,
-            onScrollChange: this.scrollTo
+            onScrollChange: this.scrollTo,
         };
         const clearable = Boolean(this.props.onClear);
         return (<div className={styles.datePopup} data-test="ring-date-popup" ref={this.componentRef}>
@@ -310,9 +306,7 @@ export default class DatePopup extends Component {
                 return (<DateInput {...this.props} {...this.state} divider={name === 'from' && (dates[name] != null || parsedTo != null)} name={name} key={name} date={dates[name]} active={this.state.active === name} onActivate={this.handleActivate(name)} onInput={this.handleInput} onConfirm={this.handleConfirm(name)} onClear={onClear} locale={locale}/>);
             })}
 
-          {this.isInTimeMode()
-                ? (<DateInput {...this.props} text={this.state.text} divider={!!parsedDate} hoverDate={null} name={'time'} key={'time'} date={null} time={time} active={this.state.active === 'time'} onActivate={this.handleActivate('time')} onInput={this.handleInput} onConfirm={this.handleConfirm('time')} onClear={clearable && this.onClear || undefined} locale={locale}/>)
-                : ('')}
+          {this.isInTimeMode() ? (<DateInput {...this.props} text={this.state.text} divider={!!parsedDate} hoverDate={null} name={'time'} key={'time'} date={null} time={time} active={this.state.active === 'time'} onActivate={this.handleActivate('time')} onInput={this.handleInput} onConfirm={this.handleConfirm('time')} onClear={(clearable && this.onClear) || undefined} locale={locale}/>) : ('')}
         </div>
         <Weekdays locale={locale}/>
         <div className={styles.calendar}>

package/components/date-picker/day.js

@@ -35,8 +35,8 @@ export default class Day extends Component {
     isDisabled = (date) => {
         const min = this.parse(this.props.minDate);
         const max = this.parse(this.props.maxDate);
-        return (min != null && isBefore(startOfDay(date), startOfDay(min))) ||
-            (max != null && isAfter(startOfDay(date), startOfDay(max)));
+        return ((min != null && isBefore(startOfDay(date), startOfDay(min))) ||
+            (max != null && isAfter(startOfDay(date), startOfDay(max))));
     };
     parse(text) {
         return this.props.parseDateInput(text);
@@ -58,19 +58,16 @@ export default class Day extends Component {
                 [styles.active]: !disabled && this.is('activeDate'),
                 [styles.weekend]: [weekdays.SA, weekdays.SU].includes(getDay(day)),
                 [styles.empty]: empty,
-                [styles.from]: (currentRange && this.isDay(currentRange[0]) && !reverse ||
-                    activeRange && this.isDay(activeRange[0])),
-                [styles.to]: (currentRange && this.isDay(currentRange[1])) ||
-                    activeRange && this.isDay(activeRange[1]),
+                [styles.from]: (currentRange && this.isDay(currentRange[0]) && !reverse) || (activeRange && this.isDay(activeRange[0])),
+                [styles.to]: (currentRange && this.isDay(currentRange[1])) || (activeRange && this.isDay(activeRange[1])),
                 [styles.between]: this.inRange(currentRange),
                 [styles.activeBetween]: !disabled && this.inRange(activeRange),
                 [styles.first]: getDate(day) === 1,
                 [styles.spread]: this.inRange(spreadRange),
                 [styles.activeSpread]: !disabled && this.inRange(activeSpreadRange),
-                [styles.disabled]: disabled
+                [styles.disabled]: disabled,
             })} onClick={this.handleClick} onMouseOver={this.handleMouseOver} onFocus={this.handleMouseOver} onMouseOut={this.handleMouseOut} onBlur={this.handleMouseOut} disabled={disabled}>
-        {empty || (<span className={classNames({ [styles.today]: isToday(day) })}>
-            {format(day, 'd')}</span>)}
+        {empty || <span className={classNames({ [styles.today]: isToday(day) })}>{format(day, 'd')}</span>}
       </button>);
     }
 }