Stacks and InlineCode

apps/yaak-client/components/Settings/Settings.tsx

@@ -3,15 +3,14 @@ import { getCurrentWebviewWindow } from '@tauri-apps/api/webviewWindow';
 import { type } from '@tauri-apps/plugin-os';
 import { useLicense } from '@yaakapp-internal/license';
 import { pluginsAtom, settingsAtom } from '@yaakapp-internal/models';
+import { HeaderSize, HStack, Icon } from '@yaakapp-internal/ui';
 import classNames from 'classnames';
 import { useAtomValue } from 'jotai';
 import { useKeyPressEvent } from 'react-use';
 import { appInfo } from '../../lib/appInfo';
 import { capitalize } from '../../lib/capitalize';
 import { CountBadge } from '../core/CountBadge';
-import { HStack } from '../core/Stacks';
 import { TabContent, type TabItem, Tabs } from '../core/Tabs/Tabs';
-import { HeaderSize, Icon } from '@yaakapp-internal/ui';
 import { SettingsCertificates } from './SettingsCertificates';
 import { SettingsGeneral } from './SettingsGeneral';
 import { SettingsHotkeys } from './SettingsHotkeys';

apps/yaak-client/components/Settings/SettingsCertificates.tsx

@@ -1,17 +1,15 @@
 import type { ClientCertificate } from '@yaakapp-internal/models';
 import { patchModel, settingsAtom } from '@yaakapp-internal/models';
+import { Heading, HStack, InlineCode, VStack } from '@yaakapp-internal/ui';
 import { useAtomValue } from 'jotai';
 import { useRef } from 'react';
 import { showConfirmDelete } from '../../lib/confirm';
 import { Button } from '../core/Button';
 import { Checkbox } from '../core/Checkbox';
 import { DetailsBanner } from '../core/DetailsBanner';
-import { Heading } from '../core/Heading';
 import { IconButton } from '../core/IconButton';
-import { InlineCode } from '@yaakapp-internal/ui';
 import { PlainInput } from '../core/PlainInput';
 import { Separator } from '../core/Separator';
