Skip to content

Commit 61d01a4

Browse files
authored
Merge pull request #17 from Greg-mso/UniqueSearch
Unique search
2 parents ec30783 + 423b541 commit 61d01a4

7 files changed

+29
-13
lines changed

dist/fonticonpicker.base-theme.react.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/fonticonpicker.material-theme.react.css

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/fonticonpicker.material-theme.react.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/fonticonpicker.react.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/fonticonpicker.react.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/js/components/FipIconContainer.jsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,15 @@ class FipIconContainer extends React.PureComponent {
119119

120120
iconSet.forEach((value, index) => {
121121
if (fuzzySearch(searchString, currentSearchSet[index])) {
122-
nIconSet.push(value);
123-
nSearchSet.push(currentSearchSet[index]);
122+
if (!nIconSet.includes(value)) {
123+
nIconSet.push(value);
124+
}
125+
if (!nSearchSet.includes(currentSearchSet[index])) {
126+
nSearchSet.push(currentSearchSet[index]);
127+
}
124128
}
125129
});
130+
126131
return {
127132
activeIcons: nIconSet,
128133
activeTitles: nSearchSet,

src/js/components/FontIconPicker.jsx

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,10 +225,21 @@ class FontIconPicker extends React.PureComponent {
225225
this.closeDropdown();
226226
}
227227
};
228-
isClickWithin = /* istanbul ignore next */ target =>
229-
this.fipButtonRef.current.contains(target) ||
230-
(this.fipDropDownRef.current &&
231-
this.fipDropDownRef.current.contains(target));
228+
229+
isClickWithin = /* istanbul ignore next */ target => {
230+
if (
231+
target.className === 'fipicon-angle-left' ||
232+
target.className === 'fipicon-angle-right' ||
233+
target.className === 'rfipicons__label'
234+
) {
235+
return true;
236+
}
237+
return (
238+
this.fipButtonRef.current.contains(target) ||
239+
(this.fipDropDownRef.current &&
240+
this.fipDropDownRef.current.contains(target))
241+
);
242+
};
232243

233244
/**
234245
* Handle the dropdown open thingy.

0 commit comments

Comments
 (0)