diff --git a/web/res/reset.svg b/web/res/reset.svg
new file mode 100644
index 0000000000000000000000000000000000000000..be0a47fa3cc16b793e7bb6650b5474f740b8aa11
--- /dev/null
+++ b/web/res/reset.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM5.354 4.646a.5.5 0 1 0-.708.708L7.293 8l-2.647 2.646a.5.5 0 0 0 .708.708L8 8.707l2.646 2.647a.5.5 0 0 0 .708-.708L8.707 8l2.647-2.646a.5.5 0 0 0-.708-.708L8 7.293 5.354 4.646z"/></svg>
diff --git a/web/src/index.js b/web/src/index.js
index f828edaabb9d573c262daa17ce9da2e2eed5acb8..4e33cbe9ba2c1c7386451a7b181eab568028cba3 100644
--- a/web/src/index.js
+++ b/web/src/index.js
@@ -50,11 +50,15 @@ const isMobileSafari = navigator.userAgent.match(/(iPod|iPhone|iPad)/) && naviga
const supportedThemes = ["light", "dark", "black"]
const defaultState = {
+ viewingGifs: false,
packs: [],
- filtering: {
- searchTerm: "",
- packs: [],
- },
+ loading: true,
+ error: null,
+}
+
+const defaultSearchState = {
+ searchTerm: null,
+ filteredPacks: null
}
const makeFrequentlyUsedState = ({ stickerIDs, stickers } = {}) => ({
@@ -64,19 +68,18 @@ const makeFrequentlyUsedState = ({ stickerIDs, stickers } = {}) => ({
stickers: stickers ?? [],
})
+const sanitizeString = s => s.toLowerCase().trim()
+
class App extends Component {
constructor(props) {
super(props)
this.defaultTheme = params.get("theme")
this.state = {
- viewingGifs: false,
- packs: defaultState.packs,
- loading: true,
- error: null,
+ ...defaultState,
+ ...defaultSearchState,
stickersPerRow: parseInt(localStorage.mauStickersPerRow || "4"),
theme: localStorage.mauStickerThemeOverride || this.defaultTheme,
frequentlyUsed: makeFrequentlyUsedState(),
- filtering: defaultState.filtering,
}
if (!supportedThemes.includes(this.state.theme)) {
@@ -91,6 +94,7 @@ class App extends Component {
this.navRef = null
this.searchStickers = this.searchStickers.bind(this)
+ this.resetSearch = this.resetSearch.bind(this)
this.sendSticker = this.sendSticker.bind(this)
this.navScroll = this.navScroll.bind(this)
this.reloadPacks = this.reloadPacks.bind(this)
@@ -125,28 +129,31 @@ class App extends Component {
this._setFrequentlyUsed()
}
+ // Search
+
+ resetSearch() {
+ this.setState({ ...defaultSearchState })
+ }
+
searchStickers(e) {
- const sanitizeString = s => s.toLowerCase().trim()
- const searchTerm = sanitizeString(e.target.value)
+ const searchTerm = e.target.value
+ const sanitizedSearch = sanitizeString(searchTerm)
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)
+ sanitizeString(sticker.body).includes(sanitizedSearch) ||
+ sanitizeString(sticker.id).includes(sanitizedSearch)
),
}))
+ const filteredPacks = packsWithFilteredStickers.filter(({ stickers }) => !!stickers.length)
- this.setState({
- filtering: {
- ...this.state.filtering,
- searchTerm,
- packs: packsWithFilteredStickers.filter(({stickers}) => !!stickers.length),
- },
- })
+ this.setState({ searchTerm, filteredPacks })
}
+ // End search
+
setStickersPerRow(val) {
localStorage.mauStickersPerRow = val
document.documentElement.style.setProperty("--stickers-per-row", localStorage.mauStickersPerRow)
@@ -169,10 +176,8 @@ class App extends Component {
reloadPacks() {
this.imageObserver.disconnect()
this.sectionObserver.disconnect()
- this.setState({
- packs: defaultState.packs,
- filtering: defaultState.filtering,
- })
+ this.setState({ packs: defaultState.packs })
+ this.resetSearch()
this._loadPacks(true)
}
@@ -258,6 +263,9 @@ class App extends Component {
continue
}
const navElement = document.getElementById(`nav-${packID}`)
+ if (!navElement) {
+ continue
+ }
if (entry.isIntersecting) {
navElement.classList.add("visible")
const bb = navElement.getBoundingClientRect()
@@ -299,6 +307,7 @@ class App extends Component {
sendSticker(sticker) {
frequent.add(sticker.id)
this.updateFrequentlyUsed()
+ this.resetSearch()
widgetAPI.sendSticker(sticker)
}
@@ -308,10 +317,10 @@ 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]
+
+ const filterActive = !!this.state.filteredPacks
+ const packs = filterActive ? this.state.filteredPacks : [this.state.frequentlyUsed, ...this.state.packs]
+ const noPacksForSearch = filterActive && packs.length === 0
if (this.state.loading) {
return html`
@@ -355,11 +364,13 @@ class App extends Component {
${this.state.viewingGifs ? html`
<${GiphySearchTab}/>
` : html`
- <${SearchBox} onInput=${this.searchStickers} value=${this.state.filtering.searchTerm ?? ""}/>
+ <${SearchBox}
+ onInput=${this.searchStickers}
+ value=${this.state.searchTerm}
+ onReset=${this.resetSearch}
+ />
<div class="pack-list ${isMobileSafari ? "ios-safari-hack" : ""}" ref=${(elem) => (this.packListRef = elem)}>
- ${filterActive && packs.length === 0
- ? html`<div class="search-empty"><h1>No stickers match your search</h1></div>`
- : null}
+ ${noPacksForSearch ? 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>
diff --git a/web/src/search-box.js b/web/src/search-box.js
index b25769ffdb5b7ec6c2a043a1f23c578ff4f52530..ce393c032f307cf1e25a958a32068812a4e98830 100644
--- a/web/src/search-box.js
+++ b/web/src/search-box.js
@@ -13,14 +13,37 @@
//
// 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"
+import { html } from "../lib/htm/preact.js"
-export const SearchBox = ({onInput, onKeyUp, value, placeholder = 'Find stickers'}) => {
- const component = html`
+export const SearchBox = ({ onInput, onKeyUp, onReset, value, placeholder = 'Find stickers' }) => {
+ const isEmpty = !value
+
+ const className = `icon-display ${isEmpty ? '' : 'reset-click-zone'}`
+ const title = isEmpty ? null : 'Click to reset'
+ const onClick = isEmpty ? null : onReset
+ const iconToDisplay = `icon-${isEmpty ? 'search' : 'reset'}`
+
+ const localOnKeyUp = (e) => {
+ if (e.key === "Escape") {
+ onReset()
+ }
+ if (onKeyUp) {
+ onKeyUp(e)
+ }
+ }
+
+ return html`
<div class="search-box">
- <input type="text" placeholder=${placeholder} value=${value} onInput=${onInput} onKeyUp=${onKeyUp}/>
- <span class="icon icon-search"/>
+ <input
+ type="text"
+ placeholder=${placeholder}
+ value=${value}
+ onInput=${onInput}
+ onKeyUp=${localOnKeyUp}
+ />
+ <div class=${className} title=${title} onClick=${onClick}>
+ <span class="icon ${iconToDisplay}" />
+ </div>
</div>
`
- return component
}
diff --git a/web/style/index.css b/web/style/index.css
index f73124e2bfaaa751101e228185f596b1810c1079..1f2ec32e431060cd915e4a767b5a176e0f92fa90 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) 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-dark .icon.icon-giphy{background-image:url(../res/giphy-dark.svg)}main.theme-black{--highlight-color: #222;--search-box-color: var(--highlight-color);--text-color: white;background-color:#000}main.theme-black .icon.icon-giphy{background-image:url(../res/giphy-dark.svg)}div.powered-by-giphy{padding:1rem}div.powered-by-giphy>img{width:100%}.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)}.icon.icon.icon-giphy{background:center/contain no-repeat url(../res/giphy-light.svg);mask:unset}nav{display:flex;overflow-x:auto}nav>a{border-bottom:2px solid rgba(0,0,0,0)}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}section.stickerpack#pack-giphy{display:flex;justify-content:space-between;flex-direction:column;min-height:100%}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%}
+*{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-dark .icon.icon-giphy{background-image:url(../res/giphy-dark.svg)}main.theme-black{--highlight-color: #222;--search-box-color: var(--highlight-color);--text-color: white;background-color:#000}main.theme-black .icon.icon-giphy{background-image:url(../res/giphy-dark.svg)}div.powered-by-giphy{padding:1rem}div.powered-by-giphy>img{width:100%}.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-search{--icon-image: url(../res/search.svg)}.icon.icon.icon-giphy{background:center/contain no-repeat url(../res/giphy-light.svg);mask:unset}.icon.icon-reset{--icon-image: url(../res/reset.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}section.stickerpack#pack-giphy{display:flex;justify-content:space-between;flex-direction:column;min-height:100%}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{display:flex;margin:.5rem;padding:0;border-radius:.4rem;background-color:var(--search-box-color);opacity:.5;transition:all .1s;border:1px solid transparent}div.search-box input,div.search-box .icon-display{color:var(--text-color);outline:none;border:none;height:1rem;margin:0;padding:.7rem;background-color:transparent;-webkit-tap-highlight-color:transparent}div.search-box .icon-display{width:1rem}div.search-box .icon-display.reset-click-zone{cursor:pointer}div.search-box .icon-display .icon{display:block;width:1rem;height:1rem}div.search-box .icon-display .icon-search{opacity:.5}div.search-box input{flex-grow:1;font-size:1rem}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:not([type=checkbox]){width:100%}
diff --git a/web/style/index.sass b/web/style/index.sass
index 1269be5e136d4ee66176b747ece83ddc7a762cb0..167929bfe8de10f3c6fd1d3ca9ce96159c46c621 100644
--- a/web/style/index.sass
+++ b/web/style/index.sass
@@ -103,12 +103,15 @@ div.powered-by-giphy
&.icon-recent
--icon-image: url(../res/recent.svg)
- &.icon.icon-search
+ &.icon-search
--icon-image: url(../res/search.svg)
&.icon.icon-giphy
background: center / contain no-repeat url(../res/giphy-light.svg)
mask: unset
+
+ &.icon-reset
+ --icon-image: url(../res/reset.svg)
nav
display: flex
@@ -187,30 +190,42 @@ div.sticker
margin: 15%
div.search-box
- position: relative
display: flex
-
- >input[type="text"]
- flex-grow: 1
- background-color: var(--search-box-color)
+ margin: $search-box-input-margin
+ padding: 0
+ border-radius: .4rem
+ background-color: var(--search-box-color)
+ opacity: .5
+ transition: all .1s
+ border: 1px solid transparent
+
+ input,.icon-display
+ color: var(--text-color)
outline: none
border: none
- border-radius: .25rem
height: $search-box-input-height
+ margin: 0
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)
+ background-color: transparent
+ -webkit-tap-highlight-color: transparent
- >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
+ .icon-display
+ width: $search-box-input-height
+
+ &.reset-click-zone
+ cursor: pointer
+
+ .icon
+ display: block
+ width: $search-box-icon-size
+ height: $search-box-icon-size
+
+ .icon-search
+ opacity: .5
+
+ input
+ flex-grow: 1
+ font-size: 1rem
div.settings-list
display: flex
@@ -223,5 +238,5 @@ div.settings-list
padding: .5rem
border-radius: .25rem
- input
+ input:not([type="checkbox"])
width: 100%