From cf4701e4e4c13e0582719bce002960af0251d881 Mon Sep 17 00:00:00 2001 From: Alexander Zinchuk Date: Fri, 28 Jul 2023 21:33:14 +0200 Subject: [PATCH] Embedded Message: Remove loading animation (#3690) --- src/components/common/EmbeddedMessage.scss | 8 -------- src/components/common/EmbeddedMessage.tsx | 10 +--------- src/lib/fasttextweb/fasttext.worker.ts | 7 +++++-- 3 files changed, 6 insertions(+), 19 deletions(-) diff --git a/src/components/common/EmbeddedMessage.scss b/src/components/common/EmbeddedMessage.scss index bb7670da2..3dbbb407a 100644 --- a/src/components/common/EmbeddedMessage.scss +++ b/src/components/common/EmbeddedMessage.scss @@ -172,12 +172,4 @@ color: var(--color-text-secondary); } } - - .embed-loading { - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - } } diff --git a/src/components/common/EmbeddedMessage.tsx b/src/components/common/EmbeddedMessage.tsx index 2fb4b3518..7558ccdd2 100644 --- a/src/components/common/EmbeddedMessage.tsx +++ b/src/components/common/EmbeddedMessage.tsx @@ -26,12 +26,10 @@ import useThumbnail from '../../hooks/useThumbnail'; import useLang from '../../hooks/useLang'; import { useFastClick } from '../../hooks/useFastClick'; import useMessageTranslation from '../middle/message/hooks/useMessageTranslation'; -import useShowTransition from '../../hooks/useShowTransition'; import ActionMessage from '../middle/ActionMessage'; import MessageSummary from './MessageSummary'; import MediaSpoiler from './MediaSpoiler'; -import Skeleton from '../ui/Skeleton'; import './EmbeddedMessage.scss'; @@ -78,15 +76,10 @@ const EmbeddedMessage: FC = ({ const isSpoiler = Boolean(message && getMessageIsSpoiler(message)); const shouldTranslate = message && isMessageTranslatable(message); - const { isPending: isTranslationPending, translatedText } = useMessageTranslation( + const { translatedText } = useMessageTranslation( chatTranslations, message?.chatId, shouldTranslate ? message?.id : undefined, requestedChatTranslationLanguage, ); - const { - shouldRender: shouldRenderLoader, - transitionClassNames, - } = useShowTransition(isTranslationPending || (!message && !customText)); - const lang = useLang(); const senderTitle = sender ? getSenderTitle(lang, sender) : message?.forwardInfo?.hiddenUserName; @@ -104,7 +97,6 @@ const EmbeddedMessage: FC = ({ onClick={message && handleClick} onMouseDown={message && handleMouseDown} > - {shouldRenderLoader && } {mediaThumbnail && renderPictogram(mediaThumbnail, mediaBlobUrl, isRoundVideo, isProtected, isSpoiler)}

diff --git a/src/lib/fasttextweb/fasttext.worker.ts b/src/lib/fasttextweb/fasttext.worker.ts index e19ec5153..4518e0371 100644 --- a/src/lib/fasttextweb/fasttext.worker.ts +++ b/src/lib/fasttextweb/fasttext.worker.ts @@ -1,3 +1,4 @@ +import { DEBUG } from '../../config'; import { createWorkerInterface } from '../../util/createPostMessageInterface'; import fasttextInitializer from './fasttext-wasm'; import fasttextWasmPath from './fasttext-wasm.wasm'; @@ -22,8 +23,10 @@ const fastTextPromise = fasttextInitializer({ }, }).then((fastText: FastTextMethods) => { fastTextInstance = fastText; - // eslint-disable-next-line no-console - console.log('[FASTTEXT] Worker ready'); + if (DEBUG) { + // eslint-disable-next-line no-console + console.log('[FASTTEXT] Worker ready'); + } }); function parseLabel(label: string) {