diff --git a/src/renderer/components/animate/animate.tsx b/src/renderer/components/animate/animate.tsx index f8bbd9b137..df160883fb 100644 --- a/src/renderer/components/animate/animate.tsx +++ b/src/renderer/components/animate/animate.tsx @@ -83,19 +83,23 @@ export class Animate extends React.Component { } render() { + if (!this.isVisible) { + return null; + } + const { name, enterDuration, leaveDuration } = this.props; const contentElem = this.contentElem; - const durations = { + const cssVarsForAnimation = { "--enter-duration": `${enterDuration}ms`, "--leave-duration": `${leaveDuration}ms`, } as React.CSSProperties; return React.cloneElement(contentElem, { className: cssNames("Animate", name, contentElem.props.className, this.statusClassName), - children: this.isVisible ? contentElem.props.children : null, + children: contentElem.props.children, style: { ...contentElem.props.style, - ...durations, + ...cssVarsForAnimation, }, }); } 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 0d1d591668..b0200f73d5 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 @@ -37,10 +37,6 @@ exports[`kube-object-menu given kube object renders 1`] = ` -
`; diff --git a/src/renderer/components/kube-object-status-icon/__snapshots__/kube-object-status-icon.test.tsx.snap b/src/renderer/components/kube-object-status-icon/__snapshots__/kube-object-status-icon.test.tsx.snap index 86f5688d82..599a0c6489 100644 --- a/src/renderer/components/kube-object-status-icon/__snapshots__/kube-object-status-icon.test.tsx.snap +++ b/src/renderer/components/kube-object-status-icon/__snapshots__/kube-object-status-icon.test.tsx.snap @@ -16,58 +16,6 @@ exports[`kube-object-status-icon given info and warning statuses are present, wh
-
-
-
- - Warning - -
- - - Some warning status for some-name - - - · - 2d - -
-
-
- - Info - -
- - - Some info status for some-name - - - · - 2d - -
-
-
-
`; @@ -87,36 +35,6 @@ exports[`kube-object-status-icon given level "critical" status, when rendered, r
-
-
-
- - Critical - -
- - - Some critical status for some-name - - - · - 2d - -
-
-
-
`; @@ -136,36 +54,6 @@ exports[`kube-object-status-icon given level "info" status, when rendered, rende
-
-
-
- - Info - -
- - - Some info status for some-name - - - · - 2d - -
-
-
-
`; @@ -185,36 +73,6 @@ exports[`kube-object-status-icon given level "warning" status, when rendered, re
-
-
-
- - Warning - -
- - - Some warning status for some-name - - - · - 2d - -
-
-
-
`; @@ -254,79 +112,5 @@ exports[`kube-object-status-icon given status for all levels is present, when re
-
-
-
- - Critical - -
- - - Some critical status for some-name - - - · - 2d - -
-
-
- - Warning - -
- - - Some warning status for some-name - - - · - 2d - -
-
-
- - Info - -
- - - Some info status for some-name - - - · - 2d - -
-
-
-
`; diff --git a/src/renderer/components/menu/menu.tsx b/src/renderer/components/menu/menu.tsx index a89841c54c..1d176d0b83 100644 --- a/src/renderer/components/menu/menu.tsx +++ b/src/renderer/components/menu/menu.tsx @@ -93,7 +93,6 @@ export class Menu extends React.Component { this.opener.addEventListener(this.props.toggleEvent, this.toggle); this.opener.addEventListener("keydown", this.onKeyDown); } - this.elem.addEventListener("keydown", this.onKeyDown); window.addEventListener("resize", this.onWindowResize); window.addEventListener("click", this.onClickOutside, true); window.addEventListener("scroll", this.onScrollOutside, true); @@ -106,7 +105,6 @@ export class Menu extends React.Component { this.opener.removeEventListener(this.props.toggleEvent, this.toggle); this.opener.removeEventListener("keydown", this.onKeyDown); } - this.elem.removeEventListener("keydown", this.onKeyDown); window.removeEventListener("resize", this.onWindowResize); window.removeEventListener("click", this.onClickOutside, true); window.removeEventListener("scroll", this.onScrollOutside, true); @@ -218,7 +216,7 @@ export class Menu extends React.Component { } } - onKeyDown(evt: KeyboardEvent) { + onKeyDown(evt: React.KeyboardEvent | KeyboardEvent) { if (!this.isOpen) return; switch (evt.code) { @@ -330,6 +328,7 @@ export class Menu extends React.Component { left: this.state?.menuStyle?.left, top: this.state?.menuStyle?.top, }} + onKeyDown={this.onKeyDown} > {menuItems} diff --git a/src/renderer/components/tooltip/tooltip.tsx b/src/renderer/components/tooltip/tooltip.tsx index 9b753c251a..4a8b0c30ca 100644 --- a/src/renderer/components/tooltip/tooltip.tsx +++ b/src/renderer/components/tooltip/tooltip.tsx @@ -9,7 +9,7 @@ import React from "react"; import { createPortal } from "react-dom"; import { observer } from "mobx-react"; import { boundMethod, cssNames, IClassName } from "../../utils"; -import { observable, makeObservable } from "mobx"; +import { observable, makeObservable, action } from "mobx"; export enum TooltipPosition { TOP = "top", @@ -54,7 +54,8 @@ export class Tooltip extends React.Component { @observable.ref elem: HTMLElement; @observable activePosition: TooltipPosition; - @observable isVisible = false; + @observable isVisible = this.props.visible ?? false; + @observable isContentVisible = false; // animation manager constructor(props: TooltipProps) { super(props); @@ -87,15 +88,16 @@ export class Tooltip extends React.Component { this.hoverTarget.removeEventListener("mouseleave", this.onLeaveTarget); } - @boundMethod + @action.bound protected onEnterTarget() { this.isVisible = true; - this.refreshPosition(); + requestAnimationFrame(action(() => this.isContentVisible = true)); } - @boundMethod + @action.bound protected onLeaveTarget() { this.isVisible = false; + this.isContentVisible = false; } @boundMethod @@ -103,6 +105,10 @@ export class Tooltip extends React.Component { const { preferredPositions } = this.props; const { elem, targetElem } = this; + if (!elem) { + return; + } + let positions = new Set([ TooltipPosition.RIGHT, TooltipPosition.BOTTOM, @@ -150,6 +156,10 @@ export class Tooltip extends React.Component { } protected setPosition(pos: { left: number; top: number }) { + if (!this.elem) { + return; + } + const elemStyle = this.elem.style; elemStyle.left = `${pos.left}px`; @@ -214,13 +224,17 @@ export class Tooltip extends React.Component { } render() { - const { style, formatters, usePortal, children, visible } = this.props; + if (!this.isVisible) { + return null; + } + + const { style, formatters, usePortal, children } = this.props; const className = cssNames("Tooltip", this.props.className, formatters, this.activePosition, { - visible: visible ?? this.isVisible, + visible: this.isContentVisible, formatter: !!formatters, }); const tooltip = ( -
+
{children}
);