refactor(new-game): extract BreakRuleStep and BreakOrderStep
Refs #30 - Add BreakRuleStep.tsx and BreakOrderStep.tsx under src/components/new-game - Replace inline components with imports in NewGame.tsx - Structural only; behavior unchanged
This commit is contained in:
@@ -20,6 +20,8 @@ import { Player2Step } from './new-game/Player2Step';
|
|||||||
import { Player3Step } from './new-game/Player3Step';
|
import { Player3Step } from './new-game/Player3Step';
|
||||||
import { GameTypeStep } from './new-game/GameTypeStep';
|
import { GameTypeStep } from './new-game/GameTypeStep';
|
||||||
import { RaceToStep } from './new-game/RaceToStep';
|
import { RaceToStep } from './new-game/RaceToStep';
|
||||||
|
import { BreakRuleStep } from './new-game/BreakRuleStep';
|
||||||
|
import { BreakOrderStep } from './new-game/BreakOrderStep';
|
||||||
import type { BreakRule } from '../types/game';
|
import type { BreakRule } from '../types/game';
|
||||||
|
|
||||||
// PlayerSelectModal moved to ./new-game/PlayerSelectModal
|
// PlayerSelectModal moved to ./new-game/PlayerSelectModal
|
||||||
@@ -59,48 +61,7 @@ interface BreakRuleStepProps {
|
|||||||
initialValue?: BreakRule | 'winnerbreak';
|
initialValue?: BreakRule | 'winnerbreak';
|
||||||
}
|
}
|
||||||
|
|
||||||
const BreakRuleStep = ({ onNext, onCancel, initialValue = 'winnerbreak' }: BreakRuleStepProps) => {
|
// BreakRuleStep moved to ./new-game/BreakRuleStep
|
||||||
const [rule, setRule] = useState<BreakRule | ''>(initialValue);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<form className={styles['new-game-form']} aria-label="Break-Regel wählen">
|
|
||||||
<div className={styles['screen-title']}>Break-Regel wählen</div>
|
|
||||||
<div className={styles['progress-indicator']} style={{ marginBottom: 24 }}>
|
|
||||||
<span className={styles['progress-dot']} />
|
|
||||||
<span className={styles['progress-dot']} />
|
|
||||||
<span className={styles['progress-dot']} />
|
|
||||||
<span className={styles['progress-dot']} />
|
|
||||||
<span className={styles['progress-dot']} />
|
|
||||||
<span className={styles['progress-dot'] + ' ' + styles['active']} />
|
|
||||||
<span className={styles['progress-dot']} />
|
|
||||||
</div>
|
|
||||||
<div style={{ display: 'flex', gap: 12, marginTop: 12 }}>
|
|
||||||
{[
|
|
||||||
{ key: 'winnerbreak', label: 'Winnerbreak' },
|
|
||||||
{ key: 'wechselbreak', label: 'Wechselbreak' },
|
|
||||||
].map(opt => (
|
|
||||||
<button
|
|
||||||
key={opt.key}
|
|
||||||
type="button"
|
|
||||||
className={`${styles['quick-pick-btn']} ${rule === (opt.key as BreakRule) ? styles['selected'] : ''}`}
|
|
||||||
onClick={() => { setRule(opt.key as BreakRule); onNext(opt.key as BreakRule); }}
|
|
||||||
aria-label={`Break-Regel wählen: ${opt.label}`}
|
|
||||||
>
|
|
||||||
{opt.label}
|
|
||||||
</button>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
<div className={styles['arrow-nav']} style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginTop: 48 }}>
|
|
||||||
<button type="button" className={styles['arrow-btn']} aria-label="Zurück" onClick={onCancel} style={{ fontSize: 48, width: 80, height: 80, borderRadius: '50%', background: '#222', color: '#fff', border: 'none', boxShadow: '0 2px 8px rgba(0,0,0,0.15)', cursor: 'pointer' }}>
|
|
||||||
←
|
|
||||||
</button>
|
|
||||||
<button type="button" className={styles['arrow-btn']} aria-label="Weiter" onClick={() => rule && onNext(rule as BreakRule)} disabled={!rule} style={{ fontSize: 48, width: 80, height: 80, borderRadius: '50%', background: '#222', color: '#fff', border: 'none', boxShadow: '0 2px 8px rgba(0,0,0,0.15)', cursor: 'pointer', opacity: !rule ? 0.5 : 1 }}>
|
|
||||||
→
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
interface BreakOrderStepProps {
|
interface BreakOrderStepProps {
|
||||||
players: string[];
|
players: string[];
|
||||||
@@ -111,88 +72,6 @@ interface BreakOrderStepProps {
|
|||||||
initialSecond?: number;
|
initialSecond?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
const BreakOrderStep = ({ players, rule, onNext, onCancel, initialFirst = 1, initialSecond }: BreakOrderStepProps) => {
|
// BreakOrderStep moved to ./new-game/BreakOrderStep
|
||||||
const playerCount = players.filter(Boolean).length;
|
|
||||||
const [first, setFirst] = useState<number>(initialFirst);
|
|
||||||
const [second, setSecond] = useState<number | undefined>(initialSecond);
|
|
||||||
|
|
||||||
// Default selections: player 1 breaks first; if 3 players with wechselbreak, player 2 breaks second
|
|
||||||
useEffect(() => {
|
|
||||||
if (!initialSecond && rule === 'wechselbreak' && playerCount === 3) {
|
|
||||||
setSecond(2);
|
|
||||||
}
|
|
||||||
}, [initialSecond, rule, playerCount]);
|
|
||||||
|
|
||||||
const handleFirst = (idx: number) => {
|
|
||||||
setFirst(idx);
|
|
||||||
// Auto-advance cases: winnerbreak (any players) OR wechselbreak with 2 players
|
|
||||||
if (rule === 'winnerbreak' || (rule === 'wechselbreak' && playerCount === 2)) {
|
|
||||||
onNext(idx);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const handleSecond = (idx: number) => {
|
|
||||||
setSecond(idx);
|
|
||||||
onNext(first, idx);
|
|
||||||
};
|
|
||||||
|
|
||||||
return (
|
|
||||||
<form className={styles['new-game-form']} aria-label="Break-Reihenfolge wählen">
|
|
||||||
<div className={styles['screen-title']}>Wer hat den ersten Anstoss?</div>
|
|
||||||
<div className={styles['progress-indicator']} style={{ marginBottom: 24 }}>
|
|
||||||
<span className={styles['progress-dot']} />
|
|
||||||
<span className={styles['progress-dot']} />
|
|
||||||
<span className={styles['progress-dot']} />
|
|
||||||
<span className={styles['progress-dot']} />
|
|
||||||
<span className={styles['progress-dot']} />
|
|
||||||
<span className={styles['progress-dot']} />
|
|
||||||
<span className={styles['progress-dot'] + ' ' + styles['active']} />
|
|
||||||
</div>
|
|
||||||
<div style={{ marginBottom: 16, fontWeight: 600 }}>Wer hat den ersten Anstoss?</div>
|
|
||||||
<div style={{ display: 'flex', gap: 12, flexWrap: 'wrap' }}>
|
|
||||||
{players.filter(Boolean).map((name, idx) => (
|
|
||||||
<button key={`first-${idx}`} type="button" className={styles['quick-pick-btn']} onClick={() => handleFirst(idx + 1)} aria-label={`Zuerst: ${name}`}>{name}</button>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
{rule === 'wechselbreak' && playerCount === 3 && (
|
|
||||||
<>
|
|
||||||
<div style={{ marginTop: 24, marginBottom: 16, fontWeight: 600 }}>Wer hat den zweiten Anstoss?</div>
|
|
||||||
<div style={{ display: 'flex', gap: 12, flexWrap: 'wrap' }}>
|
|
||||||
{players.filter(Boolean).map((name, idx) => (
|
|
||||||
<button key={`second-${idx}`} type="button" className={styles['quick-pick-btn']} onClick={() => handleSecond(idx + 1)} aria-label={`Zweites Break: ${name}`}>{name}</button>
|
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
<div className={styles['arrow-nav']} style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginTop: 48 }}>
|
|
||||||
<button type="button" className={styles['arrow-btn']} aria-label="Zurück" onClick={onCancel} style={{ fontSize: 48, width: 80, height: 80, borderRadius: '50%', background: '#222', color: '#fff', border: 'none', boxShadow: '0 2px 8px rgba(0,0,0,0.15)', cursor: 'pointer' }}>
|
|
||||||
←
|
|
||||||
</button>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className={styles['arrow-btn']}
|
|
||||||
aria-label="Weiter"
|
|
||||||
onClick={() => {
|
|
||||||
if (rule === 'wechselbreak' && playerCount === 3) {
|
|
||||||
if (first > 0 && (second ?? 0) > 0) {
|
|
||||||
handleSecond(second as number);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (first > 0) {
|
|
||||||
onNext(first);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
disabled={
|
|
||||||
(rule === 'wechselbreak' && playerCount === 3) ? !(first > 0 && (second ?? 0) > 0) : !(first > 0)
|
|
||||||
}
|
|
||||||
style={{ fontSize: 48, width: 80, height: 80, borderRadius: '50%', background: '#222', color: '#fff', border: 'none', boxShadow: '0 2px 8px rgba(0,0,0,0.15)', cursor: 'pointer', opacity: ((rule === 'wechselbreak' && playerCount === 3) ? !(first > 0 && (second ?? 0) > 0) : !(first > 0)) ? 0.5 : 1 }}
|
|
||||||
>
|
|
||||||
→
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export { Player1Step, Player2Step, Player3Step, GameTypeStep, BreakRuleStep, BreakOrderStep, RaceToStep };
|
export { Player1Step, Player2Step, Player3Step, GameTypeStep, BreakRuleStep, BreakOrderStep, RaceToStep };
|
||||||
97
src/components/new-game/BreakOrderStep.tsx
Normal file
97
src/components/new-game/BreakOrderStep.tsx
Normal file
@@ -0,0 +1,97 @@
|
|||||||
|
import { h } from 'preact';
|
||||||
|
import { useEffect, useState } from 'preact/hooks';
|
||||||
|
import styles from '../NewGame.module.css';
|
||||||
|
import type { BreakRule } from '../../types/game';
|
||||||
|
|
||||||
|
interface BreakOrderStepProps {
|
||||||
|
players: string[];
|
||||||
|
rule: BreakRule;
|
||||||
|
onNext: (first: number, second?: number) => void;
|
||||||
|
onCancel: () => void;
|
||||||
|
initialFirst?: number;
|
||||||
|
initialSecond?: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const BreakOrderStep = ({ players, rule, onNext, onCancel, initialFirst = 1, initialSecond }: BreakOrderStepProps) => {
|
||||||
|
const playerCount = players.filter(Boolean).length;
|
||||||
|
const [first, setFirst] = useState<number>(initialFirst);
|
||||||
|
const [second, setSecond] = useState<number | undefined>(initialSecond);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!initialSecond && rule === 'wechselbreak' && playerCount === 3) {
|
||||||
|
setSecond(2);
|
||||||
|
}
|
||||||
|
}, [initialSecond, rule, playerCount]);
|
||||||
|
|
||||||
|
const handleFirst = (idx: number) => {
|
||||||
|
setFirst(idx);
|
||||||
|
if (rule === 'winnerbreak' || (rule === 'wechselbreak' && playerCount === 2)) {
|
||||||
|
onNext(idx);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleSecond = (idx: number) => {
|
||||||
|
setSecond(idx);
|
||||||
|
onNext(first, idx);
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<form className={styles['new-game-form']} aria-label="Break-Reihenfolge wählen">
|
||||||
|
<div className={styles['screen-title']}>Wer hat den ersten Anstoss?</div>
|
||||||
|
<div className={styles['progress-indicator']} style={{ marginBottom: 24 }}>
|
||||||
|
<span className={styles['progress-dot']} />
|
||||||
|
<span className={styles['progress-dot']} />
|
||||||
|
<span className={styles['progress-dot']} />
|
||||||
|
<span className={styles['progress-dot']} />
|
||||||
|
<span className={styles['progress-dot']} />
|
||||||
|
<span className={styles['progress-dot']} />
|
||||||
|
<span className={styles['progress-dot'] + ' ' + styles['active']} />
|
||||||
|
</div>
|
||||||
|
<div style={{ marginBottom: 16, fontWeight: 600 }}>Wer hat den ersten Anstoss?</div>
|
||||||
|
<div style={{ display: 'flex', gap: 12, flexWrap: 'wrap' }}>
|
||||||
|
{players.filter(Boolean).map((name, idx) => (
|
||||||
|
<button key={`first-${idx}`} type="button" className={styles['quick-pick-btn']} onClick={() => handleFirst(idx + 1)} aria-label={`Zuerst: ${name}`}>{name}</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
{rule === 'wechselbreak' && playerCount === 3 && (
|
||||||
|
<>
|
||||||
|
<div style={{ marginTop: 24, marginBottom: 16, fontWeight: 600 }}>Wer hat den zweiten Anstoss?</div>
|
||||||
|
<div style={{ display: 'flex', gap: 12, flexWrap: 'wrap' }}>
|
||||||
|
{players.filter(Boolean).map((name, idx) => (
|
||||||
|
<button key={`second-${idx}`} type="button" className={styles['quick-pick-btn']} onClick={() => handleSecond(idx + 1)} aria-label={`Zweites Break: ${name}`}>{name}</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
<div className={styles['arrow-nav']} style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginTop: 48 }}>
|
||||||
|
<button type="button" className={styles['arrow-btn']} aria-label="Zurück" onClick={onCancel} style={{ fontSize: 48, width: 80, height: 80, borderRadius: '50%', background: '#222', color: '#fff', border: 'none', boxShadow: '0 2px 8px rgba(0,0,0,0.15)', cursor: 'pointer' }}>
|
||||||
|
←
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className={styles['arrow-btn']}
|
||||||
|
aria-label="Weiter"
|
||||||
|
onClick={() => {
|
||||||
|
if (rule === 'wechselbreak' && playerCount === 3) {
|
||||||
|
if (first > 0 && (second ?? 0) > 0) {
|
||||||
|
handleSecond(second as number);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (first > 0) {
|
||||||
|
onNext(first);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}}
|
||||||
|
disabled={
|
||||||
|
(rule === 'wechselbreak' && playerCount === 3) ? !(first > 0 && (second ?? 0) > 0) : !(first > 0)
|
||||||
|
}
|
||||||
|
style={{ fontSize: 48, width: 80, height: 80, borderRadius: '50%', background: '#222', color: '#fff', border: 'none', boxShadow: '0 2px 8px rgba(0,0,0,0.15)', cursor: 'pointer', opacity: ((rule === 'wechselbreak' && playerCount === 3) ? !(first > 0 && (second ?? 0) > 0) : !(first > 0)) ? 0.5 : 1 }}
|
||||||
|
>
|
||||||
|
→
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
55
src/components/new-game/BreakRuleStep.tsx
Normal file
55
src/components/new-game/BreakRuleStep.tsx
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
import { h } from 'preact';
|
||||||
|
import { useState } from 'preact/hooks';
|
||||||
|
import styles from '../NewGame.module.css';
|
||||||
|
import type { BreakRule } from '../../types/game';
|
||||||
|
|
||||||
|
interface BreakRuleStepProps {
|
||||||
|
onNext: (rule: BreakRule) => void;
|
||||||
|
onCancel: () => void;
|
||||||
|
initialValue?: BreakRule | 'winnerbreak';
|
||||||
|
}
|
||||||
|
|
||||||
|
export const BreakRuleStep = ({ onNext, onCancel, initialValue = 'winnerbreak' }: BreakRuleStepProps) => {
|
||||||
|
const [rule, setRule] = useState<BreakRule | ''>(initialValue);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<form className={styles['new-game-form']} aria-label="Break-Regel wählen">
|
||||||
|
<div className={styles['screen-title']}>Break-Regel wählen</div>
|
||||||
|
<div className={styles['progress-indicator']} style={{ marginBottom: 24 }}>
|
||||||
|
<span className={styles['progress-dot']} />
|
||||||
|
<span className={styles['progress-dot']} />
|
||||||
|
<span className={styles['progress-dot']} />
|
||||||
|
<span className={styles['progress-dot']} />
|
||||||
|
<span className={styles['progress-dot']} />
|
||||||
|
<span className={styles['progress-dot'] + ' ' + styles['active']} />
|
||||||
|
<span className={styles['progress-dot']} />
|
||||||
|
</div>
|
||||||
|
<div style={{ display: 'flex', gap: 12, marginTop: 12 }}>
|
||||||
|
{[
|
||||||
|
{ key: 'winnerbreak', label: 'Winnerbreak' },
|
||||||
|
{ key: 'wechselbreak', label: 'Wechselbreak' },
|
||||||
|
].map(opt => (
|
||||||
|
<button
|
||||||
|
key={opt.key}
|
||||||
|
type="button"
|
||||||
|
className={`${styles['quick-pick-btn']} ${rule === (opt.key as BreakRule) ? styles['selected'] : ''}`}
|
||||||
|
onClick={() => { setRule(opt.key as BreakRule); onNext(opt.key as BreakRule); }}
|
||||||
|
aria-label={`Break-Regel wählen: ${opt.label}`}
|
||||||
|
>
|
||||||
|
{opt.label}
|
||||||
|
</button>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<div className={styles['arrow-nav']} style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginTop: 48 }}>
|
||||||
|
<button type="button" className={styles['arrow-btn']} aria-label="Zurück" onClick={onCancel} style={{ fontSize: 48, width: 80, height: 80, borderRadius: '50%', background: '#222', color: '#fff', border: 'none', boxShadow: '0 2px 8px rgba(0,0,0,0.15)', cursor: 'pointer' }}>
|
||||||
|
←
|
||||||
|
</button>
|
||||||
|
<button type="button" className={styles['arrow-btn']} aria-label="Weiter" onClick={() => rule && onNext(rule as BreakRule)} disabled={!rule} style={{ fontSize: 48, width: 80, height: 80, borderRadius: '50%', background: '#222', color: '#fff', border: 'none', boxShadow: '0 2px 8px rgba(0,0,0,0.15)', cursor: 'pointer', opacity: !rule ? 0.5 : 1 }}>
|
||||||
|
→
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user