From a6d7b72b3148e0f8f1a2ffbcccf04a7a27d240c8 Mon Sep 17 00:00:00 2001 From: twanadot <72481485+twanadot@users.noreply.github.com> Date: Wed, 16 Mar 2022 20:15:08 +0100 Subject: [PATCH 1/4] fixed signs order --- .../AvatarInfoWidgetOwnAvatarView.tsx | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/components/room/widgets/avatar-info/AvatarInfoWidgetOwnAvatarView.tsx b/src/components/room/widgets/avatar-info/AvatarInfoWidgetOwnAvatarView.tsx index 3b12ce59..716c65f0 100644 --- a/src/components/room/widgets/avatar-info/AvatarInfoWidgetOwnAvatarView.tsx +++ b/src/components/room/widgets/avatar-info/AvatarInfoWidgetOwnAvatarView.tsx @@ -258,34 +258,34 @@ export const AvatarInfoWidgetOwnAvatarView: FC processAction('sign_10') }> 10 + processAction('sign_11') }> + + + processAction('sign_12') }> + + + + processAction('sign_0') }> 0 + processAction('sign_13') }> + + processAction('sign_15') }> - processAction('sign_12') }> - - processAction('sign_14') }> processAction('sign_17') }> - - processAction('sign_16') }> - processAction('sign_13') }> - - - processAction('sign_11') }> - - processAction('back') }> From 49199361e5397090673486b3e1ac0cb8fafe1865 Mon Sep 17 00:00:00 2001 From: Layne Date: Wed, 16 Mar 2022 16:57:56 -0400 Subject: [PATCH 2/4] chat bubble clicking --- src/components/room/widgets/chat/ChatWidgetMessageView.tsx | 4 ++-- src/components/room/widgets/chat/ChatWidgetView.scss | 5 ----- src/components/room/widgets/chat/ChatWidgetView.tsx | 1 + 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/components/room/widgets/chat/ChatWidgetMessageView.tsx b/src/components/room/widgets/chat/ChatWidgetMessageView.tsx index 190d7629..fe005bb2 100644 --- a/src/components/room/widgets/chat/ChatWidgetMessageView.tsx +++ b/src/components/room/widgets/chat/ChatWidgetMessageView.tsx @@ -14,7 +14,7 @@ export const ChatWidgetMessageView: FC = props => const [ isVisible, setIsVisible ] = useState(false); const elementRef = useRef(); - const onMouseDown = (event: MouseEvent) => ((event.shiftKey) && onChatClicked(chat)); + const onMouseDown = (event: MouseEvent) => onChatClicked(chat); useEffect(() => { @@ -57,7 +57,7 @@ export const ChatWidgetMessageView: FC = props => useEffect(() => setIsVisible(chat.visible), [ chat.visible ]); return ( -
+
{ (chat.styleId === 0) &&
}
diff --git a/src/components/room/widgets/chat/ChatWidgetView.scss b/src/components/room/widgets/chat/ChatWidgetView.scss index d2b8c923..98b78a3e 100644 --- a/src/components/room/widgets/chat/ChatWidgetView.scss +++ b/src/components/room/widgets/chat/ChatWidgetView.scss @@ -39,11 +39,6 @@ // -webkit-animation-name: bounceIn; // animation-name: bounceIn; - &:hover, - &:active { - pointer-events: none; - } - .user-container-bg { position: absolute; top: -1px; diff --git a/src/components/room/widgets/chat/ChatWidgetView.tsx b/src/components/room/widgets/chat/ChatWidgetView.tsx index e36923ff..65970a6a 100644 --- a/src/components/room/widgets/chat/ChatWidgetView.tsx +++ b/src/components/room/widgets/chat/ChatWidgetView.tsx @@ -93,6 +93,7 @@ export const ChatWidgetView: FC<{}> = props => const onChatClicked = useCallback((chat: ChatBubbleMessage) => { + console.log('ehre') widgetHandler.processWidgetMessage(new RoomWidgetRoomObjectMessage(RoomWidgetRoomObjectMessage.GET_OBJECT_INFO, chat.senderId, chat.senderCategory)); widgetHandler.processWidgetMessage(new RoomWidgetChatSelectAvatarMessage(RoomWidgetChatSelectAvatarMessage.MESSAGE_SELECT_AVATAR, chat.senderId, chat.username, chat.roomId)); }, [ widgetHandler ]); From 894f6ddb19adda29909df79eb7556485c50fc677 Mon Sep 17 00:00:00 2001 From: Layne Date: Wed, 16 Mar 2022 17:03:56 -0400 Subject: [PATCH 3/4] remove console log my bad --- src/components/room/widgets/chat/ChatWidgetView.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/room/widgets/chat/ChatWidgetView.tsx b/src/components/room/widgets/chat/ChatWidgetView.tsx index 65970a6a..e36923ff 100644 --- a/src/components/room/widgets/chat/ChatWidgetView.tsx +++ b/src/components/room/widgets/chat/ChatWidgetView.tsx @@ -93,7 +93,6 @@ export const ChatWidgetView: FC<{}> = props => const onChatClicked = useCallback((chat: ChatBubbleMessage) => { - console.log('ehre') widgetHandler.processWidgetMessage(new RoomWidgetRoomObjectMessage(RoomWidgetRoomObjectMessage.GET_OBJECT_INFO, chat.senderId, chat.senderCategory)); widgetHandler.processWidgetMessage(new RoomWidgetChatSelectAvatarMessage(RoomWidgetChatSelectAvatarMessage.MESSAGE_SELECT_AVATAR, chat.senderId, chat.username, chat.roomId)); }, [ widgetHandler ]); From 4aacc61462f9c1d1f67ba8f1b0be4d26a9cbab0e Mon Sep 17 00:00:00 2001 From: Layne Date: Wed, 16 Mar 2022 17:23:58 -0400 Subject: [PATCH 4/4] mod tools chatlog user click --- src/components/mod-tools/views/chatlog/ChatlogView.tsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/mod-tools/views/chatlog/ChatlogView.tsx b/src/components/mod-tools/views/chatlog/ChatlogView.tsx index 7d29357a..27b99b51 100644 --- a/src/components/mod-tools/views/chatlog/ChatlogView.tsx +++ b/src/components/mod-tools/views/chatlog/ChatlogView.tsx @@ -1,8 +1,9 @@ -import { ChatRecordData, UserProfileComposer } from '@nitrots/nitro-renderer'; +import { ChatRecordData } from '@nitrots/nitro-renderer'; import { CSSProperties, FC, Key, useCallback } from 'react'; import { AutoSizer, CellMeasurer, CellMeasurerCache, List, ListRowProps } from 'react-virtualized'; -import { SendMessageComposer, TryVisitRoom } from '../../../../api'; +import { TryVisitRoom } from '../../../../api'; import { Base, Button, Column, Flex, Grid, Text } from '../../../../common'; +import { ModToolsOpenUserInfoEvent } from '../../../../events'; import { ModToolsOpenRoomInfoEvent } from '../../../../events/mod-tools/ModToolsOpenRoomInfoEvent'; import { DispatchUiEvent } from '../../../../hooks'; @@ -29,7 +30,7 @@ export const ChatlogView: FC = props => > { chatlogEntry.timestamp } - SendMessageComposer(new UserProfileComposer(chatlogEntry.userId)) }>{ chatlogEntry.userName } + DispatchUiEvent(new ModToolsOpenUserInfoEvent(chatlogEntry.userId)) }>{ chatlogEntry.userName } { chatlogEntry.message } @@ -79,7 +80,7 @@ export const ChatlogView: FC = props => { !isRoomInfo && { chatlogEntry.timestamp } - SendMessageComposer(new UserProfileComposer(chatlogEntry.userId)) }>{ chatlogEntry.userName } + DispatchUiEvent(new ModToolsOpenUserInfoEvent(chatlogEntry.userId)) }>{ chatlogEntry.userName } { chatlogEntry.message } }