You've already forked matrix-react-sdk
mirror of
https://github.com/matrix-org/matrix-react-sdk.git
synced 2025-11-07 10:46:24 +03:00
Fix bubble radius wrong when followed by a state event from same user (#7393)
This commit is contained in:
committed by
GitHub
parent
4a9173a7f1
commit
314475985c
@@ -50,6 +50,7 @@ import TileErrorBoundary from '../views/messages/TileErrorBoundary';
|
|||||||
import { RoomPermalinkCreator } from "../../utils/permalinks/Permalinks";
|
import { RoomPermalinkCreator } from "../../utils/permalinks/Permalinks";
|
||||||
import EditorStateTransfer from "../../utils/EditorStateTransfer";
|
import EditorStateTransfer from "../../utils/EditorStateTransfer";
|
||||||
import { Action } from '../../dispatcher/actions';
|
import { Action } from '../../dispatcher/actions';
|
||||||
|
import { getEventDisplayInfo } from "../../utils/EventUtils";
|
||||||
|
|
||||||
const CONTINUATION_MAX_INTERVAL = 5 * 60 * 1000; // 5 minutes
|
const CONTINUATION_MAX_INTERVAL = 5 * 60 * 1000; // 5 minutes
|
||||||
const continuedTypes = [EventType.Sticker, EventType.RoomMessage];
|
const continuedTypes = [EventType.Sticker, EventType.RoomMessage];
|
||||||
@@ -724,7 +725,8 @@ export default class MessagePanel extends React.Component<IProps, IState> {
|
|||||||
let lastInSection = true;
|
let lastInSection = true;
|
||||||
if (nextEventWithTile) {
|
if (nextEventWithTile) {
|
||||||
willWantDateSeparator = this.wantsDateSeparator(mxEv, nextEventWithTile.getDate() || new Date());
|
willWantDateSeparator = this.wantsDateSeparator(mxEv, nextEventWithTile.getDate() || new Date());
|
||||||
lastInSection = willWantDateSeparator || mxEv.getSender() !== nextEventWithTile.getSender();
|
lastInSection = willWantDateSeparator || mxEv.getSender() !== nextEventWithTile.getSender() ||
|
||||||
|
getEventDisplayInfo(nextEventWithTile).isInfoMessage;
|
||||||
}
|
}
|
||||||
|
|
||||||
// is this a continuation of the previous message?
|
// is this a continuation of the previous message?
|
||||||
|
|||||||
Reference in New Issue
Block a user