Merge branch 'master' of github.com:ant-design/ant-design into release-4.12.3

This commit is contained in:
诸岳 2021-02-10 20:15:48 +08:00
commit c5fd0eda1b
3 changed files with 4 additions and 5 deletions

View File

@ -7,7 +7,7 @@ on:
jobs: jobs:
verify: verify:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: contains(github.event.pull_request.title, 'changelog') if: contains(github.event.pull_request.title, 'changelog') || contains(github.event.pull_request.title, 'release')
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: verify-version - name: verify-version

View File

@ -19,7 +19,6 @@ const SliderTooltip = React.forwardRef<unknown, TooltipProps>((props, ref) => {
rafRef.current = raf(() => { rafRef.current = raf(() => {
innerRef.current?.forcePopupAlign(); innerRef.current?.forcePopupAlign();
rafRef.current = null; rafRef.current = null;
keepAlign();
}); });
} }
@ -31,7 +30,7 @@ const SliderTooltip = React.forwardRef<unknown, TooltipProps>((props, ref) => {
} }
return cancelKeepAlign; return cancelKeepAlign;
}, [visible]); }, [visible, props.title]);
return <Tooltip ref={composeRef(innerRef, ref)} {...props} />; return <Tooltip ref={composeRef(innerRef, ref)} {...props} />;
}); });

View File

@ -109,8 +109,8 @@
"ie >= 11" "ie >= 11"
], ],
"dependencies": { "dependencies": {
"@ant-design/colors": "^5.0.0", "@ant-design/colors": "^6.0.0",
"@ant-design/icons": "^4.4.0", "@ant-design/icons": "^4.5.0",
"@ant-design/react-slick": "~0.28.1", "@ant-design/react-slick": "~0.28.1",
"@babel/runtime": "^7.12.5", "@babel/runtime": "^7.12.5",
"array-tree-filter": "^2.1.0", "array-tree-filter": "^2.1.0",