Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/clients/react-spa/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"dependencies": {
"@tanstack/react-query": "catalog:",
"@tanstack/react-router": "catalog:",
"@tinyrack/ui": "0.8.0",
"@tinyrack/ui": "0.9.0",
"jose": "catalog:",
"react": "catalog:",
"react-dom": "catalog:",
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"react-dom": "catalog:",
"react-hook-form": "catalog:",
"react-i18next": "catalog:",
"@tinyrack/ui": "0.8.0",
"@tinyrack/ui": "0.9.0",
"zod": "catalog:"
},
"devDependencies": {
Expand Down
18 changes: 11 additions & 7 deletions packages/frontend/src/components/ui/theme-toggle.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { TRColorSchemeToggle } from '@tinyrack/ui/components/color-scheme-toggle';
import { MoonIcon, SunIcon } from '@phosphor-icons/react';
import { TRIconButton } from '@tinyrack/ui/components/icon-button';
import { TRTooltip } from '@tinyrack/ui/components/tooltip';
import { useTranslation } from 'react-i18next';

Expand All @@ -18,18 +19,21 @@ export function ThemeToggle({
const label =
colorScheme === 'dark' ? t('common.theme.dark') : t('common.theme.light');

const Icon = colorScheme === 'dark' ? SunIcon : MoonIcon;

return (
<div className={className}>
<TRTooltip.Root>
<TRTooltip.Trigger
data-testid="theme-toggle"
render={
<TRColorSchemeToggle
onValueChange={(_value) => {
onToggle();
}}
value={colorScheme}
/>
<TRIconButton
appearance="ghost"
aria-label={label}
onClick={onToggle}
>
<Icon />
</TRIconButton>
}
/>
<TRTooltip.Portal>
Expand Down
52 changes: 35 additions & 17 deletions packages/frontend/src/features/layout/language-selector.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { TRLanguageSelectOption } from '@tinyrack/ui/components/language-select';
import { TRLanguageSelect } from '@tinyrack/ui/components/language-select';
import { CheckIcon } from '@phosphor-icons/react';
import { TRSelect } from '@tinyrack/ui/components/select';
import { useTranslation } from 'react-i18next';
import { useLanguage } from '#frontend/hooks/use-language.ts';
import { LANGUAGE_LABELS } from '#frontend/i18n/index.ts';
Expand Down Expand Up @@ -28,33 +28,51 @@ export function LanguageSelector({ className = '' }: LanguageSelectorProps) {
LANGUAGE_LABELS[detectedLanguage] || detectedLanguage;
const autoLabel = `${t('common.language.auto')} (${detectedLanguageName})`;

const options: readonly TRLanguageSelectOption[] = [
const options = [
{ label: autoLabel, value: 'auto' },
...languages.map((lang) => ({
label: LANGUAGE_LABELS[lang] || lang,
value: lang,
})),
];

const handleValueChange = (value: string, _eventDetails?: unknown) => {
if (value === 'auto') {
setAutoLanguage();
} else {
setLanguage(value);
}
};

const currentValue = isAutoMode ? 'auto' : language;

return (
<div className={className}>
<TRLanguageSelect
data-testid="language-selector"
label={t('common.language.select')}
onValueChange={handleValueChange}
options={options}
<TRSelect.Root
onValueChange={(value) => {
if (typeof value !== 'string') {
return;
}
if (value === 'auto') {
setAutoLanguage();
} else {
setLanguage(value);
}
}}
value={currentValue}
/>
>
<TRSelect.Trigger data-testid="language-selector" uiSize="sm">
<TRSelect.Value />
</TRSelect.Trigger>
<TRSelect.Portal>
<TRSelect.Positioner>
<TRSelect.Popup>
<TRSelect.List>
{options.map((option) => (
<TRSelect.Item key={option.value} value={option.value}>
<TRSelect.ItemText>{option.label}</TRSelect.ItemText>
<TRSelect.ItemIndicator>
<CheckIcon />
</TRSelect.ItemIndicator>
</TRSelect.Item>
))}
</TRSelect.List>
</TRSelect.Popup>
</TRSelect.Positioner>
</TRSelect.Portal>
</TRSelect.Root>
</div>
);
}
1 change: 0 additions & 1 deletion packages/frontend/src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
@import "@tinyrack/ui/components/avatar.css";
@import "@tinyrack/ui/components/badge.css";
@import "@tinyrack/ui/components/button.css";
@import "@tinyrack/ui/components/callout.css";
@import "@tinyrack/ui/components/card.css";
@import "@tinyrack/ui/components/checkbox.css";
@import "@tinyrack/ui/components/checkbox-group.css";
Expand Down
4 changes: 2 additions & 2 deletions packages/homepage/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"dependencies": {
"@react-router/node": "8.2.0",
"@scalar/api-reference-react": "0.9.55",
"@tinyrack/docs": "0.7.0",
"@tinyrack/ui": "0.8.0",
"@tinyrack/docs": "0.9.0",
"@tinyrack/ui": "0.9.0",
"isbot": "5.2.0",
"react": "catalog:",
"react-dom": "catalog:",
Expand Down
Loading