babylonjs-accessibility 6.15.0 → 6.16.1

package/babylon.accessibility.max.js

@@ -31239,7 +31239,6 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-
 class HTMLTwinHostComponent extends react__WEBPACK_IMPORTED_MODULE_1__.Component {
     constructor(props) {
         super(props);
@@ -31445,6 +31444,17 @@ class HTMLTwinHostComponent extends react__WEBPACK_IMPORTED_MODULE_1__.Component
         }
         return result;
     }
+    _hasChildrenWithA11yTag(node) {
+        let result = false;
+        const descendants = node.getDescendants();
+        for (const child of descendants) {
+            if (child.accessibilityTag?.description) {
+                result = true;
+                break;
+            }
+        }
+        return result;
+    }
     _getHTMLTwinItemsFromGUI(rootItems) {
         if (!rootItems || rootItems.length === 0) {
             return [];
@@ -31453,14 +31463,17 @@ class HTMLTwinHostComponent extends react__WEBPACK_IMPORTED_MODULE_1__.Component
         const queue = [...rootItems];
         for (let i = 0; i < queue.length; i++) {
             const curNode = queue[i];
-            if (!curNode.isVisible || (!this._options.addAllControls && curNode.name !== "root" && !curNode.accessibilityTag?.description)) {
+            const numOfDirectChildren = curNode.getDescendants(true).length;
+            if (!curNode.isVisible || (!this._options.addAllControls && !curNode.accessibilityTag?.description && numOfDirectChildren === 0)) {
                 continue;
             }
-            if (curNode instanceof gui_2D_advancedDynamicTexture__WEBPACK_IMPORTED_MODULE_6__.Container && curNode.children.length !== 0 && !(curNode instanceof gui_2D_advancedDynamicTexture__WEBPACK_IMPORTED_MODULE_6__.Button)) {
+            if (curNode.getClassName() !== "Button" && // curNode = Non Button -> Container or not
+                numOfDirectChildren > 0 && // curNode = Non Button Container
+                (this._options.addAllControls || this._hasChildrenWithA11yTag(curNode))) {
                 const curContainer = curNode;
                 result.push(new _htmlTwinGUIItem__WEBPACK_IMPORTED_MODULE_3__.HTMLTwinGUIItem(curContainer, this.props.scene, this._getHTMLTwinItemsFromGUI(curContainer.children)));
             }
-            else {
+            else if (this._options.addAllControls || curNode.accessibilityTag?.description) {
                 result.push(new _htmlTwinGUIItem__WEBPACK_IMPORTED_MODULE_3__.HTMLTwinGUIItem(curNode, this.props.scene, []));
             }
         }