Skip to content

Commit 39dd536

Browse files
authored
Merge pull request #1262 from dxc-technology/gomezivann-keycode-fix
[Patch] Replace keycode for key in the affected components
2 parents f9b872d + 69c0005 commit 39dd536

File tree

5 files changed

+33
-37
lines changed

5 files changed

+33
-37
lines changed

lib/src/date-input/DateInput.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@ const DxcDateInput = React.forwardRef<RefType, DateInputPropsType>(
4646
const refDate = ref || useRef(null);
4747

4848
const handleCalendarOnKeyDown = (event) => {
49-
switch (event.keyCode) {
50-
case 27: // Esc
49+
switch (event.key) {
50+
case "Esc":
51+
case "Escape":
5152
event.preventDefault();
5253
setIsOpen(false);
5354
break;

lib/src/radio-group/RadioGroup.tsx

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,19 +96,23 @@ const DxcRadioGroup = React.forwardRef<RefType, RadioGroupPropsType>(
9696
});
9797
};
9898
const handleOnKeyDown = (event: React.KeyboardEvent<HTMLDivElement>) => {
99-
switch (event.keyCode) {
100-
case 37: // arrow left
101-
case 38: // arrow up
99+
switch (event.key) {
100+
case "Left":
101+
case "ArrowLeft":
102+
case "Up":
103+
case "ArrowUp":
102104
event.preventDefault();
103105
setPreviousRadioChecked();
104106
break;
105-
case 39: // arrow right
106-
case 40: // arrow down
107+
case "Right":
108+
case "ArrowRight":
109+
case "Down":
110+
case "ArrowDown":
107111
event.preventDefault();
108112
setNextRadioChecked();
109113
break;
110-
case 13: // enter
111-
case 32: // space
114+
case "Enter":
115+
case "Space":
112116
event.preventDefault();
113117
handleOnChange(innerOptions[currentFocusIndex].value);
114118
break;

lib/src/tabs-nav/NavTabs.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,14 @@ const DxcNavTabs = ({ iconPosition = "top", tabIndex = 0, children }: NavTabsPro
6161
const activeTab = React.Children.toArray(children).findIndex((child: ReactElement) =>
6262
getPropInChild(child, "active")
6363
);
64-
switch (event.keyCode) {
65-
case 37: // arrow left
64+
switch (event.key) {
65+
case "Left":
66+
case "ArrowLeft":
6667
event.preventDefault();
6768
setInnerFocus(getPreviousTabIndex(children, innerFocus === null ? activeTab : innerFocus));
6869
break;
69-
case 39: // arrow right
70+
case "Right":
71+
case "ArrowRight":
7072
event.preventDefault();
7173
setInnerFocus(getNextTabIndex(children, innerFocus === null ? activeTab : innerFocus));
7274
break;

lib/src/tabs-nav/Tab.tsx

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,7 @@ import { TabProps } from "./types";
66

77
const DxcTab = forwardRef(
88
(
9-
{
10-
href,
11-
active = false,
12-
icon,
13-
disabled = false,
14-
notificationNumber = false,
15-
children,
16-
...otherProps
17-
}: TabProps,
9+
{ href, active = false, icon, disabled = false, notificationNumber = false, children, ...otherProps }: TabProps,
1810
ref: Ref<HTMLAnchorElement>
1911
): JSX.Element => {
2012
const tabRef: React.MutableRefObject<HTMLAnchorElement> = createRef();
@@ -26,9 +18,9 @@ const DxcTab = forwardRef(
2618
}, [focusedLabel]);
2719

2820
const handleOnKeyDown = (event: React.KeyboardEvent<HTMLAnchorElement>) => {
29-
switch (event.keyCode) {
30-
case 13: // enter
31-
case 32: // space
21+
switch (event.key) {
22+
case "Enter":
23+
case "Space":
3224
tabRef?.current?.click();
3325
event.preventDefault();
3426
break;

lib/src/text-input/TextInput.tsx

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ const makeCancelable = (promise) => {
5252
};
5353
};
5454

55-
const getNotOptionalErrorMessage = () => `This field is required. Please, enter a value.`;
56-
57-
const getPatternErrorMessage = () => `Please match the format requested.`;
58-
5955
const patternMatch = (pattern, value) => new RegExp(pattern).test(value);
6056

6157
const getLastOptionIndex = (filteredSuggestions) => {
@@ -200,13 +196,13 @@ const DxcTextInput = React.forwardRef<RefType, TextInputPropsType>(
200196
else onBlur?.({ value: event.target.value });
201197
};
202198
const handleIOnKeyDown = (event) => {
203-
switch (event.keyCode) {
204-
case 40: // Arrow Down
199+
switch (event.key) {
200+
case "Down":
201+
case "ArrowDown":
202+
event.preventDefault();
205203
if (numberInputContext?.typeNumber === "number") {
206204
decrementNumber();
207-
event.preventDefault();
208205
} else {
209-
event.preventDefault();
210206
openSuggestions();
211207
if (!isAutosuggestError && !isSearching && filteredSuggestions.length > 0) {
212208
changeVisualFocusedSuggIndex((visualFocusedSuggIndex) => {
@@ -216,12 +212,12 @@ const DxcTextInput = React.forwardRef<RefType, TextInputPropsType>(
216212
}
217213
}
218214
break;
219-
case 38: // Arrow Up
215+
case "Up":
216+
case "ArrowUp":
217+
event.preventDefault();
220218
if (numberInputContext?.typeNumber === "number") {
221219
incrementNumber();
222-
event.preventDefault();
223220
} else {
224-
event.preventDefault();
225221
openSuggestions();
226222
if (!isAutosuggestError && !isSearching && filteredSuggestions.length > 0) {
227223
changeVisualFocusedSuggIndex((visualFocusedSuggIndex) => {
@@ -232,14 +228,15 @@ const DxcTextInput = React.forwardRef<RefType, TextInputPropsType>(
232228
}
233229
}
234230
break;
235-
case 27: // Esc
231+
case "Esc":
232+
case "Escape":
236233
event.preventDefault();
237234
if (hasSuggestions()) {
238235
changeValue("");
239236
isOpen && closeSuggestions();
240237
}
241238
break;
242-
case 13: // Enter
239+
case "Enter":
243240
if (hasSuggestions() && !isSearching) {
244241
const validFocusedSuggestion =
245242
filteredSuggestions.length > 0 &&

0 commit comments

Comments
 (0)