From 5f65c3555f73f803f3db4b2e59f7db37ea2ddae7 Mon Sep 17 00:00:00 2001 From: ear-dev Date: Tue, 17 Mar 2020 14:41:06 -0400 Subject: [PATCH] Revert "Fix jump to message in mobile view" --- app/mentions-flextab/client/actionButton.js | 2 +- app/message-pin/client/actionButton.js | 8 ++++---- app/message-star/client/actionButton.js | 2 +- app/search/client/provider/result.js | 2 +- .../client/imports/components/sidebar/rooms-list.css | 3 +-- .../client/imports/components/sidebar/sidebar-header.css | 5 ++++- app/ui-utils/client/lib/RoomHistoryManager.js | 2 ++ app/ui/client/views/app/room.js | 4 +--- client/startup/offlineMessages.js | 6 +++--- 9 files changed, 18 insertions(+), 16 deletions(-) diff --git a/app/mentions-flextab/client/actionButton.js b/app/mentions-flextab/client/actionButton.js index 375a7e2f3c55..1e68f74d7ed5 100644 --- a/app/mentions-flextab/client/actionButton.js +++ b/app/mentions-flextab/client/actionButton.js @@ -13,7 +13,7 @@ Meteor.startup(function() { action() { const { msg: message } = messageArgs(this); if (window.matchMedia('(max-width: 500px)').matches) { - Template.currentData().instance.tabBar.close(); + Template.instance().tabBar.close(); } RoomHistoryManager.getSurroundingMessages(message, 50); }, diff --git a/app/message-pin/client/actionButton.js b/app/message-pin/client/actionButton.js index 5ff39db9c5de..c3e5ab9a065d 100644 --- a/app/message-pin/client/actionButton.js +++ b/app/message-pin/client/actionButton.js @@ -5,7 +5,7 @@ import toastr from 'toastr'; import { RoomHistoryManager, MessageAction } from '../../ui-utils'; import { messageArgs } from '../../ui-utils/client/lib/messageArgs'; -import { handleError } from '../../utils'; +import { handleError, isMobile } from '../../utils'; import { settings } from '../../settings'; import { hasAtLeastOnePermission } from '../../authorization'; @@ -68,12 +68,12 @@ Meteor.startup(function() { action() { const { msg: message } = messageArgs(this); if (window.matchMedia('(max-width: 500px)').matches) { - Template.currentData().instance.tabBar.close(); + Template.instance().tabBar.close(); } return RoomHistoryManager.getSurroundingMessages(message, 50); }, - condition({ msg, subscription }) { - return msg.pinned && !!subscription; + condition({ subscription }) { + return !!subscription && !isMobile(); }, order: 100, group: 'menu', diff --git a/app/message-star/client/actionButton.js b/app/message-star/client/actionButton.js index cddeea0ff9ee..bdb86a5530b7 100644 --- a/app/message-star/client/actionButton.js +++ b/app/message-star/client/actionButton.js @@ -67,7 +67,7 @@ Meteor.startup(function() { action() { const { msg: message } = messageArgs(this); if (window.matchMedia('(max-width: 500px)').matches) { - Template.currentData().instance.tabBar.close(); + Template.instance().tabBar.close(); } RoomHistoryManager.getSurroundingMessages(message, 50); }, diff --git a/app/search/client/provider/result.js b/app/search/client/provider/result.js index 957fd3358bde..0f1714135e80 100644 --- a/app/search/client/provider/result.js +++ b/app/search/client/provider/result.js @@ -33,7 +33,7 @@ Meteor.startup(function() { // RocketChat.MessageAction.hideDropDown(); if (window.matchMedia('(max-width: 500px)').matches) { - Template.currentData().instance.tabBar.close(); + Template.instance().tabBar.close(); } window.setTimeout(() => { diff --git a/app/theme/client/imports/components/sidebar/rooms-list.css b/app/theme/client/imports/components/sidebar/rooms-list.css index 2354e6e92d6b..ce99e737f4a5 100644 --- a/app/theme/client/imports/components/sidebar/rooms-list.css +++ b/app/theme/client/imports/components/sidebar/rooms-list.css @@ -57,9 +57,8 @@ @media (width <= 500px) { .rooms-list { &__type { - padding: 0 var(--sidebar-small-default-padding) 1rem var(--sidebar-small-default-padding); - font-size: var(--rooms-list-title-text-size-mobile); + padding: 0 var(--sidebar-small-default-padding) 1rem var(--sidebar-small-default-padding); } &__empty-room { diff --git a/app/theme/client/imports/components/sidebar/sidebar-header.css b/app/theme/client/imports/components/sidebar/sidebar-header.css index 0aeda3c099d7..98f06aea321d 100644 --- a/app/theme/client/imports/components/sidebar/sidebar-header.css +++ b/app/theme/client/imports/components/sidebar/sidebar-header.css @@ -87,6 +87,10 @@ width: 200px; & .rc-input__element { + background-color: var(--sidebar-background); + border-color: #81868d; + border-radius: 15px; + color: var(--color-white); border-color: var(--rc-color-primary-dark); background-color: var(--rc-color-primary-darkest); @@ -163,7 +167,6 @@ @media (width <= 500px) { .sidebar__header { padding: var(--sidebar-small-default-padding); - &-thumb { flex: 0 0 var(--sidebar-account-thumb-size-mobile); diff --git a/app/ui-utils/client/lib/RoomHistoryManager.js b/app/ui-utils/client/lib/RoomHistoryManager.js index 710d1e0bca23..74db81866dc8 100644 --- a/app/ui-utils/client/lib/RoomHistoryManager.js +++ b/app/ui-utils/client/lib/RoomHistoryManager.js @@ -250,11 +250,13 @@ export const RoomHistoryManager = new class { } const room = this.getRoom(message.rid); room.isLoading.set(true); + ChatMessage.remove({ rid: message.rid }); let typeName = undefined; const subscription = ChatSubscription.findOne({ rid: message.rid }); if (subscription) { + // const { ls } = subscription; typeName = subscription.t + subscription.name; } else { const curRoomDoc = ChatRoom.findOne({ _id: message.rid }); diff --git a/app/ui/client/views/app/room.js b/app/ui/client/views/app/room.js index f3266a3553a7..f5785c4a4dbb 100644 --- a/app/ui/client/views/app/room.js +++ b/app/ui/client/views/app/room.js @@ -96,9 +96,7 @@ const showMessageActions = (e, outerContext) => { }; const mountPopover = (e, i, outerContext) => { - let context = $(e.target).parents('.message').data('context') - || ($(e.target).parents('.message').hasClass('mentions') && 'mentions'); - + let context = $(e.target).parents('.message').data('context'); if (!context) { context = 'message'; } diff --git a/client/startup/offlineMessages.js b/client/startup/offlineMessages.js index 3ea449400691..8ce9ca1108d8 100644 --- a/client/startup/offlineMessages.js +++ b/client/startup/offlineMessages.js @@ -123,7 +123,7 @@ const retainMessages = (rid, messages) => { const roomMsgs = messages.filter((msg) => rid === msg.rid); const limit = parseInt(getConfig('roomListLimit')) || 50; const retain = sortBy(roomMsgs.filter((msg) => !msg.temp), 'ts').reverse().slice(0, limit); - retain.push(...roomMsgs.filter((msg) => msg.temp)); + retain.push(...messages.filter((msg) => rid === msg.rid && msg.temp)); return retain; }; @@ -141,7 +141,7 @@ function clearOldMessages({ records: messages, ...value }) { }); } -const cleanMessagesAtStartup = () => { +const clearOldMessageAtStartup = () => { localforage.getItem('chatMessage').then((value) => { if (value && value.records) { clearOldMessages(value); @@ -149,4 +149,4 @@ const cleanMessagesAtStartup = () => { }); }; -callbacks.add('afterMainReady', cleanMessagesAtStartup, callbacks.priority.MEDIUM, 'cleanMessagesAtStartup'); +callbacks.add('afterMainReady', clearOldMessageAtStartup, callbacks.priority.LOW, 'clearOldMessageAtStartup');