@momo-kits/date-picker 0.92.21-beta.0 → 0.92.21-beta.2

package/index.tsx

@@ -1,6 +1,6 @@
-import React, { FC, useEffect, useState } from 'react';
-import { Dimensions, LayoutChangeEvent, Platform, View } from 'react-native';
-import { Spacing, Text } from '@momo-kits/foundation';
+import React, {FC, useEffect, useState} from 'react';
+import {Dimensions, LayoutChangeEvent, Platform, View} from 'react-native';
+import {scaleSize, Spacing, Text} from '@momo-kits/foundation';
 import WheelPicker from './WheelPicker';
 import {
   getDaysInMonth,
@@ -10,7 +10,7 @@ import {
   getYears,
   timeMode,
 } from './utils';
-import { DateObject, DateTimePickerProps, PickerDataObject } from './types';
+import {DateObject, DateTimePickerProps, PickerDataObject} from './types';
 import styles from './styles';
 
 const date = new Date();
@@ -28,7 +28,8 @@ const DateTimePicker: FC<DateTimePickerProps> = ({
   selectedValue = date,
   minDate = minDateDefault,
   maxDate = maxDateDefault,
-  arrayLabelTime = []
+  arrayLabelTime = [],
+  style,
 }) => {
   const [data, setData] = useState<DateObject[]>([]);
   let [currentDate, setCurrentDate] = useState<PickerDataObject>({
@@ -42,7 +43,7 @@ const DateTimePicker: FC<DateTimePickerProps> = ({
 
   useEffect(() => {
     setupData();
-    return () => { };
+    return () => {};
   }, [selectedValue, currentDate]);
 
   useEffect(() => {
@@ -55,7 +56,7 @@ const DateTimePicker: FC<DateTimePickerProps> = ({
     const formatParts = format.split(/[^A-Za-z]+/);
     const isOnlyHour = formatParts.length === 1 && formatParts[0] === 'HH';
 
-    const componentData: { [key: string]: DateObject } = {
+    const componentData: {[key: string]: DateObject} = {
       DD: {
         name: 'day',
         data: getDaysInMonth(
@@ -73,8 +74,8 @@ const DateTimePicker: FC<DateTimePickerProps> = ({
         name: 'year',
         data: getYears(minDate, maxDate),
       },
-      HH: { name: 'hour', data: getHours(isOnlyHour ? 12 : 24) },
-      mm: { name: 'min', data: getMinutes(minuteInterval) },
+      HH: {name: 'hour', data: getHours(isOnlyHour ? 12 : 24)},
+      mm: {name: 'min', data: getMinutes(minuteInterval)},
     };
 
     const initialData = formatParts.map(part => {
@@ -88,7 +89,7 @@ const DateTimePicker: FC<DateTimePickerProps> = ({
     });
 
     if (isOnlyHour) {
-      initialData.push({ name: 'timeMode', data: timeMode });
+      initialData.push({name: 'timeMode', data: timeMode});
     }
 
     setData(initialData);
@@ -133,15 +134,21 @@ const DateTimePicker: FC<DateTimePickerProps> = ({
   };
 
   return (
-    <View onLayout={onLayout} style={styles.datePicker}>
+    <View
+      onLayout={onLayout}
+      style={[
+        style,
+        styles.datePicker,
+        {
+          height: arrayLabelTime.length > 0 ? scaleSize(238) : scaleSize(210),
+        },
+      ]}>
       {data.map((dataItem, index) => {
         return (
           <View>
             {arrayLabelTime[index] && (
-              <View style={{ alignItems: 'center', marginBottom: Spacing.M }}>
-                <Text typography="header_default_bold">
-                  {arrayLabelTime[index]}
-                </Text>
+              <View style={{alignItems: 'center', marginBottom: Spacing.S}}>
+                <Text typography="action_s_bold">{arrayLabelTime[index]}</Text>
               </View>
             )}
             <WheelPicker
@@ -159,7 +166,7 @@ const DateTimePicker: FC<DateTimePickerProps> = ({
               }}
             />
           </View>
-        )
+        );
       })}
     </View>
   );

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/date-picker",
-    "version": "0.92.21-beta.0",
+    "version": "0.92.21-beta.2",
     "private": false,
     "main": "index.tsx",
     "peerDependencies": {
@@ -15,4 +15,4 @@
     },
     "license": "MoMo",
     "dependencies": {}
-}
+}

package/publish.sh

@@ -7,16 +7,16 @@ rsync -r --exclude=/dist ./* dist
 cd dist
 
 if [ "$1" == "stable" ]; then
-  #npm version $(npm view @momo-kits/date-picker@stable version)
-  #npm version patch
+  npm version $(npm view @momo-kits/date-picker@stable version)
+  npm version patch
   npm publish --tag stable --access=public
 elif [ "$1" == "latest" ]; then
-  #npm version $(npm view @momo-kits/foundation@latest version)
-  #npm version prerelease --preid=rc
+  npm version $(npm view @momo-kits/foundation@latest version)
+  npm version prerelease --preid=rc
   npm publish --tag latest --access=public
 else
-  #npm version $(npm view @momo-kits/date-picker@beta version)
-  #npm version prerelease --preid=beta
+  npm version $(npm view @momo-kits/date-picker@beta version)
+  npm version prerelease --preid=beta
   npm publish --tag beta --access=public
 fi
 

package/styles.ts

@@ -1,5 +1,5 @@
-import { StyleSheet } from 'react-native';
-import { Colors, Radius, Spacing } from '@momo-kits/foundation';
+import {StyleSheet} from 'react-native';
+import {Colors, Radius, scaleSize, Spacing} from '@momo-kits/foundation';
 
 export default StyleSheet.create({
   wheelItem: {
@@ -11,7 +11,7 @@ export default StyleSheet.create({
   wheelPicker: {
     borderWidth: 1,
     borderRadius: Radius.S,
-    flex: 1
+    flex: 1,
   },
   overlay: {
     position: 'absolute',
@@ -27,10 +27,8 @@ export default StyleSheet.create({
     backgroundColor: Colors.blue_10,
   },
   datePicker: {
-    height: 245,
     overflow: 'hidden',
     flexDirection: 'row',
     justifyContent: 'space-evenly',
-    marginBottom: Spacing.XL,
   },
-});
+});

package/types.ts

@@ -1,4 +1,4 @@
-import { ViewStyle } from 'react-native';
+import {ViewStyle} from 'react-native';
 
 export type DateTimePickerProps = {
   /**
@@ -35,6 +35,7 @@ export type DateTimePickerProps = {
    */
   arrayLabelTime?: string[];
 
+  style?: ViewStyle;
 };
 
 /**