fix: correct parent in touchbar group and popover

electron · Feb 24, 2021 · 86a37f7 · 86a37f7
1 parent 257cca0
commit 86a37f7
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/lib/browser/api/touch-bar.ts b/lib/browser/api/touch-bar.ts
@@ -135,7 +135,7 @@ class TouchBarGroup extends TouchBarItem<Electron.TouchBarGroupConstructorOption
       }
     }
     for (const item of newChild.orderedItems) {
-      item._addParent(item);
+      item._addParent(self);
     }
   })
   child!: TouchBar;
@@ -173,14 +173,16 @@ class TouchBarPopover extends TouchBarItem<Electron.TouchBarPopoverConstructorOp
   showCloseButton!: boolean;
 
   @LiveProperty<TouchBarPopover>(config => config.items instanceof TouchBar ? config.items : new TouchBar(config.items), (self, newChild: TouchBar) => {
-    if (self.child) {
-      for (const item of self.child.orderedItems) {
-        item._removeParent(self);
+    setTimeout(() => {
+      if (self.child) {
+        for (const item of self.child.orderedItems) {
+          item._removeParent(self);
+        }
       }
-    }
-    for (const item of newChild.orderedItems) {
-      item._addParent(item);
-    }
+      for (const item of newChild.orderedItems) {
+        item._addParent(self);
+      }
+    }, 2000);
   })
   child!: TouchBar;