Merge pull request #2 from bruz/nodelist-fix

Merge upstream fix for NodeList handling

Author: gilesbowkett

CHANGELOG.md

@@ -1,6 +1,10 @@
 ## Change Log
 
-### 3.2.6 (2017/02/08 12:33 +00:00)
+### 3.2.7 (2017/02/17 07:24 +00:00)
+- [#262](https://github.com/wwayne/react-tooltip/pull/262) Fix nodelist converte in safari (@wwayne)
+- [#260](https://github.com/wwayne/react-tooltip/pull/260) Fix NodeList to Array convertion (@huumanoid)
+
+### 3.2.6 (2017/02/08 12:34 +00:00)
 - [#255](https://github.com/wwayne/react-tooltip/pull/255) (fix) Remove console logs (@flexpert)
 - [#254](https://github.com/wwayne/react-tooltip/pull/254) Add support for className prop (@jonbeller)
 

dist/index.js

@@ -57,6 +57,10 @@ var _getTipContent2 = _interopRequireDefault(_getTipContent);
 
 var _aria = require('./utils/aria');
 
+var _nodeListToArray = require('./utils/nodeListToArray');
+
+var _nodeListToArray2 = _interopRequireDefault(_nodeListToArray);
+
 var _style = require('./style');
 
 var _style2 = _interopRequireDefault(_style);
@@ -168,18 +172,13 @@ var ReactTooltip = (0, _staticMethods2.default)(_class = (0, _windowListener2.de
     key: 'getTargetArray',
     value: function getTargetArray(id) {
       var targetArray = void 0;
-
       if (!id) {
         targetArray = document.querySelectorAll('[data-tip]:not([data-for])');
       } else {
         targetArray = document.querySelectorAll('[data-tip][data-for="' + id + '"]');
       }
-
       // targetArray is a NodeList, convert it to a real array
-      // I hope I can use Object.values...
-      return Object.getOwnPropertyNames(targetArray).map(function (key) {
-        return targetArray[key];
-      });
+      return (0, _nodeListToArray2.default)(targetArray);
     }
 
     /**

dist/utils/nodeListToArray.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+exports.default = function (nodeList) {
+  var length = nodeList.length;
+  if (nodeList.hasOwnProperty) {
+    return Array.prototype.slice.call(nodeList);
+  }
+  return new Array(length).fill().map(function (index) {
+    return nodeList[index];
+  });
+};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-tooltip",
-  "version": "3.2.6",
+  "version": "3.2.7",
   "description": "react tooltip component",
   "main": "dist/index.js",
   "scripts": {

src/index.js

@@ -15,6 +15,7 @@ import getEffect from './decorators/getEffect'
 import getPosition from './utils/getPosition'
 import getTipContent from './utils/getTipContent'
 import { parseAria } from './utils/aria'
+import nodeListToArray from './utils/nodeListToArray'
 
 /* CSS */
 import cssStyle from './style'
@@ -146,18 +147,13 @@ class ReactTooltip extends Component {
    */
   getTargetArray (id) {
     let targetArray
-
     if (!id) {
       targetArray = document.querySelectorAll('[data-tip]:not([data-for])')
     } else {
       targetArray = document.querySelectorAll(`[data-tip][data-for="${id}"]`)
     }
-
     // targetArray is a NodeList, convert it to a real array
-    // I hope I can use Object.values...
-    return Object.getOwnPropertyNames(targetArray).map(key => {
-      return targetArray[key]
-    })
+    return nodeListToArray(targetArray)
   }
 
   /**

src/utils/nodeListToArray.js

@@ -0,0 +1,13 @@
+/**
+ * Convert nodelist to array
+ * @see https://github.com/facebook/fbjs/blob/e66ba20ad5be433eb54423f2b097d829324d9de6/packages/fbjs/src/core/createArrayFromMixed.js#L24
+ * NodeLists are functions in Safari
+ */
+
+export default function (nodeList) {
+  const length = nodeList.length
+  if (nodeList.hasOwnProperty) {
+    return Array.prototype.slice.call(nodeList)
+  }
+  return new Array(length).fill().map(index => nodeList[index])
+}

standalone/react-tooltip.js

@@ -372,6 +372,10 @@ var _getTipContent2 = _interopRequireDefault(_getTipContent);
 
 var _aria = require('./utils/aria');
 
+var _nodeListToArray = require('./utils/nodeListToArray');
+
+var _nodeListToArray2 = _interopRequireDefault(_nodeListToArray);
+
 var _style = require('./style');
 
 var _style2 = _interopRequireDefault(_style);
@@ -483,18 +487,13 @@ var ReactTooltip = (0, _staticMethods2.default)(_class = (0, _windowListener2.de
     key: 'getTargetArray',
     value: function getTargetArray(id) {
       var targetArray = void 0;
-
       if (!id) {
         targetArray = document.querySelectorAll('[data-tip]:not([data-for])');
       } else {
         targetArray = document.querySelectorAll('[data-tip][data-for="' + id + '"]');
       }
-
       // targetArray is a NodeList, convert it to a real array
-      // I hope I can use Object.values...
-      return Object.getOwnPropertyNames(targetArray).map(function (key) {
-        return targetArray[key];
-      });
+      return (0, _nodeListToArray2.default)(targetArray);
     }
 
     /**
@@ -898,7 +897,7 @@ var ReactTooltip = (0, _staticMethods2.default)(_class = (0, _windowListener2.de
 module.exports = ReactTooltip;
 
 }).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-},{"./decorators/customEvent":3,"./decorators/getEffect":4,"./decorators/isCapture":5,"./decorators/staticMethods":6,"./decorators/windowListener":7,"./style":9,"./utils/aria":10,"./utils/getPosition":11,"./utils/getTipContent":12,"classnames":1}],9:[function(require,module,exports){
+},{"./decorators/customEvent":3,"./decorators/getEffect":4,"./decorators/isCapture":5,"./decorators/staticMethods":6,"./decorators/windowListener":7,"./style":9,"./utils/aria":10,"./utils/getPosition":11,"./utils/getTipContent":12,"./utils/nodeListToArray":13,"classnames":1}],9:[function(require,module,exports){
 'use strict';
 
 Object.defineProperty(exports, "__esModule", {
@@ -1277,5 +1276,22 @@ var _react2 = _interopRequireDefault(_react);
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 }).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+},{}],13:[function(require,module,exports){
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+exports.default = function (nodeList) {
+  var length = nodeList.length;
+  if (nodeList.hasOwnProperty) {
+    return Array.prototype.slice.call(nodeList);
+  }
+  return new Array(length).fill().map(function (index) {
+    return nodeList[index];
+  });
+};
+
 },{}]},{},[8])(8)
 });