From 41f0432e8d97422d7aada60189683759e9a0af1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Cocchi?= Date: Sun, 6 Feb 2022 12:17:29 +0100 Subject: [PATCH 1/9] handle resetting search field --- web/res/reset.svg | 1 + web/src/index.js | 40 ++++++++++++++++++++++------------------ web/src/search-box.js | 17 ++++++++++++----- web/style/index.sass | 5 ++++- 4 files changed, 39 insertions(+), 24 deletions(-) create mode 100644 web/res/reset.svg diff --git a/web/res/reset.svg b/web/res/reset.svg new file mode 100644 index 0000000..be0a47f --- /dev/null +++ b/web/res/reset.svg @@ -0,0 +1 @@ + diff --git a/web/src/index.js b/web/src/index.js index a215c46..46d9bf6 100644 --- a/web/src/index.js +++ b/web/src/index.js @@ -41,10 +41,7 @@ const supportedThemes = ["light", "dark", "black"] const defaultState = { packs: [], - filtering: { - searchTerm: "", - packs: [], - }, + searchTerm: null, } class App extends Component { @@ -52,7 +49,7 @@ class App extends Component { super(props) this.defaultTheme = params.get("theme") this.state = { - packs: defaultState.packs, + ...defaultState, loading: true, error: null, stickersPerRow: parseInt(localStorage.mauStickersPerRow || "4"), @@ -63,7 +60,6 @@ class App extends Component { stickerIDs: frequent.get(), stickers: [], }, - filtering: defaultState.filtering, } if (!supportedThemes.includes(this.state.theme)) { this.state.theme = "light" @@ -77,6 +73,7 @@ class App extends Component { this.packListRef = null 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) @@ -101,7 +98,18 @@ class App extends Component { localStorage.mauFrequentlyUsedStickerCache = JSON.stringify(stickers.map(sticker => [sticker.id, sticker])) } + // Search + + resetSearch() { + this.setState({ searchTerm: defaultState.searchTerm }) + } + searchStickers(e) { + if (e.key === "Escape") { + this.resetSearch() + return + } + const sanitizeString = s => s.toLowerCase().trim() const searchTerm = sanitizeString(e.target.value) @@ -115,11 +123,8 @@ class App extends Component { })) this.setState({ - filtering: { - ...this.state.filtering, - searchTerm, - packs: packsWithFilteredStickers.filter(({ stickers }) => !!stickers.length), - }, + filteredPacks: packsWithFilteredStickers.filter(({ stickers }) => !!stickers.length), + searchTerm, }) } @@ -145,10 +150,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 +261,7 @@ class App extends Component { const sticker = this.stickersByID.get(id) frequent.add(id) this.updateFrequentlyUsed() + this.resetSearch() widgetAPI.sendSticker(sticker) } @@ -267,8 +271,8 @@ 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.searchTerm + const packs = filterActive ? this.state.filteredPacks : [this.state.frequentlyUsed, ...this.state.packs] if (this.state.loading) { return html`
<${Spinner} size=${80} green />
` @@ -287,7 +291,7 @@ class App extends Component { ${this.state.packs.map(pack => html`<${NavBarItem} id=${pack.id} pack=${pack}/>`)} <${NavBarItem} pack=${{ id: "settings", title: "Settings" }} iconOverride="settings" /> - <${SearchBox} onKeyUp=${this.searchStickers} /> + <${SearchBox} onKeyUp=${this.searchStickers} resetSearch=${this.resetSearch} value=${this.state.searchTerm} />
this.packListRef = elem}> ${filterActive && packs.length === 0 ? html`

No stickers match your search

` : null} ${packs.map(pack => html`<${Pack} id=${pack.id} pack=${pack} send=${this.sendSticker} />`)} diff --git a/web/src/search-box.js b/web/src/search-box.js index ba2ed5d..5af8f19 100644 --- a/web/src/search-box.js +++ b/web/src/search-box.js @@ -15,12 +15,19 @@ // along with this program. If not, see . import { html } from "../lib/htm/preact.js" -export const SearchBox = ({ onKeyUp, placeholder = 'Find stickers' }) => { - const component = html` +export const SearchBox = ({ onKeyUp, resetSearch, value }) => { + const className = `icon-display ${value ? 'reset-click-zone' : null}` + const title = value ? 'Click to reset' : null + const onClick = value ? resetSearch : null + + const iconToDisplay = `icon-${!value ? 'search' : 'reset'}` + + return html`
- - + +
+ +
` - return component } diff --git a/web/style/index.sass b/web/style/index.sass index c079f65..773c8f9 100644 --- a/web/style/index.sass +++ b/web/style/index.sass @@ -92,9 +92,12 @@ main.theme-black &.icon-recent --icon-image: url(../res/recent.svg) - &.icon.icon-search + &.icon-search --icon-image: url(../res/search.svg) + &.icon-reset + --icon-image: url(../res/reset.svg) + nav display: flex overflow-x: auto From fed4f08218952596d40648bc11495dab3680a573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Cocchi?= Date: Sun, 6 Feb 2022 12:18:11 +0100 Subject: [PATCH 2/9] handle autofocus search + setting on/off --- web/src/index.js | 23 ++++++++++++++++++++++- web/src/search-box.js | 8 +++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/web/src/index.js b/web/src/index.js index 46d9bf6..6307a09 100644 --- a/web/src/index.js +++ b/web/src/index.js @@ -15,7 +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 { shouldAutofocusSearchBar, SearchBox } from "./search-box.js" import * as widgetAPI from "./widget-api.js" import * as frequent from "./frequently-used.js" @@ -128,6 +128,10 @@ class App extends Component { }) } + // End search + + // Settings + setStickersPerRow(val) { localStorage.mauStickersPerRow = val document.documentElement.style.setProperty("--stickers-per-row", localStorage.mauStickersPerRow) @@ -147,6 +151,12 @@ class App extends Component { } } + setAutofocusSearchBar(checked) { + localStorage.mauAutofocusSearchBar = checked + } + + // End settings + reloadPacks() { this.imageObserver.disconnect() this.sectionObserver.disconnect() @@ -218,6 +228,9 @@ class App extends Component { for (const entry of intersections) { const packID = entry.target.getAttribute("data-pack-id") const navElement = document.getElementById(`nav-${packID}`) + if (!navElement) { + continue + } if (entry.isIntersecting) { navElement.classList.add("visible") const bb = navElement.getBoundingClientRect() @@ -321,6 +334,14 @@ const Settings = ({ app }) => html`
+
+ Autofocus search bar: + app.setAutofocusSearchBar(evt.target.checked)} + /> +
` diff --git a/web/src/search-box.js b/web/src/search-box.js index 5af8f19..13ae3cf 100644 --- a/web/src/search-box.js +++ b/web/src/search-box.js @@ -15,7 +15,13 @@ // along with this program. If not, see . import { html } from "../lib/htm/preact.js" +export function shouldAutofocusSearchBar() { + return localStorage.mauAutofocusSearchBar === 'true' +} + export const SearchBox = ({ onKeyUp, resetSearch, value }) => { + const autofocus = shouldAutofocusSearchBar() + const className = `icon-display ${value ? 'reset-click-zone' : null}` const title = value ? 'Click to reset' : null const onClick = value ? resetSearch : null @@ -24,7 +30,7 @@ export const SearchBox = ({ onKeyUp, resetSearch, value }) => { return html`
- +
From ad2657476279166563484898715deb1a3952821d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Cocchi?= Date: Sun, 6 Feb 2022 12:19:17 +0100 Subject: [PATCH 3/9] use flex instead of absolute for search field css --- web/style/index.css | 2 +- web/style/index.sass | 48 +++++++++++++++++++++++++++----------------- 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/web/style/index.css b/web/style/index.css index e33e450..2cc06bd 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-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%} +*{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-search{--icon-image: url(../res/search.svg)}.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}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;border-radius:.4rem;overflow:hidden}div.search-box input,div.search-box .icon-display{color:var(--text-color);opacity:.5;transition:opacity .1s;background-color:var(--search-box-color)}div.search-box input:focus,div.search-box input:focus+.icon-display,div.search-box .icon-display:focus,div.search-box .icon-display:focus+.icon-display{opacity:1}div.search-box .icon-display{padding:.7rem;width:1rem;height: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 input{flex-grow:1;outline:none;border:none;margin:0;padding:.7rem;padding-right:0;height:1rem;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 773c8f9..f760994 100644 --- a/web/style/index.sass +++ b/web/style/index.sass @@ -169,30 +169,42 @@ div.sticker margin: 15% div.search-box - position: relative display: flex + margin: $search-box-input-margin + border-radius: .4rem + overflow: hidden - >input[type="text"] - flex-grow: 1 + input,.icon-display + color: var(--text-color) + opacity: .5 + transition: opacity .1s background-color: var(--search-box-color) + + &:focus,&:focus+.icon-display + opacity: 1 + + .icon-display + padding: $search-box-input-padding + width: $search-box-input-height + height: $search-box-input-height + + &.reset-click-zone + cursor: pointer + + .icon + display: block + width: $search-box-icon-size + height: $search-box-icon-size + + input + flex-grow: 1 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 + padding-right: 0 + height: $search-box-input-height 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 @@ -205,5 +217,5 @@ div.settings-list padding: .5rem border-radius: .25rem - input + input:not([type="checkbox"]) width: 100% From 909aaf8d44ae0fc85570824210b08de20961c8a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Cocchi?= Date: Sun, 6 Feb 2022 15:47:38 +0100 Subject: [PATCH 4/9] improve for mobile support --- web/src/index.js | 42 +++++++++++++------------ web/src/search-box.js | 72 ++++++++++++++++++++++++++++++++++--------- web/style/index.css | 2 +- web/style/index.sass | 34 +++++++++++--------- 4 files changed, 101 insertions(+), 49 deletions(-) diff --git a/web/src/index.js b/web/src/index.js index 6307a09..78105b8 100644 --- a/web/src/index.js +++ b/web/src/index.js @@ -41,7 +41,13 @@ const supportedThemes = ["light", "dark", "black"] const defaultState = { packs: [], + loading: true, + error: null, +} + +const defaultSearchState = { searchTerm: null, + filteredPacks: null } class App extends Component { @@ -50,8 +56,7 @@ class App extends Component { this.defaultTheme = params.get("theme") this.state = { ...defaultState, - loading: true, - error: null, + ...defaultSearchState, stickersPerRow: parseInt(localStorage.mauStickersPerRow || "4"), theme: localStorage.mauStickerThemeOverride || this.defaultTheme, frequentlyUsed: { @@ -101,31 +106,24 @@ class App extends Component { // Search resetSearch() { - this.setState({ searchTerm: defaultState.searchTerm }) + this.setState({ ...defaultSearchState }) } - searchStickers(e) { - if (e.key === "Escape") { - this.resetSearch() - return - } - + searchStickers(searchTerm) { const sanitizeString = s => s.toLowerCase().trim() - const searchTerm = sanitizeString(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({ - filteredPacks: packsWithFilteredStickers.filter(({ stickers }) => !!stickers.length), - searchTerm, - }) + this.setState({ searchTerm, filteredPacks }) } // End search @@ -284,8 +282,10 @@ class App extends Component { render() { const theme = `theme-${this.state.theme}` - const filterActive = !!this.state.searchTerm + + 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`
<${Spinner} size=${80} green />
` @@ -304,9 +304,13 @@ class App extends Component { ${this.state.packs.map(pack => html`<${NavBarItem} id=${pack.id} pack=${pack}/>`)} <${NavBarItem} pack=${{ id: "settings", title: "Settings" }} iconOverride="settings" /> - <${SearchBox} onKeyUp=${this.searchStickers} resetSearch=${this.resetSearch} value=${this.state.searchTerm} /> + <${SearchBox} + value=${this.state.searchTerm} + onSearch=${this.searchStickers} + onReset=${this.resetSearch} + />
this.packListRef = elem}> - ${filterActive && packs.length === 0 ? html`

No stickers match your search

` : null} + ${noPacksForSearch ? html`

No stickers match your search

` : null} ${packs.map(pack => html`<${Pack} id=${pack.id} pack=${pack} send=${this.sendSticker} />`)} <${Settings} app=${this}/>
diff --git a/web/src/search-box.js b/web/src/search-box.js index 13ae3cf..3360d6a 100644 --- a/web/src/search-box.js +++ b/web/src/search-box.js @@ -13,27 +13,71 @@ // // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -import { html } from "../lib/htm/preact.js" +import { html, Component } from "../lib/htm/preact.js" export function shouldAutofocusSearchBar() { return localStorage.mauAutofocusSearchBar === 'true' } -export const SearchBox = ({ onKeyUp, resetSearch, value }) => { - const autofocus = shouldAutofocusSearchBar() +const SEARCHBOX_CLASSNAME = 'search-box' - const className = `icon-display ${value ? 'reset-click-zone' : null}` - const title = value ? 'Click to reset' : null - const onClick = value ? resetSearch : null +export class SearchBox extends Component { + constructor(props) { + super(props) - const iconToDisplay = `icon-${!value ? 'search' : 'reset'}` + this.autofocus = shouldAutofocusSearchBar() + this.value = props.value + this.onSearch = props.onSearch + this.onReset = props.onReset - return html` -
- -
- + this.search = this.search.bind(this) + this.clearSearch = this.clearSearch.bind(this) + } + + componentDidMount() { + // required for firefox / webview usage in mobile clients + const inputInWebView = document.querySelector(`.${SEARCHBOX_CLASSNAME} input`) + if (inputInWebView && this.autofocus) { + inputInWebView.focus() + } + } + + componentWillReceiveProps(props) { + this.value = props.value + } + + search(e) { + if (e.key === "Escape") { + this.clearSearch() + return + } + this.onSearch(e.target.value) + } + + clearSearch() { + this.onReset() + } + + render() { + const isEmpty = !this.value + + const className = `icon-display ${isEmpty ? null : 'reset-click-zone'}` + const title = isEmpty ? null : 'Click to reset' + const onClick = isEmpty ? null : this.clearSearch + const iconToDisplay = `icon-${isEmpty ? 'search' : 'reset'}` + + return html` +
+ +
+ +
-
- ` + ` + } } diff --git a/web/style/index.css b/web/style/index.css index 2cc06bd..726ecdb 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-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-search{--icon-image: url(../res/search.svg)}.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}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;border-radius:.4rem;overflow:hidden}div.search-box input,div.search-box .icon-display{color:var(--text-color);opacity:.5;transition:opacity .1s;background-color:var(--search-box-color)}div.search-box input:focus,div.search-box input:focus+.icon-display,div.search-box .icon-display:focus,div.search-box .icon-display:focus+.icon-display{opacity:1}div.search-box .icon-display{padding:.7rem;width:1rem;height: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 input{flex-grow:1;outline:none;border:none;margin:0;padding:.7rem;padding-right:0;height:1rem;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%} +*{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-search{--icon-image: url(../res/search.svg)}.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}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:focus-within{opacity:1;border:1px solid var(--text-color)}div.search-box:not(:focus-within):hover{opacity:.7}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 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 f760994..1cdb283 100644 --- a/web/style/index.sass +++ b/web/style/index.sass @@ -171,22 +171,32 @@ div.sticker div.search-box display: flex margin: $search-box-input-margin + padding: 0 border-radius: .4rem - overflow: hidden + background-color: var(--search-box-color) + opacity: .5 + transition: all .1s + border: 1px solid transparent + + &:focus-within + opacity: 1 + border: 1px solid var(--text-color) + + &:not(:focus-within):hover + opacity: .7 input,.icon-display color: var(--text-color) - opacity: .5 - transition: opacity .1s - background-color: var(--search-box-color) - - &:focus,&:focus+.icon-display - opacity: 1 + outline: none + border: none + height: $search-box-input-height + margin: 0 + padding: $search-box-input-padding + background-color: transparent + -webkit-tap-highlight-color: transparent .icon-display - padding: $search-box-input-padding width: $search-box-input-height - height: $search-box-input-height &.reset-click-zone cursor: pointer @@ -198,12 +208,6 @@ div.search-box input flex-grow: 1 - outline: none - border: none - margin: 0 - padding: $search-box-input-padding - padding-right: 0 - height: $search-box-input-height font-size: 1rem div.settings-list From a197bda1452d52e768e2c5a32bb4f04dd03eafc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Cocchi?= Date: Sun, 6 Feb 2022 15:53:34 +0100 Subject: [PATCH 5/9] remove autofocus property for android --- web/src/search-box.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/src/search-box.js b/web/src/search-box.js index 3360d6a..5df18e5 100644 --- a/web/src/search-box.js +++ b/web/src/search-box.js @@ -38,7 +38,7 @@ export class SearchBox extends Component { // required for firefox / webview usage in mobile clients const inputInWebView = document.querySelector(`.${SEARCHBOX_CLASSNAME} input`) if (inputInWebView && this.autofocus) { - inputInWebView.focus() + setTimeout(() => inputInWebView.focus(), 100) } } @@ -72,7 +72,6 @@ export class SearchBox extends Component { placeholder="Find stickers …" value=${this.value} onKeyUp=${this.search} - autoFocus=${this.autofocus} />
From e30535a975c298e03aa25d71b81fecb4f6bbf873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Cocchi?= Date: Sun, 6 Feb 2022 16:04:39 +0100 Subject: [PATCH 6/9] ignore autofocus issues on mobiles (disabled by design) --- web/src/search-box.js | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/web/src/search-box.js b/web/src/search-box.js index 5df18e5..cce2032 100644 --- a/web/src/search-box.js +++ b/web/src/search-box.js @@ -19,7 +19,6 @@ export function shouldAutofocusSearchBar() { return localStorage.mauAutofocusSearchBar === 'true' } -const SEARCHBOX_CLASSNAME = 'search-box' export class SearchBox extends Component { constructor(props) { @@ -34,14 +33,6 @@ export class SearchBox extends Component { this.clearSearch = this.clearSearch.bind(this) } - componentDidMount() { - // required for firefox / webview usage in mobile clients - const inputInWebView = document.querySelector(`.${SEARCHBOX_CLASSNAME} input`) - if (inputInWebView && this.autofocus) { - setTimeout(() => inputInWebView.focus(), 100) - } - } - componentWillReceiveProps(props) { this.value = props.value } @@ -67,11 +58,12 @@ export class SearchBox extends Component { const iconToDisplay = `icon-${isEmpty ? 'search' : 'reset'}` return html` -
+
From 26ab8e282199da2646092b49d249646bedcae8e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Cocchi?= Date: Sun, 6 Feb 2022 16:25:38 +0100 Subject: [PATCH 7/9] properly handle mobile devices for autofocus --- web/src/index.js | 16 +++++++++++----- web/src/search-box.js | 18 +++++++++++++++--- web/src/user-agent-detect.js | 18 ++++++++++++++++++ 3 files changed, 44 insertions(+), 8 deletions(-) create mode 100644 web/src/user-agent-detect.js diff --git a/web/src/index.js b/web/src/index.js index 78105b8..7c5efed 100644 --- a/web/src/index.js +++ b/web/src/index.js @@ -15,7 +15,8 @@ // along with this program. If not, see . import { html, render, Component } from "../lib/htm/preact.js" import { Spinner } from "./spinner.js" -import { shouldAutofocusSearchBar, SearchBox } from "./search-box.js" +import { shouldAutofocusSearchBar, shouldDisplayAutofocusSearchBar, SearchBox } from "./search-box.js" +import { checkMobileSafari } from "./user-agent-detect.js" import * as widgetAPI from "./widget-api.js" import * as frequent from "./frequently-used.js" @@ -35,7 +36,12 @@ const makeThumbnailURL = mxc => `${HOMESERVER_URL}/_matrix/media/r0/thumbnail/${ // We need to detect iOS webkit because it has a bug related to scrolling non-fixed divs // This is also used to fix scrolling to sections on Element iOS -const isMobileSafari = navigator.userAgent.match(/(iPod|iPhone|iPad)/) && navigator.userAgent.match(/AppleWebKit/) +const isMobileSafari = checkMobileSafari() + +// We need to detect iOS webkit / Android because autofocusing a field does not open +// the device keyboard by design, making the option obsolete +const shouldAutofocusOption = shouldAutofocusSearchBar() +const displayAutofocusOption = shouldDisplayAutofocusSearchBar() const supportedThemes = ["light", "dark", "black"] @@ -338,14 +344,14 @@ const Settings = ({ app }) => html`
-
+ ${displayAutofocusOption ? html`
Autofocus search bar: app.setAutofocusSearchBar(evt.target.checked)} /> -
+
` : null}
` diff --git a/web/src/search-box.js b/web/src/search-box.js index cce2032..914cdd2 100644 --- a/web/src/search-box.js +++ b/web/src/search-box.js @@ -14,11 +14,15 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . import { html, Component } from "../lib/htm/preact.js" +import { checkMobileSafari, checkAndroid } from "./user-agent-detect.js" -export function shouldAutofocusSearchBar() { - return localStorage.mauAutofocusSearchBar === 'true' +export function shouldDisplayAutofocusSearchBar() { + return !checkMobileSafari() && !checkAndroid() } +export function shouldAutofocusSearchBar() { + return localStorage.mauAutofocusSearchBar === 'true' && shouldDisplayAutofocusSearchBar() +} export class SearchBox extends Component { constructor(props) { @@ -33,6 +37,14 @@ export class SearchBox extends Component { this.clearSearch = this.clearSearch.bind(this) } + componentDidMount() { + // hack required for firefox + const inputInWebView = document.querySelector('.search-box input') + if (inputInWebView && this.autofocus) { + inputInWebView.focus() + } + } + componentWillReceiveProps(props) { this.value = props.value } @@ -63,7 +75,7 @@ export class SearchBox extends Component { placeholder="Find stickers …" value=${this.value} onKeyUp=${this.search} - autofocus=${this.autofocus} + autoFocus=${this.autofocus} />
diff --git a/web/src/user-agent-detect.js b/web/src/user-agent-detect.js new file mode 100644 index 0000000..474a479 --- /dev/null +++ b/web/src/user-agent-detect.js @@ -0,0 +1,18 @@ +export const getUserAgent = () => navigator.userAgent || navigator.vendor || window.opera + +export const checkiOSDevice = () => { + const agent = getUserAgent() + return agent.match(/(iPod|iPhone|iPad)/) +} + +export const checkMobileSafari = () => { + const agent = getUserAgent() + return agent.match(/(iPod|iPhone|iPad)/) && agent.match(/AppleWebKit/) +} + +export const checkAndroid = () => { + const agent = getUserAgent() + return agent.match(/android/i) +} + +export const checkMobileDevice = () => checkiOSDevice() || checkAndroid() From 9b87f7436ff03e083b1b1b0dde780da31e7cb054 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Cocchi?= Date: Sun, 6 Feb 2022 18:41:40 +0100 Subject: [PATCH 8/9] handle focus for iframe --- web/src/search-box.js | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/web/src/search-box.js b/web/src/search-box.js index 914cdd2..dcae44f 100644 --- a/web/src/search-box.js +++ b/web/src/search-box.js @@ -32,16 +32,34 @@ export class SearchBox extends Component { this.value = props.value this.onSearch = props.onSearch this.onReset = props.onReset + this.hasBeenFocused = false + this.focusInput = this.focusInput.bind(this) this.search = this.search.bind(this) this.clearSearch = this.clearSearch.bind(this) } - componentDidMount() { - // hack required for firefox + focusInput() { const inputInWebView = document.querySelector('.search-box input') if (inputInWebView && this.autofocus) { inputInWebView.focus() + this.hasBeenFocused = true + } + } + + componentDidMount() { + this.focusInput() + } + + componentDidUpdate() { + // check if we're in an iframe (Element desktop) + if (window.self !== window.top) { + // check if the iframe is not closed + if (document.querySelector('.search-box').offsetParent === null) { + this.focusInput() + } else { + this.hasBeenFocused = false + } } } From 31cc608a2b4bf6738373fa48b3466f5c7c7378f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Cocchi?= Date: Sun, 6 Feb 2022 19:08:03 +0100 Subject: [PATCH 9/9] use visibility from widget API to autofocus on frame opening when required --- web/src/search-box.js | 31 ++++++++----------------------- web/src/widget-api.js | 10 +++++++--- web/style/index.css | 2 +- web/style/index.sass | 3 +++ 4 files changed, 19 insertions(+), 27 deletions(-) diff --git a/web/src/search-box.js b/web/src/search-box.js index dcae44f..ea50c77 100644 --- a/web/src/search-box.js +++ b/web/src/search-box.js @@ -24,6 +24,13 @@ export function shouldAutofocusSearchBar() { return localStorage.mauAutofocusSearchBar === 'true' && shouldDisplayAutofocusSearchBar() } +export function focusSearchBar() { + const inputInWebView = document.querySelector('.search-box input') + if (inputInWebView && shouldAutofocusSearchBar()) { + inputInWebView.focus() + } +} + export class SearchBox extends Component { constructor(props) { super(props) @@ -32,35 +39,13 @@ export class SearchBox extends Component { this.value = props.value this.onSearch = props.onSearch this.onReset = props.onReset - this.hasBeenFocused = false - this.focusInput = this.focusInput.bind(this) this.search = this.search.bind(this) this.clearSearch = this.clearSearch.bind(this) } - focusInput() { - const inputInWebView = document.querySelector('.search-box input') - if (inputInWebView && this.autofocus) { - inputInWebView.focus() - this.hasBeenFocused = true - } - } - componentDidMount() { - this.focusInput() - } - - componentDidUpdate() { - // check if we're in an iframe (Element desktop) - if (window.self !== window.top) { - // check if the iframe is not closed - if (document.querySelector('.search-box').offsetParent === null) { - this.focusInput() - } else { - this.hasBeenFocused = false - } - } + focusSearchBar() } componentWillReceiveProps(props) { diff --git a/web/src/widget-api.js b/web/src/widget-api.js index fa72165..433aa61 100644 --- a/web/src/widget-api.js +++ b/web/src/widget-api.js @@ -13,6 +13,8 @@ // // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . +import { focusSearchBar } from "./search-box.js" + let widgetId = null window.onmessage = event => { @@ -33,10 +35,12 @@ window.onmessage = event => { widgetId = request.widgetId } - let response + let response = {} - if (request.action === "visibility") { - response = {} + if (request.action === "visibility") { // visibility of the widget changed + if (request.visible) { + focusSearchBar() // we have to re-focus the search bar when appropriate + } } else if (request.action === "capabilities") { response = { capabilities: ["m.sticker"] } } else { diff --git a/web/style/index.css b/web/style/index.css index 726ecdb..9a45fe1 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-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-search{--icon-image: url(../res/search.svg)}.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}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:focus-within{opacity:1;border:1px solid var(--text-color)}div.search-box:not(:focus-within):hover{opacity:.7}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 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%} +*{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-search{--icon-image: url(../res/search.svg)}.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}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:focus-within{opacity:1;border:1px solid var(--text-color)}div.search-box:not(:focus-within):hover{opacity:.7}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 1cdb283..caa7162 100644 --- a/web/style/index.sass +++ b/web/style/index.sass @@ -206,6 +206,9 @@ div.search-box width: $search-box-icon-size height: $search-box-icon-size + .icon-search + opacity: .5 + input flex-grow: 1 font-size: 1rem