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

package/lib/cjs/calendar/eventUtil.d.ts

@@ -30,17 +30,18 @@ export interface DateObj {
     isSameMonth: boolean;
     month: string;
 }
-export declare type weeekStartsOnEnum = 0 | 1 | 2 | 3 | 4 | 5 | 6;
-export declare const calcRangeData: (value: Date, start: Date, rangeLen: number, mode: string, locale: Locale, weekStartsOn: weeekStartsOnEnum) => DateObj[];
+export type weekStartsOnEnum = 0 | 1 | 2 | 3 | 4 | 5 | 6;
+export declare const calcRangeData: (value: Date, start: Date, rangeLen: number, mode: string, locale: Locale, weekStartsOn: weekStartsOnEnum) => DateObj[];
 /**
  *
- * @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 declare const calcWeekData: (value: Date, mode: string, locale: Locale, weekStartsOn: weeekStartsOnEnum) => DateObj[];
+export declare const calcWeekData: (value: Date, monthStart: Date | null, mode: string, locale: Locale, weekStartsOn: weekStartsOnEnum) => DateObj[];
 /**
  *
  * @param {object} event
@@ -74,7 +75,7 @@ export declare const filterEvents: (events: Map<string, EventObject[]>, start: D
  * @returns {arr}
  * filter out event that is not in the week range
  */
-export declare const filterWeeklyEvents: (events: Map<string, EventObject[]>, weekStart: Date, weekStartsOn: weeekStartsOnEnum) => Map<string, EventObject[]>;
+export declare const filterWeeklyEvents: (events: Map<string, EventObject[]>, weekStart: Date, weekStartsOn: weekStartsOnEnum) => Map<string, EventObject[]>;
 /**
  * @returns {arr}
  * arrange and sort all day event for a range
@@ -84,7 +85,7 @@ export declare const parseRangeAllDayEvent: (event: EventObject[], startDate: Da
  * @returns {arr}
  * arrange and sort weekly all day event
  */
