mirror of
				https://github.com/maunium/stickerpicker
				synced 2025-11-04 06:07:16 +00:00 
			
		
		
		
	Implement stickers search
This commit is contained in:
		
							parent
							
								
									66d5b90ea1
								
							
						
					
					
						commit
						add27513fe
					
				
							
								
								
									
										1
									
								
								web/res/search.svg
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								web/res/search.svg
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1 @@
 | 
			
		||||
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M9.145 18.29c-5.042 0-9.145-4.102-9.145-9.145s4.103-9.145 9.145-9.145 9.145 4.103 9.145 9.145-4.102 9.145-9.145 9.145zm0-15.167c-3.321 0-6.022 2.702-6.022 6.022s2.702 6.022 6.022 6.022 6.023-2.702 6.023-6.022-2.702-6.022-6.023-6.022zm9.263 12.443c-.817 1.176-1.852 2.188-3.046 2.981l5.452 5.453 3.014-3.013-5.42-5.421z"/></svg>
 | 
			
		||||
| 
		 After Width: | Height: | Size: 419 B  | 
@ -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>`
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										26
									
								
								web/src/search-box.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										26
									
								
								web/src/search-box.js
									
									
									
									
									
										Normal file
									
								
							@ -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
 | 
			
		||||
}
 | 
			
		||||
@ -32,6 +32,11 @@ main.empty {
 | 
			
		||||
  text-align: center
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
div.search-empty {
 | 
			
		||||
  margin: 1rem;
 | 
			
		||||
  text-align: center
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
main.has-content {
 | 
			
		||||
  position: fixed;
 | 
			
		||||
  top: 0;
 | 
			
		||||
@ -39,23 +44,26 @@ main.has-content {
 | 
			
		||||
  right: 0;
 | 
			
		||||
  bottom: 0;
 | 
			
		||||
  display: grid;
 | 
			
		||||
  grid-template-rows: calc(12vw + 2px) auto
 | 
			
		||||
  grid-template-rows: calc(12vw + 2px) min-content auto
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
main.theme-light {
 | 
			
		||||
  --highlight-color: #eee;
 | 
			
		||||
  --search-box-color: var(--highlight-color);
 | 
			
		||||
  --text-color: black;
 | 
			
		||||
  background-color: white
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
main.theme-dark {
 | 
			
		||||
  --highlight-color: #444;
 | 
			
		||||
  --search-box-color: #383e4b;
 | 
			
		||||
  --text-color: white;
 | 
			
		||||
  background-color: #22262e
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
main.theme-black {
 | 
			
		||||
  --highlight-color: #222;
 | 
			
		||||
  --search-box-color: var(--highlight-color);
 | 
			
		||||
  --text-color: white;
 | 
			
		||||
  background-color: black
 | 
			
		||||
}
 | 
			
		||||
@ -78,6 +86,10 @@ main.theme-black {
 | 
			
		||||
  --icon-image: url(../res/recent.svg)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.icon.icon-search {
 | 
			
		||||
  --icon-image: url(../res/search.svg)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
nav {
 | 
			
		||||
  display: flex;
 | 
			
		||||
  overflow-x: auto
 | 
			
		||||
@ -112,7 +124,7 @@ div.pack-list {
 | 
			
		||||
 | 
			
		||||
div.pack-list.ios-safari-hack {
 | 
			
		||||
  position: fixed;
 | 
			
		||||
  top: calc(12vw + 2px);
 | 
			
		||||
  top: calc(12vw + 2 * .7rem + 2 * 1rem + 2px);
 | 
			
		||||
  bottom: 0;
 | 
			
		||||
  left: 0;
 | 
			
		||||
  right: 0;
 | 
			
		||||
@ -162,6 +174,33 @@ div.sticker>.icon {
 | 
			
		||||
  margin: 15%
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
div.search-box {
 | 
			
		||||
  position: relative;
 | 
			
		||||
  display: flex;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
div.search-box>input[type="text"] {
 | 
			
		||||
  flex-grow: 1;
 | 
			
		||||
  background-color: var(--search-box-color);
 | 
			
		||||
  outline: none;
 | 
			
		||||
  border: none;
 | 
			
		||||
  border-radius: .25rem;
 | 
			
		||||
  padding: .7rem 1.8rem .7rem .7rem;
 | 
			
		||||
  margin: .5rem;
 | 
			
		||||
  font-size: 1rem;
 | 
			
		||||
  color: var(--text-color);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
div.search-box>span.icon {
 | 
			
		||||
  display: flex;
 | 
			
		||||
  position: absolute;
 | 
			
		||||
  right: 1rem;
 | 
			
		||||
  top: calc(50% - .5rem);
 | 
			
		||||
  width: 1rem;
 | 
			
		||||
  height: 1rem;
 | 
			
		||||
  box-sizing: border-box;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
div.settings-list {
 | 
			
		||||
  display: flex;
 | 
			
		||||
  flex-direction: column
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user