Fixed the circular imports and things

src-web/components/Settings/Settings.tsx

@@ -1,3 +1,4 @@
+import { useSearch } from '@tanstack/react-router';
 import { getCurrentWebviewWindow } from '@tauri-apps/api/webviewWindow';
 import classNames from 'classnames';
 import React, { useState } from 'react';
@@ -12,18 +13,10 @@ import { SettingsGeneral } from './SettingsGeneral';
 import { SettingsLicense } from './SettingsLicense';
 import { SettingsPlugins } from './SettingsPlugins';
 import { SettingsProxy } from './SettingsProxy';
+import { SettingsTab } from './SettingsTab';
 
 interface Props {
   hide?: () => void;
-  defaultTab?: SettingsTab;
-}
-
-export enum SettingsTab {
-  General = 'general',
-  Proxy = 'proxy',
-  Appearance = 'appearance',
-  Plugins = 'plugins',
-  License = 'license',
 }
 
 const tabs = [
@@ -34,9 +27,10 @@ const tabs = [
   SettingsTab.License,
 ];
 
-export default function Settings({ hide, defaultTab }: Props) {
+export default function Settings({ hide }: Props) {
   const osInfo = useOsInfo();
-  const [tab, setTab] = useState<string>(defaultTab ?? SettingsTab.General);
+  const { tab: tabFromQuery } = useSearch({ from: '/workspaces/$workspaceId/settings' });
+  const [tab, setTab] = useState<string>(tabFromQuery ?? SettingsTab.General);
 
   // Close settings window on escape
   // TODO: Could this be put in a better place? Eg. in Rust key listener when creating the window

src-web/components/Settings/SettingsAppearance.tsx

@@ -9,7 +9,7 @@ import { getThemes } from '../../lib/theme/themes';
 import { isThemeDark } from '../../lib/theme/window';
 import type { ButtonProps } from '../core/Button';
 import { Checkbox } from '../core/Checkbox';
-import { Editor } from '../core/Editor';
+import {Editor} from "../core/Editor/Editor";
 import type { IconProps } from '../core/Icon';
 import { Icon } from '../core/Icon';
 import { IconButton } from '../core/IconButton';

src-web/components/Settings/SettingsDesign.tsx

@@ -8,7 +8,7 @@ import { yaakDark } from '../../lib/theme/themes/yaak';
 import { getThemeCSS } from '../../lib/theme/window';
 import { Banner } from '../core/Banner';
 import { Button } from '../core/Button';
-import { Editor } from '../core/Editor';
+import {Editor} from "../core/Editor/Editor";
 import type { IconProps } from '../core/Icon';
 import { Icon } from '../core/Icon';
 import { IconButton } from '../core/IconButton';

src-web/components/Settings/SettingsGeneral.tsx

@@ -20,7 +20,7 @@ export function SettingsGeneral() {
   const settings = useSettings();
   const updateSettings = useUpdateSettings();
   const appInfo = useAppInfo();
-  const checkForUpdates = useCheckForUpdates();
+  const checkForUpdates = useCheckForUpdates(); 
 
   if (settings == null || workspace == null) {
     return null;

src-web/components/Settings/SettingsTab.ts

@@ -0,0 +1,8 @@
+
+export enum SettingsTab {
+    General = 'general',
+    Proxy = 'proxy',
+    Appearance = 'appearance',
+    Plugins = 'plugins',
+    License = 'license',
+}