Skip to content

Commit 9be4e22

Browse files
notaphplovernotaphplover
authored
Merge pull request #1803 from notaphplover/feature/update-cards-module-to-change-to-onClick
Update cards module to change onDoubleClick to onClick
2 parents eae6573 + 6a57002 commit 9be4e22

20 files changed

+121
-121
lines changed

‎packages/frontend/web-ui/src/game/components/BaseCard.spec.tsx

+24-24
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ describe(BaseCard.name, () => {
1616
let selectedClassName: string;
1717
let colorClassFixture: string;
1818
let isSelectedFixture: boolean;
19-
let onDoubleClickMock: jest.Mock<(event: MouseEvent) => void>;
19+
let onClickMock: jest.Mock<(event: MouseEvent) => void>;
2020

2121
beforeAll(() => {
2222
childrenMock = jest.fn();
2323
selectedClassName = 'selected';
2424
colorClassFixture = 'blue-card';
2525
isSelectedFixture = true;
26-
onDoubleClickMock = jest.fn();
26+
onClickMock = jest.fn();
2727
});
2828

2929
describe('when called', () => {
@@ -36,7 +36,7 @@ describe(BaseCard.name, () => {
3636
children={childrenMock()}
3737
colorClass={colorClassFixture}
3838
isSelected={isSelectedFixture}
39-
onDoubleClick={onDoubleClickMock}
39+
onClick={onClickMock}
4040
></BaseCard>,
4141
);
4242

@@ -57,11 +57,11 @@ describe(BaseCard.name, () => {
5757
'.cornie-card-inner-content',
5858
) as Element;
5959

60-
fireEvent.dblClick(selectedCard);
60+
fireEvent.click(selectedCard);
6161

6262
void waitFor(() => {
6363
// eslint-disable-next-line jest/no-standalone-expect
64-
expect(onDoubleClickMock).toHaveBeenCalledTimes(1);
64+
expect(onClickMock).toHaveBeenCalledTimes(1);
6565
});
6666
});
6767

@@ -77,9 +77,9 @@ describe(BaseCard.name, () => {
7777
expect(isSelectedCard).toBe(true);
7878
});
7979

80-
it('should call a onDoubleClick()', () => {
81-
expect(onDoubleClickMock).toHaveBeenCalledTimes(1);
82-
expect(onDoubleClickMock).toHaveBeenCalledWith(expect.any(Object));
80+
it('should call a onClick()', () => {
81+
expect(onClickMock).toHaveBeenCalledTimes(1);
82+
expect(onClickMock).toHaveBeenCalledWith(expect.any(Object));
8383
});
8484
});
8585
});
@@ -89,14 +89,14 @@ describe(BaseCard.name, () => {
8989
let selectedClassName: string;
9090
let colorClassFixture: string;
9191
let isSelectedFixture: boolean;
92-
let onDoubleClickMock: jest.Mock<(event: MouseEvent) => void>;
92+
let onClickMock: jest.Mock<(event: MouseEvent) => void>;
9393

9494
beforeAll(() => {
9595
childrenMock = jest.fn();
9696
selectedClassName = 'selected';
9797
colorClassFixture = 'blue-card';
9898
isSelectedFixture = false;
99-
onDoubleClickMock = jest.fn();
99+
onClickMock = jest.fn();
100100
});
101101

102102
describe('when called', () => {
@@ -109,7 +109,7 @@ describe(BaseCard.name, () => {
109109
children={childrenMock()}
110110
colorClass={colorClassFixture}
111111
isSelected={isSelectedFixture}
112-
onDoubleClick={onDoubleClickMock}
112+
onClick={onClickMock}
113113
></BaseCard>,
114114
);
115115

@@ -130,11 +130,11 @@ describe(BaseCard.name, () => {
130130
'.cornie-card-inner-content',
131131
) as Element;
132132

133-
fireEvent.dblClick(selectedCard);
133+
fireEvent.click(selectedCard);
134134

135135
void waitFor(() => {
136136
// eslint-disable-next-line jest/no-standalone-expect
137-
expect(onDoubleClickMock).toHaveBeenCalledTimes(1);
137+
expect(onClickMock).toHaveBeenCalledTimes(1);
138138
});
139139
});
140140

@@ -150,9 +150,9 @@ describe(BaseCard.name, () => {
150150
expect(isSelectedCard).toBe(false);
151151
});
152152

153-
it('should call a onDoubleClick()', () => {
154-
expect(onDoubleClickMock).toHaveBeenCalledTimes(1);
155-
expect(onDoubleClickMock).toHaveBeenCalledWith(expect.any(Object));
153+
it('should call a onClick()', () => {
154+
expect(onClickMock).toHaveBeenCalledTimes(1);
155+
expect(onClickMock).toHaveBeenCalledWith(expect.any(Object));
156156
});
157157
});
158158
});
@@ -162,14 +162,14 @@ describe(BaseCard.name, () => {
162162
let selectedClassName: string;
163163
let colorClassFixture: string;
164164
let isSelectedFixture: undefined;
165-
let onDoubleClickMock: jest.Mock<(event: MouseEvent) => void>;
165+
let onClickMock: jest.Mock<(event: MouseEvent) => void>;
166166

167167
beforeAll(() => {
168168
childrenMock = jest.fn();
169169
selectedClassName = 'selected';
170170
colorClassFixture = 'blue-card';
171171
isSelectedFixture = undefined;
172-
onDoubleClickMock = jest.fn();
172+
onClickMock = jest.fn();
173173
});
174174

175175
describe('when called', () => {
@@ -182,7 +182,7 @@ describe(BaseCard.name, () => {
182182
children={childrenMock()}
183183
colorClass={colorClassFixture}
184184
isSelected={isSelectedFixture}
185-
onDoubleClick={onDoubleClickMock}
185+
onClick={onClickMock}
186186
></BaseCard>,
187187
);
188188

@@ -203,11 +203,11 @@ describe(BaseCard.name, () => {
203203
'.cornie-card-inner-content',
204204
) as Element;
205205

206-
fireEvent.dblClick(selectedCard);
206+
fireEvent.click(selectedCard);
207207

208208
void waitFor(() => {
209209
// eslint-disable-next-line jest/no-standalone-expect
210-
expect(onDoubleClickMock).toHaveBeenCalledTimes(1);
210+
expect(onClickMock).toHaveBeenCalledTimes(1);
211211
});
212212
});
213213

@@ -223,9 +223,9 @@ describe(BaseCard.name, () => {
223223
expect(isSelectedCard).toBe(false);
224224
});
225225

226-
it('should call a onDoubleClick()', () => {
227-
expect(onDoubleClickMock).toHaveBeenCalledTimes(1);
228-
expect(onDoubleClickMock).toHaveBeenCalledWith(expect.any(Object));
226+
it('should call a onClick()', () => {
227+
expect(onClickMock).toHaveBeenCalledTimes(1);
228+
expect(onClickMock).toHaveBeenCalledWith(expect.any(Object));
229229
});
230230
});
231231
});

‎packages/frontend/web-ui/src/game/components/BaseCard.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ interface BaseCardOptions {
55
children: React.JSX.Element | React.JSX.Element[];
66
colorClass: string;
77
isSelected?: boolean | undefined;
8-
onDoubleClick?: ((event: MouseEvent) => void) | undefined;
8+
onClick?: ((event: MouseEvent) => void) | undefined;
99
}
1010

1111
function addSelectedClassName(isSelected: boolean | undefined): string {
@@ -21,7 +21,7 @@ export const BaseCard = (params: BaseCardOptions) => {
2121
<Box
2222
component="div"
2323
className={`cornie-card ${addSelectedClassName(params.isSelected)}`}
24-
onDoubleClick={params.onDoubleClick}
24+
onClick={params.onClick}
2525
>
2626
<Box
2727
component="div"

‎packages/frontend/web-ui/src/game/components/Card.spec.tsx

+8-8
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ describe(Card.name, () => {
4141
number: 5,
4242
},
4343
isSelected: true,
44-
onDoubleClick: () => undefined,
44+
onClick: () => undefined,
4545
};
4646
});
4747

@@ -90,7 +90,7 @@ describe(Card.name, () => {
9090
kind: 'draw',
9191
},
9292
isSelected: true,
93-
onDoubleClick: () => undefined,
93+
onClick: () => undefined,
9494
};
9595
});
9696

@@ -139,7 +139,7 @@ describe(Card.name, () => {
139139
kind: 'reverse',
140140
},
141141
isSelected: true,
142-
onDoubleClick: () => undefined,
142+
onClick: () => undefined,
143143
};
144144
});
145145

@@ -188,7 +188,7 @@ describe(Card.name, () => {
188188
kind: 'skip',
189189
},
190190
isSelected: true,
191-
onDoubleClick: () => undefined,
191+
onClick: () => undefined,
192192
};
193193
});
194194

