@atlaskit/react-ufo 4.5.1 → 4.5.3

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/ufo-interaction-ignore
 
+## 4.5.3
+
+### Patch Changes
+
+- [`5c1bb03531687`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/5c1bb03531687) -
+  FG cleanup - platform_ufo_handle_non_react_element_for_3p
+
+## 4.5.2
+
+### Patch Changes
+
+- [`4dc561b657a31`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4dc561b657a31) -
+  FG cleanup - platform_ufo_report_non_htmlelement_selectors
+- [`0251aa356dcf9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0251aa356dcf9) -
+  fix logic on checkIfExistedAndSizeMatchingV3 function
+
 ## 4.5.1
 
 ### Patch Changes

package/dist/cjs/vc/vc-observer/observers/ssr-placeholders/index.js

@@ -239,7 +239,11 @@ var SSRPlaceholderHandlers = exports.SSRPlaceholderHandlers = /*#__PURE__*/funct
     value: function checkIfExistedAndSizeMatchingV3(el) {
       el = this.findNearestPlaceholderContainerIfIgnored(el);
       var id = this.getPlaceholderId(el);
-      return this.staticPlaceholders.has(id);
+      var placeholderRects = this.staticPlaceholders.get(id);
+      if (!placeholderRects) {
+        return false;
+      }
+      return this.hasSameSizePosition(placeholderRects, el.getBoundingClientRect());
     }
   }, {
     key: "getSize",

package/dist/cjs/vc/vc-observer-new/get-element-name.js

@@ -4,37 +4,32 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var nameCache = new WeakMap();
 function getElementName(selectorConfig, element) {
   if (!(element instanceof HTMLElement)) {
-    if ((0, _platformFeatureFlags.fg)('platform_ufo_report_non_htmlelement_selectors')) {
-      var elementInstance = 'Unknown';
+    var elementInstance = 'Unknown';
 
-      // Types of elements according to LLM
-      if (element instanceof Document) {
-        elementInstance = 'Document';
-      } else if (element instanceof DocumentFragment) {
-        elementInstance = 'DocumentFragment';
-      } else if (element instanceof Text) {
-        elementInstance = 'Text';
-      } else if (element instanceof Comment) {
-        elementInstance = 'Comment';
-      } else if (element instanceof ProcessingInstruction) {
-        elementInstance = 'ProcessingInstruction';
-      } else if (element instanceof Attr) {
-        elementInstance = 'Attr';
-      } else if (element instanceof CDATASection) {
-        elementInstance = 'CDATASection';
-      }
-      if (element.parentElement && element.parentElement instanceof HTMLElement) {
-        var parentElementSelector = getElementName(selectorConfig, element.parentElement);
-        return "".concat(parentElementSelector, " > ").concat(elementInstance);
-      } else {
-        return elementInstance;
-      }
+    // Types of elements according to LLM
+    if (element instanceof Text) {
+      elementInstance = 'Text';
+    } else if (element instanceof DocumentFragment) {
+      elementInstance = 'DocumentFragment';
+    } else if (element instanceof Document) {
+      elementInstance = 'Document';
+    } else if (element instanceof Comment) {
+      elementInstance = 'Comment';
+    } else if (element instanceof ProcessingInstruction) {
+      elementInstance = 'ProcessingInstruction';
+    } else if (element instanceof Attr) {
+      elementInstance = 'Attr';
+    } else if (element instanceof CDATASection) {
+      elementInstance = 'CDATASection';
+    }
+    if (element.parentElement && element.parentElement instanceof HTMLElement) {
+      var parentElementSelector = getElementName(selectorConfig, element.parentElement);
+      return "".concat(parentElementSelector, " > ").concat(elementInstance);
     } else {
-      return 'error';
+      return elementInstance;
     }
   }
   var cachedName = nameCache.get(element);

package/dist/cjs/vc/vc-observer-new/viewport-observer/utils/check-within-component.js

@@ -6,11 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.cleanupCaches = cleanupCaches;
 exports.default = checkWithinComponent;
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _coinflip = _interopRequireDefault(require("../../../../coinflip"));
 var _checkFiberWithinComponent = _interopRequireDefault(require("./check-fiber-within-component"));
 var _findFiberWithCache = _interopRequireDefault(require("./find-fiber-with-cache"));
-var _findReactFiber = _interopRequireDefault(require("./find-react-fiber"));
 var DEFAULT_MAX_LEVEL = 20;
 
 // Cache cleanup
@@ -37,27 +35,21 @@ function checkWithinComponent(node, targetComponentName, resultCache) {
   }
   var fiber = null;
   var checkedNodes = [];
-  if ((0, _platformFeatureFlags.fg)('platform_ufo_handle_non_react_element_for_3p')) {
-    fiber = (0, _findFiberWithCache.default)(node, DEFAULT_MAX_LEVEL, checkedNodes);
-  } else {
-    fiber = (0, _findReactFiber.default)(node);
-  }
+
+  // Always use cached fiber strategy to handle non-React elements reliably
+  fiber = (0, _findFiberWithCache.default)(node, DEFAULT_MAX_LEVEL, checkedNodes);
   if (!fiber) {
-    if ((0, _platformFeatureFlags.fg)('platform_ufo_handle_non_react_element_for_3p')) {
-      checkedNodes.forEach(function (checkedNode) {
-        resultCache.set(checkedNode, false);
-      });
-    }
+    checkedNodes.forEach(function (checkedNode) {
+      resultCache.set(checkedNode, false);
+    });
     return {
       isWithin: false
     };
   }
   var isWithin = (0, _checkFiberWithinComponent.default)(fiber, targetComponentName, DEFAULT_MAX_LEVEL);
-  if ((0, _platformFeatureFlags.fg)('platform_ufo_handle_non_react_element_for_3p')) {
-    checkedNodes.forEach(function (checkedNode) {
-      resultCache.set(checkedNode, isWithin);
-    });
-  }
+  checkedNodes.forEach(function (checkedNode) {
+    resultCache.set(checkedNode, isWithin);
+  });
   return {
     isWithin: isWithin
   };

package/dist/es2019/vc/vc-observer/observers/ssr-placeholders/index.js

@@ -205,7 +205,11 @@ export class SSRPlaceholderHandlers {
   checkIfExistedAndSizeMatchingV3(el) {
     el = this.findNearestPlaceholderContainerIfIgnored(el);
     const id = this.getPlaceholderId(el);
-    return this.staticPlaceholders.has(id);
+    const placeholderRects = this.staticPlaceholders.get(id);
+    if (!placeholderRects) {
+      return false;
+    }
+    return this.hasSameSizePosition(placeholderRects, el.getBoundingClientRect());
   }
   getSize(el) {
     return new Promise(resolve => {

package/dist/es2019/vc/vc-observer-new/get-element-name.js

@@ -1,34 +1,29 @@
-import { fg } from '@atlaskit/platform-feature-flags';
 const nameCache = new WeakMap();
 function getElementName(selectorConfig, element) {
   if (!(element instanceof HTMLElement)) {
-    if (fg('platform_ufo_report_non_htmlelement_selectors')) {
-      let elementInstance = 'Unknown';
+    let elementInstance = 'Unknown';
 
-      // Types of elements according to LLM
-      if (element instanceof Document) {
-        elementInstance = 'Document';
-      } else if (element instanceof DocumentFragment) {
-        elementInstance = 'DocumentFragment';
-      } else if (element instanceof Text) {
-        elementInstance = 'Text';
-      } else if (element instanceof Comment) {
-        elementInstance = 'Comment';
-      } else if (element instanceof ProcessingInstruction) {
-        elementInstance = 'ProcessingInstruction';
-      } else if (element instanceof Attr) {
-        elementInstance = 'Attr';
-      } else if (element instanceof CDATASection) {
-        elementInstance = 'CDATASection';
-      }
-      if (element.parentElement && element.parentElement instanceof HTMLElement) {
-        const parentElementSelector = getElementName(selectorConfig, element.parentElement);
-        return `${parentElementSelector} > ${elementInstance}`;
-      } else {
-        return elementInstance;
-      }
+    // Types of elements according to LLM
+    if (element instanceof Text) {
+      elementInstance = 'Text';
+    } else if (element instanceof DocumentFragment) {
+      elementInstance = 'DocumentFragment';
+    } else if (element instanceof Document) {
+      elementInstance = 'Document';
+    } else if (element instanceof Comment) {
+      elementInstance = 'Comment';
+    } else if (element instanceof ProcessingInstruction) {
+      elementInstance = 'ProcessingInstruction';
+    } else if (element instanceof Attr) {
+      elementInstance = 'Attr';
+    } else if (element instanceof CDATASection) {
+      elementInstance = 'CDATASection';
+    }
+    if (element.parentElement && element.parentElement instanceof HTMLElement) {
+      const parentElementSelector = getElementName(selectorConfig, element.parentElement);
+      return `${parentElementSelector} > ${elementInstance}`;
     } else {
-      return 'error';
+      return elementInstance;
     }
   }
   const cachedName = nameCache.get(element);

package/dist/es2019/vc/vc-observer-new/viewport-observer/utils/check-within-component.js

@@ -1,8 +1,6 @@
-import { fg } from '@atlaskit/platform-feature-flags';
 import coinflip from '../../../../coinflip';
 import checkFiberWithinComponent from './check-fiber-within-component';
 import findFiberWithCache from './find-fiber-with-cache';
-import findReactFiber from './find-react-fiber';
 const DEFAULT_MAX_LEVEL = 20;
 
 // Cache cleanup
@@ -29,27 +27,21 @@ export default function checkWithinComponent(node, targetComponentName, resultCa
   }
   let fiber = null;
   let checkedNodes = [];
-  if (fg('platform_ufo_handle_non_react_element_for_3p')) {
-    fiber = findFiberWithCache(node, DEFAULT_MAX_LEVEL, checkedNodes);
-  } else {
-    fiber = findReactFiber(node);
-  }
+
+  // Always use cached fiber strategy to handle non-React elements reliably
+  fiber = findFiberWithCache(node, DEFAULT_MAX_LEVEL, checkedNodes);
   if (!fiber) {
-    if (fg('platform_ufo_handle_non_react_element_for_3p')) {
-      checkedNodes.forEach(checkedNode => {
-        resultCache.set(checkedNode, false);
-      });
-    }
+    checkedNodes.forEach(checkedNode => {
+      resultCache.set(checkedNode, false);
+    });
     return {
       isWithin: false
     };
   }
   const isWithin = checkFiberWithinComponent(fiber, targetComponentName, DEFAULT_MAX_LEVEL);
-  if (fg('platform_ufo_handle_non_react_element_for_3p')) {
-    checkedNodes.forEach(checkedNode => {
-      resultCache.set(checkedNode, isWithin);
-    });
-  }
+  checkedNodes.forEach(checkedNode => {
+    resultCache.set(checkedNode, isWithin);
+  });
   return {
     isWithin
   };

package/dist/esm/vc/vc-observer/observers/ssr-placeholders/index.js

@@ -232,7 +232,11 @@ export var SSRPlaceholderHandlers = /*#__PURE__*/function () {
     value: function checkIfExistedAndSizeMatchingV3(el) {
       el = this.findNearestPlaceholderContainerIfIgnored(el);
       var id = this.getPlaceholderId(el);
-      return this.staticPlaceholders.has(id);
+      var placeholderRects = this.staticPlaceholders.get(id);
+      if (!placeholderRects) {
+        return false;
+      }
+      return this.hasSameSizePosition(placeholderRects, el.getBoundingClientRect());
     }
   }, {
     key: "getSize",

package/dist/esm/vc/vc-observer-new/get-element-name.js

@@ -1,34 +1,29 @@
-import { fg } from '@atlaskit/platform-feature-flags';
 var nameCache = new WeakMap();
 function getElementName(selectorConfig, element) {
   if (!(element instanceof HTMLElement)) {
-    if (fg('platform_ufo_report_non_htmlelement_selectors')) {
-      var elementInstance = 'Unknown';
+    var elementInstance = 'Unknown';
 
-      // Types of elements according to LLM
-      if (element instanceof Document) {
-        elementInstance = 'Document';
-      } else if (element instanceof DocumentFragment) {
-        elementInstance = 'DocumentFragment';
-      } else if (element instanceof Text) {
-        elementInstance = 'Text';
-      } else if (element instanceof Comment) {
-        elementInstance = 'Comment';
-      } else if (element instanceof ProcessingInstruction) {
-        elementInstance = 'ProcessingInstruction';
-      } else if (element instanceof Attr) {
-        elementInstance = 'Attr';
-      } else if (element instanceof CDATASection) {
-        elementInstance = 'CDATASection';
-      }
-      if (element.parentElement && element.parentElement instanceof HTMLElement) {
-        var parentElementSelector = getElementName(selectorConfig, element.parentElement);
-        return "".concat(parentElementSelector, " > ").concat(elementInstance);
-      } else {
-        return elementInstance;
-      }
+    // Types of elements according to LLM
+    if (element instanceof Text) {
+      elementInstance = 'Text';
+    } else if (element instanceof DocumentFragment) {
+      elementInstance = 'DocumentFragment';
+    } else if (element instanceof Document) {
+      elementInstance = 'Document';
+    } else if (element instanceof Comment) {
+      elementInstance = 'Comment';
+    } else if (element instanceof ProcessingInstruction) {
+      elementInstance = 'ProcessingInstruction';
+    } else if (element instanceof Attr) {
+      elementInstance = 'Attr';
+    } else if (element instanceof CDATASection) {
+      elementInstance = 'CDATASection';
+    }
+    if (element.parentElement && element.parentElement instanceof HTMLElement) {
+      var parentElementSelector = getElementName(selectorConfig, element.parentElement);
+      return "".concat(parentElementSelector, " > ").concat(elementInstance);
     } else {
-      return 'error';
+      return elementInstance;
     }
   }
   var cachedName = nameCache.get(element);

package/dist/esm/vc/vc-observer-new/viewport-observer/utils/check-within-component.js

@@ -1,8 +1,6 @@
-import { fg } from '@atlaskit/platform-feature-flags';
 import coinflip from '../../../../coinflip';
 import checkFiberWithinComponent from './check-fiber-within-component';
 import findFiberWithCache from './find-fiber-with-cache';
-import findReactFiber from './find-react-fiber';
 var DEFAULT_MAX_LEVEL = 20;
 
 // Cache cleanup
@@ -29,27 +27,21 @@ export default function checkWithinComponent(node, targetComponentName, resultCa
   }
   var fiber = null;
   var checkedNodes = [];
-  if (fg('platform_ufo_handle_non_react_element_for_3p')) {
-    fiber = findFiberWithCache(node, DEFAULT_MAX_LEVEL, checkedNodes);
-  } else {
-    fiber = findReactFiber(node);
-  }
+
+  // Always use cached fiber strategy to handle non-React elements reliably
+  fiber = findFiberWithCache(node, DEFAULT_MAX_LEVEL, checkedNodes);
   if (!fiber) {
-    if (fg('platform_ufo_handle_non_react_element_for_3p')) {
-      checkedNodes.forEach(function (checkedNode) {
-        resultCache.set(checkedNode, false);
-      });
-    }
+    checkedNodes.forEach(function (checkedNode) {
+      resultCache.set(checkedNode, false);
+    });
     return {
       isWithin: false
     };
   }
   var isWithin = checkFiberWithinComponent(fiber, targetComponentName, DEFAULT_MAX_LEVEL);
-  if (fg('platform_ufo_handle_non_react_element_for_3p')) {
-    checkedNodes.forEach(function (checkedNode) {
-      resultCache.set(checkedNode, isWithin);
-    });
-  }
+  checkedNodes.forEach(function (checkedNode) {
+    resultCache.set(checkedNode, isWithin);
+  });
   return {
     isWithin: isWithin
   };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/react-ufo",
-	"version": "4.5.1",
+	"version": "4.5.3",
 	"description": "Parts of React UFO that are publicly available",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -175,15 +175,9 @@
 		"platform_ufo_enable_vc_press_interactions": {
 			"type": "boolean"
 		},
-		"platform_ufo_handle_non_react_element_for_3p": {
-			"type": "boolean"
-		},
 		"platform_ufo_segment_critical_metrics": {
 			"type": "boolean"
 		},
-		"platform_ufo_report_non_htmlelement_selectors": {
-			"type": "boolean"
-		},
 		"platform_ufo_add_segments_count_threshold": {
 			"type": "boolean"
 		},