-import { HStack, VStack } from '../core/Stacks';
 import { SelectFile } from '../SelectFile';
 
 function createEmptyCertificate(): ClientCertificate {

apps/yaak-client/components/Settings/SettingsGeneral.tsx

@@ -1,5 +1,6 @@
 import { revealItemInDir } from '@tauri-apps/plugin-opener';
 import { patchModel, settingsAtom } from '@yaakapp-internal/models';
+import { Heading, VStack } from '@yaakapp-internal/ui';
 import { useAtomValue } from 'jotai';
 import { activeWorkspaceAtom } from '../../hooks/useActiveWorkspace';
 import { useCheckForUpdates } from '../../hooks/useCheckForUpdates';
@@ -7,13 +8,11 @@ import { appInfo } from '../../lib/appInfo';
 import { revealInFinderText } from '../../lib/reveal';
 import { CargoFeature } from '../CargoFeature';
 import { Checkbox } from '../core/Checkbox';
-import { Heading } from '../core/Heading';
 import { IconButton } from '../core/IconButton';
 import { KeyValueRow, KeyValueRows } from '../core/KeyValueRow';
 import { PlainInput } from '../core/PlainInput';
 import { Select } from '../core/Select';
 import { Separator } from '../core/Separator';
-import { VStack } from '../core/Stacks';
 
 export function SettingsGeneral() {
   const workspace = useAtomValue(activeWorkspaceAtom);

apps/yaak-client/components/Settings/SettingsHotkeys.tsx

@@ -1,4 +1,16 @@
 import { patchModel, settingsAtom } from '@yaakapp-internal/models';
+import {
+  Heading,
+  HStack,
+  Icon,
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableHeaderCell,
+  TableRow,
+  VStack,
+} from '@yaakapp-internal/ui';
 import classNames from 'classnames';
 import { fuzzyMatch } from 'fuzzbunny';
 import { useAtomValue } from 'jotai';
@@ -16,13 +28,9 @@ import { capitalize } from '../../lib/capitalize';
 import { showDialog } from '../../lib/dialog';
 import { Button } from '../core/Button';
 import { Dropdown, type DropdownItem } from '../core/Dropdown';
-import { Heading } from '../core/Heading';
 import { HotkeyRaw } from '../core/Hotkey';
-import { Icon } from '@yaakapp-internal/ui';
 import { IconButton } from '../core/IconButton';
 import { PlainInput } from '../core/PlainInput';
-import { HStack, VStack } from '../core/Stacks';
-import { Table, TableBody, TableCell, TableHead, TableHeaderCell, TableRow } from '@yaakapp-internal/ui';
 
 const HOLD_KEYS = ['Shift', 'Control', 'Alt', 'Meta'];
 const LAYOUT_INSENSITIVE_KEYS = [

apps/yaak-client/components/Settings/SettingsInterface.tsx

@@ -3,21 +3,17 @@ import { useFonts } from '@yaakapp-internal/fonts';
 import { useLicense } from '@yaakapp-internal/license';
 import type { EditorKeymap, Settings } from '@yaakapp-internal/models';
 import { patchModel, settingsAtom } from '@yaakapp-internal/models';
+import { clamp, Heading, HStack, Icon, VStack } from '@yaakapp-internal/ui';
 import { useAtomValue } from 'jotai';
 import { useState } from 'react';
-
 import { activeWorkspaceAtom } from '../../hooks/useActiveWorkspace';
-import { clamp } from '@yaakapp-internal/ui';
 import { showConfirm } from '../../lib/confirm';
 import { invokeCmd } from '../../lib/tauri';
 import { CargoFeature } from '../CargoFeature';
 import { Button } from '../core/Button';
 import { Checkbox } from '../core/Checkbox';
-import { Heading } from '../core/Heading';
-import { Icon } from '@yaakapp-internal/ui';
 import { Link } from '../core/Link';
 import { Select } from '../core/Select';
-import { HStack, VStack } from '../core/Stacks';
 
 const NULL_FONT_VALUE = '__NULL_FONT__';
 

apps/yaak-client/components/Settings/SettingsLicense.tsx

@@ -1,5 +1,6 @@
 import { openUrl } from '@tauri-apps/plugin-opener';
 import { useLicense } from '@yaakapp-internal/license';
+import { Banner, HStack, Icon, VStack } from '@yaakapp-internal/ui';
 import { differenceInDays } from 'date-fns';
 import { formatDate } from 'date-fns/format';
 import { useState } from 'react';
@@ -7,11 +8,9 @@ import { useToggle } from '../../hooks/useToggle';
 import { pluralizeCount } from '../../lib/pluralize';
 import { CargoFeature } from '../CargoFeature';
 import { Button } from '../core/Button';
-import { Banner, Icon } from '@yaakapp-internal/ui';
 import { Link } from '../core/Link';
 import { PlainInput } from '../core/PlainInput';
 import { Separator } from '../core/Separator';
-import { HStack, VStack } from '../core/Stacks';
 
 export function SettingsLicense() {
   return (

apps/yaak-client/components/Settings/SettingsPlugins.tsx

@@ -9,10 +9,22 @@ import {
   searchPlugins,
   uninstallPlugin,
 } from '@yaakapp-internal/plugins';
+import {
+  HStack,
+  Icon,
+  InlineCode,
+  LoadingIcon,
+  Table,
+  TableBody,
+  TableCell,
+  TableHead,
+  TableHeaderCell,
+  TableRow,
+  useDebouncedValue,
+} from '@yaakapp-internal/ui';
 import classNames from 'classnames';
 import { useAtomValue } from 'jotai';
 import { useState } from 'react';
-import { Icon, InlineCode, LoadingIcon, useDebouncedValue } from '@yaakapp-internal/ui';
 import { useInstallPlugin } from '../../hooks/useInstallPlugin';
 import { usePluginInfo } from '../../hooks/usePluginInfo';
 import { usePluginsKey, useRefreshPlugins } from '../../hooks/usePlugins';
@@ -24,8 +36,6 @@ import { CountBadge } from '../core/CountBadge';
 import { IconButton } from '../core/IconButton';
 import { Link } from '../core/Link';
 import { PlainInput } from '../core/PlainInput';
-import { HStack } from '../core/Stacks';
-import { Table, TableBody, TableCell, TableHead, TableHeaderCell, TableRow } from '@yaakapp-internal/ui';
 import { TabContent, Tabs } from '../core/Tabs/Tabs';
 import { EmptyStateText } from '../EmptyStateText';
 import { SelectFile } from '../SelectFile';

apps/yaak-client/components/Settings/SettingsProxy.tsx

@@ -1,13 +1,10 @@
 import { patchModel, settingsAtom } from '@yaakapp-internal/models';
+import { Heading, HStack, InlineCode, VStack } from '@yaakapp-internal/ui';
 import { useAtomValue } from 'jotai';
-
 import { Checkbox } from '../core/Checkbox';
-import { Heading } from '../core/Heading';
-import { InlineCode } from '@yaakapp-internal/ui';
 import { PlainInput } from '../core/PlainInput';
 import { Select } from '../core/Select';
 import { Separator } from '../core/Separator';
-import { HStack, VStack } from '../core/Stacks';
 
 export function SettingsProxy() {
   const settings = useAtomValue(settingsAtom);

apps/yaak-client/components/Settings/SettingsTheme.tsx

@@ -1,17 +1,15 @@
 import { patchModel, settingsAtom } from '@yaakapp-internal/models';
+import { Heading, HStack, Icon, type IconProps, VStack } from '@yaakapp-internal/ui';
 import { useAtomValue } from 'jotai';
 import { lazy, Suspense } from 'react';
 import { activeWorkspaceAtom } from '../../hooks/useActiveWorkspace';
 import { useResolvedAppearance } from '../../hooks/useResolvedAppearance';
 import { useResolvedTheme } from '../../hooks/useResolvedTheme';
 import type { ButtonProps } from '../core/Button';
-import { Heading } from '../core/Heading';
-import { Icon, type IconProps } from '@yaakapp-internal/ui';
 import { IconButton } from '../core/IconButton';
 import { Link } from '../core/Link';
 import type { SelectProps } from '../core/Select';
 import { Select } from '../core/Select';
-import { HStack, VStack } from '../core/Stacks';
 
 const Editor = lazy(() => import('../core/Editor/Editor').then((m) => ({ default: m.Editor })));