Management: Fix blinking elements (#5443)
This commit is contained in:
parent
9de7a95dcb
commit
2072059cf4
@ -23,7 +23,7 @@ import { selectChatFilters } from '../../../../hooks/reducers/useFoldersReducer'
|
|||||||
import useHistoryBack from '../../../../hooks/useHistoryBack';
|
import useHistoryBack from '../../../../hooks/useHistoryBack';
|
||||||
import useOldLang from '../../../../hooks/useOldLang';
|
import useOldLang from '../../../../hooks/useOldLang';
|
||||||
|
|
||||||
import AnimatedIcon from '../../../common/AnimatedIcon';
|
import AnimatedIconWithPreview from '../../../common/AnimatedIconWithPreview';
|
||||||
import GroupChatInfo from '../../../common/GroupChatInfo';
|
import GroupChatInfo from '../../../common/GroupChatInfo';
|
||||||
import Icon from '../../../common/icons/Icon';
|
import Icon from '../../../common/icons/Icon';
|
||||||
import PrivateChatInfo from '../../../common/PrivateChatInfo';
|
import PrivateChatInfo from '../../../common/PrivateChatInfo';
|
||||||
@ -283,7 +283,7 @@ const SettingsFoldersEdit: FC<OwnProps & StateProps> = ({
|
|||||||
<div className="settings-fab-wrapper">
|
<div className="settings-fab-wrapper">
|
||||||
<div className="settings-content no-border custom-scroll">
|
<div className="settings-content no-border custom-scroll">
|
||||||
<div className="settings-content-header">
|
<div className="settings-content-header">
|
||||||
<AnimatedIcon
|
<AnimatedIconWithPreview
|
||||||
size={STICKER_SIZE_FOLDER_SETTINGS}
|
size={STICKER_SIZE_FOLDER_SETTINGS}
|
||||||
tgsUrl={LOCAL_TGS_URLS.FoldersNew}
|
tgsUrl={LOCAL_TGS_URLS.FoldersNew}
|
||||||
play={String(state.folderId)}
|
play={String(state.folderId)}
|
||||||
|
|||||||
@ -21,7 +21,7 @@ import useHistoryBack from '../../../../hooks/useHistoryBack';
|
|||||||
import useOldLang from '../../../../hooks/useOldLang';
|
import useOldLang from '../../../../hooks/useOldLang';
|
||||||
import usePreviousDeprecated from '../../../../hooks/usePreviousDeprecated';
|
import usePreviousDeprecated from '../../../../hooks/usePreviousDeprecated';
|
||||||
|
|
||||||
import AnimatedIcon from '../../../common/AnimatedIcon';
|
import AnimatedIconWithPreview from '../../../common/AnimatedIconWithPreview';
|
||||||
import Icon from '../../../common/icons/Icon';
|
import Icon from '../../../common/icons/Icon';
|
||||||
import Button from '../../../ui/Button';
|
import Button from '../../../ui/Button';
|
||||||
import Draggable from '../../../ui/Draggable';
|
import Draggable from '../../../ui/Draggable';
|
||||||
@ -198,7 +198,7 @@ const SettingsFoldersMain: FC<OwnProps & StateProps> = ({
|
|||||||
return (
|
return (
|
||||||
<div className="settings-content no-border custom-scroll">
|
<div className="settings-content no-border custom-scroll">
|
||||||
<div className="settings-content-header">
|
<div className="settings-content-header">
|
||||||
<AnimatedIcon
|
<AnimatedIconWithPreview
|
||||||
size={STICKER_SIZE_FOLDER_SETTINGS}
|
size={STICKER_SIZE_FOLDER_SETTINGS}
|
||||||
tgsUrl={LOCAL_TGS_URLS.FoldersAll}
|
tgsUrl={LOCAL_TGS_URLS.FoldersAll}
|
||||||
className="settings-content-icon"
|
className="settings-content-icon"
|
||||||
|
|||||||
@ -34,8 +34,15 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.hidden {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
.FloatingActionButton {
|
.FloatingActionButton {
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
|
&.revealed {
|
||||||
|
transition-delay: 0.2s;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -110,6 +110,7 @@ type OwnProps = {
|
|||||||
profileState: ProfileState;
|
profileState: ProfileState;
|
||||||
isMobile?: boolean;
|
isMobile?: boolean;
|
||||||
onProfileStateChange: (state: ProfileState) => void;
|
onProfileStateChange: (state: ProfileState) => void;
|
||||||
|
isActive: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
type StateProps = {
|
type StateProps = {
|
||||||
@ -173,6 +174,7 @@ const INTERSECTION_THROTTLE = 500;
|
|||||||
|
|
||||||
const Profile: FC<OwnProps & StateProps> = ({
|
const Profile: FC<OwnProps & StateProps> = ({
|
||||||
chatId,
|
chatId,
|
||||||
|
isActive,
|
||||||
threadId,
|
threadId,
|
||||||
profileState,
|
profileState,
|
||||||
theme,
|
theme,
|
||||||
@ -826,7 +828,8 @@ const Profile: FC<OwnProps & StateProps> = ({
|
|||||||
|
|
||||||
{canAddMembers && (
|
{canAddMembers && (
|
||||||
<FloatingActionButton
|
<FloatingActionButton
|
||||||
isShown={resultType === 'members'}
|
className={buildClassName(!isActive && 'hidden')}
|
||||||
|
isShown={canRenderContent}
|
||||||
onClick={handleNewMemberDialogOpen}
|
onClick={handleNewMemberDialogOpen}
|
||||||
ariaLabel={oldLang('lng_channel_add_users')}
|
ariaLabel={oldLang('lng_channel_add_users')}
|
||||||
>
|
>
|
||||||
|
|||||||
@ -313,6 +313,7 @@ const RightColumn: FC<OwnProps & StateProps> = ({
|
|||||||
threadId={threadId}
|
threadId={threadId}
|
||||||
profileState={profileState}
|
profileState={profileState}
|
||||||
isMobile={isMobile}
|
isMobile={isMobile}
|
||||||
|
isActive={isOpen && isActive}
|
||||||
onProfileStateChange={setProfileState}
|
onProfileStateChange={setProfileState}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
|||||||
@ -17,7 +17,7 @@ import useFlag from '../../../hooks/useFlag';
|
|||||||
import useHistoryBack from '../../../hooks/useHistoryBack';
|
import useHistoryBack from '../../../hooks/useHistoryBack';
|
||||||
import useOldLang from '../../../hooks/useOldLang';
|
import useOldLang from '../../../hooks/useOldLang';
|
||||||
|
|
||||||
import AnimatedIcon from '../../common/AnimatedIcon';
|
import AnimatedIconWithPreview from '../../common/AnimatedIconWithPreview';
|
||||||
import Avatar from '../../common/Avatar';
|
import Avatar from '../../common/Avatar';
|
||||||
import GroupChatInfo from '../../common/GroupChatInfo';
|
import GroupChatInfo from '../../common/GroupChatInfo';
|
||||||
import NothingFound from '../../common/NothingFound';
|
import NothingFound from '../../common/NothingFound';
|
||||||
@ -248,7 +248,7 @@ const ManageDiscussion: FC<OwnProps & StateProps> = ({
|
|||||||
<div className="Management">
|
<div className="Management">
|
||||||
<div className="custom-scroll">
|
<div className="custom-scroll">
|
||||||
<div className="section">
|
<div className="section">
|
||||||
<AnimatedIcon
|
<AnimatedIconWithPreview
|
||||||
tgsUrl={LOCAL_TGS_URLS.DiscussionGroups}
|
tgsUrl={LOCAL_TGS_URLS.DiscussionGroups}
|
||||||
size={STICKER_SIZE_DISCUSSION_GROUPS}
|
size={STICKER_SIZE_DISCUSSION_GROUPS}
|
||||||
className="section-icon"
|
className="section-icon"
|
||||||
|
|||||||
@ -21,7 +21,7 @@ import useForceUpdate from '../../../hooks/useForceUpdate';
|
|||||||
import useHistoryBack from '../../../hooks/useHistoryBack';
|
import useHistoryBack from '../../../hooks/useHistoryBack';
|
||||||
import useOldLang from '../../../hooks/useOldLang';
|
import useOldLang from '../../../hooks/useOldLang';
|
||||||
|
|
||||||
import AnimatedIcon from '../../common/AnimatedIcon';
|
import AnimatedIconWithPreview from '../../common/AnimatedIconWithPreview';
|
||||||
import Icon from '../../common/icons/Icon';
|
import Icon from '../../common/icons/Icon';
|
||||||
import LinkField from '../../common/LinkField';
|
import LinkField from '../../common/LinkField';
|
||||||
import NothingFound from '../../common/NothingFound';
|
import NothingFound from '../../common/NothingFound';
|
||||||
@ -274,7 +274,7 @@ const ManageInvites: FC<OwnProps & StateProps> = ({
|
|||||||
<div className="Management ManageInvites">
|
<div className="Management ManageInvites">
|
||||||
<div className="custom-scroll">
|
<div className="custom-scroll">
|
||||||
<div className="section">
|
<div className="section">
|
||||||
<AnimatedIcon
|
<AnimatedIconWithPreview
|
||||||
tgsUrl={LOCAL_TGS_URLS.Invite}
|
tgsUrl={LOCAL_TGS_URLS.Invite}
|
||||||
size={STICKER_SIZE_INVITES}
|
size={STICKER_SIZE_INVITES}
|
||||||
className="section-icon"
|
className="section-icon"
|
||||||
|
|||||||
@ -13,7 +13,7 @@ import useFlag from '../../../hooks/useFlag';
|
|||||||
import useHistoryBack from '../../../hooks/useHistoryBack';
|
import useHistoryBack from '../../../hooks/useHistoryBack';
|
||||||
import useOldLang from '../../../hooks/useOldLang';
|
import useOldLang from '../../../hooks/useOldLang';
|
||||||
|
|
||||||
import AnimatedIcon from '../../common/AnimatedIcon';
|
import AnimatedIconWithPreview from '../../common/AnimatedIconWithPreview';
|
||||||
import Button from '../../ui/Button';
|
import Button from '../../ui/Button';
|
||||||
import ConfirmDialog from '../../ui/ConfirmDialog';
|
import ConfirmDialog from '../../ui/ConfirmDialog';
|
||||||
import Spinner from '../../ui/Spinner';
|
import Spinner from '../../ui/Spinner';
|
||||||
@ -68,7 +68,7 @@ const ManageJoinRequests: FC<OwnProps & StateProps> = ({
|
|||||||
<div className="Management ManageJoinRequests">
|
<div className="Management ManageJoinRequests">
|
||||||
<div className="custom-scroll">
|
<div className="custom-scroll">
|
||||||
<div className="section">
|
<div className="section">
|
||||||
<AnimatedIcon
|
<AnimatedIconWithPreview
|
||||||
tgsUrl={LOCAL_TGS_URLS.JoinRequest}
|
tgsUrl={LOCAL_TGS_URLS.JoinRequest}
|
||||||
size={STICKER_SIZE_JOIN_REQUESTS}
|
size={STICKER_SIZE_JOIN_REQUESTS}
|
||||||
className="section-icon"
|
className="section-icon"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user