@@ -236,7 +236,7 @@ describe(Card.name, () => {
236236
kind: 'wild',
237237
},
238238
isSelected: true,
239-
onDoubleClick: () => undefined,
239+
onClick: () => undefined,
240240
};
241241
});
242242

@@ -271,7 +271,7 @@ describe(Card.name, () => {
271271
card: cardOptionsFixture.card,
272272
colorClass: 'white-color',
273273
isSelected: true,
274-
onDoubleClick: cardOptionsFixture.onDoubleClick,
274+
onClick: cardOptionsFixture.onClick,
275275
},
276276
{},
277277
);
@@ -292,7 +292,7 @@ describe(Card.name, () => {
292292
kind: 'wildDraw4',
293293
},
294294
isSelected: true,
295-
onDoubleClick: () => undefined,
295+
onClick: () => undefined,
296296
};
297297
});
298298

@@ -327,7 +327,7 @@ describe(Card.name, () => {
327327
card: cardOptionsFixture.card,
328328
colorClass: 'white-color',
329329
isSelected: true,
330-
onDoubleClick: cardOptionsFixture.onDoubleClick,
330+
onClick: cardOptionsFixture.onClick,
331331
},
332332
{},
333333
);

‎packages/frontend/web-ui/src/game/components/Card.tsx

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { WildDraw4Card } from './WildDraw4Card';
1111
export interface CardOptions {
1212
card: apiModels.CardV1;
1313
isSelected?: boolean | undefined;
14-
onDoubleClick?: (event: MouseEvent) => void;
14+
onClick?: (event: MouseEvent) => void;
1515
}
1616

