react-native-ll-calendar 0.1.5 → 0.1.6

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

@@ -86,7 +86,7 @@ export const MonthCalendarWeekRow = props => {
           const rawStartDjs = dayjs(eventRow.start);
           const startDjs = dateIndex === 0 ? djs : dayjs(eventRow.start);
           const endDjs = dayjs(eventRow.end);
-          const diffDays = endDjs.diff(startDjs, 'day');
+          const diffDays = endDjs.startOf('day').diff(startDjs.startOf('day'), 'day');
           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","dates","isWeekdayHeader","events","eventPosition","onPressEvent","onPressCell","eventHeight","width","screenWidth","dateColumnWidth","weekId","format","resetResource","style","styles","container","children","map","djs","dateIndex","text","filteredEvents","filter","event","startDjs","start","isBefore","sort","a","b","aStartDjs","bStartDjs","aEndDjs","end","bEndDjs","aDiffDays","diff","bDiffDays","rows","rowNums","getRowNums","date","toDate","rowsLength","length","eventIndex","ii","includes","push","dayCellCountainer","minHeight","undefined","zIndex","onPress","dayCellLabel","dayCellText","eventRow","rowIndex","height","marginBottom","rawStartDjs","endDjs","diffDays","isPrevDateEvent","isLastRow","startDate","days","rowNum","backgroundColor","borderColor","prevDateEvent","lastRowEvent","numberOfLines","ellipsizeMode","eventTitle","color","title","id","get","create","display","flexDirection","flex","borderRightWidth","borderBottomWidth","paddingBottom","paddingVertical","paddingHorizontal","textAlign","fontSize","borderWidth","borderRadius","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,QAAQ,cAAc;AAG3D,SAASC,iBAAiB,EAAEC,SAAS,QAAQ,4BAAyB;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAEvE,OAAO,MAAMC,oBAAoB,GAAIC,KAOpC,IAAK;EACJ,MAAM;IACJC,KAAK;IACLC,eAAe;IACfC,MAAM,GAAG,EAAE;IACXC,aAAa;IACbC,YAAY;IACZC;EACF,CAAC,GAAGN,KAAK;EACT,MAAMO,WAAW,GAAG,EAAE;EACtB,MAAM;IAAEC,KAAK,EAAEC;EAAY,CAAC,GAAGpB,mBAAmB,CAAC,CAAC;EACpD,MAAMqB,eAAe,GAAGD,WAAW,GAAG,CAAC;EACvC,MAAME,MAAM,GAAGV,KAAK,CAAC,CAAC,CAAC,EAAEW,MAAM,CAAC,YAAY,CAAC;EAC7C,IAAID,MAAM,IAAIP,aAAa,EAAE;IAC3BA,aAAa,CAACS,aAAa,CAACF,MAAM,CAAC;EACrC;EAEA,oBACEf,IAAA,CAACJ,IAAI;IAACsB,KAAK,EAAEC,MAAM,CAACC,SAAU;IAAAC,QAAA,EAC3BhB,KAAK,CAACiB,GAAG,CAAC,CAACC,GAAG,EAAEC,SAAS,KAAK;MAC7B,MAAMC,IAAI,GAAGnB,eAAe,GAAGiB,GAAG,CAACP,MAAM,CAAC,KAAK,CAAC,GAAGO,GAAG,CAACP,MAAM,CAAC,GAAG,CAAC;MAClE,MAAMU,cAAc,GAAGnB,MAAM,CAC1BoB,MAAM,CAAEC,KAAK,IAAK;QACjB,MAAMC,QAAQ,GAAGtC,KAAK,CAACqC,KAAK,CAACE,KAAK,CAAC;QACnC,OACED,QAAQ,CAACb,MAAM,CAAC,YAAY,CAAC,KAAKO,GAAG,CAACP,MAAM,CAAC,YAAY,CAAC,IACzDQ,SAAS,KAAK,CAAC,IAAIK,QAAQ,CAACE,QAAQ,CAACR,GAAG,CAAE;MAE/C,CAAC,CAAC,CACDS,IAAI,CAAC,CAACC,CAAC,EAAEC,CAAC,KAAK;QACd,MAAMC,SAAS,GAAGX,SAAS,KAAK,CAAC,GAAGD,GAAG,GAAGhC,KAAK,CAAC0C,CAAC,CAACH,KAAK,CAAC;QACxD,MAAMM,SAAS,GAAGZ,SAAS,KAAK,CAAC,GAAGD,GAAG,GAAGhC,KAAK,CAAC2C,CAAC,CAACJ,KAAK,CAAC;QACxD,MAAMO,OAAO,GAAG9C,KAAK,CAAC0C,CAAC,CAACK,GAAG,CAAC;QAC5B,MAAMC,OAAO,GAAGhD,KAAK,CAAC2C,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,MAAMG,IAAgC,GAAG,EAAE;MAC3C,IAAI5B,MAAM,IAAIP,aAAa,EAAE;QAC3B,MAAMoC,OAAO,GAAGpC,aAAa,CAACqC,UAAU,CAAC;UACvC9B,MAAM;UACN+B,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;YACxBR,IAAI,CAACU,IAAI,CAACF,EAAE,CAAC;UACf,CAAC,MAAM;YACL,MAAMvB,KAAK,GAAGF,cAAc,CAACwB,UAAU,CAAC;YACxC,IAAItB,KAAK,EAAE;cACTe,IAAI,CAACU,IAAI,CAACzB,KAAK,CAAC;YAClB;YACAsB,UAAU,EAAE;UACd;QACF;MACF;MACA,oBACEhD,KAAA,CAACP,gBAAgB;QAEfuB,KAAK,EAAE,CACLC,MAAM,CAACmC,iBAAiB,EACxBhD,eAAe,GAAG;UAAEiD,SAAS,EAAEC;QAAU,CAAC,GAAG,CAAC,CAAC,EAC/C;UAAEC,MAAM,EAAE,CAAC,GAAGjC;QAAU,CAAC,CACzB;QACFkC,OAAO,EAAEA,CAAA,KAAM;UACbhD,WAAW,GAAGa,GAAG,CAACwB,MAAM,CAAC,CAAC,CAAC;QAC7B,CAAE;QAAA1B,QAAA,gBAEFrB,IAAA,CAACJ,IAAI;UAACsB,KAAK,EAAEC,MAAM,CAACwC,YAAa;UAAAtC,QAAA,eAC/BrB,IAAA,CAACN,IAAI;YAACwB,KAAK,EAAEC,MAAM,CAACyC,WAAY;YAAAvC,QAAA,EAAEI;UAAI,CAAO;QAAC,CAC1C,CAAC,EACNkB,IAAI,CAACrB,GAAG,CAAC,CAACuC,QAAQ,EAAEC,QAAQ,KAAK;UAChC,IAAI,OAAOD,QAAQ,KAAK,QAAQ,EAAE;YAChC,oBACE7D,IAAA,CAACJ,IAAI;cAEHsB,KAAK,EAAE;gBAAE6C,MAAM,EAAEpD,WAAW;gBAAEqD,YAAY,EAAElE;cAAU;YAAE,GADnD+D,QAEN,CAAC;UAEN;UAEA,MAAMI,WAAW,GAAG1E,KAAK,CAACsE,QAAQ,CAAC/B,KAAK,CAAC;UACzC,MAAMD,QAAQ,GAAGL,SAAS,KAAK,CAAC,GAAGD,GAAG,GAAGhC,KAAK,CAACsE,QAAQ,CAAC/B,KAAK,CAAC;UAC9D,MAAMoC,MAAM,GAAG3E,KAAK,CAACsE,QAAQ,CAACvB,GAAG,CAAC;UAClC,MAAM6B,QAAQ,GAAGD,MAAM,CAACzB,IAAI,CAACZ,QAAQ,EAAE,KAAK,CAAC;UAC7C,MAAMuC,eAAe,GACnB5C,SAAS,KAAK,CAAC,IAAIyC,WAAW,CAAClC,QAAQ,CAACR,GAAG,CAAC;UAC9C,IAAIX,KAAK,GACP,CAACuD,QAAQ,GAAG,CAAC,IAAIrD,eAAe,GAChChB,SAAS,GAAG,CAAC,GACbD,iBAAiB,GAAG,CAAC;UAEvB,IAAIuE,eAAe,EAAE;YACnBxD,KAAK,IAAId,SAAS,GAAG,CAAC;UACxB;UAEA,MAAMuE,SAAS,GAAGP,QAAQ,KAAKnB,IAAI,CAACM,MAAM,GAAG,CAAC;UAE9C,IAAIzC,aAAa,IAAIO,MAAM,EAAE;YAC3BP,aAAa,CAAC6C,IAAI,CAAC;cACjBtC,MAAM;cACNuD,SAAS,EAAEzC,QAAQ,CAACkB,MAAM,CAAC,CAAC;cAC5BwB,IAAI,EAAEJ,QAAQ,GAAG,CAAC;cAClBK,MAAM,EAAEV,QAAQ,GAAG;YACrB,CAAC,CAAC;UACJ;UAEA,oBACE9D,IAAA,CAACL,gBAAgB;YAEfuB,KAAK,EAAE,CACLC,MAAM,CAACS,KAAK,EACZ;cACE6C,eAAe,EAAEZ,QAAQ,CAACY,eAAe;cACzCC,WAAW,EAAEb,QAAQ,CAACa,WAAW;cACjC9D,KAAK,EAAEA,KAAK;cACZmD,MAAM,EAAEpD;YACV,CAAC,EACDyD,eAAe,GAAGjD,MAAM,CAACwD,aAAa,GAAG,CAAC,CAAC,EAC3CN,SAAS,GAAGlD,MAAM,CAACyD,YAAY,GAAG,CAAC,CAAC,CACpC;YACFlB,OAAO,EAAEA,CAAA,KAAM;cACbjD,YAAY,GAAGoD,QAAQ,CAAC;YAC1B,CAAE;YAAAxC,QAAA,eAEFrB,IAAA,CAACN,IAAI;cACHmF,aAAa,EAAE,CAAE;cACjBC,aAAa,EAAC,MAAM;cACpB5D,KAAK,EAAE,CAACC,MAAM,CAAC4D,UAAU,EAAE;gBAAEC,KAAK,EAAEnB,QAAQ,CAACmB;cAAM,CAAC,CAAE;cAAA3D,QAAA,EAErDwC,QAAQ,CAACoB;YAAK,CACX;UAAC,GAtBFpB,QAAQ,CAACqB,EAuBE,CAAC;QAEvB,CAAC,CAAC;MAAA,GA5EG5E,eAAe,GAAGiB,GAAG,CAAC4D,GAAG,CAAC,GAAG,CAAC,GAAG5D,GAAG,CAAC4D,GAAG,CAAC,MAAM,CA6EpC,CAAC;IAEvB,CAAC;EAAC,CACE,CAAC;AAEX,CAAC;AAED,MAAMhE,MAAM,GAAG3B,UAAU,CAAC4F,MAAM,CAAC;EAC/BhE,SAAS,EAAE;IACTR,KAAK,EAAE,MAAM;IACbyE,OAAO,EAAE,MAAM;IACfC,aAAa,EAAE,KAAK;IACpBC,IAAI,EAAE,CAAC;IACPd,eAAe,EAAE;EACnB,CAAC;EACDnB,iBAAiB,EAAE;IACjBC,SAAS,EAAE,EAAE;IACbgC,IAAI,EAAE,CAAC;IACPC,gBAAgB,EAAE3F,iBAAiB;IACnC4F,iBAAiB,EAAE5F,iBAAiB;IACpC6E,WAAW,EAAE,gBAAgB;IAC7BD,eAAe,EAAE,OAAO;IACxBiB,aAAa,EAAE;EACjB,CAAC;EACD/B,YAAY,EAAE;IACZgC,eAAe,EAAE,CAAC;IAClBC,iBAAiB,EAAE;EACrB,CAAC;EACDhC,WAAW,EAAE;IACXiC,SAAS,EAAE,QAAQ;IACnBC,QAAQ,EAAE;EACZ,CAAC;EACDlE,KAAK,EAAE;IACLmE,WAAW,EAAE,GAAG;IAChBC,YAAY,EAAE,CAAC;IACfJ,iBAAiB,EAAE,CAAC;IACpBN,aAAa,EAAE,KAAK;IACpBW,UAAU,EAAE,QAAQ;IACpBC,SAAS,EAAE,8BAA8B;IACzCC,SAAS,EAAErG,SAAS;IACpBsG,UAAU,EAAEtG;EACd,CAAC;EACD6E,aAAa,EAAE;IACbyB,UAAU,EAAE,CAAC,CAAC;IACdC,oBAAoB,EAAE,CAAC;IACvBC,uBAAuB,EAAE;EAC3B,CAAC;EACD1B,YAAY,EAAE;IACZZ,YAAY,EAAElE;EAChB,CAAC;EACDiF,UAAU,EAAE;IACVe,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","dates","isWeekdayHeader","events","eventPosition","onPressEvent","onPressCell","eventHeight","width","screenWidth","dateColumnWidth","weekId","format","resetResource","style","styles","container","children","map","djs","dateIndex","text","filteredEvents","filter","event","startDjs","start","isBefore","sort","a","b","aStartDjs","bStartDjs","aEndDjs","end","bEndDjs","aDiffDays","diff","bDiffDays","rows","rowNums","getRowNums","date","toDate","rowsLength","length","eventIndex","ii","includes","push","dayCellCountainer","minHeight","undefined","zIndex","onPress","dayCellLabel","dayCellText","eventRow","rowIndex","height","marginBottom","rawStartDjs","endDjs","diffDays","startOf","isPrevDateEvent","isLastRow","startDate","days","rowNum","backgroundColor","borderColor","prevDateEvent","lastRowEvent","numberOfLines","ellipsizeMode","eventTitle","color","title","id","get","create","display","flexDirection","flex","borderRightWidth","borderBottomWidth","paddingBottom","paddingVertical","paddingHorizontal","textAlign","fontSize","borderWidth","borderRadius","alignItems","boxShadow","marginTop","marginLeft","borderTopStartRadius","borderBottomStartRadius"],"sourceRoot":"../../../../../src","sources":["calendar/month-calendar/view/MonthCalendarWeekRow.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/utils/functions.js

@@ -43,8 +43,8 @@ export function getWeekIds(args) {
     end,
     weekStartsOn
   } = args;
-  const startDjs = dayjs(start);
-  const endDjs = dayjs(end);
+  const startDjs = dayjs(start).startOf('day');
+  const endDjs = dayjs(end).startOf('day');
   const weekIds = [];
   let current = startDjs;
   if (weekStartsOn === 0) {

package/lib/module/utils/functions.js.map

@@ -1 +1 @@
-{"version":3,"names":["dayjs","monthlyStartDate","args","date","weekStartsOn","djs","startOf","toDate","startOfMonth","day","subtract","monthlyEndDate","endOf","endOfMonth","add","getWeekIds","start","end","startDjs","endDjs","weekIds","current","isSame","isBefore","weekId","format","includes","push"],"sourceRoot":"../../../src","sources":["utils/functions.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["dayjs","monthlyStartDate","args","date","weekStartsOn","djs","startOf","toDate","startOfMonth","day","subtract","monthlyEndDate","endOf","endOfMonth","add","getWeekIds","start","end","startDjs","endDjs","weekIds","current","isSame","isBefore","weekId","format","includes","push"],"sourceRoot":"../../../src","sources":["utils/functions.ts"],"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;AAG1B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,0BAA0B,MAAM,8CAA8C,CAAC;AAG3F,eAAO,MAAM,oBAAoB,GAAI,OAAO;IAC1C,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;IACrB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,MAAM,CAAC,EAAE,aAAa,EAAE,CAAC;IACzB,aAAa,CAAC,EAAE,0BAA0B,CAAC;IAC3C,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAC9C,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;CACpC,4CAgJA,CAAC"}
+{"version":3,"file":"MonthCalendarWeekRow.d.ts","sourceRoot":"","sources":["../../../../../../src/calendar/month-calendar/view/MonthCalendarWeekRow.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,0BAA0B,MAAM,8CAA8C,CAAC;AAG3F,eAAO,MAAM,oBAAoB,GAAI,OAAO;IAC1C,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC;IACrB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,MAAM,CAAC,EAAE,aAAa,EAAE,CAAC;IACzB,aAAa,CAAC,EAAE,0BAA0B,CAAC;IAC3C,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAC9C,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;CACpC,4CAkJA,CAAC"}

package/package.json

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

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

@@ -100,7 +100,9 @@ export const MonthCalendarWeekRow = (props: {
               const rawStartDjs = dayjs(eventRow.start);
               const startDjs = dateIndex === 0 ? djs : dayjs(eventRow.start);
               const endDjs = dayjs(eventRow.end);
-              const diffDays = endDjs.diff(startDjs, 'day');
+              const diffDays = endDjs
+                .startOf('day')
+                .diff(startDjs.startOf('day'), 'day');
               const isPrevDateEvent =
                 dateIndex === 0 && rawStartDjs.isBefore(djs);
               let width =

package/src/utils/functions.ts

@@ -45,8 +45,8 @@ export function getWeekIds(args: {
   weekStartsOn: WeekStartsOn;
 }) {
   const { start, end, weekStartsOn } = args;
-  const startDjs = dayjs(start);
-  const endDjs = dayjs(end);
+  const startDjs = dayjs(start).startOf('day');
+  const endDjs = dayjs(end).startOf('day');
   const weekIds: string[] = [];
   let current = startDjs;
   if (weekStartsOn === 0) {