diff options
Diffstat (limited to 'web/src')
| -rw-r--r-- | web/src/index.js | 49 | ||||
| -rw-r--r-- | web/src/search-box.js | 26 |
2 files changed, 71 insertions, 4 deletions
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 <https://www.gnu.org/licenses/>. 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`<main class="spinner ${theme}"><${Spinner} size=${80} green /></main>` } else if (this.state.error) { @@ -235,15 +274,17 @@ class App extends Component { } else if (this.state.packs.length === 0) { return html`<main class="empty ${theme}"><h1>No packs found 😿</h1></main>` } + return html`<main class="has-content ${theme}"> <nav onWheel=${this.navScroll} ref=${elem => this.navRef = elem}> <${NavBarItem} pack=${this.state.frequentlyUsed} iconOverride="recent" /> ${this.state.packs.map(pack => html`<${NavBarItem} id=${pack.id} pack=${pack}/>`)} <${NavBarItem} pack=${{ id: "settings", title: "Settings" }} iconOverride="settings" /> </nav> + <${SearchBox} onKeyUp=${this.searchStickers} /> <div class="pack-list ${isMobileSafari ? "ios-safari-hack" : ""}" ref=${elem => 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`<div class="search-empty"><h1>No stickers match your search</h1></div>` : null} + ${packs.map(pack => html`<${Pack} id=${pack.id} pack=${pack} send=${this.sendSticker} />`)} <${Settings} app=${this}/> </div> </main>` diff --git a/web/src/search-box.js b/web/src/search-box.js new file mode 100644 index 0000000..ba2ed5d --- /dev/null +++ b/web/src/search-box.js @@ -0,0 +1,26 @@ +// maunium-stickerpicker - A fast and simple Matrix sticker picker widget. +// Copyright (C) 2020 Tulir Asokan +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see <https://www.gnu.org/licenses/>. +import { html } from "../lib/htm/preact.js" + +export const SearchBox = ({ onKeyUp, placeholder = 'Find stickers' }) => { + const component = html` + <div class="search-box"> + <input type="text" placeholder=${placeholder} onKeyUp=${onKeyUp} /> + <span class="icon icon-search" /> + </div> + ` + return component +} |