Skip to content

Commit a8ef837

Browse files
committed
FIx search in examples
1 parent 136f5cc commit a8ef837

File tree

2 files changed

+14
-22
lines changed

2 files changed

+14
-22
lines changed

src/components/Examples/index.tsx

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,7 @@ export default function Examples(props: {
5252
useEffect(() => {
5353
function filterByTags() {
5454
let examples;
55-
if (searchInput.length === 0) {
56-
examples = sortedExamples;
57-
} else {
58-
examples = searchFilteredExampleMap;
59-
}
55+
examples = sortedExamples;
6056
examples = examples.filter((item) => {
6157
const prodFil =
6258
productFilter.length === 0 || productFilter.some((tag) => item.tags.includes(tag));
@@ -65,7 +61,7 @@ export default function Examples(props: {
6561
const blockFil =
6662
blockchainFilter.length === 0 || blockchainFilter.some((tag) => item.tags.includes(tag));
6763

68-
return [prodFil, platFil, blockFil].every((result) => result === true);
64+
return [prodFil, platFil, blockFil].some((result) => result === true);
6965
});
7066
setTagFilteredExampleMap(examples);
7167
}
@@ -119,14 +115,14 @@ export default function Examples(props: {
119115
function onChangeSearch(input) {
120116
setSearchInput(input);
121117

122-
const inputKeywords = input.trim().split(" ");
118+
const inputKeywords = input.trim().split(" ").filter(Boolean);
123119

124120
function searchFilter(item) {
125121
return (
126-
inputKeywords.every((key) => item.title.toLowerCase().includes(key.toLowerCase())) ||
127-
inputKeywords.every((key) => item.description.toLowerCase().includes(key.toLowerCase())) ||
128-
inputKeywords.every((key) =>
129-
item.tags.map((tag) => tag.includes(key.toLowerCase())).includes(true),
122+
inputKeywords.some((key) => item.title.toLowerCase().includes(key.toLowerCase())) ||
123+
inputKeywords.some((key) => item.description.toLowerCase().includes(key.toLowerCase())) ||
124+
inputKeywords.some((key) =>
125+
item.tags.map((tag) => tag.toLowerCase().includes(key.toLowerCase())),
130126
)
131127
);
132128
}

src/pages/guides/index.tsx

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,7 @@ export default function Guides({ content }: GuidesInterface) {
4343
useEffect(() => {
4444
function filterByTags() {
4545
let guides;
46-
if (searchInput.length === 0) {
47-
guides = completeGuides;
48-
} else {
49-
guides = searchFilteredGuides;
50-
}
46+
guides = completeGuides;
5147
console.log("productFilter", productFilter);
5248
console.log("platformFilter", platformFilter);
5349
console.log("tags", tags);
@@ -57,7 +53,7 @@ export default function Guides({ content }: GuidesInterface) {
5753
const platFil =
5854
platformFilter.length === 0 || platformFilter.some((tag) => item.tags.includes(tag));
5955

60-
return [prodFil, platFil].every((result) => result === true);
56+
return [prodFil, platFil].some((result) => result === true);
6157
});
6258

6359
setTagFilteredGuides(guides.sort((a: any, b: any) => a.order - b.order));
@@ -106,14 +102,14 @@ export default function Guides({ content }: GuidesInterface) {
106102
function onChangeSearch(input) {
107103
setSearchInput(input);
108104

109-
const inputKeywords = input.trim().split(" ");
105+
const inputKeywords = input.trim().split(" ").filter(Boolean);
110106

111107
function searchFilter(item) {
112108
return (
113-
inputKeywords.every((key) => item.title.toLowerCase().includes(key.toLowerCase())) ||
114-
inputKeywords.every((key) => item.description.toLowerCase().includes(key.toLowerCase())) ||
115-
inputKeywords.every((key) =>
116-
item.tags.map((tag) => tag.includes(key.toLowerCase())).includes(true),
109+
inputKeywords.some((key) => item.title.toLowerCase().includes(key.toLowerCase())) ||
110+
inputKeywords.some((key) => item.description.toLowerCase().includes(key.toLowerCase())) ||
111+
inputKeywords.some((key) =>
112+
item.tags.some((tag) => tag.toLowerCase().includes(key.toLowerCase())),
117113
)
118114
);
119115
}

0 commit comments

Comments
 (0)