Commit f4cb7ed

committed

Add undefined check. Closes #74

1 parent 47a1b56 commit f4cb7edCopy full SHA for f4cb7ed

File tree

+19

-1

lines changed

+19

-1

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ var flatten = function (array) {`
`46`	`46`	`* // => ['Emphasize all phone numbers like ', <strong>884-555-4443</strong>, '.'`
`47`	`47`	`*`
`48`	`48`	`* @param {string} str`
`49`		`- * @param {regexp\|str} match Must contain a matching group`
	`49`	`+ * @param {RegExp\|str} match Must contain a matching group`
`50`	`50`	`* @param {function} fn`
`51`	`51`	`* @return {array}`
`52`	`52`	`*/`
`@@ -70,6 +70,12 @@ function replaceString(str, match, fn) {`
`70`	`70`
`71`	`71`	`// Apply fn to all odd elements`
`72`	`72`	`for (var i = 1, length = result.length; i < length; i += 2) {`
	`73`	`+ /** @see {@link https://github.com/iansinnott/react-string-replace/issues/74} */`
	`74`	`+ if (result[i] === undefined \|\| result[i - 1] === undefined) {`
	`75`	`+ console.warn('reactStringReplace: Encountered undefined value during string replacement. Your RegExp may not be working the way you expect.');`
	`76`	`+ continue;`
	`77`	`+ }`
	`78`	`+`
`73`	`79`	`curCharLen = result[i].length;`
`74`	`80`	`curCharStart += result[i - 1].length;`
`75`	`81`	`result[i] = fn(result[i], i, curCharStart);`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -158,3 +158,15 @@ test('Will not through if first element of input is empty string', t => {`
`158`	`158`	`});`
`159`	`159`	`});`
`160`	`160`	`});`
	`161`	`+`
	`162`	`+test("Avoids undefined values due to regex", (t) => {`
	`163`	+ const string = `hey you there`;
	`164`	`+ const re = /(hey)\|(you)/;`
	`165`	`+`
	`166`	`+ // Normal splits include undefined if you do this`
	`167`	`+ t.deepEqual(string.split(re), ["", "hey", undefined, " ", undefined, "you", " there"]);`
	`168`	`+`
	`169`	`+ t.notThrows(() => {`
	`170`	`+ replaceString(string, /(hey)\|(you)/, x => x);`
	`171`	`+ });`
	`172`	`+});`

Comments

(0)