1717
export const Card = (params: CardOptions) => {
@@ -21,31 +21,31 @@ export const Card = (params: CardOptions) => {
2121
<DrawCard
2222
card={params.card}
2323
isSelected={params.isSelected}
24-
onDoubleClick={params.onDoubleClick}
24+
onClick={params.onClick}
2525
></DrawCard>
2626
);
2727
case 'normal':
2828
return (
2929
<NormalCard
3030
card={params.card}
3131
isSelected={params.isSelected}
32-
onDoubleClick={params.onDoubleClick}
32+
onClick={params.onClick}
3333
></NormalCard>
3434
);
3535
case 'reverse':
3636
return (
3737
<ReverseCard
3838
card={params.card}
3939
isSelected={params.isSelected}
40-
onDoubleClick={params.onDoubleClick}
40+
onClick={params.onClick}
4141
></ReverseCard>
4242
);
4343
case 'skip':
4444
return (
4545
<SkipCard
4646
card={params.card}
4747
isSelected={params.isSelected}
48-
onDoubleClick={params.onDoubleClick}
48+
onClick={params.onClick}
4949
></SkipCard>
5050
);
5151
case 'wild':
@@ -54,7 +54,7 @@ export const Card = (params: CardOptions) => {
5454
card={params.card}
5555
colorClass="white-color"
5656
isSelected={params.isSelected}
57-
onDoubleClick={params.onDoubleClick}
57+
onClick={params.onClick}
5858
></WildCard>
5959
);
6060
case 'wildDraw4':
@@ -63,7 +63,7 @@ export const Card = (params: CardOptions) => {
6363
card={params.card}
6464
colorClass="white-color"
6565
isSelected={params.isSelected}
66-
onDoubleClick={params.onDoubleClick}
66+
onClick={params.onClick}
6767
></WildDraw4Card>
6868
);
6969
}

