@pushwoosh/dumb-components 1.1.64 → 1.1.66

package/Calendar/CalendarSuperForm/CalendarSuperForm.js

@@ -18,7 +18,8 @@ export const CalendarSuperForm = props => {
     visibleCount,
     monthWidth,
     gap,
-    firstDayOfWeek
+    firstDayOfWeek,
+    footerContent
   } = props;
   const isRangePicker = mode === 'range-date' || mode === 'range-datetime';
   const withTime = mode === 'single-datetime' || mode === 'range-datetime';
@@ -78,16 +79,16 @@ export const CalendarSuperForm = props => {
     visibleCount: visibleCount !== undefined ? visibleCount : isRangePicker ? 2 : 1,
     monthWidth: monthWidth,
     gap: gap,
-    renderAfter: withTime || maxDays && maxDays > 0 ? () => {
+    renderAfter: withTime || maxDays && maxDays > 0 || footerContent ? () => {
       return React.createElement(Vertical, {
         "$gap": 8,
         "$margin": {
           top: 16
         }
-      }, maxDays && maxDays > 0 && React.createElement(Text, {
+      }, React.createElement(Vertical, null, maxDays && maxDays > 0 && React.createElement(Text, {
         "$variant": "footnote",
         "$color": Color.LOCKED
-      }, `Max length: ${maxDays} days`), withTime && timezone && onChangeTimezone && React.createElement(CalendarTimeAndTimezoneSection, {
+      }, `Max length: ${maxDays} days`), footerContent), withTime && timezone && onChangeTimezone && React.createElement(CalendarTimeAndTimezoneSection, {
         isRangePicker: isRangePicker,
         value: value,
         onChange: onChange,

package/Calendar/CalendarSuperForm/types.d.ts

@@ -1,3 +1,4 @@
+import { type ReactNode } from 'react';
 import { type DateStruct, type DateTimeStruct, type RangeValue, type SingleValue, type TzValue } from '../types';
 interface BaseProps {
     /** Количество видимых месяцев. */
@@ -12,6 +13,8 @@ interface BaseProps {
     disableOnAndAfter?: DateStruct;
     /** Первый день недели: 0 - воскресенье, 1 - понедельник. По умолчанию 0. */
     firstDayOfWeek?: 0 | 1;
+    /** Кастомный футер-аннотация, который рендерится после календаря и после min/max days limitation. */
+    footerContent?: ReactNode;
 }
 export type CalendarMode = 'single-date' | 'single-datetime' | 'range-date' | 'range-datetime';
 export interface CalendarSingleDateProps extends BaseProps {

package/Calendar/helpers.d.ts

@@ -19,7 +19,7 @@ export declare const getLastDayOfMonth: (date: DateStruct) => DateStruct;
 export declare const getPeriodStart: (date: DateTimeStruct | DateStruct, period: Period) => DateTimeStruct;
 export declare const getPeriodEnd: (date: DateTimeStruct | DateStruct, period: Period) => DateTimeStruct;
 export declare const dateToStruct: (date: Date, tzOffsetMinutes: number) => DateTimeStruct;
-export declare const structToDate: (ds: DateTimeStruct, tzOffsetMinutes: number) => Date;
+export declare const structToDate: (ds: DateTimeStruct | DateStruct, tzOffsetMinutes: number) => Date;
 export declare function getTimezoneOffset(timezoneName: string, at?: Date): number;
 export declare const dateToStructTz: (date: Date, tzName: string) => DateTimeStruct;
-export declare const structToDateTz: (ds: DateTimeStruct, tzName: string) => Date;
+export declare const structToDateTz: (ds: DateTimeStruct | DateStruct, tzName: string) => Date;

package/Calendar/helpers.js

@@ -128,7 +128,11 @@ export const dateToStruct = (date, tzOffsetMinutes) => {
   return utcDateToStruct(localTime);
 };
 export const structToDate = (ds, tzOffsetMinutes) => {
-  const utcTime = Date.UTC(ds.year, ds.month - 1, ds.day, ds.hour, ds.minute, ds.second, ds.millisecond);
+  const hour = ds.hour ?? 0;
+  const minute = ds.minute ?? 0;
+  const second = ds.second ?? 0;
+  const millisecond = ds.millisecond ?? 0;
+  const utcTime = Date.UTC(ds.year, ds.month - 1, ds.day, hour, minute, second, millisecond);
   return new Date(utcTime - tzOffsetMinutes * 60_000);
 };
 export function getTimezoneOffset(timezoneName, at = new Date()) {
@@ -158,7 +162,11 @@ export const dateToStructTz = (date, tzName) => {
   return dateToStruct(date, tzOffsetMinutes);
 };
 export const structToDateTz = (ds, tzName) => {
-  const utcTime = Date.UTC(ds.year, ds.month - 1, ds.day, ds.hour, ds.minute, ds.second, ds.millisecond);
+  const hour = ds.hour ?? 0;
+  const minute = ds.minute ?? 0;
+  const second = ds.second ?? 0;
+  const millisecond = ds.millisecond ?? 0;
+  const utcTime = Date.UTC(ds.year, ds.month - 1, ds.day, hour, minute, second, millisecond);
   const tentativeDate = new Date(utcTime);
   const tzOffsetMinutes = getTimezoneOffset(tzName, tentativeDate);
   return new Date(utcTime - tzOffsetMinutes * 60_000);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushwoosh/dumb-components",
-  "version": "1.1.64",
+  "version": "1.1.66",
   "description": "React components to build Pushwoosh products",
   "main": "index.js",
   "module": "index.js",