react-native-paper-dates 0.24.0 → 0.24.1

package/lib/module/Date/AutoSizer.js

@@ -1,28 +1,41 @@
 "use strict";
 
 import { useCallback, useState } from 'react';
-import { View } from 'react-native';
+import { useWindowDimensions, View } from 'react-native';
 import { sharedStyles } from '../shared/styles';
 import { jsx as _jsx } from "react/jsx-runtime";
 export default function AutoSizer({
   children
 }) {
-  const [layout, setLayout] = useState(null);
+  const {
+    width: windowWidth,
+    height: windowHeight
+  } = useWindowDimensions();
+  const windowKey = `${windowWidth}x${windowHeight}`;
+  const [measured, setMeasured] = useState(null);
   const onLayout = useCallback(event => {
     const nl = event.nativeEvent.layout;
     // https://github.com/necolas/react-native-web/issues/1704
-    if (!layout || layout.width !== nl.width || layout.height !== nl.height) {
-      setLayout({
+    setMeasured(prev => {
+      if (prev && prev.windowKey === windowKey && prev.width === nl.width && prev.height === nl.height) {
+        return prev;
+      }
+      return {
+        windowKey,
         width: nl.width,
         height: nl.height
-      });
-    }
-  }, [layout, setLayout]);
-  const isLayoutInitialized = layout && layout.height > 0 && layout.width > 0;
-  return /*#__PURE__*/_jsx(View, {
+      };
+    });
+  }, [windowKey]);
+  const layout = measured && measured.windowKey === windowKey && measured.width > 0 && measured.height > 0 ? measured : null;
+  return /*#__PURE__*/_jsx(View
+  // Modals often skip onLayout during rotation. Keying by window size
+  // mounts a fresh sizer so the calendar gets the landscape viewport.
+  , {
+    collapsable: false,
     onLayout: onLayout,
-    style: [sharedStyles.overflowHidden, sharedStyles.root, isLayoutInitialized && layout],
-    children: isLayoutInitialized ? children(layout) : null
-  });
+    style: [sharedStyles.overflowHidden, sharedStyles.root, sharedStyles.minHeightZero],
+    children: layout ? children(layout) : null
+  }, windowKey);
 }
 //# sourceMappingURL=AutoSizer.js.map

