mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2024-11-20 11:36:24 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #249 from vector-im/bwindels/ui-sent-status

Browse Source 
show message already as black when sent but no remote echo yet
This commit is contained in:
Bruno Windels 2021-03-03 13:08:46 +00:00 committed by GitHub
commit 961d0cb224
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/domain/session/room/timeline/tiles/SimpleTile.js
View File

@ -16,6 +16,7 @@ limitations under the License.
import {UpdateAction} from "../UpdateAction.js";
import {ViewModel} from "../../../../ViewModel.js";
import {SendStatus} from "../../../../../matrix/room/sending/PendingEvent.js";
export class SimpleTile extends ViewModel {
constructor(options) {
@ -47,6 +48,10 @@ export class SimpleTile extends ViewModel {
return this._entry.isPending;
}
get isUnsent() {
return this._entry.isPending && this._entry.status !== SendStatus.Sent;
}
abortSending() {
this._entry.pendingEvent?.abort();
}

2
src/platform/web/ui/css/themes/bubbles/theme.css
View File

@ -159,7 +159,7 @@ a {
margin-left: auto;
}
.TextMessageView.pending .message-container {
.TextMessageView.unsent .message-container {
background-color: #333;
}

2
src/platform/web/ui/css/themes/element/theme.css
View File

@ -624,7 +624,7 @@ only loads when the top comes into view*/
align-self: start;
}
.TextMessageView.pending .message-container {
.TextMessageView.unsent .message-container {
color: #ccc;
}

2
src/platform/web/ui/session/room/timeline/common.js
View File

@ -21,7 +21,7 @@ export function renderMessage(t, vm, children) {
const classes = {
"TextMessageView": true,
own: vm.isOwn,
pending: vm.isPending,
unsent: vm.isUnsent,
unverified: vm.isUnverified,
continuation: vm => vm.isContinuation,
messageStatus: vm => vm.shape === "message-status" || vm.shape === "missing-attachment" || vm.shape === "file",