@jetbrains/ring-ui-built 7.0.113 → 7.0.115

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

@@ -1,5 +1,6 @@
 import { dateAnimationDuration } from './consts.js';
 import 'date-fns/add';
+import 'date-fns';
 import '../global/sniffer.js';
 import 'sniffr';
 

package/components/date-picker/consts.d.ts

@@ -1,5 +1,5 @@
 import { type ReactNode } from 'react';
-import type { Locale } from 'date-fns';
+import { type Locale } from 'date-fns';
 declare const units: {
     unit: number;
     cellSize: number;
@@ -24,10 +24,11 @@ export declare const yearDuration: number;
 export declare const yearScrollSpeed: number;
 export declare const DOUBLE = 2;
 export declare const HALF = 0.5;
-export declare function parseTime(time: string): string | null;
+export declare function parseTime(time: string | null | undefined): string | null;
 export declare function shiftWeekArray<T>(arr: T[], startOfWeek: number): T[];
 export declare function getWeekStartsOn(locale: Locale | undefined): number;
 export declare function getDayNumInWeek(locale: Locale | undefined, day: number): number;
+export declare function getDefaultScrollDate({ minDate, maxDate, parseDateInput, }: Pick<DatePopupBaseProps, 'minDate' | 'maxDate' | 'parseDateInput'>): Date;
 export interface DateInputTranslations {
     addFirstDate?: string;
     addSecondDate?: string;

package/components/date-picker/consts.js

@@ -1,4 +1,5 @@
 import { add } from 'date-fns/add';
+import { endOfDay } from 'date-fns';
 import sniffr from '../global/sniffer.js';
 import 'sniffr';
 
@@ -32,13 +33,14 @@ const yearScrollSpeed = yearDuration / (YEAR * units.cellSize);
 const DOUBLE = 2;
 const HALF = 0.5;
 function parseTime(time) {
-  let result = null;
+  if (!time) return null;
   if (/^([01][0-9]|2[0-3]):[0-5][0-9]$/.test(time)) {
-    result = time;
-  } else if (/^([0-9]|2[0-3]):[0-5][0-9]$/.test(time)) {
-    result = `0${time}`;
+    return time;
   }
-  return result;
+  if (/^([0-9]|2[0-3]):[0-5][0-9]$/.test(time)) {
+    return `0${time}`;
+  }
+  return null;
 }
 function shiftWeekArray(arr, startOfWeek) {
   const shiftTimes = startOfWeek - 1;
@@ -52,6 +54,29 @@ function getDayNumInWeek(locale, day) {
   const weekDays = shiftWeekArray(Object.values(weekdays), getWeekStartsOn(locale));
   return weekDays.indexOf(day);
 }
+function getDefaultScrollDate({
+  minDate,
+  maxDate,
+  parseDateInput
+}) {
+  const minDateParsed = parseDateInput(minDate);
+  const maxDateParsed = parseDateInput(maxDate);
+  const maxDateEndOfDayNum = maxDateParsed ? Number(endOfDay(maxDateParsed)) : null;
+  const now = Date.now();
+  if (minDateParsed != null && maxDateEndOfDayNum != null) {
+    if (minDateParsed.getTime() <= now && now <= maxDateEndOfDayNum) {
+      return new Date(now);
+    }
+    return minDateParsed;
+  }
+  if (minDateParsed != null && minDateParsed.getTime() > now) {
+    return minDateParsed;
+  }
+  if (maxDateParsed != null && maxDateEndOfDayNum != null && maxDateEndOfDayNum < now) {
+    return maxDateParsed;
+  }
+  return new Date(now);
+}
 /**
  * Safari on iPhone doesn't allow setting scrollTop while a scroll is in progress.
  * If you do, the browser will overwrite it during the next scroll event.
@@ -68,4 +93,4 @@ const calendarSyncOnYearScrollUpdateDelay = isSafariOnIPhone ? 130 : 100;
 const dateAnimationDuration = 150;
 const yearsAnimationDuration = 200;
 
-export { DOUBLE, FIFTH_DAY, HALF, MIDDLE_DAY, WEEK, YEAR, calendarSyncOnYearScrollUpdateDelay, dateAnimationDuration, units as default, getDayNumInWeek, getWeekStartsOn, isSafariOnIPhone, parseTime, scrollerReRenderDelayIPhone, shiftWeekArray, weekdays, yearDuration, yearScrollSpeed, yearsAnimationDuration };
+export { DOUBLE, FIFTH_DAY, HALF, MIDDLE_DAY, WEEK, YEAR, calendarSyncOnYearScrollUpdateDelay, dateAnimationDuration, units as default, getDayNumInWeek, getDefaultScrollDate, getWeekStartsOn, isSafariOnIPhone, parseTime, scrollerReRenderDelayIPhone, shiftWeekArray, weekdays, yearDuration, yearScrollSpeed, yearsAnimationDuration };

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

@@ -92,11 +92,11 @@ import './month-slider.js';
 
 const PopupComponent = t0 => {
   const $ = c(20);
-  if ($[0] !== "6c0fae779955e7446a1909ff7858d48071c9f49aa4bbd93c41f2fade36c29627") {
+  if ($[0] !== "9234d8ca8b34a5b7faad566d500afe9eaca1e8773f78755a6a2c893b2294c421") {
     for (let $i = 0; $i < 20; $i += 1) {
       $[$i] = Symbol.for("react.memo_cache_sentinel");
     }
-    $[0] = "6c0fae779955e7446a1909ff7858d48071c9f49aa4bbd93c41f2fade36c29627";
+    $[0] = "9234d8ca8b34a5b7faad566d500afe9eaca1e8773f78755a6a2c893b2294c421";
   }
   let className;
   let datePopupProps;
@@ -260,8 +260,18 @@ class DatePicker extends PureComponent {
       withTime,
       applyTimeInput
     } = this.props;
-    const adjustedChange = withTime && !(change instanceof Date) && change?.date ? applyTimeInput(change.date, change.time) : change;
-    onChange(adjustedChange);
+    if (withTime && !(change instanceof Date) && change && 'date' in change && 'time' in change) {
+      const {
+        date,
+        time
+      } = change;
+      if (date) {
+        const dateWithTime = applyTimeInput(date, time);
+        onChange(dateWithTime);
+      }
+    } else {
+      onChange(change);
+    }
   };
   clear = () => {
     let change = null;
@@ -282,16 +292,18 @@ class DatePicker extends PureComponent {
     this.popup?._onCloseAttempt();
   };
   parse = memoize(date => {
-    const {
-      parseDateInput
-    } = this.props;
+    let normalizedDate;
     if (date instanceof Date) {
-      return date;
-    }
-    if (typeof date === 'number') {
-      return new Date(date);
+      normalizedDate = date;
+    } else if (typeof date === 'number') {
+      normalizedDate = new Date(date);
+    } else {
+      const {
+        parseDateInput
+      } = this.props;
+      normalizedDate = parseDateInput(date);
     }
-    return parseDateInput(date);
+    return normalizedDate && isValid(normalizedDate) ? normalizedDate : null;
   });
   formatTime() {
     const {

package/components/date-picker/date-popup.d.ts

@@ -7,13 +7,11 @@ export default class DatePopup extends Component<DatePopupProps, DatePopupState>
         onChange(): void;
     };
     constructor(props: DatePopupProps);
-    componentDidUpdate(prevProps: DatePopupBaseProps, prevState: DatePopupState): void;
+    componentDidUpdate(_prevProps: DatePopupBaseProps, prevState: DatePopupState): void;
     componentWillUnmount(): void;
     private animationCleanup;
     isInTimeMode: () => boolean;
     componentRef: React.RefObject<HTMLDivElement | null>;
-    parse(text: string | null | undefined, type: 'time'): string;
-    parse(text: Date | number | string | null | undefined, type?: 'date' | 'from' | 'to'): Date;
     select(changes: DatePickerChange): void;
     confirm(name: Field): void;
     isValidDate: (parsedText: Date) => boolean;

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

@@ -9,7 +9,7 @@ import DateInput from './date-input.js';
 import Months from './months.js';
 import Years from './years.js';
 import Weekdays from './weekdays.js';
-import { parseTime } from './consts.js';
+import { getDefaultScrollDate, parseTime } from './consts.js';
 import { animateDate } from './animate-date.js';
 import MonthNames from './month-names.js';
 import { s as styles } from '../_helpers/date-picker.js';
@@ -79,31 +79,33 @@ class DatePopup extends Component {
     };
     const {
       range,
-      withTime
+      withTime,
+      parseDateInput
     } = props;
     if (!range) {
-      const parsedDate = this.parse(props.date, 'date');
+      const parsedDate = parseDateInput(props.date);
       const active = withTime && parsedDate && !props.time ? 'time' : 'date';
       this.state = {
         ...defaultState,
         active,
         scrollDate: {
-          date: parsedDate,
+          date: parsedDate !== null && parsedDate !== void 0 ? parsedDate : getDefaultScrollDate(props),
           source: 'other'
         }
       };
     } else {
+      var _parseDateInput;
       this.state = {
         ...defaultState,
         active: props.from && !props.to ? 'to' : 'from',
         scrollDate: {
-          date: this.parse(props.from, 'from'),
+          date: (_parseDateInput = parseDateInput(props.from)) !== null && _parseDateInput !== void 0 ? _parseDateInput : getDefaultScrollDate(props),
           source: 'other'
         }
       };
     }
   }
-  componentDidUpdate(prevProps, prevState) {
+  componentDidUpdate(_prevProps, prevState) {
     if (this.state.active !== prevState.active) {
       if (this.state.text && prevState.active) {
         this.confirm(prevState.active);
@@ -119,16 +121,11 @@ class DatePopup extends Component {
   animationCleanup = null;
   isInTimeMode = () => !this.props.range && this.props.withTime || false;
   componentRef = /*#__PURE__*/React.createRef();
-  parse(text, type) {
-    if (type === 'time') {
-      return parseTime(String(text));
-    }
-    return this.props.parseDateInput(text);
-  }
   select(changes) {
     const {
       range,
-      withTime
+      withTime,
+      parseDateInput
     } = this.props;
     const prevActive = this.state.active;
     if (!range && !withTime) {
@@ -144,8 +141,8 @@ class DatePopup extends Component {
       this.props.onChange(adjustedDate);
       this.props.onComplete();
     } else if (!range && withTime) {
-      const date = this.parse(this.props.date, 'date');
-      const time = this.parse(this.props.time, 'time');
+      const date = parseDateInput(this.props.date);
+      const time = parseTime(this.props.time);
       const changeToSubmit = {
         date: changes.date || date,
         time: changes.time || time
@@ -167,8 +164,8 @@ class DatePopup extends Component {
         ...this.props,
         ...changes
       };
-      from = this.parse(from, 'from');
-      to = this.parse(to, 'to');
+      from = parseDateInput(from);
+      to = parseDateInput(to);
       // proceed to setting the end by default
       let active = 'to';
       let complete = false;
@@ -204,14 +201,17 @@ class DatePopup extends Component {
     const text = this.state.text;
     let result;
     if (name === 'time') {
-      result = this.parse(text, name);
-      const time = this.parse('time' in this.props ? this.props.time : '', 'time');
+      result = parseTime(text);
+      const time = parseTime('time' in this.props ? this.props.time : '');
       const emptyCase = this.state.active === 'time' ? '00:00' : null;
       result = result || time || emptyCase;
     } else {
-      result = this.parse(text, name);
-      if (!this.isValidDate(result)) {
-        result = this.parse(name in this.props ? this.props[name] : '', name);
+      const {
+        parseDateInput
+      } = this.props;
+      result = parseDateInput(text);
+      if (!result || !this.isValidDate(result)) {
+        result = parseDateInput(name in this.props ? this.props[name] : '');
       }
     }
     this.select({
@@ -219,10 +219,15 @@ class DatePopup extends Component {
     });
   }
   isValidDate = parsedText => {
-    const minDate = this.parse(this.props.minDate, 'date');
-    const maxDate = this.parse(this.props.maxDate, 'date');
+    const {
+      parseDateInput,
+      minDate,
+      maxDate
+    } = this.props;
+    const parsedMinDate = parseDateInput(minDate);
+    const parsedMaxDate = parseDateInput(maxDate);
     if (parsedText) {
-      return !(minDate && isBefore(parsedText, minDate) || maxDate && isAfter(parsedText, maxDate));
+      return !(parsedMinDate && isBefore(parsedText, parsedMinDate) || parsedMaxDate && isAfter(parsedText, parsedMaxDate));
     }
     return false;
   };
@@ -234,8 +239,8 @@ class DatePopup extends Component {
   }));
   handleInput = (text, name) => {
     if (name !== 'time') {
-      const parsed = this.parse(text, name);
-      if (this.isValidDate(parsed)) {
+      const parsed = this.props.parseDateInput(text);
+      if (parsed && this.isValidDate(parsed)) {
         this.animationCleanup?.();
         const currentScrollDate = this.state.scrollDate?.date;
         if (currentScrollDate != null) {
@@ -299,7 +304,8 @@ class DatePopup extends Component {
   render() {
     const {
       range,
-      locale
+      locale,
+      parseDateInput
     } = this.props;
     const {
       from,
@@ -308,17 +314,17 @@ class DatePopup extends Component {
       time,
       ...restProps
     } = this.props;
-    const parsedDate = this.parse(this.props.date, 'date');
-    const parsedTo = this.parse(this.props.to, 'to');
+    const parsedDate = parseDateInput(date);
+    const parsedTo = parseDateInput(to);
     const names = range ? ['from', 'to'] : ['date'];
     const dates = names.reduce((obj, key) => {
       const value = this.props[key];
       return {
         ...obj,
-        [key]: this.parse(value, key)
+        [key]: parseDateInput(value)
       };
     }, {});
-    const activeDate = this.state.active !== 'time' ? this.state.hoverDate || (this.state.text ? this.parse(this.state.text, 'date') : null) : this.state.hoverDate || null;
+    const activeDate = this.state.active !== 'time' ? this.state.hoverDate || (this.state.text ? parseDateInput(this.state.text) : null) : this.state.hoverDate || null;
     const currentRange = range && dates.from && dates.to && [dates.from, dates.to] || null;
     let activeRange = null;
     if (range && activeDate) {

package/components/date-picker/day.js

@@ -14,6 +14,7 @@ import { getDayNumInWeek, weekdays } from './consts.js';
 import { s as styles } from '../_helpers/date-picker.js';
 import { jsx } from 'react/jsx-runtime';
 import 'date-fns/add';
+import 'date-fns';
 import '../global/sniffer.js';
 import 'sniffr';
 

package/components/date-picker/scroll-arith.js

@@ -1,5 +1,6 @@
 import units, { HALF } from './consts.js';
 import 'date-fns/add';
+import 'date-fns';
 import '../global/sniffer.js';
 import 'sniffr';
 

package/components/date-picker/use-scroll-behavior.js

@@ -3,6 +3,7 @@ import { useState, useRef, useEffect, useLayoutEffect } from 'react';
 import units, { isSafariOnIPhone, scrollerReRenderDelayIPhone } from './consts.js';
 import useEventCallback from '../global/use-event-callback.js';
 import 'date-fns/add';
+import 'date-fns';
 import '../global/sniffer.js';
 import 'sniffr';
 

package/components/date-picker/weekdays.js

@@ -9,6 +9,7 @@ import { shiftWeekArray, getWeekStartsOn, weekdays } from './consts.js';
 import { s as styles } from '../_helpers/date-picker.js';
 import { jsx } from 'react/jsx-runtime';
 import 'date-fns/add';
+import 'date-fns';
 import '../global/sniffer.js';
 import 'sniffr';
 

package/components/date-picker/years.js

@@ -17,6 +17,7 @@ import { useIntersectionObserver, useVisibility } from './use-intersection-obser
 import { s as styles } from '../_helpers/date-picker.js';
 import { jsx } from 'react/jsx-runtime';
 import 'date-fns/add';
+import 'date-fns';
 import '../global/sniffer.js';
 import 'sniffr';
 import '../global/use-event-callback.js';