@hero-design/rn 8.34.0 → 8.34.2-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hero-design/rn",
-  "version": "8.34.0",
+  "version": "8.34.2-alpha.0",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -21,12 +21,16 @@
   "dependencies": {
     "@emotion/native": "^11.9.3",
     "@emotion/react": "^11.9.3",
-    "@hero-design/colors": "8.34.0",
+    "@hero-design/colors": "8.34.1",
+    "@hero-design/react-native-month-year-picker": "^8.34.1",
     "date-fns": "^2.16.1",
     "events": "^3.2.0",
-    "hero-editor": "^1.9.21"
+    "hero-editor": "^1.9.21",
+    "react-native-root-siblings": "^4.1.1",
+    "rollup-plugin-jsx": "^1.0.3"
   },
   "peerDependencies": {
+    "@hero-design/react-native-month-year-picker": "^8.34.1",
     "@react-native-community/datetimepicker": "^3.5.2",
     "@react-native-community/slider": "4.1.12",
     "react": "18.0.0",
@@ -34,7 +38,6 @@
     "react-native-gesture-handler": "^1.10.3 | ~2.5.0",
     "react-native-linear-gradient": "^2.6.2",
     "react-native-pager-view": "^5.4.25",
-    "react-native-root-siblings": "^4.1.1",
     "react-native-safe-area-context": "^3.0.2",
     "react-native-vector-icons": "^9.1.0",
     "react-native-webview": "^11.2.5"
@@ -46,7 +49,7 @@
     "@babel/preset-typescript": "^7.17.12",
     "@babel/runtime": "^7.18.9",
     "@emotion/jest": "^11.9.3",
-    "@hero-design/eslint-plugin": "8.34.0",
+    "@hero-design/eslint-plugin": "8.34.1",
     "@react-native-community/datetimepicker": "^3.5.2",
     "@react-native-community/slider": "4.1.12",
     "@rollup/plugin-babel": "^5.3.1",
@@ -62,10 +65,10 @@
     "@types/react-native": "^0.67.7",
     "@types/react-native-vector-icons": "^6.4.10",
     "babel-plugin-inline-import": "^3.0.0",
-    "eslint-config-hd": "8.34.0",
+    "eslint-config-hd": "8.34.1",
     "eslint-plugin-import": "^2.27.5",
     "jest": "^27.3.1",
-    "prettier-config-hd": "8.34.0",
+    "prettier-config-hd": "8.34.1",
     "react": "18.0.0",
     "react-native": "0.69.7",
     "react-native-gesture-handler": "~2.5.0",

package/rollup.config.js

@@ -34,7 +34,7 @@ export default {
     'react-native-pager-view',
     'react-native-vector-icons',
     'react-native-linear-gradient',
-    'react-native-root-siblings',
+    '@hero-design/react-native-month-year-picker',
   ],
   plugins: [
     replace({
@@ -42,10 +42,15 @@ export default {
     }),
     nodeResolve({ extensions, browser: true }),
     flow(),
-    commonjs(),
     json(),
     typescript(),
-    babel({ extensions, babelHelpers: 'bundled' }),
+    babel({
+      exclude: 'node_modules/**',
+      presets: ['@babel/env', '@babel/preset-react'],
+      extensions,
+      babelHelpers: 'bundled',
+    }),
+    commonjs(),
     copy({
       targets: [
         {

package/src/components/Calendar/__tests__/index.spec.tsx

@@ -92,4 +92,51 @@ describe('Calendar', () => {
     fireEvent.press(getByText('26'));
     expect(onChange).toBeCalledWith(new Date(2022, 10, 26));
   });
+
+  it('disables onTitlePress when onMonthChange is passed', () => {
+    const onTitlePress = jest.fn();
+    const { getByTestId } = renderWithTheme(
+      <Calendar
+        value={new Date(2022, 10, 5)}
+        visibleDate={new Date(2022, 10, 5)}
+        onTitlePress={onTitlePress}
+        minDate={new Date(2022, 10, 3)}
+        maxDate={new Date(2022, 10, 27)}
+        onMonthChange={jest.fn()}
+      />
+    );
+
+    fireEvent.press(getByTestId('calendar-month-picker'));
+    expect(onTitlePress).toHaveBeenCalledTimes(0);
+  });
+
+  it.each`
+    platform
+    ${'ios'}
+    ${'android'}
+  `('renders correct picker on $platform', ({ platform }) => {
+    jest.mock('react-native/Libraries/Utilities/Platform', () => ({
+      OS: platform,
+      select: () => null,
+    }));
+
+    const { getByTestId, queryByText } = renderWithTheme(
+      <Calendar
+        value={new Date(2022, 10, 5)}
+        visibleDate={new Date(2022, 10, 5)}
+        minDate={new Date(2022, 10, 3)}
+        maxDate={new Date(2022, 10, 27)}
+        onMonthChange={jest.fn()}
+      />
+    );
+
+    fireEvent.press(getByTestId('calendar-month-picker'));
+
+    // Pickers are mocked at packages/rn/testUtils/setup.tsx
+    if (platform === 'ios') {
+      expect(queryByText('IOS picker')).toBeDefined();
+    } else {
+      expect(queryByText('Android picker')).toBeDefined();
+    }
+  });
 });

package/src/components/Calendar/index.tsx

@@ -1,7 +1,17 @@
-import React from 'react';
+import {
+  MonthYearPickerDialogueAndroid,
+  MonthYearPickerViewIOS,
+} from '@hero-design/react-native-month-year-picker';
 import format from 'date-fns/fp/format';
+import React from 'react';
+import { Platform, TouchableOpacity } from 'react-native';
+import { useTheme } from '../../theme';
+import { noop } from '../../utils/functions';
+import Box from '../Box';
 import ContentNavigator from '../ContentNavigator';
+import Icon from '../Icon';
 import Typography from '../Typography';
+import CalendarRowItem from './CalendarRowItem';
 import {
   StyledCalendarDayNameCell,
   StyledCalendarHeader,
@@ -10,9 +20,7 @@ import {
   StyledContainer,
   StyledDisabledCalendarRowItem,
 } from './StyledCalendar';
-import CalendarRowItem from './CalendarRowItem';
 import { getValidDate, initArray, isEqDate } from './helpers';
-import { noop } from '../../utils/functions';
 
 const DAYS_OF_WEEK = ['Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa', 'Su'];
 // Sunday first column => 0
@@ -68,6 +76,18 @@ export interface CalendarProps {
    * Testing id of the component.
    */
   testID?: string;
+  /**
+   * Callback when header month is changed, passing this prop will disable onTitlePress.
+   */
+  onMonthChange?: (date: Date) => void;
+  /**
+   * Label for the confirm button of the month picker, Android only.
+   */
+  monthPickerConfirmLabel?: string;
+  /**
+   * Label for the cancel button of the month picker, Android only.
+   */
+  monthPickerCancelLabel?: string;
 }
 
 const Calendar = ({
@@ -81,7 +101,11 @@ const Calendar = ({
   maxDate,
   markedDates = [],
   testID,
+  onMonthChange = noop,
+  monthPickerConfirmLabel,
+  monthPickerCancelLabel,
 }: CalendarProps) => {
+  const theme = useTheme();
   const currentMonth = visibleDate.getMonth();
   const currentYear = visibleDate.getFullYear();
   const now = new Date();
@@ -92,6 +116,10 @@ const Calendar = ({
     }),
     {}
   );
+  const [monthPickerVisible, setMonthPickerVisible] = React.useState(false);
+  const [contentHeight, setContentHeight] = React.useState(0);
+
+  const useMonthPicker = onMonthChange !== noop;
 
   const firstDateOfMonth = new Date(currentYear, currentMonth, 1);
   const lastDateOfMonth = new Date(currentYear, currentMonth + 1, 0);
@@ -152,70 +180,144 @@ const Calendar = ({
     <StyledContainer testID={testID}>
       <StyledCalendarHeader>
         <ContentNavigator
-          value={format('MMMM yyyy', visibleDate)}
+          value={
+            !useMonthPicker ? (
+              format('MMMM yyyy', visibleDate)
+            ) : (
+              <TouchableOpacity
+                testID="calendar-month-picker"
+                onPress={() => setMonthPickerVisible(!monthPickerVisible)}
+              >
+                <Box
+                  flexDirection="row"
+                  justifyContent="center"
+                  alignItems="center"
+                >
+                  <Typography.Title
+                    level="h5"
+                    style={{
+                      textAlign: 'center',
+                      marginRight:
+                        theme.__hd__.calendar.space.headerMarginRight,
+                    }}
+                  >
+                    {format('MMMM yyyy', visibleDate)}
+                  </Typography.Title>
+
+                  <Icon
+                    icon={monthPickerVisible ? 'arrow-up' : 'arrow-down'}
+                    size="small"
+                  />
+                </Box>
+              </TouchableOpacity>
+            )
+          }
           onPreviousPress={onPreviousPress}
           onNextPress={onNextPress}
-          onPress={onTitlePress}
+          onPress={useMonthPicker ? undefined : onTitlePress}
           previousDisabled={disablePrevButton}
           nextDisabled={disableNextButton}
           fontSize="large"
         />
       </StyledCalendarHeader>
-      <StyledCalendarRow>
-        {DAYS_OF_WEEK.map((day) => (
-          <StyledCalendarRowItem key={day}>
-            <StyledCalendarDayNameCell>
-              <Typography.Body variant="small">{day}</Typography.Body>
-            </StyledCalendarDayNameCell>
-          </StyledCalendarRowItem>
-        ))}
-      </StyledCalendarRow>
-      <StyledCalendarRow>
-        {daysOfPreviousMonth.map((date) =>
-          date ? (
-            <CalendarRowItem
-              key={date.toDateString()}
-              date={date}
-              isCurrent={isEqDate(now, date)}
-              isSelected={isEqDate(value, date)}
-              onPress={() => onChange?.(date)}
-              textIntent="subdued"
-              marked={parsedMaskedDate[date.toDateString()]}
-            />
-          ) : (
-            <StyledDisabledCalendarRowItem testID="calendar-disabled-cell" />
-          )
-        )}
-        {daysOfCurrentMonth.map((date) =>
-          date ? (
-            <CalendarRowItem
-              key={date.toDateString()}
-              date={date}
-              isCurrent={isEqDate(now, date)}
-              isSelected={isEqDate(value, date)}
-              onPress={() => onChange?.(date)}
-              marked={parsedMaskedDate[date.toDateString()]}
-            />
-          ) : (
-            <StyledDisabledCalendarRowItem testID="calendar-disabled-cell" />
-          )
-        )}
-        {daysOfNextMonth.map((date) =>
-          date ? (
-            <CalendarRowItem
-              key={date.toDateString()}
-              date={date}
-              isCurrent={isEqDate(now, date)}
-              isSelected={isEqDate(value, date)}
-              onPress={() => onChange?.(date)}
-              textIntent="subdued"
-              marked={parsedMaskedDate[date.toDateString()]}
+      {Platform.OS === 'ios' && monthPickerVisible ? (
+        <Box style={{ overflow: 'hidden' }}>
+          <MonthYearPickerViewIOS
+            value={value}
+            minimumDate={minDate}
+            maximumDate={maxDate}
+            onChange={onMonthChange}
+            style={{
+              height:
+                contentHeight +
+                theme.__hd__.calendar.space.iosPickerMarginVertical * 2,
+              marginVertical:
+                -theme.__hd__.calendar.space.iosPickerMarginVertical,
+            }}
+          />
+        </Box>
+      ) : (
+        <Box
+          onLayout={
+            Platform.OS === 'ios'
+              ? (e) => setContentHeight(e.nativeEvent.layout.height)
+              : undefined
+          }
+        >
+          <StyledCalendarRow>
+            {DAYS_OF_WEEK.map((day) => (
+              <StyledCalendarRowItem key={day}>
+                <StyledCalendarDayNameCell>
+                  <Typography.Body variant="small">{day}</Typography.Body>
+                </StyledCalendarDayNameCell>
+              </StyledCalendarRowItem>
+            ))}
+          </StyledCalendarRow>
+          <StyledCalendarRow>
+            {daysOfPreviousMonth.map((date) =>
+              date ? (
+                <CalendarRowItem
+                  key={date.toDateString()}
+                  date={date}
+                  isCurrent={isEqDate(now, date)}
+                  isSelected={isEqDate(value, date)}
+                  onPress={() => onChange?.(date)}
+                  textIntent="subdued"
+                  marked={parsedMaskedDate[date.toDateString()]}
+                />
+              ) : (
+                <StyledDisabledCalendarRowItem testID="calendar-disabled-cell" />
+              )
+            )}
+            {daysOfCurrentMonth.map((date) =>
+              date ? (
+                <CalendarRowItem
+                  key={date.toDateString()}
+                  date={date}
+                  isCurrent={isEqDate(now, date)}
+                  isSelected={isEqDate(value, date)}
+                  onPress={() => onChange?.(date)}
+                  marked={parsedMaskedDate[date.toDateString()]}
+                />
+              ) : (
+                <StyledDisabledCalendarRowItem testID="calendar-disabled-cell" />
+              )
+            )}
+            {daysOfNextMonth.map((date) =>
+              date ? (
+                <CalendarRowItem
+                  key={date.toDateString()}
+                  date={date}
+                  isCurrent={isEqDate(now, date)}
+                  isSelected={isEqDate(value, date)}
+                  onPress={() => onChange?.(date)}
+                  textIntent="subdued"
+                  marked={parsedMaskedDate[date.toDateString()]}
+                />
+              ) : (
+                <StyledDisabledCalendarRowItem testID="calendar-disabled-cell" />
+              )
+            )}
+          </StyledCalendarRow>
+
+          {Platform.OS === 'android' && monthPickerVisible && (
+            <MonthYearPickerDialogueAndroid
+              doneButtonLabel={monthPickerConfirmLabel}
+              cancelButtonLabel={monthPickerCancelLabel}
+              value={value}
+              minimumDate={minDate}
+              maximumDate={maxDate}
+              onChange={(action, date) => {
+                setMonthPickerVisible(false);
+
+                if (action === 'dateSetAction' && !!date) {
+                  onMonthChange(date);
+                }
+              }}
             />
-          ) : (
-            <StyledDisabledCalendarRowItem testID="calendar-disabled-cell" />
-          )
-        )}
-      </StyledCalendarRow>
+          )}
+        </Box>
+      )}
     </StyledContainer>
   );
 };

package/src/components/DatePicker/DatePickerAndroid.tsx

@@ -20,7 +20,10 @@ const DatePickerAndroid = ({
   helpText,
   style,
   testID,
-}: Omit<DatePickerProps, 'variant'>) => {
+}: Omit<
+  DatePickerProps,
+  'variant' | 'monthPickerConfirmLabel' | 'monthPickerCancelLabel'
+>) => {
   const [open, setOpen] = useState(false);
 
   const displayValue = value ? formatDate(displayFormat, value) : '';

package/src/components/DatePicker/DatePickerCalendar.tsx

@@ -13,7 +13,17 @@ const InternalCalendar = ({
   maxDate,
   value,
   onChange,
-}: Pick<CalendarProps, 'minDate' | 'maxDate' | 'value' | 'onChange'>) => {
+  monthPickerConfirmLabel,
+  monthPickerCancelLabel,
+}: Pick<
+  CalendarProps,
+  | 'minDate'
+  | 'maxDate'
+  | 'value'
+  | 'onChange'
+  | 'monthPickerConfirmLabel'
+  | 'monthPickerCancelLabel'
+>) => {
   const [visibleDate, setVisibleDate] = useState(value || new Date());
   const [selectingDate, setSelectingDate] = useState<Date>(value || new Date());
   return (
@@ -39,6 +49,9 @@ const InternalCalendar = ({
       }
       minDate={minDate}
       maxDate={maxDate}
+      onMonthChange={(date) => setVisibleDate(date)}
+      monthPickerConfirmLabel={monthPickerConfirmLabel}
+      monthPickerCancelLabel={monthPickerCancelLabel}
     />
   );
 };
@@ -58,6 +71,8 @@ const DatePickerCalendar = ({
   helpText,
   style,
   testID,
+  monthPickerConfirmLabel,
+  monthPickerCancelLabel,
 }: Omit<DatePickerProps, 'variant'>) => {
   const [open, setOpen] = useState(false);
 
@@ -101,6 +116,8 @@ const DatePickerCalendar = ({
           maxDate={maxDate}
           value={value}
           onChange={setSelectingDate}
+          monthPickerConfirmLabel={monthPickerConfirmLabel}
+          monthPickerCancelLabel={monthPickerCancelLabel}
         />
       </BottomSheet>
     </TouchableOpacity>

package/src/components/DatePicker/DatePickerIOS.tsx

@@ -41,7 +41,10 @@ const DatePickerIOS = ({
   helpText,
   style,
   testID,
-}: Omit<DatePickerProps, 'variant'>) => {
+}: Omit<
+  DatePickerProps,
+  'variant' | 'monthPickerConfirmLabel' | 'monthPickerCancelLabel'
+>) => {
   const [selectingDate, setSelectingDate] = useState<Date>(
     getInitialDateValue(value || new Date(), minDate, maxDate)
   );

package/src/components/DatePicker/__tests__/DatePickerCalendar.spec.tsx

@@ -58,4 +58,43 @@ describe('DatePickerCalendar', () => {
 
     expect(getByText('This is help text')).toBeTruthy();
   });
+
+  it.each`
+    platform
+    ${'ios'}
+    ${'android'}
+  `('renders month year picker when pressing on title', ({ platform }) => {
+    jest.mock('react-native/Libraries/Utilities/Platform', () => ({
+      OS: platform,
+      select: () => null,
+    }));
+
+    const { queryByText, getByText, getByTestId } = renderWithTheme(
+      <DatePickerCalendar
+        value={new Date('December 21, 1995')}
+        label="Start date"
+        confirmLabel="Confirm"
+        helpText="This is help text"
+        onChange={jest.fn()}
+      />
+    );
+
+    fireEvent.press(getByText('Start date'));
+    fireEvent.press(getByText('December 1995'));
+
+    if (platform === 'ios') {
+      expect(queryByText('IOS picker')).toBeDefined();
+    } else {
+      expect(queryByText('Android picker')).toBeDefined();
+    }
+
+    // Selecting month
+    fireEvent(
+      getByTestId('calendar'),
+      'onMonthChange',
+      new Date('January 17, 1993')
+    );
+
+    expect(queryByText('January 1993')).toBeDefined();
+  });
 });

package/src/components/DatePicker/types.ts

@@ -64,4 +64,12 @@ export interface DatePickerProps {
    * Testing id of the component.
    */
   testID?: string;
+  /**
+   * Calendar variant prop. Label for the confirm button of the month picker, Android only.
+   */
+  monthPickerConfirmLabel?: string;
+  /**
+   * Calendar variant prop. Label for the cancel button of the month picker, Android only.
+   */
+  monthPickerCancelLabel?: string;
 }

package/src/theme/__tests__/__snapshots__/index.spec.ts.snap

@@ -262,7 +262,9 @@ Object {
       },
       "space": Object {
         "headerHorizontalPadding": 12,
+        "headerMarginRight": 8,
         "headerVerticalPadding": 16,
+        "iosPickerMarginVertical": 64,
         "rowVerticalPadding": 16,
       },
     },

package/src/theme/components/calendar.ts

@@ -24,6 +24,8 @@ const getCalendarTheme = (theme: GlobalTheme) => {
     rowVerticalPadding: theme.space.medium,
     headerVerticalPadding: theme.space.medium,
     headerHorizontalPadding: theme.space.smallMedium,
+    headerMarginRight: theme.space.small,
+    iosPickerMarginVertical: theme.space['5xlarge'],
   };
 
   const radii = {

package/testUtils/setup.tsx

@@ -107,6 +107,25 @@ jest.mock('react-native-gesture-handler', () => {
   };
 });
 
+jest.mock("@hero-design/react-native-month-year-picker", () => {
+  const React = jest.requireActual("react");
+  const { View, Text } = jest.requireActual("react-native");
+
+  return {
+    MonthYearPickerDialogueAndroid: () => (
+      <View>
+        <Text>Android picker</Text>
+      </View>
+    ),
+    MonthYearPickerViewIOS: () => (
+      <View>
+        <Text>IOS picker</Text>
+      </View>
+    ),
+  };
+});
+
+
 jest.mock('react-native/Libraries/Utilities/BackHandler', () => {
   return jest.requireActual(
     'react-native/Libraries/Utilities/__mocks__/BackHandler.js',