diff --git a/src/App.tsx b/src/App.tsx index 08aba3b4e..2b272b8f4 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -5,7 +5,7 @@ import { getActions, withGlobal } from './global'; import type { GlobalState } from './global/types'; import type { UiLoaderPage } from './components/common/UiLoader'; -import { IS_INSTALL_PROMPT_SUPPORTED, IS_MULTITAB_SUPPORTED, PLATFORM_ENV } from './util/environment'; +import { IS_INSTALL_PROMPT_SUPPORTED, IS_MULTITAB_SUPPORTED, PLATFORM_ENV } from './util/windowEnvironment'; import { INACTIVE_MARKER, PAGE_TITLE } from './config'; import { selectTabState } from './global/selectors'; import { updateSizes } from './util/windowSize'; diff --git a/src/api/gramjs/worker/provider.ts b/src/api/gramjs/worker/provider.ts index b8fc10c79..362aea83d 100644 --- a/src/api/gramjs/worker/provider.ts +++ b/src/api/gramjs/worker/provider.ts @@ -5,7 +5,7 @@ import type { WorkerMessageEvent, OriginRequest, ThenArg } from './types'; import type { LocalDb } from '../localDb'; import type { TypedBroadcastChannel } from '../../../util/multitab'; -import { IS_MULTITAB_SUPPORTED } from '../../../util/environment'; +import { IS_MULTITAB_SUPPORTED } from '../../../util/windowEnvironment'; import { DATA_BROADCAST_CHANNEL_NAME, DEBUG } from '../../../config'; import generateIdFor from '../../../util/generateIdFor'; import { pause } from '../../../util/schedulers'; diff --git a/src/bundles/calls.ts b/src/bundles/calls.ts index 34bf1d891..83d8c839f 100644 --- a/src/bundles/calls.ts +++ b/src/bundles/calls.ts @@ -1,4 +1,4 @@ -import { IS_IOS, IS_SAFARI } from '../util/environment'; +import { IS_IOS, IS_SAFARI } from '../util/windowEnvironment'; import { initializeSoundsForSafari } from '../global/actions/ui/calls'; export { default as GroupCall } from '../components/calls/group/GroupCall'; diff --git a/src/bundles/main.ts b/src/bundles/main.ts index 13240fcc9..c0bbff364 100644 --- a/src/bundles/main.ts +++ b/src/bundles/main.ts @@ -1,6 +1,6 @@ import { getActions, getGlobal } from '../global'; -import { IS_MULTITAB_SUPPORTED } from '../util/environment'; +import { IS_MULTITAB_SUPPORTED } from '../util/windowEnvironment'; import { DEBUG } from '../config'; // eslint-disable-next-line import/no-cycle diff --git a/src/components/auth/Auth.tsx b/src/components/auth/Auth.tsx index 4ab23df37..d59f5ab1a 100644 --- a/src/components/auth/Auth.tsx +++ b/src/components/auth/Auth.tsx @@ -5,7 +5,7 @@ import { getActions, withGlobal } from '../../global'; import type { GlobalState } from '../../global/types'; import '../../global/actions/initial'; -import { PLATFORM_ENV } from '../../util/environment'; +import { PLATFORM_ENV } from '../../util/windowEnvironment'; import useHistoryBack from '../../hooks/useHistoryBack'; import useCurrentOrPrev from '../../hooks/useCurrentOrPrev'; diff --git a/src/components/auth/AuthCode.tsx b/src/components/auth/AuthCode.tsx index 4ec18fcaf..ec55f772a 100644 --- a/src/components/auth/AuthCode.tsx +++ b/src/components/auth/AuthCode.tsx @@ -6,7 +6,7 @@ import React, { import { getActions, withGlobal } from '../../global'; import type { GlobalState } from '../../global/types'; -import { IS_TOUCH_ENV } from '../../util/environment'; +import { IS_TOUCH_ENV } from '../../util/windowEnvironment'; import { pick } from '../../util/iteratees'; import renderText from '../common/helpers/renderText'; import useHistoryBack from '../../hooks/useHistoryBack'; diff --git a/src/components/auth/AuthPhoneNumber.tsx b/src/components/auth/AuthPhoneNumber.tsx index f3888eea3..529cd45c5 100644 --- a/src/components/auth/AuthPhoneNumber.tsx +++ b/src/components/auth/AuthPhoneNumber.tsx @@ -12,7 +12,7 @@ import type { GlobalState } from '../../global/types'; import type { LangCode } from '../../types'; import type { ApiCountryCode } from '../../api/types'; -import { IS_SAFARI, IS_TOUCH_ENV } from '../../util/environment'; +import { IS_SAFARI, IS_TOUCH_ENV } from '../../util/windowEnvironment'; import { preloadImage } from '../../util/files'; import preloadFonts from '../../util/fonts'; import { pick } from '../../util/iteratees'; diff --git a/src/components/calls/group/GroupCall.tsx b/src/components/calls/group/GroupCall.tsx index a3bed1644..3672a43de 100644 --- a/src/components/calls/group/GroupCall.tsx +++ b/src/components/calls/group/GroupCall.tsx @@ -17,7 +17,7 @@ import { IS_ANDROID, IS_IOS, IS_REQUEST_FULLSCREEN_SUPPORTED, -} from '../../../util/environment'; +} from '../../../util/windowEnvironment'; import { LOCAL_TGS_URLS } from '../../common/helpers/animatedAssets'; import buildClassName from '../../../util/buildClassName'; import { diff --git a/src/components/calls/phone/PhoneCall.tsx b/src/components/calls/phone/PhoneCall.tsx index 8a0d99785..eeb8789fb 100644 --- a/src/components/calls/phone/PhoneCall.tsx +++ b/src/components/calls/phone/PhoneCall.tsx @@ -12,7 +12,7 @@ import { IS_ANDROID, IS_IOS, IS_REQUEST_FULLSCREEN_SUPPORTED, -} from '../../../util/environment'; +} from '../../../util/windowEnvironment'; import { LOCAL_TGS_URLS } from '../../common/helpers/animatedAssets'; import { selectTabState } from '../../../global/selectors'; import buildClassName from '../../../util/buildClassName'; diff --git a/src/components/common/Avatar.tsx b/src/components/common/Avatar.tsx index 37f5ca709..ef655ca38 100644 --- a/src/components/common/Avatar.tsx +++ b/src/components/common/Avatar.tsx @@ -13,7 +13,7 @@ import type { AnimationLevel } from '../../types'; import { ApiMediaFormat } from '../../api/types'; import { ANIMATION_LEVEL_MAX, IS_TEST } from '../../config'; -import { VIDEO_AVATARS_DISABLED } from '../../util/environment'; +import { VIDEO_AVATARS_DISABLED } from '../../util/windowEnvironment'; import { getChatAvatarHash, getChatTitle, diff --git a/src/components/common/ChatForumLastMessage.tsx b/src/components/common/ChatForumLastMessage.tsx index daf252c26..d79932899 100644 --- a/src/components/common/ChatForumLastMessage.tsx +++ b/src/components/common/ChatForumLastMessage.tsx @@ -11,7 +11,7 @@ import type { ObserveFn } from '../../hooks/useIntersectionObserver'; import type { FC } from '../../lib/teact/teact'; import type { ApiChat } from '../../api/types'; -import { IS_TOUCH_ENV } from '../../util/environment'; +import { IS_TOUCH_ENV } from '../../util/windowEnvironment'; import buildClassName from '../../util/buildClassName'; import { getOrderedTopics } from '../../global/helpers'; import { getIsMobile } from '../../hooks/useAppLayout'; diff --git a/src/components/common/File.tsx b/src/components/common/File.tsx index dc41bd1ea..36d00e2e7 100644 --- a/src/components/common/File.tsx +++ b/src/components/common/File.tsx @@ -2,7 +2,7 @@ import type { RefObject } from 'react'; import type { FC } from '../../lib/teact/teact'; import React, { memo, useRef, useState } from '../../lib/teact/teact'; -import { IS_CANVAS_FILTER_SUPPORTED } from '../../util/environment'; +import { IS_CANVAS_FILTER_SUPPORTED } from '../../util/windowEnvironment'; import buildClassName from '../../util/buildClassName'; import { formatMediaDateTime, formatPastTimeShort } from '../../util/dateFormat'; import { getColorFromExtension, getFileSizeString } from './helpers/documentInfo'; diff --git a/src/components/common/GifButton.tsx b/src/components/common/GifButton.tsx index b9325cb46..9400705b9 100644 --- a/src/components/common/GifButton.tsx +++ b/src/components/common/GifButton.tsx @@ -6,7 +6,7 @@ import React, { import type { ApiVideo } from '../../api/types'; import { ApiMediaFormat } from '../../api/types'; -import { IS_TOUCH_ENV } from '../../util/environment'; +import { IS_TOUCH_ENV } from '../../util/windowEnvironment'; import buildClassName from '../../util/buildClassName'; import type { ObserveFn } from '../../hooks/useIntersectionObserver'; import { useIsIntersecting } from '../../hooks/useIntersectionObserver'; diff --git a/src/components/common/PasswordForm.tsx b/src/components/common/PasswordForm.tsx index 10e0796b9..9759fa786 100644 --- a/src/components/common/PasswordForm.tsx +++ b/src/components/common/PasswordForm.tsx @@ -5,7 +5,7 @@ import React, { } from '../../lib/teact/teact'; import { MIN_PASSWORD_LENGTH } from '../../config'; -import { IS_TOUCH_ENV } from '../../util/environment'; +import { IS_TOUCH_ENV } from '../../util/windowEnvironment'; import buildClassName from '../../util/buildClassName'; import stopEvent from '../../util/stopEvent'; import useLang from '../../hooks/useLang'; diff --git a/src/components/common/ProfileInfo.tsx b/src/components/common/ProfileInfo.tsx index 755785555..a536d7e6e 100644 --- a/src/components/common/ProfileInfo.tsx +++ b/src/components/common/ProfileInfo.tsx @@ -11,7 +11,7 @@ import type { GlobalState } from '../../global/types'; import type { AnimationLevel } from '../../types'; import { MediaViewerOrigin } from '../../types'; -import { IS_TOUCH_ENV } from '../../util/environment'; +import { IS_TOUCH_ENV } from '../../util/windowEnvironment'; import { MEMO_EMPTY_ARRAY } from '../../util/memo'; import { selectTabState, diff --git a/src/components/common/ProfilePhoto.tsx b/src/components/common/ProfilePhoto.tsx index 7ed3db093..f95dd8c5a 100644 --- a/src/components/common/ProfilePhoto.tsx +++ b/src/components/common/ProfilePhoto.tsx @@ -3,7 +3,7 @@ import React, { memo, useEffect, useRef } from '../../lib/teact/teact'; import type { FC, TeactNode } from '../../lib/teact/teact'; import type { ApiChat, ApiPhoto, ApiUser } from '../../api/types'; -import { IS_CANVAS_FILTER_SUPPORTED } from '../../util/environment'; +import { IS_CANVAS_FILTER_SUPPORTED } from '../../util/windowEnvironment'; import { getChatAvatarHash, getChatTitle, diff --git a/src/components/common/SliderDots.tsx b/src/components/common/SliderDots.tsx index fd8cbea9e..dbabcf047 100644 --- a/src/components/common/SliderDots.tsx +++ b/src/components/common/SliderDots.tsx @@ -4,7 +4,7 @@ import React, { memo, useCallback } from '../../lib/teact/teact'; import buildClassName from '../../util/buildClassName'; import styles from './SliderDots.module.scss'; -import { IS_TOUCH_ENV } from '../../util/environment'; +import { IS_TOUCH_ENV } from '../../util/windowEnvironment'; import Button from '../ui/Button'; type OwnProps = { diff --git a/src/components/common/StickerButton.tsx b/src/components/common/StickerButton.tsx index bd56aa86c..1d4e1f64e 100644 --- a/src/components/common/StickerButton.tsx +++ b/src/components/common/StickerButton.tsx @@ -8,7 +8,7 @@ import type { ApiBotInlineMediaResult, ApiSticker } from '../../api/types'; import buildClassName from '../../util/buildClassName'; import { preventMessageInputBlurWithBubbling } from '../middle/helpers/preventMessageInputBlur'; -import { IS_TOUCH_ENV } from '../../util/environment'; +import { IS_TOUCH_ENV } from '../../util/windowEnvironment'; import { getServerTimeOffset } from '../../util/serverTime'; import type { ObserveFn } from '../../hooks/useIntersectionObserver'; diff --git a/src/components/common/StickerView.tsx b/src/components/common/StickerView.tsx index a4eaf9691..2414ca179 100644 --- a/src/components/common/StickerView.tsx +++ b/src/components/common/StickerView.tsx @@ -5,7 +5,7 @@ import type { FC } from '../../lib/teact/teact'; import type { ObserveFn } from '../../hooks/useIntersectionObserver'; import type { ApiSticker } from '../../api/types'; -import { IS_WEBM_SUPPORTED } from '../../util/environment'; +import { IS_WEBM_SUPPORTED } from '../../util/windowEnvironment'; import * as mediaLoader from '../../util/mediaLoader'; import buildClassName from '../../util/buildClassName'; import generateIdFor from '../../util/generateIdFor'; diff --git a/src/components/common/helpers/mediaDimensions.ts b/src/components/common/helpers/mediaDimensions.ts index e45f92af5..3620e95f0 100644 --- a/src/components/common/helpers/mediaDimensions.ts +++ b/src/components/common/helpers/mediaDimensions.ts @@ -3,7 +3,7 @@ import type { } from '../../../api/types'; import { STICKER_SIZE_INLINE_DESKTOP_FACTOR, STICKER_SIZE_INLINE_MOBILE_FACTOR } from '../../../config'; -import { IS_TOUCH_ENV } from '../../../util/environment'; +import { IS_TOUCH_ENV } from '../../../util/windowEnvironment'; import windowSize from '../../../util/windowSize'; import { getPhotoInlineDimensions, getVideoDimensions } from '../../../global/helpers'; diff --git a/src/components/common/helpers/renderText.tsx b/src/components/common/helpers/renderText.tsx index 3208f744f..ffb4f23c2 100644 --- a/src/components/common/helpers/renderText.tsx +++ b/src/components/common/helpers/renderText.tsx @@ -5,7 +5,7 @@ import type { TextPart } from '../../../types'; import EMOJI_REGEX from '../../../lib/twemojiRegex'; import { RE_LINK_TEMPLATE, RE_MENTION_TEMPLATE } from '../../../config'; -import { IS_EMOJI_SUPPORTED } from '../../../util/environment'; +import { IS_EMOJI_SUPPORTED } from '../../../util/windowEnvironment'; import { fixNonStandardEmoji, handleEmojiLoad, diff --git a/src/components/left/LeftColumn.tsx b/src/components/left/LeftColumn.tsx index 0f5197015..2b61907ff 100644 --- a/src/components/left/LeftColumn.tsx +++ b/src/components/left/LeftColumn.tsx @@ -7,7 +7,7 @@ import type { FC } from '../../lib/teact/teact'; import type { GlobalState } from '../../global/types'; import { LeftColumnContent, SettingsScreens } from '../../types'; -import { IS_MAC_OS, IS_PWA, LAYERS_ANIMATION_NAME } from '../../util/environment'; +import { IS_MAC_OS, IS_PWA, LAYERS_ANIMATION_NAME } from '../../util/windowEnvironment'; import captureEscKeyListener from '../../util/captureEscKeyListener'; import { selectTabState, selectCurrentChat, selectIsForumPanelOpen } from '../../global/selectors'; import useFoldersReducer from '../../hooks/reducers/useFoldersReducer'; diff --git a/src/components/left/main/Chat.tsx b/src/components/left/main/Chat.tsx index 116be18fd..cc288028f 100644 --- a/src/components/left/main/Chat.tsx +++ b/src/components/left/main/Chat.tsx @@ -17,7 +17,7 @@ import type { AnimationLevel } from '../../../types'; import type { ChatAnimationTypes } from './hooks'; import { MAIN_THREAD_ID } from '../../../api/types'; -import { IS_OPEN_IN_NEW_TAB_SUPPORTED } from '../../../util/environment'; +import { IS_OPEN_IN_NEW_TAB_SUPPORTED } from '../../../util/windowEnvironment'; import { isUserId, getPrivateChatUserId, diff --git a/src/components/left/main/ChatFolders.tsx b/src/components/left/main/ChatFolders.tsx index acdd7ed2f..1d93db8c8 100644 --- a/src/components/left/main/ChatFolders.tsx +++ b/src/components/left/main/ChatFolders.tsx @@ -10,7 +10,7 @@ import type { FolderEditDispatch } from '../../../hooks/reducers/useFoldersReduc import type { GlobalState } from '../../../global/types'; import { ALL_FOLDER_ID } from '../../../config'; -import { IS_TOUCH_ENV } from '../../../util/environment'; +import { IS_TOUCH_ENV } from '../../../util/windowEnvironment'; import { captureEvents, SwipeDirection } from '../../../util/captureEvents'; import buildClassName from '../../../util/buildClassName'; import captureEscKeyListener from '../../../util/captureEscKeyListener'; diff --git a/src/components/left/main/ChatList.tsx b/src/components/left/main/ChatList.tsx index ea1322395..b070a41f7 100644 --- a/src/components/left/main/ChatList.tsx +++ b/src/components/left/main/ChatList.tsx @@ -16,7 +16,7 @@ import { CHAT_HEIGHT_PX, CHAT_LIST_SLICE, } from '../../../config'; -import { IS_MAC_OS, IS_PWA } from '../../../util/environment'; +import { IS_MAC_OS, IS_PWA } from '../../../util/windowEnvironment'; import { getPinnedChatsCount, getOrderKey } from '../../../util/folderManager'; import buildClassName from '../../../util/buildClassName'; diff --git a/src/components/left/main/ForumPanel.tsx b/src/components/left/main/ForumPanel.tsx index 9391467b7..2ed144636 100644 --- a/src/components/left/main/ForumPanel.tsx +++ b/src/components/left/main/ForumPanel.tsx @@ -11,7 +11,7 @@ import { GENERAL_TOPIC_ID, TOPICS_SLICE, TOPIC_HEIGHT_PX, TOPIC_LIST_SENSITIVE_AREA, ANIMATION_LEVEL_MIN, } from '../../../config'; -import { IS_TOUCH_ENV } from '../../../util/environment'; +import { IS_TOUCH_ENV } from '../../../util/windowEnvironment'; import { selectChat, selectCurrentMessageList, selectIsForumPanelOpen, selectTabState, } from '../../../global/selectors'; diff --git a/src/components/left/main/LeftMain.tsx b/src/components/left/main/LeftMain.tsx index b68d91af2..0bd22aaaf 100644 --- a/src/components/left/main/LeftMain.tsx +++ b/src/components/left/main/LeftMain.tsx @@ -7,7 +7,7 @@ import type { SettingsScreens } from '../../../types'; import { LeftColumnContent } from '../../../types'; import type { FolderEditDispatch } from '../../../hooks/reducers/useFoldersReducer'; -import { IS_TOUCH_ENV } from '../../../util/environment'; +import { IS_TOUCH_ENV } from '../../../util/windowEnvironment'; import buildClassName from '../../../util/buildClassName'; import useShowTransition from '../../../hooks/useShowTransition'; import useLang from '../../../hooks/useLang'; diff --git a/src/components/left/main/LeftMainHeader.tsx b/src/components/left/main/LeftMainHeader.tsx index 3a5aa570a..30c173d66 100644 --- a/src/components/left/main/LeftMainHeader.tsx +++ b/src/components/left/main/LeftMainHeader.tsx @@ -19,7 +19,7 @@ import { IS_TEST, PRODUCTION_HOSTNAME, } from '../../../config'; -import { IS_PWA } from '../../../util/environment'; +import { IS_PWA } from '../../../util/windowEnvironment'; import buildClassName from '../../../util/buildClassName'; import { formatDateToString } from '../../../util/dateFormat'; import switchTheme from '../../../util/switchTheme'; diff --git a/src/components/left/main/Topic.tsx b/src/components/left/main/Topic.tsx index 2084b03c1..f2e3a68cd 100644 --- a/src/components/left/main/Topic.tsx +++ b/src/components/left/main/Topic.tsx @@ -11,7 +11,7 @@ import type { ObserveFn } from '../../../hooks/useIntersectionObserver'; import type { ChatAnimationTypes } from './hooks'; import type { AnimationLevel } from '../../../types'; -import { IS_OPEN_IN_NEW_TAB_SUPPORTED } from '../../../util/environment'; +import { IS_OPEN_IN_NEW_TAB_SUPPORTED } from '../../../util/windowEnvironment'; import { selectCanDeleteTopic, selectChat, diff --git a/src/components/left/main/hooks/useTopicContextActions.ts b/src/components/left/main/hooks/useTopicContextActions.ts index ac43dd175..21b71fd2c 100644 --- a/src/components/left/main/hooks/useTopicContextActions.ts +++ b/src/components/left/main/hooks/useTopicContextActions.ts @@ -6,7 +6,7 @@ import type { MenuItemContextAction } from '../../../ui/ListItem'; import { compact } from '../../../../util/iteratees'; import { getCanManageTopic, getHasAdminRight } from '../../../../global/helpers'; -import { IS_OPEN_IN_NEW_TAB_SUPPORTED } from '../../../../util/environment'; +import { IS_OPEN_IN_NEW_TAB_SUPPORTED } from '../../../../util/windowEnvironment'; import useLang from '../../../../hooks/useLang'; diff --git a/src/components/left/newChat/NewChat.tsx b/src/components/left/newChat/NewChat.tsx index 369e7ea45..e3e4b6b5f 100644 --- a/src/components/left/newChat/NewChat.tsx +++ b/src/components/left/newChat/NewChat.tsx @@ -3,7 +3,7 @@ import React, { memo, useCallback, useState } from '../../../lib/teact/teact'; import { LeftColumnContent } from '../../../types'; -import { LAYERS_ANIMATION_NAME } from '../../../util/environment'; +import { LAYERS_ANIMATION_NAME } from '../../../util/windowEnvironment'; import Transition from '../../ui/Transition'; import NewChatStep1 from './NewChatStep1'; diff --git a/src/components/left/settings/Settings.tsx b/src/components/left/settings/Settings.tsx index dfde1348e..fc25c8a90 100644 --- a/src/components/left/settings/Settings.tsx +++ b/src/components/left/settings/Settings.tsx @@ -4,7 +4,7 @@ import React, { memo, useCallback, useState } from '../../../lib/teact/teact'; import { SettingsScreens } from '../../../types'; import type { FolderEditDispatch, FoldersState } from '../../../hooks/reducers/useFoldersReducer'; -import { LAYERS_ANIMATION_NAME } from '../../../util/environment'; +import { LAYERS_ANIMATION_NAME } from '../../../util/windowEnvironment'; import useTwoFaReducer from '../../../hooks/reducers/useTwoFaReducer'; import Transition from '../../ui/Transition'; diff --git a/src/components/left/settings/SettingsGeneral.tsx b/src/components/left/settings/SettingsGeneral.tsx index ab303c2e0..d7ea8b0b2 100644 --- a/src/components/left/settings/SettingsGeneral.tsx +++ b/src/components/left/settings/SettingsGeneral.tsx @@ -9,7 +9,7 @@ import { SettingsScreens } from '../../../types'; import { getSystemTheme, IS_IOS, IS_MAC_OS, IS_TOUCH_ENV, -} from '../../../util/environment'; +} from '../../../util/windowEnvironment'; import { pick } from '../../../util/iteratees'; import { setTimeFormat } from '../../../util/langProvider'; import useLang from '../../../hooks/useLang'; diff --git a/src/components/left/settings/twoFa/SettingsTwoFaEmailCode.tsx b/src/components/left/settings/twoFa/SettingsTwoFaEmailCode.tsx index 3f168b270..ff539c000 100644 --- a/src/components/left/settings/twoFa/SettingsTwoFaEmailCode.tsx +++ b/src/components/left/settings/twoFa/SettingsTwoFaEmailCode.tsx @@ -6,7 +6,7 @@ import { withGlobal } from '../../../../global'; import type { ApiSticker } from '../../../../api/types'; -import { IS_TOUCH_ENV } from '../../../../util/environment'; +import { IS_TOUCH_ENV } from '../../../../util/windowEnvironment'; import { selectAnimatedEmoji } from '../../../../global/selectors'; import useLang from '../../../../hooks/useLang'; import useHistoryBack from '../../../../hooks/useHistoryBack'; diff --git a/src/components/left/settings/twoFa/SettingsTwoFaSkippableForm.tsx b/src/components/left/settings/twoFa/SettingsTwoFaSkippableForm.tsx index b62fd9210..fa18c086b 100644 --- a/src/components/left/settings/twoFa/SettingsTwoFaSkippableForm.tsx +++ b/src/components/left/settings/twoFa/SettingsTwoFaSkippableForm.tsx @@ -6,7 +6,7 @@ import { withGlobal } from '../../../../global'; import type { ApiSticker } from '../../../../api/types'; -import { IS_TOUCH_ENV } from '../../../../util/environment'; +import { IS_TOUCH_ENV } from '../../../../util/windowEnvironment'; import { selectAnimatedEmoji } from '../../../../global/selectors'; import renderText from '../../../common/helpers/renderText'; import useFlag from '../../../../hooks/useFlag'; diff --git a/src/components/main/DownloadManager.tsx b/src/components/main/DownloadManager.tsx index ad581b69a..51ba1415a 100644 --- a/src/components/main/DownloadManager.tsx +++ b/src/components/main/DownloadManager.tsx @@ -7,7 +7,7 @@ import type { ApiMessage } from '../../api/types'; import { ApiMediaFormat } from '../../api/types'; import { selectTabState } from '../../global/selectors'; -import { IS_OPFS_SUPPORTED, IS_SERVICE_WORKER_SUPPORTED, MAX_BUFFER_SIZE } from '../../util/environment'; +import { IS_OPFS_SUPPORTED, IS_SERVICE_WORKER_SUPPORTED, MAX_BUFFER_SIZE } from '../../util/windowEnvironment'; import * as mediaLoader from '../../util/mediaLoader'; import download from '../../util/download'; import { diff --git a/src/components/main/Main.tsx b/src/components/main/Main.tsx index b39676662..21d5ff095 100644 --- a/src/components/main/Main.tsx +++ b/src/components/main/Main.tsx @@ -15,7 +15,7 @@ import '../../global/actions/all'; import { BASE_EMOJI_KEYWORD_LANG, DEBUG, INACTIVE_MARKER, } from '../../config'; -import { IS_ANDROID } from '../../util/environment'; +import { IS_ANDROID } from '../../util/windowEnvironment'; import { selectChatMessage, selectTabState, diff --git a/src/components/main/NewContactModal.tsx b/src/components/main/NewContactModal.tsx index 395d7e14f..9417b0c0f 100644 --- a/src/components/main/NewContactModal.tsx +++ b/src/components/main/NewContactModal.tsx @@ -6,7 +6,7 @@ import { getActions, withGlobal } from '../../global'; import type { ApiCountryCode, ApiUser, ApiUserStatus } from '../../api/types'; -import { IS_TOUCH_ENV } from '../../util/environment'; +import { IS_TOUCH_ENV } from '../../util/windowEnvironment'; import { getUserStatus } from '../../global/helpers'; import { selectUser, selectUserStatus } from '../../global/selectors'; import renderText from '../common/helpers/renderText'; diff --git a/src/components/mediaViewer/MediaViewer.tsx b/src/components/mediaViewer/MediaViewer.tsx index 94e3dea7d..77eae3033 100644 --- a/src/components/mediaViewer/MediaViewer.tsx +++ b/src/components/mediaViewer/MediaViewer.tsx @@ -23,7 +23,7 @@ import { } from '../../global/selectors'; import { stopCurrentAudio } from '../../util/audioPlayer'; import captureEscKeyListener from '../../util/captureEscKeyListener'; -import { IS_TOUCH_ENV } from '../../util/environment'; +import { IS_TOUCH_ENV } from '../../util/windowEnvironment'; import { ANIMATION_END_DELAY } from '../../config'; import { MEDIA_VIEWER_MEDIA_QUERY } from '../common/helpers/mediaDimensions'; import { disableDirectTextInput, enableDirectTextInput } from '../../util/directInputManager'; diff --git a/src/components/mediaViewer/MediaViewerContent.tsx b/src/components/mediaViewer/MediaViewerContent.tsx index e115b5381..7fa4f8832 100644 --- a/src/components/mediaViewer/MediaViewerContent.tsx +++ b/src/components/mediaViewer/MediaViewerContent.tsx @@ -8,7 +8,7 @@ import type { import type { AnimationLevel } from '../../types'; import { MediaViewerOrigin } from '../../types'; -import { IS_TOUCH_ENV } from '../../util/environment'; +import { IS_TOUCH_ENV } from '../../util/windowEnvironment'; import { selectChat, selectChatMessage, selectTabState, selectIsMessageProtected, selectScheduledMessage, selectUser, } from '../../global/selectors'; diff --git a/src/components/mediaViewer/MediaViewerSlides.tsx b/src/components/mediaViewer/MediaViewerSlides.tsx index 1923bf17c..aa7ed1e9c 100644 --- a/src/components/mediaViewer/MediaViewerSlides.tsx +++ b/src/components/mediaViewer/MediaViewerSlides.tsx @@ -9,7 +9,7 @@ import type { RealTouchEvent } from '../../util/captureEvents'; import { animateNumber, timingFunctions } from '../../util/animation'; import buildClassName from '../../util/buildClassName'; import { captureEvents, IOS_SCREEN_EDGE_THRESHOLD } from '../../util/captureEvents'; -import { IS_IOS, IS_TOUCH_ENV } from '../../util/environment'; +import { IS_IOS, IS_TOUCH_ENV } from '../../util/windowEnvironment'; import { clamp, isBetween, round } from '../../util/math'; import { debounce } from '../../util/schedulers'; diff --git a/src/components/mediaViewer/SlideTransition.tsx b/src/components/mediaViewer/SlideTransition.tsx index 508170801..6c3c8e89f 100644 --- a/src/components/mediaViewer/SlideTransition.tsx +++ b/src/components/mediaViewer/SlideTransition.tsx @@ -1,7 +1,7 @@ import type { FC } from '../../lib/teact/teact'; import React from '../../lib/teact/teact'; -import { IS_TOUCH_ENV } from '../../util/environment'; +import { IS_TOUCH_ENV } from '../../util/windowEnvironment'; import type { ChildrenFn, TransitionProps } from '../ui/Transition'; import Transition from '../ui/Transition'; diff --git a/src/components/mediaViewer/VideoPlayer.tsx b/src/components/mediaViewer/VideoPlayer.tsx index 4a503bed1..fc02f8889 100644 --- a/src/components/mediaViewer/VideoPlayer.tsx +++ b/src/components/mediaViewer/VideoPlayer.tsx @@ -6,7 +6,7 @@ import { getActions } from '../../global'; import type { ApiDimensions } from '../../api/types'; -import { IS_IOS, IS_TOUCH_ENV, IS_YA_BROWSER } from '../../util/environment'; +import { IS_IOS, IS_TOUCH_ENV, IS_YA_BROWSER } from '../../util/windowEnvironment'; import safePlay from '../../util/safePlay'; import stopEvent from '../../util/stopEvent'; import useBuffering from '../../hooks/useBuffering'; diff --git a/src/components/mediaViewer/VideoPlayerControls.tsx b/src/components/mediaViewer/VideoPlayerControls.tsx index 3b198ef50..0fdc76448 100644 --- a/src/components/mediaViewer/VideoPlayerControls.tsx +++ b/src/components/mediaViewer/VideoPlayerControls.tsx @@ -5,7 +5,7 @@ import React, { import type { BufferedRange } from '../../hooks/useBuffering'; -import { IS_IOS, IS_TOUCH_ENV } from '../../util/environment'; +import { IS_IOS, IS_TOUCH_ENV } from '../../util/windowEnvironment'; import buildClassName from '../../util/buildClassName'; import { formatMediaDuration } from '../../util/dateFormat'; import { formatFileSize } from '../../util/textFormat'; diff --git a/src/components/mediaViewer/helpers/ghostAnimation.ts b/src/components/mediaViewer/helpers/ghostAnimation.ts index 3cf9e334a..f1efd934b 100644 --- a/src/components/mediaViewer/helpers/ghostAnimation.ts +++ b/src/components/mediaViewer/helpers/ghostAnimation.ts @@ -11,7 +11,7 @@ import { } from '../../common/helpers/mediaDimensions'; import windowSize from '../../../util/windowSize'; import stopEvent from '../../../util/stopEvent'; -import { IS_TOUCH_ENV } from '../../../util/environment'; +import { IS_TOUCH_ENV } from '../../../util/windowEnvironment'; import { getMessageHtmlId } from '../../../global/helpers'; import { isElementInViewport } from '../../../util/isElementInViewport'; diff --git a/src/components/middle/AudioPlayer.tsx b/src/components/middle/AudioPlayer.tsx index 3e4b14e46..92533062e 100644 --- a/src/components/middle/AudioPlayer.tsx +++ b/src/components/middle/AudioPlayer.tsx @@ -7,7 +7,7 @@ import type { ApiAudio, ApiChat, ApiMessage, ApiUser, } from '../../api/types'; -import { IS_IOS, IS_TOUCH_ENV } from '../../util/environment'; +import { IS_IOS, IS_TOUCH_ENV } from '../../util/windowEnvironment'; import { PLAYBACK_RATE_FOR_AUDIO_MIN_DURATION } from '../../config'; import * as mediaLoader from '../../util/mediaLoader'; diff --git a/src/components/middle/EmojiInteractionAnimation.tsx b/src/components/middle/EmojiInteractionAnimation.tsx index 5dd29ffec..c11155119 100644 --- a/src/components/middle/EmojiInteractionAnimation.tsx +++ b/src/components/middle/EmojiInteractionAnimation.tsx @@ -6,7 +6,7 @@ import { getActions, withGlobal } from '../../global'; import type { ActiveEmojiInteraction } from '../../global/types'; -import { IS_ANDROID } from '../../util/environment'; +import { IS_ANDROID } from '../../util/windowEnvironment'; import useFlag from '../../hooks/useFlag'; import useMedia from '../../hooks/useMedia'; import buildClassName from '../../util/buildClassName'; diff --git a/src/components/middle/HeaderActions.tsx b/src/components/middle/HeaderActions.tsx index b2f5dc979..2bd12bb2d 100644 --- a/src/components/middle/HeaderActions.tsx +++ b/src/components/middle/HeaderActions.tsx @@ -13,7 +13,7 @@ import type { IAnchorPosition } from '../../types'; import { ManagementScreens } from '../../types'; import { ANIMATION_LEVEL_MIN } from '../../config'; -import { ARE_CALLS_SUPPORTED, IS_PWA } from '../../util/environment'; +import { ARE_CALLS_SUPPORTED, IS_PWA } from '../../util/windowEnvironment'; import { isChatBasicGroup, isChatChannel, isChatSuperGroup, isUserId, } from '../../global/helpers'; diff --git a/src/components/middle/HeaderPinnedMessage.tsx b/src/components/middle/HeaderPinnedMessage.tsx index 648ea6ffd..b187c4ef9 100644 --- a/src/components/middle/HeaderPinnedMessage.tsx +++ b/src/components/middle/HeaderPinnedMessage.tsx @@ -10,7 +10,7 @@ import { getMessageMediaHash, getMessageSingleInlineButton, } from '../../global/helpers'; import buildClassName from '../../util/buildClassName'; -import { IS_TOUCH_ENV } from '../../util/environment'; +import { IS_TOUCH_ENV } from '../../util/windowEnvironment'; import renderText from '../common/helpers/renderText'; import useMedia from '../../hooks/useMedia'; diff --git a/src/components/middle/MessageList.tsx b/src/components/middle/MessageList.tsx index 29d0c2999..58ab45707 100644 --- a/src/components/middle/MessageList.tsx +++ b/src/components/middle/MessageList.tsx @@ -41,7 +41,7 @@ import { getPhotoFullDimensions, } from '../../global/helpers'; import { orderBy } from '../../util/iteratees'; -import { DPR } from '../../util/environment'; +import { DPR } from '../../util/windowEnvironment'; import { fastRaf, debounce, onTickEnd } from '../../util/schedulers'; import buildClassName from '../../util/buildClassName'; import { groupMessages } from './helpers/groupMessages'; diff --git a/src/components/middle/MiddleColumn.tsx b/src/components/middle/MiddleColumn.tsx index 990745459..ca840ab72 100644 --- a/src/components/middle/MiddleColumn.tsx +++ b/src/components/middle/MiddleColumn.tsx @@ -27,7 +27,7 @@ import { GENERAL_TOPIC_ID, TMP_CHAT_ID, } from '../../config'; -import { MASK_IMAGE_DISABLED } from '../../util/environment'; +import { MASK_IMAGE_DISABLED } from '../../util/windowEnvironment'; import { DropAreaState } from './composer/DropArea'; import { selectChat, diff --git a/src/components/middle/composer/AttachBotIcon.tsx b/src/components/middle/composer/AttachBotIcon.tsx index b214b4523..4ebbabfe8 100644 --- a/src/components/middle/composer/AttachBotIcon.tsx +++ b/src/components/middle/composer/AttachBotIcon.tsx @@ -5,7 +5,7 @@ import type { ISettings } from '../../../types'; import type { ApiDocument } from '../../../api/types'; import { ApiMediaFormat } from '../../../api/types'; -import { IS_COMPACT_MENU } from '../../../util/environment'; +import { IS_COMPACT_MENU } from '../../../util/windowEnvironment'; import useMedia from '../../../hooks/useMedia'; import { getDocumentMediaHash } from '../../../global/helpers'; import buildClassName from '../../../util/buildClassName'; diff --git a/src/components/middle/composer/AttachMenu.tsx b/src/components/middle/composer/AttachMenu.tsx index 5a582c4a4..872f06b7f 100644 --- a/src/components/middle/composer/AttachMenu.tsx +++ b/src/components/middle/composer/AttachMenu.tsx @@ -12,7 +12,7 @@ import { SUPPORTED_IMAGE_CONTENT_TYPES, SUPPORTED_VIDEO_CONTENT_TYPES, } from '../../../config'; -import { IS_TOUCH_ENV } from '../../../util/environment'; +import { IS_TOUCH_ENV } from '../../../util/windowEnvironment'; import { openSystemFilesDialog } from '../../../util/systemFilesDialog'; import { validateFiles } from '../../../util/files'; diff --git a/src/components/middle/composer/BotCommandMenu.tsx b/src/components/middle/composer/BotCommandMenu.tsx index eecc8d88c..3d8e0197e 100644 --- a/src/components/middle/composer/BotCommandMenu.tsx +++ b/src/components/middle/composer/BotCommandMenu.tsx @@ -4,7 +4,7 @@ import { getActions } from '../../../global'; import type { FC } from '../../../lib/teact/teact'; import type { ApiBotCommand } from '../../../api/types'; -import { IS_TOUCH_ENV } from '../../../util/environment'; +import { IS_TOUCH_ENV } from '../../../util/windowEnvironment'; import useMouseInside from '../../../hooks/useMouseInside'; import useAppLayout from '../../../hooks/useAppLayout'; diff --git a/src/components/middle/composer/BotKeyboardMenu.tsx b/src/components/middle/composer/BotKeyboardMenu.tsx index 2124c7fda..ffc886a3d 100644 --- a/src/components/middle/composer/BotKeyboardMenu.tsx +++ b/src/components/middle/composer/BotKeyboardMenu.tsx @@ -4,7 +4,7 @@ import { getActions, withGlobal } from '../../../global'; import type { ApiMessage } from '../../../api/types'; -import { IS_TOUCH_ENV } from '../../../util/environment'; +import { IS_TOUCH_ENV } from '../../../util/windowEnvironment'; import { selectChatMessage, selectCurrentMessageList } from '../../../global/selectors'; import useMouseInside from '../../../hooks/useMouseInside'; diff --git a/src/components/middle/composer/Composer.tsx b/src/components/middle/composer/Composer.tsx index c07531d1b..23c2493c0 100644 --- a/src/components/middle/composer/Composer.tsx +++ b/src/components/middle/composer/Composer.tsx @@ -33,7 +33,7 @@ import { EDITABLE_INPUT_CSS_SELECTOR, MAX_UPLOAD_FILEPART_SIZE, EDITABLE_INPUT_MODAL_ID, } from '../../../config'; -import { IS_VOICE_RECORDING_SUPPORTED, IS_IOS } from '../../../util/environment'; +import { IS_VOICE_RECORDING_SUPPORTED, IS_IOS } from '../../../util/windowEnvironment'; import { MEMO_EMPTY_ARRAY } from '../../../util/memo'; import { selectChat, diff --git a/src/components/middle/composer/CustomEmojiPicker.tsx b/src/components/middle/composer/CustomEmojiPicker.tsx index 7ea23fdc2..e9fe6b3ae 100644 --- a/src/components/middle/composer/CustomEmojiPicker.tsx +++ b/src/components/middle/composer/CustomEmojiPicker.tsx @@ -16,7 +16,7 @@ import { STICKER_PICKER_MAX_SHARED_COVERS, STICKER_SIZE_PICKER_HEADER, } from '../../../config'; -import { IS_TOUCH_ENV } from '../../../util/environment'; +import { IS_TOUCH_ENV } from '../../../util/windowEnvironment'; import { MEMO_EMPTY_ARRAY } from '../../../util/memo'; import fastSmoothScroll from '../../../util/fastSmoothScroll'; import buildClassName from '../../../util/buildClassName'; diff --git a/src/components/middle/composer/CustomSendMenu.tsx b/src/components/middle/composer/CustomSendMenu.tsx index 9d48b04eb..9dfa938ad 100644 --- a/src/components/middle/composer/CustomSendMenu.tsx +++ b/src/components/middle/composer/CustomSendMenu.tsx @@ -1,7 +1,7 @@ import type { FC } from '../../../lib/teact/teact'; import React, { memo } from '../../../lib/teact/teact'; -import { IS_TOUCH_ENV } from '../../../util/environment'; +import { IS_TOUCH_ENV } from '../../../util/windowEnvironment'; import useMouseInside from '../../../hooks/useMouseInside'; import useLang from '../../../hooks/useLang'; diff --git a/src/components/middle/composer/EmojiButton.tsx b/src/components/middle/composer/EmojiButton.tsx index 6cb97e7f3..cd3d12bcf 100644 --- a/src/components/middle/composer/EmojiButton.tsx +++ b/src/components/middle/composer/EmojiButton.tsx @@ -2,7 +2,7 @@ import React, { memo, useCallback } from '../../../lib/teact/teact'; import type { FC } from '../../../lib/teact/teact'; -import { IS_EMOJI_SUPPORTED } from '../../../util/environment'; +import { IS_EMOJI_SUPPORTED } from '../../../util/windowEnvironment'; import { handleEmojiLoad, LOADED_EMOJIS } from '../../../util/emoji'; import buildClassName from '../../../util/buildClassName'; diff --git a/src/components/middle/composer/EmojiPicker.tsx b/src/components/middle/composer/EmojiPicker.tsx index d9395f873..fabacaf86 100644 --- a/src/components/middle/composer/EmojiPicker.tsx +++ b/src/components/middle/composer/EmojiPicker.tsx @@ -12,7 +12,7 @@ import type { } from '../../../util/emoji'; import { MENU_TRANSITION_DURATION, RECENT_SYMBOL_SET_ID } from '../../../config'; -import { IS_TOUCH_ENV } from '../../../util/environment'; +import { IS_TOUCH_ENV } from '../../../util/windowEnvironment'; import { MEMO_EMPTY_ARRAY } from '../../../util/memo'; import { uncompressEmoji } from '../../../util/emoji'; import fastSmoothScroll from '../../../util/fastSmoothScroll'; diff --git a/src/components/middle/composer/GifPicker.tsx b/src/components/middle/composer/GifPicker.tsx index f60341667..66768fd64 100644 --- a/src/components/middle/composer/GifPicker.tsx +++ b/src/components/middle/composer/GifPicker.tsx @@ -7,7 +7,7 @@ import { getActions, withGlobal } from '../../../global'; import type { ApiVideo } from '../../../api/types'; import { SLIDE_TRANSITION_DURATION } from '../../../config'; -import { IS_TOUCH_ENV } from '../../../util/environment'; +import { IS_TOUCH_ENV } from '../../../util/windowEnvironment'; import buildClassName from '../../../util/buildClassName'; import { selectCurrentMessageList, selectIsChatWithSelf } from '../../../global/selectors'; diff --git a/src/components/middle/composer/InlineBotTooltip.tsx b/src/components/middle/composer/InlineBotTooltip.tsx index acb72d09b..8b0f670d9 100644 --- a/src/components/middle/composer/InlineBotTooltip.tsx +++ b/src/components/middle/composer/InlineBotTooltip.tsx @@ -7,7 +7,7 @@ import { getActions } from '../../../global'; import type { ApiBotInlineMediaResult, ApiBotInlineResult, ApiBotInlineSwitchPm } from '../../../api/types'; import { LoadMoreDirection } from '../../../types'; -import { IS_TOUCH_ENV } from '../../../util/environment'; +import { IS_TOUCH_ENV } from '../../../util/windowEnvironment'; import setTooltipItemVisible from '../../../util/setTooltipItemVisible'; import buildClassName from '../../../util/buildClassName'; import useShowTransition from '../../../hooks/useShowTransition'; diff --git a/src/components/middle/composer/MessageInput.tsx b/src/components/middle/composer/MessageInput.tsx index 08ec0a858..f47a7a5a2 100644 --- a/src/components/middle/composer/MessageInput.tsx +++ b/src/components/middle/composer/MessageInput.tsx @@ -11,7 +11,7 @@ import type { Signal } from '../../../util/signals'; import { EDITABLE_INPUT_ID } from '../../../config'; import { IS_ANDROID, IS_EMOJI_SUPPORTED, IS_IOS, IS_TOUCH_ENV, -} from '../../../util/environment'; +} from '../../../util/windowEnvironment'; import { selectIsInSelectMode, selectReplyingToId } from '../../../global/selectors'; import { debounce } from '../../../util/schedulers'; import focusEditableElement from '../../../util/focusEditableElement'; diff --git a/src/components/middle/composer/SendAsMenu.tsx b/src/components/middle/composer/SendAsMenu.tsx index 35e97974c..eb5246d63 100644 --- a/src/components/middle/composer/SendAsMenu.tsx +++ b/src/components/middle/composer/SendAsMenu.tsx @@ -7,7 +7,7 @@ import type { ApiSendAsPeerId } from '../../../api/types'; import setTooltipItemVisible from '../../../util/setTooltipItemVisible'; import { useKeyboardNavigation } from './hooks/useKeyboardNavigation'; -import { IS_TOUCH_ENV } from '../../../util/environment'; +import { IS_TOUCH_ENV } from '../../../util/windowEnvironment'; import { isUserId } from '../../../global/helpers'; import useMouseInside from '../../../hooks/useMouseInside'; import useLang from '../../../hooks/useLang'; diff --git a/src/components/middle/composer/StickerPicker.tsx b/src/components/middle/composer/StickerPicker.tsx index 791e04d6e..cb6a6c203 100644 --- a/src/components/middle/composer/StickerPicker.tsx +++ b/src/components/middle/composer/StickerPicker.tsx @@ -15,7 +15,7 @@ import { SLIDE_TRANSITION_DURATION, STICKER_PICKER_MAX_SHARED_COVERS, STICKER_SIZE_PICKER_HEADER, } from '../../../config'; -import { IS_TOUCH_ENV } from '../../../util/environment'; +import { IS_TOUCH_ENV } from '../../../util/windowEnvironment'; import { MEMO_EMPTY_ARRAY } from '../../../util/memo'; import fastSmoothScroll from '../../../util/fastSmoothScroll'; import buildClassName from '../../../util/buildClassName'; diff --git a/src/components/middle/composer/StickerSetCover.tsx b/src/components/middle/composer/StickerSetCover.tsx index 0013245a4..1a207acc5 100644 --- a/src/components/middle/composer/StickerSetCover.tsx +++ b/src/components/middle/composer/StickerSetCover.tsx @@ -7,7 +7,7 @@ import type { ObserveFn } from '../../../hooks/useIntersectionObserver'; import { STICKER_SIZE_PICKER_HEADER } from '../../../config'; import { selectIsAlwaysHighPriorityEmoji } from '../../../global/selectors'; -import { IS_WEBM_SUPPORTED } from '../../../util/environment'; +import { IS_WEBM_SUPPORTED } from '../../../util/windowEnvironment'; import { getFirstLetters } from '../../../util/textFormat'; import buildClassName from '../../../util/buildClassName'; import { getStickerPreviewHash } from '../../../global/helpers'; diff --git a/src/components/middle/composer/SymbolMenu.tsx b/src/components/middle/composer/SymbolMenu.tsx index 66d9d9373..36c4c27c6 100644 --- a/src/components/middle/composer/SymbolMenu.tsx +++ b/src/components/middle/composer/SymbolMenu.tsx @@ -7,7 +7,7 @@ import type { FC } from '../../../lib/teact/teact'; import type { ApiSticker, ApiVideo } from '../../../api/types'; import type { GlobalActions } from '../../../global'; -import { IS_TOUCH_ENV } from '../../../util/environment'; +import { IS_TOUCH_ENV } from '../../../util/windowEnvironment'; import { fastRaf } from '../../../util/schedulers'; import buildClassName from '../../../util/buildClassName'; import { selectTabState, selectIsCurrentUserPremium } from '../../../global/selectors'; diff --git a/src/components/middle/composer/helpers/applyIosAutoCapitalizationFix.ts b/src/components/middle/composer/helpers/applyIosAutoCapitalizationFix.ts index 3a0f9c894..62a95028b 100644 --- a/src/components/middle/composer/helpers/applyIosAutoCapitalizationFix.ts +++ b/src/components/middle/composer/helpers/applyIosAutoCapitalizationFix.ts @@ -1,4 +1,4 @@ -import { IS_IOS } from '../../../../util/environment'; +import { IS_IOS } from '../../../../util/windowEnvironment'; let resetInput: HTMLInputElement; diff --git a/src/components/middle/composer/hooks/useCustomEmojiTooltip.ts b/src/components/middle/composer/hooks/useCustomEmojiTooltip.ts index d942eec74..b1b2c59eb 100644 --- a/src/components/middle/composer/hooks/useCustomEmojiTooltip.ts +++ b/src/components/middle/composer/hooks/useCustomEmojiTooltip.ts @@ -7,7 +7,7 @@ import type { Signal } from '../../../../util/signals'; import { getActions } from '../../../../global'; import { EMOJI_IMG_REGEX } from '../../../../config'; -import { IS_EMOJI_SUPPORTED } from '../../../../util/environment'; +import { IS_EMOJI_SUPPORTED } from '../../../../util/windowEnvironment'; import { getHtmlBeforeSelection } from '../../../../util/selection'; import focusEditableElement from '../../../../util/focusEditableElement'; import { buildCustomEmojiHtml } from '../helpers/customEmoji'; diff --git a/src/components/middle/composer/hooks/useDraft.ts b/src/components/middle/composer/hooks/useDraft.ts index 8d3db5ba2..8efc26bde 100644 --- a/src/components/middle/composer/hooks/useDraft.ts +++ b/src/components/middle/composer/hooks/useDraft.ts @@ -7,7 +7,7 @@ import type { Signal } from '../../../../util/signals'; import { ApiMessageEntityTypes } from '../../../../api/types'; import { DRAFT_DEBOUNCE, EDITABLE_INPUT_CSS_SELECTOR } from '../../../../config'; -import { IS_TOUCH_ENV } from '../../../../util/environment'; +import { IS_TOUCH_ENV } from '../../../../util/windowEnvironment'; import focusEditableElement from '../../../../util/focusEditableElement'; import parseMessageInput from '../../../../util/parseMessageInput'; import { getTextWithEntitiesAsHtml } from '../../../common/helpers/renderTextWithEntities'; diff --git a/src/components/middle/composer/hooks/useStickerTooltip.ts b/src/components/middle/composer/hooks/useStickerTooltip.ts index dc1e63232..e2c90e5af 100644 --- a/src/components/middle/composer/hooks/useStickerTooltip.ts +++ b/src/components/middle/composer/hooks/useStickerTooltip.ts @@ -5,7 +5,7 @@ import type { Signal } from '../../../../util/signals'; import { getActions } from '../../../../global'; import { EMOJI_IMG_REGEX } from '../../../../config'; -import { IS_EMOJI_SUPPORTED } from '../../../../util/environment'; +import { IS_EMOJI_SUPPORTED } from '../../../../util/windowEnvironment'; import parseEmojiOnlyString from '../../../../util/parseEmojiOnlyString'; import twemojiRegex from '../../../../lib/twemojiRegex'; import { prepareForRegExp } from '../helpers/prepareForRegExp'; diff --git a/src/components/middle/composer/hooks/useVoiceRecording.ts b/src/components/middle/composer/hooks/useVoiceRecording.ts index 0063e70c4..d979411bc 100644 --- a/src/components/middle/composer/hooks/useVoiceRecording.ts +++ b/src/components/middle/composer/hooks/useVoiceRecording.ts @@ -2,7 +2,7 @@ import { useCallback, useEffect, useRef, useState, } from '../../../../lib/teact/teact'; -import { IS_SAFARI, IS_VOICE_RECORDING_SUPPORTED } from '../../../../util/environment'; +import { IS_SAFARI, IS_VOICE_RECORDING_SUPPORTED } from '../../../../util/windowEnvironment'; import * as voiceRecording from '../../../../util/voiceRecording'; import captureEscKeyListener from '../../../../util/captureEscKeyListener'; diff --git a/src/components/middle/helpers/preventMessageInputBlur.ts b/src/components/middle/helpers/preventMessageInputBlur.ts index 4c340c446..07128cccf 100644 --- a/src/components/middle/helpers/preventMessageInputBlur.ts +++ b/src/components/middle/helpers/preventMessageInputBlur.ts @@ -1,7 +1,7 @@ import type React from '../../../lib/teact/teact'; import { EDITABLE_INPUT_ID } from '../../../config'; -import { IS_IOS } from '../../../util/environment'; +import { IS_IOS } from '../../../util/windowEnvironment'; export function preventMessageInputBlur(e: React.MouseEvent, withBubbling = false) { if ( diff --git a/src/components/middle/hooks/useMessageObservers.ts b/src/components/middle/hooks/useMessageObservers.ts index 39948545b..0d3df043d 100644 --- a/src/components/middle/hooks/useMessageObservers.ts +++ b/src/components/middle/hooks/useMessageObservers.ts @@ -3,7 +3,7 @@ import { getActions } from '../../../global'; import type { MessageListType } from '../../../global/types'; -import { IS_ANDROID } from '../../../util/environment'; +import { IS_ANDROID } from '../../../util/windowEnvironment'; import { useIntersectionObserver } from '../../../hooks/useIntersectionObserver'; import useBackgroundMode from '../../../hooks/useBackgroundMode'; import useAppLayout from '../../../hooks/useAppLayout'; diff --git a/src/components/middle/hooks/useScrollHooks.ts b/src/components/middle/hooks/useScrollHooks.ts index a4db975e9..9e9add7bc 100644 --- a/src/components/middle/hooks/useScrollHooks.ts +++ b/src/components/middle/hooks/useScrollHooks.ts @@ -6,7 +6,7 @@ import { LoadMoreDirection } from '../../../types'; import type { MessageListType } from '../../../global/types'; import { LOCAL_MESSAGE_MIN_ID, MESSAGE_LIST_SLICE } from '../../../config'; -import { IS_SCROLL_PATCH_NEEDED, MESSAGE_LIST_SENSITIVE_AREA } from '../../../util/environment'; +import { IS_SCROLL_PATCH_NEEDED, MESSAGE_LIST_SENSITIVE_AREA } from '../../../util/windowEnvironment'; import { debounce } from '../../../util/schedulers'; import { useIntersectionObserver, useOnIntersect } from '../../../hooks/useIntersectionObserver'; import useSyncEffect from '../../../hooks/useSyncEffect'; diff --git a/src/components/middle/message/ContextMenuContainer.tsx b/src/components/middle/message/ContextMenuContainer.tsx index f58120acd..0debdbfcf 100644 --- a/src/components/middle/message/ContextMenuContainer.tsx +++ b/src/components/middle/message/ContextMenuContainer.tsx @@ -29,7 +29,7 @@ import { isChatGroup, isOwnMessage, areReactionsEmpty, isUserId, isMessageLocal, getMessageVideo, getChatMessageLink, } from '../../../global/helpers'; import { SERVICE_NOTIFICATIONS_USER_ID } from '../../../config'; -import { IS_TRANSLATION_SUPPORTED } from '../../../util/environment'; +import { IS_TRANSLATION_SUPPORTED } from '../../../util/windowEnvironment'; import buildClassName from '../../../util/buildClassName'; import { copyTextToClipboard } from '../../../util/clipboard'; diff --git a/src/components/middle/message/CustomEmojiEffect.tsx b/src/components/middle/message/CustomEmojiEffect.tsx index 6bd9b034f..761adcc41 100644 --- a/src/components/middle/message/CustomEmojiEffect.tsx +++ b/src/components/middle/message/CustomEmojiEffect.tsx @@ -3,7 +3,7 @@ import React, { memo, useMemo } from '../../../lib/teact/teact'; import type { FC } from '../../../lib/teact/teact'; import type { ApiEmojiStatus, ApiReactionCustomEmoji } from '../../../api/types'; -import { IS_OFFSET_PATH_SUPPORTED } from '../../../util/environment'; +import { IS_OFFSET_PATH_SUPPORTED } from '../../../util/windowEnvironment'; import { getStickerPreviewHash } from '../../../global/helpers'; import buildClassName from '../../../util/buildClassName'; import useMedia from '../../../hooks/useMedia'; diff --git a/src/components/middle/message/Message.tsx b/src/components/middle/message/Message.tsx index 7aac79506..42e7d995d 100644 --- a/src/components/middle/message/Message.tsx +++ b/src/components/middle/message/Message.tsx @@ -32,7 +32,7 @@ import type { ObserveFn } from '../../../hooks/useIntersectionObserver'; import { AudioOrigin } from '../../../types'; import { MAIN_THREAD_ID } from '../../../api/types'; -import { IS_ANDROID, IS_TOUCH_ENV } from '../../../util/environment'; +import { IS_ANDROID, IS_TOUCH_ENV } from '../../../util/windowEnvironment'; import { EMOJI_STATUS_LOOP_LIMIT, GENERAL_TOPIC_ID } from '../../../config'; import { selectChat, diff --git a/src/components/middle/message/MessagePhoneCall.tsx b/src/components/middle/message/MessagePhoneCall.tsx index 92ee5f22d..704ec699e 100644 --- a/src/components/middle/message/MessagePhoneCall.tsx +++ b/src/components/middle/message/MessagePhoneCall.tsx @@ -7,7 +7,7 @@ import type { ApiMessage, PhoneCallAction } from '../../../api/types'; import useLang from '../../../hooks/useLang'; import buildClassName from '../../../util/buildClassName'; import { formatTimeDuration, formatTime } from '../../../util/dateFormat'; -import { ARE_CALLS_SUPPORTED } from '../../../util/environment'; +import { ARE_CALLS_SUPPORTED } from '../../../util/windowEnvironment'; import Button from '../../ui/Button'; diff --git a/src/components/middle/message/ReactionSelector.tsx b/src/components/middle/message/ReactionSelector.tsx index 8e43ed733..b3534899d 100644 --- a/src/components/middle/message/ReactionSelector.tsx +++ b/src/components/middle/message/ReactionSelector.tsx @@ -9,7 +9,7 @@ import type { import { getTouchY } from '../../../util/scrollLock'; import { createClassNameBuilder } from '../../../util/buildClassName'; -import { IS_COMPACT_MENU } from '../../../util/environment'; +import { IS_COMPACT_MENU } from '../../../util/windowEnvironment'; import { isSameReaction, canSendReaction, getReactionUniqueKey } from '../../../global/helpers'; import useHorizontalScroll from '../../../hooks/useHorizontalScroll'; diff --git a/src/components/middle/message/ReactionSelectorReaction.tsx b/src/components/middle/message/ReactionSelectorReaction.tsx index 44b13de68..b2c409ad3 100644 --- a/src/components/middle/message/ReactionSelectorReaction.tsx +++ b/src/components/middle/message/ReactionSelectorReaction.tsx @@ -3,7 +3,7 @@ import React, { memo } from '../../../lib/teact/teact'; import type { FC } from '../../../lib/teact/teact'; import type { ApiAvailableReaction, ApiReaction } from '../../../api/types'; -import { IS_COMPACT_MENU } from '../../../util/environment'; +import { IS_COMPACT_MENU } from '../../../util/windowEnvironment'; import { createClassNameBuilder } from '../../../util/buildClassName'; import useMedia from '../../../hooks/useMedia'; import useFlag from '../../../hooks/useFlag'; diff --git a/src/components/middle/message/SponsoredMessage.tsx b/src/components/middle/message/SponsoredMessage.tsx index 22b039589..9ca419bf9 100644 --- a/src/components/middle/message/SponsoredMessage.tsx +++ b/src/components/middle/message/SponsoredMessage.tsx @@ -7,7 +7,7 @@ import { getActions, withGlobal } from '../../../global'; import type { ApiChat, ApiSponsoredMessage, ApiUser } from '../../../api/types'; -import { IS_ANDROID, IS_TOUCH_ENV } from '../../../util/environment'; +import { IS_ANDROID, IS_TOUCH_ENV } from '../../../util/windowEnvironment'; import { renderTextWithEntities } from '../../common/helpers/renderTextWithEntities'; import { selectChat, selectSponsoredMessage, selectUser } from '../../../global/selectors'; import { getChatTitle, getUserFullName } from '../../../global/helpers'; diff --git a/src/components/middle/message/Sticker.tsx b/src/components/middle/message/Sticker.tsx index ea948bca5..3fe632770 100644 --- a/src/components/middle/message/Sticker.tsx +++ b/src/components/middle/message/Sticker.tsx @@ -8,7 +8,7 @@ import type { ObserveFn } from '../../../hooks/useIntersectionObserver'; import { getStickerDimensions } from '../../common/helpers/mediaDimensions'; import { getMessageMediaHash } from '../../../global/helpers'; import buildClassName from '../../../util/buildClassName'; -import { IS_WEBM_SUPPORTED } from '../../../util/environment'; +import { IS_WEBM_SUPPORTED } from '../../../util/windowEnvironment'; import { getActions } from '../../../global'; import { useIsIntersecting } from '../../../hooks/useIntersectionObserver'; diff --git a/src/components/middle/message/hooks/useBlurredMediaThumbRef.ts b/src/components/middle/message/hooks/useBlurredMediaThumbRef.ts index 1dff8d82f..c415f4ebe 100644 --- a/src/components/middle/message/hooks/useBlurredMediaThumbRef.ts +++ b/src/components/middle/message/hooks/useBlurredMediaThumbRef.ts @@ -1,6 +1,6 @@ import type { ApiMessage } from '../../../../api/types'; -import { IS_CANVAS_FILTER_SUPPORTED } from '../../../../util/environment'; +import { IS_CANVAS_FILTER_SUPPORTED } from '../../../../util/windowEnvironment'; import { getMessageMediaThumbDataUri } from '../../../../global/helpers'; import useCanvasBlur from '../../../../hooks/useCanvasBlur'; import useAppLayout from '../../../../hooks/useAppLayout'; diff --git a/src/components/middle/message/hooks/useOuterHandlers.ts b/src/components/middle/message/hooks/useOuterHandlers.ts index 9005ad743..fc71a35d2 100644 --- a/src/components/middle/message/hooks/useOuterHandlers.ts +++ b/src/components/middle/message/hooks/useOuterHandlers.ts @@ -3,7 +3,7 @@ import type React from '../../../../lib/teact/teact'; import { useEffect, useRef } from '../../../../lib/teact/teact'; import { getActions } from '../../../../global'; -import { IS_ANDROID, IS_TOUCH_ENV } from '../../../../util/environment'; +import { IS_ANDROID, IS_TOUCH_ENV } from '../../../../util/windowEnvironment'; import windowSize from '../../../../util/windowSize'; import { captureEvents, SwipeDirection } from '../../../../util/captureEvents'; import useFlag from '../../../../hooks/useFlag'; diff --git a/src/components/right/GifSearch.tsx b/src/components/right/GifSearch.tsx index 6d470485d..1d04a455f 100644 --- a/src/components/right/GifSearch.tsx +++ b/src/components/right/GifSearch.tsx @@ -4,7 +4,7 @@ import { getActions, withGlobal } from '../../global'; import type { ApiChat, ApiVideo } from '../../api/types'; -import { IS_TOUCH_ENV } from '../../util/environment'; +import { IS_TOUCH_ENV } from '../../util/windowEnvironment'; import { selectCurrentGifSearch, selectChat, diff --git a/src/components/right/Profile.tsx b/src/components/right/Profile.tsx index b0d8d2e91..5940388c9 100644 --- a/src/components/right/Profile.tsx +++ b/src/components/right/Profile.tsx @@ -23,7 +23,7 @@ import { SHARED_MEDIA_SLICE, SLIDE_TRANSITION_DURATION, } from '../../config'; -import { IS_TOUCH_ENV } from '../../util/environment'; +import { IS_TOUCH_ENV } from '../../util/windowEnvironment'; import { getHasAdminRight, isChatAdmin, isChatChannel, isChatGroup, isUserBot, isUserId, isUserRightBanned, } from '../../global/helpers'; diff --git a/src/components/ui/InfiniteScroll.tsx b/src/components/ui/InfiniteScroll.tsx index 592445f03..bc511db9d 100644 --- a/src/components/ui/InfiniteScroll.tsx +++ b/src/components/ui/InfiniteScroll.tsx @@ -8,7 +8,7 @@ import React, { import { debounce } from '../../util/schedulers'; import resetScroll from '../../util/resetScroll'; -import { IS_ANDROID } from '../../util/environment'; +import { IS_ANDROID } from '../../util/windowEnvironment'; import buildStyle from '../../util/buildStyle'; type OwnProps = { diff --git a/src/components/ui/ListItem.tsx b/src/components/ui/ListItem.tsx index 7f4356dae..783b85116 100644 --- a/src/components/ui/ListItem.tsx +++ b/src/components/ui/ListItem.tsx @@ -2,7 +2,7 @@ import type { RefObject } from 'react'; import type { FC, TeactNode } from '../../lib/teact/teact'; import React, { useRef, useCallback } from '../../lib/teact/teact'; -import { IS_TOUCH_ENV, MouseButton } from '../../util/environment'; +import { IS_TOUCH_ENV, MouseButton } from '../../util/windowEnvironment'; import { fastRaf } from '../../util/schedulers'; import buildClassName from '../../util/buildClassName'; diff --git a/src/components/ui/Menu.tsx b/src/components/ui/Menu.tsx index f6a0f7b99..5575313b3 100644 --- a/src/components/ui/Menu.tsx +++ b/src/components/ui/Menu.tsx @@ -12,7 +12,7 @@ import buildStyle from '../../util/buildStyle'; import { dispatchHeavyAnimationEvent } from '../../hooks/useHeavyAnimationCheck'; import useHistoryBack from '../../hooks/useHistoryBack'; import { preventMessageInputBlurWithBubbling } from '../middle/helpers/preventMessageInputBlur'; -import { IS_BACKDROP_BLUR_SUPPORTED, IS_COMPACT_MENU } from '../../util/environment'; +import { IS_BACKDROP_BLUR_SUPPORTED, IS_COMPACT_MENU } from '../../util/windowEnvironment'; import Portal from './Portal'; diff --git a/src/components/ui/MenuItem.tsx b/src/components/ui/MenuItem.tsx index 09270b69b..2c92f6b6b 100644 --- a/src/components/ui/MenuItem.tsx +++ b/src/components/ui/MenuItem.tsx @@ -4,7 +4,7 @@ import React, { useCallback } from '../../lib/teact/teact'; import { IS_TEST } from '../../config'; import buildClassName from '../../util/buildClassName'; import useLang from '../../hooks/useLang'; -import { IS_COMPACT_MENU } from '../../util/environment'; +import { IS_COMPACT_MENU } from '../../util/windowEnvironment'; import './MenuItem.scss'; diff --git a/src/components/ui/ResponsiveHoverButton.tsx b/src/components/ui/ResponsiveHoverButton.tsx index 9597ab69a..5a68c63fa 100644 --- a/src/components/ui/ResponsiveHoverButton.tsx +++ b/src/components/ui/ResponsiveHoverButton.tsx @@ -3,7 +3,7 @@ import React, { useRef, useCallback, memo } from '../../lib/teact/teact'; import type { OwnProps as ButtonProps } from './Button'; -import { IS_TOUCH_ENV } from '../../util/environment'; +import { IS_TOUCH_ENV } from '../../util/windowEnvironment'; import Button from './Button'; diff --git a/src/components/ui/TabList.tsx b/src/components/ui/TabList.tsx index f9c79061c..94a852808 100644 --- a/src/components/ui/TabList.tsx +++ b/src/components/ui/TabList.tsx @@ -2,7 +2,7 @@ import type { FC } from '../../lib/teact/teact'; import React, { memo, useRef, useEffect } from '../../lib/teact/teact'; import { ALL_FOLDER_ID } from '../../config'; -import { IS_ANDROID, IS_IOS } from '../../util/environment'; +import { IS_ANDROID, IS_IOS } from '../../util/windowEnvironment'; import fastSmoothScrollHorizontal from '../../util/fastSmoothScrollHorizontal'; import usePrevious from '../../hooks/usePrevious'; diff --git a/src/global/actions/api/initial.ts b/src/global/actions/api/initial.ts index 2915fd6e1..2f124e763 100644 --- a/src/global/actions/api/initial.ts +++ b/src/global/actions/api/initial.ts @@ -15,7 +15,7 @@ import { } from '../../../config'; import { IS_MOV_SUPPORTED, IS_WEBM_SUPPORTED, MAX_BUFFER_SIZE, PLATFORM_ENV, -} from '../../../util/environment'; +} from '../../../util/windowEnvironment'; import { unsubscribe } from '../../../util/notifications'; import * as cacheApi from '../../../util/cacheApi'; import { updateAppBadge } from '../../../util/appBadge'; diff --git a/src/global/actions/api/messages.ts b/src/global/actions/api/messages.ts index f8dfcc704..190a2dc8f 100644 --- a/src/global/actions/api/messages.ts +++ b/src/global/actions/api/messages.ts @@ -32,7 +32,7 @@ import { SUPPORTED_IMAGE_CONTENT_TYPES, SUPPORTED_VIDEO_CONTENT_TYPES, } from '../../../config'; -import { IS_IOS } from '../../../util/environment'; +import { IS_IOS } from '../../../util/windowEnvironment'; import { callApi, cancelApiProgress } from '../../../api/gramjs'; import { areSortedArraysIntersecting, buildCollectionByKey, omit, split, unique, diff --git a/src/global/actions/apiUpdaters/calls.async.ts b/src/global/actions/apiUpdaters/calls.async.ts index 962a1de6d..b189e3721 100644 --- a/src/global/actions/apiUpdaters/calls.async.ts +++ b/src/global/actions/apiUpdaters/calls.async.ts @@ -9,7 +9,7 @@ import { joinPhoneCall, processSignalingMessage, } from '../../../lib/secret-sauce'; import type { ApiPhoneCall } from '../../../api/types'; -import { ARE_CALLS_SUPPORTED } from '../../../util/environment'; +import { ARE_CALLS_SUPPORTED } from '../../../util/windowEnvironment'; import { callApi } from '../../../api/gramjs'; import * as langProvider from '../../../util/langProvider'; import { EMOJI_DATA, EMOJI_OFFSETS } from '../../../util/phoneCallEmojiConstants'; diff --git a/src/global/actions/apiUpdaters/calls.ts b/src/global/actions/apiUpdaters/calls.ts index d0821bab2..28367063e 100644 --- a/src/global/actions/apiUpdaters/calls.ts +++ b/src/global/actions/apiUpdaters/calls.ts @@ -3,7 +3,7 @@ import { removeGroupCall, updateGroupCall, updateGroupCallParticipant } from '.. import { omit } from '../../../util/iteratees'; import { selectChat } from '../../selectors'; import { updateChat } from '../../reducers'; -import { ARE_CALLS_SUPPORTED } from '../../../util/environment'; +import { ARE_CALLS_SUPPORTED } from '../../../util/windowEnvironment'; import { notifyAboutCall } from '../../../util/notifications'; import { selectGroupCall, selectPhoneCallUser } from '../../selectors/calls'; import { checkNavigatorUserMediaPermissions, initializeSounds } from '../ui/calls'; diff --git a/src/global/actions/apiUpdaters/payments.ts b/src/global/actions/apiUpdaters/payments.ts index 81076c82b..46aeedbfc 100644 --- a/src/global/actions/apiUpdaters/payments.ts +++ b/src/global/actions/apiUpdaters/payments.ts @@ -1,6 +1,6 @@ import { addActionHandler } from '../../index'; -import { IS_PRODUCTION_HOST } from '../../../util/environment'; +import { IS_PRODUCTION_HOST } from '../../../util/windowEnvironment'; import { closeInvoice } from '../../reducers'; import * as langProvider from '../../../util/langProvider'; import { formatCurrency } from '../../../util/formatCurrency'; diff --git a/src/global/actions/ui/calls.ts b/src/global/actions/ui/calls.ts index 6a5ca2bd6..d6ce2fe3a 100644 --- a/src/global/actions/ui/calls.ts +++ b/src/global/actions/ui/calls.ts @@ -21,7 +21,7 @@ import { selectActiveGroupCall, selectChatGroupCall, selectGroupCall } from '../ import { getMainUsername } from '../../helpers'; import { buildCollectionByKey, omit } from '../../../util/iteratees'; import safePlay from '../../../util/safePlay'; -import { ARE_CALLS_SUPPORTED } from '../../../util/environment'; +import { ARE_CALLS_SUPPORTED } from '../../../util/windowEnvironment'; import * as langProvider from '../../../util/langProvider'; import { updateTabState } from '../../reducers/tabs'; import { getCurrentTabId } from '../../../util/establishMultitabRole'; diff --git a/src/global/actions/ui/initial.ts b/src/global/actions/ui/initial.ts index 382b7c005..97a97a57b 100644 --- a/src/global/actions/ui/initial.ts +++ b/src/global/actions/ui/initial.ts @@ -3,7 +3,7 @@ import { addActionHandler, getGlobal, setGlobal } from '../../index'; import { ANIMATION_LEVEL_MAX } from '../../../config'; import { IS_ANDROID, IS_IOS, IS_MAC_OS, IS_SAFARI, IS_TOUCH_ENV, -} from '../../../util/environment'; +} from '../../../util/windowEnvironment'; import { setLanguage } from '../../../util/langProvider'; import switchTheme from '../../../util/switchTheme'; import { selectTabState, selectNotifySettings, selectTheme } from '../../selectors'; diff --git a/src/global/actions/ui/messages.ts b/src/global/actions/ui/messages.ts index 791d04e4b..1fa56721b 100644 --- a/src/global/actions/ui/messages.ts +++ b/src/global/actions/ui/messages.ts @@ -14,7 +14,7 @@ import { FAST_SMOOTH_MAX_DURATION, SERVICE_NOTIFICATIONS_USER_ID, } from '../../../config'; -import { IS_TOUCH_ENV } from '../../../util/environment'; +import { IS_TOUCH_ENV } from '../../../util/windowEnvironment'; import { enterMessageSelectMode, toggleMessageSelection, diff --git a/src/global/actions/ui/settings.ts b/src/global/actions/ui/settings.ts index cb0f96553..d79c546ad 100644 --- a/src/global/actions/ui/settings.ts +++ b/src/global/actions/ui/settings.ts @@ -3,7 +3,7 @@ import { replaceSettings, replaceThemeSettings } from '../../reducers'; import switchTheme from '../../../util/switchTheme'; import { ANIMATION_LEVEL_MAX, ANIMATION_LEVEL_MED, ANIMATION_LEVEL_MIN } from '../../../config'; import { setLanguage, setTimeFormat } from '../../../util/langProvider'; -import { IS_IOS } from '../../../util/environment'; +import { IS_IOS } from '../../../util/windowEnvironment'; import type { ActionReturnType, GlobalState } from '../../types'; import { updateTabState } from '../../reducers/tabs'; import { addCallback } from '../../../lib/teact/teactn'; @@ -12,6 +12,7 @@ import { getCurrentTabId } from '../../../util/establishMultitabRole'; let prevGlobal: GlobalState | undefined; addCallback((global: GlobalState) => { + // eslint-disable-next-line eslint-multitab-tt/no-getactions-in-actions const { updatePageTitle } = getActions(); const settings = global.settings.byKey; diff --git a/src/global/helpers/messageMedia.ts b/src/global/helpers/messageMedia.ts index 942b434b9..741cd905a 100644 --- a/src/global/helpers/messageMedia.ts +++ b/src/global/helpers/messageMedia.ts @@ -18,7 +18,7 @@ import { IS_PROGRESSIVE_SUPPORTED, IS_SAFARI, MAX_BUFFER_SIZE, -} from '../../util/environment'; +} from '../../util/windowEnvironment'; import { getMessageKey, isMessageLocal, matchLinkInMessageText } from './messages'; import { getDocumentHasPreview } from '../../components/common/helpers/documentInfo'; diff --git a/src/global/helpers/messages.ts b/src/global/helpers/messages.ts index 6a2c5407e..9a1445159 100644 --- a/src/global/helpers/messages.ts +++ b/src/global/helpers/messages.ts @@ -11,7 +11,7 @@ import { SERVICE_NOTIFICATIONS_USER_ID, } from '../../config'; import { getUserFullName } from './users'; -import { IS_OPUS_SUPPORTED, isWebpSupported } from '../../util/environment'; +import { IS_OPUS_SUPPORTED, isWebpSupported } from '../../util/windowEnvironment'; import { getChatTitle, isUserId } from './chats'; import { getGlobal } from '../index'; diff --git a/src/global/init.ts b/src/global/init.ts index 743a63945..ec76b41b8 100644 --- a/src/global/init.ts +++ b/src/global/init.ts @@ -3,7 +3,7 @@ import { } from './index'; import { INITIAL_GLOBAL_STATE, INITIAL_TAB_STATE } from './initialState'; -import { IS_MULTITAB_SUPPORTED } from '../util/environment'; +import { IS_MULTITAB_SUPPORTED } from '../util/windowEnvironment'; import { IS_MOCKED_CLIENT } from '../config'; import { initCache, loadCache } from './cache'; import { cloneDeep } from '../util/iteratees'; diff --git a/src/global/initialState.ts b/src/global/initialState.ts index 7067218c8..cb6f29775 100644 --- a/src/global/initialState.ts +++ b/src/global/initialState.ts @@ -7,7 +7,7 @@ import { DEFAULT_VOLUME, IOS_DEFAULT_MESSAGE_TEXT_SIZE_PX, MACOS_DEFAULT_MESSAGE_TEXT_SIZE_PX, } from '../config'; -import { IS_IOS, IS_MAC_OS } from '../util/environment'; +import { IS_IOS, IS_MAC_OS } from '../util/windowEnvironment'; export const INITIAL_GLOBAL_STATE: GlobalState = { attachMenu: { bots: {} }, diff --git a/src/global/selectors/ui.ts b/src/global/selectors/ui.ts index a67516981..5f90bb144 100644 --- a/src/global/selectors/ui.ts +++ b/src/global/selectors/ui.ts @@ -1,7 +1,7 @@ import type { GlobalState, TabArgs } from '../types'; import { NewChatMembersProgress, RightColumnContent } from '../../types'; -import { getSystemTheme } from '../../util/environment'; +import { getSystemTheme } from '../../util/windowEnvironment'; import { selectCurrentMessageList, selectIsCreateTopicPanelOpen, selectIsEditTopicPanelOpen, selectIsPollResultsOpen, } from './messages'; diff --git a/src/hooks/useAppLayout.ts b/src/hooks/useAppLayout.ts index 5367436ac..054aa3fd6 100644 --- a/src/hooks/useAppLayout.ts +++ b/src/hooks/useAppLayout.ts @@ -6,7 +6,7 @@ import { } from '../config'; import { useEffect } from '../lib/teact/teact'; -import { IS_IOS } from '../util/environment'; +import { IS_IOS } from '../util/windowEnvironment'; import { createCallbackManager } from '../util/callbacks'; import { updateSizes } from '../util/windowSize'; import useForceUpdate from './useForceUpdate'; diff --git a/src/hooks/useCanvasBlur.ts b/src/hooks/useCanvasBlur.ts index 48875d180..d0c4136c7 100644 --- a/src/hooks/useCanvasBlur.ts +++ b/src/hooks/useCanvasBlur.ts @@ -1,6 +1,6 @@ import { useEffect, useRef } from '../lib/teact/teact'; -import { IS_CANVAS_FILTER_SUPPORTED } from '../util/environment'; +import { IS_CANVAS_FILTER_SUPPORTED } from '../util/windowEnvironment'; import fastBlur from '../lib/fastBlur'; import useSyncEffect from './useSyncEffect'; diff --git a/src/hooks/useChatContextActions.ts b/src/hooks/useChatContextActions.ts index 27efaba08..800b11dae 100644 --- a/src/hooks/useChatContextActions.ts +++ b/src/hooks/useChatContextActions.ts @@ -4,7 +4,7 @@ import { getActions } from '../global'; import type { ApiChat, ApiUser } from '../api/types'; import type { MenuItemContextAction } from '../components/ui/ListItem'; -import { IS_OPEN_IN_NEW_TAB_SUPPORTED } from '../util/environment'; +import { IS_OPEN_IN_NEW_TAB_SUPPORTED } from '../util/windowEnvironment'; import { SERVICE_NOTIFICATIONS_USER_ID } from '../config'; import { isChatArchived, getCanDeleteChat, isUserId, isChatChannel, isChatGroup, diff --git a/src/hooks/useContextMenuHandlers.ts b/src/hooks/useContextMenuHandlers.ts index 678bc4d7b..d0f082ee6 100644 --- a/src/hooks/useContextMenuHandlers.ts +++ b/src/hooks/useContextMenuHandlers.ts @@ -4,7 +4,7 @@ import { useState, useEffect, useCallback } from '../lib/teact/teact'; import type { IAnchorPosition } from '../types'; import { IS_TOUCH_ENV, IS_PWA, IS_IOS, -} from '../util/environment'; +} from '../util/windowEnvironment'; const LONG_TAP_DURATION_MS = 200; const IOS_PWA_CONTEXT_MENU_DELAY_MS = 100; diff --git a/src/hooks/useFocusAfterAnimation.tsx b/src/hooks/useFocusAfterAnimation.tsx index a03fe72bc..8979d636f 100644 --- a/src/hooks/useFocusAfterAnimation.tsx +++ b/src/hooks/useFocusAfterAnimation.tsx @@ -1,6 +1,6 @@ import type { RefObject } from 'react'; -import { IS_TOUCH_ENV } from '../util/environment'; +import { IS_TOUCH_ENV } from '../util/windowEnvironment'; import { fastRaf } from '../util/schedulers'; import { useEffect } from '../lib/teact/teact'; diff --git a/src/hooks/useFullscreen.ts b/src/hooks/useFullscreen.ts index e2064b222..ff76bda54 100644 --- a/src/hooks/useFullscreen.ts +++ b/src/hooks/useFullscreen.ts @@ -1,5 +1,5 @@ import { useLayoutEffect, useState, useEffect } from '../lib/teact/teact'; -import { IS_IOS } from '../util/environment'; +import { IS_IOS } from '../util/windowEnvironment'; type RefType = { current: HTMLVideoElement | null; diff --git a/src/hooks/useHistoryBack.ts b/src/hooks/useHistoryBack.ts index 083801da1..e0d5f26a4 100644 --- a/src/hooks/useHistoryBack.ts +++ b/src/hooks/useHistoryBack.ts @@ -3,7 +3,7 @@ import { getActions } from '../lib/teact/teactn'; import { IS_TEST } from '../config'; import { fastRaf } from '../util/schedulers'; -import { IS_IOS } from '../util/environment'; +import { IS_IOS } from '../util/windowEnvironment'; import useSyncEffect from './useSyncEffect'; import useEffectOnce from './useEffectOnce'; diff --git a/src/hooks/useMediaWithLoadProgress.ts b/src/hooks/useMediaWithLoadProgress.ts index bbafd07d8..c909fe5d3 100644 --- a/src/hooks/useMediaWithLoadProgress.ts +++ b/src/hooks/useMediaWithLoadProgress.ts @@ -2,7 +2,7 @@ import { useEffect, useMemo, useRef, useState, } from '../lib/teact/teact'; -import { IS_PROGRESSIVE_SUPPORTED } from '../util/environment'; +import { IS_PROGRESSIVE_SUPPORTED } from '../util/windowEnvironment'; import { ApiMediaFormat } from '../api/types'; import { throttle } from '../util/schedulers'; import * as mediaLoader from '../util/mediaLoader'; diff --git a/src/hooks/useMouseInside.ts b/src/hooks/useMouseInside.ts index 4e6b901cb..619afffc2 100644 --- a/src/hooks/useMouseInside.ts +++ b/src/hooks/useMouseInside.ts @@ -1,6 +1,6 @@ import { useCallback, useEffect, useRef } from '../lib/teact/teact'; -import { IS_TOUCH_ENV } from '../util/environment'; +import { IS_TOUCH_ENV } from '../util/windowEnvironment'; const MENU_CLOSE_TIMEOUT = 250; let closeTimeout: number | undefined; diff --git a/src/hooks/usePictureInPicture.ts b/src/hooks/usePictureInPicture.ts index cdb9f4387..2d3cb6c39 100644 --- a/src/hooks/usePictureInPicture.ts +++ b/src/hooks/usePictureInPicture.ts @@ -1,6 +1,6 @@ import { useLayoutEffect, useCallback, useState } from '../lib/teact/teact'; import { DEBUG } from '../config'; -import { IS_IOS, IS_PWA } from '../util/environment'; +import { IS_IOS, IS_PWA } from '../util/windowEnvironment'; import safePlay, { getIsVideoPlaying } from '../util/safePlay'; type RefType = { diff --git a/src/hooks/usePreventPinchZoomGesture.ts b/src/hooks/usePreventPinchZoomGesture.ts index f468e9a9a..4ed5f883a 100644 --- a/src/hooks/usePreventPinchZoomGesture.ts +++ b/src/hooks/usePreventPinchZoomGesture.ts @@ -1,5 +1,5 @@ import { useEffect } from '../lib/teact/teact'; -import { IS_IOS, IS_PWA, IS_TOUCH_ENV } from '../util/environment'; +import { IS_IOS, IS_PWA, IS_TOUCH_ENV } from '../util/windowEnvironment'; const metaViewport = document.querySelector('meta[name="viewport"]'); const defaultViewportContent = metaViewport?.getAttribute('content') || ''; diff --git a/src/hooks/useThumbnail.ts b/src/hooks/useThumbnail.ts index ef38e4fd5..ee3973bee 100644 --- a/src/hooks/useThumbnail.ts +++ b/src/hooks/useThumbnail.ts @@ -3,7 +3,7 @@ import { useLayoutEffect, useMemo, useState } from '../lib/teact/teact'; import type { ApiMessage, ApiSticker } from '../api/types'; import { DEBUG } from '../config'; -import { isWebpSupported } from '../util/environment'; +import { isWebpSupported } from '../util/windowEnvironment'; import { EMPTY_IMAGE_DATA_URI, webpToPngBase64 } from '../util/webpToPng'; import { getMessageMediaThumbDataUri } from '../global/helpers'; import { selectTheme } from '../global/selectors'; diff --git a/src/index.tsx b/src/index.tsx index ba8a92c3f..93ba8d383 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -8,7 +8,7 @@ import { getActions, getGlobal, } from './global'; import updateWebmanifest from './util/updateWebmanifest'; -import { IS_MULTITAB_SUPPORTED } from './util/environment'; +import { IS_MULTITAB_SUPPORTED } from './util/windowEnvironment'; import './global/init'; import { APP_VERSION, DEBUG, MULTITAB_LOCALSTORAGE_KEY } from './config'; diff --git a/src/lib/rlottie/RLottie.ts b/src/lib/rlottie/RLottie.ts index 95d4724fa..f4443a27a 100644 --- a/src/lib/rlottie/RLottie.ts +++ b/src/lib/rlottie/RLottie.ts @@ -2,7 +2,7 @@ import type { RLottieApi } from './rlottie.worker'; import { DPR, IS_SAFARI, IS_ANDROID, IS_IOS, -} from '../../util/environment'; +} from '../../util/windowEnvironment'; import { createConnector } from '../../util/PostMessageConnector'; import { animate } from '../../util/animation'; import cycleRestrict from '../../util/cycleRestrict'; diff --git a/src/util/PopupManager.ts b/src/util/PopupManager.ts index 0a4bf4689..4ef219617 100644 --- a/src/util/PopupManager.ts +++ b/src/util/PopupManager.ts @@ -1,4 +1,4 @@ -import { IS_ANDROID, IS_IOS } from './environment'; +import { IS_ANDROID, IS_IOS } from './windowEnvironment'; const SHOULD_PRE_OPEN = IS_IOS || IS_ANDROID; diff --git a/src/util/audioPlayer.ts b/src/util/audioPlayer.ts index 65fb710f7..4511e0b9b 100644 --- a/src/util/audioPlayer.ts +++ b/src/util/audioPlayer.ts @@ -3,7 +3,7 @@ import { getActions, getGlobal } from '../global'; import { AudioOrigin, GlobalSearchContent } from '../types'; import type { ApiMessage } from '../api/types'; -import { IS_SAFARI } from './environment'; +import { IS_SAFARI } from './windowEnvironment'; import safePlay from './safePlay'; import { patchSafariProgressiveAudio, isSafariPatchInProgress } from './patchSafariProgressiveAudio'; import type { MessageKey } from '../global/helpers'; diff --git a/src/util/captureEvents.ts b/src/util/captureEvents.ts index edd9aa45f..669686600 100644 --- a/src/util/captureEvents.ts +++ b/src/util/captureEvents.ts @@ -1,4 +1,4 @@ -import { IS_IOS } from './environment'; +import { IS_IOS } from './windowEnvironment'; import { Lethargy } from './lethargy'; import { clamp, round } from './math'; import { debounce } from './schedulers'; diff --git a/src/util/customEmojiManager.ts b/src/util/customEmojiManager.ts index 46f9fc2e4..de40422bb 100644 --- a/src/util/customEmojiManager.ts +++ b/src/util/customEmojiManager.ts @@ -9,7 +9,7 @@ import { getStickerPreviewHash } from '../global/helpers'; import * as mediaLoader from './mediaLoader'; import { throttle } from './schedulers'; import generateIdFor from './generateIdFor'; -import { IS_WEBM_SUPPORTED } from './environment'; +import { IS_WEBM_SUPPORTED } from './windowEnvironment'; import placeholderSrc from '../assets/square.svg'; import blankSrc from '../assets/blank.png'; diff --git a/src/util/deeplink.ts b/src/util/deeplink.ts index 53a0c7543..4afedf25d 100644 --- a/src/util/deeplink.ts +++ b/src/util/deeplink.ts @@ -3,7 +3,7 @@ import { getActions } from '../global'; import type { ApiChatType } from '../api/types'; import { API_CHAT_TYPES } from '../config'; -import { IS_SAFARI } from './environment'; +import { IS_SAFARI } from './windowEnvironment'; type DeepLinkMethod = 'resolve' | 'login' | 'passport' | 'settings' | 'join' | 'addstickers' | 'addemoji' | 'setlanguage' | 'addtheme' | 'confirmphone' | 'socks' | 'proxy' | 'privatepost' | 'bg' | 'share' | 'msg' | 'msg_url' | diff --git a/src/util/establishMultitabRole.ts b/src/util/establishMultitabRole.ts index 4a6cc9da7..d93348258 100644 --- a/src/util/establishMultitabRole.ts +++ b/src/util/establishMultitabRole.ts @@ -1,6 +1,6 @@ import { createCallbackManager } from './callbacks'; import { ESTABLISH_BROADCAST_CHANNEL_NAME } from '../config'; -import { IS_MULTITAB_SUPPORTED } from './environment'; +import { IS_MULTITAB_SUPPORTED } from './windowEnvironment'; import { getPasscodeHash, setPasscodeHash } from './passcode'; const ESTABLISH_TIMEOUT = 100; diff --git a/src/util/fastSmoothScroll.ts b/src/util/fastSmoothScroll.ts index 7aef6c0bb..59744169c 100644 --- a/src/util/fastSmoothScroll.ts +++ b/src/util/fastSmoothScroll.ts @@ -7,7 +7,7 @@ import { FAST_SMOOTH_MAX_DISTANCE, FAST_SMOOTH_MAX_DURATION, FAST_SMOOTH_MIN_DURATION, FAST_SMOOTH_SHORT_TRANSITION_MAX_DISTANCE, } from '../config'; -import { IS_ANDROID } from './environment'; +import { IS_ANDROID } from './windowEnvironment'; import { dispatchHeavyAnimationEvent } from '../hooks/useHeavyAnimationCheck'; import { animateSingle } from './animation'; import { fastRaf } from './schedulers'; diff --git a/src/util/focusEditableElement.ts b/src/util/focusEditableElement.ts index 8f88d0acf..d77557e09 100644 --- a/src/util/focusEditableElement.ts +++ b/src/util/focusEditableElement.ts @@ -1,4 +1,4 @@ -import { IS_TOUCH_ENV } from './environment'; +import { IS_TOUCH_ENV } from './windowEnvironment'; export default function focusEditableElement(element: HTMLElement, force?: boolean, forcePlaceCaretAtEnd?: boolean) { if (!force && element === document.activeElement) { diff --git a/src/util/handleError.ts b/src/util/handleError.ts index 36efdfb73..5c7af4db7 100644 --- a/src/util/handleError.ts +++ b/src/util/handleError.ts @@ -1,7 +1,7 @@ import { DEBUG_ALERT_MSG } from '../config'; import { throttle } from './schedulers'; import { getAllMultitabTokens } from './establishMultitabRole'; -import { IS_MULTITAB_SUPPORTED } from './environment'; +import { IS_MULTITAB_SUPPORTED } from './windowEnvironment'; window.addEventListener('error', handleErrorEvent); window.addEventListener('unhandledrejection', handleErrorEvent); diff --git a/src/util/mediaLoader.ts b/src/util/mediaLoader.ts index 82337c0f8..a53185fd2 100644 --- a/src/util/mediaLoader.ts +++ b/src/util/mediaLoader.ts @@ -15,7 +15,7 @@ import * as cacheApi from './cacheApi'; import { fetchBlob } from './files'; import { IS_OPUS_SUPPORTED, IS_PROGRESSIVE_SUPPORTED, isWebpSupported, -} from './environment'; +} from './windowEnvironment'; import { oggToWav } from './oggToWav'; import { webpToPng } from './webpToPng'; diff --git a/src/util/multitab.ts b/src/util/multitab.ts index 96be1deb0..509dcaee9 100644 --- a/src/util/multitab.ts +++ b/src/util/multitab.ts @@ -6,7 +6,7 @@ import type { LocalDb } from '../api/gramjs/localDb'; import type { ApiInitialArgs } from '../api/types'; import type { GlobalState } from '../global/types'; -import { IS_MULTITAB_SUPPORTED } from './environment'; +import { IS_MULTITAB_SUPPORTED } from './windowEnvironment'; import { APP_VERSION, DATA_BROADCAST_CHANNEL_NAME, MULTITAB_LOCALSTORAGE_KEY } from '../config'; import { deepMerge } from './deepMerge'; import { selectTabState } from '../global/selectors'; diff --git a/src/util/notifications.ts b/src/util/notifications.ts index 20375f05f..e92b21b10 100644 --- a/src/util/notifications.ts +++ b/src/util/notifications.ts @@ -28,7 +28,7 @@ import { selectNotifySettings, selectUser, } from '../global/selectors'; -import { IS_SERVICE_WORKER_SUPPORTED, IS_TOUCH_ENV } from './environment'; +import { IS_SERVICE_WORKER_SUPPORTED, IS_TOUCH_ENV } from './windowEnvironment'; import { translate } from './langProvider'; import * as mediaLoader from './mediaLoader'; import { debounce } from './schedulers'; diff --git a/src/util/parseMessageInput.ts b/src/util/parseMessageInput.ts index c25a4ecf9..68845dec3 100644 --- a/src/util/parseMessageInput.ts +++ b/src/util/parseMessageInput.ts @@ -1,7 +1,7 @@ import type { ApiMessageEntity, ApiFormattedText } from '../api/types'; import { ApiMessageEntityTypes } from '../api/types'; import { RE_LINK_TEMPLATE } from '../config'; -import { IS_EMOJI_SUPPORTED } from './environment'; +import { IS_EMOJI_SUPPORTED } from './windowEnvironment'; export const ENTITY_CLASS_BY_NODE_NAME: Record = { B: ApiMessageEntityTypes.Bold, diff --git a/src/util/resetScroll.ts b/src/util/resetScroll.ts index 60a81abf7..3d498a9dd 100644 --- a/src/util/resetScroll.ts +++ b/src/util/resetScroll.ts @@ -1,4 +1,4 @@ -import { IS_IOS } from './environment'; +import { IS_IOS } from './windowEnvironment'; import forceReflow from './forceReflow'; const resetScroll = (container: HTMLDivElement, scrollTop?: number) => { diff --git a/src/util/setupServiceWorker.ts b/src/util/setupServiceWorker.ts index c99863fa1..76075b3e5 100644 --- a/src/util/setupServiceWorker.ts +++ b/src/util/setupServiceWorker.ts @@ -1,7 +1,7 @@ import { DEBUG, DEBUG_MORE, IS_TEST } from '../config'; import { getActions } from '../global'; import { formatShareText } from './deeplink'; -import { IS_ANDROID, IS_IOS, IS_SERVICE_WORKER_SUPPORTED } from './environment'; +import { IS_ANDROID, IS_IOS, IS_SERVICE_WORKER_SUPPORTED } from './windowEnvironment'; import { validateFiles } from './files'; import { notifyClientReady, playNotifySoundDebounced } from './notifications'; diff --git a/src/util/updateWebmanifest.ts b/src/util/updateWebmanifest.ts index ab1a69e9b..a1f01e504 100644 --- a/src/util/updateWebmanifest.ts +++ b/src/util/updateWebmanifest.ts @@ -2,7 +2,7 @@ // https://medium.com/@alshakero/how-to-setup-your-web-app-manifest-dynamically-using-javascript-f7fbee899a61 import { DEBUG } from '../config'; -import { IS_MAC_OS } from './environment'; +import { IS_MAC_OS } from './windowEnvironment'; export default function updateWebmanifest() { if (!IS_MAC_OS) { diff --git a/src/util/webpToPng.ts b/src/util/webpToPng.ts index ea3c37f5d..1a7c05e80 100644 --- a/src/util/webpToPng.ts +++ b/src/util/webpToPng.ts @@ -1,4 +1,4 @@ -import { isWebpSupported } from './environment'; +import { isWebpSupported } from './windowEnvironment'; import { dataUriToBlob, blobToDataUri } from './files'; import { pause } from './schedulers'; diff --git a/src/util/environment.ts b/src/util/windowEnvironment.ts similarity index 100% rename from src/util/environment.ts rename to src/util/windowEnvironment.ts diff --git a/src/util/windowSize.ts b/src/util/windowSize.ts index b6135f0fe..85b89cb88 100644 --- a/src/util/windowSize.ts +++ b/src/util/windowSize.ts @@ -1,5 +1,5 @@ import { throttle } from './schedulers'; -import { IS_IOS } from './environment'; +import { IS_IOS } from './windowEnvironment'; type IDimensions = { width: number;