diff --git a/web/res/search.svg b/web/res/search.svg
new file mode 100644
index 0000000000000000000000000000000000000000..7be339650e437fa6bad197a3d76f02ea05cf0af0
--- /dev/null
+++ b/web/res/search.svg
@@ -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>
\ No newline at end of file
diff --git a/web/src/index.js b/web/src/index.js
index 38a06b436553f180bbef6c4f4a2ed27f70344a4b..a215c463aa453c88c10e26763f99903b25cd42c5 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"
@@ -38,12 +39,20 @@ const isMobileSafari = navigator.userAgent.match(/(iPod|iPhone|iPad)/) && naviga
const supportedThemes = ["light", "dark", "black"]
+const defaultState = {
+ packs: [],
+ filtering: {
+ searchTerm: "",
+ packs: [],
+ },
+}
+
class App extends Component {
constructor(props) {
super(props)
this.defaultTheme = params.get("theme")
this.state = {
- packs: [],
+ packs: defaultState.packs,
loading: true,
error: null,
stickersPerRow: parseInt(localStorage.mauStickersPerRow || "4"),
@@ -54,6 +63,7 @@ class App extends Component {
stickerIDs: frequent.get(),
stickers: [],
},
+ filtering: defaultState.filtering,
}
if (!supportedThemes.includes(this.state.theme)) {
this.state.theme = "light"
@@ -66,6 +76,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)
@@ -90,6 +101,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)
@@ -112,7 +145,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)
}
@@ -231,6 +267,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) {
@@ -241,15 +280,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 0000000000000000000000000000000000000000..ba2ed5d3703d3289433bcd1aa17feec3eec9b86c
--- /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
+}
diff --git a/web/style/index.css b/web/style/index.css
index 9132dabafc4102049ce027b6db63da8e4770cbf1..e33e450738681474ccc63d7eb459532794f065b4 100644
--- a/web/style/index.css
+++ b/web/style/index.css
@@ -1 +1 @@
-*{font-family:sans-serif}body{margin:0}h1{font-size:1rem}:root{--stickers-per-row: 4;--sticker-size: calc(100vw / var(--stickers-per-row))}main{color:var(--text-color)}main.spinner{margin-top:5rem}main.error,main.empty{margin:2rem}main.empty{text-align:center}main.has-content{position:fixed;top:0;left:0;right:0;bottom:0;display:grid;grid-template-rows:calc(12vw + 2px) auto}main.theme-light{--highlight-color: #eee;--text-color: black;background-color:#fff}main.theme-dark{--highlight-color: #444;--text-color: white;background-color:#22262e}main.theme-black{--highlight-color: #222;--text-color: white;background-color:#000}.icon{width:100%;height:100%;background-color:var(--text-color);mask-size:contain;-webkit-mask-size:contain;mask-image:var(--icon-image);-webkit-mask-image:var(--icon-image)}.icon.icon-settings{--icon-image: url(../res/settings.svg)}.icon.icon-recent{--icon-image: url(../res/recent.svg)}nav{display:flex;overflow-x:auto}nav>a{border-bottom:2px solid transparent}nav>a.visible{border-bottom-color:green}nav>a>div.sticker{width:12vw;height:12vw}div.pack-list,nav{scrollbar-width:none}div.pack-list::-webkit-scrollbar,nav::-webkit-scrollbar{display:none}div.pack-list{overflow-y:auto}div.pack-list.ios-safari-hack{position:fixed;top:calc(12vw + 2px);bottom:0;left:0;right:0;-webkit-overflow-scrolling:touch}section.stickerpack{margin-top:.75rem}section.stickerpack>div.sticker-list{display:flex;flex-wrap:wrap}section.stickerpack>h1{margin:0 0 0 .75rem}div.sticker{display:flex;padding:4px;cursor:pointer;position:relative;width:var(--sticker-size);height:var(--sticker-size);box-sizing:border-box}div.sticker:hover{background-color:var(--highlight-color)}div.sticker>img{display:none;width:100%;object-fit:contain}div.sticker>img.visible{display:initial}div.sticker>.icon{width:70%;height:70%;margin:15%}div.settings-list{display:flex;flex-direction:column}div.settings-list>*{margin:.5rem}div.settings-list button{padding:.5rem;border-radius:.25rem}div.settings-list input{width:100%}
+*{font-family:sans-serif}body{margin:0}h1{font-size:1rem}:root{--stickers-per-row: 4;--sticker-size: calc(100vw / var(--stickers-per-row))}main{color:var(--text-color)}main.spinner{margin-top:5rem}main.error,main.empty{margin:2rem}main.empty{text-align:center}main.has-content{position:fixed;top:0;left:0;right:0;bottom:0;display:grid;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:#fff}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:#000}.icon{width:100%;height:100%;background-color:var(--text-color);mask-size:contain;-webkit-mask-size:contain;mask-image:var(--icon-image);-webkit-mask-image:var(--icon-image)}.icon.icon-settings{--icon-image: url(../res/settings.svg)}.icon.icon-recent{--icon-image: url(../res/recent.svg)}.icon.icon.icon-search{--icon-image: url(../res/search.svg)}nav{display:flex;overflow-x:auto}nav>a{border-bottom:2px solid transparent}nav>a.visible{border-bottom-color:green}nav>a>div.sticker{width:12vw;height:12vw}div.pack-list,nav{scrollbar-width:none}div.pack-list::-webkit-scrollbar,nav::-webkit-scrollbar{display:none}div.pack-list{overflow-y:auto}div.pack-list.ios-safari-hack{position:fixed;top:calc(calc(12vw + 2px) + calc(2 * 0.7rem + 2 * 0.5rem + 1rem));bottom:0;left:0;right:0;-webkit-overflow-scrolling:touch}div.search-empty{margin:1.2rem;text-align:center}section.stickerpack{margin-top:.75rem}section.stickerpack>div.sticker-list{display:flex;flex-wrap:wrap}section.stickerpack>h1{margin:0 0 0 .75rem}div.sticker{display:flex;padding:4px;cursor:pointer;position:relative;width:var(--sticker-size);height:var(--sticker-size);box-sizing:border-box}div.sticker:hover{background-color:var(--highlight-color)}div.sticker>img{display:none;width:100%;object-fit:contain}div.sticker>img.visible{display:initial}div.sticker>.icon{width:70%;height:70%;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;height:1rem;padding:.7rem;padding-right:calc(1rem + 0.7rem);margin:.5rem;font-size:1rem;color:var(--text-color)}div.search-box>span.icon{display:flex;position:absolute;top:calc(50% - 1rem / 2);right:1rem;width:1rem;height:1rem;box-sizing:border-box}div.settings-list{display:flex;flex-direction:column}div.settings-list>*{margin:.5rem}div.settings-list button{padding:.5rem;border-radius:.25rem}div.settings-list input{width:100%}
diff --git a/web/style/index.sass b/web/style/index.sass
index 2b61292223b6ac135f870cb82c632022883b9e98..c079f652e4a010d8f130ca66c96f6f0019d23c9c 100644
--- a/web/style/index.sass
+++ b/web/style/index.sass
@@ -32,6 +32,12 @@ $nav-bottom-highlight: 2px
$nav-height: calc(#{$nav-sticker-size} + #{$nav-bottom-highlight})
$nav-height-inverse: calc(-#{$nav-sticker-size} - #{$nav-bottom-highlight})
+$search-box-icon-size: 1rem
+$search-box-input-height: 1rem
+$search-box-input-padding: .7rem
+$search-box-input-margin: .5rem
+$search-box-height: calc(2 * #{$search-box-input-padding} + 2 * #{$search-box-input-margin} + #{$search-box-input-height})
+
main
color: var(--text-color)
@@ -50,22 +56,24 @@ main
left: 0
right: 0
bottom: 0
-
display: grid
- grid-template-rows: $nav-height auto
+ grid-template-rows: $nav-height 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
@@ -84,6 +92,9 @@ main.theme-black
&.icon-recent
--icon-image: url(../res/recent.svg)
+ &.icon.icon-search
+ --icon-image: url(../res/search.svg)
+
nav
display: flex
overflow-x: auto
@@ -109,12 +120,16 @@ div.pack-list
div.pack-list.ios-safari-hack
position: fixed
- top: $nav-height
+ top: calc(#{$nav-height} + #{$search-box-height})
bottom: 0
left: 0
right: 0
-webkit-overflow-scrolling: touch
+div.search-empty
+ margin: 1.2rem
+ text-align: center
+
section.stickerpack
margin-top: .75rem
@@ -150,6 +165,32 @@ div.sticker
height: 70%
margin: 15%
+div.search-box
+ position: relative
+ display: flex
+
+ >input[type="text"]
+ flex-grow: 1
+ background-color: var(--search-box-color)
+ outline: none
+ border: none
+ border-radius: .25rem
+ height: $search-box-input-height
+ padding: $search-box-input-padding
+ padding-right: calc(#{$search-box-icon-size} + #{$search-box-input-padding})
+ margin: $search-box-input-margin
+ font-size: 1rem
+ color: var(--text-color)
+
+ >span.icon
+ display: flex
+ position: absolute
+ top: calc(50% - #{$search-box-icon-size} / 2)
+ right: $search-box-icon-size
+ width: $search-box-icon-size
+ height: $search-box-icon-size
+ box-sizing: border-box
+
div.settings-list
display: flex
flex-direction: column