From 6152fd20bf01ec97758a807f747ebf5939903f47 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 8 Jun 2018 21:37:20 +0900 Subject: [PATCH] Improve deck --- .../desktop/views/pages/deck/deck.notes.vue | 2 +- .../views/pages/deck/deck.notifications.vue | 52 ++++++++++++++++++- 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/src/client/app/desktop/views/pages/deck/deck.notes.vue b/src/client/app/desktop/views/pages/deck/deck.notes.vue index 1ccacea908..1f1ca6ad5e 100644 --- a/src/client/app/desktop/views/pages/deck/deck.notes.vue +++ b/src/client/app/desktop/views/pages/deck/deck.notes.vue @@ -31,7 +31,7 @@ import Vue from 'vue'; import XNote from './deck.note.vue'; -const displayLimit = 30; +const displayLimit = 20; export default Vue.extend({ components: { diff --git a/src/client/app/desktop/views/pages/deck/deck.notifications.vue b/src/client/app/desktop/views/pages/deck/deck.notifications.vue index 31a3673dd3..afe2cd1cbd 100644 --- a/src/client/app/desktop/views/pages/deck/deck.notifications.vue +++ b/src/client/app/desktop/views/pages/deck/deck.notifications.vue @@ -21,20 +21,27 @@ import Vue from 'vue'; import XNotification from './deck.notification.vue'; +const displayLimit = 20; + export default Vue.extend({ components: { XNotification }, + + inject: ['column', 'isScrollTop', 'count'], + data() { return { fetching: true, fetchingMoreNotifications: false, notifications: [], + queue: [], moreNotifications: false, connection: null, connectionId: null }; }, + computed: { _notifications(): any[] { return (this.notifications as any).map(notification => { @@ -46,12 +53,22 @@ export default Vue.extend({ }); } }, + + watch: { + queue(q) { + this.count(q.length); + } + }, + mounted() { this.connection = (this as any).os.stream.getConnection(); this.connectionId = (this as any).os.stream.use(); this.connection.on('notification', this.onNotification); + this.column.$on('top', this.onTop); + this.column.$on('bottom', this.onBottom); + const max = 10; (this as any).api('i/notifications', { @@ -66,10 +83,15 @@ export default Vue.extend({ this.fetching = false; }); }, + beforeDestroy() { this.connection.off('notification', this.onNotification); (this as any).os.stream.dispose(this.connectionId); + + this.column.$off('top', this.onTop); + this.column.$off('bottom', this.onBottom); }, + methods: { fetchMoreNotifications() { this.fetchingMoreNotifications = true; @@ -90,6 +112,7 @@ export default Vue.extend({ this.fetchingMoreNotifications = false; }); }, + onNotification(notification) { // TODO: ユーザーが画面を見てないと思われるとき(ブラウザやタブがアクティブじゃないなど)は送信しない this.connection.send({ @@ -97,7 +120,34 @@ export default Vue.extend({ id: notification.id }); - this.notifications.unshift(notification); + this.prepend(notification); + }, + + prepend(notification) { + if (this.isScrollTop()) { + // Prepend the notification + this.notifications.unshift(notification); + + // オーバーフローしたら古い通知は捨てる + if (this.notifications.length >= displayLimit) { + this.notifications = this.notifications.slice(0, displayLimit); + } + } else { + this.queue.push(notification); + } + }, + + releaseQueue() { + this.queue.forEach(n => this.prepend(n)); + this.queue = []; + }, + + onTop() { + this.releaseQueue(); + }, + + onBottom() { + this.fetchMoreNotifications(); } } });