From 5e4f13f04d8457e5e6508517dab91ca6cd3bd7f9 Mon Sep 17 00:00:00 2001 From: Helior Colorado Date: Sun, 28 Feb 2016 23:35:50 -0800 Subject: [PATCH 01/17] 0.3.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 67ada3f..f658206 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-highlighter", - "version": "0.3.0", + "version": "0.3.1", "description": "Highlight select fragments of texts", "main": "lib/highlighter.js", "peerDependencies": { From 1e28f3a97b15a121d0da36d1cbb960f8bdab8ef6 Mon Sep 17 00:00:00 2001 From: Cesar Andreu Date: Thu, 7 Apr 2016 21:19:13 -0700 Subject: [PATCH 02/17] Bump react peer dependency to allow v14 and v15 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f658206..297851e 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "Highlight select fragments of texts", "main": "lib/highlighter.js", "peerDependencies": { - "react": "^0.14.0" + "react": "^0.14.0 || ^15.0.0" }, "scripts": { "test": "_mocha", From e0a9ef109b7e275f747ac9f0e9a619845a4b6071 Mon Sep 17 00:00:00 2001 From: admmasters Date: Fri, 8 Apr 2016 11:33:14 +0100 Subject: [PATCH 03/17] Use React.createElement to allow usage with React 15.0. No longer rely upon React.__spread which is breaking on 15.0. Also use React.createElement directly rather than React.DOM.span. --- lib/highlighter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/highlighter.js b/lib/highlighter.js index 5b8f6c4..feb0035 100644 --- a/lib/highlighter.js +++ b/lib/highlighter.js @@ -29,7 +29,7 @@ var Highlighter = React.createClass({displayName: "Highlighter", }, render: function() { - return React.DOM.span(React.__spread({}, this.props), this.renderElement(this.props.children)); + return React.createElement('span', this.props, this.renderElement(this.props.children)); }, /** From 3ce6a0d4d5a5a823c1261abba146993c0d5a9e23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hosmel=20Quintana=20=F0=9F=98=B4?= Date: Fri, 8 Apr 2016 11:38:03 -0600 Subject: [PATCH 04/17] update for React v15 --- lib/highlighter.js | 3 ++- package.json | 10 ++++++---- test/testHighlighter.js | 6 +++--- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/lib/highlighter.js b/lib/highlighter.js index 5b8f6c4..1c5e09f 100644 --- a/lib/highlighter.js +++ b/lib/highlighter.js @@ -1,6 +1,7 @@ var React = require('react'); var RegExpPropType = require('./regExpPropType'); var escapeStringRegexp = require('escape-string-regexp'); +var objectAssign = require('object-assign'); var Highlighter = React.createClass({displayName: "Highlighter", @@ -29,7 +30,7 @@ var Highlighter = React.createClass({displayName: "Highlighter", }, render: function() { - return React.DOM.span(React.__spread({}, this.props), this.renderElement(this.props.children)); + return React.DOM.span(objectAssign({}, this.props), this.renderElement(this.props.children)); }, /** diff --git a/package.json b/package.json index f658206..972d9c9 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "Highlight select fragments of texts", "main": "lib/highlighter.js", "peerDependencies": { - "react": "^0.14.0" + "react": "^0.14.0||^15.0.0" }, "scripts": { "test": "_mocha", @@ -34,11 +34,13 @@ "istanbul": "^0.4.1", "jsdom": "^3.1.2", "mocha": "^2.3.4", - "react": "^0.14.0", - "react-dom": "^0.14.0", + "react": "^15.0.0", + "react-addons-test-utils": "^15.0.0", + "react-dom": "^15.0.0", "webpack": "^1.7.3" }, "dependencies": { - "escape-string-regexp": "^1.0.4" + "escape-string-regexp": "^1.0.4", + "object-assign": "^4.0.1" } } diff --git a/test/testHighlighter.js b/test/testHighlighter.js index 3fcf75d..7606b09 100644 --- a/test/testHighlighter.js +++ b/test/testHighlighter.js @@ -1,5 +1,5 @@ -var React = require('react/addons'); -var TestUtils = React.addons.TestUtils; +var React = require('react'); +var TestUtils = require('react-addons-test-utils'); var ReactDOM = require('react-dom'); var expect = require('chai').expect; var Highlight = require('..'); @@ -57,7 +57,7 @@ describe('Highlight element', function() { var element = React.createElement(Highlight, {search: 'Seek', matchStyle: { color: 'red' }}, 'Hide and Seek'); var node = TestUtils.renderIntoDocument(element); var matches = TestUtils.scryRenderedDOMComponentsWithTag(node, 'strong'); - expect(matches[0].getAttribute('style')).to.eql('color:red;'); + expect(matches[0].getAttribute('style')).to.eql('color: red;'); }); it('should support passing props to parent element', function() { From dbb58fdf1498b3edaa46875f29b10f31a7797901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hosmel=20Quintana=20=F0=9F=98=B4?= Date: Fri, 8 Apr 2016 11:42:08 -0600 Subject: [PATCH 05/17] Implement solution from #25 --- lib/highlighter.js | 4 +--- package.json | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/highlighter.js b/lib/highlighter.js index 1c5e09f..16d3016 100644 --- a/lib/highlighter.js +++ b/lib/highlighter.js @@ -1,8 +1,6 @@ var React = require('react'); var RegExpPropType = require('./regExpPropType'); var escapeStringRegexp = require('escape-string-regexp'); -var objectAssign = require('object-assign'); - var Highlighter = React.createClass({displayName: "Highlighter", count: 0, @@ -30,7 +28,7 @@ var Highlighter = React.createClass({displayName: "Highlighter", }, render: function() { - return React.DOM.span(objectAssign({}, this.props), this.renderElement(this.props.children)); + return React.createElement('span', this.props, this.renderElement(this.props.children)); }, /** diff --git a/package.json b/package.json index 972d9c9..dea36e0 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,6 @@ "webpack": "^1.7.3" }, "dependencies": { - "escape-string-regexp": "^1.0.4", - "object-assign": "^4.0.1" + "escape-string-regexp": "^1.0.4" } } From c4d6ca6cd34b9f30ce734483f75e505aaf6d026e Mon Sep 17 00:00:00 2001 From: Kenny Tran Date: Fri, 22 Apr 2016 11:57:35 -0700 Subject: [PATCH 06/17] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b3120ea..39f5d08 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ npm install react-highlighter --save ``` ## Usage -``` +```js var Highlight = require('react-highlighter'); The quick brown fox jumps over the lazy dog From 7ca481d4973e2c88e122e2fe2c1f0f4aff401eb9 Mon Sep 17 00:00:00 2001 From: Helior Colorado Date: Tue, 10 May 2016 23:38:39 -0500 Subject: [PATCH 07/17] 0.3.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1ef5a0c..cf09e66 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-highlighter", - "version": "0.3.1", + "version": "0.3.2", "description": "Highlight select fragments of texts", "main": "lib/highlighter.js", "peerDependencies": { From dcfa789bd3549b77e2d7828b0b252c9f63ebc809 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hosmel=20Quintana=20=F0=9F=98=B4?= Date: Tue, 5 Jul 2016 14:57:48 -0600 Subject: [PATCH 08/17] bump deps --- package.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index cf09e66..f9ad3af 100644 --- a/package.json +++ b/package.json @@ -29,17 +29,17 @@ }, "homepage": "https://github.com/helior/react-highlighter", "devDependencies": { - "chai": "^2.1.2", - "coveralls": "^2.11.2", - "istanbul": "^0.4.1", - "jsdom": "^3.1.2", - "mocha": "^2.3.4", - "react": "^15.0.0", - "react-addons-test-utils": "^15.0.0", - "react-dom": "^15.0.0", - "webpack": "^1.7.3" + "chai": "^3.5.0", + "coveralls": "^2.11.9", + "istanbul": "^0.4.4", + "jsdom": "^9.4.0", + "mocha": "^2.5.3", + "react": "^15.2.0", + "react-addons-test-utils": "^15.2.0", + "react-dom": "^15.2.0", + "webpack": "^1.13.1" }, "dependencies": { - "escape-string-regexp": "^1.0.4" + "escape-string-regexp": "^1.0.5" } } From 6e4d097e23216b7962089d8955d9f8d12ffc551c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hosmel=20Quintana=20=F0=9F=98=B4?= Date: Tue, 5 Jul 2016 15:04:03 -0600 Subject: [PATCH 09/17] blacklist custom props --- lib/highlighter.js | 5 ++++- package.json | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/highlighter.js b/lib/highlighter.js index 16d3016..3890b88 100644 --- a/lib/highlighter.js +++ b/lib/highlighter.js @@ -1,6 +1,7 @@ var React = require('react'); var RegExpPropType = require('./regExpPropType'); var escapeStringRegexp = require('escape-string-regexp'); +var blacklist = require('blacklist'); var Highlighter = React.createClass({displayName: "Highlighter", count: 0, @@ -28,7 +29,9 @@ var Highlighter = React.createClass({displayName: "Highlighter", }, render: function() { - return React.createElement('span', this.props, this.renderElement(this.props.children)); + var props = blacklist(this.props, 'search', 'caseSensitive', 'matchElement', 'matchClass', 'matchStyle'); + + return React.createElement('span', props, this.renderElement(this.props.children)); }, /** diff --git a/package.json b/package.json index f9ad3af..8ebc06e 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,7 @@ "webpack": "^1.13.1" }, "dependencies": { + "blacklist": "^1.1.2", "escape-string-regexp": "^1.0.5" } } From ff81d4c7d39f688a0aca8f214c5a6ef22b3e0ecc Mon Sep 17 00:00:00 2001 From: Helior Colorado Date: Fri, 15 Jul 2016 19:48:14 -0700 Subject: [PATCH 10/17] 0.3.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8ebc06e..c22bd0c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-highlighter", - "version": "0.3.2", + "version": "0.3.3", "description": "Highlight select fragments of texts", "main": "lib/highlighter.js", "peerDependencies": { From ec2ae091898ac666a184a9b102484cc1c6d71543 Mon Sep 17 00:00:00 2001 From: Charlie Cochran Date: Mon, 24 Apr 2017 18:02:25 -0500 Subject: [PATCH 11/17] Fix deprecation warnings --- lib/highlighter.js | 20 +++++++++++--------- package.json | 3 ++- test/testHighlighter.js | 2 +- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/lib/highlighter.js b/lib/highlighter.js index 3890b88..832317f 100644 --- a/lib/highlighter.js +++ b/lib/highlighter.js @@ -2,21 +2,23 @@ var React = require('react'); var RegExpPropType = require('./regExpPropType'); var escapeStringRegexp = require('escape-string-regexp'); var blacklist = require('blacklist'); +var createReactClass = require('create-react-class'); +var PropTypes = require('prop-types'); -var Highlighter = React.createClass({displayName: "Highlighter", +var Highlighter = createReactClass({displayName: "Highlighter", count: 0, propTypes: { - search: React.PropTypes.oneOfType([ - React.PropTypes.string, - React.PropTypes.number, - React.PropTypes.bool, + search: PropTypes.oneOfType([ + PropTypes.string, + PropTypes.number, + PropTypes.bool, RegExpPropType ]).isRequired, - caseSensitive: React.PropTypes.bool, - matchElement: React.PropTypes.string, - matchClass: React.PropTypes.string, - matchStyle: React.PropTypes.object + caseSensitive: PropTypes.bool, + matchElement: PropTypes.string, + matchClass: PropTypes.string, + matchStyle: PropTypes.object }, getDefaultProps: function() { diff --git a/package.json b/package.json index c22bd0c..dd3b512 100644 --- a/package.json +++ b/package.json @@ -31,11 +31,12 @@ "devDependencies": { "chai": "^3.5.0", "coveralls": "^2.11.9", + "create-react-class": "^15.5.2", "istanbul": "^0.4.4", "jsdom": "^9.4.0", "mocha": "^2.5.3", + "prop-types": "^15.5.8", "react": "^15.2.0", - "react-addons-test-utils": "^15.2.0", "react-dom": "^15.2.0", "webpack": "^1.13.1" }, diff --git a/test/testHighlighter.js b/test/testHighlighter.js index 7606b09..0da705b 100644 --- a/test/testHighlighter.js +++ b/test/testHighlighter.js @@ -1,5 +1,5 @@ var React = require('react'); -var TestUtils = require('react-addons-test-utils'); +var TestUtils = require('react-dom/test-utils'); var ReactDOM = require('react-dom'); var expect = require('chai').expect; var Highlight = require('..'); From 0c1338804f921e02e9873ded4b7c021cd7d2ec52 Mon Sep 17 00:00:00 2001 From: Helior Colorado Date: Sat, 27 May 2017 12:16:44 -0700 Subject: [PATCH 12/17] 0.3.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dd3b512..85aa64f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-highlighter", - "version": "0.3.3", + "version": "0.3.4", "description": "Highlight select fragments of texts", "main": "lib/highlighter.js", "peerDependencies": { From 3d8306e26176226d5440f228807bb586450802f9 Mon Sep 17 00:00:00 2001 From: Helior Colorado Date: Thu, 8 Jun 2017 19:40:51 -0700 Subject: [PATCH 13/17] Resolves #41; move devDependencies to run-time dependencies. Specifically create-react-class and prop-types" --- package.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 85aa64f..eb2a976 100644 --- a/package.json +++ b/package.json @@ -31,17 +31,18 @@ "devDependencies": { "chai": "^3.5.0", "coveralls": "^2.11.9", - "create-react-class": "^15.5.2", + "istanbul": "^0.4.4", "jsdom": "^9.4.0", "mocha": "^2.5.3", - "prop-types": "^15.5.8", "react": "^15.2.0", "react-dom": "^15.2.0", "webpack": "^1.13.1" }, "dependencies": { "blacklist": "^1.1.2", - "escape-string-regexp": "^1.0.5" + "create-react-class": "^15.5.2", + "escape-string-regexp": "^1.0.5", + "prop-types": "^15.5.8" } } From 3397da90b9596e682b598a9b6dfe47e0f4aade1c Mon Sep 17 00:00:00 2001 From: Helior Colorado Date: Thu, 8 Jun 2017 19:49:54 -0700 Subject: [PATCH 14/17] 0.3.5 --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index eb2a976..6a935f4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-highlighter", - "version": "0.3.4", + "version": "0.3.5", "description": "Highlight select fragments of texts", "main": "lib/highlighter.js", "peerDependencies": { @@ -31,7 +31,6 @@ "devDependencies": { "chai": "^3.5.0", "coveralls": "^2.11.9", - "istanbul": "^0.4.4", "jsdom": "^9.4.0", "mocha": "^2.5.3", From ab4443e05f076e24adee064981ccd62ce54bb47c Mon Sep 17 00:00:00 2001 From: Helior Colorado Date: Thu, 8 Jun 2017 20:01:41 -0700 Subject: [PATCH 15/17] Resolves #40; add "files" declaration for UMD goodness --- package.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package.json b/package.json index 6a935f4..3e1fe69 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,10 @@ "version": "0.3.5", "description": "Highlight select fragments of texts", "main": "lib/highlighter.js", + "files": [ + "lib", + "dist" + ], "peerDependencies": { "react": "^0.14.0 || ^15.0.0" }, From b80b25e0d6a8629dd3600f85a572263aed7026a2 Mon Sep 17 00:00:00 2001 From: Helior Colorado Date: Thu, 8 Jun 2017 20:02:21 -0700 Subject: [PATCH 16/17] 0.4.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3e1fe69..20285a3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-highlighter", - "version": "0.3.5", + "version": "0.4.0", "description": "Highlight select fragments of texts", "main": "lib/highlighter.js", "files": [ From cac04951719ea0dfcff7500a66f5d90a4937c20b Mon Sep 17 00:00:00 2001 From: ofir hartuv Date: Thu, 17 Aug 2017 16:12:26 +0300 Subject: [PATCH 17/17] change the children's key to be unique to able html mouse events --- .idea/misc.xml | 6 ++ .idea/modules.xml | 8 ++ .idea/react-highlighter.iml | 12 +++ .idea/vcs.xml | 6 ++ .idea/workspace.xml | 175 ++++++++++++++++++++++++++++++++++++ lib/highlighter.js | 4 +- 6 files changed, 209 insertions(+), 2 deletions(-) create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/react-highlighter.iml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..24eb271 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..af05fd2 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/react-highlighter.iml b/.idea/react-highlighter.iml new file mode 100644 index 0000000..24643cc --- /dev/null +++ b/.idea/react-highlighter.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..32d8c6b --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + + false + false + true + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +