ff-dom 1.0.18-beta.5 → 1.0.18-beta.6

package/dist/index.browser.js

@@ -1080,7 +1080,7 @@ const getUniqueParentXpath = (domNode, docmt, node, isTarget, nodeXpath, isIndex
             currentNode = currentNode.parentElement;
         }
         // Final constructed XPath
-        const finalXPath = xpathParts.join("");
+        const finalXPath = xpathParts.join("") + nodeXpath;
         let count = getCountOfXPath(finalXPath, domNode, docmt);
         if (count === 1) {
             parentXpathCache.set(domNode, finalXPath); // Cache final result
@@ -2275,7 +2275,7 @@ const getElementsFromHTML = (record, docmt) => {
             tag.remove();
         });
     }
-    tempDiv.innerHTML = document.body.innerHTML;
+    tempDiv.innerHTML = document.body?.innerHTML;
     const finalLocatorsSet = new Set();
     let finalLocators = [];
     function createLocator(base, overrides = {}) {
@@ -2378,7 +2378,7 @@ const getElementsFromHTML = (record, docmt) => {
                                 else if ((locator.name.includes("xpath") ||
                                     trimmedSelector.startsWith("//")) &&
                                     !locator.type.match("dynamic")) {
-                                    if (tempDiv.innerHTML) {
+                                    if (tempDiv?.innerHTML) {
                                         const normalizedXPath = normalizeXPath(trimmedSelector);
                                         targetElement = getElementFromXPath(tempDiv, normalizedXPath);
                                         if (targetElement) {
@@ -2475,17 +2475,16 @@ const getElementsFromHTML = (record, docmt) => {
                                 });
                             });
                         }
-                        const fnValue = parseDOM(targetElement, document, false, true);
-                        record.locators.forEach((loc) => {
-                            createLocator(loc, {
-                                name: 'xpath',
-                                value: fnValue,
-                                isRecorded: fnValue?.find((x) => x.value === loc.value)
-                                    ? loc.isRecorded
-                                    : "Y",
-                                isSelfHealed: fnValue?.find((x) => x.value === loc.value)
-                                    ? loc.isSelfHealed
-                                    : "Y",
+                        const xpathResults = parseDOM(targetElement, document, false, true);
+                        xpathResults.forEach((result) => {
+                            const fnValue = result.value;
+                            record.locators.forEach((loc) => {
+                                createLocator(loc, {
+                                    name: 'xpath',
+                                    value: fnValue,
+                                    isRecorded: loc.value === fnValue ? loc.isRecorded : 'Y',
+                                    isSelfHealed: loc.value === fnValue ? loc.isSelfHealed : 'Y',
+                                });
                             });
                         });
                         for (const locator of record.locators) {