package/lib/module/Date/AutoSizer.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useState","View","sharedStyles","jsx","_jsx","AutoSizer","children","layout","setLayout","onLayout","event","nl","nativeEvent","width","height","isLayoutInitialized","style","overflowHidden","root"],"sourceRoot":"../../../src","sources":["Date/AutoSizer.tsx"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,QAAQ,QAAQ,OAAO;AAC7C,SAA4BC,IAAI,QAAQ,cAAc;AACtD,SAASC,YAAY,QAAQ,kBAAkB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAO/C,eAAe,SAASC,SAASA,CAAC;EAChCC;AAGF,CAAC,EAAE;EACD,MAAM,CAACC,MAAM,EAAEC,SAAS,CAAC,GAAGR,QAAQ,CAAwB,IAAI,CAAC;EAEjE,MAAMS,QAAQ,GAAGV,WAAW,CACzBW,KAAwB,IAAK;IAC5B,MAAMC,EAAE,GAAGD,KAAK,CAACE,WAAW,CAACL,MAAM;IACnC;IACA,IAAI,CAACA,MAAM,IAAIA,MAAM,CAACM,KAAK,KAAKF,EAAE,CAACE,KAAK,IAAIN,MAAM,CAACO,MAAM,KAAKH,EAAE,CAACG,MAAM,EAAE;MACvEN,SAAS,CAAC;QAAEK,KAAK,EAAEF,EAAE,CAACE,KAAK;QAAEC,MAAM,EAAEH,EAAE,CAACG;MAAO,CAAC,CAAC;IACnD;EACF,CAAC,EACD,CAACP,MAAM,EAAEC,SAAS,CACpB,CAAC;EAED,MAAMO,mBAAmB,GAAGR,MAAM,IAAIA,MAAM,CAACO,MAAM,GAAG,CAAC,IAAIP,MAAM,CAACM,KAAK,GAAG,CAAC;EAE3E,oBACET,IAAA,CAACH,IAAI;IACHQ,QAAQ,EAAEA,QAAS;IACnBO,KAAK,EAAE,CACLd,YAAY,CAACe,cAAc,EAC3Bf,YAAY,CAACgB,IAAI,EACjBH,mBAAmB,IAAIR,MAAM,CAC7B;IAAAD,QAAA,EAEDS,mBAAmB,GAAGT,QAAQ,CAACC,MAAM,CAAC,GAAG;EAAI,CAC1C,CAAC;AAEX","ignoreList":[]}
+{"version":3,"names":["useCallback","useState","useWindowDimensions","View","sharedStyles","jsx","_jsx","AutoSizer","children","width","windowWidth","height","windowHeight","windowKey","measured","setMeasured","onLayout","event","nl","nativeEvent","layout","prev","collapsable","style","overflowHidden","root","minHeightZero"],"sourceRoot":"../../../src","sources":["Date/AutoSizer.tsx"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,QAAQ,QAAQ,OAAO;AAC7C,SAA4BC,mBAAmB,EAAEC,IAAI,QAAQ,cAAc;AAC3E,SAASC,YAAY,QAAQ,kBAAkB;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAW/C,eAAe,SAASC,SAASA,CAAC;EAChCC;AAGF,CAAC,EAAE;EACD,MAAM;IAAEC,KAAK,EAAEC,WAAW;IAAEC,MAAM,EAAEC;EAAa,CAAC,GAAGV,mBAAmB,CAAC,CAAC;EAC1E,MAAMW,SAAS,GAAG,GAAGH,WAAW,IAAIE,YAAY,EAAE;EAClD,MAAM,CAACE,QAAQ,EAAEC,WAAW,CAAC,GAAGd,QAAQ,CAAwB,IAAI,CAAC;EAErE,MAAMe,QAAQ,GAAGhB,WAAW,CACzBiB,KAAwB,IAAK;IAC5B,MAAMC,EAAE,GAAGD,KAAK,CAACE,WAAW,CAACC,MAAM;IACnC;IACAL,WAAW,CAAEM,IAAI,IAAK;MACpB,IACEA,IAAI,IACJA,IAAI,CAACR,SAAS,KAAKA,SAAS,IAC5BQ,IAAI,CAACZ,KAAK,KAAKS,EAAE,CAACT,KAAK,IACvBY,IAAI,CAACV,MAAM,KAAKO,EAAE,CAACP,MAAM,EACzB;QACA,OAAOU,IAAI;MACb;MACA,OAAO;QAAER,SAAS;QAAEJ,KAAK,EAAES,EAAE,CAACT,KAAK;QAAEE,MAAM,EAAEO,EAAE,CAACP;MAAO,CAAC;IAC1D,CAAC,CAAC;EACJ,CAAC,EACD,CAACE,SAAS,CACZ,CAAC;EAED,MAAMO,MAAM,GACVN,QAAQ,IACRA,QAAQ,CAACD,SAAS,KAAKA,SAAS,IAChCC,QAAQ,CAACL,KAAK,GAAG,CAAC,IAClBK,QAAQ,CAACH,MAAM,GAAG,CAAC,GACfG,QAAQ,GACR,IAAI;EAEV,oBACER,IAAA,CAACH;EACC;EACA;EAAA;IAEAmB,WAAW,EAAE,KAAM;IACnBN,QAAQ,EAAEA,QAAS;IACnBO,KAAK,EAAE,CACLnB,YAAY,CAACoB,cAAc,EAC3BpB,YAAY,CAACqB,IAAI,EACjBrB,YAAY,CAACsB,aAAa,CAC1B;IAAAlB,QAAA,EAEDY,MAAM,GAAGZ,QAAQ,CAACY,MAAM,CAAC,GAAG;EAAI,GAT5BP,SAUD,CAAC;AAEX","ignoreList":[]}

package/lib/module/Date/Calendar.js

@@ -92,7 +92,7 @@ function Calendar(props) {
   }, [mode, dateMode, onChangeRef, startDateRef, endDateRef, datesRef]);
   const selectColor = theme.colors.primaryContainer;
   return /*#__PURE__*/_jsxs(View, {
-    style: sharedStyles.root,
+    style: [sharedStyles.root, sharedStyles.minHeightZero],
     children: [/*#__PURE__*/_jsx(Swiper, {
       initialIndex: getInitialIndex(firstDate, startYear, endYear),
       selectedYear: selectedYear,
@@ -127,14 +127,16 @@ function Calendar(props) {
         dayContentStyle: dayContentStyle
       }, index),
       renderHeader: ({
+        endInset,
         onPrev,
         onNext
       }) => /*#__PURE__*/_jsx(CalendarHeader, {
+        disableWeekDays: disableWeekDays,
+        endInset: endInset,
         locale: locale,
-        onPrev: onPrev,
         onNext: onNext,
+        onPrev: onPrev,
         scrollMode: scrollMode,
-        disableWeekDays: disableWeekDays,
         startWeekOnMonday: startWeekOnMonday || false
       })
     }), scrollMode === 'horizontal' ? /*#__PURE__*/_jsx(YearPicker, {

package/lib/module/Date/Calendar.js.map

@@ -1 +1 @@
-{"version":3,"names":["View","Swiper","Month","areDatesOnSameDay","dateToUnix","getEndOfDay","getInitialIndex","CalendarHeader","memo","useCallback","useState","YearPicker","useTheme","useLatest","sharedStyles","defaultStartYear","defaultEndYear","jsx","_jsx","jsxs","_jsxs","Calendar","props","locale","mode","onChange","startDate","endDate","date","disableWeekDays","startYear","endYear","dates","validRange","dateMode","startWeekOnMonday","dayContent","dayContentPosition","dayContentStyle","scrollMode","firstDate","theme","selectedYear","setSelectedYear","undefined","selectingYear","setSelectingYear","startDateRef","endDateRef","onChangeRef","datesRef","onPressYear","year","prev","onPressDate","d","current","sd","ed","isStart","exists","some","newDates","filter","sort","a","b","getTime","datePressed","change","selectColor","colors","primaryContainer","style","root","children","initialIndex","renderItem","index","primaryColor","primary","roundness","renderHeader","onPrev","onNext"],"sourceRoot":"../../../src","sources":["Date/Calendar.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["View","Swiper","Month","areDatesOnSameDay","dateToUnix","getEndOfDay","getInitialIndex","CalendarHeader","memo","useCallback","useState","YearPicker","useTheme","useLatest","sharedStyles","defaultStartYear","defaultEndYear","jsx","_jsx","jsxs","_jsxs","Calendar","props","locale","mode","onChange","startDate","endDate","date","disableWeekDays","startYear","endYear","dates","validRange","dateMode","startWeekOnMonday","dayContent","dayContentPosition","dayContentStyle","scrollMode","firstDate","theme","selectedYear","setSelectedYear","undefined","selectingYear","setSelectingYear","startDateRef","endDateRef","onChangeRef","datesRef","onPressYear","year","prev","onPressDate","d","current","sd","ed","isStart","exists","some","newDates","filter","sort","a","b","getTime","datePressed","change","selectColor","colors","primaryContainer","style","root","minHeightZero","children","initialIndex","renderItem","index","primaryColor","primary","roundness","renderHeader","endInset","onPrev","onNext"],"sourceRoot":"../../../src","sources":["Date/Calendar.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/Date/CalendarEdit.js

@@ -2,6 +2,7 @@
 
 import { Keyboard, StyleSheet, View } from 'react-native';
 import DatePickerInputWithoutModal from './DatePickerInputWithoutModal';
+import { weekdaySpan, weekdaySpanOvershoot } from './weekdayColumns';
 import { memo, useCallback, useEffect, useRef } from 'react';
 import { useTheme } from 'react-native-paper';
 import { sharedStyles } from '../shared/styles';
@@ -18,7 +19,8 @@ function CalendarEdit({
   locale,
   inputEnabled,
   withDateFormatInLabel,
-  placeholder
+  placeholder,
+  disableWeekDays
 }) {
   const theme = useTheme();
   const dateInput = useRef(null);
@@ -53,43 +55,23 @@ function CalendarEdit({
   const onSubmitInput = useCallback(() => {
     // TODO: close modal and persist range
   }, []);
-  return /*#__PURE__*/_jsxs(View, {
+  return /*#__PURE__*/_jsx(View, {
     style: styles.root,
-    children: [mode === 'single' ? /*#__PURE__*/_jsx(DatePickerInputWithoutModal, {
-      inputMode: "start",
-      ref: dateInput,
-      mode: "outlined",
-      label: label,
-      value: state.date,
-      onChange: date => onChange({
-        ...state,
-        date
-      }),
-      onSubmitEditing: onSubmitInput,
-      validRange: validRange,
-      locale: locale,
-      withModal: false,
-      autoComplete: 'off',
-      inputEnabled: inputEnabled,
-      withDateFormatInLabel: withDateFormatInLabel,
-      placeholder: placeholder,
-      style: inputStyle
-    }) : null, mode === 'range' ? /*#__PURE__*/_jsxs(View, {
-      style: sharedStyles.flexDirectionRow,
-      children: [/*#__PURE__*/_jsx(View, {
-        style: sharedStyles.root,
-        children: /*#__PURE__*/_jsx(DatePickerInputWithoutModal, {
+    children: /*#__PURE__*/_jsx(View, {
+      style: weekdaySpan(disableWeekDays),
+      children: /*#__PURE__*/_jsxs(View, {
+        style: weekdaySpanOvershoot,
+        children: [mode === 'single' ? /*#__PURE__*/_jsx(DatePickerInputWithoutModal, {
           inputMode: "start",
-          ref: startInput,
+          ref: dateInput,
           mode: "outlined",
-          label: startLabel,
-          value: state.startDate,
-          onChange: startDate => onChange({
+          label: label,
+          value: state.date,
+          onChange: date => onChange({
             ...state,
-            startDate
+            date
           }),
-          returnKeyType: 'next',
-          onSubmitEditing: onSubmitStartInput,
+          onSubmitEditing: onSubmitInput,
           validRange: validRange,
           locale: locale,
           withModal: false,
@@ -98,38 +80,65 @@ function CalendarEdit({
           withDateFormatInLabel: withDateFormatInLabel,
           placeholder: placeholder,
           style: inputStyle
-        })
-      }), /*#__PURE__*/_jsx(View, {
-        style: styles.separator
-      }), /*#__PURE__*/_jsx(View, {
-        style: sharedStyles.root,
-        children: /*#__PURE__*/_jsx(DatePickerInputWithoutModal, {
-          inputMode: "end",
-          ref: endInput,
-          mode: "outlined",
-          label: endLabel,
-          value: state.endDate,
-          onChange: endDate => onChange({
-            ...state,
-            endDate
-          }),
-          onSubmitEditing: onSubmitEndInput,
-          validRange: validRange,
-          locale: locale,
-          withModal: false,
-          autoComplete: "off",
-          inputEnabled: inputEnabled,
-          withDateFormatInLabel: withDateFormatInLabel,
-          placeholder: placeholder,
-          style: inputStyle
-        })
-      })]
-    }) : null]
+        }) : null, mode === 'range' ? /*#__PURE__*/_jsxs(View, {
+          style: sharedStyles.flexDirectionRow,
+          children: [/*#__PURE__*/_jsx(View, {
+            style: sharedStyles.root,
+            children: /*#__PURE__*/_jsx(DatePickerInputWithoutModal, {
+              inputMode: "start",
+              ref: startInput,
+              mode: "outlined",
+              label: startLabel,
+              value: state.startDate,
+              onChange: startDate => onChange({
+                ...state,
+                startDate
+              }),
+              returnKeyType: 'next',
+              onSubmitEditing: onSubmitStartInput,
+              validRange: validRange,
+              locale: locale,
+              withModal: false,
+              autoComplete: 'off',
+              inputEnabled: inputEnabled,
+              withDateFormatInLabel: withDateFormatInLabel,
+              placeholder: placeholder,
+              style: inputStyle
+            })
+          }), /*#__PURE__*/_jsx(View, {
+            style: styles.separator
+          }), /*#__PURE__*/_jsx(View, {
+            style: sharedStyles.root,
+            children: /*#__PURE__*/_jsx(DatePickerInputWithoutModal, {
+              inputMode: "end",
+              ref: endInput,
+              mode: "outlined",
+              label: endLabel,
+              value: state.endDate,
+              onChange: endDate => onChange({
+                ...state,
+                endDate
+              }),
+              onSubmitEditing: onSubmitEndInput,
+              validRange: validRange,
+              locale: locale,
+              withModal: false,
+              autoComplete: "off",
+              inputEnabled: inputEnabled,
+              withDateFormatInLabel: withDateFormatInLabel,
+              placeholder: placeholder,
+              style: inputStyle
+            })
+          })]
+        }) : null]
+      })
+    })
   });
 }
 const styles = StyleSheet.create({
   root: {
-    padding: 12
+    paddingVertical: 12,
+    width: '100%'
   },
   separator: {
     width: 12

package/lib/module/Date/CalendarEdit.js.map

@@ -1 +1 @@
-{"version":3,"names":["Keyboard","StyleSheet","View","DatePickerInputWithoutModal","memo","useCallback","useEffect","useRef","useTheme","sharedStyles","jsx","_jsx","jsxs","_jsxs","CalendarEdit","mode","state","label","startLabel","endLabel","collapsed","onChange","validRange","locale","inputEnabled","withDateFormatInLabel","placeholder","theme","dateInput","startInput","endInput","inputStyle","backgroundColor","colors","elevation","level3","dismiss","inputsToFocus","current","filter","n","inputsToBlur","forEach","ip","blur","focus","onSubmitStartInput","onSubmitEndInput","onSubmitInput","style","styles","root","children","inputMode","ref","value","date","onSubmitEditing","withModal","autoComplete","flexDirectionRow","startDate","returnKeyType","separator","endDate","create","padding","width"],"sourceRoot":"../../../src","sources":["Date/CalendarEdit.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["Keyboard","StyleSheet","View","DatePickerInputWithoutModal","weekdaySpan","weekdaySpanOvershoot","memo","useCallback","useEffect","useRef","useTheme","sharedStyles","jsx","_jsx","jsxs","_jsxs","CalendarEdit","mode","state","label","startLabel","endLabel","collapsed","onChange","validRange","locale","inputEnabled","withDateFormatInLabel","placeholder","disableWeekDays","theme","dateInput","startInput","endInput","inputStyle","backgroundColor","colors","elevation","level3","dismiss","inputsToFocus","current","filter","n","inputsToBlur","forEach","ip","blur","focus","onSubmitStartInput","onSubmitEndInput","onSubmitInput","style","styles","root","children","inputMode","ref","value","date","onSubmitEditing","withModal","autoComplete","flexDirectionRow","startDate","returnKeyType","separator","endDate","create","paddingVertical","width"],"sourceRoot":"../../../src","sources":["Date/CalendarEdit.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/Date/CalendarHeader.js

@@ -1,12 +1,20 @@
 "use strict";
 
-import { StyleSheet, View } from 'react-native';
+import { Platform, StyleSheet, View } from 'react-native';
 import { IconButton, useTheme } from 'react-native-paper';
 import DayNames, { dayNamesHeight } from './DayNames';
+import { centerIconOnLastWeekday } from './weekdayColumns';
 import { getTranslation } from '../translations/utils';
 import { sharedStyles } from '../shared/styles';
 import { memo } from 'react';
+
+/** Space reserved so an overlay header does not paint over a vertical scrollbar. */
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+export const verticalScrollbarGutter = Platform.select({
+  ios: 0,
+  web: 16,
+  default: 14
+});
 const buttonContainerHeight = 56;
 const buttonContainerMarginTop = 4;
 const buttonContainerMarginBottom = 8;
@@ -22,12 +30,15 @@ function CalendarHeader({
   onNext,
   disableWeekDays,
   locale,
-  startWeekOnMonday
+  startWeekOnMonday,
+  endInset = 0
 }) {
   const isHorizontal = scrollMode === 'horizontal';
   const theme = useTheme();
   return /*#__PURE__*/_jsxs(View, {
-    style: styles.datePickerHeader,
+    style: endInset ? [styles.datePickerHeader, {
+      right: endInset
+    }] : styles.datePickerHeader,
     pointerEvents: 'box-none',
     children: [isHorizontal ? /*#__PURE__*/_jsxs(View, {
       style: styles.buttonContainer,
@@ -35,26 +46,23 @@ function CalendarHeader({
       children: [/*#__PURE__*/_jsx(View, {
         style: sharedStyles.root,
         pointerEvents: 'box-none'
-      }), /*#__PURE__*/_jsx(View, {
-        style: {
+      }), /*#__PURE__*/_jsxs(View, {
+        style: [styles.arrowGroup, {
           backgroundColor: theme.colors.elevation.level3
-        },
-        children: /*#__PURE__*/_jsx(IconButton, {
+        }, centerIconOnLastWeekday(disableWeekDays)],
+        children: [/*#__PURE__*/_jsx(IconButton, {
           icon: "chevron-left",
           accessibilityLabel: getTranslation(locale, 'previous'),
           onPress: onPrev,
-          testID: "react-native-paper-dates-prev-month"
-        })
-      }), /*#__PURE__*/_jsx(View, {
-        style: {
-          backgroundColor: theme.colors.elevation.level3
-        },
-        children: /*#__PURE__*/_jsx(IconButton, {
+          testID: "react-native-paper-dates-prev-month",
+          style: styles.arrowButton
+        }), /*#__PURE__*/_jsx(IconButton, {
           icon: "chevron-right",
           accessibilityLabel: getTranslation(locale, 'next'),
           onPress: onNext,
-          testID: "react-native-paper-dates-next-month"
-        })
+          testID: "react-native-paper-dates-next-month",
+          style: styles.arrowButton
+        })]
       })]
     }) : null, /*#__PURE__*/_jsx(DayNames, {
       disableWeekDays: disableWeekDays,
@@ -77,6 +85,13 @@ const styles = StyleSheet.create({
     marginBottom: buttonContainerMarginBottom,
     flexDirection: 'row',
     alignItems: 'center'
+  },
+  arrowGroup: {
+    flexDirection: 'row',
+    alignItems: 'center'
+  },
+  arrowButton: {
+    margin: 0
   }
 });
 export default /*#__PURE__*/memo(CalendarHeader);

package/lib/module/Date/CalendarHeader.js.map

@@ -1 +1 @@
-{"version":3,"names":["StyleSheet","View","IconButton","useTheme","DayNames","dayNamesHeight","getTranslation","sharedStyles","memo","jsx","_jsx","jsxs","_jsxs","buttonContainerHeight","buttonContainerMarginTop","buttonContainerMarginBottom","getCalendarHeaderHeight","scrollMode","CalendarHeader","onPrev","onNext","disableWeekDays","locale","startWeekOnMonday","isHorizontal","theme","style","styles","datePickerHeader","pointerEvents","children","buttonContainer","root","backgroundColor","colors","elevation","level3","icon","accessibilityLabel","onPress","testID","create","position","top","right","left","zIndex","height","marginTop","marginBottom","flexDirection","alignItems"],"sourceRoot":"../../../src","sources":["Date/CalendarHeader.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["Platform","StyleSheet","View","IconButton","useTheme","DayNames","dayNamesHeight","centerIconOnLastWeekday","getTranslation","sharedStyles","memo","jsx","_jsx","jsxs","_jsxs","verticalScrollbarGutter","select","ios","web","default","buttonContainerHeight","buttonContainerMarginTop","buttonContainerMarginBottom","getCalendarHeaderHeight","scrollMode","CalendarHeader","onPrev","onNext","disableWeekDays","locale","startWeekOnMonday","endInset","isHorizontal","theme","style","styles","datePickerHeader","right","pointerEvents","children","buttonContainer","root","arrowGroup","backgroundColor","colors","elevation","level3","icon","accessibilityLabel","onPress","testID","arrowButton","create","position","top","left","zIndex","height","marginTop","marginBottom","flexDirection","alignItems","margin"],"sourceRoot":"../../../src","sources":["Date/CalendarHeader.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/Date/DatePickerModal.js

@@ -1,11 +1,11 @@
 "use strict";
 
-import { Modal, Platform, StyleSheet, TouchableWithoutFeedback, useWindowDimensions, View } from 'react-native';
+import { Modal, Platform, StyleSheet, TouchableWithoutFeedback, View } from 'react-native';
 import { useTheme } from 'react-native-paper';
 import DatePickerModalContent from './DatePickerModalContent';
 import { memo } from 'react';
 import { sharedStyles } from '../shared/styles';
-import { supportedOrientations } from '../shared/utils';
+import { supportedOrientations, useIsLargeScreen } from '../shared/utils';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export function DatePickerModal(props) {
   const {
@@ -23,16 +23,9 @@ export function DatePickerModal(props) {
     default: 'slide'
   });
   const theme = useTheme();
-  const dimensions = useWindowDimensions();
-
-  // Automatically use formSheet on iPad for better fit
-  // iPad detection: width > 650 AND height > 650 (works in both orientations)
-  // - iPad portrait: 744x1133, landscape: 1133x744 (both > 650)
-  // - iPhone landscape: 932x430 (height < 650, so excluded)
-  // pageSheet on iPad is ~540pt wide, but calendar is max 400pt, causing centering
-  // formSheet at ~540x620pt provides a better fit for the date picker
+  const isLargeScreen = useIsLargeScreen();
   const shouldUseSheet = Platform.OS === 'ios' && (presentationStyle === 'pageSheet' || presentationStyle === 'formSheet');
-  const useFormSheet = shouldUseSheet && dimensions.width > 650 && dimensions.height > 650;
+  const useFormSheet = shouldUseSheet && isLargeScreen;
   const isSheet = shouldUseSheet;
   return /*#__PURE__*/_jsx(View, {
     style: StyleSheet.absoluteFill,
@@ -58,7 +51,7 @@ export function DatePickerModal(props) {
         children: /*#__PURE__*/_jsx(View, {
           style: [styles.modalContent, {
             backgroundColor: theme.colors.elevation.level3
-          }, dimensions.width > 650 ? useFormSheet ? styles.modalContentFormSheet : styles.modalContentBig : null],
+          }, isLargeScreen ? useFormSheet ? styles.modalContentFormSheet : styles.modalContentBig : null],
           children: /*#__PURE__*/_jsx(DatePickerModalContent, {
             ...rest,
             inputEnabled: inputEnabled,
@@ -76,7 +69,8 @@ export function DatePickerModal(props) {
 const styles = StyleSheet.create({
   modalContent: {
     flex: 1,
-    width: '100%'
+    width: '100%',
+    minHeight: 0
   },
   modalContentBig: {
     maxWidth: 400,

package/lib/module/Date/DatePickerModal.js.map

@@ -1 +1 @@
-{"version":3,"names":["Modal","Platform","StyleSheet","TouchableWithoutFeedback","useWindowDimensions","View","useTheme","DatePickerModalContent","memo","sharedStyles","supportedOrientations","jsx","_jsx","jsxs","_jsxs","DatePickerModal","props","visible","animationType","disableStatusBar","disableStatusBarPadding","inputEnabled","presentationStyle","statusBarOnTopOfBackdrop","rest","animationTypeCalculated","select","web","default","theme","dimensions","shouldUseSheet","OS","useFormSheet","width","height","isSheet","style","absoluteFill","pointerEvents","children","transparent","onRequestClose","onDismiss","statusBarTranslucent","onPress","root","backgroundColor","colors","backdrop","styles","modalRoot","modalContent","elevation","level3","modalContentFormSheet","modalContentBig","disableSafeTop","withDateFormatInLabel","placeholder","create","flex","maxWidth","maxHeight","borderRadius","overflow","justifyContent","alignItems"],"sourceRoot":"../../../src","sources":["Date/DatePickerModal.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["Modal","Platform","StyleSheet","TouchableWithoutFeedback","View","useTheme","DatePickerModalContent","memo","sharedStyles","supportedOrientations","useIsLargeScreen","jsx","_jsx","jsxs","_jsxs","DatePickerModal","props","visible","animationType","disableStatusBar","disableStatusBarPadding","inputEnabled","presentationStyle","statusBarOnTopOfBackdrop","rest","animationTypeCalculated","select","web","default","theme","isLargeScreen","shouldUseSheet","OS","useFormSheet","isSheet","style","absoluteFill","pointerEvents","children","transparent","onRequestClose","onDismiss","statusBarTranslucent","onPress","root","backgroundColor","colors","backdrop","styles","modalRoot","modalContent","elevation","level3","modalContentFormSheet","modalContentBig","disableSafeTop","withDateFormatInLabel","placeholder","create","flex","width","minHeight","maxWidth","maxHeight","borderRadius","overflow","justifyContent","alignItems"],"sourceRoot":"../../../src","sources":["Date/DatePickerModal.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/Date/DatePickerModalContent.js

@@ -8,6 +8,9 @@ import CalendarEdit from './CalendarEdit';
 import DatePickerModalHeaderBackground from './DatePickerModalHeaderBackground';
 import DatePickerModalStatusBar from './DatePickerModalStatusBar';
 import { memo, useCallback, useEffect, useState } from 'react';
+import { View } from 'react-native';
+import { useSafeAreaInsets } from 'react-native-safe-area-context';
+import { sharedStyles } from '../shared/styles';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 export function DatePickerModalContent(props) {
   const {
@@ -31,6 +34,7 @@ export function DatePickerModalContent(props) {
   } = props;
   const anyProps = props;
   const defaultUppercase = false;
+  const insets = useSafeAreaInsets();
 
   // use local state to add only onConfirm state changes
   const [state, setState] = useState({
@@ -81,6 +85,7 @@ export function DatePickerModalContent(props) {
   }, [setCollapsed]);
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsxs(DatePickerModalHeaderBackground, {
+      disableWeekDays: disableWeekDays,
       children: [/*#__PURE__*/_jsx(DatePickerModalStatusBar, {
         disableSafeTop: !!disableSafeTop,
         disableStatusBar: !!disableStatusBar,
@@ -92,7 +97,8 @@ export function DatePickerModalContent(props) {
         saveLabel: props.saveLabel,
         saveLabelDisabled: props.saveLabelDisabled ?? false,
         uppercase: props.uppercase ?? defaultUppercase,
-        closeIcon: props.closeIcon
+        closeIcon: props.closeIcon,
+        disableWeekDays: disableWeekDays
       }), /*#__PURE__*/_jsx(DatePickerModalContentHeader, {
         state: state,
         mode: mode,
@@ -108,41 +114,49 @@ export function DatePickerModalContent(props) {
         locale: locale,
         editIcon: props?.editIcon,
         calendarIcon: props.calendarIcon,
-        allowEditing: props.allowEditing ?? true
+        allowEditing: props.allowEditing ?? true,
+        disableWeekDays: disableWeekDays
       })]
-    }), /*#__PURE__*/_jsx(AnimatedCrossView, {
-      collapsed: collapsed,
-      calendar: /*#__PURE__*/_jsx(Calendar, {
-        locale: locale,
-        mode: mode,
-        startDate: state.startDate,
-        endDate: state.endDate,
-        date: state.date,
-        onChange: onInnerChange,
-        disableWeekDays: disableWeekDays,
-        dates: state.dates,
-        validRange: validRange,
-        dateMode: dateMode,
-        startYear: startYear,
-        endYear: endYear,
-        startWeekOnMonday: startWeekOnMonday,
-        dayContent: dayContent,
-        dayContentPosition: dayContentPosition,
-        dayContentStyle: dayContentStyle
-      }),
-      calendarEdit: /*#__PURE__*/_jsx(CalendarEdit, {
-        mode: mode,
-        state: state,
-        label: props.label,
-        startLabel: props.startLabel,
-        endLabel: props.endLabel,
+    }), /*#__PURE__*/_jsx(View, {
+      style: [sharedStyles.root, sharedStyles.minHeightZero, {
+        paddingLeft: insets.left,
+        paddingRight: insets.right
+      }],
+      children: /*#__PURE__*/_jsx(AnimatedCrossView, {
         collapsed: collapsed,
-        onChange: onInnerChange,
-        validRange: validRange,
-        locale: locale,
-        inputEnabled: props.inputEnabled,
-        withDateFormatInLabel: props.withDateFormatInLabel,
-        placeholder: props.placeholder
+        calendar: /*#__PURE__*/_jsx(Calendar, {
+          locale: locale,
+          mode: mode,
+          startDate: state.startDate,
+          endDate: state.endDate,
+          date: state.date,
+          onChange: onInnerChange,
+          disableWeekDays: disableWeekDays,
+          dates: state.dates,
+          validRange: validRange,
+          dateMode: dateMode,
+          startYear: startYear,
+          endYear: endYear,
+          startWeekOnMonday: startWeekOnMonday,
+          dayContent: dayContent,
+          dayContentPosition: dayContentPosition,
+          dayContentStyle: dayContentStyle
+        }),
+        calendarEdit: /*#__PURE__*/_jsx(CalendarEdit, {
+          mode: mode,
+          state: state,
+          label: props.label,
+          startLabel: props.startLabel,
+          endLabel: props.endLabel,
+          collapsed: collapsed,
+          onChange: onInnerChange,
+          validRange: validRange,
+          locale: locale,
+          inputEnabled: props.inputEnabled,
+          withDateFormatInLabel: props.withDateFormatInLabel,
+          placeholder: props.placeholder,
+          disableWeekDays: disableWeekDays
+        })
       })
     })]
   });