Merge pull request #2173 from IBMa/revert-2171-dev-2122-new

Revert "sync dev-2122-new-v4 with dev-2122-new"

Author: shunguoy

accessibility-checker-engine/src/v4/rules/aria_search_label_unique.ts

@@ -11,7 +11,7 @@
   limitations under the License.
 *****************************************************************************/
 
-import { Rule, RuleResult, RuleFail, RuleContext, RulePass, RuleContextHierarchy } from "../api/IRule";
+import { Rule, RuleResult, RuleFail, RuleContext, RulePotential, RuleManual, RulePass, RuleContextHierarchy } from "../api/IRule";
 import { eRulePolicy, eToolkitLevel } from "../api/IRule";
 import { AriaUtil } from "../util/AriaUtil";
 import { CommonUtil } from "../util/CommonUtil";
@@ -39,16 +39,8 @@ export const aria_search_label_unique: Rule = {
             "group": "Each element with \"search\" role must have a unique label that describes its purpose"
         }
     },
-    /**
-     * deprecated the rule on 01/27/2025
-     * rulesets: [{
-        "id": ["IBM_Accessibility", "IBM_Accessibility_next", "WCAG_2_1", "WCAG_2_0", "WCAG_2_2"],
-        "num": ["2.4.1"],
-        "level": eRulePolicy.VIOLATION,
-        "toolkitLevel": eToolkitLevel.LEVEL_THREE
-    }],*/
     rulesets: [{
-        "id": [],
+        "id": ["IBM_Accessibility", "IBM_Accessibility_next", "WCAG_2_1", "WCAG_2_0", "WCAG_2_2"],
         "num": ["2.4.1"],
         "level": eRulePolicy.VIOLATION,
         "toolkitLevel": eToolkitLevel.LEVEL_THREE

accessibility-checker-engine/src/v4/rules/label_name_visible.ts

@@ -19,6 +19,7 @@ import { FragmentUtil } from "../../v2/checker/accessibility/util/fragment";
 import { VisUtil } from "../util/VisUtil";
 import { CSSUtil } from "../util/CSSUtil";
 import { DOMWalker } from "../../v2/dom/DOMWalker";
+import { AccNameUtil } from "../util/AccNameUtil";
 
 export const label_name_visible: Rule = {
     id: "label_name_visible",

accessibility-checker-engine/src/v4/util/CommonUtil.ts

@@ -1207,15 +1207,15 @@ export class CommonUtil {
             if (nw.bEndTag) continue;
             if ((nw.node.nodeType === 1 && (VisUtil.hiddenByDefaultElements.includes(nw.node.nodeName.toLowerCase())) || !VisUtil.isNodeVisible(nw.node) || VisUtil.isElementOffscreen(nw.node as HTMLElement))) {
                 if (nw.node.nextSibling) {
-                    if (nw.node.nextSibling.nodeType === 3 && nw.node.nextSibling.nodeValue && nw.node.nextSibling.nodeValue.trim() !== '')
-                        text += ' ' + nw.node.nextSibling.nodeValue.trim();
+                    if (nw.node.nextSibling.nodeType === 3 && nw.node.nextSibling.nodeValue !== null)
+                        text += nw.node.nextSibling.nodeValue;
                     nw.node = nw.node.nextSibling;
                     continue;
                 } else
                     break;
             }
-            if (nw.node.nodeType === 3 && nw.node.nodeValue && nw.node.nodeValue.trim() !== '') {
-                text += ' ' + nw.node.nodeValue.trim(); 
+            if (nw.node.nodeType === 3 && nw.node.nodeValue !== null) {
+                text += nw.node.nodeValue.trim(); 
             }    
         }
         return text.trim();