Skip to content

fix: use shared Switch component for System settings toggles (#1668) #1670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RounakKumarAgarwal wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix: use shared Switch component for System settings toggles (#1668) #1670

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
57 changes: 11 additions & 46 deletions frontend/src/pages/SettingsPage/components/SystemSettingsCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react';
import { Monitor } from 'lucide-react';
import { invoke } from '@tauri-apps/api/core';
import SettingsCard from './SettingsCard';
import { Switch } from '@/components/ui/switch';

const SystemSettingsCard: React.FC = () => {
// null = unknown / error reading state
Expand Down Expand Up @@ -74,31 +75,13 @@ const SystemSettingsCard: React.FC = () => {
</div>
</div>

<button
role="switch"
aria-checked={isChecked}
<Switch
checked={isChecked}
onCheckedChange={handleToggle}
disabled={isDisabled}
aria-labelledby="autostart-label"
aria-describedby="autostart-desc"
disabled={isDisabled}
onClick={handleToggle}
className={[
'relative inline-flex h-6 w-11 shrink-0 cursor-pointer items-center rounded-full',
'transition-colors duration-200 ease-in-out',
'focus:outline-none focus-visible:ring-2 focus-visible:ring-offset-2',
'disabled:cursor-not-allowed disabled:opacity-50',
isChecked
? 'bg-primary focus-visible:ring-primary'
: 'bg-gray-200 focus-visible:ring-gray-500 dark:bg-gray-700',
].join(' ')}
>
<span
className={[
'inline-block h-4 w-4 rounded-full bg-white shadow-md',
'transition-transform duration-200 ease-in-out',
isChecked ? 'translate-x-6' : 'translate-x-1',
].join(' ')}
/>
</button>
/>
</div>

<div className="flex items-center justify-between py-1">
Expand All @@ -115,31 +98,13 @@ const SystemSettingsCard: React.FC = () => {
</div>
</div>

<button
role="switch"
aria-checked={closeToTrayChecked}
<Switch
checked={closeToTrayChecked}
onCheckedChange={handleCloseToTrayToggle}
disabled={closeToTrayDisabled}
aria-labelledby="close-to-tray-label"
aria-describedby="close-to-tray-desc"
disabled={closeToTrayDisabled}
onClick={handleCloseToTrayToggle}
className={[
'relative inline-flex h-6 w-11 shrink-0 cursor-pointer items-center rounded-full',
'transition-colors duration-200 ease-in-out',
'focus:outline-none focus-visible:ring-2 focus-visible:ring-offset-2',
'disabled:cursor-not-allowed disabled:opacity-50',
closeToTrayChecked
? 'bg-primary focus-visible:ring-primary'
: 'bg-gray-200 focus-visible:ring-gray-500 dark:bg-gray-700',
].join(' ')}
>
<span
className={[
'inline-block h-4 w-4 rounded-full bg-white shadow-md',
'transition-transform duration-200 ease-in-out',
closeToTrayChecked ? 'translate-x-6' : 'translate-x-1',
].join(' ')}
/>
</button>
/>
</div>
</SettingsCard>
);
Expand Down
Loading