From add27513fe3e5383bbc98cd64d694e05ff38ce40 Mon Sep 17 00:00:00 2001 From: Kévin Cocchi Date: Thu, 17 Dec 2020 01:01:32 +0100 Subject: Implement stickers search --- web/src/index.js | 49 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 4 deletions(-) (limited to 'web/src/index.js') diff --git a/web/src/index.js b/web/src/index.js index 5de4bd5..82a3e25 100644 --- a/web/src/index.js +++ b/web/src/index.js @@ -15,6 +15,7 @@ // along with this program. If not, see . import { html, render, Component } from "../lib/htm/preact.js" import { Spinner } from "./spinner.js" +import { SearchBox } from "./search-box.js" import * as widgetAPI from "./widget-api.js" import * as frequent from "./frequently-used.js" @@ -37,12 +38,20 @@ export const parseQuery = str => Object.fromEntries( const supportedThemes = ["light", "dark", "black"] +const defaultState = { + packs: [], + filtering: { + searchTerm: "", + packs: [], + }, +} + class App extends Component { constructor(props) { super(props) this.defaultTheme = parseQuery(location.search.substr(1)).theme this.state = { - packs: [], + packs: defaultState.packs, loading: true, error: null, stickersPerRow: parseInt(localStorage.mauStickersPerRow || "4"), @@ -53,6 +62,7 @@ class App extends Component { stickerIDs: frequent.get(), stickers: [], }, + filtering: defaultState.filtering, } if (!supportedThemes.includes(this.state.theme)) { this.state.theme = "light" @@ -65,6 +75,7 @@ class App extends Component { this.imageObserver = null this.packListRef = null this.navRef = null + this.searchStickers = this.searchStickers.bind(this) this.sendSticker = this.sendSticker.bind(this) this.navScroll = this.navScroll.bind(this) this.reloadPacks = this.reloadPacks.bind(this) @@ -89,6 +100,28 @@ class App extends Component { localStorage.mauFrequentlyUsedStickerCache = JSON.stringify(stickers.map(sticker => [sticker.id, sticker])) } + searchStickers(e) { + const sanitizeString = s => s.toLowerCase().trim() + const searchTerm = sanitizeString(e.target.value) + + const allPacks = [this.state.frequentlyUsed, ...this.state.packs] + const packsWithFilteredStickers = allPacks.map(pack => ({ + ...pack, + stickers: pack.stickers.filter(sticker => + sanitizeString(sticker.body).includes(searchTerm) || + sanitizeString(sticker.id).includes(searchTerm) + ), + })) + + this.setState({ + filtering: { + ...this.state.filtering, + searchTerm, + packs: packsWithFilteredStickers.filter(({ stickers }) => !!stickers.length), + }, + }) + } + setStickersPerRow(val) { localStorage.mauStickersPerRow = val document.documentElement.style.setProperty("--stickers-per-row", localStorage.mauStickersPerRow) @@ -111,7 +144,10 @@ class App extends Component { reloadPacks() { this.imageObserver.disconnect() this.sectionObserver.disconnect() - this.setState({ packs: [] }) + this.setState({ + packs: defaultState.packs, + filtering: defaultState.filtering, + }) this._loadPacks(true) } @@ -225,6 +261,9 @@ class App extends Component { render() { const theme = `theme-${this.state.theme}` + const filterActive = !!this.state.filtering.searchTerm + const packs = filterActive ? this.state.filtering.packs : [this.state.frequentlyUsed, ...this.state.packs] + if (this.state.loading) { return html`
<${Spinner} size=${80} green />
` } else if (this.state.error) { @@ -235,15 +274,17 @@ class App extends Component { } else if (this.state.packs.length === 0) { return html`

No packs found 😿

` } + return html`
+ <${SearchBox} onKeyUp=${this.searchStickers} />
this.packListRef = elem}> - <${Pack} pack=${this.state.frequentlyUsed} send=${this.sendSticker} /> - ${this.state.packs.map(pack => html`<${Pack} id=${pack.id} pack=${pack} send=${this.sendSticker} />`)} + ${filterActive && packs.length === 0 ? html`

No stickers match your search

` : null} + ${packs.map(pack => html`<${Pack} id=${pack.id} pack=${pack} send=${this.sendSticker} />`)} <${Settings} app=${this}/>
` -- cgit v1.2.3