@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react';
2
2
import clone from 'clone' ;
3
3
import { objType } from 'for-promise/utils/lib.mjs' ;
4
4
5
+ import { isMobile } from '@src/util/libs/mobile' ;
5
6
import blobUrlManager from '@src/util/libs/blobUrlManager' ;
6
7
import matrixAppearance from '@src/util/libs/appearance' ;
7
8
@@ -33,6 +34,7 @@ function Room() {
33
34
forceScroll : null ,
34
35
} ;
35
36
37
+ const [ isRoomMode , setIsRoomMode ] = useState ( false ) ;
36
38
const [ roomInfo , setRoomInfo ] = useState ( defaultRoomInfo ) ;
37
39
tinyAPI . emit ( 'setRoomInfo' , defaultRoomInfo ) ;
38
40
@@ -66,6 +68,9 @@ function Room() {
66
68
} ;
67
69
68
70
useEffect ( ( ) => {
71
+ const onRoomModeSelected = ( roomType ) => {
72
+ setIsRoomMode ( roomType === 'room' ? true : false ) ;
73
+ } ;
69
74
const setRoomSelected = ( roomId , threadId , eventId , forceScroll ) => {
70
75
const threadTimeline = threadId ? RoomTimeline . newFromThread ( threadId , roomId ) : null ;
71
76
const roomTimeline = threadTimeline ?? new RoomTimeline ( roomId ) ;
@@ -137,8 +142,10 @@ function Room() {
137
142
}
138
143
} ;
139
144
145
+ navigation . on ( cons . events . navigation . SELECTED_ROOM_MODE , onRoomModeSelected ) ;
140
146
navigation . on ( cons . events . navigation . ROOM_SELECTED , handleRoomSelected ) ;
141
147
return ( ) => {
148
+ navigation . removeListener ( cons . events . navigation . SELECTED_ROOM_MODE , onRoomModeSelected ) ;
142
149
navigation . removeListener ( cons . events . navigation . ROOM_SELECTED , handleRoomSelected ) ;
143
150
} ;
144
151
} , [ mx , roomInfo ] ) ;
@@ -172,7 +179,10 @@ function Room() {
172
179
173
180
// Checker is User List
174
181
const cloneIsUserList = clone ( isUserList ) ;
175
- if ( cloneIsUserList === isUserList ) {
182
+ if (
183
+ cloneIsUserList === isUserList &&
184
+ ( ! isMobile ( ) || window . matchMedia ( 'screen and (min-width: 768px)' ) . matches || isRoomMode )
185
+ ) {
176
186
// Complete
177
187
return (
178
188
< div className = "room" >
0 commit comments