@douyinfe/semi-foundation 2.24.2 → 2.25.0-alpha.0

package/lib/es/calendar/eventUtil.js

@@ -1,5 +1,4 @@
 import { format, isSameMonth, isWeekend, differenceInCalendarDays, isBefore, addDays, startOfWeek, endOfWeek, getSeconds, differenceInHours, getMinutes, getHours, addHours, isSameDay, endOfDay, startOfDay, toDate } from 'date-fns';
-
 const copyEvent = function (event, date, start, end) {
   let allDay = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
   const copied = Object.assign({}, event);
@@ -9,14 +8,12 @@ const copyEvent = function (event, date, start, end) {
   copied.allDay = allDay;
   return copied;
 };
-
 const isDateInRange = (dirtyDate, dirtyStart, dirtyEnd) => {
   const date = toDate(dirtyDate);
   const start = toDate(dirtyStart);
   const end = toDate(dirtyEnd);
   return date.getTime() < end.getTime() && date.getTime() >= start.getTime();
 };
-
 export const sortDate = (a, b) => {
   const res = isBefore(new Date(a), new Date(b)) ? -1 : 1;
   return res;
@@ -37,13 +34,11 @@ export const isAllDayEvent = event => 'allDay' in event && event.allDay;
  * if event object does not have start time, add start time = end time - 1h; if not same day, then startday of the end
  * if event object does not have end time, add end time = start time + 1h; if not same day, then endday of the start
  */
-
 export const amendEvent = event => {
   const {
     start,
     end
   } = event;
-
   if (!start && !end) {
     return undefined;
   } else if (!start) {
@@ -51,7 +46,6 @@ export const amendEvent = event => {
   } else {
     event.end = isSameDay(start, addHours(start, 1)) ? addHours(start, 1) : endOfDay(start);
   }
-
   return event;
 };
 /**
@@ -59,7 +53,6 @@ export const amendEvent = event => {
  * @param {arr} events
  * find the max topInd and used as row height
  */
-
 export const calcRowHeight = events => {
   const topIndArr = events.map(item => item.topInd);
   return topIndArr.length ? Math.max(...topIndArr) + 1 : 1;
@@ -82,35 +75,34 @@ export const calcRangeData = (value, start, rangeLen, mode, locale, weekStartsOn
     });
     dateObj.isToday = isSameDay(date, today);
     dateObj.isWeekend = checkWeekend(date);
-
     if (mode === 'month') {
       dateObj.isSameMonth = isSameMonth(value, date);
       dateObj.month = format(date, 'LLL', {
         locale
       });
     }
-
     arr.push(dateObj);
   });
   return arr;
 };
 /**
  *
- * @param {value} date
+ * @param {Date} date
+ * @param {Date} monthStart current month start date, using for month mode
  * @param {string} mode
  * @param {string} locale
  * @returns {object[]} { date: Date, dayString: string, ind: number, isToday: boolean, isWeekend: boolean, weekday: string }
  * create weekly object array
  */
