Merge branch 'master' into aarav_edit

1 files changed, 6 insertions, 16 deletions

diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx
index e70f9e5ed..be6e2fecb 100644
--- a/src/client/views/MainView.tsx
+++ b/src/client/views/MainView.tsx
@@ -529,6 +529,7 @@ export class MainView extends ObservableReactComponent<object> {
                 fa.faColumns,
                 fa.faChevronCircleUp,
                 fa.faUpload,
+                fa.faBorderStyle,
                 fa.faBorderAll,
                 fa.faBraille,
                 fa.faPersonChalkboard,
@@ -847,7 +848,7 @@ export class MainView extends ObservableReactComponent<object> {
     }
 
     @action
-    selectMenu = (button: Doc) => {
+    selectLeftSidebarButton = (button: Doc) => {
         const title = StrCast(button.$title);
         const willOpen = !this._leftMenuFlyoutWidth || this._panelContent !== title;
         this.closeFlyout();
@@ -859,7 +860,9 @@ export class MainView extends ObservableReactComponent<object> {
                 case 'Help':
                     break;
                 default:
-                    this.expandFlyout(button);
+                    this._leftMenuFlyoutWidth = this._leftMenuFlyoutWidth || 250;
+                    this._sidebarContent.proto = DocCast(button.target);
+                    SnappingManager.SetLastPressedBtn(button[Id]);
             }
         }
         return true;
@@ -935,19 +938,6 @@ export class MainView extends ObservableReactComponent<object> {
             </div>
         );
     }
-
-    expandFlyout = action((button: Doc) => {
-        // bcz: What's going on here!? --- may be fixed now, so commenting out ...
-        // Chrome(not firefox) seems to have a bug when the flyout expands and there's a zoomed freeform tab.  All of the div below the CollectionFreeFormView's main div
-        // generate the wrong value from getClientRectangle() -- specifically they return an 'x' that is the flyout's width greater than it should be.
-        // interactively adjusting the flyout fixes the problem.  So does programmatically changing the value after a timeout to something *fractionally* different (ie, 1.5, not 1);)
-        this._leftMenuFlyoutWidth = this._leftMenuFlyoutWidth || 250;
-        // setTimeout(action(() => (this._leftMenuFlyoutWidth += 0.5)));
-
-        this._sidebarContent.proto = DocCast(button.target);
-        SnappingManager.SetLastPressedBtn(button[Id]);
-    });
-
     closeFlyout = action(() => {
         SnappingManager.SetLastPressedBtn('');
         this._panelContent = 'none';
@@ -1161,7 +1151,7 @@ export class MainView extends ObservableReactComponent<object> {
 
 // eslint-disable-next-line prefer-arrow-callback
 ScriptingGlobals.add(function selectMainMenu(doc: Doc) {
-    MainView.Instance.selectMenu(doc);
+    MainView.Instance.selectLeftSidebarButton(doc);
 });
 // eslint-disable-next-line prefer-arrow-callback
 ScriptingGlobals.add(function hideUI() {