Compare commits

..
3 changed files with 22 additions and 61 deletions

View file

@ -1,11 +1,13 @@
import { Button, Popover, PopoverContent, PopoverTrigger } from "@tensamin/ui";
import {
Button,
Popover,
PopoverContent,
PopoverTrigger,
useIsMobile,
} from "@tensamin/ui";
import { ArrowLeft, House, Phone, Settings, User } from "lucide-react";
ArrowLeft,
ChevronDown,
ChevronUp,
House,
Phone,
Settings,
User,
} from "lucide-react";
import { useLocation, useNavigate, useSearch } from "@tanstack/react-router";
import { joinCall, useCall } from "@tensamin/call/store";
import Wrapper from "@tensamin/user/wrapper";
@ -31,8 +33,6 @@ export default function Navbar({ forMobile }: { forMobile: boolean }) {
call.call_members.some((member) => member === id),
);
const isMobile = useIsMobile();
const [selectOpen, setSelectOpen] = useState(false);
const [userInfoOpen, setUserInfoOpen] = useState(false);
@ -72,10 +72,8 @@ export default function Navbar({ forMobile }: { forMobile: boolean }) {
{pathname === "/chat" && id && (
<Wrapper
userId={id}
component={(user) =>
isMobile ? (
<p className="font-medium text-md">{user?.display}</p>
) : (
component={(user) => (
<>
<Popover open={userInfoOpen} onOpenChange={setUserInfoOpen}>
<PopoverTrigger
render={
@ -87,6 +85,7 @@ export default function Navbar({ forMobile }: { forMobile: boolean }) {
}}
>
<p className="font-medium text-md">{user?.display}</p>
{userInfoOpen ? <ChevronUp /> : <ChevronDown />}
</Button>
}
/>
@ -94,8 +93,8 @@ export default function Navbar({ forMobile }: { forMobile: boolean }) {
<Profile user={user} />
</PopoverContent>
</Popover>
)
}
</>
)}
loading={<Skeleton className="ml-3 w-40 h-5" />}
/>
)}

View file

@ -1,6 +1,6 @@
{
"name": "tensamin",
"version": "0.0.8",
"version": "0.0.7",
"private": true,
"workspaces": [
"packages/*",

View file

@ -11,8 +11,6 @@ import {
ContextMenuTrigger,
Drawer,
DrawerContent,
DrawerDescription,
DrawerTitle,
DrawerTrigger,
useIsMobile,
} from "@tensamin/ui";
@ -43,12 +41,6 @@ type MenuComponents = {
SubContent: (props: { children: ReactNode }) => ReactElement;
};
function blurActiveElement() {
if (document.activeElement instanceof HTMLElement) {
document.activeElement.blur();
}
}
const desktopMenuComponents: MenuComponents = {
Content: ContextMenuContent,
Group: ContextMenuGroup,
@ -59,20 +51,10 @@ const desktopMenuComponents: MenuComponents = {
SubContent: ContextMenuSubContent,
};
function getMobileMenuComponents({
description,
onClose,
title,
}: {
description: string;
onClose: () => void;
title: string;
}): MenuComponents {
function getMobileMenuComponents(onClose: () => void): MenuComponents {
return {
Content: ({ className, children }) => (
<DrawerContent>
<DrawerTitle className="sr-only">{title}</DrawerTitle>
<DrawerDescription className="sr-only">{description}</DrawerDescription>
<div className={cn("p-3!", className)}>{children}</div>
</DrawerContent>
),
@ -80,7 +62,6 @@ function getMobileMenuComponents({
Item: ({ children, className, disabled, onClick, variant = "default" }) => {
async function handleClick() {
await onClick?.();
blurActiveElement();
onClose();
}
@ -105,9 +86,8 @@ function getMobileMenuComponents({
Sub: ({ children }) => <div>{children}</div>,
SubTrigger: ({ children, onClick }) => {
async function handleClick() {
blurActiveElement();
onClose();
await onClick?.();
onClose();
}
return (
@ -218,23 +198,11 @@ export default function MessageContextMenu({
);
const [mainDrawerOpen, setMainDrawerOpen] = useState(false);
const [reactionDrawerOpen, setReactionDrawerOpen] = useState(false);
const mainDrawerComponents = useMemo(
() =>
getMobileMenuComponents({
description: "Actions available for this message.",
onClose: () => setMainDrawerOpen(false),
title: "Message actions",
}),
[],
const mainDrawerComponents = getMobileMenuComponents(() =>
setMainDrawerOpen(false),
);
const reactionDrawerComponents = useMemo(
() =>
getMobileMenuComponents({
description: "Choose a reaction to add to this message.",
onClose: () => setReactionDrawerOpen(false),
title: "Add reaction",
}),
[],
const reactionDrawerComponents = getMobileMenuComponents(() =>
setReactionDrawerOpen(false),
);
if (isMobile) {
@ -253,13 +221,7 @@ export default function MessageContextMenu({
</Drawer>
<Drawer open={reactionDrawerOpen} onOpenChange={setReactionDrawerOpen}>
<DrawerContent>
<DrawerTitle className="sr-only">Add reaction</DrawerTitle>
<DrawerDescription className="sr-only">
Choose a reaction to add to this message.
</DrawerDescription>
<div className="p-3!">
<ReactionItems Item={reactionDrawerComponents.Item} />
</div>
<ReactionItems Item={reactionDrawerComponents.Item} />
</DrawerContent>
</Drawer>
</>