@momo-kits/step 0.0.61-beta.8 → 0.0.62-alpha.13

package/Step.horizontal.js

@@ -1,5 +1,4 @@
-import { Colors, IconSource, Image, Spacing } from '@momo-kits/core-v2';
-import { Text } from '@momo-kits/core';
+import { Colors, IconSource, Image, Spacing, Text } from '@momo-kits/core-v2';
 import PropTypes from 'prop-types';
 import React from 'react';
 import { StyleSheet, View } from 'react-native';
@@ -96,6 +95,7 @@ const HorizontalStep = (props) => {
                         styles.circleText,
                         {
                             fontSize: CIRCLE_TEXT_SIZE,
+                            lineHeight: CIRCLE_TEXT_SIZE + 2,
                         },
                     ]}>
                     {index + 1}
@@ -108,6 +108,7 @@ const HorizontalStep = (props) => {
                     styles.circleText,
                     {
                         fontSize: CIRCLE_TEXT_SIZE,
+                        lineHeight: CIRCLE_TEXT_SIZE + 2,
                     },
                 ]}>
                 {index + 1}

package/Step.vertical.js

@@ -4,8 +4,8 @@ import {
     Image,
     ScaleSize,
     Spacing,
+    Text,
 } from '@momo-kits/core-v2';
-import { Text } from '@momo-kits/core';
 
 import React from 'react';
 import { StyleSheet, View } from 'react-native';
@@ -104,6 +104,7 @@ const VerticalStep = (props) => {
                         styles.circleText,
                         {
                             fontSize: CIRCLE_TEXT_SIZE,
+                            lineHeight: CIRCLE_TEXT_SIZE + 2,
                         },
                     ]}>
                     {index + 1}
@@ -116,6 +117,7 @@ const VerticalStep = (props) => {
                     styles.circleText,
                     {
                         fontSize: CIRCLE_TEXT_SIZE,
+                        lineHeight: CIRCLE_TEXT_SIZE + 2,
                     },
                 ]}>
                 {index + 1}
@@ -171,11 +173,25 @@ const VerticalStep = (props) => {
         );
     };
 
-    const renderContent = (content, error, index) => {
+    const renderContent = (content, error, index, size) => {
         const disabledColor = Colors.black_09;
+        let marginBottom = size === 'small' ? Spacing.S : Spacing.M;
+        let minHeight = ScaleSize(30);
+
+        if (index === steps.length - 1) {
+            marginBottom = 0;
+            minHeight = 0;
+        }
 
         return (
-            <View style={styles.content}>
+            <View
+                style={[
+                    styles.content,
+                    {
+                        marginBottom,
+                        minHeight,
+                    },
+                ]}>
                 {content && typeof content === 'string' ? (
                     <Text
                         style={[
@@ -212,7 +228,7 @@ const VerticalStep = (props) => {
                 </View>
                 <View style={styles.contentContainer}>
                     {renderHeader(title, subTitle, error, index)}
-                    {renderContent(content, error, index)}
+                    {renderContent(content, error, index, size)}
                 </View>
             </View>
         );
@@ -241,7 +257,9 @@ const styles = StyleSheet.create({
         alignItems: 'center',
     },
     contentContainer: { marginLeft: Spacing.S, flex: 1 },
-    content: { marginVertical: Spacing.XS, minHeight: ScaleSize(60) },
+    content: {
+        marginTop: Spacing.XS,
+    },
     contentText: {
         color: Colors.black_12,
     },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/step",
-    "version": "0.0.61-beta.8",
+    "version": "0.0.62-alpha.13",
     "private": false,
     "main": "index.js",
     "dependencies": {},
@@ -8,7 +8,7 @@
         "react-native": ">=0.55",
         "prop-types": "^15.7.2",
         "react": "16.9.0",
-        "@momo-kits/core": ">=0.0.5-beta"
+        "@momo-kits/core-v2": ">=0.0.5-beta"
     },
     "devDependencies": {},
     "license": "MoMo"