From 5faa4790b103052e6ff1755f02be2e0508bf177c Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 13 Jul 2023 15:07:34 +0100 Subject: [PATCH 1/2] Hide widget menu button if it there are no options available --- .../views/context_menus/WidgetContextMenu.tsx | 92 +++++++++++++++---- src/components/views/elements/AppTile.tsx | 31 +++++-- 2 files changed, 94 insertions(+), 29 deletions(-) diff --git a/src/components/views/context_menus/WidgetContextMenu.tsx b/src/components/views/context_menus/WidgetContextMenu.tsx index 6482b817734..83fde0722cd 100644 --- a/src/components/views/context_menus/WidgetContextMenu.tsx +++ b/src/components/views/context_menus/WidgetContextMenu.tsx @@ -15,9 +15,10 @@ limitations under the License. */ import React, { ComponentProps, useContext } from "react"; -import { IWidget, MatrixCapabilities } from "matrix-widget-api"; +import { ClientWidgetApi, IWidget, MatrixCapabilities } from "matrix-widget-api"; import { logger } from "matrix-js-sdk/src/logger"; import { ApprovalOpts, WidgetLifecycle } from "@matrix-org/react-sdk-module-api/lib/lifecycles/WidgetLifecycle"; +import { MatrixClient, Room } from "matrix-js-sdk/src/matrix"; import IconizedContextMenu, { IconizedContextMenuOption, IconizedContextMenuOptionList } from "./IconizedContextMenu"; import { ChevronFace } from "../../structures/ContextMenu"; @@ -48,6 +49,69 @@ interface IProps extends Omit, "child onEditClick?(): void; } +const showStreamAudioStreamButton = (app: IWidget): boolean => { + return !!getConfigLivestreamUrl() && WidgetType.JITSI.matches(app.type); +}; + +const showEditButton = (app: IWidget, canModify: boolean): boolean => { + return canModify && WidgetUtils.isManagedByManager(app); +}; + +const showRevokeButton = ( + cli: MatrixClient, + roomId: string | undefined, + app: IWidget, + userWidget: boolean | undefined, +): boolean => { + const isAllowedWidget = + (isAppWidget(app) && + app.eventId !== undefined && + (SettingsStore.getValue("allowedWidgets", roomId)[app.eventId] ?? false)) || + app.creatorUserId === cli?.getUserId(); + + const isLocalWidget = WidgetType.JITSI.matches(app.type); + return !userWidget && !isLocalWidget && isAllowedWidget; +}; + +const showDeleteButton = (canModify: boolean, onDeleteClick: undefined | (() => void)): boolean => { + return !!onDeleteClick || canModify; +}; + +const showSnapshotButton = (widgetMessaging: ClientWidgetApi | undefined): boolean => { + return ( + SettingsStore.getValue("enableWidgetScreenshots") && + !!widgetMessaging?.hasCapability(MatrixCapabilities.Screenshots) + ); +}; + +const showMoveButtons = (app: IWidget, room: Room | undefined, showUnpin: boolean | undefined): [boolean, boolean] => { + if (!showUnpin) return [false, false]; + + const pinnedWidgets = room ? WidgetLayoutStore.instance.getContainerWidgets(room, Container.Top) : []; + const widgetIndex = pinnedWidgets.findIndex((widget) => widget.id === app.id); + return [widgetIndex > 0, widgetIndex < pinnedWidgets.length - 1]; +}; + +export const showContextMenu = ( + cli: MatrixClient, + room: Room | undefined, + app: IWidget, + userWidget: boolean, + showUnpin: boolean, + onDeleteClick: (() => void) | undefined, +): boolean => { + const canModify = userWidget || WidgetUtils.canUserModifyWidgets(cli, room?.roomId); + const widgetMessaging = WidgetMessagingStore.instance.getMessagingForUid(WidgetUtils.getWidgetUid(app)); + return ( + showStreamAudioStreamButton(app) || + showEditButton(app, canModify) || + showRevokeButton(cli, room?.roomId, app, userWidget) || + showDeleteButton(canModify, onDeleteClick) || + showSnapshotButton(widgetMessaging) || + showMoveButtons(app, room, showUnpin).some(Boolean) + ); +}; + export const WidgetContextMenu: React.FC = ({ onFinished, app, @@ -64,7 +128,7 @@ export const WidgetContextMenu: React.FC = ({ const canModify = userWidget || WidgetUtils.canUserModifyWidgets(cli, roomId); let streamAudioStreamButton: JSX.Element | undefined; - if (roomId && getConfigLivestreamUrl() && WidgetType.JITSI.matches(app.type)) { + if (roomId && showStreamAudioStreamButton(app)) { const onStreamAudioClick = async (): Promise => { try { await startJitsiAudioLivestream(cli, widgetMessaging!, roomId); @@ -84,11 +148,8 @@ export const WidgetContextMenu: React.FC = ({ ); } - const pinnedWidgets = room ? WidgetLayoutStore.instance.getContainerWidgets(room, Container.Top) : []; - const widgetIndex = pinnedWidgets.findIndex((widget) => widget.id === app.id); - let editButton: JSX.Element | undefined; - if (canModify && WidgetUtils.isManagedByManager(app)) { + if (showEditButton(app, canModify)) { const _onEditClick = (): void => { if (onEditClick) { onEditClick(); @@ -102,8 +163,7 @@ export const WidgetContextMenu: React.FC = ({ } let snapshotButton: JSX.Element | undefined; - const screenshotsEnabled = SettingsStore.getValue("enableWidgetScreenshots"); - if (screenshotsEnabled && widgetMessaging?.hasCapability(MatrixCapabilities.Screenshots)) { + if (showSnapshotButton(widgetMessaging)) { const onSnapshotClick = (): void => { widgetMessaging ?.takeScreenshot() @@ -123,7 +183,7 @@ export const WidgetContextMenu: React.FC = ({ } let deleteButton: JSX.Element | undefined; - if (onDeleteClick || canModify) { + if (showDeleteButton(canModify, onDeleteClick)) { const _onDeleteClick = (): void => { if (onDeleteClick) { onDeleteClick(); @@ -154,15 +214,8 @@ export const WidgetContextMenu: React.FC = ({ ); } - const isAllowedWidget = - (isAppWidget(app) && - app.eventId !== undefined && - (SettingsStore.getValue("allowedWidgets", roomId)[app.eventId] ?? false)) || - app.creatorUserId === cli.getUserId(); - - const isLocalWidget = WidgetType.JITSI.matches(app.type); let revokeButton: JSX.Element | undefined; - if (!userWidget && !isLocalWidget && isAllowedWidget) { + if (showRevokeButton(cli, roomId, app, userWidget)) { const opts: ApprovalOpts = { approved: undefined }; ModuleRunner.instance.invoke(WidgetLifecycle.PreLoadRequest, opts, new ElementWidget(app)); @@ -185,8 +238,9 @@ export const WidgetContextMenu: React.FC = ({ } } + const [showMoveLeftButton, showMoveRightButton] = showMoveButtons(app, room, showUnpin); let moveLeftButton: JSX.Element | undefined; - if (showUnpin && widgetIndex > 0) { + if (showMoveLeftButton) { const onClick = (): void => { if (!room) throw new Error("room must be defined"); WidgetLayoutStore.instance.moveWithinContainer(room, Container.Top, app, -1); @@ -197,7 +251,7 @@ export const WidgetContextMenu: React.FC = ({ } let moveRightButton: JSX.Element | undefined; - if (showUnpin && widgetIndex < pinnedWidgets.length - 1) { + if (showMoveRightButton) { const onClick = (): void => { if (!room) throw new Error("room must be defined"); WidgetLayoutStore.instance.moveWithinContainer(room, Container.Top, app, 1); diff --git a/src/components/views/elements/AppTile.tsx b/src/components/views/elements/AppTile.tsx index 0d48113b7b4..2c1125e56d3 100644 --- a/src/components/views/elements/AppTile.tsx +++ b/src/components/views/elements/AppTile.tsx @@ -36,7 +36,7 @@ import { aboveLeftOf, ContextMenuButton } from "../../structures/ContextMenu"; import PersistedElement, { getPersistKey } from "./PersistedElement"; import { WidgetType } from "../../../widgets/WidgetType"; import { ElementWidget, StopGapWidget } from "../../../stores/widgets/StopGapWidget"; -import { WidgetContextMenu } from "../context_menus/WidgetContextMenu"; +import { showContextMenu, WidgetContextMenu } from "../context_menus/WidgetContextMenu"; import WidgetAvatar from "../avatars/WidgetAvatar"; import LegacyCallHandler from "../../../LegacyCallHandler"; import { IApp, isAppWidget } from "../../../stores/WidgetStore"; @@ -107,6 +107,7 @@ interface IState { error: Error | null; menuDisplayed: boolean; requiresClient: boolean; + hasContextMenuOptions: boolean; } export default class AppTile extends React.Component { @@ -249,6 +250,14 @@ export default class AppTile extends React.Component { error: null, menuDisplayed: false, requiresClient: this.determineInitialRequiresClientState(), + hasContextMenuOptions: showContextMenu( + this.context, + this.props.room, + newProps.app, + newProps.userWidget, + !newProps.userWidget, + newProps.onDeleteClick, + ), }; } @@ -770,15 +779,17 @@ export default class AppTile extends React.Component { )} - - - + {this.state.hasContextMenuOptions && ( + + + + )} )} From 86869356b3946e3590550f02e87ea699cbfa8c9c Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 14 Jul 2023 15:30:16 +0100 Subject: [PATCH 2/2] Update snapshots --- .../__snapshots__/AppTile-test.tsx.snap | 39 ------------------- 1 file changed, 39 deletions(-) diff --git a/test/components/views/elements/__snapshots__/AppTile-test.tsx.snap b/test/components/views/elements/__snapshots__/AppTile-test.tsx.snap index 843ee980e1e..70a1b899d0d 100644 --- a/test/components/views/elements/__snapshots__/AppTile-test.tsx.snap +++ b/test/components/views/elements/__snapshots__/AppTile-test.tsx.snap @@ -139,19 +139,6 @@ exports[`AppTile for a pinned widget should render 1`] = ` class="mx_Icon mx_Icon_12" /> -
-
-