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

package/dist/index.cdn.js

@@ -1083,7 +1083,7 @@
                 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
@@ -2278,7 +2278,7 @@
                 tag.remove();
             });
         }
-        tempDiv.innerHTML = document.body.innerHTML;
+        tempDiv.innerHTML = document.body?.innerHTML;
         const finalLocatorsSet = new Set();
         let finalLocators = [];
         function createLocator(base, overrides = {}) {
@@ -2381,7 +2381,7 @@
                                     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) {
@@ -2478,17 +2478,16 @@
                                     });
                                 });
                             }
-                            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) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ff-dom",
-    "version": "1.0.18-beta.5",
+    "version": "1.0.18-beta.6",
     "description": "",
     "type": "module",
     "files": [

package/src/utils/getElementsFromHTML.ts

@@ -148,7 +148,7 @@ const getElementsFromHTML = (
     });
   }
 
-  tempDiv.innerHTML = document.body.innerHTML;
+  tempDiv.innerHTML = document.body?.innerHTML;
   const finalLocatorsSet: Set<string> = new Set();
   let finalLocators: any[] = [];
 
@@ -289,7 +289,7 @@ const getElementsFromHTML = (
                     trimmedSelector.startsWith("//")) &&
                   !locator.type.match("dynamic")
                 ) {
-                  if (tempDiv.innerHTML) {
+                  if (tempDiv?.innerHTML) {
                     const normalizedXPath = normalizeXPath(trimmedSelector);
                     targetElement = getElementFromXPath(
                       tempDiv,