Merge branch 'master' into zach-starter

1 files changed, 5 insertions, 4 deletions

diff --git a/src/client/util/CurrentUserUtils.ts b/src/client/util/CurrentUserUtils.ts
index 21b74e30c..dbf08c66c 100644
--- a/src/client/util/CurrentUserUtils.ts
+++ b/src/client/util/CurrentUserUtils.ts
@@ -823,7 +823,7 @@ pie title Minerals in my tap water
     }
 
     /// initializes a context menu button for the top bar context menu
-    static setupContextMenuButton(params:Button, btnDoc?:Doc) {
+    static setupContextMenuButton(params:Button, btnDoc?:Doc, btnContainer?:Doc) {
         const reqdOpts:DocumentOptions = {
             ...OmitKeys(params, ["scripts", "funcs", "subMenu"]).omit,
             color: Colors.WHITE, isSystem: true,
@@ -831,6 +831,7 @@ pie title Minerals in my tap water
             _height: 30, _nativeHeight: 30, linearBtnWidth: params.linearBtnWidth,
             toolType: params.toolType, expertMode: params.expertMode,
             _dragOnlyWithinContainer: true, _lockedPosition: true,
+            _embedContainer: btnContainer
         };
         const reqdFuncs:{[key:string]:any} = {
             ...params.funcs,
@@ -840,15 +841,15 @@ pie title Minerals in my tap water
 
     
     static setupContextMenuBtn(params:Button, menuDoc:Doc):Doc {
-        const menuBtnDoc = DocListCast(menuDoc?.data).find(doc => doc.title === params.title);
+        const menuBtnDoc = DocListCast(menuDoc?.data).find( doc => doc.title === params.title);
         const subMenu = params.subMenu;
         if (!subMenu) { // button does not have a sub menu
-            return this.setupContextMenuButton(params, menuBtnDoc);
+            return this.setupContextMenuButton(params, menuBtnDoc, menuDoc);
         }  
         // linear view
         const reqdSubMenuOpts = { ...OmitKeys(params, ["scripts", "funcs", "subMenu"]).omit, undoIgnoreFields: new List<string>(['width', "linearView_IsOpen"]),
             childDontRegisterViews: true, flexGap: 0, _height: 30, ignoreClick: params.scripts?.onClick ? false : true,
-            linearView_SubMenu: true, linearView_Expandable: true};
+            linearView_SubMenu: true, linearView_Expandable: true, embedContainer: menuDoc};
         
         const items = (menuBtnDoc?:Doc) => !menuBtnDoc ? [] : subMenu.map(sub => this.setupContextMenuBtn(sub, menuBtnDoc) );
         const creator = params.btnType === ButtonType.MultiToggleButton ? this.multiToggleList : this.linearButtonList;