Merge pull request #120 from wwayne/custom

Fix custom event with specific id
ReactTooltip · Jun 21, 2016 · 8bd9aa1 · 8bd9aa1
2 parents f5ed788 + 3732095
commit 8bd9aa1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/decorators/customEvent.js b/src/decorators/customEvent.js
@@ -8,6 +8,7 @@
 
 const checkStatus = function (dataEventOff, e) {
   const {show} = this.state
+  const {id} = this.props
   const dataIsCapture = e.currentTarget.getAttribute('data-iscapture')
   const isCapture = dataIsCapture && dataIsCapture === 'true' || this.props.isCapture
   const currentItem = e.currentTarget.getAttribute('currentItem')
@@ -17,7 +18,7 @@ const checkStatus = function (dataEventOff, e) {
     if (!dataEventOff) this.hideTooltip(e)
   } else {
     e.currentTarget.setAttribute('currentItem', 'true')
-    setUntargetItems(e.currentTarget, this.getTargetArray())
+    setUntargetItems(e.currentTarget, this.getTargetArray(id))
     this.showTooltip(e)
   }
 }

diff --git a/standalone/react-tooltip.js b/standalone/react-tooltip.js
@@ -124,6 +124,7 @@ exports.default = function (target) {
 
 var checkStatus = function checkStatus(dataEventOff, e) {
   var show = this.state.show;
+  var id = this.props.id;
 
   var dataIsCapture = e.currentTarget.getAttribute('data-iscapture');
   var isCapture = dataIsCapture && dataIsCapture === 'true' || this.props.isCapture;
@@ -134,7 +135,7 @@ var checkStatus = function checkStatus(dataEventOff, e) {
     if (!dataEventOff) this.hideTooltip(e);
   } else {
     e.currentTarget.setAttribute('currentItem', 'true');
-    setUntargetItems(e.currentTarget, this.getTargetArray());
+    setUntargetItems(e.currentTarget, this.getTargetArray(id));
     this.showTooltip(e);
   }
 };