imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't form continuations from thread roots (#8166)

Browse source 
* Don't form continuations from thread roots

* Only apply the continuation break in the main timeline
This commit is contained in:
Robin 2022-03-26 18:06:25 -04:00 • committed by GitHub
parent 6c69f3e3b6
commit 1e060fed84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 62 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/components/views/rooms/SearchResultTile.tsx
View file

@ -68,6 +68,7 @@ export default class SearchResultTile extends React.Component<IProps> {
const layout = SettingsStore.getValue("layout");
const isTwelveHour = SettingsStore.getValue("showTwelveHourTimestamps");
const alwaysShowTimestamps = SettingsStore.getValue("alwaysShowTimestamps");
const threadsEnabled = SettingsStore.getValue("feature_thread");
const timeline = result.context.getTimeline();
for (let j = 0; j < timeline.length; j++) {
@ -88,6 +89,7 @@ export default class SearchResultTile extends React.Component<IProps> {
prevEv,
mxEv,
this.context?.showHiddenEventsInTimeline,
threadsEnabled,
TimelineRenderingType.Search,
);
@ -102,6 +104,7 @@ export default class SearchResultTile extends React.Component<IProps> {
mxEv,
nextEv,
this.context?.showHiddenEventsInTimeline,
threadsEnabled,
TimelineRenderingType.Search,
)
);