Merge pull request #18221 from jianghaoran116/fix-18111

<fix>(tooltip): fix alwaysShowContent doesn't work after leaving the …
apache · Mar 3, 2023 · 0e2954c · 0e2954c
2 parents dbec96f + 19c3c9d
commit 0e2954c
Show file tree

Hide file tree

Showing 4 changed files with 277 additions and 11 deletions.
diff --git a/src/component/tooltip/TooltipHTMLContent.ts b/src/component/tooltip/TooltipHTMLContent.ts
@@ -262,6 +262,7 @@ class TooltipHTMLContent {
     private _enterable = true;
     private _zr: ZRenderType;
 
+    private _alwaysShowContent: boolean = false;
     private _hideTimeout: number;
     /**
      * Hide delay time
@@ -360,6 +361,9 @@ class TooltipHTMLContent {
         const alwaysShowContent = tooltipModel.get('alwaysShowContent');
         alwaysShowContent && this._moveIfResized();
 
+        // update alwaysShowContent
+        this._alwaysShowContent = alwaysShowContent;
+
         // update className
         this.el.className = tooltipModel.get('className') || '';
 
@@ -488,7 +492,7 @@ class TooltipHTMLContent {
     }
 
     hideLater(time?: number) {
-        if (this._show && !(this._inContent && this._enterable)) {
+        if (this._show && !(this._inContent && this._enterable) && !this._alwaysShowContent) {
             if (time) {
                 this._hideDelay = time;
                 // Set show false to avoid invoke hideLater multiple times

diff --git a/src/component/tooltip/TooltipRichContent.ts b/src/component/tooltip/TooltipRichContent.ts
@@ -37,6 +37,8 @@ class TooltipRichContent {
 
     private _hideTimeout: number;
 
+    private _alwaysShowContent: boolean = false;
+
     private _enterable = true;
 
     private _inContent: boolean;
@@ -56,6 +58,9 @@ class TooltipRichContent {
     update(tooltipModel: Model<TooltipOption>) {
         const alwaysShowContent = tooltipModel.get('alwaysShowContent');
         alwaysShowContent && this._moveIfResized();
+
+        // update alwaysShowContent
+        this._alwaysShowContent = alwaysShowContent;
     }
 
     show() {
@@ -190,7 +195,7 @@ class TooltipRichContent {
     }
 
     hideLater(time?: number) {
-        if (this._show && !(this._inContent && this._enterable)) {
+        if (this._show && !(this._inContent && this._enterable) && !this._alwaysShowContent) {
             if (time) {
                 this._hideDelay = time;
                 // Set show false to avoid invoke hideLater multiple times

diff --git a/src/component/tooltip/TooltipView.ts b/src/component/tooltip/TooltipView.ts
@@ -147,8 +147,6 @@ class TooltipView extends ComponentView {
 
     private _api: ExtensionAPI;
 
-    private _alwaysShowContent: boolean;
-
     private _tooltipContent: TooltipHTMLContent | TooltipRichContent;
 
     private _refreshUpdateTimeout: number;
@@ -196,12 +194,6 @@ class TooltipView extends ComponentView {
 
         this._api = api;
 
-        /**
-         * @private
-         * @type {boolean}
-         */
-        this._alwaysShowContent = tooltipModel.get('alwaysShowContent');
-
         const tooltipContent = this._tooltipContent;
         tooltipContent.update(tooltipModel);
         tooltipContent.setEnterable(tooltipModel.get('enterable'));
@@ -396,7 +388,7 @@ class TooltipView extends ComponentView {
     ) {
         const tooltipContent = this._tooltipContent;
 
-        if (!this._alwaysShowContent && this._tooltipModel) {
+        if (this._tooltipModel) {
             tooltipContent.hideLater(this._tooltipModel.get('hideDelay'));
         }
 

diff --git a/test/tooltip-alwaysShowContent.html b/test/tooltip-alwaysShowContent.html