Only apply larger minimised with on new room list

This commit is contained in:
David Langley
2025-04-16 15:31:30 +01:00
parent 2be29613bf
commit 572c7d50d0
3 changed files with 22 additions and 4 deletions

View File

@@ -25,6 +25,10 @@ Please see LICENSE files in the repository root for full details.
.mx_LeftPanel_wrapper,
.mx_LeftPanel {
--collapsedWidth: 68px;
}
.mx_LeftPanel_NewRoomList {
--collapsedWidth: 232px;
}

View File

@@ -379,13 +379,14 @@ export default class LeftPanel extends React.Component<IProps, IState> {
}
public render(): React.ReactNode {
const useNewRoomList = SettingsStore.getValue("feature_new_room_list");
const containerClasses = classNames({
mx_LeftPanel: true,
mx_LeftPanel_NewRoomList: useNewRoomList,
mx_LeftPanel_minimized: this.props.isMinimized,
});
const roomListClasses = classNames("mx_LeftPanel_actualRoomListContainer", "mx_AutoHideScrollbar");
const useNewRoomList = SettingsStore.getValue("feature_new_room_list");
if (useNewRoomList) {
return (
<div className={containerClasses}>

View File

@@ -259,9 +259,15 @@ class LoggedInView extends React.Component<IProps, IState> {
private createResizer(): Resizer<ICollapseConfig, CollapseItem> {
let panelSize: number | null;
let panelCollapsed: boolean;
const useNewRoomList = SettingsStore.getValue("feature_new_room_list");
let toggleSize = 206 - 50;
if (useNewRoomList) {
toggleSize = 232;
}
const collapseConfig: ICollapseConfig = {
// TODO decrease this once Spaces launches as it'll no longer need to include the 56px Community Panel
toggleSize: 232,
toggleSize: toggleSize,
onCollapsed: (collapsed) => {
panelCollapsed = collapsed;
if (collapsed) {
@@ -697,6 +703,13 @@ class LoggedInView extends React.Component<IProps, IState> {
"mx_MatrixChat--with-avatar": this.state.backgroundImage,
});
const useNewRoomList = SettingsStore.getValue("feature_new_room_list");
const leftPanelWrapperClasses = classNames({
mx_LeftPanel_wrapper: true,
mx_LeftPanel_NewRoomList: useNewRoomList,
});
const audioFeedArraysForCalls = this.state.activeCalls.map((call) => {
return <AudioFeedArrayForLegacyCall call={call} key={call.callId} />;
});
@@ -713,7 +726,7 @@ class LoggedInView extends React.Component<IProps, IState> {
<div className={bodyClasses}>
<div className="mx_LeftPanel_outerWrapper">
<LeftPanelLiveShareWarning isMinimized={this.props.collapseLhs || false} />
<div className="mx_LeftPanel_wrapper">
<div className={leftPanelWrapperClasses}>
<BackdropPanel blurMultiplier={0.5} backgroundImage={this.state.backgroundImage} />
<SpacePanel />
<BackdropPanel backgroundImage={this.state.backgroundImage} />
@@ -724,7 +737,7 @@ class LoggedInView extends React.Component<IProps, IState> {
>
<LeftPanel
pageType={this.props.page_type as PageTypes}
isMinimized={false}
isMinimized={(!useNewRoomList && this.props.collapseLhs) || false}
resizeNotifier={this.props.resizeNotifier}
/>
</div>