Skip to content

Commit 7d381c3

Browse files
Pybsamacamc314
andauthored
fix(linter/jsx-a11y/mouse-events-have-key-events): handle nullish event handlers (#27306)
`mouse-events-have-key-events` reports absent hover handlers such as `onMouseOver={undefined}` and misses active hover handlers paired with `onFocus={null}`. The same issue affects hover-out/blur and configured handler lists. Use one local predicate to skip nullish hover values, reject nullish keyboard values, and continue to a later configured active hover handler. Preserve existing component, spread and bare-attribute behavior. Bare attributes retain Oxc's prior behavior, which differs from [the upstream rule](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/v6.10.2/src/rules/mouse-events-have-key-events.js). Validation: - The new regression test demonstrated five false-positive cases and four false-negative cases before the fix. - Both focused rule tests pass, with 22 new regression/control cases including default/configured handlers, ordering, dynamic functions, components and bare attributes. - Independent AI code review found no blocking issues; suggested bare-attribute coverage was added. - Full post-commit `just ready` passed: 98 test targets, 5,061 passed / 161 ignored / 0 failed; formatting, code generation, checks, Clippy and documentation completed with a clean worktree. Fixes #27305 AI-assisted with Codex. --------- Co-authored-by: Pybsama <[email protected]> Co-authored-by: Cameron Clark <[email protected]>
1 parent 4e09837 commit 7d381c3

2 files changed

Lines changed: 124 additions & 25 deletions

File tree

‎crates/oxc_linter/src/rules/jsx_a11y/mouse_events_have_key_events.rs‎

Lines changed: 54 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
use oxc_ast::{AstKind, ast::JSXAttributeValue};
1+
use oxc_ast::{
2+
AstKind,
3+
ast::{Expression, JSXAttributeItem, JSXAttributeValue},
4+
};
25
use oxc_diagnostics::OxcDiagnostic;
36
use oxc_macros::declare_oxc_lint;
47
use oxc_span::{GetSpan, Span};
@@ -96,22 +99,12 @@ impl Rule for MouseEventsHaveKeyEvents {
9699

97100
for handler in &self.0.hover_in_handlers {
98101
if let Some(jsx_attr) = has_jsx_prop(jsx_opening_el, handler) {
99-
if get_prop_value(jsx_attr).is_none() {
102+
if !has_handler_value(jsx_attr) {
100103
continue;
101104
}
102105

103-
match has_jsx_prop(jsx_opening_el, "onFocus").and_then(get_prop_value) {
104-
Some(JSXAttributeValue::ExpressionContainer(container)) => {
105-
if let Some(expr) = container.expression.as_expression()
106-
&& expr.is_undefined()
107-
{
108-
ctx.diagnostic(miss_on_focus(jsx_attr.span(), handler));
109-
}
110-
}
111-
None => {
112-
ctx.diagnostic(miss_on_focus(jsx_attr.span(), handler));
113-
}
114-
_ => {}
106+
if !has_jsx_prop(jsx_opening_el, "onFocus").is_some_and(has_handler_value) {
107+
ctx.diagnostic(miss_on_focus(jsx_attr.span(), handler));
115108
}
116109

117110
break;
@@ -120,20 +113,12 @@ impl Rule for MouseEventsHaveKeyEvents {
120113

121114
for handler in &self.0.hover_out_handlers {
122115
if let Some(jsx_attr) = has_jsx_prop(jsx_opening_el, handler) {
123-
if get_prop_value(jsx_attr).is_none() {
116+
if !has_handler_value(jsx_attr) {
124117
continue;
125118
}
126119

127-
match has_jsx_prop(jsx_opening_el, "onBlur").and_then(get_prop_value) {
128-
Some(JSXAttributeValue::ExpressionContainer(container))
129-
if container.expression.is_undefined() =>
130-
{
131-
ctx.diagnostic(miss_on_blur(jsx_attr.span(), handler));
132-
}
133-
None => {
134-
ctx.diagnostic(miss_on_blur(jsx_attr.span(), handler));
135-
}
136-
_ => {}
120+
if !has_jsx_prop(jsx_opening_el, "onBlur").is_some_and(has_handler_value) {
121+
ctx.diagnostic(miss_on_blur(jsx_attr.span(), handler));
137122
}
138123

139124
break;
@@ -142,10 +127,29 @@ impl Rule for MouseEventsHaveKeyEvents {
142127
}
143128
}
144129

130+
fn has_handler_value(attribute: &JSXAttributeItem<'_>) -> bool {
131+
match get_prop_value(attribute) {
132+
Some(JSXAttributeValue::ExpressionContainer(container)) => {
133+
let Some(expression) = container.expression.as_expression() else {
134+
return true;
135+
};
136+
let expression = expression.get_inner_expression();
137+
!expression.is_undefined() && !matches!(expression, Expression::NullLiteral(_))
138+
}
139+
Some(_) => true,
140+
None => false,
141+
}
142+
}
143+
145144
#[test]
146145
fn test() {
147146
use crate::tester::Tester;
148147

148+
let configured = Some(serde_json::json!([{
149+
"hoverInHandlers": ["onMouseOver", "onMouseEnter"],
150+
"hoverOutHandlers": ["onMouseOut", "onMouseLeave"]
151+
}]));
152+
149153
let pass = vec![
150154
("<div onMouseOver={() => void 0} onFocus={() => void 0} />;", None),
151155
("<div onMouseOver={() => void 0} onFocus={() => void 0} {...props} />;", None),
@@ -197,6 +201,21 @@ fn test() {
197201
"<div onMouseLeave={() => {}} />",
198202
Some(serde_json::json!([{ "hoverOutHandlers": ["onPointerLeave"] }])),
199203
),
204+
("<div onMouseOver={undefined} />", None),
205+
("<div onMouseOut={undefined} />", None),
206+
("<div onMouseOver={null} />", None),
207+
("<div onMouseOut={null} />", None),
208+
("<div onMouseOver={undefined} onMouseOut={null} />", None),
209+
("<div onMouseOver />", None),
210+
("<div onMouseOut />", None),
211+
("<div onMouseOver={handler} onFocus={handler} />", None),
212+
("<div onMouseOut={handler} onBlur={handler} />", None),
213+
("<div onMouseOver={null} onMouseEnter={handler} onFocus={handler} />", configured.clone()),
214+
(
215+
"<div onMouseOut={undefined} onMouseLeave={handler} onBlur={handler} />",
216+
configured.clone(),
217+
),
218+
("<Custom onMouseOver={handler} onFocus={null} />", None),
200219
];
201220

202221
let fail = vec![
@@ -234,6 +253,16 @@ fn test() {
234253
"<div onPointerLeave={() => {}} />",
235254
Some(serde_json::json!([{ "hoverOutHandlers": ["onPointerLeave"] }])),
236255
),
256+
("<div onMouseOver={handler} onFocus={null} />", None),
257+
("<div onMouseOut={handler} onBlur={null} />", None),
258+
("<div onMouseOver={handler} onFocus={undefined} />", None),
259+
("<div onMouseOut={handler} onBlur={undefined} />", None),
260+
("<div onMouseOver={handler} onFocus />", None),
261+
("<div onMouseOut={handler} onBlur />", None),
262+
("<div onMouseOver={null} onMouseEnter={handler} />", configured.clone()),
263+
("<div onMouseOut={undefined} onMouseLeave={handler} />", configured.clone()),
264+
("<div onMouseOver={null} onMouseEnter={handler} onFocus={null} />", configured.clone()),
265+
("<div onMouseOut={undefined} onMouseLeave={handler} onBlur={null} />", configured),
237266
];
238267

239268
Tester::new(MouseEventsHaveKeyEvents::NAME, MouseEventsHaveKeyEvents::PLUGIN, pass, fail)

‎crates/oxc_linter/src/snapshots/jsx_a11y_mouse_events_have_key_events.snap‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,3 +99,73 @@ source: crates/oxc_linter/src/tester.rs
9999
· ─────────────────────────
100100
╰────
101101
help: Try to add `onBlur`.
102+
103+
⚠ jsx-a11y(mouse-events-have-key-events): `onMouseOver` must be accompanied by `onFocus` for accessibility.
104+
╭─[mouse_events_have_key_events.tsx:1:6]
105+
1 │ <div onMouseOver={handler} onFocus={null} />
106+
· ─────────────────────
107+
╰────
108+
help: Try to add `onFocus`.
109+
110+
⚠ jsx-a11y(mouse-events-have-key-events): `onMouseOut` must be accompanied by `onBlur` for accessibility.
111+
╭─[mouse_events_have_key_events.tsx:1:6]
112+
1 │ <div onMouseOut={handler} onBlur={null} />
113+
· ────────────────────
114+
╰────
115+
help: Try to add `onBlur`.
116+
117+
⚠ jsx-a11y(mouse-events-have-key-events): `onMouseOver` must be accompanied by `onFocus` for accessibility.
118+
╭─[mouse_events_have_key_events.tsx:1:6]
119+
1 │ <div onMouseOver={handler} onFocus={undefined} />
120+
· ─────────────────────
121+
╰────
122+
help: Try to add `onFocus`.
123+
124+
⚠ jsx-a11y(mouse-events-have-key-events): `onMouseOut` must be accompanied by `onBlur` for accessibility.
125+
╭─[mouse_events_have_key_events.tsx:1:6]
126+
1 │ <div onMouseOut={handler} onBlur={undefined} />
127+
· ────────────────────
128+
╰────
129+
help: Try to add `onBlur`.
130+
131+
⚠ jsx-a11y(mouse-events-have-key-events): `onMouseOver` must be accompanied by `onFocus` for accessibility.
132+
╭─[mouse_events_have_key_events.tsx:1:6]
133+
1 │ <div onMouseOver={handler} onFocus />
134+
· ─────────────────────
135+
╰────
136+
help: Try to add `onFocus`.
137+
138+
⚠ jsx-a11y(mouse-events-have-key-events): `onMouseOut` must be accompanied by `onBlur` for accessibility.
139+
╭─[mouse_events_have_key_events.tsx:1:6]
140+
1 │ <div onMouseOut={handler} onBlur />
141+
· ────────────────────
142+
╰────
143+
help: Try to add `onBlur`.
144+
145+
⚠ jsx-a11y(mouse-events-have-key-events): `onMouseEnter` must be accompanied by `onFocus` for accessibility.
146+
╭─[mouse_events_have_key_events.tsx:1:25]
147+
1 │ <div onMouseOver={null} onMouseEnter={handler} />
148+
· ──────────────────────
149+
╰────
150+
help: Try to add `onFocus`.
151+
152+
⚠ jsx-a11y(mouse-events-have-key-events): `onMouseLeave` must be accompanied by `onBlur` for accessibility.
153+
╭─[mouse_events_have_key_events.tsx:1:29]
154+
1 │ <div onMouseOut={undefined} onMouseLeave={handler} />
155+
· ──────────────────────
156+
╰────
157+
help: Try to add `onBlur`.
158+
159+
⚠ jsx-a11y(mouse-events-have-key-events): `onMouseEnter` must be accompanied by `onFocus` for accessibility.
160+
╭─[mouse_events_have_key_events.tsx:1:25]
161+
1 │ <div onMouseOver={null} onMouseEnter={handler} onFocus={null} />
162+
· ──────────────────────
163+
╰────
164+
help: Try to add `onFocus`.
165+
166+
⚠ jsx-a11y(mouse-events-have-key-events): `onMouseLeave` must be accompanied by `onBlur` for accessibility.
167+
╭─[mouse_events_have_key_events.tsx:1:29]
168+
1 │ <div onMouseOut={undefined} onMouseLeave={handler} onBlur={null} />
169+
· ──────────────────────
170+
╰────
171+
help: Try to add `onBlur`.

0 commit comments

Comments
 (0)