natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 🐛 fix scroll

This commit is contained in:
ThatOneCalculator 2022-08-18 17:23:32 -07:00
parent dda8655ca3
commit 93cdf4313e
2 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "misskey", "name": "misskey",
"version": "12.118.1-calc.9", "version": "12.118.1-calc.9.3",
"codename": "aqua", "codename": "aqua",
"repository": { "repository": {
"type": "git", "type": "git",

48
packages/client/src/ui/universal.vue
View File

@ -116,22 +116,6 @@ mainRouter.on('change', () => {
document.documentElement.style.overflowY = 'scroll'; document.documentElement.style.overflowY = 'scroll';
let timer = -1;
const postButton = document.getElementById('postButton');
window.addEventListener('scroll', () => {
if (timer !== -1) {
if (postButton != null) {
postButton.style.transform = 'scale(0)';
}
clearTimeout(timer);
}
timer = setTimeout(() => {
if (postButton != null) {
postButton.style.transform = 'scale(1)';
}
}, 150);
}, false);
if (defaultStore.state.widgets.length === 0) { if (defaultStore.state.widgets.length === 0) {
defaultStore.set('widgets', [{ defaultStore.set('widgets', [{
name: 'calendar', name: 'calendar',
@ -153,7 +137,7 @@ onMounted(() => {
} }
}); });
const onContextmenu = (ev) => { const onContextmenu = (ev: MouseEvent) => {
const isLink = (el: HTMLElement) => { const isLink = (el: HTMLElement) => {
if (el.tagName === 'A') return true; if (el.tagName === 'A') return true;
if (el.parentElement) { if (el.parentElement) {
@ -176,7 +160,7 @@ const onContextmenu = (ev) => {
}], ev); }], ev);
}; };
const attachSticky = (el) => { const attachSticky = (el: any) => {
const sticky = new StickySidebar(widgetsEl); const sticky = new StickySidebar(widgetsEl);
window.addEventListener('scroll', () => { window.addEventListener('scroll', () => {
sticky.calc(window.scrollY); sticky.calc(window.scrollY);
@ -187,8 +171,26 @@ function top() {
window.scroll({ top: 0, behavior: 'smooth' }); window.scroll({ top: 0, behavior: 'smooth' });
} }
let scrollPos = 0;
const postButton = document.querySelector<HTMLElement>('.postButton');
function checkPosition() {
let windowY = window.scrollY;
if (postButton != null) {
if (windowY < scrollPos) {
postButton.style.transform = 'scale(1)';
} else {
postButton.style.transform = 'scale(0)';
}
}
scrollPos = windowY;
}
window.addEventListener('scroll', checkPosition);
const wallpaper = localStorage.getItem('wallpaper') != null; const wallpaper = localStorage.getItem('wallpaper') != null;
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -302,7 +304,15 @@ const wallpaper = localStorage.getItem('wallpaper') != null;
border-radius: 10px; border-radius: 10px;
box-shadow: var(--shadow) 0px 0px 25px; box-shadow: var(--shadow) 0px 0px 25px;
transition: background 0.6s; transition: background 0.6s;
transition: 0.3s; transition: transform 0.3s;
> .isHidden {
transform: scale(0);
}
> .isVisible {
transform: scale(1);
}
&:active { &:active {
background-color: var(--accentedBg); background-color: var(--accentedBg);