Merge pull request #1 from Greg-mso/UniqueSearch

Unique search

Author: Greg Guiver

src/js/components/FipIconContainer.jsx

@@ -119,10 +119,15 @@ class FipIconContainer extends React.PureComponent {
 
 		iconSet.forEach((value, index) => {
 			if (fuzzySearch(searchString, currentSearchSet[index])) {
-				nIconSet.push(value);
-				nSearchSet.push(currentSearchSet[index]);
+				if (!nIconSet.includes(value)) {
+					nIconSet.push(value);
+				}
+				if (!nSearchSet.includes(currentSearchSet[index])) {
+					nSearchSet.push(currentSearchSet[index]);
+				}
 			}
 		});
+
 		return {
 			activeIcons: nIconSet,
 			activeTitles: nSearchSet,

src/js/components/FontIconPicker.jsx

@@ -225,10 +225,20 @@ class FontIconPicker extends React.PureComponent {
 			this.closeDropdown();
 		}
 	};
-	isClickWithin = /* istanbul ignore next */ target =>
-		this.fipButtonRef.current.contains(target) ||
-		(this.fipDropDownRef.current &&
-			this.fipDropDownRef.current.contains(target));
+	isClickWithin = /* istanbul ignore next */ target => {
+		if (
+			target.className === 'fipicon-angle-left' ||
+			target.className === 'fipicon-angle-right' ||
+			target.className === 'rfipicons__label'
+		) {
+			return true;
+		}
+		return (
+			this.fipButtonRef.current.contains(target) ||
+			(this.fipDropDownRef.current &&
+				this.fipDropDownRef.current.contains(target))
+		);
+	};
 
 	/**
 	 * Handle the dropdown open thingy.