react-native-paper-dates 0.22.8 → 0.22.10

package/src/Date/Swiper.tsx

@@ -20,6 +20,7 @@ function Swiper({
   renderFooter,
   selectedYear,
   initialIndex,
+  startWeekOnMonday,
 }: SwiperProps) {
   const isHorizontal = scrollMode === 'horizontal'
   const [index, setIndex] = React.useState(initialIndex)
@@ -66,6 +67,7 @@ function Swiper({
               initialIndex={initialIndex}
               estimatedHeight={estimatedMonthHeight}
               renderItem={renderItem}
+              startWeekOnMonday={startWeekOnMonday}
             />
           )}
         </AutoSizer>
@@ -83,12 +85,14 @@ function VerticalScroller({
   initialIndex,
   estimatedHeight,
   renderItem,
+  startWeekOnMonday,
 }: {
   renderItem: (renderProps: RenderProps) => any
   width: number
   height: number
   initialIndex: number
   estimatedHeight: number
+  startWeekOnMonday: boolean
 }) {
   const idx = React.useRef<number>(initialIndex)
   const [visibleIndexes, setVisibleIndexes] = React.useState<number[]>(
@@ -101,7 +105,8 @@ function VerticalScroller({
     if (!element) {
       return
     }
-    const top = getVerticalMonthsOffset(idx.current) - montHeaderHeight
+    const top =
+      getVerticalMonthsOffset(idx.current, startWeekOnMonday) - montHeaderHeight
 
     element.scrollTo({
       top,
@@ -118,14 +123,14 @@ function VerticalScroller({
       }
 
       const offset = top - beginOffset
-      const index = getIndexFromVerticalOffset(offset)
+      const index = getIndexFromVerticalOffset(offset, startWeekOnMonday)
 
       if (idx.current !== index) {
         idx.current = index
         setVisibleIndexesThrottled(visibleArray(index))
       }
     },
-    [setVisibleIndexesThrottled]
+    [setVisibleIndexesThrottled, startWeekOnMonday]
   )
 
   return (
@@ -153,12 +158,17 @@ function VerticalScroller({
             style={{
               willChange: 'transform',
               transform: `translateY(${getVerticalMonthsOffset(
-                visibleIndexes[vi]
+                visibleIndexes[vi],
+                startWeekOnMonday
               )}px)`,
               left: 0,
               right: 0,
               position: 'absolute',
-              height: getMonthHeight('vertical', visibleIndexes[vi]),
+              height: getMonthHeight(
+                'vertical',
+                visibleIndexes[vi],
+                startWeekOnMonday
+              ),
             }}
           >
             {renderItem({

package/src/Date/SwiperUtils.ts

@@ -21,6 +21,7 @@ export type SwiperProps = {
   renderHeader?: (renderProps: RenderProps) => any
   renderFooter?: (renderProps: RenderProps) => any
   selectedYear: number | undefined
+  startWeekOnMonday: boolean
 }
 
 export function useYearChange(

package/src/Date/dateUtils.tsx

@@ -58,11 +58,19 @@ export function getDaysInMonth({
 export function getFirstDayOfMonth({
   year,
   month,
+  startWeekOnMonday,
 }: {
   year: number
   month: number
+  startWeekOnMonday: boolean
 }): number {
-  return new Date(year, month, 1).getDay()
+  let dayOfWeek = new Date(year, month, 1).getDay()
+  if (startWeekOnMonday) {
+    // Map Sunday (0) to 6, Monday (1) to 0, etc.
+    dayOfWeek = (dayOfWeek + 6) % 7
+  }
+
+  return dayOfWeek
 }
 
 export function useRangeChecker(validRange: ValidRangeType | undefined) {
@@ -167,22 +175,22 @@ export const totalMonths = startAtIndex * 2
 export const beginOffset = estimatedMonthHeight * startAtIndex
 export const gridCounts = new Array<number | undefined>(totalMonths)
 
-export function getGridCount(index: number) {
+export function getGridCount(index: number, startWeekOnMonday: boolean) {
   const cHeight = gridCounts[index]
   if (cHeight) {
     return cHeight
   }
   const monthDate = addMonths(new Date(), getRealIndex(index))
-  const h = getGridCountForDate(monthDate)
+  const h = getGridCountForDate(monthDate, startWeekOnMonday)
   gridCounts[index] = h
   return h
 }
 
-export function getGridCountForDate(date: Date) {
+export function getGridCountForDate(date: Date, startWeekOnMonday: boolean) {
   const year = date.getFullYear()
   const month = date.getMonth()
   const daysInMonth = getDaysInMonth({ year, month })
-  const dayOfWeek = getFirstDayOfMonth({ year, month })
+  const dayOfWeek = getFirstDayOfMonth({ year, month, startWeekOnMonday })
   return Math.ceil((daysInMonth + dayOfWeek) / 7)
 }