Fix react component register event issue

nosir · Jun 29, 2019 · 98106d5 · 98106d5
1 parent 9cbe403
commit 98106d5
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 30 deletions.
diff --git a/bower.json b/bower.json
@@ -3,7 +3,7 @@
   "description":
     "JavaScript library for formatting input text content when you are typing",
   "keywords": ["cleave", "javascript", "html", "form", "input"],
-  "version": "1.5.1",
+  "version": "1.5.2",
   "author": {
     "name": "Max Huang",
     "email": "[email protected]",

diff --git a/dist/cleave-angular.min.js b/dist/cleave-angular.min.js
diff --git a/dist/cleave-react-node.js b/dist/cleave-react-node.js
@@ -88,6 +88,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	            phoneRegionCode = (nextProps.options || {}).phoneRegionCode,
 	            newValue = nextProps.value;
 
+	        // update registed events
 	        owner.updateRegisteredEvents(nextProps);
 
 	        if (newValue !== undefined) {
@@ -117,13 +118,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	            onInit = _owner$registeredEven.onInit;
 
 
-	        owner.registeredEvents = {
-	            onInit: props.onInit === onInit ? onInit : props.onInit,
-	            onChange: props.onChange === onChange ? onChange : props.onChange,
-	            onFocus: props.onFocus === onFocus ? onFocus : props.onFocus,
-	            onBlur: props.onBlur === onBlur ? onBlur : props.onBlur,
-	            onKeyDown: props.onKeyDown === onKeyDown ? onKeyDown : props.onKeyDown
-	        };
+	        if (props.onInit && props.onInit !== onInit) owner.registeredEvents.onInit = props.onInit;
+	        if (props.onChange && props.onChange !== onChange) owner.registeredEvents.onChange = props.onChange;
+	        if (props.onFocus && props.onFocus !== onFocus) owner.registeredEvents.onFocus = props.onFocus;
+	        if (props.onBlur && props.onBlur !== onBlur) owner.registeredEvents.onBlur = props.onBlur;
+	        if (props.onKeyDown && props.onKeyDown !== onKeyDown) owner.registeredEvents.onKeyDown = props.onKeyDown;
 	    },
 
 	    getInitialState: function getInitialState() {

diff --git a/dist/cleave-react-node.min.js b/dist/cleave-react-node.min.js
diff --git a/dist/cleave-react.js b/dist/cleave-react.js
@@ -88,6 +88,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	            phoneRegionCode = (nextProps.options || {}).phoneRegionCode,
 	            newValue = nextProps.value;
 
+	        // update registed events
 	        owner.updateRegisteredEvents(nextProps);
 
 	        if (newValue !== undefined) {
@@ -117,13 +118,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	            onInit = _owner$registeredEven.onInit;
 
 
-	        owner.registeredEvents = {
-	            onInit: props.onInit === onInit ? onInit : props.onInit,
-	            onChange: props.onChange === onChange ? onChange : props.onChange,
-	            onFocus: props.onFocus === onFocus ? onFocus : props.onFocus,
-	            onBlur: props.onBlur === onBlur ? onBlur : props.onBlur,
-	            onKeyDown: props.onKeyDown === onKeyDown ? onKeyDown : props.onKeyDown
-	        };
+	        if (props.onInit && props.onInit !== onInit) owner.registeredEvents.onInit = props.onInit;
+	        if (props.onChange && props.onChange !== onChange) owner.registeredEvents.onChange = props.onChange;
+	        if (props.onFocus && props.onFocus !== onFocus) owner.registeredEvents.onFocus = props.onFocus;
+	        if (props.onBlur && props.onBlur !== onBlur) owner.registeredEvents.onBlur = props.onBlur;
+	        if (props.onKeyDown && props.onKeyDown !== onKeyDown) owner.registeredEvents.onKeyDown = props.onKeyDown;
 	    },
 
 	    getInitialState: function getInitialState() {

diff --git a/dist/cleave-react.min.js b/dist/cleave-react.min.js
diff --git a/dist/cleave.min.js b/dist/cleave.min.js
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "form",
     "input"
   ],
-  "version": "1.5.1",
+  "version": "1.5.2",
   "files": [
     "src",
     "dist",

diff --git a/src/Cleave.react.js b/src/Cleave.react.js
@@ -28,6 +28,7 @@ var cleaveReactClass = CreateReactClass({
             phoneRegionCode = (nextProps.options || {}).phoneRegionCode,
             newValue = nextProps.value;
 
+        // update registed events
         owner.updateRegisteredEvents(nextProps);
 
         if (newValue !== undefined) {
@@ -51,13 +52,11 @@ var cleaveReactClass = CreateReactClass({
         var owner = this,
             { onKeyDown, onChange, onFocus, onBlur, onInit } = owner.registeredEvents;
 
-        owner.registeredEvents = {
-            onInit:    props.onInit === onInit ? onInit : props.onInit,
-            onChange:  props.onChange === onChange ? onChange : props.onChange,
-            onFocus:   props.onFocus === onFocus ? onFocus : props.onFocus,
-            onBlur:    props.onBlur === onBlur ? onBlur : props.onBlur,
-            onKeyDown: props.onKeyDown === onKeyDown ? onKeyDown : props.onKeyDown
-        };
+        if (props.onInit && props.onInit !== onInit) owner.registeredEvents.onInit = props.onInit;
+        if (props.onChange && props.onChange !== onChange) owner.registeredEvents.onChange = props.onChange;
+        if (props.onFocus && props.onFocus !== onFocus) owner.registeredEvents.onFocus = props.onFocus;
+        if (props.onBlur && props.onBlur !== onBlur) owner.registeredEvents.onBlur = props.onBlur;
+        if (props.onKeyDown && props.onKeyDown !== onKeyDown) owner.registeredEvents.onKeyDown = props.onKeyDown;
     },
 
     getInitialState: function () {