Skip to content

Open-source and local-first Slack and Notion alternative that puts you in control of your data

Reuse read state indicator component

Hakan Shehu4b767eb23856
diff --git a/apps/desktop/src/renderer/components/channels/channel-sidebar-item.tsx b/apps/desktop/src/renderer/components/channels/channel-sidebar-item.tsx
index cbbddce1..1ad58456 100644
--- a/apps/desktop/src/renderer/components/channels/channel-sidebar-item.tsx
+++ b/apps/desktop/src/renderer/components/channels/channel-sidebar-item.tsx
@@ -3,6 +3,7 @@ import { ChannelNode } from '@colanode/core';
import { Avatar } from '@/renderer/components/avatars/avatar';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useRadar } from '@/renderer/contexts/radar';
+import { ReadStateIndicator } from '@/renderer/components/layouts/read-state-indicator';
interface ChannelSidebarItemProps {
node: ChannelNode;
@@ -39,13 +40,11 @@ export const ChannelSidebarItem = ({ node }: ChannelSidebarItemProps) => {
>
{node.attributes.name ?? 'Unnamed'}
</span>
- {!isActive && mentionsCount > 0 && (
- <span className="mr-1 rounded-md bg-sidebar-accent px-1 py-0.5 text-xs bg-red-400 text-white">
- {mentionsCount}
- </span>
- )}
- {!isActive && mentionsCount === 0 && unreadCount > 0 && (
- <span className="size-2 rounded-full bg-red-500" />
+ {!isActive && (
+ <ReadStateIndicator
+ count={mentionsCount}
+ hasChanges={unreadCount > 0}
+ />
)}
</button>
);
diff --git a/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx b/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx
index 618e146e..4979002b 100644
--- a/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx
+++ b/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx
@@ -4,6 +4,7 @@ import { Avatar } from '@/renderer/components/avatars/avatar';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useQuery } from '@/renderer/hooks/use-query';
import { useRadar } from '@/renderer/contexts/radar';
+import { ReadStateIndicator } from '@/renderer/components/layouts/read-state-indicator';
interface ChatSidebarItemProps {
node: ChatNode;
@@ -55,11 +56,7 @@ export const ChatSidebarItem = ({ node }: ChatSidebarItemProps) => {
>
{data.attributes.name ?? 'Unnamed'}
</span>
- {!isActive && unreadCount > 0 && (
- <span className="mr-1 rounded-md px-1 py-0.5 text-xs bg-red-400 text-white">
- {unreadCount}
- </span>
- )}
+ <ReadStateIndicator count={unreadCount} hasChanges={unreadCount > 0} />
</div>
);
};
diff --git a/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx b/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx
index 94c3f40f..90174a82 100644
--- a/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx
+++ b/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx
@@ -19,30 +19,13 @@ import { ChevronsUpDown, LogOut, Plus, Settings } from 'lucide-react';
import { useApp } from '@/renderer/contexts/app';
import { useNavigate } from 'react-router-dom';
import { useRadar } from '@/renderer/contexts/radar';
+import { ReadStateIndicator } from '@/renderer/components/layouts/read-state-indicator';
-interface ReadStateIndicatorProps {
+interface AccountReadState {
importantCount: number;
hasUnseenChanges: boolean;
}
-const ReadStateIndicator = ({
- importantCount,
- hasUnseenChanges,
-}: ReadStateIndicatorProps) => {
- return (
- <React.Fragment>
- {importantCount > 0 && (
- <span className="mr-1 rounded-md px-1 py-0.5 text-xs bg-red-400 text-white">
- {importantCount}
- </span>
- )}
- {importantCount === 0 && hasUnseenChanges && (
- <span className="size-2 rounded-full bg-red-500" />
- )}
- </React.Fragment>
- );
-};
-
export function LayoutSidebarFooter() {
const app = useApp();
const account = useAccount();
@@ -53,13 +36,13 @@ export function LayoutSidebarFooter() {
const [open, setOpen] = React.useState(false);
const otherAccounts = app.accounts.filter((a) => a.id !== account.id);
- const accountStates: Record<string, ReadStateIndicatorProps> = {};
+ const accountStates: Record<string, AccountReadState> = {};
for (const otherAccount of otherAccounts) {
const accountWorkspaces = app.workspaces.filter(
(w) => w.accountId === otherAccount.id
);
- const state: ReadStateIndicatorProps = {
+ const state: AccountReadState = {
importantCount: 0,
hasUnseenChanges: false,
};
@@ -103,8 +86,8 @@ export function LayoutSidebarFooter() {
</div>
<ChevronsUpDown className="ml-auto size-4" />
<ReadStateIndicator
- importantCount={importantCount}
- hasUnseenChanges={hasUnseenChanges}
+ count={importantCount}
+ hasChanges={hasUnseenChanges}
/>
</SidebarMenuButton>
</DropdownMenuTrigger>
@@ -179,8 +162,8 @@ export function LayoutSidebarFooter() {
</span>
</div>
<ReadStateIndicator
- importantCount={state.importantCount}
- hasUnseenChanges={state.hasUnseenChanges}
+ count={state.importantCount}
+ hasChanges={state.hasUnseenChanges}
/>
</div>
</DropdownMenuItem>
diff --git a/apps/desktop/src/renderer/components/layouts/layout-sidebar-header.tsx b/apps/desktop/src/renderer/components/layouts/layout-sidebar-header.tsx
index 0ff75ded..54aaa535 100644
--- a/apps/desktop/src/renderer/components/layouts/layout-sidebar-header.tsx
+++ b/apps/desktop/src/renderer/components/layouts/layout-sidebar-header.tsx
@@ -19,29 +19,7 @@ import {
} from '@/renderer/components/ui/sidebar';
import { ChevronsUpDown, Settings, Plus, Bell } from 'lucide-react';
import { useRadar } from '@/renderer/contexts/radar';
-
-interface ReadStateIndicatorProps {
- importantCount: number;
- hasUnseenChanges: boolean;
-}
-
-const ReadStateIndicator = ({
- importantCount,
- hasUnseenChanges,
-}: ReadStateIndicatorProps) => {
- return (
- <React.Fragment>
- {importantCount > 0 && (
- <span className="mr-1 rounded-md px-1 py-0.5 text-xs bg-red-400 text-white">
- {importantCount}
- </span>
- )}
- {importantCount === 0 && hasUnseenChanges && (
- <span className="size-2 rounded-full bg-red-500" />
- )}
- </React.Fragment>
- );
-};
+import { ReadStateIndicator } from '@/renderer/components/layouts/read-state-indicator';
export const LayoutSidebarHeader = () => {
const workspace = useWorkspace();
@@ -86,8 +64,8 @@ export const LayoutSidebarHeader = () => {
</div>
<ChevronsUpDown className="ml-auto size-4" />
<ReadStateIndicator
- importantCount={importantCount}
- hasUnseenChanges={hasUnseenChanges}
+ count={importantCount}
+ hasChanges={hasUnseenChanges}
/>
</SidebarMenuButton>
</DropdownMenuTrigger>
@@ -153,8 +131,8 @@ export const LayoutSidebarHeader = () => {
{otherWorkspace.name}
</p>
<ReadStateIndicator
- importantCount={workspaceState.importantCount}
- hasUnseenChanges={workspaceState.hasUnseenChanges}
+ count={workspaceState.importantCount}
+ hasChanges={workspaceState.hasUnseenChanges}
/>
</div>
</DropdownMenuItem>
diff --git a/apps/desktop/src/renderer/components/layouts/read-state-indicator.tsx b/apps/desktop/src/renderer/components/layouts/read-state-indicator.tsx
new file mode 100644
index 00000000..805910d8
--- /dev/null
+++ b/apps/desktop/src/renderer/components/layouts/read-state-indicator.tsx
@@ -0,0 +1,23 @@
+interface ReadStateIndicatorProps {
+ count: number;
+ hasChanges: boolean;
+}
+
+export const ReadStateIndicator = ({
+ count,
+ hasChanges,
+}: ReadStateIndicatorProps) => {
+ if (count === 0 && !hasChanges) {
+ return null;
+ }
+
+ if (count > 0) {
+ return (
+ <span className="mr-1 rounded-md px-1 py-0.5 text-xs bg-red-400 text-white">
+ {count}
+ </span>
+ );
+ }
+
+ return <span className="size-2 rounded-full bg-red-500" />;
+};