-export declare const parseWeeklyAllDayEvent: (event: EventObject[], startDate: Date, weekStart: Date, parsed: Array<Array<ParsedRangeEvent>>, weekStartsOn: weeekStartsOnEnum) => ParsedRangeEvent[][];
+export declare const parseWeeklyAllDayEvent: (event: EventObject[], startDate: Date, weekStart: Date, parsed: Array<Array<ParsedRangeEvent>>, weekStartsOn: weekStartsOnEnum) => ParsedRangeEvent[][];
 export declare const collectDailyEvents: (events: ParsedRangeEvent[][]) => ParsedRangeEvent[][];
 export declare const renderDailyEvent: (event: EventObject) => {
     startPos: number;

package/lib/cjs/calendar/eventUtil.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.sortDate = exports.round = exports.renderDailyEvent = exports.parseWeeklyAllDayEvent = exports.parseRangeAllDayEvent = exports.parseEvent = exports.parseAllDayEvent = exports.isAllDayEvent = exports.getPos = exports.getCurrDate = exports.filterWeeklyEvents = exports.filterEvents = exports.convertEventsArrToMap = exports.collectDailyEvents = exports.checkWeekend = exports.calcWeekData = exports.calcRowHeight = exports.calcRangeData = exports.amendEvent = void 0;
-
 var _dateFns = require("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);
@@ -16,41 +14,29 @@ const copyEvent = function (event, date, start, end) {
   copied.allDay = allDay;
   return copied;
 };
-
 const isDateInRange = (dirtyDate, dirtyStart, dirtyEnd) => {
   const date = (0, _dateFns.toDate)(dirtyDate);
   const start = (0, _dateFns.toDate)(dirtyStart);
   const end = (0, _dateFns.toDate)(dirtyEnd);
   return date.getTime() < end.getTime() && date.getTime() >= start.getTime();
 };
-
 const sortDate = (a, b) => {
   const res = (0, _dateFns.isBefore)(new Date(a), new Date(b)) ? -1 : 1;
   return res;
 };
-
 exports.sortDate = sortDate;
-
 const checkWeekend = val => (0, _dateFns.isWeekend)(val);
-
 exports.checkWeekend = checkWeekend;
-
 const getCurrDate = () => new Date();
-
 exports.getCurrDate = getCurrDate;
-
 const round = value => Math.round(value * 1000) / 1000;
-
 exports.round = round;
-
 const getPos = value => {
   const currSec = ((0, _dateFns.getHours)(value) * 60 + (0, _dateFns.getMinutes)(value)) * 60 + (0, _dateFns.getSeconds)(value);
   const totalSec = 24 * 60 * 60;
   return currSec / totalSec;
 };
-
 exports.getPos = getPos;
-
 const isAllDayEvent = event => 'allDay' in event && event.allDay;
 /**
  *
@@ -59,16 +45,12 @@ 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
  */
-
-
 exports.isAllDayEvent = isAllDayEvent;
-
 const amendEvent = event => {
   const {
     start,
     end
   } = event;
-
   if (!start && !end) {
     return undefined;
   } else if (!start) {
@@ -76,7 +58,6 @@ const amendEvent = event => {
   } else {
     event.end = (0, _dateFns.isSameDay)(start, (0, _dateFns.addHours)(start, 1)) ? (0, _dateFns.addHours)(start, 1) : (0, _dateFns.endOfDay)(start);
   }
-
   return event;
 };
 /**
@@ -84,17 +65,12 @@ const amendEvent = event => {
  * @param {arr} events
  * find the max topInd and used as row height
  */
-
-
 exports.amendEvent = amendEvent;
-
 const calcRowHeight = events => {
   const topIndArr = events.map(item => item.topInd);
   return topIndArr.length ? Math.max(...topIndArr) + 1 : 1;
 };
-
 exports.calcRowHeight = calcRowHeight;
-
 const calcRangeData = (value, start, rangeLen, mode, locale, weekStartsOn) => {
   const today = getCurrDate();
   const arr = [];
@@ -113,38 +89,35 @@ const calcRangeData = (value, start, rangeLen, mode, locale, weekStartsOn) => {
     });
     dateObj.isToday = (0, _dateFns.isSameDay)(date, today);
     dateObj.isWeekend = checkWeekend(date);
-
     if (mode === 'month') {
       dateObj.isSameMonth = (0, _dateFns.isSameMonth)(value, date);
       dateObj.month = (0, _dateFns.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
  */
-
-
 exports.calcRangeData = calcRangeData;
-
-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;
+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 = (0, _dateFns.startOfWeek)(value, {
     weekStartsOn
   });
-  return calcRangeData(value, start, 7, mode, locale, weekStartsOn);
+  const realValue = monthStart || value;
+  return calcRangeData(realValue, start, 7, mode, locale, weekStartsOn);
 };
 /**
  *
@@ -153,10 +126,7 @@ 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
  */
-
-
 exports.calcWeekData = calcWeekData;
-
 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;
@@ -165,7 +135,6 @@ const parseAllDayEvent = function (event) {
     start,
     end
   } = event;
-
   if (start && end) {
     const diff = (0, _dateFns.differenceInCalendarDays)(end, start);
     [...Array(diff + 1).keys()].map(day => {
@@ -175,7 +144,6 @@ const parseAllDayEvent = function (event) {
     const date = start || end || currDate;
     res.push(copyEvent(event, (0, _dateFns.startOfDay)(date), null, null, allDay));
   }
-
   return res;
 };
 /**
@@ -184,26 +152,20 @@ const parseAllDayEvent = function (event) {
  * @returns {object[]} { allDay: boolean, data: Date, start: Date, end: Date, children: ReactNode }
  * parsed events
  */
-
-
 exports.parseAllDayEvent = parseAllDayEvent;
-
 const parseEvent = event => {
   const {
     start,
     end
   } = event;
   let res = [];
-
   if (isAllDayEvent(event)) {
     return parseAllDayEvent(event);
   }
-
   if (start && end) {
     if (!(0, _dateFns.isBefore)(start, end)) {
       [event.start, event.end] = [event.end, event.start];
     }
-
     if ((0, _dateFns.isSameDay)(start, end)) {
       res.push(copyEvent(event, (0, _dateFns.startOfDay)(start)));
     } else if (Math.abs((0, _dateFns.differenceInHours)(start, end)) < 24) {
@@ -216,7 +178,6 @@ const parseEvent = event => {
     const amend = amendEvent(event);
     res.push(copyEvent(amend, (0, _dateFns.startOfDay)(amend.start)));
   }
-
   return res;
 };
 /**
@@ -227,23 +188,17 @@ const parseEvent = event => {
  * @returns {map}
  * convert events array to may, use datestring as key
  */
-
-
 exports.parseEvent = parseEvent;
-
 const convertEventsArrToMap = (arr, key, func, displayValue) => {
   const res = new Map();
   arr.forEach(item => {
     let val;
-
     if (key in item) {
       val = item[key];
     } else {
       val = (0, _dateFns.startOfDay)(displayValue);
     }
-
     const k = func ? func(val).toString() : val.toString();
-
     if (res.has(k)) {
       res.get(k).push(item);
     } else {
@@ -256,23 +211,23 @@ const convertEventsArrToMap = (arr, key, func, displayValue) => {
  * @returns {arr}
  * filter out event that is not in the date range
  */
-
-
 exports.convertEventsArrToMap = convertEventsArrToMap;
-
 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 ((0, _dateFns.isBefore)(end, date)) {// do nothing
+      if (res.has(day)) {
+        res.set(day, [...res.get(day), ...item]);
+      } else {
+        res.set(day, item);
+      }
+    } else if ((0, _dateFns.isBefore)(end, date)) {
+      // do nothing
     } else {
       const filtered = item.filter(i => !i.end || !(0, _dateFns.isBefore)(i.end, start));
       const key = start.toString();
-
       if (res.has(key)) {
         res.set(key, [...res.get(key), ...filtered]);
       } else {
@@ -286,11 +241,7 @@ const filterEvents = (events, start, end) => {
  * @returns {arr}
  * filter out event that is not in the week range
  */
-// eslint-disable-next-line max-len
-
-
 exports.filterEvents = filterEvents;
-
 const filterWeeklyEvents = (events, weekStart, weekStartsOn) => filterEvents(events, weekStart, (0, _dateFns.addDays)((0, _dateFns.endOfWeek)(weekStart, {
   weekStartsOn
 }), 1));
@@ -298,10 +249,7 @@ const filterWeeklyEvents = (events, weekStart, weekStartsOn) => filterEvents(eve
  * @returns {arr}
  * arrange and sort all day event for a range
  */
-
-
 exports.filterWeeklyEvents = filterWeeklyEvents;
-
 const parseRangeAllDayEvent = (event, startDate, rangeStart, rangeEnd, parsed) => {
   const dateRangeLen = (0, _dateFns.differenceInCalendarDays)(rangeEnd, rangeStart);
   event.sort((a, b) => sortDate(a.start, b.start)).forEach(item => {
@@ -312,17 +260,14 @@ const parseRangeAllDayEvent = (event, startDate, rangeStart, rangeEnd, parsed) =
     let dateLength;
     const j = (0, _dateFns.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) ? (0, _dateFns.differenceInCalendarDays)(end, startDate) : (0, _dateFns.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;
@@ -330,7 +275,6 @@ const parseRangeAllDayEvent = (event, startDate, rangeStart, rangeEnd, parsed) =
       if (!parsed[i]) {
         parsed[i] = [];
       }
-
       if (dist > 0) {
         parsed[i][j + dist] = item;
       } else {
@@ -344,16 +288,11 @@ const parseRangeAllDayEvent = (event, startDate, rangeStart, rangeEnd, parsed) =
  * @returns {arr}
  * arrange and sort weekly all day event
  */
-
-
 exports.parseRangeAllDayEvent = parseRangeAllDayEvent;
-
 const parseWeeklyAllDayEvent = (event, startDate, weekStart, parsed, weekStartsOn) => parseRangeAllDayEvent(event, startDate, weekStart, (0, _dateFns.addDays)((0, _dateFns.endOfWeek)(startDate, {
   weekStartsOn
 }), 1), parsed);
-
 exports.parseWeeklyAllDayEvent = parseWeeklyAllDayEvent;
-
 const collectDailyEvents = events => {
   const collections = {};
   events.forEach((row, rowInd) => {
@@ -368,11 +307,8 @@ const collectDailyEvents = events => {
   });
   return collections;
 };
-
 exports.collectDailyEvents = collectDailyEvents;
-
 const renderDailyEvent = event => {
-  // eslint-disable-next-line prefer-const
   let {
     start,
     end,
@@ -380,7 +316,6 @@ const renderDailyEvent = event => {
     children
   } = event;
   let startPos, endPos;
-
   if (isAllDayEvent(event)) {
     startPos = 0;
     endPos = 0;
@@ -392,11 +327,9 @@ const renderDailyEvent = event => {
     if (!(0, _dateFns.isBefore)(start, end)) {
       [start, end] = [end, start];
     }
-
     startPos = getPos(start);
     endPos = getPos(end);
   }
-
   const parsed = {
     startPos: round(startPos),
     endPos: round(endPos),
@@ -405,5 +338,4 @@ const renderDailyEvent = event => {
   };
   return parsed;
 };
-
 exports.renderDailyEvent = renderDailyEvent;

package/lib/cjs/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;