react-native-ll-calendar 0.15.0 → 0.15.1

package/lib/module/calendar/month-calendar/view/MonthCalendarWeekRow.js

@@ -91,7 +91,8 @@ export const MonthCalendarWeekRow = props => {
           const rawStartDjs = dayjs(event.start);
           const startDjs = dateIndex === 0 ? djs : dayjs(event.start);
           const endDjs = dayjs(event.end);
-          const diffDays = endDjs.startOf('day').diff(startDjs.startOf('day'), 'day');
+          const isEndOnDayBoundary = endDjs.hour() === 0 && endDjs.minute() === 0 && endDjs.second() === 0 && endDjs.millisecond() === 0;
+          const diffDays = Math.max(0, endDjs.startOf('day').diff(startDjs.startOf('day'), 'day') - (isEndOnDayBoundary ? 1 : 0));
           const isPrevDateEvent = dateIndex === 0 && rawStartDjs.isBefore(djs);
           let width = (diffDays + 1) * dateColumnWidth - EVENT_GAP * 2 - CELL_BORDER_WIDTH * 2;
           if (isPrevDateEvent) {

package/lib/module/calendar/month-calendar/view/MonthCalendarWeekRow.js.map

@@ -1 +1 @@
-{"version":3,"names":["dayjs","StyleSheet","useWindowDimensions","Text","TouchableOpacity","View","CELL_BORDER_WIDTH","EVENT_GAP","jsx","_jsx","jsxs","_jsxs","MonthCalendarWeekRow","props","eventHeight","width","screenWidth","dateColumnWidth","weekId","dates","format","eventPosition","resetResource","style","styles","container","onLayout","children","map","djs","dateIndex","text","filteredEvents","events","filter","event","startDjs","start","isBefore","sort","a","b","aStartDjs","bStartDjs","aEndDjs","end","bEndDjs","aDiffDays","startOf","diff","bDiffDays","rowNums","getRowNums","date","toDate","rowsLength","length","eventIndex","ii","includes","push","dayCellCountainer","minHeight","weekRowMinHeight","zIndex","borderColor","cellBorderColor","onPress","onPressCell","onLongPress","onLongPressCell","delayLongPress","delayLongPressCell","dayCellInner","dayCellContainerStyle","dayCellLabel","dayCellText","dayCellTextStyle","isSame","todayCellTextStyle","allowFontScaling","rowIndex","height","marginBottom","rawStartDjs","endDjs","diffDays","isPrevDateEvent","isLastRow","startDate","days","rowNum","backgroundColor","borderStyle","undefined","borderWidth","borderRadius","prevDateEvent","lastRowEvent","onPressEvent","onLongPressEvent","delayLongPressEvent","numberOfLines","ellipsizeMode","eventEllipsizeMode","eventTitle","color","eventTextStyle","title","id","get","create","display","flexDirection","flex","borderRightWidth","borderBottomWidth","position","top","left","right","bottom","paddingVertical","paddingHorizontal","textAlign","fontSize","alignItems","boxShadow","marginTop","marginLeft","borderTopStartRadius","borderBottomStartRadius"],"sourceRoot":"../../../../../src","sources":["calendar/month-calendar/view/MonthCalendarWeekRow.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["dayjs","StyleSheet","useWindowDimensions","Text","TouchableOpacity","View","CELL_BORDER_WIDTH","EVENT_GAP","jsx","_jsx","jsxs","_jsxs","MonthCalendarWeekRow","props","eventHeight","width","screenWidth","dateColumnWidth","weekId","dates","format","eventPosition","resetResource","style","styles","container","onLayout","children","map","djs","dateIndex","text","filteredEvents","events","filter","event","startDjs","start","isBefore","sort","a","b","aStartDjs","bStartDjs","aEndDjs","end","bEndDjs","aDiffDays","startOf","diff","bDiffDays","rowNums","getRowNums","date","toDate","rowsLength","length","eventIndex","ii","includes","push","dayCellCountainer","minHeight","weekRowMinHeight","zIndex","borderColor","cellBorderColor","onPress","onPressCell","onLongPress","onLongPressCell","delayLongPress","delayLongPressCell","dayCellInner","dayCellContainerStyle","dayCellLabel","dayCellText","dayCellTextStyle","isSame","todayCellTextStyle","allowFontScaling","rowIndex","height","marginBottom","rawStartDjs","endDjs","isEndOnDayBoundary","hour","minute","second","millisecond","diffDays","Math","max","isPrevDateEvent","isLastRow","startDate","days","rowNum","backgroundColor","borderStyle","undefined","borderWidth","borderRadius","prevDateEvent","lastRowEvent","onPressEvent","onLongPressEvent","delayLongPressEvent","numberOfLines","ellipsizeMode","eventEllipsizeMode","eventTitle","color","eventTextStyle","title","id","get","create","display","flexDirection","flex","borderRightWidth","borderBottomWidth","position","top","left","right","bottom","paddingVertical","paddingHorizontal","textAlign","fontSize","alignItems","boxShadow","marginTop","marginLeft","borderTopStartRadius","borderBottomStartRadius"],"sourceRoot":"../../../../../src","sources":["calendar/month-calendar/view/MonthCalendarWeekRow.tsx"],"mappings":"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","ignoreList":[]}

package/lib/typescript/src/calendar/month-calendar/view/MonthCalendarWeekRow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MonthCalendarWeekRow.d.ts","sourceRoot":"","sources":["../../../../../../src/calendar/month-calendar/view/MonthCalendarWeekRow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAGL,KAAK,iBAAiB,EACvB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAgC,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAC5E,OAAO,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC/E,OAAO,KAAK,0BAA0B,MAAM,8CAA8C,CAAC;AAE3F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,eAAO,MAAM,oBAAoB,GAAI,OAAO;IAC1C,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;IACrB,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,aAAa,CAAC,EAAE,0BAA0B,CAAC;IAC3C,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAC9C,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAClD,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IACnC,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IACvC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,qBAAqB,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,SAAS,CAAC;IAClD,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,SAAS,CAAC;IAC7C,yBAAyB,CAAC,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,SAAS,CAAC;IAClE,oBAAoB,CAAC,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,SAAS,CAAC;IAC7D,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kBAAkB,CAAC,EAAE,SAAS,CAAC;IAC/B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,SAAS,CAAC;IACrD,kBAAkB,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC;IACzD,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;CAC/C,4CA0LA,CAAC"}
+{"version":3,"file":"MonthCalendarWeekRow.d.ts","sourceRoot":"","sources":["../../../../../../src/calendar/month-calendar/view/MonthCalendarWeekRow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAGL,KAAK,iBAAiB,EACvB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAgC,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAC5E,OAAO,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC/E,OAAO,KAAK,0BAA0B,MAAM,8CAA8C,CAAC;AAE3F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,eAAO,MAAM,oBAAoB,GAAI,OAAO;IAC1C,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;IACrB,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,aAAa,CAAC,EAAE,0BAA0B,CAAC;IAC3C,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAC9C,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAClD,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IACnC,eAAe,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IACvC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,qBAAqB,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,SAAS,CAAC;IAClD,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,SAAS,CAAC;IAC7C,yBAAyB,CAAC,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,SAAS,CAAC;IAClE,oBAAoB,CAAC,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,SAAS,CAAC;IAC7D,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kBAAkB,CAAC,EAAE,SAAS,CAAC;IAC/B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,SAAS,CAAC;IACrD,kBAAkB,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC;IACzD,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;CAC/C,4CAkMA,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-ll-calendar",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "description": "ReactNative Calendar Library",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/src/calendar/month-calendar/view/MonthCalendarWeekRow.tsx

@@ -142,9 +142,17 @@ export const MonthCalendarWeekRow = (props: {
               const rawStartDjs = dayjs(event.start);
               const startDjs = dateIndex === 0 ? djs : dayjs(event.start);
               const endDjs = dayjs(event.end);
-              const diffDays = endDjs
-                .startOf('day')
-                .diff(startDjs.startOf('day'), 'day');
+              const isEndOnDayBoundary =
+                endDjs.hour() === 0 &&
+                endDjs.minute() === 0 &&
+                endDjs.second() === 0 &&
+                endDjs.millisecond() === 0;
+              const diffDays = Math.max(
+                0,
+                endDjs.startOf('day').diff(startDjs.startOf('day'), 'day') -
+                  (isEndOnDayBoundary ? 1 : 0)
+              );
+
               const isPrevDateEvent =
                 dateIndex === 0 && rawStartDjs.isBefore(djs);
               let width =