diff --git a/src/app/features/common-settings/appearance/Appearance.tsx b/src/app/features/common-settings/appearance/Appearance.tsx index 4954dc988..3d1266952 100644 --- a/src/app/features/common-settings/appearance/Appearance.tsx +++ b/src/app/features/common-settings/appearance/Appearance.tsx @@ -19,26 +19,27 @@ import { SettingTile } from '$components/setting-tile'; import { useRoom } from '$hooks/useRoom'; import { SequenceCardStyle } from '$features/common-settings/styles.css'; -import { useShowRoomIcon } from '$hooks/useShowRoomIcon'; +import { useShowPerRoomRoomIcon } from '$hooks/useShowRoomIcon'; import { useSetting } from '$state/hooks/settings'; import type { ShowRoomIcon } from '$state/settings'; import { settingsAtom } from '$state/settings'; import { stopPropagation } from '$utils/keyboard'; import FocusTrap from 'focus-trap-react'; -function SelectShowRoomIcon({roomId}: {roomId: string}) { +export function SelectShowPerRoomRoomIcon({roomId}: {roomId: string}) { const [menuCords, setMenuCords] = useState(); - const showRoomIconItems = useShowRoomIcon(); + const showRoomIconItems = useShowPerRoomRoomIcon(); const [showRoomIconArray, setShowRoomIconArray] = useSetting(settingsAtom, 'perRoomShowRoomIcon'); const showRoomIcon = showRoomIconArray.find(item => item.roomId === roomId )?.display; - + const handleMenu: MouseEventHandler = (evt) => { setMenuCords(evt.currentTarget.getBoundingClientRect()); }; - const handleSelect = (position: ShowRoomIcon) => { - const CleanedShowRoomIconArray = showRoomIconArray.filter(item => item.roomId !== roomId ); - const newShowRoomIconArray = [...CleanedShowRoomIconArray, {roomId, display: position}] + const handleSelect = (position?: ShowRoomIcon) => { + let newShowRoomIconArray = showRoomIconArray.filter(item => item.roomId !== roomId ); + if(position) + newShowRoomIconArray = [...newShowRoomIconArray, {roomId, display: position}] setShowRoomIconArray(newShowRoomIconArray); setMenuCords(undefined); }; @@ -134,7 +135,7 @@ export function Appearance({ requestClose }: AppearanceProps) { } + after={} /> diff --git a/src/app/features/settings/cosmetics/Themes.tsx b/src/app/features/settings/cosmetics/Themes.tsx index 6081accdc..8bea290e7 100644 --- a/src/app/features/settings/cosmetics/Themes.tsx +++ b/src/app/features/settings/cosmetics/Themes.tsx @@ -38,6 +38,7 @@ import FocusTrap from 'focus-trap-react'; import { useShowRoomIcon } from '$hooks/useShowRoomIcon'; import type { PanelSizetItem } from '$hooks/usePanelSizes'; import { usePanelSizeItems } from '$hooks/usePanelSizes'; +import { SelectShowPerRoomRoomIcon } from '$features/common-settings/appearance/Appearance'; const clampIncomingInlineImageHeight = (n: number) => Math.max(1, Math.min(4096, n)); @@ -717,7 +718,8 @@ function SelectShowRoomIcon() { setMenuCords(evt.currentTarget.getBoundingClientRect()); }; - const handleSelect = (position: ShowRoomIcon) => { + const handleSelect = (position?: ShowRoomIcon) => { + if(!position) return; setShowRoomIcon(position); setMenuCords(undefined); }; @@ -874,6 +876,16 @@ export function Appearance({ after={} /> + {/*THIS SHOULD BE MOVED TO A NEW SETTINGS MENU INSIDE OF THE HOME SETTINGS AS SOON AS THERE IS A REASON TO CREATE A HOME MENU SETTINGS PANEL + it is currently here because it would be eerie to have an entire home settings menu for just one single setting*/} + + } + /> + @@ -24,3 +24,26 @@ export const useShowRoomIcon = (): MessageLayoutItem[] => ], [] ); + +export const useShowPerRoomRoomIcon = (): MessageLayoutItem[] => + useMemo( + () => [ + { + layout: undefined, + name: 'Default', + }, + { + layout: ShowRoomIcon.Always, + name: 'Always', + }, + { + layout: ShowRoomIcon.Smart, + name: 'Smart', + }, + { + layout: ShowRoomIcon.Never, + name: 'Never', + }, + ], + [] + ); diff --git a/src/app/pages/client/space/Space.tsx b/src/app/pages/client/space/Space.tsx index 0c2e09c7f..ce3f3f935 100644 --- a/src/app/pages/client/space/Space.tsx +++ b/src/app/pages/client/space/Space.tsx @@ -520,21 +520,18 @@ export function Space() { const [roomSidebarWidth, setRoomSidebarWidth] = useSetting(settingsAtom, 'roomSidebarWidth'); const [curWidth, setCurWidth] = useState(roomSidebarWidth); - - const [showRoomIconGeneral] = useSetting(settingsAtom, 'showRoomIcon'); - - const [showRoomIconArray] = useSetting(settingsAtom, 'perRoomShowRoomIcon'); - // oxlint-disable-next-line no-console - console.log(showRoomIconArray, space.roomId); - - const showIcons = () => { - if (showRoomIconGeneral === ShowRoomIcon.Always) return true; - if (showRoomIconGeneral === ShowRoomIcon.Never) return false; - return curWidth < 144; - }; useEffect(() => { setCurWidth(roomSidebarWidth); }, [roomSidebarWidth]); + + const [showRoomIconGeneral] = useSetting(settingsAtom, 'showRoomIcon'); + const [showRoomIconArray] = useSetting(settingsAtom, 'perRoomShowRoomIcon'); + const showRoomIcon = showRoomIconArray.find(item => item.roomId === space.roomId )?.display ?? showRoomIconGeneral; + const showIcons = () => { + if (showRoomIcon === ShowRoomIcon.Always) return true; + if (showRoomIcon === ShowRoomIcon.Never) return false; + return curWidth < 144; + }; const [joinCallOnSingleClick] = useSetting(settingsAtom, 'joinCallOnSingleClick'); const tombstoneEvent = useStateEvent(space, EventType.RoomTombstone);