Improve tag matching

Fixes case where tag is followed by punctuation
aduth · May 21, 2017 · 267aeaa · 267aeaa
1 parent 2fb7619
commit 267aeaa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/state/selectors/get-dones.js b/src/state/selectors/get-dones.js
@@ -37,9 +37,9 @@ export default function getDones( state, query = {} ) {
 					return includes( pageIds, item.id );
 
 				case 'tag':
-					const tag = '#' + value.toLowerCase();
-					const text = item.text.toLowerCase();
-					return includes( text.split( ' ' ), tag );
+					const tag = value.replace( /\W/g, '' );
+					const pattern = new RegExp( `(^|\\s)#${ tag }(\\W|$)`, 'i' );
+					return pattern.test( item.text );
 
 				default:
 					return true;

diff --git a/src/state/selectors/test/get-dones.js b/src/state/selectors/test/get-dones.js
@@ -16,7 +16,7 @@ describe( 'getDones()', () => {
 					290: {
 						id: 290,
 						user: 1,
-						text: '#fill #the #tag #cloud',
+						text: '#fill, #the #tag #cloud',
 						date: '2017-04-27 00:00:00',
 						done: true
 					}
@@ -41,7 +41,7 @@ describe( 'getDones()', () => {
 		expect( dones ).to.eql( [ {
 			id: 290,
 			user: 1,
-			text: '#fill #the #tag #cloud',
+			text: '#fill, #the #tag #cloud',
 			date: '2017-04-27 00:00:00',
 			done: true
 		} ] );