Merge pull request #18 from simpletut/setDefaultTimezoneV2

Set default timezone v2

Author: simpletut

package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactjs-availability-calendar",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "React Availability Calendar",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",

src/components/Calendar/Utils/index.tsx

@@ -75,14 +75,14 @@ export const formatBookingsData = ({ bookings, year }: IFormatBookingsData): Boo
     const to = booking?.to
     const middayCheckout = booking?.middayCheckout
 
-    const validStartDate = dayjs.tz(from).year() === Number(year)
-    const validEndDate = dayjs.tz(to).year() === Number(year)
+    const validStartDate = dayjs(from).year() === Number(year)
+    const validEndDate = dayjs(to).year() === Number(year)
 
     if (!validStartDate && !validEndDate) return null
 
     const nxtBooking: BookingType = {
-      from: dayjs.tz(from).format(dateFormat),
-      to: dayjs.tz(to).format(dateFormat),
+      from: dayjs(from).format(dateFormat),
+      to: dayjs(to).format(dateFormat),
       middayCheckout,
     }
 
@@ -93,12 +93,12 @@ export const formatBookingsData = ({ bookings, year }: IFormatBookingsData): Boo
 }
 
 export const getDatesInRange = ({ startDate, endDate }: IGetDatesInRange): blockedDaysType => {
-  let _startDate = dayjs.tz(startDate).hour(0).minute(0).second(0);
-  const _endDate = dayjs.tz(endDate).hour(0).minute(0).second(0);
+  let _startDate = dayjs(startDate).hour(0).minute(0).second(0);
+  const _endDate = dayjs(endDate).hour(0).minute(0).second(0);
 
   const dates: blockedDaysType = []
 
-  while (!dayjs.tz(_startDate).isAfter(_endDate)) {
+  while (!dayjs(_startDate).isAfter(_endDate)) {
     dates.push(_startDate.format(dateFormat));
 
     _startDate = _startDate.add(1, 'day')

src/components/Calendar/Year/index.tsx

@@ -10,7 +10,7 @@ const Year = ({
   lateCheckouts = [],
   monthsFrom = 1,
 }: IYear): JSX.Element => {
-  const _year = activeYear || dayjs.tz().year()
+  const _year = activeYear || dayjs().year()
 
   return (
     <div className='year' data-testid='year'>
@@ -19,8 +19,8 @@ const Year = ({
         const month = monthsFrom + pos
         const date = `${_year}-${month}`
         const monthName = getMonthName(month)
-        const totalDays = dayjs.tz(date).daysInMonth()
-        const firstDayOfWeek = dayjs.tz(`${date}-01`).day()
+        const totalDays = dayjs(date).daysInMonth()
+        const firstDayOfWeek = dayjs(`${date}-01`).day()
 
         const offsetDays =
           firstDayOfWeek !== 0

src/components/Calendar/index.tsx

@@ -6,17 +6,17 @@ import Controls from './Controls'
 import Year from './Year'
 import Key from './Key'
 import { ICalendarPropTypes, IControls, blockedDaysType, IYear } from './types'
-import timezone from "dayjs/plugin/timezone";
-import utc from "dayjs/plugin/utc";
-import advancedFormat from "dayjs/plugin/advancedFormat";
+// import timezone from "dayjs/plugin/timezone";
+// import utc from "dayjs/plugin/utc";
+// import advancedFormat from "dayjs/plugin/advancedFormat";
 import customParseFormat from 'dayjs/plugin/customParseFormat'
 
-const defaultTimeZone = 'Europe/London';
+// const defaultTimeZone = 'Europe/London';
 
-dayjs.extend(utc);
-dayjs.extend(timezone);
-dayjs.extend(advancedFormat);
-dayjs.tz.setDefault(defaultTimeZone);
+// dayjs.extend(utc);
+// dayjs.extend(timezone);
+// dayjs.extend(advancedFormat);
+// dayjs.tz.setDefault(defaultTimeZone);
 dayjs.extend(isBetween);
 dayjs.extend(customParseFormat);
 
@@ -31,7 +31,7 @@ const Calendar = ({
   const initialPage = 1
   const totalCalendarMonths = 12
   const _showNumberOfMonths = isValidMonthsOption(showNumberOfMonths) ? showNumberOfMonths : totalCalendarMonths
-  const _year = dayjs.tz().year();
+  const _year = dayjs().year();
   const [activeYear, setActiveYear] = useState(_year)
   const [bookedDates, setBookedDates] = useState<blockedDaysType>([])
   const [lateCheckouts, setLateCheckouts] = useState<blockedDaysType>([])
@@ -55,7 +55,7 @@ const Calendar = ({
   )
 
   const findActivePage = useCallback(() => {
-    const now = dayjs.tz()
+    const now = dayjs()
     const _month = now.month() + 1
     let _page = 1
     for (let i = 1; i <= totalPages; i++) {
@@ -74,7 +74,7 @@ const Calendar = ({
   }, [findActivePage, _showNumberOfMonths])
 
   const initCal = useCallback(() => {
-    const now = dayjs.tz()
+    const now = dayjs()
     const _year = now.year()
     setActiveYear(_year)
     if (_showNumberOfMonths !== totalCalendarMonths) findActivePage()
@@ -85,7 +85,7 @@ const Calendar = ({
     const isFirstPage = page === 1
 
     if (isFirstPage) {
-      const _previousYear = dayjs.tz(`${activeYear}`).subtract(1, 'year').year()
+      const _previousYear = dayjs(`${activeYear}`).subtract(1, 'year').year()
       setActiveYear(_previousYear)
 
       if (_showNumberOfMonths === totalCalendarMonths) {
@@ -110,7 +110,7 @@ const Calendar = ({
   const next = useCallback(() => {
     const isLastPage = page === totalPages
     if (isLastPage) {
-      const _nextYear = dayjs.tz(`${activeYear}`).add(1, 'year').year()
+      const _nextYear = dayjs(`${activeYear}`).add(1, 'year').year()
       setActiveYear(_nextYear)
       resetCalendarYear()
       return