‎packages/frontend/web-ui/src/game/components/DrawCard.spec.tsx

+8-8
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ describe(DrawCard.name, () => {
2727
let selectedClassName: string;
2828
let isSelectedFixture: boolean;
2929
let imageUrlFixture: string;
30-
let onDoubleClickMock: jest.Mock<(event: MouseEvent) => void>;
30+
let onClickMock: jest.Mock<(event: MouseEvent) => void>;
3131

3232
beforeAll(() => {
3333
drawCardOptionsFixture = {
@@ -41,7 +41,7 @@ describe(DrawCard.name, () => {
4141
selectedClassName = 'selected';
4242
imageUrlFixture = 'image-url-fixture';
4343
isSelectedFixture = true;
44-
onDoubleClickMock = jest.fn();
44+
onClickMock = jest.fn();
4545
});
4646

4747
describe('when called', () => {
@@ -62,7 +62,7 @@ describe(DrawCard.name, () => {
6262
<DrawCard
6363
card={drawCardOptionsFixture.card}
6464
isSelected={isSelectedFixture}
65-
onDoubleClick={onDoubleClickMock}
65+
onClick={onClickMock}
6666
></DrawCard>,
6767
);
6868

@@ -85,11 +85,11 @@ describe(DrawCard.name, () => {
8585
'.cornie-card-inner-content',
8686
) as Element;
8787

88-
fireEvent.dblClick(selectedCard);
88+
fireEvent.click(selectedCard);
8989

9090
void waitFor(() => {
9191
// eslint-disable-next-line jest/no-standalone-expect
92-
expect(onDoubleClickMock).toHaveBeenCalledTimes(1);
92+
expect(onClickMock).toHaveBeenCalledTimes(1);
9393
});
9494
});
9595

@@ -117,9 +117,9 @@ describe(DrawCard.name, () => {
117117
expect(imageSourceUrl).toStrictEqual(imageUrlFixture);
118118
});
119119

120-
it('should call a onDoubleClick()', () => {
121-
expect(onDoubleClickMock).toHaveBeenCalledTimes(1);
122-
expect(onDoubleClickMock).toHaveBeenCalledWith(expect.any(Object));
120+
it('should call a onClick()', () => {
121+
expect(onClickMock).toHaveBeenCalledTimes(1);
122+
expect(onClickMock).toHaveBeenCalledWith(expect.any(Object));
123123
});
124124
});
125125
});

‎packages/frontend/web-ui/src/game/components/DrawCard.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { ImageCard } from './ImageCard';
88
export interface DrawCardOptions {
99
card: apiModels.DrawCardV1;
1010
isSelected?: boolean | undefined;
11-
onDoubleClick?: ((event: MouseEvent) => void) | undefined;
11+
onClick?: ((event: MouseEvent) => void) | undefined;
1212
}
1313

1414
export const DrawCard = (params: DrawCardOptions) => {
@@ -17,7 +17,7 @@ export const DrawCard = (params: DrawCardOptions) => {
1717
image={getImageCardUrl(params.card)}
1818
colorClass={getCardColorClassName(params.card.color)}
1919
isSelected={params.isSelected}
20-
onDoubleClick={params.onDoubleClick}
20+
onClick={params.onClick}
2121
></ImageCard>
2222
);
2323
};

0 commit comments

Comments
 (0)