mystiq/hydrogen-web
Archived
4
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename replyTextTile -> replyTile

Browse source
This commit is contained in:
RMidhunSuresh 2022-01-06 22:38:37 +05:30
parent 086e0c0320
commit 7f91653208
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/domain/session/room/timeline/tiles/BaseMessageTile.js
View file

@ -24,7 +24,7 @@ export class BaseMessageTile extends SimpleTile {
this._date = this._entry.timestamp ? new Date(this._entry.timestamp) : null;
this._isContinuation = false;
this._reactions = null;
this._replyTextTile = null;
this._replyTile = null;
if (this._entry.annotations || this._entry.pendingAnnotations) {
this._updateReactions();
}
@ -216,16 +216,16 @@ export class BaseMessageTile extends SimpleTile {
}
}
get replyTextTile() {
get replyTile() {
if (!this._entry.contextEventId) {
return null;
}
if (!this._replyTextTile) {
if (!this._replyTile) {
const entry = this._entry.contextEntry;
if (entry) {
this._replyTextTile = this._tileCreator(entry);
this._replyTile = this._tileCreator(entry);
}
}
return this._replyTextTile;
return this._replyTile;
}
}

4
src/domain/session/room/timeline/tiles/SimpleTile.js
View file

@ -97,9 +97,9 @@ export class SimpleTile extends ViewModel {
const replyEntry = param?.reply ?? entry.contextEntry;
if (replyEntry) {
// this is an update to contextEntry used for replyPreview
const action = this._replyTextTile?.updateEntry(replyEntry);
const action = this._replyTile?.updateEntry(replyEntry);
if (action?.shouldReplace) {
this._replyTextTile = this._tileCreator(replyEntry);
this._replyTile = this._tileCreator(replyEntry);
}
}
const renderedAsRedacted = this.shape === "redacted";

8
src/platform/web/ui/session/room/timeline/TextMessageView.js
View file

@ -26,13 +26,13 @@ export class TextMessageView extends BaseMessageView {
"Timeline_messageBody": true,
statusMessage: vm => vm.shape === "message-status",
}
}, t.mapView(vm => vm.replyTextTile, replyTextTile => {
if (vm.isReply && !replyTextTile) {
}, t.mapView(vm => vm.replyTile, replyTile => {
if (vm.isReply && !replyTile) {
return new ReplyPreviewError();
}
else if (replyTextTile && !this._isReplyPreview) {
else if (replyTile && !this._isReplyPreview) {
// if this._isReplyPreview = true, this is already a reply preview, don't nest replies for now.
return new ReplyPreviewView(replyTextTile);
return new ReplyPreviewView(replyTile);
}
else {
return null;