Fix borked appbar shadow
This commit is contained in:
parent
0c00dbece9
commit
4603851e0d
@ -124,6 +124,10 @@ export function AllImagesView(vm, params, key, { appbar }) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function handleContentScroll(evt) {
|
||||||
|
appbar.companionScrollTop(evt.target.scrollTop);
|
||||||
|
}
|
||||||
|
|
||||||
function pushAppBarState() {
|
function pushAppBarState() {
|
||||||
const up = selectMode()
|
const up = selectMode()
|
||||||
? {
|
? {
|
||||||
@ -172,8 +176,7 @@ export function AllImagesView(vm, params, key, { appbar }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return function() {
|
return function() {
|
||||||
return el(
|
return scrollView(
|
||||||
'div',
|
|
||||||
{
|
{
|
||||||
onclick: {
|
onclick: {
|
||||||
'.photoSelect .icon svg path': toggleSelect,
|
'.photoSelect .icon svg path': toggleSelect,
|
||||||
@ -181,7 +184,8 @@ export function AllImagesView(vm, params, key, { appbar }) {
|
|||||||
'.albumSelectButton .icon': toggleAll,
|
'.albumSelectButton .icon': toggleAll,
|
||||||
'.albumSelectButton .icon svg path': toggleAll,
|
'.albumSelectButton .icon svg path': toggleAll,
|
||||||
'.photoOverlay': photoClick
|
'.photoOverlay': photoClick
|
||||||
}
|
},
|
||||||
|
onscroll: handleContentScroll
|
||||||
},
|
},
|
||||||
sections().map(renderSection)
|
sections().map(renderSection)
|
||||||
);
|
);
|
||||||
@ -194,3 +198,7 @@ const trashButtonContainer = styled(
|
|||||||
},
|
},
|
||||||
CLICKABLE
|
CLICKABLE
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const scrollView = styled({
|
||||||
|
overflow: 'scroll'
|
||||||
|
});
|
||||||
|
|||||||
@ -40,10 +40,12 @@ export function AppBarView(vm, params, key, opts) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function pushState(newState) {
|
function pushState(newState) {
|
||||||
|
companionScrollTop(0);
|
||||||
stateStack.unshift(Object.assign({ _seq: seq++ }, newState));
|
stateStack.unshift(Object.assign({ _seq: seq++ }, newState));
|
||||||
}
|
}
|
||||||
|
|
||||||
function popState(navigateTo) {
|
function popState(navigateTo) {
|
||||||
|
companionScrollTop(0);
|
||||||
stateStack.shift();
|
stateStack.shift();
|
||||||
if (navigateTo) {
|
if (navigateTo) {
|
||||||
router.goto(navigateTo);
|
router.goto(navigateTo);
|
||||||
|
|||||||
@ -39,8 +39,7 @@ export function GalleryView(vm) {
|
|||||||
function renderMain() {
|
function renderMain() {
|
||||||
return [
|
return [
|
||||||
iv(appbar),
|
iv(appbar),
|
||||||
content(
|
content([
|
||||||
{ onscroll: handleContentScroll },
|
|
||||||
renderSwitch(
|
renderSwitch(
|
||||||
{
|
{
|
||||||
photos: [AllImagesView, {}, 'allImages', context],
|
photos: [AllImagesView, {}, 'allImages', context],
|
||||||
@ -48,7 +47,7 @@ export function GalleryView(vm) {
|
|||||||
},
|
},
|
||||||
routeName()
|
routeName()
|
||||||
)
|
)
|
||||||
)
|
])
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user