Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: pagination/date-separated-list系処理を良い感じに? #8209

Merged
merged 119 commits into from
Jan 13, 2023
Merged
Show file tree
Hide file tree
Changes from 110 commits
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
a1f346a
pages/messaging/messaging-room.vue
tamaina Jan 27, 2022
8a72648
wip
tamaina Jan 27, 2022
c61d6bd
wip
tamaina Jan 27, 2022
6f9ccf6
Merge branch 'develop' into fix-msg-room
tamaina Jan 27, 2022
364ac37
wip???
tamaina Jan 27, 2022
a8af328
wip?
tamaina Jan 27, 2022
dd0d86c
Merge branch 'develop' into fix-msg-room
tamaina Jan 27, 2022
9923cfa
:v:
tamaina Jan 27, 2022
19af8e8
messaaging-room.form.vue rewrite to compositon api
tamaina Jan 27, 2022
4a7f968
refactor
tamaina Jan 27, 2022
410939a
関心事でないのでとりあえず置いておく
tamaina Jan 27, 2022
f660782
:art:
tamaina Jan 27, 2022
60ad28c
:art:
tamaina Jan 27, 2022
7af5562
Merge branch 'develop' into fix-msg-room
tamaina Jan 28, 2022
f0bb08d
i18n.ts
tamaina Jan 28, 2022
1f4d211
fix scroll container find function
tamaina Jan 28, 2022
6fc1043
Merge branch 'fix-msg-room' of https://github.com/misskey-dev/misskey…
tamaina Jan 28, 2022
9825d7c
fix
tamaina Jan 28, 2022
eaaccb5
FIX
tamaina Jan 29, 2022
927317b
Merge branch 'develop' into fix-msg-room
tamaina Feb 1, 2022
edb36d7
Merge branch 'develop' into fix-msg-room
tamaina Feb 1, 2022
8eaf142
:v:
tamaina Feb 1, 2022
9061d33
Merge branch 'develop' into fix-msg-room
tamaina Feb 2, 2022
b88fc1f
Fix scroll bottom detect
tamaina Feb 2, 2022
99d8172
wip
tamaina Feb 2, 2022
90c6f15
aaaaaaaaaaa
tamaina Feb 2, 2022
fa809bb
Merge branch 'develop' into fix-msg-room
tamaina Feb 2, 2022
ba21a29
rename
tamaina Feb 2, 2022
08ae09a
fix
tamaina Feb 2, 2022
de90b25
fix?
tamaina Feb 2, 2022
a2f16c1
:v:
tamaina Feb 2, 2022
a7dd3e9
:v:
tamaina Feb 2, 2022
37f7837
clean up
tamaina Feb 2, 2022
1056380
clena up
tamaina Feb 2, 2022
ddbf8c7
refactor
tamaina Feb 3, 2022
b96e98b
Merge branch 'develop' into fix-msg-room
tamaina Feb 3, 2022
7a4d617
scroll event once or not
tamaina Feb 3, 2022
8913c75
fix
tamaina Feb 4, 2022
af2603e
fix once
tamaina Feb 4, 2022
e6c0313
add safe-area-inset-bottom to spacer
tamaina Mar 4, 2022
b9c2b6d
Merge branch 'develop' into fix-msg-room
tamaina Mar 4, 2022
cc91ee9
Merge branch 'spacer-safe' into fix-msg-room
tamaina Mar 4, 2022
3cabae1
fix
tamaina Mar 4, 2022
11977ea
Merge branch 'spacer-safe' into fix-msg-room
tamaina Mar 4, 2022
3677570
:v:
tamaina Mar 4, 2022
a3fc001
Merge branch 'spacer-safe' into fix-msg-room
tamaina Mar 4, 2022
fbb4ebe
:art:
tamaina Mar 4, 2022
b3f36bc
fix
tamaina Mar 4, 2022
3f73244
Merge branch 'spacer-safe' into fix-msg-room
tamaina Mar 4, 2022
5e9d36e
fix
tamaina Mar 4, 2022
17d71fa
wip
tamaina Mar 5, 2022
6dc9a6c
:v:
tamaina Mar 5, 2022
e41047d
clean up
tamaina Mar 5, 2022
33ab9f1
Merge branch 'develop' into fix-msg-room
tamaina Mar 11, 2022
7ef48fa
Merge branch 'develop' into fix-msg-room
tamaina Mar 27, 2022
dbbc750
Merge branch 'develop' into fix-msg-room
tamaina May 7, 2022
c2c7a06
fix lint
tamaina May 7, 2022
1756d74
Update packages/client/src/components/global/sticky-container.vue
tamaina May 8, 2022
09e515a
Merge branch 'fix-msg-room' of https://github.com/misskey-dev/misskey…
tamaina May 8, 2022
7afbaa1
Update packages/client/src/components/ui/pagination.vue
tamaina May 8, 2022
1cf0167
Merge branch 'fix-msg-room' of https://github.com/misskey-dev/misskey…
tamaina May 8, 2022
27cc8cd
Update packages/client/src/pages/messaging/messaging-room.form.vue
tamaina May 8, 2022
ce4f967
clean up: single line comment
tamaina May 8, 2022
b2c610c
Merge branch 'fix-msg-room' of https://github.com/misskey-dev/misskey…
tamaina May 8, 2022
31563c2
https://github.com/misskey-dev/misskey/pull/8209#discussion_r867386077
tamaina May 8, 2022
a0bf73b
fix
tamaina May 8, 2022
58509ee
asobi → tolerance
tamaina May 8, 2022
e2e0b15
Merge branch 'develop' into fix-msg-room
tamaina May 27, 2022
312e2a0
Merge branch 'develop' into fix-msg-room
tamaina Jun 11, 2022
423d027
Merge branch 'develop' into fix-msg-room
tamaina Jun 19, 2022
dd84145
pick form
tamaina Jun 19, 2022
eebc276
pick message
tamaina Jun 19, 2022
c8bbadd
pick room
tamaina Jun 19, 2022
26b76f2
Merge branch 'msg-room-conp' into fix-msg-room
tamaina Jun 19, 2022
e16c8e7
fix lint
tamaina Jun 19, 2022
802aa04
Merge branch 'msg-room-conp' into fix-msg-room
tamaina Jun 19, 2022
7a91481
fix scroll?
tamaina Jun 19, 2022
6e95bd1
fix scroll.ts
tamaina Jun 19, 2022
4b32469
fix directives/sticky-container
tamaina Jun 19, 2022
9d691da
update global/sticky-container.vue
tamaina Jun 19, 2022
d14cd4a
Merge branch 'msg-room-conp' into fix-msg-room
tamaina Jun 19, 2022
db4319b
fix, :art:
tamaina Jun 19, 2022
7d8674b
Merge branch 'msg-room-conp' into fix-msg-room
tamaina Jun 19, 2022
fcd8d5f
revert merge
tamaina Jun 19, 2022
60acb32
Merge branch 'develop' into fix-msg-room
tamaina Jun 21, 2022
b9b7754
Merge branch 'develop' into fix-msg-room
tamaina Jul 8, 2022
0392600
:v:
tamaina Jul 8, 2022
97fea31
fix lint errors
tamaina Jul 8, 2022
4a8dd92
:art:
tamaina Jul 8, 2022
6564d60
Merge branch 'develop' into fix-msg-room
tamaina Jul 15, 2022
484985a
Update packages/client/src/types/date-separated-list.ts
tamaina Jul 15, 2022
6244406
https://github.com/misskey-dev/misskey/pull/8209#discussion_r917225080
tamaina Jul 15, 2022
6dff6b6
Merge branch 'fix-msg-room' of https://github.com/misskey-dev/misskey…
tamaina Jul 15, 2022
2de1a47
use '
tamaina Jul 15, 2022
ce29f28
Update packages/client/src/scripts/scroll.ts
tamaina Jul 15, 2022
392805d
use Number.EPSILON
tamaina Jul 15, 2022
8cc7115
Merge branch 'fix-msg-room' of https://github.com/misskey-dev/misskey…
tamaina Jul 15, 2022
98b7598
revert
tamaina Jul 15, 2022
81a2564
Merge branch 'develop' into fix-msg-room
tamaina Jul 25, 2022
c0d34b5
fix
tamaina Jul 25, 2022
2e7b320
Merge branch 'develop' into fix-msg-room
tamaina Sep 20, 2022
399bb8a
fix
tamaina Sep 20, 2022
d469701
Merge branch 'develop' into fix-msg-room
tamaina Nov 26, 2022
236cfef
Merge branch 'develop' into fix-msg-room
tamaina Dec 9, 2022
607d258
Use % instead of vh
tamaina Dec 9, 2022
f4d2bb3
:art:
tamaina Dec 9, 2022
f08d454
Merge branch 'develop' into fix-msg-room
tamaina Dec 19, 2022
e9a6053
Merge branch 'develop' into fix-msg-room
tamaina Dec 27, 2022
53a37ca
Merge branch 'develop' into fix-msg-room
tamaina Dec 27, 2022
a8b9881
Merge branch 'develop' into fix-msg-room
tamaina Dec 30, 2022
a4b7806
Merge branch 'develop' into fix-msg-room
tamaina Jan 3, 2023
f27bb90
Merge branch 'develop' into fix-msg-room
tamaina Jan 6, 2023
2b3a4c8
:art:
tamaina Jan 6, 2023
544aa13
:art:
tamaina Jan 6, 2023
ce1941d
Merge branch 'develop' into fix-msg-room
tamaina Jan 10, 2023
d06ce61
wip
tamaina Jan 10, 2023
0db6eba
wip
tamaina Jan 10, 2023
166b663
Merge branch 'develop' into fix-msg-room
tamaina Jan 10, 2023
86f13a4
css modules
tamaina Jan 10, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
60 changes: 49 additions & 11 deletions packages/frontend/src/components/MkDateSeparatedList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ import { defineComponent, h, PropType, TransitionGroup } from 'vue';
import MkAd from '@/components/global/MkAd.vue';
import { i18n } from '@/i18n';
import { defaultStore } from '@/store';
import { MisskeyEntity } from '@/types/date-separated-list';

