@momo-kits/step 0.0.43-beta.27 → 0.0.43-beta.28

package/Step.vertical.web.js

@@ -16,13 +16,12 @@ const styles = StyleSheet.create({
         borderWidth: 2,
         padding: 4,
     },
-    checkedCircle: {
-        width: CIRCLE_SIZE,
-        height: CIRCLE_SIZE,
-        borderRadius: CIRCLE_SIZE / 2,
-        backgroundColor: '#ffadd2',
-        borderWidth: 2,
-        borderColor: Colors.pink_09,
+    iconImage: {
+        width: 16,
+        height: 16,
+        position: 'absolute',
+        top: 2,
+        left: 2,
     },
     titleDefault: {
         color: Colors.black_12,
@@ -34,8 +33,15 @@ const styles = StyleSheet.create({
         fontSize: 14,
         fontWeight: 'bold',
     },
-    containerStyle: {
-        minHeight: CIRCLE_SIZE + 20 + CIRCLE_SIZE,
+    container: {
+        width: '100%',
+        paddingRight: 48,
+        marginTop: 4,
+    },
+    titleAndDate: {
+        flexDirection: 'row',
+        justifyContent: 'space-between',
+        alignItems: 'center',
     },
     description: {
         fontSize: 12,
@@ -84,127 +90,266 @@ export default class VerticalStep extends Component {
         });
     };
 
-    circleStep = (index) => {
+    /* #region  render cust */
+    _renderCircleImage = ({ icon = '', circleColor, circleBorderColor }) => {
         return (
-            <View style={[styles.circle]}>
-                <Text style={styles.number}>{index}</Text>
+            <View>
+                <View
+                    style={[
+                        styles.circle,
+                        {
+                            backgroundColor: circleColor,
+                            borderColor: circleBorderColor,
+                        },
+                    ]}>
+                    <Image
+                        source={icon}
+                        style={[styles.iconImage, { tintColor: '#ffffff' }]}
+                    />
+                </View>
+            </View>
+        );
+    };
+
+    _renderCircleText = ({
+        circleColor = '',
+        circleBorderColor = '',
+        index = 0,
+    }) => {
+        return (
+            <View>
+                <View
+                    style={[
+                        styles.circle,
+                        {
+                            backgroundColor: circleColor,
+                            borderColor: circleBorderColor,
+                        },
+                    ]}>
+                    <Text style={styles.number}>{index + 1}</Text>
+                </View>
+            </View>
+        );
+    };
+
+    _renderCircle = ({
+        circleColor = '',
+        circleBorderColor = '',
+        isActiveState = false,
+        circleUnchecked = false,
+        iconActive,
+        iconUnchecked,
+        icon = {},
+        index = 0,
+    }) => {
+        let resultComponent = <></>;
+        if (!isActiveState) {
+            if (circleUnchecked) {
+                if (Object.keys(iconUnchecked).length === 0) {
+                    resultComponent = this._renderCircleImage({
+                        icon,
+                        circleColor,
+                        circleBorderColor,
+                    });
+                } else {
+                    resultComponent = this._renderCircleText({
+                        circleColor,
+                        circleBorderColor,
+                        index,
+                    });
+                }
+            } else {
+                resultComponent = this._renderCircleImage({
+                    icon,
+                    circleColor,
+                    circleBorderColor,
+                });
+            }
+        } else {
+            // This is active case
+            // If icon diff "" & regex http or https url so will render image component
+            if (Object.keys(iconActive).length === 0) {
+                resultComponent = this._renderCircleImage({
+                    icon,
+                    circleColor,
+                    circleBorderColor,
+                });
+            } else {
+                // Otherwise render index number in text component
+                resultComponent = resultComponent = this._renderCircleText({
+                    circleColor,
+                    circleBorderColor,
+                    index,
+                });
+            }
+        }
+        return resultComponent;
+    };
+
+    _renderLine = ({ titles = {}, index = 0, lineActive = '' }) => {
+        let resultComponent = <></>;
+
+        if (titles?.length - 1 !== index) {
+            resultComponent = (
+                <View
+                    style={[
+                        styles.lineVertical,
+                        {
+                            backgroundColor: lineActive,
+                        },
+                    ]}
+                />
+            );
+        }
+        return resultComponent;
+    };
+
+    _renderTitle = ({ textFontStyle = {}, titleStyle = {}, value = {} }) => {
+        let resultComponent = (
+            <View>
+                <Text.Caption
+                    style={[{ marginLeft: 10 }, textFontStyle, titleStyle]}>
+                    {value}
+                </Text.Caption>
             </View>
         );
+        return resultComponent;
+    };
+
+    _renderDateOrValue = ({
+        date = '',
+        isActiveState = false,
+        circleChecked = false,
+        dateStyle = {},
+        index = 0,
+    }) => {
+        // Init states in render function
+        let resultComponent = <></>;
+        if (!date) {
+            return resultComponent;
+        }
+        if (isActiveState || circleChecked) {
+            resultComponent = (
+                <Text style={[styles.date, dateStyle]}>{date[index]}</Text>
+            );
+        }
+        return resultComponent;
+    };
+
+    _renderDescription = ({ items = {}, descriptionStyle = {}, index = 0 }) => {
+        let resultComponent = <></>;
+
+        if (items) {
+            resultComponent = (
+                <View>
+                    {typeof items[index] == 'string' ? (
+                        <Text style={[styles.description, descriptionStyle]}>
+                            {items[index]}
+                        </Text>
+                    ) : (
+                        <View style={[styles.description]}>{items[index]}</View>
+                    )}
+                </View>
+            );
+        }
+        return resultComponent;
     };
+    /* #endregion */
 
     circleColumn = (value, index) => {
         const {
             currentStep,
             titles,
-            lineStyle,
             iconActive,
-            iconInActive,
+            iconChecked,
+            iconUnchecked,
+            circleColorActive,
+            circleColorChecked,
+            circleColorUnchecked,
+            circleBorderColorActive,
+            circleBorderColorChecked,
+            circleBorderColorUnchecked,
             lineColorActive,
             lineColorInActive,
             items,
-            currentStepColor,
             date,
             titleStyle,
             descriptionStyle,
             dateStyle,
         } = this.props;
-        const icon =
-            currentStep >= index + 2
-                ? iconActive || IconSource.ic_check_24
-                : iconInActive || index + 1;
-        var circleColor =
-            currentStep >= index + 1 ? currentStepColor : Colors.black_06;
-        var circleBorderColor =
-            currentStep >= index + 1 ? Colors.pink_09 : Colors.black_04;
-        const textFontStyle =
-            currentStep === index + 1
-                ? styles.titleActive
-                : styles.titleDefault;
-        const lineActive =
-            currentStep >= index + 2
-                ? lineColorActive
-                    ? Colors.pink_09
-                    : '#ffd6e7'
-                : lineColorInActive || Colors.black_04;
+
+        // Three circle states
+        const isActiveState = currentStep == index + 1;
+        const circleChecked = currentStep > index + 1;
+        const circleUnchecked = currentStep < index + 1;
+
+        // Default properties is inactive state
+        let icon = {};
+        let circleColor = circleColorUnchecked || Colors.black_06;
+        let circleBorderColor = circleBorderColorUnchecked || Colors.black_04;
+        let textFontStyle = styles.titleDefault;
+        let lineActive = lineColorInActive || Colors.black_04;
+
+        let tintColor = '#ffd6e7';
+
+        // This is all properties in active state
+        if (isActiveState) {
+            icon = iconActive || index + 1;
+            circleColor = circleColorActive || '#d82d8b';
+            circleBorderColor = circleBorderColorActive || Colors.pink_09;
+            textFontStyle = styles.titleActive;
+        }
+
+        if (circleChecked) {
+            icon = iconChecked || IconSource.ic_check_24;
+            lineActive = lineColorActive || tintColor;
+            circleColor = circleColorChecked || '#ffadd2';
+            circleBorderColor = circleBorderColorChecked || Colors.pink_09;
+        }
+
+        if (circleUnchecked) {
+            icon = iconUnchecked || index + 1;
+        }
+
         return (
             <View key={index} style={{ flexDirection: 'row' }}>
                 <View>
-                    {currentStep <= index + 1 ? (
-                        <View>
-                            {/* image */}
-                            <View
-                                style={[
-                                    styles.circle,
-                                    {
-                                        backgroundColor: circleColor,
-                                        borderColor: circleBorderColor,
-                                    },
-                                ]}>
-                                <Text style={styles.number}>{icon}</Text>
-                            </View>
-                        </View>
-                    ) : (
-                        <View>
-                            <Image
-                                source={icon}
-                                style={[
-                                    styles.checkedCircle,
-                                    { tintColor: '#ffd6e7' },
-                                ]}
-                            />
-                        </View>
-                    )}
-                    {titles?.length - 1 !== index && (
-                        <View
-                            style={[
-                                styles.lineVertical,
-                                {
-                                    backgroundColor: lineActive,
-                                },
-                                lineStyle,
-                            ]}
-                        />
-                    )}
+                    {this._renderCircle({
+                        circleColor,
+                        circleBorderColor,
+                        isActiveState,
+                        circleUnchecked,
+                        iconActive,
+                        iconUnchecked,
+                        icon,
+                        index,
+                    })}
+                    {this._renderLine({
+                        titles,
+                        index,
+                        lineActive,
+                    })}
                 </View>
-                <View
-                    style={[{ width: '100%', paddingRight: 48, marginTop: 4 }]}>
-                    <View
-                        style={{
-                            flexDirection: 'row',
-                            justifyContent: 'space-between',
-                            alignItems: 'center',
-                        }}>
-                        <Text.Caption
-                            style={[
-                                { marginLeft: 10 },
-                                textFontStyle,
-                                titleStyle,
-                            ]}>
-                            {value}
-                        </Text.Caption>
-                        {date && currentStep >= index + 1 && (
-                            <Text style={[styles.date, dateStyle]}>
-                                {date[index]}
-                            </Text>
-                        )}
+                <View style={styles.container}>
+                    <View style={styles.titleAndDate}>
+                        {this._renderTitle({
+                            textFontStyle,
+                            titleStyle,
+                            value,
+                        })}
+                        {this._renderDateOrValue({
+                            date,
+                            isActiveState,
+                            circleChecked,
+                            dateStyle,
+                            index,
+                        })}
                     </View>
-                    {items && (
-                        <View>
-                            {typeof items[index] == 'string' ? (
-                                <Text
-                                    style={[
-                                        styles.description,
-                                        descriptionStyle,
-                                    ]}>
-                                    {items[index]}
-                                </Text>
-                            ) : (
-                                <View style={[styles.description]}>
-                                    {items[index]}
-                                </View>
-                            )}
-                        </View>
-                    )}
+                    {this._renderDescription({
+                        items,
+                        descriptionStyle,
+                        index,
+                    })}
                 </View>
             </View>
         );
@@ -218,7 +363,7 @@ export default class VerticalStep extends Component {
     render() {
         return (
             <ScrollView>
-                <View style={[styles.containerStyle]} onLayout={this.onLayout}>
+                <View onLayout={this.onLayout}>
                     <View style={[styles.circleColumn]}>
                         {this.renderCircle()}
                     </View>
@@ -235,11 +380,16 @@ VerticalStep.propTypes = {
     items: PropTypes.array,
     isVertical: PropTypes.bool,
     iconActive: PropTypes.any,
-    iconInActive: PropTypes.any,
+    iconChecked: PropTypes.any,
+    iconUnchecked: PropTypes.any,
+    circleColorActive: PropTypes.string,
+    circleColorChecked: PropTypes.string,
+    circleColorUnchecked: PropTypes.string,
+    circleBorderColorActive: PropTypes.string,
+    circleBorderColorChecked: PropTypes.string,
+    circleBorderColorUnchecked: PropTypes.string,
     lineColorActive: PropTypes.string,
     lineColorInActive: PropTypes.string,
-    borderColorActive: PropTypes.string,
-    borderColorInActive: PropTypes.string,
     titleStyle: PropTypes.object,
     descriptionStyle: PropTypes.object,
     dateStyle: PropTypes.object,

package/Step.web.js

@@ -3,6 +3,8 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import HorizontalStep from './Step.horizontal.web.js';
 import VerticalStep from './Step.vertical.web.js';
+import Colors from '../../core/colors';
+import { Icons as IconSource } from '../../core/icons';
 
 export default class Step extends Component {
     constructor(props) {
@@ -26,11 +28,16 @@ Step.propTypes = {
     items: PropTypes.array,
     isVertical: PropTypes.bool,
     iconActive: PropTypes.any,
-    iconInActive: PropTypes.any,
+    iconChecked: PropTypes.any,
+    iconUnchecked: PropTypes.any,
+    circleColorActive: PropTypes.string,
+    circleColorChecked: PropTypes.string,
+    circleColorUnchecked: PropTypes.string,
+    circleBorderColorActive: PropTypes.string,
+    circleBorderColorChecked: PropTypes.string,
+    circleBorderColorUnchecked: PropTypes.string,
     lineColorActive: PropTypes.string,
     lineColorInActive: PropTypes.string,
-    borderColorActive: PropTypes.string,
-    borderColorInActive: PropTypes.string,
     titleStyle: PropTypes.object,
     descriptionStyle: PropTypes.object,
     dateStyle: PropTypes.object,
@@ -39,4 +46,16 @@ Step.propTypes = {
 Step.defaultProps = {
     titles: [],
     currentStep: 0,
+    isVertical: false,
+    iconActive: 'index + 1',
+    iconChecked: IconSource.ic_check_24,
+    iconUnchecked: 'index + 1',
+    circleColorActive: '#d82d8b',
+    circleColorChecked: '#ffadd2',
+    circleColorUnchecked: Colors.black_06,
+    circleBorderColorActive: Colors.pink_09,
+    circleBorderColorChecked: Colors.pink_09,
+    circleBorderColorUnchecked: Colors.black_04,
+    lineColorActive: '#ffd6e7',
+    lineColorInActive: Colors.black_04,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/step",
-  "version": "0.0.43-beta.27",
+  "version": "0.0.43-beta.28",
   "private": false,
   "main": "index.js",
   "dependencies": {},