-
-export const calcWeekData = function (value) {
-  let mode = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'week';
-  let locale = arguments.length > 2 ? arguments[2] : undefined;
-  let weekStartsOn = arguments.length > 3 ? arguments[3] : undefined;
+export const calcWeekData = function (value, monthStart) {
+  let mode = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'week';
+  let locale = arguments.length > 3 ? arguments[3] : undefined;
+  let weekStartsOn = arguments.length > 4 ? arguments[4] : undefined;
   const start = startOfWeek(value, {
     weekStartsOn
   });
-  return calcRangeData(value, start, 7, mode, locale, weekStartsOn);
+  const realValue = monthStart || value;
+  return calcRangeData(realValue, start, 7, mode, locale, weekStartsOn);
 };
 /**
  *
@@ -119,7 +111,6 @@ export const calcWeekData = function (value) {
  * @returns {object[]} { allDay: boolean, data: Date, start: Date, end: Date, children: ReactNode }
  * parsed a spanned all-day event into multiple dates
  */
-
 export const parseAllDayEvent = function (event) {
   let allDay = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
   let currDate = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : undefined;
@@ -128,7 +119,6 @@ export const parseAllDayEvent = function (event) {
     start,
     end
   } = event;
-
   if (start && end) {
     const diff = differenceInCalendarDays(end, start);
     [...Array(diff + 1).keys()].map(day => {
@@ -138,7 +128,6 @@ export const parseAllDayEvent = function (event) {
     const date = start || end || currDate;
     res.push(copyEvent(event, startOfDay(date), null, null, allDay));
   }
-
   return res;
 };
 /**
@@ -147,23 +136,19 @@ export const parseAllDayEvent = function (event) {
  * @returns {object[]} { allDay: boolean, data: Date, start: Date, end: Date, children: ReactNode }
  * parsed events
  */
-
 export const parseEvent = event => {
   const {
     start,
     end
   } = event;
   let res = [];
-
   if (isAllDayEvent(event)) {
     return parseAllDayEvent(event);
   }
-
   if (start && end) {
     if (!isBefore(start, end)) {
       [event.start, event.end] = [event.end, event.start];
     }
-
     if (isSameDay(start, end)) {
       res.push(copyEvent(event, startOfDay(start)));
     } else if (Math.abs(differenceInHours(start, end)) < 24) {
@@ -176,7 +161,6 @@ export const parseEvent = event => {
     const amend = amendEvent(event);
     res.push(copyEvent(amend, startOfDay(amend.start)));
   }
-
   return res;
 };
 /**
@@ -187,20 +171,16 @@ export const parseEvent = event => {
  * @returns {map}
  * convert events array to may, use datestring as key
  */
-
 export const convertEventsArrToMap = (arr, key, func, displayValue) => {
   const res = new Map();
   arr.forEach(item => {
     let val;
-
     if (key in item) {
       val = item[key];
     } else {
       val = startOfDay(displayValue);
     }
-
     const k = func ? func(val).toString() : val.toString();
-
     if (res.has(k)) {
       res.get(k).push(item);
     } else {
@@ -213,20 +193,22 @@ export const convertEventsArrToMap = (arr, key, func, displayValue) => {
  * @returns {arr}
  * filter out event that is not in the date range
  */
-
 export const filterEvents = (events, start, end) => {
   const res = new Map();
   [...events.keys()].map(day => {
     const item = events.get(day);
     const date = new Date(day);
-
     if (isDateInRange(date, start, end)) {
-      res.set(day, item);
-    } else if (isBefore(end, date)) {// do nothing
+      if (res.has(day)) {
+        res.set(day, [...res.get(day), ...item]);
+      } else {
+        res.set(day, item);
+      }
+    } else if (isBefore(end, date)) {
+      // do nothing
     } else {
       const filtered = item.filter(i => !i.end || !isBefore(i.end, start));
       const key = start.toString();
-
       if (res.has(key)) {
         res.set(key, [...res.get(key), ...filtered]);
       } else {
@@ -240,8 +222,6 @@ export const filterEvents = (events, start, end) => {
  * @returns {arr}
  * filter out event that is not in the week range
  */
-// eslint-disable-next-line max-len
-
 export const filterWeeklyEvents = (events, weekStart, weekStartsOn) => filterEvents(events, weekStart, addDays(endOfWeek(weekStart, {
   weekStartsOn
 }), 1));
@@ -249,7 +229,6 @@ export const filterWeeklyEvents = (events, weekStart, weekStartsOn) => filterEve
  * @returns {arr}
  * arrange and sort all day event for a range
  */
-
 export const parseRangeAllDayEvent = (event, startDate, rangeStart, rangeEnd, parsed) => {
   const dateRangeLen = differenceInCalendarDays(rangeEnd, rangeStart);
   event.sort((a, b) => sortDate(a.start, b.start)).forEach(item => {
@@ -260,17 +239,14 @@ export const parseRangeAllDayEvent = (event, startDate, rangeStart, rangeEnd, pa
     let dateLength;
     const j = differenceInCalendarDays(startDate, rangeStart);
     let i = 0;
-
     while (Boolean(parsed[i]) && Boolean(parsed[i][j])) {
       i++;
     }
-
     if (!end) {
       dateLength = 0;
     } else {
       dateLength = isDateInRange(end, rangeStart, rangeEnd) ? differenceInCalendarDays(end, startDate) : differenceInCalendarDays(rangeEnd, startDate);
     }
-
     itemInfo.leftPos = round(Number(j) / dateRangeLen);
     itemInfo.width = Math.min(1 - round(Number(j) / dateRangeLen), round((dateLength + 1) * 1 / dateRangeLen));
     itemInfo.topInd = i;
@@ -278,7 +254,6 @@ export const parseRangeAllDayEvent = (event, startDate, rangeStart, rangeEnd, pa
       if (!parsed[i]) {
         parsed[i] = [];
       }
-
       if (dist > 0) {
         parsed[i][j + dist] = item;
       } else {
@@ -292,7 +267,6 @@ export const parseRangeAllDayEvent = (event, startDate, rangeStart, rangeEnd, pa
  * @returns {arr}
  * arrange and sort weekly all day event
  */
-
 export const parseWeeklyAllDayEvent = (event, startDate, weekStart, parsed, weekStartsOn) => parseRangeAllDayEvent(event, startDate, weekStart, addDays(endOfWeek(startDate, {
   weekStartsOn
 }), 1), parsed);
@@ -311,7 +285,6 @@ export const collectDailyEvents = events => {
   return collections;
 };
 export const renderDailyEvent = event => {
-  // eslint-disable-next-line prefer-const
   let {
     start,
     end,
@@ -319,7 +292,6 @@ export const renderDailyEvent = event => {
     children
   } = event;
   let startPos, endPos;
-
   if (isAllDayEvent(event)) {
     startPos = 0;
     endPos = 0;
@@ -331,11 +303,9 @@ export const renderDailyEvent = event => {
     if (!isBefore(start, end)) {
       [start, end] = [end, start];
     }
-
     startPos = getPos(start);
     endPos = getPos(end);
   }
-
   const parsed = {
     startPos: round(startPos),
     endPos: round(endPos),

package/lib/es/calendar/foundation.d.ts

@@ -1,8 +1,8 @@
 import BaseFoundation, { DefaultAdapter } from '../base/foundation';
 import { Locale } from 'date-fns';
 import { DateObj } from './eventUtil';
-import type { weeekStartsOnEnum } from './eventUtil';
-export { weeekStartsOnEnum };
+import type { weekStartsOnEnum } from './eventUtil';
+export { weekStartsOnEnum };
 export interface EventObject {
     [x: string]: any;
     key: string;
@@ -36,8 +36,8 @@ export interface WeeklyData {
     month: string;
     week: DateObj[];
 }
-export declare type MonthData = Record<number, DateObj[]>;
-export declare type ParsedEventsType = ParsedEvents | ParsedEventsWithArray | MonthlyEvent;
+export type MonthData = Record<number, DateObj[]>;
+export type ParsedEventsType = ParsedEvents | ParsedEventsWithArray | MonthlyEvent;
 export interface CalendarAdapter<P = Record<string, any>, S = Record<string, any>> extends DefaultAdapter<P, S> {
     updateCurrPos?: (currPos: number) => void;
     updateShowCurrTime?: () => void;