diff --git a/src/Components/Buttons/CommanderDamage.tsx b/src/Components/Buttons/CommanderDamage.tsx index 0537bbc..fee0991 100644 --- a/src/Components/Buttons/CommanderDamage.tsx +++ b/src/Components/Buttons/CommanderDamage.tsx @@ -201,6 +201,7 @@ export const CommanderDamage = ({ void; rotation: number; + playerIndex: number; }; const ExtraCounter = ({ @@ -67,6 +68,7 @@ const ExtraCounter = ({ setCounterTotal, type, rotation, + playerIndex, }: ExtraCounterProps) => { const timeoutRef = useRef(undefined); const [timeoutFinished, setTimeoutFinished] = useState(false); @@ -120,6 +122,7 @@ const ExtraCounter = ({ onContextMenu={(e: React.MouseEvent) => { e.preventDefault(); }} + aria-label={`Player ${playerIndex} extra counter: ${type}`} > {Icon} diff --git a/src/Components/Buttons/LifeCounterButton.tsx b/src/Components/Buttons/LifeCounterButton.tsx index 2e7ef27..31d7664 100644 --- a/src/Components/Buttons/LifeCounterButton.tsx +++ b/src/Components/Buttons/LifeCounterButton.tsx @@ -121,6 +121,7 @@ const LifeCounterButton = ({ e.preventDefault(); }} style={{ fontSize }} + aria-label={`${operation === 'add' ? 'Add' : 'Subtract'} life`} > { return ( - + ); diff --git a/src/Components/Buttons/SettingsButton.tsx b/src/Components/Buttons/SettingsButton.tsx index a37233d..60ac105 100644 --- a/src/Components/Buttons/SettingsButton.tsx +++ b/src/Components/Buttons/SettingsButton.tsx @@ -40,7 +40,11 @@ type SettingsButtonProps = { const SettingsButton = ({ onClick, rotation }: SettingsButtonProps) => { return ( - + ); diff --git a/src/Components/Counters/ExtraCountersBar.tsx b/src/Components/Counters/ExtraCountersBar.tsx index bea54ee..725543e 100644 --- a/src/Components/Counters/ExtraCountersBar.tsx +++ b/src/Components/Counters/ExtraCountersBar.tsx @@ -132,6 +132,7 @@ const ExtraCountersBar = ({ )?.value } setCounterTotal={handleCounterChange} + playerIndex={player.index} /> )} {Boolean(useCommanderDamage && usePartner) && ( @@ -145,6 +146,7 @@ const ExtraCountersBar = ({ )?.value } setCounterTotal={handleCounterChange} + playerIndex={player.index} /> )} {usePoison && ( @@ -157,6 +159,7 @@ const ExtraCountersBar = ({ ?.value } setCounterTotal={handleCounterChange} + playerIndex={player.index} /> )} {useEnergy && ( @@ -169,6 +172,7 @@ const ExtraCountersBar = ({ ?.value } setCounterTotal={handleCounterChange} + playerIndex={player.index} /> )} {useExperience && ( @@ -182,6 +186,7 @@ const ExtraCountersBar = ({ )?.value } setCounterTotal={handleCounterChange} + playerIndex={player.index} /> )} diff --git a/src/Components/PlayerMenu/Settings.tsx b/src/Components/PlayerMenu/Settings.tsx index 18ceb85..2924e8b 100644 --- a/src/Components/PlayerMenu/Settings.tsx +++ b/src/Components/PlayerMenu/Settings.tsx @@ -183,6 +183,8 @@ const Settings = ({ type="color" value={player.color} onChange={handleColorChange} + role="button" + aria-label="Color picker" /> {player.settings.useCommanderDamage && ( @@ -207,6 +209,9 @@ const Settings = ({ /> } onChange={handleSettingsChange} + role="checkbox" + aria-checked={player.settings.usePartner} + aria-label="Partner" /> )} @@ -232,6 +237,9 @@ const Settings = ({ /> } onChange={handleSettingsChange} + role="checkbox" + aria-checked={player.settings.usePoison} + aria-label="Poison" /> @@ -256,6 +264,9 @@ const Settings = ({ /> } onChange={handleSettingsChange} + role="checkbox" + aria-checked={player.settings.useEnergy} + aria-label="Energy" /> @@ -280,6 +291,9 @@ const Settings = ({ /> } onChange={handleSettingsChange} + role="checkbox" + aria-checked={player.settings.useExperience} + aria-label="Experience" /> @@ -293,6 +307,7 @@ const Settings = ({ padding: '0 4px 0 4px', }} onClick={handleNewGame} + aria-label="Back to start" > Back to Start @@ -305,6 +320,9 @@ const Settings = ({ padding: '0 4px 0 4px', }} onClick={toggleFullscreen} + role="checkbox" + aria-checked={document.fullscreenElement ? true : false} + aria-label="Fullscreen toggle" > Fullscreen @@ -317,6 +335,9 @@ const Settings = ({ padding: '0 4px 0 4px', }} onClick={handleWakeLock} + role="checkbox" + aria-checked={wakeLock.active} + aria-label="Keep awake" > Keep Awake diff --git a/vite.config.ts b/vite.config.ts index f756dde..9cacb6c 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,12 +1,13 @@ -import { defineConfig } from 'vite' -import react from '@vitejs/plugin-react-swc' +import { defineConfig } from 'vite'; +import react from '@vitejs/plugin-react-swc'; // https://vitejs.dev/config/ export default defineConfig({ plugins: [react()], build: { + minify: 'esbuild', rollupOptions: { - external: ['babel-plugin-macros'] - } - } -}) + external: ['babel-plugin-macros'], + }, + }, +});