diff --git a/src/components/left/main/Chat.scss b/src/components/left/main/Chat.scss index 15c439de5..1aa534c25 100644 --- a/src/components/left/main/Chat.scss +++ b/src/components/left/main/Chat.scss @@ -23,32 +23,44 @@ } } - &.selected, - &.selected:hover { - --background-color: var(--color-chat-active) !important; + @media (max-width: 600px) { + &.selected { + --background-color: var(--color-chat-hover) !important; - .Avatar.online::after { - border-color: var(--color-chat-active) !important; - background: var(--color-white); + .Avatar.online::after { + border-color: var(--color-chat-hover); + } } + } - .ListItem-button { + @media (min-width: 600px) { + &.selected, + &.selected:hover { --background-color: var(--color-chat-active) !important; - --color-text: var(--color-white); - --color-text-meta-colored: var(--color-white); - --color-text-meta: var(--color-white); - --color-text-secondary: var(--color-white); - --color-error: var(--color-white); - --color-pinned: var(--color-white); - } - .icon-muted-chat { - color: var(--color-white) !important; - } + .Avatar.online::after { + border-color: var(--color-chat-active) !important; + background: var(--color-white); + } - .Badge:not(.pinned) { - background: var(--color-white); - color: var(--color-chat-active); + .ListItem-button { + --background-color: var(--color-chat-active) !important; + --color-text: var(--color-white); + --color-text-meta-colored: var(--color-white); + --color-text-meta: var(--color-white); + --color-text-secondary: var(--color-white); + --color-error: var(--color-white); + --color-pinned: var(--color-white); + } + + .icon-muted-chat { + color: var(--color-white) !important; + } + + .Badge:not(.pinned) { + background: var(--color-white); + color: var(--color-chat-active); + } } } diff --git a/src/components/left/main/Chat.tsx b/src/components/left/main/Chat.tsx index a1a8d0d5f..673137325 100644 --- a/src/components/left/main/Chat.tsx +++ b/src/components/left/main/Chat.tsx @@ -256,7 +256,7 @@ const Chat: FC = ({ const className = buildClassName( 'Chat chat-item-clickable', isChatPrivate(chatId) ? 'private' : 'group', - isSelected && !IS_SINGLE_COLUMN_LAYOUT && 'selected', + isSelected && 'selected', ); return ( diff --git a/src/components/right/management/ManageChannel.tsx b/src/components/right/management/ManageChannel.tsx index 69c30f8ef..706d7d9fe 100644 --- a/src/components/right/management/ManageChannel.tsx +++ b/src/components/right/management/ManageChannel.tsx @@ -184,16 +184,25 @@ const ManageChannel: FC = ({ disabled={!canChangeInfo} /> {chat.isCreator && ( - + {lang('ChannelType')} {chat.username ? lang('TypePublic') : lang('TypePrivate')} )} - + {lang('Discussion')} {hasLinkedChat ? lang('DiscussionUnlink') : lang('Add')} - + {lang('ChannelAdministrators')} {adminsCount} @@ -206,7 +215,11 @@ const ManageChannel: FC = ({
- + {lang('ChannelSubscribers')} {lang('Subscribers', chat.membersCount!, 'i')} diff --git a/src/components/right/management/ManageChatAdministrators.tsx b/src/components/right/management/ManageChatAdministrators.tsx index a4b1f0b2a..9bea35075 100644 --- a/src/components/right/management/ManageChatAdministrators.tsx +++ b/src/components/right/management/ManageChatAdministrators.tsx @@ -5,8 +5,8 @@ import { withGlobal } from '../../../lib/teact/teactn'; import { ManagementScreens } from '../../../types'; import { ApiChat, ApiChatMember, ApiUser } from '../../../api/types'; -import { getUserFullName, isChatChannel } from '../../../modules/helpers'; +import { getUserFullName, isChatChannel } from '../../../modules/helpers'; import { selectChat } from '../../../modules/selectors'; import useLang from '../../../hooks/useLang'; import useHistoryBack from '../../../hooks/useHistoryBack'; @@ -86,7 +86,11 @@ const ManageChatAdministrators: FC = ({
- + {lang('EventLog')} {lang(isChannel ? 'EventLogInfoDetailChannel' : 'EventLogInfoDetail')} @@ -103,7 +107,6 @@ const ManageChatAdministrators: FC = ({ handleAdminMemberClick(member)} > = ({ disabled={!canChangeInfo} /> {chat.isCreator && ( - + {lang('GroupType')} {chat.username ? lang('TypePublic') : lang('TypePrivate')} )} {hasLinkedChannel && ( - + {lang('LinkedChannel')} {lang('DiscussionUnlink')} @@ -249,7 +253,6 @@ const ManageGroup: FC = ({ @@ -258,13 +261,17 @@ const ManageGroup: FC = ({ {enabledPermissionsCount}/{TOTAL_PERMISSIONS_COUNT} - + {lang('ChannelAdministrators')} {formatInteger(adminsCount)}
- + {lang('GroupMembers')} {formatInteger(chat.membersCount!)} diff --git a/src/components/right/management/ManageGroupPermissions.tsx b/src/components/right/management/ManageGroupPermissions.tsx index fb68b34a9..c6c03d02a 100644 --- a/src/components/right/management/ManageGroupPermissions.tsx +++ b/src/components/right/management/ManageGroupPermissions.tsx @@ -247,7 +247,12 @@ const ManageGroupPermissions: FC = ({
- + {lang('ChannelBlockedUsers')} {removedUsersCount} @@ -258,7 +263,6 @@ const ManageGroupPermissions: FC = ({ {lang('ChannelAddException')} @@ -268,7 +272,6 @@ const ManageGroupPermissions: FC = ({ handleExceptionMemberClick(member)} > = (props) => { if (ref) { containerRef = ref; } + const [isTouched, markIsTouched, unmarkIsTouched] = useFlag(); const { isContextMenuOpen, contextMenuPosition, @@ -97,7 +100,12 @@ const ListItem: FC = (props) => { return; } onClick(e); - }, [disabled, onClick]); + + if (IS_TOUCH_ENV && !ripple) { + markIsTouched(); + fastRaf(unmarkIsTouched); + } + }, [disabled, markIsTouched, onClick, ripple, unmarkIsTouched]); const handleMouseDown = useCallback((e: React.MouseEvent) => { if (inactive || IS_TOUCH_ENV) { @@ -141,7 +149,7 @@ const ListItem: FC = (props) => { style={style} >