Improved search layout: scrolling, mobile

This commit is contained in:
Silvio Giebl 2019-12-04 10:39:30 +01:00
parent 9d24b14ba1
commit 1d1564e5c0
3 changed files with 44 additions and 23 deletions

View File

@ -162,6 +162,7 @@
body { body {
position: relative; position: relative;
padding-bottom: $sp-10; padding-bottom: $sp-10;
overflow-y: scroll;
@include mq(md) { @include mq(md) {
position: static; position: static;

View File

@ -7,27 +7,25 @@
z-index: 2; z-index: 2;
flex-grow: 1; flex-grow: 1;
height: $sp-10; height: $sp-10;
padding-top: $sp-2; padding: $sp-2;
padding-bottom: $sp-2; transition: padding linear 100ms;
@include mq(md) { @include mq(md) {
max-width: $search-results-width; position: relative !important;
height: 100%; width: auto !important;
padding-top: 0; height: 100% !important;
padding-bottom: 0; padding: 0;
transition: none;
} }
} }
.search-input-wrap { .search-input-wrap {
position: relative; position: relative;
height: 100%; height: $sp-8;
margin-right: $sp-2; transition: height linear 100ms;
margin-left: $sp-2;
transition: margin linear 100ms;
@include mq(md) { @include mq(md) {
margin-right: 0; height: 100% !important;
margin-left: 0;
transition: none; transition: none;
} }
} }
@ -47,15 +45,17 @@
border-left: 0; border-left: 0;
border-radius: $border-radius; border-radius: $border-radius;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.12), 0 3px 10px rgba(0, 0, 0, 0.08); box-shadow: 0 1px 2px rgba(0, 0, 0, 0.12), 0 3px 10px rgba(0, 0, 0, 0.08);
transition: width ease 200ms;
@include fs-4; @include fs-4;
@include mq(md) { @include mq(md) {
max-width: $search-results-width; max-width: $search-results-width;
padding-top: $gutter-spacing-sm;
padding-left: #{$gutter-spacing + $sp-5}; padding-left: #{$gutter-spacing + $sp-5};
padding-bottom: $gutter-spacing-sm;
background-color: $body-background-color; background-color: $body-background-color;
border-radius: 0; border-radius: 0;
box-shadow: none; box-shadow: none;
transition: width ease 200ms;
@include fs-3; @include fs-3;
} }
@ -88,9 +88,10 @@
.search-results { .search-results {
position: absolute; position: absolute;
left: 0;
display: none; display: none;
width: 100%; width: 100%;
max-height: calc(100vh - 100%); max-height: calc(100% - #{$sp-10});
overflow-y: auto; overflow-y: auto;
background: $search-background-color; background: $search-background-color;
border-bottom-right-radius: $border-radius; border-bottom-right-radius: $border-radius;
@ -99,6 +100,7 @@
@include mq(md) { @include mq(md) {
width: $search-results-width; width: $search-results-width;
max-height: calc(100vh - 200%) !important;
} }
} }
@ -213,11 +215,17 @@
} }
.search-active { .search-active {
overflow: hidden; .search {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
padding: 0;
}
.search-input-wrap { .search-input-wrap {
margin-right: 0; height: $sp-10;
margin-left: 0;
} }
.search-input { .search-input {
@ -239,4 +247,13 @@
opacity: 1; opacity: 1;
transition: opacity ease 200ms, width 0s, height 0s; transition: opacity ease 200ms, width 0s, height 0s;
} }
@include mq(md) {
.main {
position: absolute;
height: 100vh;
width: 100vw;
overflow: hidden;
}
}
} }

View File

@ -112,13 +112,17 @@ function initSearch() {
var searchInput = document.getElementById('search-input'); var searchInput = document.getElementById('search-input');
var searchResults = document.getElementById('search-results'); var searchResults = document.getElementById('search-results');
function hideResults() { function clearResults() {
searchResults.innerHTML = ''; searchResults.innerHTML = '';
document.body.classList.remove('search-active'); hideResults();
}
function hideResults() {
document.documentElement.classList.remove('search-active');
} }
function update() { function update() {
hideResults(); clearResults();
var input = searchInput.value; var input = searchInput.value;
if (input === '') { if (input === '') {
@ -136,8 +140,7 @@ function initSearch() {
}); });
if (results.length > 0) { if (results.length > 0) {
window.scroll(0, window.scrollY + searchInput.getBoundingClientRect().top); document.documentElement.classList.add('search-active');
document.body.classList.add('search-active');
var resultsList = document.createElement('ul'); var resultsList = document.createElement('ul');
resultsList.classList.add('search-results-list'); resultsList.classList.add('search-results-list');
@ -242,7 +245,7 @@ function initSearch() {
jtd.addEvent(searchInput, 'keyup', function(e){ jtd.addEvent(searchInput, 'keyup', function(e){
switch (e.keyCode) { switch (e.keyCode) {
case 27: // When esc key is pressed, hide the results and clear the field case 27: // When esc key is pressed, hide the results and clear the field
hideResults(); clearResults();
searchInput.value = ''; searchInput.value = '';
return; return;
case 38: // arrow up case 38: // arrow up