Ship maximised widgets and remove feature flag (#7509)

Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Timo 2022-01-11 14:11:48 +01:00 committed by GitHub
parent 8b088da888
commit 59f57e15fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 3 additions and 18 deletions

View file

@ -260,7 +260,6 @@ export default class RightPanel extends React.Component<IProps, IState> {
} }
break; break;
case RightPanelPhases.Timeline: case RightPanelPhases.Timeline:
if (!SettingsStore.getValue("feature_maximised_widgets")) break;
card = <TimelineCard card = <TimelineCard
classNames="mx_ThreadPanel mx_TimelineCard" classNames="mx_ThreadPanel mx_TimelineCard"
room={this.props.room} room={this.props.room}

View file

@ -2172,7 +2172,6 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
// keep the timeline in as the mainSplitBody // keep the timeline in as the mainSplitBody
break; break;
case MainSplitContentType.MaximisedWidget: case MainSplitContentType.MaximisedWidget:
if (!SettingsStore.getValue("feature_maximised_widgets")) break;
mainSplitBody = <AppsDrawer mainSplitBody = <AppsDrawer
room={this.state.room} room={this.state.room}
userId={this.context.credentials.userId} userId={this.context.credentials.userId}

View file

@ -542,7 +542,7 @@ export default class AppTile extends React.Component<IProps, IState> {
); );
} }
let maxMinButton; let maxMinButton;
if (SettingsStore.getValue("feature_maximised_widgets") && !this.props.hideMaximiseButton) { if (!this.props.hideMaximiseButton) {
const widgetIsMaximised = WidgetLayoutStore.instance. const widgetIsMaximised = WidgetLayoutStore.instance.
isInContainer(this.props.room, this.props.app, Container.Center); isInContainer(this.props.room, this.props.app, Container.Center);
maxMinButton = <AccessibleButton maxMinButton = <AccessibleButton

View file

@ -97,7 +97,6 @@ const PinnedMessagesHeaderButton = ({ room, isHighlighted, onClick }: IHeaderBut
}; };
const TimelineCardHeaderButton = ({ room, isHighlighted, onClick }: IHeaderButtonProps) => { const TimelineCardHeaderButton = ({ room, isHighlighted, onClick }: IHeaderButtonProps) => {
if (!SettingsStore.getValue("feature_maximised_widgets")) return null;
let unreadIndicator; let unreadIndicator;
const color = RoomNotificationStateStore.instance.getRoomState(room).color; const color = RoomNotificationStateStore.instance.getRoomState(room).color;
switch (color) { switch (color) {

View file

@ -169,10 +169,7 @@ const AppRow: React.FC<IAppRowProps> = ({ app, room }) => {
</AccessibleTooltipButton> </AccessibleTooltipButton>
{ canModifyWidget && <ContextMenuTooltipButton { canModifyWidget && <ContextMenuTooltipButton
className={classNames({ className="mx_RoomSummaryCard_app_options mx_RoomSummaryCard_maximised_widget"
"mx_RoomSummaryCard_app_options": true,
"mx_RoomSummaryCard_maximised_widget": SettingsStore.getValue("feature_maximised_widgets"),
})}
isExpanded={menuDisplayed} isExpanded={menuDisplayed}
onClick={openMenu} onClick={openMenu}
title={_t("Options")} title={_t("Options")}
@ -186,13 +183,12 @@ const AppRow: React.FC<IAppRowProps> = ({ app, room }) => {
disabled={cannotPin} disabled={cannotPin}
yOffset={-24} yOffset={-24}
/> />
{ SettingsStore.getValue("feature_maximised_widgets") &&
<AccessibleTooltipButton <AccessibleTooltipButton
className={isMaximised ? "mx_RoomSummaryCard_app_minimise" : "mx_RoomSummaryCard_app_maximise"} className={isMaximised ? "mx_RoomSummaryCard_app_minimise" : "mx_RoomSummaryCard_app_maximise"}
onClick={toggleMaximised} onClick={toggleMaximised}
title={maximiseTitle} title={maximiseTitle}
yOffset={-24} yOffset={-24}
/> } />
{ contextMenu } { contextMenu }
</div>; </div>;

View file

@ -865,7 +865,6 @@
"Render LaTeX maths in messages": "Render LaTeX maths in messages", "Render LaTeX maths in messages": "Render LaTeX maths in messages",
"Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.", "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.",
"Message Pinning": "Message Pinning", "Message Pinning": "Message Pinning",
"Maximised widgets": "Maximised widgets",
"Threaded messaging": "Threaded messaging", "Threaded messaging": "Threaded messaging",
"Custom user status messages": "Custom user status messages", "Custom user status messages": "Custom user status messages",
"Group & filter rooms by custom tags (refresh to apply changes)": "Group & filter rooms by custom tags (refresh to apply changes)", "Group & filter rooms by custom tags (refresh to apply changes)": "Group & filter rooms by custom tags (refresh to apply changes)",

View file

@ -215,13 +215,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
supportedLevels: LEVELS_FEATURE, supportedLevels: LEVELS_FEATURE,
default: false, default: false,
}, },
"feature_maximised_widgets": {
isFeature: true,
labsGroup: LabGroup.Widgets,
displayName: _td("Maximised widgets"),
supportedLevels: LEVELS_FEATURE,
default: false,
},
"feature_thread": { "feature_thread": {
isFeature: true, isFeature: true,
labsGroup: LabGroup.Messaging, labsGroup: LabGroup.Messaging,