fix PR comments

alexwizp · alexwizp · commit 398f17204a88 · 2025-07-29T19:45:49.000+03:00
diff --git a/packages/eslint-plugin/src/rules/a11y/consistent_is_invalid_props.ts b/packages/eslint-plugin/src/rules/a11y/consistent_is_invalid_props.ts
@@ -19,7 +19,8 @@
 
 import { type TSESTree, ESLintUtils } from '@typescript-eslint/utils';
 import { getAttrValue } from '../../utils/get_attr_value';
-import { isAttrsEqual } from "../../utils/is_attrs_equal";
+import { areAttrsEqual } from '../../utils/are_attrs_equal';
+
 const formControlComponent = 'EuiFormRow';
 
 const formControlChildComponents = [
@@ -74,7 +75,7 @@ export const ConsistentIsInvalidProps = ESLintUtils.RuleCreator.withoutDocs({
           'isInvalid'
         );
 
-        if (!isAttrsEqual(childIsInvalid,formRowIsInvalid)) {
+        if (!areAttrsEqual(childIsInvalid, formRowIsInvalid)) {
           const componentName = (
             childElement.openingElement.name as TSESTree.JSXIdentifier
           ).name;
diff --git a/packages/eslint-plugin/src/rules/a11y/sr_output_disabled_tooltip.ts b/packages/eslint-plugin/src/rules/a11y/sr_output_disabled_tooltip.ts
@@ -8,7 +8,7 @@
 
 import { type TSESTree, ESLintUtils } from '@typescript-eslint/utils';
 import { getAttrValue } from '../../utils/get_attr_value';
-import { isAttrsEqual } from '../../utils/is_attrs_equal';
+import { areAttrsEqual } from '../../utils/are_attrs_equal';
 
 const tooltipComponent = 'EuiToolTip';
 const disabledTooltipComponentProp = 'disableScreenReaderOutput';
@@ -65,7 +65,7 @@ export const ScreenReaderOutputDisabledTooltip =
           if (
             tooltipContent &&
             ariaLabel &&
-            isAttrsEqual(tooltipContent,ariaLabel)
+            areAttrsEqual(tooltipContent, ariaLabel)
           ) {
             const buttonElementName = (
               buttonElement.openingElement.name as TSESTree.JSXIdentifier
diff --git a/packages/eslint-plugin/src/utils/are_attrs_equal.ts b/packages/eslint-plugin/src/utils/are_attrs_equal.ts
@@ -19,14 +19,7 @@
 
 const normalizeAttrString = (str?: string) => str?.trim().replace(/\s+/g, ' ');
 
-export const isAttrsEqual = (...strings: Array<string | undefined>): boolean => {
-  if (strings.length < 2) return true;
-
-  const normalizedStrings = strings.map(normalizeAttrString);
-  const firstValue = normalizedStrings[0];
-
-  return normalizedStrings.every((value) => {
-    if (value === undefined && firstValue === undefined) return true;
-    return value === firstValue;
-  });
+export const areAttrsEqual = (...strings: Array<string | undefined>): boolean => {
+  const [first, ...rest] = strings.map(normalizeAttrString);
+  return rest.every((s) => s === first);
 };
