Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Remove wave animations from Space messages

Anand Baburajana6a8806fab61
diff --git a/web/apps/space/src/components/SpaceMessagesPage.tsx b/web/apps/space/src/components/SpaceMessagesPage.tsx
index 9b0cdf16b8..338a1488c1 100644
--- a/web/apps/space/src/components/SpaceMessagesPage.tsx
+++ b/web/apps/space/src/components/SpaceMessagesPage.tsx
@@ -50,22 +50,6 @@ const isFriendRequestConversation = (conversation: SpaceMessageConversation) =>
let nextLocalMessageID = 0;
const localMessageIdPrefix = "space-local-message-";
-const waveMessageText = "πŸ‘‹";
-
-const isUnreadIncomingWaveConversation = (
- conversation: SpaceMessageConversation,
-) => {
- const activity = conversation.latestActivity;
- return (
- (activity.type == "message" || activity.type == "post_reply") &&
- !activity.outgoing &&
- !activity.isUnavailable &&
- activity.text?.trim() == waveMessageText &&
- conversation.unreadActivities.some(
- (unreadActivity) => unreadActivity.id == activity.id,
- )
- );
-};
const createLocalMessageID = () =>
`${localMessageIdPrefix}${Date.now()}-${nextLocalMessageID++}`;
@@ -147,12 +131,6 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({
const [showFriendRequestCanceledToast, setShowFriendRequestCanceledToast] =
React.useState(false);
const [messages, setMessages] = React.useState<SpaceMessage[]>([]);
- const [
- previewWaveAnimationActivityIds,
- setPreviewWaveAnimationActivityIds,
- ] = React.useState<string[]>([]);
- const [waveAnimationMessageId, setWaveAnimationMessageId] =
- React.useState<string>();
const [selectedFriendProfile, setSelectedFriendProfile] =
React.useState<SpaceMessageConversation["friend"]>();
const [
@@ -167,9 +145,6 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({
);
const markedReadSpaceIdRef = React.useRef<string | undefined>(undefined);
const conversationsLoadGenerationRef = React.useRef(0);
- const animatedPreviewWaveActivityIdsRef = React.useRef<Set<string>>(
- new Set(),
- );
const previousSelectedSpaceIdRef = React.useRef<string | undefined>(
selectedSpaceId,
);
@@ -300,26 +275,6 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({
),
)
.map(conversationId);
- const nextPreviewWaveAnimationActivityIds = items
- .filter(isUnreadIncomingWaveConversation)
- .map((conversation) => conversation.latestActivity.id)
- .filter(
- (activityId) =>
- !animatedPreviewWaveActivityIdsRef.current.has(
- activityId,
- ),
- );
- if (nextPreviewWaveAnimationActivityIds.length > 0) {
- nextPreviewWaveAnimationActivityIds.forEach((activityId) =>
- animatedPreviewWaveActivityIdsRef.current.add(activityId),
- );
- setPreviewWaveAnimationActivityIds((currentIds) => [
- ...new Set([
- ...currentIds,
- ...nextPreviewWaveAnimationActivityIds,
- ]),
- ]);
- }
setNewConversationIds(unreadConversationIds);
setConversations(items);
setLatestPostCreatedAtMs(page.latestPostCreatedAtMs);
@@ -635,7 +590,6 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({
React.useEffect(() => {
markedReadSpaceIdRef.current = undefined;
- setWaveAnimationMessageId(undefined);
const actorSpaceId = profile?.spaceId;
if (!profile || !actorSpaceId || !selectedSpaceId) {
@@ -685,24 +639,6 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [profile?.spaceId, selectedFriendSpaceId, selectedSpaceId]);
- React.useEffect(() => {
- if (!waveAnimationMessageId) return;
- const timeoutID = window.setTimeout(
- () => setWaveAnimationMessageId(undefined),
- 700,
- );
- return () => window.clearTimeout(timeoutID);
- }, [waveAnimationMessageId]);
-
- React.useEffect(() => {
- if (previewWaveAnimationActivityIds.length == 0) return;
- const timeoutID = window.setTimeout(
- () => setPreviewWaveAnimationActivityIds([]),
- 950,
- );
- return () => window.clearTimeout(timeoutID);
- }, [previewWaveAnimationActivityIds]);
-
if (profileLoadStatus != "ready" || !profile) {
return (
<SpaceRouteFallback
@@ -734,10 +670,6 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({
messages={messages}
newConversationIds={newConversationIds}
latestPostCreatedAtMs={latestPostCreatedAtMs}
- previewWaveAnimationActivityIds={
- previewWaveAnimationActivityIds
- }
- waveAnimationMessageId={waveAnimationMessageId}
onBack={() => void router.push(spaceRoutes.home)}
onCloseThread={closeConversation}
onConfirmFriendRequest={confirmFriendRequest}
@@ -787,12 +719,6 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({
sender,
recipient,
);
- if (
- text.trim() == waveMessageText &&
- selectedFriendSpaceIdRef.current == spaceId
- ) {
- setWaveAnimationMessageId(message.id);
- }
replaceMessageIfThreadIsCurrent(
spaceId,
optimisticMessage.id,
@@ -827,12 +753,6 @@ export const SpaceMessagesPage: React.FC<SpaceMessagesPageProps> = ({
sender,
recipient,
);
- if (
- text.trim() == waveMessageText &&
- selectedFriendSpaceIdRef.current == spaceId
- ) {
- setWaveAnimationMessageId(message.id);
- }
replaceMessageIfThreadIsCurrent(
spaceId,
optimisticMessage.id,
diff --git a/web/apps/space/src/screens/MessagesScreen.tsx b/web/apps/space/src/screens/MessagesScreen.tsx
index 82f30f4f9a..60801a2557 100644
--- a/web/apps/space/src/screens/MessagesScreen.tsx
+++ b/web/apps/space/src/screens/MessagesScreen.tsx
@@ -120,13 +120,11 @@ interface MessagesScreenProps {
) => Promise<void>;
onSendMessage: (spaceId: string, text: string) => Promise<void>;
onSetMessageLiked: (messageId: string, liked: boolean) => Promise<void>;
- previewWaveAnimationActivityIds?: string[];
profileLink?: string;
newConversationIds?: string[];
profile: SetupProfile;
selectedFriend?: SpaceMessageConversation["friend"];
threadBackLabel?: string;
- waveAnimationMessageId?: string;
}
interface MessageContextMenuState {
@@ -247,8 +245,7 @@ const conversationPreview = (conversation: SpaceMessageConversation) => {
const ConversationPreviewLine: React.FC<{
conversation: SpaceMessageConversation;
- shouldAnimateWave: boolean;
-}> = ({ conversation, shouldAnimateWave }) => {
+}> = ({ conversation }) => {
const activity = conversation.latestActivity;
const previewLineSx = {
color: textSecondary,
@@ -262,34 +259,6 @@ const ConversationPreviewLine: React.FC<{
whiteSpace: "nowrap",
};
- if (shouldAnimateWave) {
- return (
- <Box sx={previewLineSx}>
- <Box
- component="span"
- sx={{
- animation:
- "spaceConversationPreviewWave 900ms ease-in-out",
- display: "inline-block",
- transformOrigin: "70% 70%",
- "@keyframes spaceConversationPreviewWave": {
- "0%, 100%": { transform: "rotate(0deg)" },
- "20%": { transform: "rotate(-18deg)" },
- "40%": { transform: "rotate(14deg)" },
- "60%": { transform: "rotate(-10deg)" },
- "80%": { transform: "rotate(6deg)" },
- },
- "@media (prefers-reduced-motion: reduce)": {
- animation: "none",
- },
- }}
- >
- {waveMessageText}
- </Box>
- </Box>
- );
- }
-
if (activity.type == "message_like" && activity.text) {
return (
<Box sx={{ ...previewLineSx, display: "flex" }}>
@@ -461,7 +430,6 @@ const ConversationListItem: React.FC<{
activityPost?: SpaceMessageActivityPost;
conversation: SpaceMessageConversation;
latestPostCreatedAtMs?: number | null;
- shouldAnimateWave: boolean;
onConfirmFriendRequest: (
conversation: SpaceMessageConversation,
) => Promise<void>;
@@ -476,7 +444,6 @@ const ConversationListItem: React.FC<{
activityPost,
conversation,
latestPostCreatedAtMs,
- shouldAnimateWave,
onConfirmFriendRequest,
onDeleteFriendRequest,
onLoadActivityPost,
@@ -721,10 +688,7 @@ const ConversationListItem: React.FC<{
{timestampLabel}
</Box>
</Box>
- <ConversationPreviewLine
- conversation={conversation}
- shouldAnimateWave={shouldAnimateWave}
- />
+ <ConversationPreviewLine conversation={conversation} />
</Box>
{showPostThumbnailSlot &&
(postThumbnailUrl ? (
@@ -869,7 +833,6 @@ const ConversationSection: React.FC<{
onOpenThread: (conversation: SpaceMessageConversation) => void;
onPostSomething: () => void;
section: ConversationSection;
- waveAnimationActivityIds: ReadonlySet<string>;
}> = ({
activityPostsByKey,
latestPostCreatedAtMs,
@@ -880,7 +843,6 @@ const ConversationSection: React.FC<{
onOpenThread,
onPostSomething,
section,
- waveAnimationActivityIds,
}) => {
if (section.items.length == 0) return null;
@@ -916,9 +878,6 @@ const ConversationSection: React.FC<{
}
conversation={conversation}
latestPostCreatedAtMs={latestPostCreatedAtMs}
- shouldAnimateWave={waveAnimationActivityIds.has(
- conversation.latestActivity.id,
- )}
onConfirmFriendRequest={onConfirmFriendRequest}
onDeleteFriendRequest={onDeleteFriendRequest}
onLoadActivityPost={onLoadActivityPost}
@@ -1397,7 +1356,6 @@ const MessageBubble: React.FC<{
ownSpaceID?: string;
parentMessage?: SpaceMessage;
profile: SetupProfile;
- shouldAnimateWave: boolean;
}> = ({
activityPost,
groupsWithNext,
@@ -1410,7 +1368,6 @@ const MessageBubble: React.FC<{
ownSpaceID,
parentMessage,
profile,
- shouldAnimateWave,
}) => {
const isOwn = message.sender.spaceId == ownSpaceID;
const isUnavailable = Boolean(message.isUnavailable);
@@ -1647,24 +1604,6 @@ const MessageBubble: React.FC<{
fontWeight: 600,
lineHeight: isWave ? "48px" : "21px",
overflowWrap: "anywhere",
- ...(isWave &&
- shouldAnimateWave && {
- animation:
- "spaceMessageBubbleWave 650ms ease-in-out",
- transformOrigin: "70% 70%",
- }),
- "@keyframes spaceMessageBubbleWave": {
- "0%, 100%": {
- transform: "rotate(0deg)",
- },
- "20%": { transform: "rotate(-18deg)" },
- "40%": { transform: "rotate(14deg)" },
- "60%": { transform: "rotate(-10deg)" },
- "80%": { transform: "rotate(6deg)" },
- },
- "@media (prefers-reduced-motion: reduce)": {
- animation: "none",
- },
whiteSpace: "pre-wrap",
}}
>
@@ -1726,12 +1665,10 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({
onReplyToMessage,
onSendMessage,
onSetMessageLiked,
- previewWaveAnimationActivityIds = [],
profile,
profileLink,
selectedFriend,
threadBackLabel = "Back to messages",
- waveAnimationMessageId,
}) => {
const [messageText, setMessageText] = React.useState("");
const [messageContextMenu, setMessageContextMenu] =
@@ -1778,10 +1715,6 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({
() => conversationTimeSections(conversations, newConversationIds),
[conversations, newConversationIds],
);
- const previewWaveAnimationActivityIdSet = React.useMemo(
- () => new Set(previewWaveAnimationActivityIds),
- [previewWaveAnimationActivityIds],
- );
const loadActivityPost = React.useCallback(
(post: SpaceMessageActivityPost) => {
if (!onLoadActivityPost) return;
@@ -2548,10 +2481,6 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({
profile={
profile
}
- shouldAnimateWave={
- message.id ==
- waveAnimationMessageId
- }
/>
</React.Fragment>
);
@@ -3010,9 +2939,6 @@ export const MessagesScreen: React.FC<MessagesScreenProps> = ({
openPostPhotoPicker
}
section={section}
- waveAnimationActivityIds={
- previewWaveAnimationActivityIdSet
- }
/>
))}
</Box>