react-native-ll-calendar 0.8.0 → 0.8.2

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

@@ -27,9 +27,12 @@ export const MonthCalendarWeekRow = props => {
         const bStartDjs = dateIndex === 0 ? djs : dayjs(b.start);
         const aEndDjs = dayjs(a.end);
         const bEndDjs = dayjs(b.end);
-        const aDiffDays = aEndDjs.diff(aStartDjs, 'day');
-        const bDiffDays = bEndDjs.diff(bStartDjs, 'day');
-        return bDiffDays - aDiffDays;
+        const aDiffDays = aEndDjs.startOf('day').diff(aStartDjs.startOf('day'), 'day');
+        const bDiffDays = bEndDjs.startOf('day').diff(bStartDjs.startOf('day'), 'day');
+        if (aDiffDays !== bDiffDays) {
+          return bDiffDays - aDiffDays;
+        }
+        return dayjs(a.start).diff(dayjs(b.start));
       });
       const events = [];
       if (weekId && props.eventPosition) {

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","children","map","djs","dateIndex","text","filteredEvents","events","filter","event","startDjs","start","isBefore","sort","a","b","aStartDjs","bStartDjs","aEndDjs","end","bEndDjs","aDiffDays","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","startOf","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":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,UAAU,EAAEC,mBAAmB,QAAQ,cAAc;AAC9D,SAASC,IAAI,EAAEC,gBAAgB,EAAEC,IAAI,QAAwB,cAAc;AAG3E,SAASC,iBAAiB,EAAEC,SAAS,QAAQ,4BAAyB;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAGvE,OAAO,MAAMC,oBAAoB,GAAIC,KAqBpC,IAAK;EACJ,MAAMC,WAAW,GAAGD,KAAK,CAACC,WAAW,IAAI,EAAE;EAC3C,MAAM;IAAEC,KAAK,EAAEC;EAAY,CAAC,GAAGd,mBAAmB,CAAC,CAAC;EACpD,MAAMe,eAAe,GAAGD,WAAW,GAAG,CAAC;EACvC,MAAME,MAAM,GAAGL,KAAK,CAACM,KAAK,CAAC,CAAC,CAAC,EAAEC,MAAM,CAAC,YAAY,CAAC;EACnD,IAAIF,MAAM,IAAIL,KAAK,CAACQ,aAAa,EAAE;IACjCR,KAAK,CAACQ,aAAa,CAACC,aAAa,CAACJ,MAAM,CAAC;EAC3C;EAEA,oBACET,IAAA,CAACJ,IAAI;IAACkB,KAAK,EAAEC,MAAM,CAACC,SAAU;IAAAC,QAAA,EAC3Bb,KAAK,CAACM,KAAK,CAACQ,GAAG,CAAC,CAACC,GAAG,EAAEC,SAAS,KAAK;MACnC,MAAMC,IAAI,GAAGF,GAAG,CAACR,MAAM,CAAC,GAAG,CAAC;MAC5B,MAAMW,cAAc,GAAGlB,KAAK,CAACmB,MAAM,EAC/BC,MAAM,CAAEC,KAAK,IAAK;QAClB,MAAMC,QAAQ,GAAGnC,KAAK,CAACkC,KAAK,CAACE,KAAK,CAAC;QACnC,OACED,QAAQ,CAACf,MAAM,CAAC,YAAY,CAAC,KAAKQ,GAAG,CAACR,MAAM,CAAC,YAAY,CAAC,IACzDS,SAAS,KAAK,CAAC,IAAIM,QAAQ,CAACE,QAAQ,CAACT,GAAG,CAAE;MAE/C,CAAC,CAAC,CACDU,IAAI,CAAC,CAACC,CAAC,EAAEC,CAAC,KAAK;QACd,MAAMC,SAAS,GAAGZ,SAAS,KAAK,CAAC,GAAGD,GAAG,GAAG5B,KAAK,CAACuC,CAAC,CAACH,KAAK,CAAC;QACxD,MAAMM,SAAS,GAAGb,SAAS,KAAK,CAAC,GAAGD,GAAG,GAAG5B,KAAK,CAACwC,CAAC,CAACJ,KAAK,CAAC;QACxD,MAAMO,OAAO,GAAG3C,KAAK,CAACuC,CAAC,CAACK,GAAG,CAAC;QAC5B,MAAMC,OAAO,GAAG7C,KAAK,CAACwC,CAAC,CAACI,GAAG,CAAC;QAC5B,MAAME,SAAS,GAAGH,OAAO,CAACI,IAAI,CAACN,SAAS,EAAE,KAAK,CAAC;QAChD,MAAMO,SAAS,GAAGH,OAAO,CAACE,IAAI,CAACL,SAAS,EAAE,KAAK,CAAC;QAEhD,OAAOM,SAAS,GAAGF,SAAS;MAC9B,CAAC,CAAC;MAEJ,MAAMd,MAAkC,GAAG,EAAE;MAC7C,IAAId,MAAM,IAAIL,KAAK,CAACQ,aAAa,EAAE;QACjC,MAAM4B,OAAO,GAAGpC,KAAK,CAACQ,aAAa,CAAC6B,UAAU,CAAC;UAC7ChC,MAAM;UACNiC,IAAI,EAAEvB,GAAG,CAACwB,MAAM,CAAC;QACnB,CAAC,CAAC;QACF,MAAMC,UAAU,GAAGJ,OAAO,CAACK,MAAM,GAAGvB,cAAc,CAACuB,MAAM;QACzD,IAAIC,UAAU,GAAG,CAAC;QAClB,KAAK,IAAIC,EAAE,GAAG,CAAC,EAAEA,EAAE,IAAIH,UAAU,EAAEG,EAAE,EAAE,EAAE;UACvC,IAAIP,OAAO,CAACQ,QAAQ,CAACD,EAAE,CAAC,EAAE;YACxBxB,MAAM,CAAC0B,IAAI,CAACF,EAAE,CAAC;UACjB,CAAC,MAAM;YACL,MAAMtB,KAAK,GAAGH,cAAc,CAACwB,UAAU,CAAC;YACxC,IAAIrB,KAAK,EAAE;cACTF,MAAM,CAAC0B,IAAI,CAACxB,KAAK,CAAC;YACpB;YACAqB,UAAU,EAAE;UACd;QACF;MACF;MACA,oBACE5C,KAAA,CAACP,gBAAgB;QAEfmB,KAAK,EAAE,CACLC,MAAM,CAACmC,iBAAiB,EACxB;UAAEC,SAAS,EAAE/C,KAAK,CAACgD;QAAiB,CAAC,EACrC;UAAEC,MAAM,EAAE,CAAC,GAAGjC;QAAU,CAAC,EACzB;UAAEkC,WAAW,EAAElD,KAAK,CAACmD,eAAe,IAAI;QAAiB,CAAC,CAC1D;QACFC,OAAO,EAAEA,CAAA,KAAM;UACbpD,KAAK,CAACqD,WAAW,GAAGtC,GAAG,CAACwB,MAAM,CAAC,CAAC,CAAC;QACnC,CAAE;QACFe,WAAW,EAAEA,CAAA,KAAM;UACjBtD,KAAK,CAACuD,eAAe,GAAGxC,GAAG,CAACwB,MAAM,CAAC,CAAC,CAAC;QACvC,CAAE;QACFiB,cAAc,EAAExD,KAAK,CAACyD,kBAAmB;QAAA5C,QAAA,gBAEzCjB,IAAA,CAACJ,IAAI;UACHkB,KAAK,EAAE,CACLC,MAAM,CAAC+C,YAAY,EACnB1D,KAAK,CAAC2D,qBAAqB,GAAG5C,GAAG,CAACwB,MAAM,CAAC,CAAC,CAAC;QAC3C,CACH,CAAC,eACF3C,IAAA,CAACJ,IAAI;UAACkB,KAAK,EAAEC,MAAM,CAACiD,YAAa;UAAA/C,QAAA,eAC/BjB,IAAA,CAACN,IAAI;YACHoB,KAAK,EAAE,CACLC,MAAM,CAACkD,WAAW,EAClB7D,KAAK,CAAC8D,gBAAgB,GAAG/C,GAAG,CAACwB,MAAM,CAAC,CAAC,CAAC,EACtCpD,KAAK,CAAC4B,GAAG,CAAC,CAACgD,MAAM,CAAC5E,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,GAC7Ba,KAAK,CAACgE,kBAAkB,GACxB,CAAC,CAAC,CACN;YACFC,gBAAgB,EAAEjE,KAAK,CAACiE,gBAAiB;YAAApD,QAAA,EAExCI;UAAI,CACD;QAAC,CACH,CAAC,EACNE,MAAM,CAACL,GAAG,CAAC,CAACO,KAAK,EAAE6C,QAAQ,KAAK;UAC/B,IAAI,OAAO7C,KAAK,KAAK,QAAQ,EAAE;YAC7B,oBACEzB,IAAA,CAACJ,IAAI;cAEHkB,KAAK,EAAE;gBAAEyD,MAAM,EAAElE,WAAW;gBAAEmE,YAAY,EAAE1E;cAAU;YAAE,GADnD2B,KAEN,CAAC;UAEN;UAEA,MAAMgD,WAAW,GAAGlF,KAAK,CAACkC,KAAK,CAACE,KAAK,CAAC;UACtC,MAAMD,QAAQ,GAAGN,SAAS,KAAK,CAAC,GAAGD,GAAG,GAAG5B,KAAK,CAACkC,KAAK,CAACE,KAAK,CAAC;UAC3D,MAAM+C,MAAM,GAAGnF,KAAK,CAACkC,KAAK,CAACU,GAAG,CAAC;UAC/B,MAAMwC,QAAQ,GAAGD,MAAM,CACpBE,OAAO,CAAC,KAAK,CAAC,CACdtC,IAAI,CAACZ,QAAQ,CAACkD,OAAO,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC;UACvC,MAAMC,eAAe,GACnBzD,SAAS,KAAK,CAAC,IAAIqD,WAAW,CAAC7C,QAAQ,CAACT,GAAG,CAAC;UAC9C,IAAIb,KAAK,GACP,CAACqE,QAAQ,GAAG,CAAC,IAAInE,eAAe,GAChCV,SAAS,GAAG,CAAC,GACbD,iBAAiB,GAAG,CAAC;UAEvB,IAAIgF,eAAe,EAAE;YACnBvE,KAAK,IAAIR,SAAS,GAAG,CAAC;UACxB;UAEA,MAAMgF,SAAS,GAAGR,QAAQ,KAAK/C,MAAM,CAACsB,MAAM,GAAG,CAAC;UAEhD,IAAIzC,KAAK,CAACQ,aAAa,IAAIH,MAAM,EAAE;YACjCL,KAAK,CAACQ,aAAa,CAACqC,IAAI,CAAC;cACvBxC,MAAM;cACNsE,SAAS,EAAErD,QAAQ,CAACiB,MAAM,CAAC,CAAC;cAC5BqC,IAAI,EAAEL,QAAQ,GAAG,CAAC;cAClBM,MAAM,EAAEX,QAAQ,GAAG;YACrB,CAAC,CAAC;UACJ;UAEA,oBACEtE,IAAA,CAACL,gBAAgB;YAEfmB,KAAK,EAAE,CACLC,MAAM,CAACU,KAAK,EACZ;cACEyD,eAAe,EAAEzD,KAAK,CAACyD,eAAe;cACtC5B,WAAW,EAAE7B,KAAK,CAAC6B,WAAW;cAC9BhD,KAAK,EAAEA,KAAK;cACZiE,MAAM,EAAElE,WAAW;cACnB,IAAIoB,KAAK,CAAC0D,WAAW,KAAKC,SAAS,IAAI;gBACrCD,WAAW,EAAE1D,KAAK,CAAC0D;cACrB,CAAC,CAAC;cACF,IAAI1D,KAAK,CAAC4D,WAAW,KAAKD,SAAS,IAAI;gBACrCC,WAAW,EAAE5D,KAAK,CAAC4D;cACrB,CAAC,CAAC;cACF,IAAI5D,KAAK,CAAC6D,YAAY,KAAKF,SAAS,IAAI;gBACtCE,YAAY,EAAE7D,KAAK,CAAC6D;cACtB,CAAC;YACH,CAAC,EACDT,eAAe,GAAG9D,MAAM,CAACwE,aAAa,GAAG,CAAC,CAAC,EAC3CT,SAAS,GAAG/D,MAAM,CAACyE,YAAY,GAAG,CAAC,CAAC,CACpC;YACFhC,OAAO,EAAEA,CAAA,KAAM;cACbpD,KAAK,CAACqF,YAAY,GAAGhE,KAAK,CAAC;YAC7B,CAAE;YACFiC,WAAW,EAAEA,CAAA,KAAM;cACjBtD,KAAK,CAACsF,gBAAgB,GAAGjE,KAAK,CAAC;YACjC,CAAE;YACFmC,cAAc,EAAExD,KAAK,CAACuF,mBAAoB;YAAA1E,QAAA,eAE1CjB,IAAA,CAACN,IAAI;cACHkG,aAAa,EAAE,CAAE;cACjBC,aAAa,EAAEzF,KAAK,CAAC0F,kBAAkB,IAAI,MAAO;cAClDhF,KAAK,EAAE,CACLC,MAAM,CAACgF,UAAU,EACjB;gBAAEC,KAAK,EAAEvE,KAAK,CAACuE;cAAM,CAAC,EACtB5F,KAAK,CAAC6F,cAAc,GAAGxE,KAAK,CAAC,CAC7B;cACF4C,gBAAgB,EAAEjE,KAAK,CAACiE,gBAAiB;cAAApD,QAAA,EAExCQ,KAAK,CAACyE;YAAK,CACR;UAAC,GAxCFzE,KAAK,CAAC0E,EAyCK,CAAC;QAEvB,CAAC,CAAC;MAAA,GAtHGhF,GAAG,CAACiF,GAAG,CAAC,MAAM,CAuHH,CAAC;IAEvB,CAAC;EAAC,CACE,CAAC;AAEX,CAAC;AAED,MAAMrF,MAAM,GAAGvB,UAAU,CAAC6G,MAAM,CAAC;EAC/BrF,SAAS,EAAE;IACTV,KAAK,EAAE,MAAM;IACbgG,OAAO,EAAE,MAAM;IACfC,aAAa,EAAE,KAAK;IACpBC,IAAI,EAAE,CAAC;IACPtB,eAAe,EAAE;EACnB,CAAC;EACDhC,iBAAiB,EAAE;IACjBsD,IAAI,EAAE,CAAC;IACPC,gBAAgB,EAAE5G,iBAAiB;IACnC6G,iBAAiB,EAAE7G,iBAAiB;IACpCyD,WAAW,EAAE,gBAAgB;IAC7B4B,eAAe,EAAE,OAAO;IACxByB,QAAQ,EAAE;EACZ,CAAC;EACD7C,YAAY,EAAE;IACZ6C,QAAQ,EAAE,UAAU;IACpBC,GAAG,EAAE,CAAC;IACNC,IAAI,EAAE,CAAC;IACPC,KAAK,EAAE,CAAC;IACRC,MAAM,EAAE;EACV,CAAC;EACD/C,YAAY,EAAE;IACZgD,eAAe,EAAE,CAAC;IAClBC,iBAAiB,EAAE;EACrB,CAAC;EACDhD,WAAW,EAAE;IACXiD,SAAS,EAAE,QAAQ;IACnBC,QAAQ,EAAE;EACZ,CAAC;EACD1F,KAAK,EAAE;IACL4D,WAAW,EAAE,GAAG;IAChBC,YAAY,EAAE,CAAC;IACf2B,iBAAiB,EAAE,CAAC;IACpBV,aAAa,EAAE,KAAK;IACpBa,UAAU,EAAE,QAAQ;IACpBC,SAAS,EAAE,8BAA8B;IACzCC,SAAS,EAAExH,SAAS;IACpByH,UAAU,EAAEzH;EACd,CAAC;EACDyF,aAAa,EAAE;IACbgC,UAAU,EAAE,CAAC,CAAC;IACdC,oBAAoB,EAAE,CAAC;IACvBC,uBAAuB,EAAE;EAC3B,CAAC;EACDjC,YAAY,EAAE;IACZhB,YAAY,EAAE1E;EAChB,CAAC;EACDiG,UAAU,EAAE;IACVoB,QAAQ,EAAE;EACZ;AACF,CAAC,CAAC","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","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":[]}

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;AAE1B,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;CAC1D,4CAkLA,CAAC"}
+{"version":3,"file":"MonthCalendarWeekRow.d.ts","sourceRoot":"","sources":["../../../../../../src/calendar/month-calendar/view/MonthCalendarWeekRow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,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;CAC1D,4CA0LA,CAAC"}

package/package.json

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

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

@@ -53,10 +53,18 @@ export const MonthCalendarWeekRow = (props: {
             const bStartDjs = dateIndex === 0 ? djs : dayjs(b.start);
             const aEndDjs = dayjs(a.end);
             const bEndDjs = dayjs(b.end);
-            const aDiffDays = aEndDjs.diff(aStartDjs, 'day');
-            const bDiffDays = bEndDjs.diff(bStartDjs, 'day');
+            const aDiffDays = aEndDjs
+              .startOf('day')
+              .diff(aStartDjs.startOf('day'), 'day');
+            const bDiffDays = bEndDjs
+              .startOf('day')
+              .diff(bStartDjs.startOf('day'), 'day');
 
-            return bDiffDays - aDiffDays;
+            if (aDiffDays !== bDiffDays) {
+              return bDiffDays - aDiffDays;
+            }
+
+            return dayjs(a.start).diff(dayjs(b.start));
           });
 
         const events: (CalendarEvent | number)[] = [];