Merge pull request #2504 from johanrd/fix/2484

Post-merge review of #2484 (`template-no-nested-interactive`)

Author: NullVoxPopuli

docs/rules/template-no-nested-interactive.md

@@ -99,12 +99,13 @@ Examples of **correct** code for this rule:
 
 ## Options
 
-| Name                        | Type       | Default | Description                                                 |
-| --------------------------- | ---------- | ------- | ----------------------------------------------------------- |
-| `additionalInteractiveTags` | `string[]` | `[]`    | Extra tag names to consider interactive.                    |
-| `ignoredTags`               | `string[]` | `[]`    | Tag names to skip checking.                                 |
-| `ignoreTabindex`            | `boolean`  | `false` | If `true`, `tabindex` does not make an element interactive. |
-| `ignoreUsemap`              | `boolean`  | `false` | If `true`, `usemap` does not make an element interactive.   |
+| Name                        | Type       | Default | Description                                                   |
+| --------------------------- | ---------- | ------- | ------------------------------------------------------------- |
+| `additionalInteractiveTags` | `string[]` | `[]`    | Extra tag names to consider interactive.                      |
+| `ignoredTags`               | `string[]` | `[]`    | Tag names to skip checking.                                   |
+| `ignoreTabindex`            | `boolean`  | `false` | If `true`, `tabindex` does not make an element interactive.   |
+| `ignoreUsemap`              | `boolean`  | `false` | If `true`, `usemap` does not make an element interactive.     |
+| `ignoreUsemapAttribute`     | `boolean`  | `false` | Alias for `ignoreUsemap` (original ember-template-lint name). |
 
 ## References
 

lib/rules/template-no-nested-interactive.js

@@ -79,6 +79,7 @@ module.exports = {
           ignoredTags: { type: 'array', items: { type: 'string' } },
           ignoreTabindex: { type: 'boolean' },
           ignoreUsemap: { type: 'boolean' },
+          ignoreUsemapAttribute: { type: 'boolean' },
         },
         additionalProperties: false,
       },
@@ -99,7 +100,7 @@ module.exports = {
     const additionalInteractiveTags = new Set(options.additionalInteractiveTags || []);
     const ignoredTags = new Set(options.ignoredTags || []);
     const ignoreTabindex = options.ignoreTabindex || false;
-    const ignoreUsemap = options.ignoreUsemap || false;
+    const ignoreUsemap = options.ignoreUsemap || options.ignoreUsemapAttribute || false;
 
     const interactiveStack = [];
     // Stack for saving/restoring label interactiveChildCount across GlimmerBlock boundaries