mirror of
https://github.com/fromchat-messenger/web.git
synced 2026-09-22 19:15:08 +03:00
Implement better call UI
This commit is contained in:
@@ -2,7 +2,7 @@ import { LeftPanel } from "./left/LeftPanel";
|
||||
import { RightPanel } from "./right/RightPanel";
|
||||
import "@/pages/chat/css/chat.scss";
|
||||
import useDownloadAppScreen from "@/core/hooks/useDownloadAppScreen";
|
||||
import { CallWindow } from "./right/CallWindow";
|
||||
import { CallWindow } from "./right/calls/CallWindow";
|
||||
|
||||
export default function ChatPage() {
|
||||
const { navigate: navigateDownloadApp } = useDownloadAppScreen();
|
||||
|
||||
@@ -3,35 +3,29 @@ import useProfile from "@/pages/chat/hooks/useProfile";
|
||||
import defaultAvatar from "@/images/default-avatar.png";
|
||||
import { useState } from "react";
|
||||
import { ProfileDialog } from "./profile/ProfileDialog";
|
||||
import { MinimizedCallBar } from "@/pages/chat/ui/right/calls/MinimizedCallBar";
|
||||
|
||||
export function ChatHeader() {
|
||||
const { profileData } = useProfile();
|
||||
const [isProfileOpen, setIsProfileOpen] = useState(false);
|
||||
|
||||
const handleProfileClick = () => {
|
||||
setIsProfileOpen(true);
|
||||
};
|
||||
|
||||
const profilePictureUrl = profileData?.profile_picture || defaultAvatar;
|
||||
const [profilePictureUrl, setProfilePictureUrl] = useState(profileData?.profile_picture || defaultAvatar);
|
||||
|
||||
return (
|
||||
<>
|
||||
<header className="chat-header-left">
|
||||
<div className="product-name">{PRODUCT_NAME}</div>
|
||||
<div className="profile">
|
||||
<a href="#" id="profile-open" onClick={handleProfileClick}>
|
||||
<img
|
||||
<a href="#" id="profile-open" onClick={() => setIsProfileOpen(true)}>
|
||||
<img
|
||||
src={profilePictureUrl}
|
||||
alt=""
|
||||
alt=""
|
||||
id="preview1"
|
||||
onError={(e) => {
|
||||
const target = e.target as HTMLImageElement;
|
||||
target.src = defaultAvatar;
|
||||
}}
|
||||
/>
|
||||
onError={() => setProfilePictureUrl(defaultAvatar)} />
|
||||
</a>
|
||||
</div>
|
||||
</header>
|
||||
<MinimizedCallBar />
|
||||
<ProfileDialog isOpen={isProfileOpen} onOpenChange={setIsProfileOpen} />
|
||||
</>
|
||||
);
|
||||
|
||||
+98
-8
@@ -4,13 +4,26 @@ import useAudioCall from "@/pages/chat/hooks/useAudioCall";
|
||||
import defaultAvatar from "@/images/default-avatar.png";
|
||||
|
||||
export function CallWindow() {
|
||||
const { chat, toggleMute } = useAppState();
|
||||
const { chat, toggleMute, toggleCallMinimize } = useAppState();
|
||||
const { call } = chat;
|
||||
const { acceptCall, rejectCall, remoteAudioRef, endCall } = useAudioCall();
|
||||
const [position, setPosition] = useState({ x: 100, y: 100 });
|
||||
const [isDragging, setIsDragging] = useState(false);
|
||||
const [dragStart, setDragStart] = useState({ x: 0, y: 0 });
|
||||
const [callDuration, setCallDuration] = useState(0);
|
||||
const [isVisible, setIsVisible] = useState(false);
|
||||
const [shouldRender, setShouldRender] = useState(false);
|
||||
const [callData, setCallData] = useState<{
|
||||
remoteUsername: string | null;
|
||||
status: "calling" | "connecting" | "active" | "ended";
|
||||
isInitiator: boolean;
|
||||
isMuted: boolean;
|
||||
} | null>(null);
|
||||
|
||||
const status = callData?.status || call.status;
|
||||
const remoteUsername = callData?.remoteUsername || call.remoteUsername;
|
||||
const isInitiator = callData?.isInitiator || call.isInitiator;
|
||||
const isMuted = callData?.isMuted || call.isMuted;
|
||||
|
||||
useEffect(() => {
|
||||
let interval: NodeJS.Timeout;
|
||||
@@ -28,6 +41,62 @@ export function CallWindow() {
|
||||
};
|
||||
}, [call.status, call.startTime]);
|
||||
|
||||
// Preserve call data during exit animation
|
||||
useEffect(() => {
|
||||
if (call.isActive) {
|
||||
setCallData({
|
||||
remoteUsername: call.remoteUsername,
|
||||
status: call.status,
|
||||
isInitiator: call.isInitiator,
|
||||
isMuted: call.isMuted
|
||||
});
|
||||
}
|
||||
}, [call.isActive, call.remoteUsername, call.status, call.isInitiator, call.isMuted]);
|
||||
|
||||
// Handle visibility animation with entrance and exit delays
|
||||
useEffect(() => {
|
||||
if (call.isActive) {
|
||||
setShouldRender(true);
|
||||
if (!call.isMinimized) {
|
||||
// Call is active and not minimized - show window with entrance animation
|
||||
if (!isVisible) {
|
||||
// Only animate in if not already visible (prevents animation on rapid calls)
|
||||
requestAnimationFrame(() => {
|
||||
setIsVisible(true);
|
||||
});
|
||||
}
|
||||
} else {
|
||||
// Call is active but minimized - hide window but keep rendered
|
||||
setIsVisible(false);
|
||||
}
|
||||
} else {
|
||||
if (shouldRender) {
|
||||
// Call ended - start exit animation
|
||||
setIsVisible(false);
|
||||
// After animation completes, stop rendering
|
||||
const timer = setTimeout(() => {
|
||||
setShouldRender(false);
|
||||
setCallData(null);
|
||||
}, 300); // Match the CSS transition duration
|
||||
return () => clearTimeout(timer);
|
||||
} else {
|
||||
// Call not active and not rendered - ensure clean state
|
||||
setShouldRender(false);
|
||||
setIsVisible(false);
|
||||
setCallData(null);
|
||||
}
|
||||
}
|
||||
}, [call.isActive, call.isMinimized, shouldRender, isVisible]);
|
||||
|
||||
// Cleanup effect to reset state when component unmounts
|
||||
useEffect(() => {
|
||||
return () => {
|
||||
setIsVisible(false);
|
||||
setShouldRender(false);
|
||||
setCallData(null);
|
||||
};
|
||||
}, []);
|
||||
|
||||
function formatDuration(seconds: number) {
|
||||
const mins = Math.floor(seconds / 60);
|
||||
const secs = seconds % 60;
|
||||
@@ -35,7 +104,7 @@ export function CallWindow() {
|
||||
}
|
||||
|
||||
function getStatusText() {
|
||||
switch (call.status) {
|
||||
switch (status) {
|
||||
case "calling":
|
||||
return "Calling...";
|
||||
case "connecting":
|
||||
@@ -47,6 +116,19 @@ export function CallWindow() {
|
||||
}
|
||||
}
|
||||
|
||||
function getGradientClass() {
|
||||
switch (status) {
|
||||
case "calling":
|
||||
return "gradient-calling";
|
||||
case "connecting":
|
||||
return "gradient-connecting";
|
||||
case "active":
|
||||
return "gradient-active";
|
||||
default:
|
||||
return "gradient-default";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return (
|
||||
<>
|
||||
@@ -57,9 +139,9 @@ export function CallWindow() {
|
||||
playsInline
|
||||
controls />
|
||||
|
||||
{call.isActive && (
|
||||
{shouldRender && (
|
||||
<div
|
||||
className={`call-window ${isDragging ? 'dragging' : ''}`}
|
||||
className={`call-window ${isDragging ? 'dragging' : ''} ${getGradientClass()} ${isVisible ? 'visible' : 'hidden'}`}
|
||||
style={{
|
||||
left: position.x,
|
||||
top: position.y
|
||||
@@ -83,7 +165,15 @@ export function CallWindow() {
|
||||
onMouseLeave={() => setIsDragging(false)}
|
||||
>
|
||||
<div className="call-header">
|
||||
<div className="user-info">
|
||||
<div className="window-controls">
|
||||
<mdui-button-icon
|
||||
onClick={toggleCallMinimize}
|
||||
icon="minimize"
|
||||
className="minimize-btn"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="user-info-centered">
|
||||
<img
|
||||
src={defaultAvatar}
|
||||
alt="Avatar"
|
||||
@@ -91,7 +181,7 @@ export function CallWindow() {
|
||||
|
||||
<div className="user-details">
|
||||
<h3 className="username">
|
||||
{call.remoteUsername}
|
||||
{remoteUsername}
|
||||
</h3>
|
||||
<p className="status">
|
||||
{getStatusText()}
|
||||
@@ -101,14 +191,14 @@ export function CallWindow() {
|
||||
</div>
|
||||
|
||||
<div className="call-controls">
|
||||
{call.status === "calling" && !call.isInitiator ? (
|
||||
{status === "calling" && !isInitiator ? (
|
||||
<>
|
||||
<mdui-button-icon onClick={acceptCall} icon="call" />
|
||||
<mdui-button-icon onClick={rejectCall} icon="call_end" />
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<mdui-button-icon onClick={toggleMute} icon={call.isMuted ? "mic_off" : "mic"} />
|
||||
<mdui-button-icon onClick={toggleMute} icon={isMuted ? "mic_off" : "mic"} />
|
||||
<mdui-button-icon onClick={endCall} icon="call_end" />
|
||||
</>
|
||||
)}
|
||||
@@ -0,0 +1,62 @@
|
||||
import { useAppState } from "@/pages/chat/state";
|
||||
import useAudioCall from "@/pages/chat/hooks/useAudioCall";
|
||||
import defaultAvatar from "@/images/default-avatar.png";
|
||||
|
||||
export function MinimizedCallBar() {
|
||||
const { chat, toggleCallMinimize } = useAppState();
|
||||
const { call } = chat;
|
||||
const { endCall, toggleMute } = useAudioCall();
|
||||
|
||||
function getGradientClass() {
|
||||
switch (call.status) {
|
||||
case "calling":
|
||||
return "gradient-calling";
|
||||
case "connecting":
|
||||
return "gradient-connecting";
|
||||
case "active":
|
||||
return "gradient-active";
|
||||
default:
|
||||
return "gradient-default";
|
||||
}
|
||||
}
|
||||
|
||||
function getStatusText() {
|
||||
switch (call.status) {
|
||||
case "calling":
|
||||
return "Calling...";
|
||||
case "connecting":
|
||||
return "Connecting...";
|
||||
case "active":
|
||||
return "Active";
|
||||
default:
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
if (!call.isActive || !call.isMinimized) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return (
|
||||
<div className={`minimized-call-bar ${getGradientClass()}`} onClick={toggleCallMinimize}>
|
||||
<div className="call-info">
|
||||
<img src={defaultAvatar} alt="Avatar" className="avatar" />
|
||||
<div className="user-details">
|
||||
<span className="username">{call.remoteUsername}</span>
|
||||
<span className="status">{getStatusText()}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="call-actions" onClick={(e) => e.stopPropagation()}>
|
||||
{call.status === "calling" && !call.isInitiator ? (
|
||||
<mdui-button-icon onClick={endCall} icon="call_end" />
|
||||
) : (
|
||||
<>
|
||||
<mdui-button-icon onClick={toggleMute} icon={call.isMuted ? "mic_off" : "mic"} />
|
||||
<mdui-button-icon onClick={endCall} icon="call_end" />
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user