Skip to content

Commit 1a3a022

Browse files
tangjinzhoutangjinzhou
committed
feat: remove colorpicker
1 parent 535fb55 commit 1a3a022

File tree

7 files changed

+89
-58
lines changed

7 files changed

+89
-58
lines changed

‎components/color-picker/ColorPicker.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ export default {
178178
const prefixCls = getPrefixCls('color-picker', customizePrefixCls);
179179
const { disabled } = getOptionProps(this);
180180
const classString = {
181-
[`${prefixCls}-box`]: true,
181+
[prefixCls]: true,
182182
[`${prefixCls}-open`]: this.myOpen,
183183
[`${prefixCls}-lg`]: this.size === 'large',
184184
[`${prefixCls}-sm`]: this.size === 'small',

‎components/color-picker/__tests__/__snapshots__/demo.test.js.snap‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// Jest Snapshot v1, https://goo.gl/fbAQLP
2+
3+
exports[`renders ./antdv-demo/docs/color-picker/demo/alpha.md correctly 1`] = `<a-color-picker alpha="true"></a-color-picker>`;
4+
5+
exports[`renders ./antdv-demo/docs/color-picker/demo/basic.md correctly 1`] = `
6+
<div class="ant-row">
7+
<div class="ant-col ant-col-12">
8+
有默认值
9+
<a-colorpicker></a-colorpicker>
10+
</div>
11+
<div class="ant-col ant-col-12">
12+
无默认值
13+
<a-colorpicker></a-colorpicker>
14+
</div>
15+
</div>
16+
`;
17+
18+
exports[`renders ./antdv-demo/docs/color-picker/demo/colors.md correctly 1`] = `<a-color-picker config="[object Object]"></a-color-picker>`;
19+
20+
exports[`renders ./antdv-demo/docs/color-picker/demo/hue.md correctly 1`] = `<a-color-picker></a-color-picker>`;
21+
22+
exports[`renders ./antdv-demo/docs/color-picker/demo/size.md correctly 1`] = `
23+
<div>
24+
<div class="ant-row">
25+
<div class="ant-col ant-col-8">
26+
<a-colorpicker size="large"></a-colorpicker>
27+
</div>
28+
<div class="ant-col ant-col-8">
29+
<a-colorpicker></a-colorpicker>
30+
</div>
31+
<div class="ant-col ant-col-8">
32+
<a-colorpicker size="small"></a-colorpicker>
33+
</div>
34+
</div>
35+
</div>
36+
`;

‎components/color-picker/__tests__/__snapshots__/index.test.js.snap‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`ColorPicker prop locale should works 1`] = `
4-
<div tabindex="0" class="ant-color-picker-box ant-color-picker-open">
4+
<div tabindex="0" class="ant-color-picker ant-color-picker-open">
55
<div class="ant-color-picker-selection">
66
<div id="color-picker-box25">
77
<div class="pickr">
@@ -57,7 +57,7 @@ exports[`ColorPicker prop locale should works 1`] = `
5757
`;
5858
5959
exports[`ColorPicker save event should works 1`] = `
60-
<div tabindex="0" class="ant-color-picker-box ant-color-picker-open">
60+
<div tabindex="0" class="ant-color-picker ant-color-picker-open">
6161
<div class="ant-color-picker-selection">
6262
<div id="color-picker-box31">
6363
<div class="pickr">
@@ -113,7 +113,7 @@ exports[`ColorPicker save event should works 1`] = `
113113
`;
114114
115115
exports[`ColorPicker should support default value 1`] = `
116-
<div tabindex="0" class="ant-color-picker-box ant-color-picker-open">
116+
<div tabindex="0" class="ant-color-picker ant-color-picker-open">
117117
<div class="ant-color-picker-selection">
118118
<div id="color-picker-box1">
119119
<div class="pickr">
@@ -169,7 +169,7 @@ exports[`ColorPicker should support default value 1`] = `
169169
`;
170170
171171
exports[`ColorPicker should support disabled 1`] = `
172-
<div tabindex="-1" class="ant-color-picker-box ant-color-picker-disabled">
172+
<div tabindex="-1" class="ant-color-picker ant-color-picker-disabled">
173173
<div class="ant-color-picker-selection">
174174
<div id="color-picker-box13">
175175
<div class="pickr">
@@ -225,7 +225,7 @@ exports[`ColorPicker should support disabled 1`] = `
225225
`;
226226
227227
exports[`ColorPicker should support format 1`] = `
228-
<div tabindex="0" class="ant-color-picker-box">
228+
<div tabindex="0" class="ant-color-picker">
229229
<div class="ant-color-picker-selection">
230230
<div id="color-picker-box19">
231231
<div class="pickr">
@@ -281,7 +281,7 @@ exports[`ColorPicker should support format 1`] = `
281281
`;
282282
283283
exports[`ColorPicker should support v-model 1`] = `
284-
<div tabindex="0" class="ant-color-picker-box">
284+
<div tabindex="0" class="ant-color-picker">
285285
<div class="ant-color-picker-selection">
286286
<div id="color-picker-box7">
287287
<div class="pickr">

‎components/color-picker/style/index.less‎

Lines changed: 42 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,51 @@
11
@import '../../style/themes/index';
22
@import '../../input/style/mixin';
3-
@import '~@simonwep/pickr/dist/themes/classic.min.css'; // 'classic' theme
4-
@import '~@simonwep/pickr/dist/themes/monolith.min.css'; // 'monolith' theme
5-
@import '~@simonwep/pickr/dist/themes/nano.min.css'; // 'nano' theme
3+
64
@color-picker-prefix-cls: ~'@{ant-prefix}-color-picker';
75
.@{color-picker-prefix-cls} {
8-
&-box{
9-
box-sizing: border-box;
10-
margin: 0;
11-
padding: 0;
12-
color: rgba(0, 0, 0, 0.65);
13-
font-size: 14px;
14-
font-variant: tabular-nums;
15-
line-height: 1.5;
16-
list-style: none;
17-
font-feature-settings: 'tnum';
18-
position: relative;
6+
box-sizing: border-box;
7+
margin: 0;
8+
padding: 0;
9+
color: rgba(0, 0, 0, 0.65);
10+
font-size: 14px;
11+
font-variant: tabular-nums;
12+
line-height: 1.5;
13+
list-style: none;
14+
font-feature-settings: 'tnum';
15+
position: relative;
16+
display: inline-block;
17+
outline: none;
18+
cursor: pointer;
19+
transition: opacity 0.3s;
20+
min-width: 55px;
21+
.pickr {
1922
display: inline-block;
20-
outline: none;
21-
cursor: pointer;
22-
transition: opacity 0.3s;
23-
min-width: 55px;
24-
.pickr{
25-
display: inline-block;
26-
button{
27-
width: 18px;
28-
height: 18px;
29-
margin-left: 7px;
30-
&:focus{
31-
box-shadow: none;
32-
}
23+
.pcr-button {
24+
width: 18px;
25+
height: 18px;
26+
margin-left: 7px;
27+
&:focus {
28+
box-shadow: none;
3329
}
3430
}
35-
&.@{color-picker-prefix-cls}-disabled{
36-
cursor: not-allowed;
37-
.@{color-picker-prefix-cls}-selection {
38-
background: @input-disabled-bg;
39-
box-shadow: none;
31+
}
32+
&.@{color-picker-prefix-cls}-disabled {
33+
cursor: not-allowed;
34+
.@{color-picker-prefix-cls}-selection {
35+
background: @input-disabled-bg;
36+
box-shadow: none;
37+
border: @border-width-base @border-style-base @select-border-color;
38+
&:hover,
39+
&:focus,
40+
&:active {
4041
border: @border-width-base @border-style-base @select-border-color;
41-
&:hover,
42-
&:focus,
43-
&:active {
44-
border: @border-width-base @border-style-base @select-border-color;
45-
box-shadow: none;
46-
}
42+
box-shadow: none;
4743
}
48-
&.@{color-picker-prefix-cls}-open {
49-
.@{color-picker-prefix-cls}-icon {
50-
& svg {
51-
transform: none;
52-
}
44+
}
45+
&.@{color-picker-prefix-cls}-open {
46+
.@{color-picker-prefix-cls}-icon {
47+
& svg {
48+
transform: none;
5349
}
5450
}
5551
}
@@ -64,7 +60,7 @@
6460
.active();
6561
}
6662
}
67-
&-selection{
63+
&-selection {
6864
display: block;
6965
box-sizing: border-box;
7066
background-color: @select-background;
@@ -82,7 +78,7 @@
8278
.hover;
8379
}
8480
}
85-
&-icon{
81+
&-icon {
8682
.iconfont-mixin();
8783
position: absolute;
8884
top: 50%;
@@ -112,7 +108,7 @@
112108
line-height: @input-height-sm - 12;
113109
height: @input-height-sm;
114110
}
115-
.pickr button{
111+
.pickr .pcr-button {
116112
width: 14px;
117113
height: 14px;
118114
}

‎components/index.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ import { default as Skeleton } from './skeleton';
136136

137137
import { default as Comment } from './comment';
138138

139-
import { default as ColorPicker } from './color-picker';
139+
// import { default as ColorPicker } from './color-picker';
140140

141141
import { default as ConfigProvider } from './config-provider';
142142

@@ -205,7 +205,7 @@ const components = [
205205
Drawer,
206206
Skeleton,
207207
Comment,
208-
ColorPicker,
208+
// ColorPicker,
209209
ConfigProvider,
210210
Empty,
211211
Result,
@@ -295,7 +295,7 @@ export {
295295
Drawer,
296296
Skeleton,
297297
Comment,
298-
ColorPicker,
298+
// ColorPicker,
299299
ConfigProvider,
300300
Empty,
301301
Result,

‎components/style.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ import './result/style';
6060
import './descriptions/style';
6161
import './page-header/style';
6262
import './form-model/style';
63-
import './color-picker/style';
63+
// import './color-picker/style';

‎tests/__snapshots__/index.test.js.snap‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ Array [
6363
"Drawer",
6464
"Skeleton",
6565
"Comment",
66-
"ColorPicker",
6766
"ConfigProvider",
6867
"Empty",
6968
"Result",

0 commit comments

Comments
 (0)