Browse Source

Merge pull request #1325 from DouyinFE/fix-tooltipOpacity

Fix tooltip opacity
代强 2 years ago
parent
commit
4e62b8ee87
3 changed files with 6 additions and 4 deletions
  1. 1 1
      lerna.json
  2. 1 1
      packages/semi-ui/package.json
  3. 4 2
      packages/semi-ui/tooltip/index.tsx

+ 1 - 1
lerna.json

@@ -1,5 +1,5 @@
 {
     "useWorkspaces": true,
     "npmClient": "yarn",
-    "version": "2.24.3"
+    "version": "2.24.4-alpha.0"
 }

+ 1 - 1
packages/semi-ui/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-ui",
-    "version": "2.24.3",
+    "version": "2.24.4-alpha.0",
     "description": "",
     "main": "lib/cjs/index.js",
     "module": "lib/es/index.js",

+ 4 - 2
packages/semi-ui/tooltip/index.tsx

@@ -565,6 +565,9 @@ export default class Tooltip extends BaseComponent<TooltipProps, TooltipState> {
         const icon = this.renderIcon();
         const portalInnerStyle = omit(containerStyle, motion ? ['transformOrigin'] : undefined);
         const transformOrigin = get(containerStyle, 'transformOrigin');
+        const userOpacity = get(style, 'opacity');
+        const opacity = userOpacity ? userOpacity : 1;
+
         const inner =
             <CSSAnimation
                 fillMode="forwards"
@@ -580,13 +583,12 @@ export default class Tooltip extends BaseComponent<TooltipProps, TooltipState> {
                 {
                     ({ animationStyle, animationClassName, animationEventsNeedBind }) => {
                         return <div
-
                             className={classNames(className, animationClassName)}
                             style={{
-                                opacity: isPositionUpdated ? '1' : "0",
                                 ...animationStyle,
                                 transformOrigin,
                                 ...style,
+                                opacity: isPositionUpdated ? opacity : "0",
                             }}
                             {...portalEventSet}
                             {...animationEventsNeedBind}