From 08fa7cd67fea41cf5d44796d94b0224e03ef1fb1 Mon Sep 17 00:00:00 2001 From: 7w1 Date: Mon, 2 Mar 2026 15:10:21 -0600 Subject: [PATCH] make eslint happy --- src/app/components/SecretStorage.tsx | 2 +- .../components/UserRoomProfileRenderer.tsx | 2 +- .../autocomplete/RoomMentionAutocomplete.tsx | 2 +- src/app/components/emoji-board/EmojiBoard.tsx | 2 +- .../emoji-board/components/Item.tsx | 2 +- .../image-pack-view/ImagePackContent.tsx | 4 +-- src/app/components/member-tile/MemberTile.tsx | 2 +- .../placeholder/CompactPlaceholder.tsx | 2 +- .../placeholder/DefaultPlaceholder.tsx | 2 +- .../components/uia-stages/PasswordStage.tsx | 2 +- .../developer-tools/DevelopTools.tsx | 2 +- .../permissions/PermissionGroups.tsx | 2 +- .../common-settings/permissions/Powers.tsx | 2 +- src/app/features/lobby/Lobby.tsx | 2 +- .../features/room-settings/RoomSettings.tsx | 4 +-- src/app/features/room/message/Reactions.tsx | 2 +- .../room/room-pin-menu/RoomPinMenu.tsx | 2 +- src/app/features/settings/account/Profile.tsx | 2 +- src/app/features/settings/devices/Devices.tsx | 2 +- .../settings/devices/OtherDevices.tsx | 2 +- .../notifications/KeywordMessages.tsx | 2 +- .../settings/notifications/Notifications.tsx | 2 +- .../features/space-settings/SpaceSettings.tsx | 2 +- src/app/hooks/useCommands.ts | 2 +- src/app/hooks/useDeviceVerificationStatus.ts | 2 +- src/app/hooks/useJoinedRoomId.ts | 3 +- src/app/hooks/useMemberPowerTag.ts | 2 +- src/app/hooks/useMentionClickHandler.ts | 4 +-- src/app/hooks/useNotificationJumper.ts | 2 +- src/app/hooks/usePathWithOrigin.ts | 2 +- src/app/hooks/usePowerLevels.ts | 2 +- src/app/hooks/useRoomAliases.ts | 2 +- src/app/hooks/useRoomCreators.ts | 2 +- src/app/hooks/useRoomNavigate.ts | 4 +-- src/app/hooks/useRoomWidgets.ts | 2 +- .../hooks/useRoomsNotificationPreferences.ts | 2 +- src/app/hooks/useSidebarItems.ts | 2 +- src/app/hooks/useSpaceHierarchy.ts | 2 +- src/app/hooks/useStateEvent.ts | 2 +- src/app/hooks/useTextAreaCodeEditor.ts | 2 +- src/app/hooks/useTheme.ts | 4 +-- src/app/hooks/useUserProfile.ts | 2 +- src/app/hooks/useVirtualPaginator.ts | 2 +- src/app/pages/App.tsx | 4 +-- src/app/pages/Router.tsx | 30 +++++++++---------- src/app/pages/auth/AuthLayout.tsx | 2 +- src/app/pages/auth/login/Login.tsx | 4 +-- .../auth/reset-password/PasswordResetForm.tsx | 2 +- src/app/pages/client/ClientNonUIFeatures.tsx | 2 +- src/app/pages/pathUtils.ts | 4 +-- src/app/plugins/react-custom-html-parser.tsx | 8 ++--- src/app/state/sessions.ts | 2 +- src/client/initMatrix.ts | 4 +-- 53 files changed, 79 insertions(+), 80 deletions(-) diff --git a/src/app/components/SecretStorage.tsx b/src/app/components/SecretStorage.tsx index 15231682..07b2e15d 100644 --- a/src/app/components/SecretStorage.tsx +++ b/src/app/components/SecretStorage.tsx @@ -2,10 +2,10 @@ import { FormEventHandler, useCallback } from 'react'; import { Box, Text, Button, Spinner, color } from 'folds'; import { decodeRecoveryKey, deriveRecoveryKeyFromPassphrase } from '$types/matrix-sdk'; import { SecretStorageKeyContent, SecretStoragePassphraseContent } from '$types/matrix/accountData'; -import { PasswordInput } from './password-input'; import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback'; import { useMatrixClient } from '$hooks/useMatrixClient'; import { useAlive } from '$hooks/useAlive'; +import { PasswordInput } from './password-input'; type SecretStorageRecoveryPassphraseProps = { processing?: boolean; diff --git a/src/app/components/UserRoomProfileRenderer.tsx b/src/app/components/UserRoomProfileRenderer.tsx index eeae40ca..97489d27 100644 --- a/src/app/components/UserRoomProfileRenderer.tsx +++ b/src/app/components/UserRoomProfileRenderer.tsx @@ -1,12 +1,12 @@ import { Menu, PopOut, toRem } from 'folds'; import FocusTrap from 'focus-trap-react'; import { useCloseUserRoomProfile, useUserRoomProfileState } from '$state/hooks/userRoomProfile'; -import { UserRoomProfile } from './user-profile'; import { UserRoomProfileState } from '$state/userRoomProfile'; import { useAllJoinedRoomsSet, useGetRoom } from '$hooks/useGetRoom'; import { stopPropagation } from '$utils/keyboard'; import { SpaceProvider } from '$hooks/useSpace'; import { RoomProvider } from '$hooks/useRoom'; +import { UserRoomProfile } from './user-profile'; function UserRoomProfileContextMenu({ state }: { state: UserRoomProfileState }) { const { roomId, spaceId, userId, cords, position, initialProfile } = state; diff --git a/src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx b/src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx index a3be8cf3..0d2e9693 100644 --- a/src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx +++ b/src/app/components/editor/autocomplete/RoomMentionAutocomplete.tsx @@ -15,9 +15,9 @@ import { allRoomsAtom } from '$state/room-list/roomList'; import { factoryRoomIdByActivity } from '$utils/sort'; import { RoomAvatar, RoomIcon } from '$components/room-avatar'; import { getViaServers } from '$plugins/via-servers'; +import { createMentionElement, moveCursor, replaceWithElement } from '$components/editor/utils'; import { AutocompleteMenu } from './AutocompleteMenu'; import { AutocompleteQuery } from './autocompleteQuery'; -import { createMentionElement, moveCursor, replaceWithElement } from '$components/editor/utils'; type MentionAutoCompleteHandler = (roomAliasOrId: string, name: string) => void; diff --git a/src/app/components/emoji-board/EmojiBoard.tsx b/src/app/components/emoji-board/EmojiBoard.tsx index 9a603b97..2190a53f 100644 --- a/src/app/components/emoji-board/EmojiBoard.tsx +++ b/src/app/components/emoji-board/EmojiBoard.tsx @@ -29,6 +29,7 @@ import { addRecentEmoji } from '$plugins/recent-emoji'; import { useMediaAuthentication } from '$hooks/useMediaAuthentication'; import { ImagePack, ImageUsage, PackImageReader } from '$plugins/custom-emoji'; import { getEmoticonSearchStr } from '$plugins/utils'; +import { VirtualTile } from '$components/virtualizer'; import { useEmojiGroupIcons } from './useEmojiGroupIcons'; import { useEmojiGroupLabels } from './useEmojiGroupLabels'; import { @@ -51,7 +52,6 @@ import { EmojiBoardLayout, } from './components'; import { EmojiBoardTab, EmojiType } from './types'; -import { VirtualTile } from '$components/virtualizer'; const RECENT_GROUP_ID = 'recent_group'; const SEARCH_GROUP_ID = 'search_group'; diff --git a/src/app/components/emoji-board/components/Item.tsx b/src/app/components/emoji-board/components/Item.tsx index ca564494..09179357 100644 --- a/src/app/components/emoji-board/components/Item.tsx +++ b/src/app/components/emoji-board/components/Item.tsx @@ -3,8 +3,8 @@ import { MatrixClient } from '$types/matrix-sdk'; import { PackImageReader } from '$plugins/custom-emoji'; import { IEmoji } from '$plugins/emoji'; import { mxcUrlToHttp } from '$utils/matrix'; -import * as css from './styles.css'; import { EmojiItemInfo, EmojiType } from '$components/emoji-board/types'; +import * as css from './styles.css'; export const getEmojiItemInfo = (element: Element): EmojiItemInfo | undefined => { const label = element.getAttribute('title'); diff --git a/src/app/components/image-pack-view/ImagePackContent.tsx b/src/app/components/image-pack-view/ImagePackContent.tsx index de5b5000..6f56d70f 100644 --- a/src/app/components/image-pack-view/ImagePackContent.tsx +++ b/src/app/components/image-pack-view/ImagePackContent.tsx @@ -18,12 +18,12 @@ import { replaceSpaceWithDash, suffixRename } from '$utils/common'; import { getFileNameWithoutExt } from '$utils/mimeTypes'; import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback'; import { SequenceCard } from '$components/sequence-card'; -import { ImageTile, ImageTileEdit, ImageTileUpload } from './ImageTile'; import { SettingTile } from '$components/setting-tile'; +import { CompactUploadCardRenderer } from '$components/upload-card'; +import { ImageTile, ImageTileEdit, ImageTileUpload } from './ImageTile'; import { UsageSwitcher } from './UsageSwitcher'; import { ImagePackProfile, ImagePackProfileEdit } from './PackMeta'; import * as css from './style.css'; -import { CompactUploadCardRenderer } from '$components/upload-card'; export type ImagePackContentProps = { imagePack: ImagePack; diff --git a/src/app/components/member-tile/MemberTile.tsx b/src/app/components/member-tile/MemberTile.tsx index 111af3ed..9af782ee 100644 --- a/src/app/components/member-tile/MemberTile.tsx +++ b/src/app/components/member-tile/MemberTile.tsx @@ -6,8 +6,8 @@ import { getMxIdLocalPart } from '$utils/matrix'; import { useSableCosmetics } from '$hooks/useSableCosmetics'; import { useAtomValue } from 'jotai'; import { nicknamesAtom } from '$state/nicknames'; -import * as css from './style.css'; import { UserAvatar } from '$components/user-avatar'; +import * as css from './style.css'; const getName = (room: Room, member: RoomMember, nicknames: Record) => getMemberDisplayName(room, member.userId, nicknames) ?? diff --git a/src/app/components/message/placeholder/CompactPlaceholder.tsx b/src/app/components/message/placeholder/CompactPlaceholder.tsx index 86b6c662..c6e6dda0 100644 --- a/src/app/components/message/placeholder/CompactPlaceholder.tsx +++ b/src/app/components/message/placeholder/CompactPlaceholder.tsx @@ -1,8 +1,8 @@ import { useMemo } from 'react'; import { as, ContainerColor, toRem } from 'folds'; import { randomNumberBetween } from '$utils/common'; -import { LinePlaceholder } from './LinePlaceholder'; import { CompactLayout } from '$components/message/layout'; +import { LinePlaceholder } from './LinePlaceholder'; export const CompactPlaceholder = as<'div', { variant?: ContainerColor }>( ({ variant, ...props }, ref) => { diff --git a/src/app/components/message/placeholder/DefaultPlaceholder.tsx b/src/app/components/message/placeholder/DefaultPlaceholder.tsx index 98301d2e..444990ac 100644 --- a/src/app/components/message/placeholder/DefaultPlaceholder.tsx +++ b/src/app/components/message/placeholder/DefaultPlaceholder.tsx @@ -1,8 +1,8 @@ import { CSSProperties, useMemo } from 'react'; import { Avatar, Box, ContainerColor, as, color, toRem } from 'folds'; import { randomNumberBetween } from '$utils/common'; -import { LinePlaceholder } from './LinePlaceholder'; import { ModernLayout } from '$components/message/layout'; +import { LinePlaceholder } from './LinePlaceholder'; const contentMargin: CSSProperties = { marginTop: toRem(3) }; diff --git a/src/app/components/uia-stages/PasswordStage.tsx b/src/app/components/uia-stages/PasswordStage.tsx index 582758a0..8ebc923a 100644 --- a/src/app/components/uia-stages/PasswordStage.tsx +++ b/src/app/components/uia-stages/PasswordStage.tsx @@ -1,9 +1,9 @@ import { Box, Button, color, config, Dialog, Header, Icon, IconButton, Icons, Text } from 'folds'; import { FormEventHandler } from 'react'; import { AuthType } from '$types/matrix-sdk'; +import { PasswordInput } from '$components/password-input'; import { StageComponentProps } from './types'; import { ErrorCode } from '../../cs-errorcode'; -import { PasswordInput } from '$components/password-input'; export function PasswordStage({ stageData, diff --git a/src/app/features/common-settings/developer-tools/DevelopTools.tsx b/src/app/features/common-settings/developer-tools/DevelopTools.tsx index 5f8bc077..7925d44a 100644 --- a/src/app/features/common-settings/developer-tools/DevelopTools.tsx +++ b/src/app/features/common-settings/developer-tools/DevelopTools.tsx @@ -24,9 +24,9 @@ import { useRoomAccountData } from '$hooks/useRoomAccountData'; import { CutoutCard } from '$components/cutout-card'; import { AccountDataEditor, AccountDataSubmitCallback } from '$components/AccountDataEditor'; import { useMatrixClient } from '$hooks/useMatrixClient'; +import { SequenceCardStyle } from '$features/common-settings/styles.css'; import { SendRoomEvent } from './SendRoomEvent'; import { StateEventEditor, StateEventInfo } from './StateEventEditor'; -import { SequenceCardStyle } from '$features/common-settings/styles.css'; type DeveloperToolsProps = { requestClose: () => void; diff --git a/src/app/features/common-settings/permissions/PermissionGroups.tsx b/src/app/features/common-settings/permissions/PermissionGroups.tsx index 1abe3a82..32400581 100644 --- a/src/app/features/common-settings/permissions/PermissionGroups.tsx +++ b/src/app/features/common-settings/permissions/PermissionGroups.tsx @@ -17,8 +17,8 @@ import { StateEvent } from '$types/matrix/room'; import { PowerSwitcher } from '$components/power'; import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback'; import { useAlive } from '$hooks/useAlive'; -import { PermissionGroup } from './types'; import { SequenceCardStyle } from '$features/common-settings/styles.css'; +import { PermissionGroup } from './types'; const USER_DEFAULT_LOCATION: PermissionLocation = { user: true, diff --git a/src/app/features/common-settings/permissions/Powers.tsx b/src/app/features/common-settings/permissions/Powers.tsx index 78e2351d..a029ac78 100644 --- a/src/app/features/common-settings/permissions/Powers.tsx +++ b/src/app/features/common-settings/permissions/Powers.tsx @@ -26,8 +26,8 @@ import { stopPropagation } from '$utils/keyboard'; import { getPowerTagIconSrc } from '$hooks/useMemberPowerTag'; import { useRoomCreatorsTag } from '$hooks/useRoomCreatorsTag'; import { useRoomCreators } from '$hooks/useRoomCreators'; -import { PermissionGroup } from './types'; import { SequenceCardStyle } from '$features/common-settings/styles.css'; +import { PermissionGroup } from './types'; type PeekPermissionsProps = { powerLevels: IPowerLevels; diff --git a/src/app/features/lobby/Lobby.tsx b/src/app/features/lobby/Lobby.tsx index a57a1d5f..0bc47426 100644 --- a/src/app/features/lobby/Lobby.tsx +++ b/src/app/features/lobby/Lobby.tsx @@ -51,11 +51,11 @@ import { useGetRoom } from '$hooks/useGetRoom'; import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback'; import { getRoomPermissionsAPI } from '$hooks/useRoomPermissions'; import { getRoomCreatorsForRoomId } from '$hooks/useRoomCreators'; +import { MembersDrawer } from '$features/room/MembersDrawer'; import { SpaceHierarchy } from './SpaceHierarchy'; import { CanDropCallback, useDnDMonitor } from './DnD'; import { LobbyHero } from './LobbyHero'; import { LobbyHeader } from './LobbyHeader'; -import { MembersDrawer } from '$features/room/MembersDrawer'; const useCanDropLobbyItem = ( space: Room, diff --git a/src/app/features/room-settings/RoomSettings.tsx b/src/app/features/room-settings/RoomSettings.tsx index 16f5ea7a..d79cfd77 100644 --- a/src/app/features/room-settings/RoomSettings.tsx +++ b/src/app/features/room-settings/RoomSettings.tsx @@ -13,12 +13,12 @@ import { RoomAvatar, RoomIcon } from '$components/room-avatar'; import { RoomSettingsPage } from '$state/roomSettings'; import { useRoom } from '$hooks/useRoom'; import { SwipeableOverlayWrapper } from '$components/SwipeableOverlayWrapper'; -import { General } from './general'; import { Members } from '$features/common-settings/members'; import { EmojisStickers } from '$features/common-settings/emojis-stickers'; -import { Permissions } from './permissions'; import { DeveloperTools } from '$features/common-settings/developer-tools'; import { Cosmetics } from '$features/common-settings/cosmetics/Cosmetics'; +import { Permissions } from './permissions'; +import { General } from './general'; type RoomSettingsMenuItem = { page: RoomSettingsPage; diff --git a/src/app/features/room/message/Reactions.tsx b/src/app/features/room/message/Reactions.tsx index 6152f7c2..19c920c6 100644 --- a/src/app/features/room/message/Reactions.tsx +++ b/src/app/features/room/message/Reactions.tsx @@ -21,8 +21,8 @@ import { Reaction, ReactionTooltipMsg } from '$components/message'; import { useRelations } from '$hooks/useRelations'; import { stopPropagation } from '$utils/keyboard'; import { useMediaAuthentication } from '$hooks/useMediaAuthentication'; -import * as css from './styles.css'; import { ReactionViewer } from '$features/room/reaction-viewer'; +import * as css from './styles.css'; export type ReactionsProps = { room: Room; diff --git a/src/app/features/room/room-pin-menu/RoomPinMenu.tsx b/src/app/features/room/room-pin-menu/RoomPinMenu.tsx index eaff34d1..d05284da 100644 --- a/src/app/features/room/room-pin-menu/RoomPinMenu.tsx +++ b/src/app/features/room/room-pin-menu/RoomPinMenu.tsx @@ -87,8 +87,8 @@ import { nicknamesAtom } from '$state/nicknames'; import { AccountDataEvent } from '$types/matrix/accountData'; import { useSableCosmetics } from '$hooks/useSableCosmetics'; import { EncryptedContent } from '$features/room/message'; -import * as css from './RoomPinMenu.css'; import type { PinReadMarker } from '$features/room/RoomViewHeader'; +import * as css from './RoomPinMenu.css'; const log = createLogger('RoomPinMenu'); diff --git a/src/app/features/settings/account/Profile.tsx b/src/app/features/settings/account/Profile.tsx index a94aaa60..ce6b855a 100644 --- a/src/app/features/settings/account/Profile.tsx +++ b/src/app/features/settings/account/Profile.tsx @@ -44,11 +44,11 @@ import { createUploadAtom, UploadSuccess } from '$state/upload'; import { CompactUploadCardRenderer } from '$components/upload-card'; import { useCapabilities } from '$hooks/useCapabilities'; import { profilesCacheAtom } from '$state/userRoomProfile'; +import { SequenceCardStyle } from '$features/settings/styles.css'; import { TimezoneEditor } from './TimezoneEditor'; import { PronounEditor } from './PronounEditor'; import { BioEditor } from './BioEditor'; import { NameColorEditor } from './NameColorEditor'; -import { SequenceCardStyle } from '$features/settings/styles.css'; type PronounSet = { summary: string; diff --git a/src/app/features/settings/devices/Devices.tsx b/src/app/features/settings/devices/Devices.tsx index fc7eb4bb..03e3ed66 100644 --- a/src/app/features/settings/devices/Devices.tsx +++ b/src/app/features/settings/devices/Devices.tsx @@ -12,6 +12,7 @@ import { import { useSecretStorageDefaultKeyId, useSecretStorageKeyContent } from '$hooks/useSecretStorage'; import { useCrossSigningActive } from '$hooks/useCrossSigning'; import { BackupRestoreTile } from '$components/BackupRestore'; +import { SequenceCardStyle } from '$features/settings/styles.css'; import { LocalBackup } from './LocalBackup'; import { DeviceLogoutBtn, DeviceKeyDetails, DeviceTile, DeviceTilePlaceholder } from './DeviceTile'; import { OtherDevices } from './OtherDevices'; @@ -21,7 +22,6 @@ import { VerificationStatusBadge, VerifyCurrentDeviceTile, } from './Verification'; -import { SequenceCardStyle } from '$features/settings/styles.css'; function DevicesPlaceholder() { return ( diff --git a/src/app/features/settings/devices/OtherDevices.tsx b/src/app/features/settings/devices/OtherDevices.tsx index 7970bf77..e044201d 100644 --- a/src/app/features/settings/devices/OtherDevices.tsx +++ b/src/app/features/settings/devices/OtherDevices.tsx @@ -12,9 +12,9 @@ import { useAuthMetadata } from '$hooks/useAuthMetadata'; import { withSearchParam } from '$pages/pathUtils'; import { useAccountManagementActions } from '$hooks/useAccountManagement'; import { SettingTile } from '$components/setting-tile'; +import { SequenceCardStyle } from '$features/settings/styles.css'; import { VerifyOtherDeviceTile } from './Verification'; import { DeviceDeleteBtn, DeviceTile } from './DeviceTile'; -import { SequenceCardStyle } from '$features/settings/styles.css'; type OtherDevicesProps = { devices: IMyDevice[]; diff --git a/src/app/features/settings/notifications/KeywordMessages.tsx b/src/app/features/settings/notifications/KeywordMessages.tsx index a2852284..fba9b53a 100644 --- a/src/app/features/settings/notifications/KeywordMessages.tsx +++ b/src/app/features/settings/notifications/KeywordMessages.tsx @@ -13,8 +13,8 @@ import { useNotificationModeActions, } from '$hooks/useNotificationMode'; import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback'; -import { NotificationModeSwitcher } from './NotificationModeSwitcher'; import { SequenceCardStyle } from '$features/settings/styles.css'; +import { NotificationModeSwitcher } from './NotificationModeSwitcher'; const NOTIFY_MODE_OPS: NotificationModeOptions = { highlight: true, diff --git a/src/app/features/settings/notifications/Notifications.tsx b/src/app/features/settings/notifications/Notifications.tsx index f74f8604..ef84ae59 100644 --- a/src/app/features/settings/notifications/Notifications.tsx +++ b/src/app/features/settings/notifications/Notifications.tsx @@ -2,11 +2,11 @@ import { Box, Text, IconButton, Icon, Icons, Scroll } from 'folds'; import { Page, PageContent, PageHeader } from '$components/page'; import { SequenceCard } from '$components/sequence-card'; import { SettingTile } from '$components/setting-tile'; +import { SequenceCardStyle } from '$features/settings/styles.css'; import { SystemNotification } from './SystemNotification'; import { AllMessagesNotifications } from './AllMessages'; import { SpecialMessagesNotifications } from './SpecialMessages'; import { KeywordMessagesNotifications } from './KeywordMessages'; -import { SequenceCardStyle } from '$features/settings/styles.css'; type NotificationsProps = { requestClose: () => void; diff --git a/src/app/features/space-settings/SpaceSettings.tsx b/src/app/features/space-settings/SpaceSettings.tsx index ffdd6d42..79ab8442 100644 --- a/src/app/features/space-settings/SpaceSettings.tsx +++ b/src/app/features/space-settings/SpaceSettings.tsx @@ -15,9 +15,9 @@ import { useRoom } from '$hooks/useRoom'; import { EmojisStickers } from '$features/common-settings/emojis-stickers'; import { Members } from '$features/common-settings/members'; import { DeveloperTools } from '$features/common-settings/developer-tools'; +import { Cosmetics } from '$features/common-settings/cosmetics/Cosmetics'; import { General } from './general'; import { Permissions } from './permissions'; -import { Cosmetics } from '$features/common-settings/cosmetics/Cosmetics'; type SpaceSettingsMenuItem = { page: SpaceSettingsPage; diff --git a/src/app/hooks/useCommands.ts b/src/app/hooks/useCommands.ts index d9c4e7d6..c12f3f6e 100644 --- a/src/app/hooks/useCommands.ts +++ b/src/app/hooks/useCommands.ts @@ -23,10 +23,10 @@ import { rateLimitedActions, removeRoomIdFromMDirect, } from '$utils/matrix'; -import { useRoomNavigate } from './useRoomNavigate'; import { getStateEvent } from '$utils/room'; import { splitWithSpace } from '$utils/common'; import { createRoomEncryptionState } from '$components/create-room'; +import { useRoomNavigate } from './useRoomNavigate'; import { enrichWidgetUrl } from './useRoomWidgets'; export const SHRUG = '¯\\_(ツ)_/¯'; diff --git a/src/app/hooks/useDeviceVerificationStatus.ts b/src/app/hooks/useDeviceVerificationStatus.ts index f6102fe6..4d2ea071 100644 --- a/src/app/hooks/useDeviceVerificationStatus.ts +++ b/src/app/hooks/useDeviceVerificationStatus.ts @@ -1,8 +1,8 @@ import { useCallback, useEffect, useState } from 'react'; import { CryptoApi } from '$types/matrix-sdk'; import { verifiedDevice } from '$utils/matrix-crypto'; -import { useAlive } from './useAlive'; import { fulfilledPromiseSettledResult } from '$utils/common'; +import { useAlive } from './useAlive'; import { useMatrixClient } from './useMatrixClient'; import { useDeviceListChange } from './useDeviceList'; diff --git a/src/app/hooks/useJoinedRoomId.ts b/src/app/hooks/useJoinedRoomId.ts index 96085031..d52f4f5b 100644 --- a/src/app/hooks/useJoinedRoomId.ts +++ b/src/app/hooks/useJoinedRoomId.ts @@ -1,7 +1,6 @@ import { useMemo } from 'react'; -import { useMatrixClient } from './useMatrixClient'; - import { getCanonicalAliasRoomId, isRoomAlias } from '$utils/matrix'; +import { useMatrixClient } from './useMatrixClient'; export const useJoinedRoomId = (allRooms: string[], roomIdOrAlias: string): string | undefined => { const mx = useMatrixClient(); diff --git a/src/app/hooks/useMemberPowerTag.ts b/src/app/hooks/useMemberPowerTag.ts index f8c862c0..ac2df17c 100644 --- a/src/app/hooks/useMemberPowerTag.ts +++ b/src/app/hooks/useMemberPowerTag.ts @@ -1,11 +1,11 @@ import { useCallback, useMemo } from 'react'; import { MatrixClient, Room, RoomMember } from '$types/matrix-sdk'; import { MemberPowerTag, MemberPowerTagIcon } from '$types/matrix/room'; +import { accessibleColor } from '$plugins/color'; import { getPowerLevelTag, PowerLevelTags, usePowerLevelTags } from './usePowerLevelTags'; import { IPowerLevels, readPowerLevel } from './usePowerLevels'; import { useRoomCreatorsTag } from './useRoomCreatorsTag'; import { ThemeKind } from './useTheme'; -import { accessibleColor } from '$plugins/color'; export type GetMemberPowerTag = (userId: string) => MemberPowerTag; diff --git a/src/app/hooks/useMentionClickHandler.ts b/src/app/hooks/useMentionClickHandler.ts index 25d7a828..aadfb982 100644 --- a/src/app/hooks/useMentionClickHandler.ts +++ b/src/app/hooks/useMentionClickHandler.ts @@ -1,11 +1,11 @@ import { ReactEventHandler, useCallback } from 'react'; import { useNavigate } from 'react-router-dom'; -import { useRoomNavigate } from './useRoomNavigate'; -import { useMatrixClient } from './useMatrixClient'; import { isRoomId, isUserId } from '$utils/matrix'; import { getHomeRoomPath, withSearchParam } from '$pages/pathUtils'; import { RoomSearchParams } from '$pages/paths'; import { useOpenUserRoomProfile } from '$state/hooks/userRoomProfile'; +import { useMatrixClient } from './useMatrixClient'; +import { useRoomNavigate } from './useRoomNavigate'; import { useSpaceOptionally } from './useSpace'; export const useMentionClickHandler = (roomId: string): ReactEventHandler => { diff --git a/src/app/hooks/useNotificationJumper.ts b/src/app/hooks/useNotificationJumper.ts index da35a81a..507f9669 100644 --- a/src/app/hooks/useNotificationJumper.ts +++ b/src/app/hooks/useNotificationJumper.ts @@ -2,10 +2,10 @@ import { useCallback, useEffect } from 'react'; import { useAtom } from 'jotai'; import { SyncState, ClientEvent } from '$types/matrix-sdk'; import { pendingNotificationAtom } from '$state/sessions'; +import { createLogger } from '$utils/debug'; import { useSyncState } from './useSyncState'; import { useMatrixClient } from './useMatrixClient'; import { useRoomNavigate } from './useRoomNavigate'; -import { createLogger } from '$utils/debug'; export function NotificationJumper() { const [pending, setPending] = useAtom(pendingNotificationAtom); diff --git a/src/app/hooks/usePathWithOrigin.ts b/src/app/hooks/usePathWithOrigin.ts index 1565364b..956153dc 100644 --- a/src/app/hooks/usePathWithOrigin.ts +++ b/src/app/hooks/usePathWithOrigin.ts @@ -1,6 +1,6 @@ import { useMemo } from 'react'; -import { useClientConfig } from './useClientConfig'; import { trimLeadingSlash, trimSlash, trimTrailingSlash } from '$utils/common'; +import { useClientConfig } from './useClientConfig'; export const usePathWithOrigin = (path: string): string => { const { hashRouter } = useClientConfig(); diff --git a/src/app/hooks/usePowerLevels.ts b/src/app/hooks/usePowerLevels.ts index 79fa8fc3..4b1b874b 100644 --- a/src/app/hooks/usePowerLevels.ts +++ b/src/app/hooks/usePowerLevels.ts @@ -2,10 +2,10 @@ import { MatrixEvent, Room } from '$types/matrix-sdk'; import { createContext, useCallback, useContext, useMemo, useState } from 'react'; import { produce } from 'immer'; import { StateEvent } from '$types/matrix/room'; +import { getStateEvent } from '$utils/room'; import { useStateEvent } from './useStateEvent'; import { useStateEventCallback } from './useStateEventCallback'; import { useMatrixClient } from './useMatrixClient'; -import { getStateEvent } from '$utils/room'; export type PowerLevelActions = 'invite' | 'redact' | 'kick' | 'ban' | 'historical'; export type PowerLevelNotificationsAction = 'room'; diff --git a/src/app/hooks/useRoomAliases.ts b/src/app/hooks/useRoomAliases.ts index fb51b375..36fff1ad 100644 --- a/src/app/hooks/useRoomAliases.ts +++ b/src/app/hooks/useRoomAliases.ts @@ -1,11 +1,11 @@ import { useCallback, useEffect, useMemo } from 'react'; import { MatrixError, Room, RoomCanonicalAliasEventContent } from '$types/matrix-sdk'; import { StateEvent } from '$types/matrix/room'; +import { getStateEvent } from '$utils/room'; import { AsyncState, useAsyncCallback } from './useAsyncCallback'; import { useMatrixClient } from './useMatrixClient'; import { useAlive } from './useAlive'; import { useStateEvent } from './useStateEvent'; -import { getStateEvent } from '$utils/room'; export const usePublishedAliases = (room: Room): [string | undefined, string[]] => { const aliasContent = useStateEvent( diff --git a/src/app/hooks/useRoomCreators.ts b/src/app/hooks/useRoomCreators.ts index 1ee0740c..6c4f740c 100644 --- a/src/app/hooks/useRoomCreators.ts +++ b/src/app/hooks/useRoomCreators.ts @@ -1,9 +1,9 @@ import { MatrixClient, MatrixEvent, Room } from '$types/matrix-sdk'; import { useMemo } from 'react'; import { IRoomCreateContent, StateEvent } from '$types/matrix/room'; -import { useStateEvent } from './useStateEvent'; import { creatorsSupported } from '$utils/matrix'; import { getStateEvent } from '$utils/room'; +import { useStateEvent } from './useStateEvent'; export const getRoomCreators = (createEvent: MatrixEvent): Set => { const createContent = createEvent.getContent(); diff --git a/src/app/hooks/useRoomNavigate.ts b/src/app/hooks/useRoomNavigate.ts index 8cc6344f..51555125 100644 --- a/src/app/hooks/useRoomNavigate.ts +++ b/src/app/hooks/useRoomNavigate.ts @@ -8,13 +8,13 @@ import { getSpacePath, getSpaceRoomPath, } from '$pages/pathUtils'; -import { useMatrixClient } from './useMatrixClient'; import { getOrphanParents, guessPerfectParent } from '$utils/room'; import { roomToParentsAtom } from '$state/room/roomToParents'; import { mDirectAtom } from '$state/mDirectList'; -import { useSelectedSpace } from './router/useSelectedSpace'; import { settingsAtom } from '$state/settings'; import { useSetting } from '$state/hooks/settings'; +import { useSelectedSpace } from './router/useSelectedSpace'; +import { useMatrixClient } from './useMatrixClient'; export const useRoomNavigate = () => { const navigate = useNavigate(); diff --git a/src/app/hooks/useRoomWidgets.ts b/src/app/hooks/useRoomWidgets.ts index 857da6aa..a424e2ec 100644 --- a/src/app/hooks/useRoomWidgets.ts +++ b/src/app/hooks/useRoomWidgets.ts @@ -2,9 +2,9 @@ import { Room, MatrixEvent, MatrixClient } from '$types/matrix-sdk'; import { useCallback, useMemo } from 'react'; import { IWidget } from 'matrix-widget-api'; import { StateEvent } from '$types/matrix/room'; +import { getStateEvents } from '$utils/room'; import { useStateEventCallback } from './useStateEventCallback'; import { useForceUpdate } from './useForceUpdate'; -import { getStateEvents } from '$utils/room'; export interface RoomWidget extends IWidget { eventId?: string; diff --git a/src/app/hooks/useRoomsNotificationPreferences.ts b/src/app/hooks/useRoomsNotificationPreferences.ts index cba04e61..65626bc1 100644 --- a/src/app/hooks/useRoomsNotificationPreferences.ts +++ b/src/app/hooks/useRoomsNotificationPreferences.ts @@ -2,8 +2,8 @@ import { createContext, useCallback, useContext, useMemo } from 'react'; import { ConditionKind, IPushRules, MatrixClient, PushRuleKind } from '$types/matrix-sdk'; import { Icons, IconSrc } from 'folds'; import { AccountDataEvent } from '$types/matrix/accountData'; -import { useAccountData } from './useAccountData'; import { isRoomId } from '$utils/matrix'; +import { useAccountData } from './useAccountData'; import { getNotificationMode, getNotificationModeActions, diff --git a/src/app/hooks/useSidebarItems.ts b/src/app/hooks/useSidebarItems.ts index c3e525c4..dba7b2f2 100644 --- a/src/app/hooks/useSidebarItems.ts +++ b/src/app/hooks/useSidebarItems.ts @@ -2,8 +2,8 @@ import { Dispatch, SetStateAction, useCallback, useEffect, useState } from 'reac import { MatrixClient } from '$types/matrix-sdk'; import { AccountDataEvent } from '$types/matrix/accountData'; import { Membership } from '$types/matrix/room'; -import { useMatrixClient } from './useMatrixClient'; import { getAccountData, isSpace } from '$utils/room'; +import { useMatrixClient } from './useMatrixClient'; import { useAccountDataCallback } from './useAccountDataCallback'; export type ISidebarFolder = { diff --git a/src/app/hooks/useSpaceHierarchy.ts b/src/app/hooks/useSpaceHierarchy.ts index 793bd70f..af8c8019 100644 --- a/src/app/hooks/useSpaceHierarchy.ts +++ b/src/app/hooks/useSpaceHierarchy.ts @@ -3,11 +3,11 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { MatrixError, Room, IHierarchyRoom } from '$types/matrix-sdk'; import { QueryFunction, useInfiniteQuery } from '@tanstack/react-query'; import { MSpaceChildContent, StateEvent } from '$types/matrix/room'; -import { useMatrixClient } from './useMatrixClient'; import { roomToParentsAtom } from '$state/room/roomToParents'; import { getAllParents, getStateEvents, isValidChild } from '$utils/room'; import { isRoomId } from '$utils/matrix'; import { SortFunc, byOrderKey, byTsOldToNew, factoryRoomIdByActivity } from '$utils/sort'; +import { useMatrixClient } from './useMatrixClient'; import { useStateEventCallback } from './useStateEventCallback'; import { ErrorCode } from '../cs-errorcode'; diff --git a/src/app/hooks/useStateEvent.ts b/src/app/hooks/useStateEvent.ts index 10afec0b..ba99eff5 100644 --- a/src/app/hooks/useStateEvent.ts +++ b/src/app/hooks/useStateEvent.ts @@ -1,9 +1,9 @@ import { Room } from '$types/matrix-sdk'; import { useCallback, useMemo } from 'react'; import { StateEvent } from '$types/matrix/room'; +import { getStateEvent } from '$utils/room'; import { useStateEventCallback } from './useStateEventCallback'; import { useForceUpdate } from './useForceUpdate'; -import { getStateEvent } from '$utils/room'; export const useStateEvent = (room: Room, eventType: StateEvent, stateKey = '') => { const [updateCount, forceUpdate] = useForceUpdate(); diff --git a/src/app/hooks/useTextAreaCodeEditor.ts b/src/app/hooks/useTextAreaCodeEditor.ts index 5c95a191..ff44e934 100644 --- a/src/app/hooks/useTextAreaCodeEditor.ts +++ b/src/app/hooks/useTextAreaCodeEditor.ts @@ -1,8 +1,8 @@ import { useMemo, useCallback, KeyboardEventHandler, MutableRefObject } from 'react'; import { isKeyHotkey } from 'is-hotkey'; import { TextArea, Intent, TextAreaOperations, Cursor } from '$plugins/text-area'; -import { useTextAreaIntentHandler } from './useTextAreaIntent'; import { GetTarget } from '$plugins/text-area/type'; +import { useTextAreaIntentHandler } from './useTextAreaIntent'; export const useTextAreaCodeEditor = ( textAreaRef: MutableRefObject, diff --git a/src/app/hooks/useTheme.ts b/src/app/hooks/useTheme.ts index fbfdc68f..f053d900 100644 --- a/src/app/hooks/useTheme.ts +++ b/src/app/hooks/useTheme.ts @@ -1,4 +1,6 @@ import { createContext, useContext, useEffect, useMemo, useState } from 'react'; +import { settingsAtom } from '$state/settings'; +import { useSetting } from '$state/hooks/settings'; import { onDarkFontWeight, onLightFontWeight } from '../../config.css'; import { butterTheme, @@ -9,8 +11,6 @@ import { silverTheme, gruvdarkTheme, } from '../../colors.css'; -import { settingsAtom } from '$state/settings'; -import { useSetting } from '$state/hooks/settings'; export enum ThemeKind { Light = 'light', diff --git a/src/app/hooks/useUserProfile.ts b/src/app/hooks/useUserProfile.ts index 4afab6a4..2b546b55 100644 --- a/src/app/hooks/useUserProfile.ts +++ b/src/app/hooks/useUserProfile.ts @@ -4,10 +4,10 @@ import { selectAtom } from 'jotai/utils'; import { EventTimeline, Room } from '$types/matrix-sdk'; import { StateEvent } from '$types/matrix/room'; import colorMXID from '$utils/colorMXID'; -import { useMatrixClient } from './useMatrixClient'; import { profilesCacheAtom } from '$state/userRoomProfile'; import { useSetting } from '$state/hooks/settings'; import { settingsAtom } from '$state/settings'; +import { useMatrixClient } from './useMatrixClient'; const inFlightProfiles = new Map>(); diff --git a/src/app/hooks/useVirtualPaginator.ts b/src/app/hooks/useVirtualPaginator.ts index aedef122..3b5ae870 100644 --- a/src/app/hooks/useVirtualPaginator.ts +++ b/src/app/hooks/useVirtualPaginator.ts @@ -1,11 +1,11 @@ import { useCallback, useEffect, useLayoutEffect, useMemo, useRef } from 'react'; -import { OnIntersectionCallback, useIntersectionObserver } from './useIntersectionObserver'; import { canFitInScrollView, getScrollInfo, isInScrollView, isIntersectingScrollView, } from '$utils/dom'; +import { OnIntersectionCallback, useIntersectionObserver } from './useIntersectionObserver'; const PAGINATOR_ANCHOR_ATTR = 'data-paginator-anchor'; diff --git a/src/app/pages/App.tsx b/src/app/pages/App.tsx index 6263723f..bfe51f2a 100644 --- a/src/app/pages/App.tsx +++ b/src/app/pages/App.tsx @@ -6,11 +6,11 @@ import { ReactQueryDevtools } from '@tanstack/react-query-devtools'; import { ClientConfigLoader } from '$components/ClientConfigLoader'; import { ClientConfigProvider } from '$hooks/useClientConfig'; +import { ScreenSizeProvider, useScreenSize } from '$hooks/useScreenSize'; +import { useCompositionEndTracking } from '$hooks/useComposingCheck'; import { ConfigConfigError, ConfigConfigLoading } from './ConfigConfig'; import { FeatureCheck } from './FeatureCheck'; import { createRouter } from './Router'; -import { ScreenSizeProvider, useScreenSize } from '$hooks/useScreenSize'; -import { useCompositionEndTracking } from '$hooks/useComposingCheck'; const queryClient = new QueryClient(); diff --git a/src/app/pages/Router.tsx b/src/app/pages/Router.tsx index 0d79b8e0..5d755772 100644 --- a/src/app/pages/Router.tsx +++ b/src/app/pages/Router.tsx @@ -8,6 +8,21 @@ import { } from 'react-router-dom'; import { ClientConfig } from '$hooks/useClientConfig'; +import { Room } from '$features/room'; +import { Lobby } from '$features/lobby'; +import { PageRoot } from '$components/page'; +import { ScreenSize } from '$hooks/useScreenSize'; +import { ReceiveSelfDeviceVerification } from '$components/DeviceVerification'; +import { AutoRestoreBackupOnVerification } from '$components/BackupRestore'; +import { RoomSettingsRenderer } from '$features/room-settings'; +import { SpaceSettingsRenderer } from '$features/space-settings'; +import { UserRoomProfileRenderer } from '$components/UserRoomProfileRenderer'; +import { CreateRoomModalRenderer } from '$features/create-room'; +import { CreateSpaceModalRenderer } from '$features/create-space'; +import { getFallbackSession, MATRIX_SESSIONS_KEY, Sessions } from '$state/sessions'; +import { getLocalStorageItem } from '$state/utils/atomWithLocalStorage'; +import { NotificationJumper } from '$hooks/useNotificationJumper'; +import { SearchModalRenderer } from '$features/search'; import { AuthLayout, Login, Register, ResetPassword } from './auth'; import { DIRECT_PATH, @@ -45,32 +60,17 @@ import { RouteSpaceProvider, Space, SpaceRouteRoomProvider, SpaceSearch } from ' import { Explore, FeaturedRooms, PublicRooms } from './client/explore'; import { Notifications, Inbox, Invites } from './client/inbox'; import { setAfterLoginRedirectPath } from './afterLoginRedirectPath'; -import { Room } from '$features/room'; -import { Lobby } from '$features/lobby'; import { WelcomePage } from './client/WelcomePage'; import { SidebarNav } from './client/SidebarNav'; -import { PageRoot } from '$components/page'; -import { ScreenSize } from '$hooks/useScreenSize'; import { MobileFriendlyPageNav, MobileFriendlyClientNav } from './MobileFriendly'; import { ClientInitStorageAtom } from './client/ClientInitStorageAtom'; import { ClientNonUIFeatures } from './client/ClientNonUIFeatures'; import { AuthRouteThemeManager, UnAuthRouteThemeManager } from './ThemeManager'; -import { ReceiveSelfDeviceVerification } from '$components/DeviceVerification'; -import { AutoRestoreBackupOnVerification } from '$components/BackupRestore'; -import { RoomSettingsRenderer } from '$features/room-settings'; import { ClientRoomsNotificationPreferences } from './client/ClientRoomsNotificationPreferences'; -import { SpaceSettingsRenderer } from '$features/space-settings'; -import { UserRoomProfileRenderer } from '$components/UserRoomProfileRenderer'; -import { CreateRoomModalRenderer } from '$features/create-room'; import { HomeCreateRoom } from './client/home/CreateRoom'; import { Create } from './client/create'; -import { CreateSpaceModalRenderer } from '$features/create-space'; -import { SearchModalRenderer } from '$features/search'; -import { getFallbackSession, MATRIX_SESSIONS_KEY, Sessions } from '$state/sessions'; -import { getLocalStorageItem } from '$state/utils/atomWithLocalStorage'; import { CallProvider } from './client/call/CallProvider'; import { PersistentCallContainer } from './client/call/PersistentCallContainer'; -import { NotificationJumper } from '$hooks/useNotificationJumper'; /** * Returns true if there is at least one stored session. diff --git a/src/app/pages/auth/AuthLayout.tsx b/src/app/pages/auth/AuthLayout.tsx index 387b2e98..edc913a6 100644 --- a/src/app/pages/auth/AuthLayout.tsx +++ b/src/app/pages/auth/AuthLayout.tsx @@ -21,9 +21,9 @@ import { AutoDiscoveryInfoProvider } from '$hooks/useAutoDiscoveryInfo'; import { AuthFlowsLoader } from '$components/AuthFlowsLoader'; import { AuthFlowsProvider } from '$hooks/useAuthFlows'; import { AuthServerProvider } from '$hooks/useAuthServer'; +import { LOGIN_PATH, REGISTER_PATH, RESET_PASSWORD_PATH } from '$pages/paths'; import { AutoDiscoveryAction, autoDiscovery } from '../../cs-api'; import { ServerPicker } from './ServerPicker'; -import { LOGIN_PATH, REGISTER_PATH, RESET_PASSWORD_PATH } from '$pages/paths'; import * as css from './styles.css'; import { AuthFooter } from './AuthFooter'; diff --git a/src/app/pages/auth/login/Login.tsx b/src/app/pages/auth/login/Login.tsx index cb60dc4b..11df22a8 100644 --- a/src/app/pages/auth/login/Login.tsx +++ b/src/app/pages/auth/login/Login.tsx @@ -9,10 +9,10 @@ import { getLoginPath, getRegisterPath, withSearchParam } from '$pages/pathUtils import { usePathWithOrigin } from '$hooks/usePathWithOrigin'; import { LoginPathSearchParams } from '$pages/paths'; import { useClientConfig } from '$hooks/useClientConfig'; -import { PasswordLoginForm } from './PasswordLoginForm'; import { SSOLogin } from '$pages/auth/SSOLogin'; -import { TokenLogin } from './TokenLogin'; import { OrDivider } from '$pages/auth/OrDivider'; +import { PasswordLoginForm } from './PasswordLoginForm'; +import { TokenLogin } from './TokenLogin'; const getLoginTokenSearchParam = () => { // when using hasRouter query params in existing route diff --git a/src/app/pages/auth/reset-password/PasswordResetForm.tsx b/src/app/pages/auth/reset-password/PasswordResetForm.tsx index a973a393..af4c5752 100644 --- a/src/app/pages/auth/reset-password/PasswordResetForm.tsx +++ b/src/app/pages/auth/reset-password/PasswordResetForm.tsx @@ -26,8 +26,8 @@ import { EmailStageDialog } from '$components/uia-stages'; import { getLoginPath, withSearchParam } from '$pages/pathUtils'; import { LoginPathSearchParams } from '$pages/paths'; import { getUIAError, getUIAErrorCode } from '$utils/matrix-uia'; -import { ResetPasswordResult, resetPassword } from './resetPasswordUtil'; import { FieldError } from '$pages/auth/FiledError'; +import { ResetPasswordResult, resetPassword } from './resetPasswordUtil'; type FormData = { email: string; diff --git a/src/app/pages/client/ClientNonUIFeatures.tsx b/src/app/pages/client/ClientNonUIFeatures.tsx index 70881a59..1c1b0e58 100644 --- a/src/app/pages/client/ClientNonUIFeatures.tsx +++ b/src/app/pages/client/ClientNonUIFeatures.tsx @@ -27,8 +27,8 @@ import { useSelectedRoom } from '$hooks/router/useSelectedRoom'; import { useInboxNotificationsSelected } from '$hooks/router/useInbox'; import { useMediaAuthentication } from '$hooks/useMediaAuthentication'; import { pendingNotificationAtom } from '$state/sessions'; -import { BackgroundNotifications } from './BackgroundNotifications'; import { getInboxInvitesPath } from '$pages/pathUtils'; +import { BackgroundNotifications } from './BackgroundNotifications'; function SystemEmojiFeature() { const [twitterEmoji] = useSetting(settingsAtom, 'twitterEmoji'); diff --git a/src/app/pages/pathUtils.ts b/src/app/pages/pathUtils.ts index 05e92b63..3872c929 100644 --- a/src/app/pages/pathUtils.ts +++ b/src/app/pages/pathUtils.ts @@ -1,4 +1,6 @@ import { generatePath, Path } from 'react-router-dom'; +import { trimLeadingSlash, trimTrailingSlash } from '$utils/common'; +import { HashRouterConfig } from '$hooks/useClientConfig'; import { DIRECT_CREATE_PATH, DIRECT_PATH, @@ -24,8 +26,6 @@ import { SPACE_SEARCH_PATH, CREATE_PATH, } from './paths'; -import { trimLeadingSlash, trimTrailingSlash } from '$utils/common'; -import { HashRouterConfig } from '$hooks/useClientConfig'; export const joinPathComponent = (path: Path): string => path.pathname + path.search + path.hash; diff --git a/src/app/plugins/react-custom-html-parser.tsx b/src/app/plugins/react-custom-html-parser.tsx index bdbba2bd..c02fc6b2 100644 --- a/src/app/plugins/react-custom-html-parser.tsx +++ b/src/app/plugins/react-custom-html-parser.tsx @@ -31,17 +31,17 @@ import { import { getMemberDisplayName } from '$utils/room'; import { Nicknames } from '$state/nicknames'; import { EMOJI_PATTERN, sanitizeForRegex, URL_NEG_LB } from '$utils/regex'; -import { getHexcodeForEmoji, getShortcodeFor } from './emoji'; import { findAndReplace } from '$utils/findAndReplace'; +import { onEnterOrSpace } from '$utils/keyboard'; +import { copyToClipboard } from '$utils/dom'; +import { useTimeoutToggle } from '$hooks/useTimeoutToggle'; import { parseMatrixToRoom, parseMatrixToRoomEvent, parseMatrixToUser, testMatrixTo, } from './matrix-to'; -import { onEnterOrSpace } from '$utils/keyboard'; -import { copyToClipboard } from '$utils/dom'; -import { useTimeoutToggle } from '$hooks/useTimeoutToggle'; +import { getHexcodeForEmoji, getShortcodeFor } from './emoji'; const ReactPrism = lazy(() => import('./react-prism/ReactPrism')); diff --git a/src/app/state/sessions.ts b/src/app/state/sessions.ts index 93f1f2fa..3a9b222a 100644 --- a/src/app/state/sessions.ts +++ b/src/app/state/sessions.ts @@ -1,10 +1,10 @@ import { atom } from 'jotai'; +import { createLogger } from '$utils/debug'; import { atomWithLocalStorage, getLocalStorageItem, setLocalStorageItem, } from './utils/atomWithLocalStorage'; -import { createLogger } from '$utils/debug'; const log = createLogger('sessions'); diff --git a/src/client/initMatrix.ts b/src/client/initMatrix.ts index 8999f84e..40f1c283 100644 --- a/src/client/initMatrix.ts +++ b/src/client/initMatrix.ts @@ -5,9 +5,7 @@ import { IndexedDBCryptoStore, } from '$types/matrix-sdk'; -import { cryptoCallbacks } from './secretStorageKeys'; import { clearNavToActivePathStore } from '$state/navToActivePath'; -import { pushSessionToSW } from '../sw-session'; import { Session, Sessions, @@ -17,6 +15,8 @@ import { } from '$state/sessions'; import { getLocalStorageItem } from '$state/utils/atomWithLocalStorage'; import { createLogger } from '$utils/debug'; +import { pushSessionToSW } from '../sw-session'; +import { cryptoCallbacks } from './secretStorageKeys'; const log = createLogger('initMatrix');