eslint-plugin-primer-react 5.3.0 → 5.4.0-rc.61b506f

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-primer-react",
-  "version": "5.3.0",
+  "version": "5.4.0-rc.61b506f",
   "description": "ESLint rules for Primer React",
   "main": "src/index.js",
   "scripts": {
@@ -44,7 +44,7 @@
     "eslint-plugin-prettier": "^5.0.1",
     "jest": "^29.7.0",
     "markdownlint-cli2": "^0.13.0",
-    "markdownlint-cli2-formatter-pretty": "^0.0.5"
+    "markdownlint-cli2-formatter-pretty": "^0.0.6"
   },
   "prettier": "@github/prettier-config"
 }

package/src/configs/recommended.js

@@ -17,6 +17,7 @@ module.exports = {
     'primer-react/a11y-explicit-heading': 'error',
     'primer-react/no-deprecated-props': 'warn',
     'primer-react/a11y-remove-disable-tooltip': 'error',
+    'primer-react/a11y-use-next-tooltip': 'error',
   },
   settings: {
     github: {

package/src/index.js

@@ -9,6 +9,7 @@ module.exports = {
     'no-deprecated-props': require('./rules/no-deprecated-props'),
     'a11y-link-in-text-block': require('./rules/a11y-link-in-text-block'),
     'a11y-remove-disable-tooltip': require('./rules/a11y-remove-disable-tooltip'),
+    'a11y-use-next-tooltip': require('./rules/a11y-use-next-tooltip'),
   },
   configs: {
     recommended: require('./configs/recommended'),

package/src/rules/__tests__/a11y-use-next-tooltip.test.js

@@ -0,0 +1,61 @@
+const rule = require('../a11y-use-next-tooltip')
+const {RuleTester} = require('eslint')
+
+const ruleTester = new RuleTester({
+  parserOptions: {
+    ecmaVersion: 'latest',
+    sourceType: 'module',
+    ecmaFeatures: {
+      jsx: true,
+    },
+  },
+})
+
+ruleTester.run('a11y-use-next-tooltip', rule, {
+  valid: [
+    `import {Tooltip} from '@primer/react/next';`,
+    `import {UnderlineNav, Button} from '@primer/react';
+   import {Tooltip} from '@primer/react/next';`,
+    `import {UnderlineNav, Button} from '@primer/react';
+   import {Tooltip, SelectPanel} from '@primer/react/next';`,
+  ],
+  invalid: [
+    {
+      code: `import {Tooltip} from '@primer/react';`,
+      errors: [{messageId: 'useNextTooltip'}],
+      output: `import {Tooltip} from '@primer/react/next';`,
+    },
+    {
+      code: `import {Tooltip, Button} from '@primer/react';\n<Tooltip aria-label="tooltip text"><Button>Button</Button></Tooltip>`,
+      errors: [{messageId: 'useNextTooltip'}, {messageId: 'useTextProp'}],
+      output: `import {Button} from '@primer/react';\nimport {Tooltip} from '@primer/react/next';\n<Tooltip text="tooltip text"><Button>Button</Button></Tooltip>`,
+    },
+    {
+      code: `import {ActionList, ActionMenu, Tooltip, Button} from '@primer/react';\n<Tooltip aria-label="tooltip text"><Button>Button</Button></Tooltip>`,
+      errors: [
+        {messageId: 'useNextTooltip', line: 1},
+        {messageId: 'useTextProp', line: 2},
+      ],
+      output: `import {ActionList, ActionMenu, Button} from '@primer/react';\nimport {Tooltip} from '@primer/react/next';\n<Tooltip text="tooltip text"><Button>Button</Button></Tooltip>`,
+    },
+    {
+      code: `import {ActionList, ActionMenu, Button, Tooltip} from '@primer/react';\n<Tooltip aria-label="tooltip text"><Button aria-label="test">Button</Button></Tooltip>`,
+      errors: [
+        {messageId: 'useNextTooltip', line: 1},
+        {messageId: 'useTextProp', line: 2},
+      ],
+      output: `import {ActionList, ActionMenu, Button} from '@primer/react';\nimport {Tooltip} from '@primer/react/next';\n<Tooltip text="tooltip text"><Button aria-label="test">Button</Button></Tooltip>`,
+    },
+    {
+      code: `import {ActionList, ActionMenu, Tooltip, Button} from '@primer/react';\n<Tooltip aria-label="tooltip text" noDelay={true} wrap={true} align="left"><Button>Button</Button></Tooltip>`,
+      errors: [
+        {messageId: 'useNextTooltip', line: 1},
+        {messageId: 'useTextProp', line: 2},
+        {messageId: 'noDelayRemoved', line: 2},
+        {messageId: 'wrapRemoved', line: 2},
+        {messageId: 'alignRemoved', line: 2},
+      ],
+      output: `import {ActionList, ActionMenu, Button} from '@primer/react';\nimport {Tooltip} from '@primer/react/next';\n<Tooltip text="tooltip text"   ><Button>Button</Button></Tooltip>`,
+    },
+  ],
+})

package/src/rules/a11y-use-next-tooltip.js

@@ -0,0 +1,128 @@
+'use strict'
+const url = require('../url')
+const {getJSXOpeningElementAttribute} = require('../utils/get-jsx-opening-element-attribute')
+const {getJSXOpeningElementName} = require('../utils/get-jsx-opening-element-name')
+
+module.exports = {
+  meta: {
+    type: 'suggestion',
+    docs: {
+      description: 'recommends the use of @primer/react/next Tooltip component',
+      category: 'Best Practices',
+      recommended: true,
+      url: url(module),
+    },
+    fixable: true,
+    schema: [],
+    messages: {
+      useNextTooltip: 'Please use @primer/react/next Tooltip component that has accessibility improvements',
+      useTextProp: 'Please use the text prop instead of aria-label',
+      noDelayRemoved: 'noDelay prop is removed. Tooltip now has no delay by default',
+      wrapRemoved: 'wrap prop is removed. Tooltip now wraps by default',
+      alignRemoved: 'align prop is removed. Please use the direction prop instead.',
+    },
+  },
+  create(context) {
+    return {
+      ImportDeclaration(node) {
+        if (node.source.value !== '@primer/react') {
+          return
+        }
+        const hasTooltip = node.specifiers.some(
+          specifier => specifier.imported && specifier.imported.name === 'Tooltip',
+        )
+
+        const hasOtherImports = node.specifiers.length > 1
+        if (!hasTooltip) {
+          return
+        }
+        context.report({
+          node,
+          messageId: 'useNextTooltip',
+          fix(fixer) {
+            // If Tooltip is the only import, replace the whole import statement
+            if (!hasOtherImports) {
+              return fixer.replaceText(node.source, `'@primer/react/next'`)
+            } else {
+              // Otherwise, remove Tooltip from the import statement and add a new import statement with the correct path
+              const tooltipSpecifier = node.specifiers.find(
+                specifier => specifier.imported && specifier.imported.name === 'Tooltip',
+              )
+
+              const tokensToRemove = [' ', ',']
+              const tooltipIsFirstImport = tooltipSpecifier === node.specifiers[0]
+              const tooltipIsLastImport = tooltipSpecifier === node.specifiers[node.specifiers.length - 1]
+              const tooltipIsNotFirstOrLastImport = !tooltipIsFirstImport && !tooltipIsLastImport
+
+              const sourceCode = context.getSourceCode()
+              const canRemoveBefore = tooltipIsNotFirstOrLastImport
+                ? false
+                : tokensToRemove.includes(sourceCode.getTokenBefore(tooltipSpecifier).value)
+              const canRemoveAfter = tokensToRemove.includes(sourceCode.getTokenAfter(tooltipSpecifier).value)
+              const start = canRemoveBefore
+                ? sourceCode.getTokenBefore(tooltipSpecifier).range[0]
+                : tooltipSpecifier.range[0]
+              const end = canRemoveAfter
+                ? sourceCode.getTokenAfter(tooltipSpecifier).range[1] + 1
+                : tooltipSpecifier.range[1]
+              return [
+                // remove tooltip specifier and the space and comma after it
+                fixer.removeRange([start, end]),
+                fixer.insertTextAfterRange(
+                  [node.range[1], node.range[1]],
+                  `\nimport {Tooltip} from '@primer/react/next';`,
+                ),
+              ]
+            }
+          },
+        })
+      },
+      JSXOpeningElement(node) {
+        const openingElName = getJSXOpeningElementName(node)
+        if (openingElName !== 'Tooltip') {
+          return
+        }
+        const ariaLabel = getJSXOpeningElementAttribute(node, 'aria-label')
+        if (ariaLabel !== undefined) {
+          context.report({
+            node,
+            messageId: 'useTextProp',
+            fix(fixer) {
+              return fixer.replaceText(ariaLabel.name, 'text')
+            },
+          })
+        }
+        const noDelay = getJSXOpeningElementAttribute(node, 'noDelay')
+        if (noDelay !== undefined) {
+          context.report({
+            node,
+            messageId: 'noDelayRemoved',
+            fix(fixer) {
+              return fixer.remove(noDelay)
+            },
+          })
+        }
+        const wrap = getJSXOpeningElementAttribute(node, 'wrap')
+        if (wrap !== undefined) {
+          context.report({
+            node,
+            messageId: 'wrapRemoved',
+            fix(fixer) {
+              return fixer.remove(wrap)
+            },
+          })
+        }
+        const align = getJSXOpeningElementAttribute(node, 'align')
+        if (align !== undefined) {
+          context.report({
+            node,
+            messageId: 'alignRemoved',
+            fix(fixer) {
+              return fixer.remove(align)
+            },
+          })
+        }
+      },
+    }
+  },
+}

package/src/rules/no-system-props.js

@@ -15,6 +15,7 @@ const utilityComponents = new Set(['Box', 'Text'])
 // Components for which we allow a set of prop names
 const excludedComponentProps = new Map([
   ['ActionMenu.Overlay', new Set(['width', 'height', 'maxHeight', 'position', 'top', 'right', 'bottom', 'left'])],
+  ['ActionMenu.Button', new Set(['alignContent'])],
   ['Autocomplete.Overlay', new Set(['width', 'height', 'maxHeight', 'position', 'top', 'right', 'bottom', 'left'])],
   ['AnchoredOverlay', new Set(['width', 'height'])],
   ['Avatar', new Set(['size'])],