reduce duplication of getDefaultValidationOption invoke

Edward Xiao · Edward Xiao · commit 47df0ae1a8bc · 2018-10-17T10:18:25.000+08:00
diff --git a/src/js/Inputs/Checkbox.js b/src/js/Inputs/Checkbox.js
@@ -128,8 +128,9 @@ class Index extends React.Component {
   }
 
   handleCheckEnd(err, msg) {
-    if (getDefaultValidationOption(this.props.validationOption).msgOnError) {
-      msg = getDefaultValidationOption(this.props.validationOption).msgOnError;
+    const { msgOnError } = getDefaultValidationOption(this.props.validationOption);
+    if (err && msgOnError) {
+      msg = msgOnError;
     }
     this.setState({ err, msg });
     const { validationCallback } = this.props;
@@ -181,10 +182,11 @@ class Index extends React.Component {
     const successMsgClass = cx(STYLES['msg'], !err && STYLES['success']);
 
     let msgHtml;
-    if (getDefaultValidationOption(validationOption).showMsg && err && msg) {
+    const { showMsg } = getDefaultValidationOption(validationOption);
+    if (showMsg && err && msg) {
       msgHtml = <div className={errMsgClass}>{msg}</div>;
     }
-    if (getDefaultValidationOption(validationOption).showMsg && !err && successMsg) {
+    if (showMsg && !err && successMsg) {
       msgHtml = <div className={successMsgClass}>{successMsg}</div>;
     }
     return (
diff --git a/src/js/Inputs/Radiobox.js b/src/js/Inputs/Radiobox.js
@@ -127,8 +127,9 @@ class Index extends React.Component {
   }
 
   handleCheckEnd(err, msg) {
-    if (getDefaultValidationOption(this.props.validationOption).msgOnError) {
-      msg = getDefaultValidationOption(this.props.validationOption).msgOnError;
+    const { msgOnError } = getDefaultValidationOption(this.props.validationOption);
+    if (err && msgOnError) {
+      msg = msgOnError;
     }
     this.setState({ err, msg });
     const { validationCallback } = this.props;
@@ -170,10 +171,11 @@ class Index extends React.Component {
     const successMsgClass = cx(STYLES['msg'], !err && STYLES['success']);
 
     let msgHtml;
-    if (getDefaultValidationOption(validationOption).showMsg && err && msg) {
+    const { showMsg } = getDefaultValidationOption(validationOption);
+    if (showMsg && err && msg) {
       msgHtml = <div className={errMsgClass}>{msg}</div>;
     }
-    if (getDefaultValidationOption(validationOption).showMsg && !err && successMsg) {
+    if (showMsg && !err && successMsg) {
       msgHtml = <div className={successMsgClass}>{successMsg}</div>;
     }
 
diff --git a/src/js/Inputs/Select.js b/src/js/Inputs/Select.js
@@ -331,8 +331,9 @@ class Index extends React.Component {
   }
 
   handleCheckEnd(err, msg) {
-    if (getDefaultValidationOption(this.props.validationOption).msgOnError) {
-      msg = getDefaultValidationOption(this.props.validationOption).msgOnError;
+    const { msgOnError } = getDefaultValidationOption(this.props.validationOption);
+    if (err && msgOnError) {
+      msg = msgOnError;
     }
     this.setState({ err, msg });
     const { validationCallback } = this.props;
@@ -396,10 +397,11 @@ class Index extends React.Component {
     const successMsgClass = cx(STYLES['msg'], !err && STYLES['success']);
 
     let msgHtml;
-    if (getDefaultValidationOption(validationOption).showMsg && err && msg) {
+    const { showMsg } = getDefaultValidationOption(validationOption);
+    if (showMsg && err && msg) {
       msgHtml = <div className={errMsgClass}>{msg}</div>;
     }
-    if (getDefaultValidationOption(validationOption).showMsg && !err && successMsg) {
+    if (showMsg && !err && successMsg) {
       msgHtml = <div className={successMsgClass}>{successMsg}</div>;
     }
     let optionListHtml;
diff --git a/src/js/Inputs/Textarea.js b/src/js/Inputs/Textarea.js
@@ -185,8 +185,9 @@ class Index extends React.Component {
   }
 
   handleCheckEnd(err, msg) {
-    if (err && getDefaultValidationOption(this.props.validationOption).msgOnError) {
-      msg = getDefaultValidationOption(this.props.validationOption).msgOnError;
+    const { msgOnError } = getDefaultValidationOption(this.props.validationOption);
+    if (err && msgOnError) {
+      msg = msgOnError;
     }
     this.setState({ err, msg });
     const { validationCallback } = this.props;
@@ -223,10 +224,11 @@ class Index extends React.Component {
     const successMsgClass = cx(STYLES['msg'], !err && STYLES['success']);
 
     let msgHtml;
-    if (getDefaultValidationOption(validationOption).showMsg && err && msg) {
+    const { showMsg } = getDefaultValidationOption(validationOption);
+    if (showMsg && err && msg) {
       msgHtml = <div className={errMsgClass}>{msg}</div>;
     }
-    if (getDefaultValidationOption(validationOption).showMsg && !err && successMsg) {
+    if (showMsg && !err && successMsg) {
       msgHtml = <div className={successMsgClass}>{successMsg}</div>;
     }
     return (
diff --git a/src/js/Inputs/Textbox.js b/src/js/Inputs/Textbox.js
@@ -255,8 +255,9 @@ class Index extends React.Component {
   }
 
   handleCheckEnd(err, msg) {
-    if (err && getDefaultValidationOption(this.props.validationOption).msgOnError) {
-      msg = getDefaultValidationOption(this.props.validationOption).msgOnError;
+    const { msgOnError } = getDefaultValidationOption(this.props.validationOption);
+    if (err && msgOnError) {
+      msg = msgOnError;
     }
     this.setState({ err, msg });
     const { validationCallback } = this.props;
@@ -294,10 +295,11 @@ class Index extends React.Component {
     const successMsgClass = cx(STYLES['msg'], !err && STYLES['success']);
 
     let msgHtml;
-    if (getDefaultValidationOption(validationOption).showMsg && err && msg) {
+    const { showMsg } = getDefaultValidationOption(validationOption);
+    if (showMsg && err && msg) {
       msgHtml = <div className={errMsgClass}>{msg}</div>;
     }
-    if (getDefaultValidationOption(validationOption).showMsg && !err && successMsg) {
+    if (showMsg && !err && successMsg) {
       msgHtml = <div className={successMsgClass}>{successMsg}</div>;
     }
     return (

Original file line number	Diff line number	Diff line change
`@@ -128,8 +128,9 @@ class Index extends React.Component {`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`handleCheckEnd(err, msg) {`
`131`		`- if (getDefaultValidationOption(this.props.validationOption).msgOnError) {`
`132`		`- msg = getDefaultValidationOption(this.props.validationOption).msgOnError;`
	`131`	`+ const { msgOnError } = getDefaultValidationOption(this.props.validationOption);`
	`132`	`+ if (err && msgOnError) {`
	`133`	`+ msg = msgOnError;`
`133`	`134`	`}`
`134`	`135`	`this.setState({ err, msg });`
`135`	`136`	`const { validationCallback } = this.props;`
`@@ -181,10 +182,11 @@ class Index extends React.Component {`
`181`	`182`	`const successMsgClass = cx(STYLES['msg'], !err && STYLES['success']);`
`182`	`183`
`183`	`184`	`let msgHtml;`
`184`		`- if (getDefaultValidationOption(validationOption).showMsg && err && msg) {`
	`185`	`+ const { showMsg } = getDefaultValidationOption(validationOption);`
	`186`	`+ if (showMsg && err && msg) {`
`185`	`187`	`msgHtml = <div className={errMsgClass}>{msg}</div>;`
`186`	`188`	`}`
`187`		`- if (getDefaultValidationOption(validationOption).showMsg && !err && successMsg) {`
	`189`	`+ if (showMsg && !err && successMsg) {`
`188`	`190`	`msgHtml = <div className={successMsgClass}>{successMsg}</div>;`
`189`	`191`	`}`
`190`	`192`	`return (`
Original file line number	Diff line number	Diff line change
`@@ -127,8 +127,9 @@ class Index extends React.Component {`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`handleCheckEnd(err, msg) {`
`130`		`- if (getDefaultValidationOption(this.props.validationOption).msgOnError) {`
`131`		`- msg = getDefaultValidationOption(this.props.validationOption).msgOnError;`
	`130`	`+ const { msgOnError } = getDefaultValidationOption(this.props.validationOption);`
	`131`	`+ if (err && msgOnError) {`
	`132`	`+ msg = msgOnError;`
`132`	`133`	`}`
`133`	`134`	`this.setState({ err, msg });`
`134`	`135`	`const { validationCallback } = this.props;`
`@@ -170,10 +171,11 @@ class Index extends React.Component {`
`170`	`171`	`const successMsgClass = cx(STYLES['msg'], !err && STYLES['success']);`
`171`	`172`
`172`	`173`	`let msgHtml;`
`173`		`- if (getDefaultValidationOption(validationOption).showMsg && err && msg) {`
	`174`	`+ const { showMsg } = getDefaultValidationOption(validationOption);`
	`175`	`+ if (showMsg && err && msg) {`
`174`	`176`	`msgHtml = <div className={errMsgClass}>{msg}</div>;`
`175`	`177`	`}`
`176`		`- if (getDefaultValidationOption(validationOption).showMsg && !err && successMsg) {`
	`178`	`+ if (showMsg && !err && successMsg) {`
`177`	`179`	`msgHtml = <div className={successMsgClass}>{successMsg}</div>;`
`178`	`180`	`}`
`179`	`181`
Original file line number	Diff line number	Diff line change
`@@ -331,8 +331,9 @@ class Index extends React.Component {`
`331`	`331`	`}`
`332`	`332`
`333`	`333`	`handleCheckEnd(err, msg) {`
`334`		`- if (getDefaultValidationOption(this.props.validationOption).msgOnError) {`
`335`		`- msg = getDefaultValidationOption(this.props.validationOption).msgOnError;`
	`334`	`+ const { msgOnError } = getDefaultValidationOption(this.props.validationOption);`
	`335`	`+ if (err && msgOnError) {`
	`336`	`+ msg = msgOnError;`
`336`	`337`	`}`
`337`	`338`	`this.setState({ err, msg });`
`338`	`339`	`const { validationCallback } = this.props;`
`@@ -396,10 +397,11 @@ class Index extends React.Component {`
`396`	`397`	`const successMsgClass = cx(STYLES['msg'], !err && STYLES['success']);`
`397`	`398`
`398`	`399`	`let msgHtml;`
`399`		`- if (getDefaultValidationOption(validationOption).showMsg && err && msg) {`
	`400`	`+ const { showMsg } = getDefaultValidationOption(validationOption);`
	`401`	`+ if (showMsg && err && msg) {`
`400`	`402`	`msgHtml = <div className={errMsgClass}>{msg}</div>;`
`401`	`403`	`}`
`402`		`- if (getDefaultValidationOption(validationOption).showMsg && !err && successMsg) {`
	`404`	`+ if (showMsg && !err && successMsg) {`
`403`	`405`	`msgHtml = <div className={successMsgClass}>{successMsg}</div>;`
`404`	`406`	`}`
`405`	`407`	`let optionListHtml;`
Original file line number	Diff line number	Diff line change
`@@ -185,8 +185,9 @@ class Index extends React.Component {`
`185`	`185`	`}`
`186`	`186`
`187`	`187`	`handleCheckEnd(err, msg) {`
`188`		`- if (err && getDefaultValidationOption(this.props.validationOption).msgOnError) {`
`189`		`- msg = getDefaultValidationOption(this.props.validationOption).msgOnError;`
	`188`	`+ const { msgOnError } = getDefaultValidationOption(this.props.validationOption);`
	`189`	`+ if (err && msgOnError) {`
	`190`	`+ msg = msgOnError;`
`190`	`191`	`}`
`191`	`192`	`this.setState({ err, msg });`
`192`	`193`	`const { validationCallback } = this.props;`
`@@ -223,10 +224,11 @@ class Index extends React.Component {`
`223`	`224`	`const successMsgClass = cx(STYLES['msg'], !err && STYLES['success']);`
`224`	`225`
`225`	`226`	`let msgHtml;`
`226`		`- if (getDefaultValidationOption(validationOption).showMsg && err && msg) {`
	`227`	`+ const { showMsg } = getDefaultValidationOption(validationOption);`
	`228`	`+ if (showMsg && err && msg) {`
`227`	`229`	`msgHtml = <div className={errMsgClass}>{msg}</div>;`
`228`	`230`	`}`
`229`		`- if (getDefaultValidationOption(validationOption).showMsg && !err && successMsg) {`
	`231`	`+ if (showMsg && !err && successMsg) {`
`230`	`232`	`msgHtml = <div className={successMsgClass}>{successMsg}</div>;`
`231`	`233`	`}`
`232`	`234`	`return (`
Original file line number	Diff line number	Diff line change
`@@ -255,8 +255,9 @@ class Index extends React.Component {`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`handleCheckEnd(err, msg) {`
`258`		`- if (err && getDefaultValidationOption(this.props.validationOption).msgOnError) {`
`259`		`- msg = getDefaultValidationOption(this.props.validationOption).msgOnError;`
	`258`	`+ const { msgOnError } = getDefaultValidationOption(this.props.validationOption);`
	`259`	`+ if (err && msgOnError) {`
	`260`	`+ msg = msgOnError;`
`260`	`261`	`}`
`261`	`262`	`this.setState({ err, msg });`
`262`	`263`	`const { validationCallback } = this.props;`
`@@ -294,10 +295,11 @@ class Index extends React.Component {`
`294`	`295`	`const successMsgClass = cx(STYLES['msg'], !err && STYLES['success']);`
`295`	`296`
`296`	`297`	`let msgHtml;`
`297`		`- if (getDefaultValidationOption(validationOption).showMsg && err && msg) {`
	`298`	`+ const { showMsg } = getDefaultValidationOption(validationOption);`
	`299`	`+ if (showMsg && err && msg) {`
`298`	`300`	`msgHtml = <div className={errMsgClass}>{msg}</div>;`
`299`	`301`	`}`
`300`		`- if (getDefaultValidationOption(validationOption).showMsg && !err && successMsg) {`
	`302`	`+ if (showMsg && !err && successMsg) {`
`301`	`303`	`msgHtml = <div className={successMsgClass}>{successMsg}</div>;`
`302`	`304`	`}`
`303`	`305`	`return (`