From 731c790d497e671118325d2f5199c8895abb154f Mon Sep 17 00:00:00 2001 From: talksik Date: Wed, 18 May 2022 15:44:52 -0500 Subject: [PATCH] fancy stuff might be overkill --- packages/desktop/src/tree/protected/FlowState.tsx | 2 +- .../src/tree/protected/terminal/line/LineRow.tsx | 12 +++++++++++- .../src/tree/protected/terminal/panels/SidePanel.tsx | 8 ++++---- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/packages/desktop/src/tree/protected/FlowState.tsx b/packages/desktop/src/tree/protected/FlowState.tsx index 872bd96..2c3c4a0 100644 --- a/packages/desktop/src/tree/protected/FlowState.tsx +++ b/packages/desktop/src/tree/protected/FlowState.tsx @@ -27,7 +27,7 @@ export default function FlowState({ handleReconnect }: { handleReconnect: () => }, []); return ( -
+
{/* */} diff --git a/packages/desktop/src/tree/protected/terminal/line/LineRow.tsx b/packages/desktop/src/tree/protected/terminal/line/LineRow.tsx index 394db39..a496e88 100644 --- a/packages/desktop/src/tree/protected/terminal/line/LineRow.tsx +++ b/packages/desktop/src/tree/protected/terminal/line/LineRow.tsx @@ -9,6 +9,7 @@ import moment from 'moment'; import { useKeyPressEvent } from 'react-use'; import toast from 'react-hot-toast'; import { LineMemberState } from '@nirvana/core/models/line.model'; +import useElectron from '../../../../providers/ElectronProvider'; export default React.memo(function LineRow({ index, @@ -22,6 +23,7 @@ export default React.memo(function LineRow({ isSelected: boolean; }) { const { user } = useAuth(); + const { desktopMode, isWindowFocused } = useElectron(); const isUserTunedIn = useMemo( () => line.tunedInMemberIds?.includes(user._id.toString()), @@ -131,9 +133,17 @@ export default React.memo(function LineRow({ onClick={handleActivateLine} role={'presentation'} className={`flex flex-row items-center justify-start gap-2 px-4 py-4 hover:bg-gray-200 - cursor-pointer transition-all relative z-50 rounded + cursor-pointer transition-all relative z-50 ${isUserToggleTuned && ' bg-gray-100 shadow-2xl '} ${isSelected && ' bg-gray-200 shadow-2xl'} + + ${ + !isWindowFocused && + desktopMode === 'overlayOnly' && + isSelected && + ' bg-transparent opacity-100 ' + } + ${!isWindowFocused && desktopMode === 'overlayOnly' && !isSelected && ' bg-transparent '} `} > {/* channel picture */} diff --git a/packages/desktop/src/tree/protected/terminal/panels/SidePanel.tsx b/packages/desktop/src/tree/protected/terminal/panels/SidePanel.tsx index 872234a..b64513d 100644 --- a/packages/desktop/src/tree/protected/terminal/panels/SidePanel.tsx +++ b/packages/desktop/src/tree/protected/terminal/panels/SidePanel.tsx @@ -24,7 +24,7 @@ export default function SidePanel() { const { handleToggleDesktopMode, desktopMode, isWindowFocused } = useElectron(); - // todo: sort + // todo: sort based on content blocks and my last activity date const allChannels = useMemo(() => { let channels = Object.values(roomsMap); @@ -66,15 +66,15 @@ export default function SidePanel() { return (
{/* user control panel */}