Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 59f57e1

Browse files
toger5t3chguy
andauthored
Ship maximised widgets and remove feature flag (#7509)
Co-authored-by: Michael Telatynski <[email protected]>
1 parent 8b088da commit 59f57e1

File tree

7 files changed

+3
-18
lines changed

7 files changed

+3
-18
lines changed

src/components/structures/RightPanel.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,6 @@ export default class RightPanel extends React.Component<IProps, IState> {
260260
}
261261
break;
262262
case RightPanelPhases.Timeline:
263-
if (!SettingsStore.getValue("feature_maximised_widgets")) break;
264263
card = <TimelineCard
265264
classNames="mx_ThreadPanel mx_TimelineCard"
266265
room={this.props.room}

src/components/structures/RoomView.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2172,7 +2172,6 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
21722172
// keep the timeline in as the mainSplitBody
21732173
break;
21742174
case MainSplitContentType.MaximisedWidget:
2175-
if (!SettingsStore.getValue("feature_maximised_widgets")) break;
21762175
mainSplitBody = <AppsDrawer
21772176
room={this.state.room}
21782177
userId={this.context.credentials.userId}

src/components/views/elements/AppTile.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ export default class AppTile extends React.Component<IProps, IState> {
542542
);
543543
}
544544
let maxMinButton;
545-
if (SettingsStore.getValue("feature_maximised_widgets") && !this.props.hideMaximiseButton) {
545+
if (!this.props.hideMaximiseButton) {
546546
const widgetIsMaximised = WidgetLayoutStore.instance.
547547
isInContainer(this.props.room, this.props.app, Container.Center);
548548
maxMinButton = <AccessibleButton

src/components/views/right_panel/RoomHeaderButtons.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ const PinnedMessagesHeaderButton = ({ room, isHighlighted, onClick }: IHeaderBut
9797
};
9898

9999
const TimelineCardHeaderButton = ({ room, isHighlighted, onClick }: IHeaderButtonProps) => {
100-
if (!SettingsStore.getValue("feature_maximised_widgets")) return null;
101100
let unreadIndicator;
102101
const color = RoomNotificationStateStore.instance.getRoomState(room).color;
103102
switch (color) {

src/components/views/right_panel/RoomSummaryCard.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,7 @@ const AppRow: React.FC<IAppRowProps> = ({ app, room }) => {
169169
</AccessibleTooltipButton>
170170

171171
{ canModifyWidget && <ContextMenuTooltipButton
172-
className={classNames({
173-
"mx_RoomSummaryCard_app_options": true,
174-
"mx_RoomSummaryCard_maximised_widget": SettingsStore.getValue("feature_maximised_widgets"),
175-
})}
172+
className="mx_RoomSummaryCard_app_options mx_RoomSummaryCard_maximised_widget"
176173
isExpanded={menuDisplayed}
177174
onClick={openMenu}
178175
title={_t("Options")}
@@ -186,13 +183,12 @@ const AppRow: React.FC<IAppRowProps> = ({ app, room }) => {
186183
disabled={cannotPin}
187184
yOffset={-24}
188185
/>
189-
{ SettingsStore.getValue("feature_maximised_widgets") &&
190186
<AccessibleTooltipButton
191187
className={isMaximised ? "mx_RoomSummaryCard_app_minimise" : "mx_RoomSummaryCard_app_maximise"}
192188
onClick={toggleMaximised}
193189
title={maximiseTitle}
194190
yOffset={-24}
195-
/> }
191+
/>
196192

197193
{ contextMenu }
198194
</div>;

src/i18n/strings/en_EN.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -865,7 +865,6 @@
865865
"Render LaTeX maths in messages": "Render LaTeX maths in messages",
866866
"Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.": "Communities v2 prototypes. Requires compatible homeserver. Highly experimental - use with caution.",
867867
"Message Pinning": "Message Pinning",
868-
"Maximised widgets": "Maximised widgets",
869868
"Threaded messaging": "Threaded messaging",
870869
"Custom user status messages": "Custom user status messages",
871870
"Group & filter rooms by custom tags (refresh to apply changes)": "Group & filter rooms by custom tags (refresh to apply changes)",

src/settings/Settings.tsx

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -215,13 +215,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
215215
supportedLevels: LEVELS_FEATURE,
216216
default: false,
217217
},
218-
"feature_maximised_widgets": {
219-
isFeature: true,
220-
labsGroup: LabGroup.Widgets,
221-
displayName: _td("Maximised widgets"),
222-
supportedLevels: LEVELS_FEATURE,
223-
default: false,
224-
},
225218
"feature_thread": {
226219
isFeature: true,
227220
labsGroup: LabGroup.Messaging,

0 commit comments

Comments
 (0)