export default defineComponent({
props: {
items: {
type: Array as PropType<{ id: string; createdAt: string; _shouldInsertAd_: boolean; }[]>,
type: Array as PropType<MisskeyEntity[]>,
required: true,
},
direction: {
Expand Down Expand Up @@ -90,16 +91,30 @@ export default defineComponent({
}
});

function onBeforeLeave(el: HTMLElement) {
el.style.top = `${el.offsetTop}px`;
el.style.left = `${el.offsetLeft}px`;
}
function onLeaveCanceled(el: HTMLElement) {
el.style.top = '';
el.style.left = '';
}

return () => h(
defaultStore.state.animation ? TransitionGroup : 'div',
defaultStore.state.animation ? {
class: 'sqadhkmv' + (props.noGap ? ' noGap' : ''),
name: 'list',
tag: 'div',
'data-direction': props.direction,
'data-reversed': props.reversed ? 'true' : 'false',
} : {
class: 'sqadhkmv' + (props.noGap ? ' noGap' : ''),
{
class: {
'sqadhkmv': true,
'noGap': props.noGap
},
'data-direction': props.direction,
'data-reversed': props.reversed ? 'true' : 'false',
...(defaultStore.state.animation ? {
name: 'list',
tag: 'div',
onBeforeLeave,
onLeaveCanceled,
} : {}),
},
{ default: renderChildren });
},
Expand All @@ -108,6 +123,7 @@ export default defineComponent({

<style lang="scss">
.sqadhkmv {
display: flex;
tamaina marked this conversation as resolved.
Show resolved Hide resolved
container-type: inline-size;

> *:empty {
Expand All @@ -122,24 +138,46 @@ export default defineComponent({
transition: transform 0.7s cubic-bezier(0.23, 1, 0.32, 1);
}

&.deny-move-transition > .list-move {
transition: none !important;
}

> .list-leave-active,
> .list-enter-active {
transition: transform 0.7s cubic-bezier(0.23, 1, 0.32, 1), opacity 0.7s cubic-bezier(0.23, 1, 0.32, 1);
}

> .list-leave-from,
> .list-leave-to,
> .list-leave-active {
transition: transform 0.7s cubic-bezier(0.23, 1, 0.32, 1), opacity 0.7s cubic-bezier(0.23, 1, 0.32, 1);
position: absolute !important;
}

&[data-direction="up"] {
> .list-enter-from {
> .list-enter-from,
> .list-leave-to {
opacity: 0;
transform: translateY(64px);
}
}

&[data-direction="down"] {
> .list-enter-from {
> .list-enter-from,
> .list-leave-to {
opacity: 0;
transform: translateY(-64px);
}
}

&[data-reversed="true"] {
flex-direction: column-reverse;
}

&[data-reversed="false"] {
flex-direction: column;
}

> .separator {
text-align: center;

Expand Down
11 changes: 10 additions & 1 deletion packages/frontend/src/components/MkNotes.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,16 @@

<template #default="{ items: notes }">
<div class="giivymft" :class="{ noGap }">
<XList ref="notes" v-slot="{ item: note }" :items="notes" :direction="pagination.reversed ? 'up' : 'down'" :reversed="pagination.reversed" :no-gap="noGap" :ad="true" class="notes">
<XList
ref="notes"
v-slot="{ item: note }"
:items="notes"
:direction="pagination.reversed ? 'up' : 'down'"
:reversed="pagination.reversed"
:no-gap="noGap"
:ad="true"
class="notes"
>
<XNote :key="note._featuredId_ || note._prId_ || note.id" class="qtqtichx" :note="note"/>
</XList>
</div>
Expand Down