Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(tooltip): Tooltip support colour background #23155

Merged
merged 4 commits into from
May 25, 2020
Merged

feat(tooltip): Tooltip support colour background #23155

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6a6bfaa
feat(tooltip): Tooltip support colour background
AshoneA Apr 12, 2020
61cc77a
patch: update test case
AshoneA May 22, 2020
bef6eea
chore: repalce h1 tag to Divider
AshoneA May 25, 2020
a64717a
chore: update demo
AshoneA May 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions components/badge/demo/colorful.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ title:
We preset a series of colorful Badge styles for use in different situations. You can also set it to a hex color string for custom color.

```jsx
import { Badge } from 'antd';
import { Badge, Divider } from 'antd';

const colors = [
'pink',
Expand All @@ -34,15 +34,15 @@ const colors = [

ReactDOM.render(
<div>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<div>
<>

<h4 style={{ marginBottom: 16 }}>Presets:</h4>
<Divider orientation="left">Presets</Divider>
<div>
{colors.map(color => (
<div key={color}>
<Badge color={color} text={color} />
</div>
))}
</div>
<h4 style={{ margin: '16px 0' }}>Custom:</h4>
<Divider orientation="left">Custom</Divider>
<div>
<Badge color="#f50" text="#f50" />
<br />
Expand Down
144 changes: 120 additions & 24 deletions components/config-provider/__tests__/__snapshots__/components.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18737,7 +18737,11 @@ exports[`ConfigProvider components Popconfirm configProvider 1`] = `
>
<div
class="config-popover-arrow"
/>
>
<span
class="config-popover-arrow-content"
/>
</div>
<div
class="config-popover-inner"
role="tooltip"
Expand Down Expand Up @@ -18817,7 +18821,11 @@ exports[`ConfigProvider components Popconfirm configProvider componentSize large
>
<div
class="config-popover-arrow"
/>
>
<span
class="config-popover-arrow-content"
/>
</div>
<div
class="config-popover-inner"
role="tooltip"
Expand Down Expand Up @@ -18897,7 +18905,11 @@ exports[`ConfigProvider components Popconfirm configProvider componentSize middl
>
<div
class="config-popover-arrow"
/>
>
<span
class="config-popover-arrow-content"
/>
</div>
<div
class="config-popover-inner"
role="tooltip"
Expand Down Expand Up @@ -18977,7 +18989,11 @@ exports[`ConfigProvider components Popconfirm configProvider virtual and dropdow
>
<div
class="ant-popover-arrow"
/>
>
<span
class="ant-popover-arrow-content"
/>
</div>
<div
class="ant-popover-inner"
role="tooltip"
Expand Down Expand Up @@ -19057,7 +19073,11 @@ exports[`ConfigProvider components Popconfirm normal 1`] = `
>
<div
class="ant-popover-arrow"
/>
>
<span
class="ant-popover-arrow-content"
/>
</div>
<div
class="ant-popover-inner"
role="tooltip"
Expand Down Expand Up @@ -19137,7 +19157,11 @@ exports[`ConfigProvider components Popconfirm prefixCls 1`] = `
>
<div
class="prefix-Popconfirm-arrow"
/>
>
<span
class="prefix-Popconfirm-arrow-content"
/>
</div>
<div
class="prefix-Popconfirm-inner"
role="tooltip"
Expand Down Expand Up @@ -19217,7 +19241,11 @@ exports[`ConfigProvider components Popover configProvider 1`] = `
>
<div
class="config-popover-arrow"
/>
>
<span
class="config-popover-arrow-content"
/>
</div>
<div
class="config-popover-inner"
role="tooltip"
Expand Down Expand Up @@ -19249,7 +19277,11 @@ exports[`ConfigProvider components Popover configProvider componentSize large 1`
>
<div
class="config-popover-arrow"
/>
>
<span
class="config-popover-arrow-content"
/>
</div>
<div
class="config-popover-inner"
role="tooltip"
Expand Down Expand Up @@ -19281,7 +19313,11 @@ exports[`ConfigProvider components Popover configProvider componentSize middle 1
>
<div
class="config-popover-arrow"
/>
>
<span
class="config-popover-arrow-content"
/>
</div>
<div
class="config-popover-inner"
role="tooltip"
Expand Down Expand Up @@ -19313,7 +19349,11 @@ exports[`ConfigProvider components Popover configProvider virtual and dropdownMa
>
<div
class="ant-popover-arrow"
/>
>
<span
class="ant-popover-arrow-content"
/>
</div>
<div
class="ant-popover-inner"
role="tooltip"
Expand Down Expand Up @@ -19345,7 +19385,11 @@ exports[`ConfigProvider components Popover normal 1`] = `
>
<div
class="ant-popover-arrow"
/>
>
<span
class="ant-popover-arrow-content"
/>
</div>
<div
class="ant-popover-inner"
role="tooltip"
Expand Down Expand Up @@ -19377,7 +19421,11 @@ exports[`ConfigProvider components Popover prefixCls 1`] = `
>
<div
class="prefix-Popover-arrow"
/>
>
<span
class="prefix-Popover-arrow-content"
/>
</div>
<div
class="prefix-Popover-inner"
role="tooltip"
Expand Down Expand Up @@ -22630,7 +22678,11 @@ exports[`ConfigProvider components Slider configProvider 1`] = `
>
<div
class="config-tooltip-arrow"
/>
>
<span
class="config-tooltip-arrow-content"
/>
</div>
<div
class="config-tooltip-inner"
role="tooltip"
Expand Down Expand Up @@ -22680,7 +22732,11 @@ exports[`ConfigProvider components Slider configProvider componentSize large 1`]
>
<div
class="config-tooltip-arrow"
/>
>
<span
class="config-tooltip-arrow-content"
/>
</div>
<div
class="config-tooltip-inner"
role="tooltip"
Expand Down Expand Up @@ -22730,7 +22786,11 @@ exports[`ConfigProvider components Slider configProvider componentSize middle 1`
>
<div
class="config-tooltip-arrow"
/>
>
<span
class="config-tooltip-arrow-content"
/>
</div>
<div
class="config-tooltip-inner"
role="tooltip"
Expand Down Expand Up @@ -22780,7 +22840,11 @@ exports[`ConfigProvider components Slider configProvider virtual and dropdownMat
>
<div
class="ant-tooltip-arrow"
/>
>
<span
class="ant-tooltip-arrow-content"
/>
</div>
<div
class="ant-tooltip-inner"
role="tooltip"
Expand Down Expand Up @@ -22830,7 +22894,11 @@ exports[`ConfigProvider components Slider normal 1`] = `
>
<div
class="ant-tooltip-arrow"
/>
>
<span
class="ant-tooltip-arrow-content"
/>
</div>
<div
class="ant-tooltip-inner"
role="tooltip"
Expand Down Expand Up @@ -22880,7 +22948,11 @@ exports[`ConfigProvider components Slider prefixCls 1`] = `
>
<div
class="prefix-Slider-tooltip-arrow"
/>
>
<span
class="prefix-Slider-tooltip-arrow-content"
/>
</div>
<div
class="prefix-Slider-tooltip-inner"
role="tooltip"
Expand Down Expand Up @@ -34541,7 +34613,11 @@ Array [
>
<div
class="config-tooltip-arrow"
/>
>
<span
class="config-tooltip-arrow-content"
/>
</div>
<div
class="config-tooltip-inner"
role="tooltip"
Expand Down Expand Up @@ -34571,7 +34647,11 @@ Array [
>
<div
class="config-tooltip-arrow"
/>
>
<span
class="config-tooltip-arrow-content"
/>
</div>
<div
class="config-tooltip-inner"
role="tooltip"
Expand Down Expand Up @@ -34601,7 +34681,11 @@ Array [
>
<div
class="config-tooltip-arrow"
/>
>
<span
class="config-tooltip-arrow-content"
/>
</div>
<div
class="config-tooltip-inner"
role="tooltip"
Expand Down Expand Up @@ -34631,7 +34715,11 @@ Array [
>
<div
class="ant-tooltip-arrow"
/>
>
<span
class="ant-tooltip-arrow-content"
/>
</div>
<div
class="ant-tooltip-inner"
role="tooltip"
Expand Down Expand Up @@ -34661,7 +34749,11 @@ Array [
>
<div
class="ant-tooltip-arrow"
/>
>
<span
class="ant-tooltip-arrow-content"
/>
</div>
<div
class="ant-tooltip-inner"
role="tooltip"
Expand Down Expand Up @@ -34691,7 +34783,11 @@ Array [
>
<div
class="prefix-Tooltip-arrow"
/>
>
<span
class="prefix-Tooltip-arrow-content"
/>
</div>
<div
class="prefix-Tooltip-inner"
role="tooltip"
Expand Down
Loading