From 720acdf5255a2fc38867b49f3789a36dd78e14ae Mon Sep 17 00:00:00 2001 From: Shea Duma Date: Wed, 13 May 2026 15:07:08 +0300 Subject: [PATCH] added settings --- .../common-settings/general/RoomProfile.tsx | 193 +++++++++++++++++- .../features/settings/cosmetics/Themes.tsx | 16 ++ src/app/features/settings/settingsLink.ts | 1 + src/app/hooks/usePanelSizes.ts | 4 + src/app/pages/client/space/Space.tsx | 46 ++--- src/app/state/settings.ts | 2 + 6 files changed, 230 insertions(+), 32 deletions(-) diff --git a/src/app/features/common-settings/general/RoomProfile.tsx b/src/app/features/common-settings/general/RoomProfile.tsx index 524c9f034..9b7f732bb 100644 --- a/src/app/features/common-settings/general/RoomProfile.tsx +++ b/src/app/features/common-settings/general/RoomProfile.tsx @@ -4,15 +4,22 @@ import { Button, Chip, color, + config, + Dialog, + Header, Icon, + IconButton, Icons, Input, + Overlay, + OverlayBackdrop, + OverlayCenter, Spinner, Text, TextArea, } from 'folds'; import type { FormEventHandler } from 'react'; -import { useCallback, useMemo, useState } from 'react'; +import { useCallback, useEffect, useMemo, useState } from 'react'; import { useAtomValue } from 'jotai'; import Linkify from 'linkify-react'; import classNames from 'classnames'; @@ -43,6 +50,9 @@ import { settingsAtom } from '$state/settings'; import { useStateEvent } from '$hooks/useStateEvent'; import type { RoomBannerContent } from '$types/matrix-sdk-events'; import { CustomStateEvent } from '$types/matrix/room'; +import { SettingTile } from '$components/setting-tile'; +import { stopPropagation } from '$utils/keyboard'; +import FocusTrap from 'focus-trap-react'; type RoomProfileEditProps = { canEditAvatar: boolean; @@ -299,6 +309,175 @@ export function RoomProfileEdit({ ); } +export type ProfileProps = { + bannerURI?: string; +}; +function RoomBannerEdit({ bannerURI }: Readonly) { + const mx = useMatrixClient(); + const [alertRemove, setAlertRemove] = useState(false); + + const space = useRoom(); + const [stagedUrl, setStagedUrl] = useState(); + const [isRemoving, setIsRemoving] = useState(false); + + const bannerUrl = bannerURI; + + useEffect(() => { + if (bannerUrl) { + setStagedUrl(undefined); + } + }, [bannerUrl]); + + const [imageFile, setImageFile] = useState(); + const imageFileURL = useObjectURL(imageFile); + + const uploadAtom = useMemo(() => { + if (imageFile) return createUploadAtom(imageFile); + return undefined; + }, [imageFile]); + + const pickFile = useFilePicker(setImageFile, false); + + const handlePick = useCallback(() => { + setIsRemoving(false); + setStagedUrl(undefined); + pickFile('image/*'); + }, [pickFile]); + + const handleRemoveUpload = useCallback(() => { + setImageFile(undefined); + }, []); + + const handleUploaded = useCallback( + (upload: UploadSuccess) => { + const { mxc } = upload; + + if (imageFileURL) setStagedUrl(imageFileURL); + mx.sendStateEvent(space.roomId, CustomStateEvent.RoomBanner, {url: mxc}, ''); + setImageFile(undefined); + }, + [mx, imageFileURL, space] + ); + + const handleRemoveBanner = async () => { + setIsRemoving(true); + setStagedUrl(undefined); + setImageFile(undefined); + + mx.sendStateEvent(space.roomId, CustomStateEvent.RoomBanner, {url: ''}, ''); + + setAlertRemove(false); + }; + + const previewUrl = isRemoving ? undefined : imageFileURL || stagedUrl || bannerUrl; + + return ( + + + + {previewUrl ? ( + Banner Preview + ) : ( + + + No Banner Set + + + )} + + + {uploadAtom ? ( + + + + ) : ( + + + {bannerUrl && ( + + )} + + )} + + + }> + + setAlertRemove(false), + clickOutsideDeactivates: true, + escapeDeactivates: stopPropagation, + }} + > + +
+ + Remove Banner + + setAlertRemove(false)} radii="300"> + + +
+ + Are you sure you want to remove profile banner? + + +
+
+
+
+
+ ); +} + type RoomProfileProps = { permissions: RoomPermissionsAPI; }; @@ -404,14 +583,10 @@ export function RoomProfile({ permissions }: RoomProfileProps) { className={SequenceCardStyle} variant="SurfaceVariant" direction="Column" - gap="400"> - - {`${name}'s - + gap="400" + > + + ); } diff --git a/src/app/features/settings/cosmetics/Themes.tsx b/src/app/features/settings/cosmetics/Themes.tsx index b67a30ae5..cf86aed12 100644 --- a/src/app/features/settings/cosmetics/Themes.tsx +++ b/src/app/features/settings/cosmetics/Themes.tsx @@ -237,6 +237,7 @@ function ThemeVisualPreferences() { const [linkPreviewMaxHeightInput, setLinkPreviewMaxHeightInput] = useState( linkPreviewImageMaxHeight.toString() ); + const [showRoomBanners,setShowRoomBanners] = useSetting(settingsAtom, 'showRoomBanners'); const handleIncomingDefaultHeightChange: ChangeEventHandler = (evt) => { const val = evt.target.value; @@ -345,6 +346,14 @@ function ThemeVisualPreferences() { /> + + } + /> + + { @@ -627,6 +640,7 @@ function SidebarWidth({ sidebarSelector }: { sidebarSelector: string }) { if (sidebarSelector === 'threadRootHeight') return threadRootHeight; if (sidebarSelector === 'vcmsgSidebarWidth') return vcmsgSidebarWidth; if (sidebarSelector === 'widgetSidebarWidth') return widgetSidebarWidth; + if (sidebarSelector === 'roomBannerHeight') return roomBannerHeight; return undefined; }, [ sidebarSelector, @@ -636,6 +650,7 @@ function SidebarWidth({ sidebarSelector }: { sidebarSelector: string }) { threadRootHeight, vcmsgSidebarWidth, widgetSidebarWidth, + roomBannerHeight ]); const [curValue, setCurValue] = useState(getCurValue); const setValue = (value: number) => { @@ -645,6 +660,7 @@ function SidebarWidth({ sidebarSelector }: { sidebarSelector: string }) { if (sidebarSelector === 'threadRootHeight') setThreadRootHeight(value); if (sidebarSelector === 'vcmsgSidebarWidth') setvcmsgSidebarWidth(value); if (sidebarSelector === 'widgetSidebarWidth') setWidgetSidebarWidth(value); + if (sidebarSelector === 'roomBannerHeight') setRoomBannerHeight(value); }; useEffect(() => { diff --git a/src/app/features/settings/settingsLink.ts b/src/app/features/settings/settingsLink.ts index 32a705c29..03cfac011 100644 --- a/src/app/features/settings/settingsLink.ts +++ b/src/app/features/settings/settingsLink.ts @@ -93,6 +93,7 @@ const settingsLinkFocusIdsBySection: Record layout: 'widgetSidebarWidth', name: 'Widget Panel Width', }, + { + layout: 'roomBannerHeight', + name: 'Room Banner Height', + }, ], [] ); diff --git a/src/app/pages/client/space/Space.tsx b/src/app/pages/client/space/Space.tsx index e00c7f933..ea653afba 100644 --- a/src/app/pages/client/space/Space.tsx +++ b/src/app/pages/client/space/Space.tsx @@ -271,6 +271,7 @@ function SpaceHeader({ hideText, mx }: { hideText?: boolean; mx: MatrixClient }) return cords; }); }; + const [showBanners] = useSetting(settingsAtom, 'showRoomBanners'); const [roomBannerHeight, setRoomBannerHeight] = useSetting(settingsAtom, 'roomBannerHeight'); const [curHeight, setCurHeight] = useState(roomBannerHeight); useEffect(() => { @@ -280,7 +281,7 @@ function SpaceHeader({ hideText, mx }: { hideText?: boolean; mx: MatrixClient }) const bannerState = useStateEvent(space, CustomStateEvent.RoomBanner); const bannerMXC = bannerState?.getContent()?.url; const bannerURI = mxcUrlToHttp(mx, bannerMXC ?? '', true); - const hasBanner = bannerURI && !hideText; + const hasBanner = bannerURI && !hideText && showBanners; return ( <> @@ -355,31 +356,30 @@ function SpaceHeader({ hideText, mx }: { hideText?: boolean; mx: MatrixClient }) )} - {bannerURI && !hideText && ( + {hasBanner && ( <> -
- - {`${spaceName}'s - -
- +
+ + {`${spaceName}'s + +
+ )} - ); } diff --git a/src/app/state/settings.ts b/src/app/state/settings.ts index 1b689fcc5..b1b744c1f 100644 --- a/src/app/state/settings.ts +++ b/src/app/state/settings.ts @@ -161,6 +161,7 @@ export interface Settings { showPersonaSetting: boolean; closeFoldersByDefault: boolean; showRoomIcon: ShowRoomIcon; + showRoomBanners: boolean; roomSidebarWidth: number; roomBannerHeight: number; memberSidebarWidth: number; @@ -292,6 +293,7 @@ export const defaultSettings: Settings = { showPersonaSetting: false, closeFoldersByDefault: false, showRoomIcon: ShowRoomIcon.Smart, + showRoomBanners: true, roomSidebarWidth: 256, roomBannerHeight: 190, memberSidebarWidth: 262,