Fix/wordcount whitespace only error (#123)

* Addresses error thrown when the results of matchWord or matchCharacters returns null. Includes test for the case * Changes as per @tofumatt * Going full ternary
WordPress · May 7, 2018 · 4892728 · 4892728
1 parent aaa44c2
commit 4892728
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/packages/wordcount/src/index.js b/packages/wordcount/src/index.js
@@ -95,10 +95,10 @@ export function count( text, type, userSettings ) {
 	const settings = loadSettings( type, userSettings );
 	if ( text ) {
 		let matchRegExp = settings[ type + 'RegExp' ];
-		if ( 'words' === settings.type ) {
-			return matchWords( text, matchRegExp, settings ).length;
-		} else {
-			return matchCharacters( text, matchRegExp, settings ).length;
-		}
+		const results = ( 'words' === settings.type ) ?
+			matchWords( text, matchRegExp, settings ) :
+			matchCharacters( text, matchRegExp, settings );
+
+		return results ? results.length : 0;
 	}
 }
diff --git a/packages/wordcount/src/test/index.test.js b/packages/wordcount/src/test/index.test.js
@@ -84,6 +84,13 @@ describe( 'WordCounter', () => {
 				words: 1,
 				characters_excluding_spaces: 5,
 				characters_including_spaces: 6
+			},
+			{
+				message: "Empty Tags",
+				string: "<p></p>",
+				words: 0,
+				characters_excluding_spaces: 0,
+				characters_including_spaces: 0
 			}
 	];