Skip to content

allow CallExpressions in accessibilityActions #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 11, 2020
Merged

allow CallExpressions in accessibilityActions #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions __tests__/src/rules/has-valid-accessibility-actions-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ ruleTester.run('has-valid-accessibility-actions', rule, {
}}
/>`,
},
{
code: `<View
accessibilityActions={useMemo()}
onAccessibilityAction={useCallback()}
/>`,
},
].map(parserOptionsMapper),
invalid: [
{
Expand Down
100 changes: 58 additions & 42 deletions src/rules/has-valid-accessibility-actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import type { JSXOpeningElement } from 'ast-types-flow';
import { getProp, getPropValue, hasProp } from 'jsx-ast-utils';
import { getProp, getPropValue, hasEveryProp, hasProp } from 'jsx-ast-utils';
import { generateObjSchema } from '../util/schemas';
import type { ESLintContext } from '../../flow/eslint';

Expand Down Expand Up @@ -36,51 +36,67 @@ module.exports = {
message,
});

if (hasProp(node.attributes, 'accessibilityActions')) {
if (
typeof getPropValue(
getProp(node.attributes, 'onAccessibilityAction')
) !== 'function'
) {
error(
'accessibilityActions: has accessibilityActions but onAccessibilityAction is not a function'
);
if (
hasEveryProp(node.attributes, [
'accessibilityActions',
'onAccessibilityAction',
])
) {
const handlerProp = getProp(node.attributes, 'onAccessibilityAction');
const handlerPropType = handlerProp.value.expression.type;
// CallExpressions are always assumed valid
if (handlerPropType !== 'CallExpression') {
const handlerPropValue = getPropValue(handlerProp);
if (typeof handlerPropValue !== 'function') {
error(
'accessibilityActions: has accessibilityActions but onAccessibilityAction is not a function'
);
}
}

const attrValue = getPropValue(
getProp(node.attributes, 'accessibilityActions')
);
const actionsProp = getProp(node.attributes, 'accessibilityActions');
const actionsPropType = actionsProp.value.expression.type;
// CallExpressions are always assumed valid
if (actionsPropType !== 'CallExpression') {
const attrValue = getPropValue(actionsProp);

if (!Array.isArray(attrValue)) {
error('accessibilityActions: value must be an Array');
} else if (attrValue.length === 0) {
error('accessibilityActions: Array cannot be empty');
} else {
attrValue.forEach((action) => {
if (!action.name) {
error('accessibilityActions: action missing name');
} else if (
standardActions.indexOf(action.name) < 0 &&
!action.label
) {
error(
`accessibilityActions: custom action "${action.name}" missing label`
);
}
if (
Object.keys(action).filter((f) => f !== 'name' && f !== 'label')
.length > 0
) {
error(
`accessibilityActions: action "${action.name}" contains unrecognised keys`
);
}
});
if (!Array.isArray(attrValue)) {
error('accessibilityActions: value must be an Array');
} else if (attrValue.length === 0) {
error('accessibilityActions: Array cannot be empty');
} else {
attrValue.forEach((action) => {
if (!action.name) {
error('accessibilityActions: action missing name');
} else if (
standardActions.indexOf(action.name) < 0 &&
!action.label
) {
error(
`accessibilityActions: custom action "${action.name}" missing label`
);
}
if (
Object.keys(action).filter((f) => f !== 'name' && f !== 'label')
.length > 0
) {
error(
`accessibilityActions: action "${action.name}" contains unrecognised keys`
);
}
});
}
}
} else {
if (hasProp(node.attributes, 'accessibilityActions')) {
error(
'accessibilityActions: has accessibilityActions but onAccessibilityAction is not a function'
);
} else if (hasProp(node.attributes, 'onAccessibilityAction')) {
error(
'accessibilityActions: has onAccessibilityAction function but no accessibilityActions Array'
);
}
} else if (hasProp(node.attributes, 'onAccessibilityAction')) {
error(
'accessibilityActions: has onAccessibilityAction function but no accessibilityActions Array'
);
}
},
}),
Expand Down