From 3f6f45ca8cbab129e81ec1a13ac199348ad173bf Mon Sep 17 00:00:00 2001 From: Layne Date: Sun, 27 Mar 2022 04:39:07 +0000 Subject: [PATCH] @experimental/freeflowchat --- src/api/utils/DoElementsOverlap.ts | 10 -- src/api/utils/index.ts | 1 - .../NavigatorRoomSettingsVipChatTabView.tsx | 6 +- .../widgets/chat/ChatWidgetMessageView.tsx | 31 +++- .../room/widgets/chat/ChatWidgetView.scss | 2 +- .../room/widgets/chat/ChatWidgetView.tsx | 141 +++++++++++++----- .../widgets/chat/common/DoChatsOverlap.ts | 7 + 7 files changed, 136 insertions(+), 62 deletions(-) delete mode 100644 src/api/utils/DoElementsOverlap.ts create mode 100644 src/components/room/widgets/chat/common/DoChatsOverlap.ts diff --git a/src/api/utils/DoElementsOverlap.ts b/src/api/utils/DoElementsOverlap.ts deleted file mode 100644 index f28b0c86..00000000 --- a/src/api/utils/DoElementsOverlap.ts +++ /dev/null @@ -1,10 +0,0 @@ -export const DoElementsOverlap = (a: HTMLElement, b: HTMLElement) => -{ - const rectA = a.getBoundingClientRect(); - const rectB = b.getBoundingClientRect(); - - const ox = Math.abs(rectA.x - rectB.x) < (rectA.x < rectB.x ? rectB.width : rectA.width); - const oy = Math.abs(rectA.y - rectB.y) < (rectA.y < rectB.y ? rectB.height : rectA.height); - - return (ox && oy); -} diff --git a/src/api/utils/index.ts b/src/api/utils/index.ts index c63244a6..398758cb 100644 --- a/src/api/utils/index.ts +++ b/src/api/utils/index.ts @@ -1,6 +1,5 @@ export * from './CloneObject'; export * from './ColorUtils'; -export * from './DoElementsOverlap'; export * from './LocalizeBadgeDescription'; export * from './LocalizeBageName'; export * from './LocalizeFormattedNumber'; diff --git a/src/components/navigator/views/room-settings/NavigatorRoomSettingsVipChatTabView.tsx b/src/components/navigator/views/room-settings/NavigatorRoomSettingsVipChatTabView.tsx index cb6122bc..8ecb26eb 100644 --- a/src/components/navigator/views/room-settings/NavigatorRoomSettingsVipChatTabView.tsx +++ b/src/components/navigator/views/room-settings/NavigatorRoomSettingsVipChatTabView.tsx @@ -28,9 +28,9 @@ export const NavigatorRoomSettingsVipChatTabView: FC{LocalizeText('navigator.roomsettings.chat.mode.line.by.line')}