pro/im_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved hiding components to the top level

Browse Source
This commit is contained in:
or-else
2023-03-14 15:54:22 -07:00
parent 2fb6a9bb0a
commit 8df3c34cf4
7 changed files with 118 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/messages-view.jsx
+1 -3
View File
@@ -1305,9 +1305,7 @@ class MessagesView extends React.Component {
const {formatMessage} = this.props.intl; const {formatMessage} = this.props.intl;
let component; let component;
if (this.props.hideSelf) { if (!this.state.topic) {
component = null;
} else if (!this.state.topic) {
component = ( component = (
<LogoView <LogoView
serverVersion={this.props.serverVersion} serverVersion={this.props.serverVersion}
src/views/sidepanel-view.jsx
+1 -1
View File
@@ -124,7 +124,7 @@ class SidepanelView extends React.PureComponent {
} }
return ( return (
<div id="sidepanel" className={this.props.hideSelf ? 'nodisplay' : null}> <div id="sidepanel">
<SideNavbar <SideNavbar
state={view} state={view}
title={title} title={title}
src/views/tinode-web.jsx
+108 -107
View File
@@ -1985,126 +1985,127 @@ class TinodeWeb extends React.Component {
(_ => {this.setState({alertVisible: false}); this.state.alertParams.onConfirm();}) : null} (_ => {this.setState({alertVisible: false}); this.state.alertParams.onConfirm();}) : null}
confirm={this.state.alertParams.confirm} confirm={this.state.alertParams.confirm}
/> : null} /> : null}
<SidepanelView {!this.state.displayMobile || this.state.mobilePanel == 'sidepanel' ?
tinode={this.tinode} <SidepanelView
connected={this.state.connected} tinode={this.tinode}
displayMobile={this.state.displayMobile} connected={this.state.connected}
hideSelf={this.state.displayMobile && this.state.mobilePanel !== 'sidepanel'} displayMobile={this.state.displayMobile}
state={this.state.sidePanelSelected} state={this.state.sidePanelSelected}
title={this.state.sidePanelTitle} title={this.state.sidePanelTitle}
avatar={this.state.sidePanelAvatar} avatar={this.state.sidePanelAvatar}
trustedBadges={this.state.myTrustedBadges} trustedBadges={this.state.myTrustedBadges}
login={this.state.login} login={this.state.login}
persist={this.state.persist} persist={this.state.persist}
myUserId={this.state.myUserId} myUserId={this.state.myUserId}
loginDisabled={this.state.loginDisabled} loginDisabled={this.state.loginDisabled}
loadSpinnerVisible={this.state.loadSpinnerVisible} loadSpinnerVisible={this.state.loadSpinnerVisible}
errorText={this.state.errorText} errorText={this.state.errorText}
errorLevel={this.state.errorLevel} errorLevel={this.state.errorLevel}
errorAction={this.state.errorAction} errorAction={this.state.errorAction}
errorActionText={this.state.errorActionText} errorActionText={this.state.errorActionText}
topicSelected={this.state.topicSelected} topicSelected={this.state.topicSelected}
chatList={this.state.chatList} chatList={this.state.chatList}
credMethod={this.state.credMethod} credMethod={this.state.credMethod}
credCode={this.state.credCode} credCode={this.state.credCode}
credToken={this.state.credToken} credToken={this.state.credToken}
transport={this.state.transport} transport={this.state.transport}
messageSounds={this.state.messageSounds} messageSounds={this.state.messageSounds}
desktopAlerts={this.state.desktopAlerts} desktopAlerts={this.state.desktopAlerts}
desktopAlertsEnabled={this.state.desktopAlertsEnabled} desktopAlertsEnabled={this.state.desktopAlertsEnabled}
incognitoMode={this.state.incognitoMode} incognitoMode={this.state.incognitoMode}
serverAddress={this.state.serverAddress} serverAddress={this.state.serverAddress}
secureConnection={this.state.secureConnection} secureConnection={this.state.secureConnection}
serverVersion={this.state.serverVersion} serverVersion={this.state.serverVersion}
reqCredMethod={this.state.reqCredMethod} reqCredMethod={this.state.reqCredMethod}
onGlobalSettings={this.handleGlobalSettings} onGlobalSettings={this.handleGlobalSettings}
onSignUp={this.handleNewAccount} onSignUp={this.handleNewAccount}
onSettings={this.handleSettings} onSettings={this.handleSettings}
onNavigate={this.basicNavigator} onNavigate={this.basicNavigator}
onLoginRequest={this.handleLoginRequest} onLoginRequest={this.handleLoginRequest}
onPersistenceChange={this.handlePersistenceChange} onPersistenceChange={this.handlePersistenceChange}
onCreateAccount={this.handleNewAccountRequest} onCreateAccount={this.handleNewAccountRequest}
onUpdateAccountDesc={this.handleTopicUpdateRequest} onUpdateAccountDesc={this.handleTopicUpdateRequest}
onUpdatePassword={this.handleUpdatePasswordRequest} onUpdatePassword={this.handleUpdatePasswordRequest}
onUpdateAccountTags={this.handleUpdateAccountTagsRequest} onUpdateAccountTags={this.handleUpdateAccountTagsRequest}
onTogglePushNotifications={this.toggleFCMToken} onTogglePushNotifications={this.toggleFCMToken}
onToggleMessageSounds={this.handleToggleMessageSounds} onToggleMessageSounds={this.handleToggleMessageSounds}
onToggleIncognitoMode={this.handleToggleIncognitoMode} onToggleIncognitoMode={this.handleToggleIncognitoMode}
onCredAdd={this.handleCredAdd} onCredAdd={this.handleCredAdd}
onCredDelete={this.handleCredDelete} onCredDelete={this.handleCredDelete}
onCredConfirm={this.handleCredConfirm} onCredConfirm={this.handleCredConfirm}
onTopicSelected={this.handleTopicSelected} onTopicSelected={this.handleTopicSelected}
onCreateTopic={this.handleStartTopicRequest} onCreateTopic={this.handleStartTopicRequest}
onLogout={this.handleLogout} onLogout={this.handleLogout}
onDeleteAccount={this.handleDeleteAccount} onDeleteAccount={this.handleDeleteAccount}
onShowAlert={this.handleShowAlert} onShowAlert={this.handleShowAlert}
onCancel={this.handleSidepanelCancel} onCancel={this.handleSidepanelCancel}
onError={this.handleError} onError={this.handleError}
onValidateCredentials={this.handleValidateCredentialsRequest} onValidateCredentials={this.handleValidateCredentialsRequest}
onPasswordResetRequest={this.handlePasswordResetRequest} onPasswordResetRequest={this.handlePasswordResetRequest}
onResetPassword={this.handleResetPassword} onResetPassword={this.handleResetPassword}
onShowArchive={this.handleShowArchive} onShowArchive={this.handleShowArchive}
onShowBlocked={this.handleShowBlocked} onShowBlocked={this.handleShowBlocked}
onShowCountrySelector={this.handleShowCountrySelector} onShowCountrySelector={this.handleShowCountrySelector}
onInitFind={this.tnInitFind} onInitFind={this.tnInitFind}
searchResults={this.state.searchResults} searchResults={this.state.searchResults}
onSearchContacts={this.handleSearchContacts} onSearchContacts={this.handleSearchContacts}
showContextMenu={this.handleShowContextMenu} /> showContextMenu={this.handleShowContextMenu} />
: null}
<MessagesView {!this.state.displayMobile || (this.state.mobilePanel == 'topic-view' && !this.state.infoPanel) ?
tinode={this.tinode} <MessagesView
connected={this.state.connected} tinode={this.tinode}
ready={this.state.ready} connected={this.state.connected}
online={this.state.topicSelectedOnline} ready={this.state.ready}
acs={this.state.topicSelectedAcs} online={this.state.topicSelectedOnline}
displayMobile={this.state.displayMobile} acs={this.state.topicSelectedAcs}
viewportWidth={this.state.viewportWidth} displayMobile={this.state.displayMobile}
viewportHeight={this.state.viewportHeight} viewportWidth={this.state.viewportWidth}
hideSelf={this.state.displayMobile && viewportHeight={this.state.viewportHeight}
(this.state.mobilePanel !== 'topic-view' || this.state.infoPanel)} topic={this.state.topicSelected}
topic={this.state.topicSelected} myUserId={this.state.myUserId}
myUserId={this.state.myUserId} // User public.fn.
// User public.fn. myUserName={this.state.sidePanelTitle}
myUserName={this.state.sidePanelTitle} serverVersion={this.state.serverVersion}
serverVersion={this.state.serverVersion} serverAddress={this.state.serverAddress}
serverAddress={this.state.serverAddress} applicationVisible={this.state.applicationVisible}
applicationVisible={this.state.applicationVisible}
forwardMessage={this.state.forwardMessage} forwardMessage={this.state.forwardMessage}
onCancelForwardMessage={this.handleHideForwardDialog} onCancelForwardMessage={this.handleHideForwardDialog}
callTopic={this.state.callTopic} callTopic={this.state.callTopic}
callSeq={this.state.callSeq} callSeq={this.state.callSeq}
callState={this.state.callState} callState={this.state.callState}
callAudioOnly={this.state.callAudioOnly} callAudioOnly={this.state.callAudioOnly}
onCallHangup={this.handleCallHangup} onCallHangup={this.handleCallHangup}
onCallInvite={this.handleCallInvite} onCallInvite={this.handleCallInvite}
onCallSendOffer={this.handleCallSendOffer} onCallSendOffer={this.handleCallSendOffer}
onCallIceCandidate={this.handleCallIceCandidate} onCallIceCandidate={this.handleCallIceCandidate}
onCallSendAnswer={this.handleCallSendAnswer} onCallSendAnswer={this.handleCallSendAnswer}
errorText={this.state.errorText} errorText={this.state.errorText}
errorLevel={this.state.errorLevel} errorLevel={this.state.errorLevel}
errorAction={this.state.errorAction} errorAction={this.state.errorAction}
errorActionText={this.state.errorActionText} errorActionText={this.state.errorActionText}
newTopicParams={this.state.newTopicParams} newTopicParams={this.state.newTopicParams}
onHideMessagesView={this.handleHideMessagesView} onHideMessagesView={this.handleHideMessagesView}
onError={this.handleError} onError={this.handleError}
onNewTopicCreated={this.handleNewTopicCreated} onNewTopicCreated={this.handleNewTopicCreated}
showContextMenu={this.handleShowContextMenu} showContextMenu={this.handleShowContextMenu}
onChangePermissions={this.handleChangePermissions} onChangePermissions={this.handleChangePermissions}
onNewChat={this.handleNewChatInvitation} onNewChat={this.handleNewChatInvitation}
sendMessage={this.handleSendMessage} sendMessage={this.handleSendMessage}
onVideoCallClosed={this.handleCallClose} /> onVideoCallClosed={this.handleCallClose} />
: null}
{this.state.infoPanel ? {this.state.infoPanel ?
<InfoView <InfoView
umd/index.dev.js
+5 -10
View File
@@ -6210,9 +6210,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
formatMessage formatMessage
} = this.props.intl; } = this.props.intl;
let component; let component;
if (this.props.hideSelf) { if (!this.state.topic) {
component = null;
} else if (!this.state.topic) {
component = react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_logo_view_jsx__WEBPACK_IMPORTED_MODULE_13__["default"], { component = react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_logo_view_jsx__WEBPACK_IMPORTED_MODULE_13__["default"], {
serverVersion: this.props.serverVersion, serverVersion: this.props.serverVersion,
serverAddress: this.props.serverAddress serverAddress: this.props.serverAddress
@@ -7019,8 +7017,7 @@ class SidepanelView extends (react__WEBPACK_IMPORTED_MODULE_0___default().PureCo
onCancel = this.props.onCancel; onCancel = this.props.onCancel;
} }
return react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", { return react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
id: "sidepanel", id: "sidepanel"
className: this.props.hideSelf ? 'nodisplay' : null
}, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_side_navbar_jsx__WEBPACK_IMPORTED_MODULE_4__["default"], { }, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_widgets_side_navbar_jsx__WEBPACK_IMPORTED_MODULE_4__["default"], {
state: view, state: view,
title: title, title: title,
@@ -8963,11 +8960,10 @@ class TinodeWeb extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
this.state.alertParams.onConfirm(); this.state.alertParams.onConfirm();
} : null, } : null,
confirm: this.state.alertParams.confirm confirm: this.state.alertParams.confirm
}) : null, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_sidepanel_view_jsx__WEBPACK_IMPORTED_MODULE_11__["default"], { }) : null, !this.state.displayMobile || this.state.mobilePanel == 'sidepanel' ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_sidepanel_view_jsx__WEBPACK_IMPORTED_MODULE_11__["default"], {
tinode: this.tinode, tinode: this.tinode,
connected: this.state.connected, connected: this.state.connected,
displayMobile: this.state.displayMobile, displayMobile: this.state.displayMobile,
hideSelf: this.state.displayMobile && this.state.mobilePanel !== 'sidepanel',
state: this.state.sidePanelSelected, state: this.state.sidePanelSelected,
title: this.state.sidePanelTitle, title: this.state.sidePanelTitle,
avatar: this.state.sidePanelAvatar, avatar: this.state.sidePanelAvatar,
@@ -9028,7 +9024,7 @@ class TinodeWeb extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
searchResults: this.state.searchResults, searchResults: this.state.searchResults,
onSearchContacts: this.handleSearchContacts, onSearchContacts: this.handleSearchContacts,
showContextMenu: this.handleShowContextMenu showContextMenu: this.handleShowContextMenu
}), react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_messages_view_jsx__WEBPACK_IMPORTED_MODULE_10__["default"], { }) : null, !this.state.displayMobile || this.state.mobilePanel == 'topic-view' && !this.state.infoPanel ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_messages_view_jsx__WEBPACK_IMPORTED_MODULE_10__["default"], {
tinode: this.tinode, tinode: this.tinode,
connected: this.state.connected, connected: this.state.connected,
ready: this.state.ready, ready: this.state.ready,
@@ -9037,7 +9033,6 @@ class TinodeWeb extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
displayMobile: this.state.displayMobile, displayMobile: this.state.displayMobile,
viewportWidth: this.state.viewportWidth, viewportWidth: this.state.viewportWidth,
viewportHeight: this.state.viewportHeight, viewportHeight: this.state.viewportHeight,
hideSelf: this.state.displayMobile && (this.state.mobilePanel !== 'topic-view' || this.state.infoPanel),
topic: this.state.topicSelected, topic: this.state.topicSelected,
myUserId: this.state.myUserId, myUserId: this.state.myUserId,
myUserName: this.state.sidePanelTitle, myUserName: this.state.sidePanelTitle,
@@ -9068,7 +9063,7 @@ class TinodeWeb extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
onNewChat: this.handleNewChatInvitation, onNewChat: this.handleNewChatInvitation,
sendMessage: this.handleSendMessage, sendMessage: this.handleSendMessage,
onVideoCallClosed: this.handleCallClose onVideoCallClosed: this.handleCallClose
}), this.state.infoPanel ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_info_view_jsx__WEBPACK_IMPORTED_MODULE_9__["default"], { }) : null, this.state.infoPanel ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_info_view_jsx__WEBPACK_IMPORTED_MODULE_9__["default"], {
tinode: this.tinode, tinode: this.tinode,
connected: this.state.connected, connected: this.state.connected,
displayMobile: this.state.displayMobile, displayMobile: this.state.displayMobile,
umd/index.dev.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/index.prod.js
+1 -1
View File
File diff suppressed because one or more lines are too long
umd/index.prod.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long