Fix borked appbar shadow

This commit is contained in:
Timothy Farrell 2017-12-31 14:56:37 -06:00
parent 0c00dbece9
commit 4603851e0d
3 changed files with 15 additions and 6 deletions

View File

@ -124,6 +124,10 @@ export function AllImagesView(vm, params, key, { appbar }) {
}
}
function handleContentScroll(evt) {
appbar.companionScrollTop(evt.target.scrollTop);
}
function pushAppBarState() {
const up = selectMode()
? {
@ -172,8 +176,7 @@ export function AllImagesView(vm, params, key, { appbar }) {
}
return function() {
return el(
'div',
return scrollView(
{
onclick: {
'.photoSelect .icon svg path': toggleSelect,
@ -181,7 +184,8 @@ export function AllImagesView(vm, params, key, { appbar }) {
'.albumSelectButton .icon': toggleAll,
'.albumSelectButton .icon svg path': toggleAll,
'.photoOverlay': photoClick
}
},
onscroll: handleContentScroll
},
sections().map(renderSection)
);
@ -194,3 +198,7 @@ const trashButtonContainer = styled(
},
CLICKABLE
);
const scrollView = styled({
overflow: 'scroll'
});

View File

@ -40,10 +40,12 @@ export function AppBarView(vm, params, key, opts) {
}
function pushState(newState) {
companionScrollTop(0);
stateStack.unshift(Object.assign({ _seq: seq++ }, newState));
}
function popState(navigateTo) {
companionScrollTop(0);
stateStack.shift();
if (navigateTo) {
router.goto(navigateTo);

View File

@ -39,8 +39,7 @@ export function GalleryView(vm) {
function renderMain() {
return [
iv(appbar),
content(
{ onscroll: handleContentScroll },
content([
renderSwitch(
{
photos: [AllImagesView, {}, 'allImages', context],
@ -48,7 +47,7 @@ export function GalleryView(vm) {
},
routeName()
)
)
])
];
}