Address comments

songlang1994 · Oct 12, 2021 · d953a31 · d953a31
1 parent 976e0ca
commit d953a31
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/src/components/CheckboxWithTooltip/CheckboxWithTooltipForMobileWebAndNative.js b/src/components/CheckboxWithTooltip/CheckboxWithTooltipForMobileWebAndNative.js
@@ -10,21 +10,21 @@ import withWindowDimensions from '../withWindowDimensions';
 class CheckboxWithTooltipForMobileWebAndNative extends React.Component {
     constructor(props) {
         super(props);
-        this.onPress = this.onPress.bind(this);
+        this.showGrowlAndTriggerOnPress = this.showGrowlAndTriggerOnPress.bind(this);
     }
 
     componentDidUpdate() {
         if (this.props.toggleTooltip) {
-            Growl.show(this.props.text, CONST.GROWL.WARNING, 3000);
+            Growl.show(this.props.text, this.props.growlType, 3000);
         }
     }
 
     /**
      * Show warning modal on mobile devices since tooltips are not supported when checkbox is disabled.
      */
-    onPress() {
+    showGrowlAndTriggerOnPress() {
         if (this.props.toggleTooltip) {
-            Growl.show(this.props.text, CONST.GROWL.WARNING, 3000);
+            Growl.show(this.props.text, this.props.growlType, 3000);
         }
         this.props.onPress();
     }
@@ -34,7 +34,7 @@ class CheckboxWithTooltipForMobileWebAndNative extends React.Component {
             <View style={this.props.style}>
                 <Checkbox
                     isChecked={this.props.isChecked}
-                    onPress={this.onPress}
+                    onPress={this.showGrowlAndTriggerOnPress}
                 />
             </View>
         );
@@ -44,6 +44,4 @@ class CheckboxWithTooltipForMobileWebAndNative extends React.Component {
 CheckboxWithTooltipForMobileWebAndNative.propTypes = propTypes;
 CheckboxWithTooltipForMobileWebAndNative.defaultProps = defaultProps;
 
-export default compose(
-    withWindowDimensions,
-)(CheckboxWithTooltipForMobileWebAndNative);
+export default withWindowDimensions(CheckboxWithTooltipForMobileWebAndNative);
diff --git a/src/components/CheckboxWithTooltip/CheckboxWithTooltipPropTypes.js b/src/components/CheckboxWithTooltip/CheckboxWithTooltipPropTypes.js
@@ -1,5 +1,7 @@
 import PropTypes from 'prop-types';
 import {windowDimensionsPropTypes} from '../withWindowDimensions';
+import CONST from '../../CONST';
+import stylePropTypes from '../../styles/stylePropTypes';
 
 const propTypes = {
     /** Whether the checkbox is checked */
@@ -17,8 +19,11 @@ const propTypes = {
     /** Should the input be disabled  */
     disabled: PropTypes.bool,
 
+    /** Type of the growl to be displayed in case of mobile devices  */
+    growlType: PropTypes.string,
+
     /** Container styles */
-    style: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
+    style: stylePropTypes,
 
     /** Props inherited from withWindowDimensions */
     ...windowDimensionsPropTypes,
@@ -28,6 +33,7 @@ const defaultProps = {
     style: [],
     disabled: false,
     toggleTooltip: true,
+    growlType: CONST.GROWL.WARNING,
 };
 
 export {

diff --git a/src/components/CheckboxWithTooltip/index.js b/src/components/CheckboxWithTooltip/index.js
@@ -44,6 +44,4 @@ CheckboxWithTooltip.propTypes = propTypes;
 CheckboxWithTooltip.defaultProps = defaultProps;
 CheckboxWithTooltip.displayName = 'CheckboxWithTooltip';
 
-export default compose(
-    withWindowDimensions,
-)(CheckboxWithTooltip);
+export default withWindowDimensions(CheckboxWithTooltip);
diff --git a/src/components/CheckboxWithTooltip/index.native.js b/src/components/CheckboxWithTooltip/index.native.js
@@ -19,6 +19,4 @@ CheckboxWithTooltip.propTypes = propTypes;
 CheckboxWithTooltip.defaultProps = defaultProps;
 CheckboxWithTooltip.displayName = 'CheckboxWithTooltip';
 
-export default compose(
-    withWindowDimensions,
-)(CheckboxWithTooltip);
+export default withWindowDimensions(CheckboxWithTooltip);