From 8dc73422554d10378d9e844ac0eed37e7a5a3a19 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Mon, 2 May 2022 12:13:00 -0400 Subject: [PATCH] Make not animated if toolbar to increase determinism Signed-off-by: Sebastian Malton --- .../kube-object-menu.test.tsx.snap | 15 ++---- src/renderer/components/menu/menu-actions.tsx | 1 + src/renderer/components/menu/menu.tsx | 46 ++++++++++++------- 3 files changed, 36 insertions(+), 26 deletions(-) diff --git a/src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap b/src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap index ccc13293ba..2d33cccf7a 100644 --- a/src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap +++ b/src/renderer/components/kube-object-menu/__snapshots__/kube-object-menu.test.tsx.snap @@ -5,8 +5,7 @@ exports[`kube-object-menu given kube object renders 1`] = `
  • Some menu item @@ -45,8 +44,7 @@ exports[`kube-object-menu given kube object when removing kube object renders 1`
    • Some menu item @@ -139,8 +137,7 @@ exports[`kube-object-menu given kube object with namespace when removing kube ob
      • Some menu item @@ -233,8 +230,7 @@ exports[`kube-object-menu given kube object without namespace when removing kube
        • Some menu item @@ -326,8 +322,7 @@ exports[`kube-object-menu given no kube object, renders 1`] = `
          diff --git a/src/renderer/components/menu/menu-actions.tsx b/src/renderer/components/menu/menu-actions.tsx index dc839af0e2..7faa4f5ab8 100644 --- a/src/renderer/components/menu/menu-actions.tsx +++ b/src/renderer/components/menu/menu-actions.tsx @@ -137,6 +137,7 @@ class NonInjectedMenuActions extends React.Component = { closeOnClickOutside: true, closeOnScroll: false, toggleEvent: "click", + animated: true, }; export class Menu extends React.Component { @@ -297,7 +299,7 @@ export class Menu extends React.Component { } render() { - const { position, id } = this.props; + const { position, id, animated } = this.props; let { className, usePortal } = this.props; className = cssNames("Menu", className, this.state.position || position, { @@ -319,28 +321,40 @@ export class Menu extends React.Component { return item; }); - const menu = ( - + let menu = ( +
            + {menuItems} +
          + ); + + if (animated) { + menu = ( -
            - {menuItems} -
          + {menu}           + ); + } + + menu = ( + + {menu} ); if (usePortal === true) usePortal = document.body; - return usePortal instanceof HTMLElement ? createPortal(menu, usePortal) : menu; + return usePortal instanceof HTMLElement + ? createPortal(menu, usePortal) + : menu; } }