Skip to content

Added the ability to specify label components that require a label attribute #668

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.

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion docs/form-control-has-label.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,12 @@ This rule takes one optional object argument of type object:
"vuejs-accessibility/form-control-has-label": [
"error",
{
"labelComponents": ["CustomLabel"],
"labelComponents": [
"CustomLabel",
],
"labelComponentsWithRequiredAttributes": [
{ "name": "CustomComponentWithRequiredAttribute", "requiredAttributes": ["label"] },
]
"controlComponents": ["CustomInput"]
}
]
Expand All @@ -26,6 +31,8 @@ This rule takes one optional object argument of type object:

For the `labelComponents` option, these strings determine which elements (**always including** `<label>`) should be checked for having the `for` prop. This is a good use case when you have a wrapper component that simply renders a `label` element.

For the `labelComponentsWithRequiredAttributes` option, these objects determine which elements should be checked for having a value for any of the `requiredAttributes` as an attribute. This is a good use case when you have a wrapper component that renders a `label` element when a specific attribute is provided.

For the `controlComponents` option, these strings determine which elements (**always including** `<input>`, `<textarea>` and `<select>`) should be checked for having an associated label. This is a good use case when you have a wrapper component that simply renders an input element.

### Succeed
Expand Down
59 changes: 58 additions & 1 deletion src/rules/__tests__/form-control-has-label.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,73 @@ makeRuleTester("form-control-has-label", rule, {
code: "<custom-label for='input'>text</custom-label><input type='text' id='input' />",
options: [{ labelComponents: ["CustomLabel"] }]
},
{
code: "<custom-label label='text'><input type='text' id='input' /></custom-label>",
options: [{
labelComponentsWithRequiredAttributes: [
{ name: "CustomLabel", requiredAttributes: ["label"] },
],
}]
},
{
code: `
<custom-label label='text'><input type='text' id='input' /></custom-label>
<custom-label-other><input type='text' id='input' /></custom-label-other>
`,
options: [{
labelComponents: [
"CustomLabelOther",
],
labelComponentsWithRequiredAttributes: [
{ name: "CustomLabel", requiredAttributes: ["label"] },
],
}]
},
{
code: "<custom-label label='text' id='id' for='bla'><input type='text' id='input' /></custom-label>",
options: [{
labelComponentsWithRequiredAttributes: [
{ name: "CustomLabel", requiredAttributes: ["label", "id", "for"] },
],
}]
},
{
code: "<custom-label><input type='text' id='input' /></custom-label>",
options: [{ labelComponents: ["CustomLabel"] }]
},
"<b-form-input />"
],
invalid: [
"<input type='text' />",
"<textarea type='text'></textarea>",
"<custom-label for='input'>text</custom-label><input type='text' id='input' />",
{
code: "<custom-label><input type='text' id='input' /></custom-label>",
options: [{
labelComponentsWithRequiredAttributes: [
{ name: "CustomLabel", requiredAttributes: ["label"] },
],
}],
errors: [{ messageId: "default" }]
},
{
code: "<div><b-form-input /></div>",
options: [{ controlComponents: ["b-form-input"] }],
errors: [{ messageId: "default" }]
}
},
{
code: "<div label='text'><b-form-input /></div>",
options: [{ controlComponents: ["b-form-input"] }],
errors: [{ messageId: "default" }]
},
{
code: "<custom-label label='text'>label next to input</custom-label><input type='text' id='input' />",
options: [{
labelComponentsWithRequiredAttributes: [
{ name: "CustomLabel", requiredAttributes: ["label"] },
],
}],
errors: [{ messageId: "default" }]
},
]
});
44 changes: 42 additions & 2 deletions src/rules/form-control-has-label.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
import type { Rule } from "eslint";
import type { AST } from "vue-eslint-parser";

interface LabelComponentsRequiredAttributes {
name: string;
requiredAttributes: string[];
}

interface FormControlHasLabelOptions {
labelComponents: string[];
labelComponentsWithRequiredAttributes: LabelComponentsRequiredAttributes[];
}

import {
Expand All @@ -23,10 +29,22 @@ function isLabelElement(
| AST.VExpressionContainer,
{ labelComponents = [] }: FormControlHasLabelOptions
) {
const allLabelComponents = labelComponents.concat("label");
const allLabelComponents: string[] = labelComponents.concat("label");
return isMatchingElement(node, allLabelComponents);
}

function isLabelElementWithRequiredAttributes(
node: | AST.VElement,
{ labelComponentsWithRequiredAttributes = [] }: FormControlHasLabelOptions
) {
return labelComponentsWithRequiredAttributes.some((component) => (
isMatchingElement(node, [component.name]) &&
component.requiredAttributes.some(
(attr) => getElementAttributeValue(node, attr)
)
));
}

function hasLabelElement(
node: AST.VElement,
options: FormControlHasLabelOptions
Expand All @@ -37,7 +55,13 @@ function hasLabelElement(
[parent, ...parent.children].some((node) =>
isLabelElement(node, options)
) ||
(parent && parent.type === "VElement" && hasLabelElement(parent, options))
(
parent && parent.type === "VElement" &&
(
isLabelElementWithRequiredAttributes(parent, options) ||
hasLabelElement(parent, options)
)
)
);
}

Expand All @@ -62,6 +86,22 @@ const rule: Rule.RuleModule = {
},
uniqueItems: true
},
labelComponentsWithRequiredAttributes: {
type: "array",
items: {
type: "object",
properties: {
name: {
type: "string",
},
requiredAttributes: {
type: "array",
items: { type: "string" }
},
}
},
uniqueItems: true
},
controlComponents: {
type: "array",
items: {
Expand Down