From b664f5e8c38dd4eb9b77c19c73a8afe66d6f423e Mon Sep 17 00:00:00 2001 From: Oliver Date: Thu, 11 Sep 2025 11:59:25 +0200 Subject: Move SettingsNavigationListItem to separate folder --- .../components/SettingsNavigationListItem.tsx | 33 --------------------- .../src/renderer/components/Support.tsx | 2 +- .../renderer/components/UserInterfaceSettings.tsx | 2 +- .../SettingsNavigationListItem.tsx | 34 ++++++++++++++++++++++ .../settings-navigation-list-item/index.ts | 1 + .../ApiAccessMethodsListItem.tsx | 2 +- .../app-info-list-item/AppInfoListItem.tsx | 2 +- .../components/daita-list-item/DaitaListItem.tsx | 2 +- .../components/debug-list-item/DebugListItem.tsx | 2 +- .../multihop-list-item/MultihopListItem.tsx | 2 +- .../SplitTunnelingListItem.tsx | 2 +- .../support-list-item/SupportListItem.tsx | 2 +- .../UserInterfaceSettingsListItem.tsx | 2 +- .../vpn-settings-list-item/VpnSettingsListItem.tsx | 2 +- .../ip-override-settings/IpOverrideSettings.tsx | 2 +- .../open-vpn-settings/OpenVpnSettings.tsx | 2 +- .../wireguard-settings/WireguardSettings.tsx | 2 +- 17 files changed, 49 insertions(+), 47 deletions(-) delete mode 100644 desktop/packages/mullvad-vpn/src/renderer/components/SettingsNavigationListItem.tsx create mode 100644 desktop/packages/mullvad-vpn/src/renderer/components/settings-navigation-list-item/SettingsNavigationListItem.tsx create mode 100644 desktop/packages/mullvad-vpn/src/renderer/components/settings-navigation-list-item/index.ts diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/SettingsNavigationListItem.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/SettingsNavigationListItem.tsx deleted file mode 100644 index 51bb0afa3b..0000000000 --- a/desktop/packages/mullvad-vpn/src/renderer/components/SettingsNavigationListItem.tsx +++ /dev/null @@ -1,33 +0,0 @@ -import React from 'react'; - -import { RoutePath } from '../../shared/routes'; -import { useHistory } from '../lib/history'; -import { SettingsListItem, SettingsListItemProps } from './settings-list-item'; - -export type SettingsNavigationListItemProps = { - to: RoutePath; -} & SettingsListItemProps; - -function SettingsNavigationListItem({ to, children, ...props }: SettingsNavigationListItemProps) { - const history = useHistory(); - const navigate = React.useCallback(() => history.push(to), [history, to]); - - return ( - - - - {children} - - - - ); -} -const SettingsNavigationListItemNamespace = Object.assign(SettingsNavigationListItem, { - Label: SettingsListItem.Label, - Group: SettingsListItem.Group, - Text: SettingsListItem.Text, - Footer: SettingsListItem.Footer, - Icon: SettingsListItem.Icon, -}); - -export { SettingsNavigationListItemNamespace as SettingsNavigationListItem }; diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/Support.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/Support.tsx index 4f2799200f..6ceb844c47 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/Support.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/Support.tsx @@ -14,8 +14,8 @@ import { BackAction } from './KeyboardNavigation'; import { Layout, SettingsContainer } from './Layout'; import { NavigationContainer } from './NavigationContainer'; import { NavigationScrollbars } from './NavigationScrollbars'; +import { SettingsNavigationListItem } from './settings-navigation-list-item'; import SettingsHeader, { HeaderTitle } from './SettingsHeader'; -import { SettingsNavigationListItem } from './SettingsNavigationListItem'; const StyledContent = styled.div({ display: 'flex', diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/UserInterfaceSettings.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/UserInterfaceSettings.tsx index 1f3a4893a2..5a1e4ad39e 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/UserInterfaceSettings.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/UserInterfaceSettings.tsx @@ -13,8 +13,8 @@ import { BackAction } from './KeyboardNavigation'; import { Layout, SettingsContainer, SettingsContent, SettingsGroup, SettingsStack } from './Layout'; import { NavigationContainer } from './NavigationContainer'; import { NavigationScrollbars } from './NavigationScrollbars'; +import { SettingsNavigationListItem } from './settings-navigation-list-item'; import SettingsHeader, { HeaderTitle } from './SettingsHeader'; -import { SettingsNavigationListItem } from './SettingsNavigationListItem'; const StyledAnimateMapCellGroup = styled(SettingsGroup)({ '@media (prefers-reduced-motion: reduce)': { diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/settings-navigation-list-item/SettingsNavigationListItem.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/settings-navigation-list-item/SettingsNavigationListItem.tsx new file mode 100644 index 0000000000..ba0f13c480 --- /dev/null +++ b/desktop/packages/mullvad-vpn/src/renderer/components/settings-navigation-list-item/SettingsNavigationListItem.tsx @@ -0,0 +1,34 @@ +import React from 'react'; + +import { RoutePath } from '../../../shared/routes'; +import { useHistory } from '../../lib/history'; +import { SettingsListItem, SettingsListItemProps } from '../settings-list-item'; + +export type SettingsNavigationListItemProps = { + to: RoutePath; +} & SettingsListItemProps; + +function SettingsNavigationListItem({ to, children, ...props }: SettingsNavigationListItemProps) { + const history = useHistory(); + const navigate = React.useCallback(() => history.push(to), [history, to]); + + return ( + + + + {children} + + + + ); +} + +const SettingsNavigationListItemNamespace = Object.assign(SettingsNavigationListItem, { + Label: SettingsListItem.Label, + Group: SettingsListItem.Group, + Text: SettingsListItem.Text, + Footer: SettingsListItem.Footer, + Icon: SettingsListItem.Icon, +}); + +export { SettingsNavigationListItemNamespace as SettingsNavigationListItem }; diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/settings-navigation-list-item/index.ts b/desktop/packages/mullvad-vpn/src/renderer/components/settings-navigation-list-item/index.ts new file mode 100644 index 0000000000..e4c54dd8a3 --- /dev/null +++ b/desktop/packages/mullvad-vpn/src/renderer/components/settings-navigation-list-item/index.ts @@ -0,0 +1 @@ +export * from './SettingsNavigationListItem'; diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/api-access-methods-list-item/ApiAccessMethodsListItem.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/api-access-methods-list-item/ApiAccessMethodsListItem.tsx index 0817fcab6a..5ea6d8d81f 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/api-access-methods-list-item/ApiAccessMethodsListItem.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/api-access-methods-list-item/ApiAccessMethodsListItem.tsx @@ -1,6 +1,6 @@ import { messages } from '../../../../../../shared/gettext'; import { RoutePath } from '../../../../../../shared/routes'; -import { SettingsNavigationListItem } from '../../../../SettingsNavigationListItem'; +import { SettingsNavigationListItem } from '../../../../settings-navigation-list-item'; export function ApiAccessMethodsListItem() { return ( diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/app-info-list-item/AppInfoListItem.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/app-info-list-item/AppInfoListItem.tsx index f2da959715..636782fd04 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/app-info-list-item/AppInfoListItem.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/app-info-list-item/AppInfoListItem.tsx @@ -5,7 +5,7 @@ import { RoutePath } from '../../../../../../shared/routes'; import { Flex } from '../../../../../lib/components'; import { Dot } from '../../../../../lib/components/dot'; import { useVersionCurrent, useVersionSuggestedUpgrade } from '../../../../../redux/hooks'; -import { SettingsNavigationListItem } from '../../../../SettingsNavigationListItem'; +import { SettingsNavigationListItem } from '../../../../settings-navigation-list-item'; const StyledText = styled(SettingsNavigationListItem.Text)` margin-top: -4px; diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/daita-list-item/DaitaListItem.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/daita-list-item/DaitaListItem.tsx index d4ee9b0cba..6524d67626 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/daita-list-item/DaitaListItem.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/daita-list-item/DaitaListItem.tsx @@ -1,7 +1,7 @@ import { strings } from '../../../../../../shared/constants'; import { messages } from '../../../../../../shared/gettext'; import { RoutePath } from '../../../../../../shared/routes'; -import { SettingsNavigationListItem } from '../../../../SettingsNavigationListItem'; +import { SettingsNavigationListItem } from '../../../../settings-navigation-list-item'; import { useIsOn } from './hooks'; export function DaitaListItem() { diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/debug-list-item/DebugListItem.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/debug-list-item/DebugListItem.tsx index b6698b4d90..b0da1d5bf0 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/debug-list-item/DebugListItem.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/debug-list-item/DebugListItem.tsx @@ -1,5 +1,5 @@ import { RoutePath } from '../../../../../../shared/routes'; -import { SettingsNavigationListItem } from '../../../../SettingsNavigationListItem'; +import { SettingsNavigationListItem } from '../../../../settings-navigation-list-item'; export function DebugListItem() { return ( diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/multihop-list-item/MultihopListItem.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/multihop-list-item/MultihopListItem.tsx index 09bcdb4dfe..f9f9e24f3c 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/multihop-list-item/MultihopListItem.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/multihop-list-item/MultihopListItem.tsx @@ -1,7 +1,7 @@ import { messages } from '../../../../../../shared/gettext'; import { RoutePath } from '../../../../../../shared/routes'; import { Icon } from '../../../../../lib/components'; -import { SettingsNavigationListItem } from '../../../../SettingsNavigationListItem'; +import { SettingsNavigationListItem } from '../../../../settings-navigation-list-item'; import { useIsOn } from './hooks'; export function MultihopListItem() { diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/split-tunneling-list-item/SplitTunnelingListItem.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/split-tunneling-list-item/SplitTunnelingListItem.tsx index 14922acedf..51a734540f 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/split-tunneling-list-item/SplitTunnelingListItem.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/split-tunneling-list-item/SplitTunnelingListItem.tsx @@ -1,6 +1,6 @@ import { strings } from '../../../../../../shared/constants'; import { RoutePath } from '../../../../../../shared/routes'; -import { SettingsNavigationListItem } from '../../../../SettingsNavigationListItem'; +import { SettingsNavigationListItem } from '../../../../settings-navigation-list-item'; export function SplitTunnelingListItem() { return ( diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/support-list-item/SupportListItem.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/support-list-item/SupportListItem.tsx index c44171dcb0..75815be27b 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/support-list-item/SupportListItem.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/support-list-item/SupportListItem.tsx @@ -1,6 +1,6 @@ import { messages } from '../../../../../../shared/gettext'; import { RoutePath } from '../../../../../../shared/routes'; -import { SettingsNavigationListItem } from '../../../../SettingsNavigationListItem'; +import { SettingsNavigationListItem } from '../../../../settings-navigation-list-item'; export function SupportListItem() { return ( diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/user-interface-settings-list-item/UserInterfaceSettingsListItem.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/user-interface-settings-list-item/UserInterfaceSettingsListItem.tsx index ba5582864e..bbcb007db9 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/user-interface-settings-list-item/UserInterfaceSettingsListItem.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/user-interface-settings-list-item/UserInterfaceSettingsListItem.tsx @@ -1,6 +1,6 @@ import { messages } from '../../../../../../shared/gettext'; import { RoutePath } from '../../../../../../shared/routes'; -import { SettingsNavigationListItem } from '../../../../SettingsNavigationListItem'; +import { SettingsNavigationListItem } from '../../../../settings-navigation-list-item'; export function UserInterfaceSettingsListItem() { return ( diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/vpn-settings-list-item/VpnSettingsListItem.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/vpn-settings-list-item/VpnSettingsListItem.tsx index aae576f728..411a44d608 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/vpn-settings-list-item/VpnSettingsListItem.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/settings/components/vpn-settings-list-item/VpnSettingsListItem.tsx @@ -1,6 +1,6 @@ import { messages } from '../../../../../../shared/gettext'; import { RoutePath } from '../../../../../../shared/routes'; -import { SettingsNavigationListItem } from '../../../../SettingsNavigationListItem'; +import { SettingsNavigationListItem } from '../../../../settings-navigation-list-item'; export function VpnSettingsListItem() { return ( diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/vpn-settings/components/ip-override-settings/IpOverrideSettings.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/vpn-settings/components/ip-override-settings/IpOverrideSettings.tsx index b884cb3f3e..7f8348fc3c 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/views/vpn-settings/components/ip-override-settings/IpOverrideSettings.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/vpn-settings/components/ip-override-settings/IpOverrideSettings.tsx @@ -1,6 +1,6 @@ import { messages } from '../../../../../../shared/gettext'; import { RoutePath } from '../../../../../../shared/routes'; -import { SettingsNavigationListItem } from '../../../../SettingsNavigationListItem'; +import { SettingsNavigationListItem } from '../../../../settings-navigation-list-item'; export function IpOverrideSettings() { return ( diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/vpn-settings/components/open-vpn-settings/OpenVpnSettings.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/vpn-settings/components/open-vpn-settings/OpenVpnSettings.tsx index 41f6d26e45..5fdb51b9c6 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/views/vpn-settings/components/open-vpn-settings/OpenVpnSettings.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/vpn-settings/components/open-vpn-settings/OpenVpnSettings.tsx @@ -4,7 +4,7 @@ import { strings } from '../../../../../../shared/constants'; import { messages } from '../../../../../../shared/gettext'; import { RoutePath } from '../../../../../../shared/routes'; import { useTunnelProtocol } from '../../../../../lib/relay-settings-hooks'; -import { SettingsNavigationListItem } from '../../../../SettingsNavigationListItem'; +import { SettingsNavigationListItem } from '../../../../settings-navigation-list-item'; export function OpenVpnSettings() { const tunnelProtocol = useTunnelProtocol(); diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/views/vpn-settings/components/wireguard-settings/WireguardSettings.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/views/vpn-settings/components/wireguard-settings/WireguardSettings.tsx index 12d81bcfbb..84ad2816e1 100644 --- a/desktop/packages/mullvad-vpn/src/renderer/components/views/vpn-settings/components/wireguard-settings/WireguardSettings.tsx +++ b/desktop/packages/mullvad-vpn/src/renderer/components/views/vpn-settings/components/wireguard-settings/WireguardSettings.tsx @@ -5,7 +5,7 @@ import { messages } from '../../../../../../shared/gettext'; import { RoutePath } from '../../../../../../shared/routes'; import { RelaySettingsRedux } from '../../../../../redux/settings/reducers'; import { useSelector } from '../../../../../redux/store'; -import { SettingsNavigationListItem } from '../../../../SettingsNavigationListItem'; +import { SettingsNavigationListItem } from '../../../../settings-navigation-list-item'; function mapRelaySettingsToProtocol(relaySettings: RelaySettingsRedux) { if ('normal' in relaySettings) { -- cgit v1.3-3-g829e