Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Add custom event to hide tooltip #112

Merged
merged 1 commit into from
Jun 1, 2016
Merged

Add custom event to hide tooltip #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ Check example: [React-tooltip Test](http://wwayne.com/react-tooltip)
type | data-type | String | success, warning, error, info, light | tooltip's color theme
effect | data-effect | String | float, solid | either float or pinned
event | data-event | String | e.g. click | custom event to trigger tooltip
eventOff | data-event-off | String | e.g. click | custom event to hide tooltip
isCapture | data-iscapture | Bool | true, false | when set to ture, custom event's propagation mode will be capture, default is false, `<p data-tip="tooltip" data-event='click' data-iscapture='true'></p>` or `<ReactTooltip isCapture={true} />` |
offset | data-offset | Object | top, right, bottom, left | `data-offset="{'top': 10, 'left': 10}"` for specific and `offset={{top: 10, left: 10}}` for global
multiline | data-multiline | Bool | true, false | support `<br>`, `<br />` to make multiline
Expand Down
31 changes: 14 additions & 17 deletions dist/react-tooltip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,25 +171,22 @@ var ReactTooltip = function (_Component) {
value: function bindListener() {
var targetArray = this.getTargetArray();

var dataEvent = void 0;
var dataEventOff = void 0;
var dataEvent = undefined;
var dataEventOff = undefined;
for (var i = 0; i < targetArray.length; i++) {
if (targetArray[i].getAttribute('currentItem') === null) {
targetArray[i].setAttribute('currentItem', 'false');
}
dataEvent = this.state.event || targetArray[i].getAttribute('data-event');
if (dataEvent) {
dataEventOff = this.state.eventOff || targetArray[i].getAttribute('data-event-off');
// if off event is specified, we will show tip on data-event and hide it on data-event-off
if (dataEventOff) {
targetArray[i].removeEventListener(dataEvent, this.showTooltip);
targetArray[i].addEventListener(dataEvent, this.showTooltip, false);
dataEventOff = this.state.eventOff || targetArray[i].getAttribute('data-event-off');

targetArray[i].removeEventListener(dataEvent, this.checkStatus);
targetArray[i].addEventListener(dataEvent, this.checkStatus, false);
if (dataEventOff) {
targetArray[i].removeEventListener(dataEventOff, this.hideTooltip);
targetArray[i].addEventListener(dataEventOff, this.hideTooltip, false);
} else {
targetArray[i].removeEventListener(dataEvent, this.checkStatus);
targetArray[i].addEventListener(dataEvent, this.checkStatus, false);
}
} else {
targetArray[i].removeEventListener('mouseenter', this.showTooltip);
Expand All @@ -209,7 +206,7 @@ var ReactTooltip = function (_Component) {
key: 'unbindListener',
value: function unbindListener() {
var targetArray = document.querySelectorAll('[data-tip]');
var dataEvent = void 0;
var dataEvent = undefined;

for (var i = 0; i < targetArray.length; i++) {
dataEvent = this.state.event || targetArray[i].getAttribute('data-event');
Expand All @@ -232,7 +229,7 @@ var ReactTooltip = function (_Component) {
value: function getTargetArray() {
var id = this.props.id;

var targetArray = void 0;
var targetArray = undefined;

if (id === undefined) {
targetArray = document.querySelectorAll('[data-tip]:not([data-for])');
Expand Down Expand Up @@ -281,7 +278,7 @@ var ReactTooltip = function (_Component) {
value: function checkStatus(e) {
var show = this.state.show;

var isCapture = void 0;
var isCapture = undefined;

if (e.currentTarget.getAttribute('data-iscapture')) {
isCapture = e.currentTarget.getAttribute('data-iscapture') === 'true';
Expand Down Expand Up @@ -332,7 +329,7 @@ var ReactTooltip = function (_Component) {
/* Detect multiline */
var regexp = /<br\s*\/?>/;
var multiline = e.currentTarget.getAttribute('data-multiline') ? e.currentTarget.getAttribute('data-multiline') : this.props.multiline ? this.props.multiline : false;
var tooltipText = void 0;
var tooltipText = undefined;
var multilineCount = 0;
if (!multiline || multiline === 'false' || !regexp.test(originTooltip)) {
tooltipText = originTooltip;
Expand Down Expand Up @@ -467,8 +464,8 @@ var ReactTooltip = function (_Component) {
var targetHeight = currentTarget.clientHeight;
var windoWidth = window.innerWidth;
var windowHeight = window.innerHeight;
var x = void 0;
var y = void 0;
var x = undefined;
var y = undefined;
var defaultTopY = targetTop - tipHeight - 8;
var defaultBottomY = targetTop + targetHeight + 8;
var defaultLeftX = targetLeft - tipWidth - 6;
Expand Down Expand Up @@ -740,8 +737,8 @@ var ReactTooltip = function (_Component) {
}
firstCount++;
}
for (var _i = string.length - 1; _i >= 0; _i--) {
if (string[_i] !== ' ') {
for (var i = string.length - 1; i >= 0; i--) {
if (string[i] !== ' ') {
break;
}
lastCount++;
Expand Down
2 changes: 1 addition & 1 deletion dist/react-tooltip.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-tooltip",
"version": "2.0.2",
"version": "2.0.3",
"description": "react tooltip component",
"main": "index.js",
"scripts": {
Expand Down
11 changes: 4 additions & 7 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,17 +126,14 @@ class ReactTooltip extends Component {
}
dataEvent = this.state.event || targetArray[i].getAttribute('data-event')
if (dataEvent) {
dataEventOff = this.state.eventOff || targetArray[i].getAttribute('data-event-off')
// if off event is specified, we will show tip on data-event and hide it on data-event-off
if (dataEventOff) {
targetArray[i].removeEventListener(dataEvent, this.showTooltip)
targetArray[i].addEventListener(dataEvent, this.showTooltip, false)
dataEventOff = this.state.eventOff || targetArray[i].getAttribute('data-event-off')

targetArray[i].removeEventListener(dataEvent, this.checkStatus)
targetArray[i].addEventListener(dataEvent, this.checkStatus, false)
if (dataEventOff) {
targetArray[i].removeEventListener(dataEventOff, this.hideTooltip)
targetArray[i].addEventListener(dataEventOff, this.hideTooltip, false)
} else {
targetArray[i].removeEventListener(dataEvent, this.checkStatus)
targetArray[i].addEventListener(dataEvent, this.checkStatus, false)
}
} else {
targetArray[i].removeEventListener('mouseenter', this.showTooltip)
Expand Down
98 changes: 45 additions & 53 deletions standalone/react-tooltip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,52 +1,47 @@
(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.ReactTooltip = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
/*!
Copyright (c) 2016 Jed Watson.
Copyright (c) 2015 Jed Watson.
Licensed under the MIT License (MIT), see
http://jedwatson.github.io/classnames
*/
/* global define */

(function () {
'use strict';
function classNames() {
var classes = '';
var arg;

var hasOwn = {}.hasOwnProperty;

function classNames () {
var classes = [];

for (var i = 0; i < arguments.length; i++) {
var arg = arguments[i];
if (!arg) continue;

var argType = typeof arg;
for (var i = 0; i < arguments.length; i++) {
arg = arguments[i];
if (!arg) {
continue;
}

if (argType === 'string' || argType === 'number') {
classes.push(arg);
} else if (Array.isArray(arg)) {
classes.push(classNames.apply(null, arg));
} else if (argType === 'object') {
for (var key in arg) {
if (hasOwn.call(arg, key) && arg[key]) {
classes.push(key);
}
if ('string' === typeof arg || 'number' === typeof arg) {
classes += ' ' + arg;
} else if (Object.prototype.toString.call(arg) === '[object Array]') {
classes += ' ' + classNames.apply(null, arg);
} else if ('object' === typeof arg) {
for (var key in arg) {
if (!arg.hasOwnProperty(key) || !arg[key]) {
continue;
}
classes += ' ' + key;
}
}

return classes.join(' ');
}
return classes.substr(1);
}

if (typeof module !== 'undefined' && module.exports) {
module.exports = classNames;
} else if (typeof define === 'function' && typeof define.amd === 'object' && define.amd) {
// register as 'classnames', consistent with npm package name
define('classnames', [], function () {
return classNames;
});
} else {
window.classNames = classNames;
}
}());
// safely export classNames for node / browserify
if (typeof module !== 'undefined' && module.exports) {
module.exports = classNames;
}

// safely export classNames for RequireJS
if (typeof define !== 'undefined' && define.amd) {
define('classnames', [], function() {
return classNames;
});
}

},{}],2:[function(require,module,exports){
(function (global){
Expand Down Expand Up @@ -223,25 +218,22 @@ var ReactTooltip = function (_Component) {
value: function bindListener() {
var targetArray = this.getTargetArray();

var dataEvent = void 0;
var dataEventOff = void 0;
var dataEvent = undefined;
var dataEventOff = undefined;
for (var i = 0; i < targetArray.length; i++) {
if (targetArray[i].getAttribute('currentItem') === null) {
targetArray[i].setAttribute('currentItem', 'false');
}
dataEvent = this.state.event || targetArray[i].getAttribute('data-event');
if (dataEvent) {
dataEventOff = this.state.eventOff || targetArray[i].getAttribute('data-event-off');
// if off event is specified, we will show tip on data-event and hide it on data-event-off
if (dataEventOff) {
targetArray[i].removeEventListener(dataEvent, this.showTooltip);
targetArray[i].addEventListener(dataEvent, this.showTooltip, false);
dataEventOff = this.state.eventOff || targetArray[i].getAttribute('data-event-off');

targetArray[i].removeEventListener(dataEvent, this.checkStatus);
targetArray[i].addEventListener(dataEvent, this.checkStatus, false);
if (dataEventOff) {
targetArray[i].removeEventListener(dataEventOff, this.hideTooltip);
targetArray[i].addEventListener(dataEventOff, this.hideTooltip, false);
} else {
targetArray[i].removeEventListener(dataEvent, this.checkStatus);
targetArray[i].addEventListener(dataEvent, this.checkStatus, false);
}
} else {
targetArray[i].removeEventListener('mouseenter', this.showTooltip);
Expand All @@ -261,7 +253,7 @@ var ReactTooltip = function (_Component) {
key: 'unbindListener',
value: function unbindListener() {
var targetArray = document.querySelectorAll('[data-tip]');
var dataEvent = void 0;
var dataEvent = undefined;

for (var i = 0; i < targetArray.length; i++) {
dataEvent = this.state.event || targetArray[i].getAttribute('data-event');
Expand All @@ -284,7 +276,7 @@ var ReactTooltip = function (_Component) {
value: function getTargetArray() {
var id = this.props.id;

var targetArray = void 0;
var targetArray = undefined;

if (id === undefined) {
targetArray = document.querySelectorAll('[data-tip]:not([data-for])');
Expand Down Expand Up @@ -333,7 +325,7 @@ var ReactTooltip = function (_Component) {
value: function checkStatus(e) {
var show = this.state.show;

var isCapture = void 0;
var isCapture = undefined;

if (e.currentTarget.getAttribute('data-iscapture')) {
isCapture = e.currentTarget.getAttribute('data-iscapture') === 'true';
Expand Down Expand Up @@ -384,7 +376,7 @@ var ReactTooltip = function (_Component) {
/* Detect multiline */
var regexp = /<br\s*\/?>/;
var multiline = e.currentTarget.getAttribute('data-multiline') ? e.currentTarget.getAttribute('data-multiline') : this.props.multiline ? this.props.multiline : false;
var tooltipText = void 0;
var tooltipText = undefined;
var multilineCount = 0;
if (!multiline || multiline === 'false' || !regexp.test(originTooltip)) {
tooltipText = originTooltip;
Expand Down Expand Up @@ -519,8 +511,8 @@ var ReactTooltip = function (_Component) {
var targetHeight = currentTarget.clientHeight;
var windoWidth = window.innerWidth;
var windowHeight = window.innerHeight;
var x = void 0;
var y = void 0;
var x = undefined;
var y = undefined;
var defaultTopY = targetTop - tipHeight - 8;
var defaultBottomY = targetTop + targetHeight + 8;
var defaultLeftX = targetLeft - tipWidth - 6;
Expand Down Expand Up @@ -792,8 +784,8 @@ var ReactTooltip = function (_Component) {
}
firstCount++;
}
for (var _i = string.length - 1; _i >= 0; _i--) {
if (string[_i] !== ' ') {
for (var i = string.length - 1; i >= 0; i--) {
if (string[i] !== ' ') {
break;
}
lastCount++;
Expand Down
2 changes: 1 addition & 1 deletion standalone/react-tooltip.min.js
View file
Open in desktop

Large diffs are not rendered by default.