Skip to content

Commit 3f66cf4

Browse files
authored
fix: remove undefined class (#2504)
1 parent 1adb927 commit 3f66cf4

File tree

2 files changed

+10
-15
lines changed

2 files changed

+10
-15
lines changed

components/carousel/__tests__/__snapshots__/demo.test.js.snap

+6-14
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ exports[`renders ./antdv-demo/docs/carousel/demo/autoplay.md correctly 1`] = `
7070
</div>
7171
</div>
7272
</div>
73-
<ul class="slick-dots slick-dots-bottom undefined" style="display: block;">
73+
<ul class="slick-dots slick-dots-bottom" style="display: block;">
7474
<li class="slick-active"><button class="">1</button></li>
7575
<li class=""><button class="">2</button></li>
7676
<li class=""><button class="">3</button></li>
@@ -150,7 +150,7 @@ exports[`renders ./antdv-demo/docs/carousel/demo/basic.md correctly 1`] = `
150150
</div>
151151
</div>
152152
</div>
153-
<ul class="slick-dots slick-dots-bottom undefined" style="display: block;">
153+
<ul class="slick-dots slick-dots-bottom" style="display: block;">
154154
<li class="slick-active"><button class="">1</button></li>
155155
<li class=""><button class="">2</button></li>
156156
<li class=""><button class="">3</button></li>
@@ -238,7 +238,7 @@ exports[`renders ./antdv-demo/docs/carousel/demo/customArrows.md correctly 1`] =
238238
<path d="M666.7 505.5l-246-178A8 8 0 0 0 408 334v46.9c0 10.2 4.9 19.9 13.2 25.9L566.6 512 421.2 617.2c-8.3 6-13.2 15.6-13.2 25.9V690c0 6.5 7.4 10.3 12.7 6.5l246-178c4.4-3.2 4.4-9.8 0-13z"></path>
239239
<path d="M512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm0 820c-205.4 0-372-166.6-372-372s166.6-372 372-372 372 166.6 372 372-166.6 372-372 372z"></path>
240240
</svg></i></div>
241-
<ul class="slick-dots slick-dots-bottom undefined" style="display: block;">
241+
<ul class="slick-dots slick-dots-bottom" style="display: block;">
242242
<li class="slick-active"><button class="">1</button></li>
243243
<li class=""><button class="">2</button></li>
244244
<li class=""><button class="">3</button></li>
@@ -345,7 +345,7 @@ exports[`renders ./antdv-demo/docs/carousel/demo/fade.md correctly 1`] = `
345345
</div>
346346
</div>
347347
</div>
348-
<ul class="slick-dots slick-dots-bottom undefined" style="display: block;">
348+
<ul class="slick-dots slick-dots-bottom" style="display: block;">
349349
<li class="slick-active"><button class="">1</button></li>
350350
<li class=""><button class="">2</button></li>
351351
<li class=""><button class="">3</button></li>
@@ -357,15 +357,7 @@ exports[`renders ./antdv-demo/docs/carousel/demo/fade.md correctly 1`] = `
357357
358358
exports[`renders ./antdv-demo/docs/carousel/demo/position.md correctly 1`] = `
359359
<div>
360-
<div class="ant-radio-group ant-radio-group-outline ant-radio-group-default" style="margin-bottom: 8px;"><label class="ant-radio-button-wrapper ant-radio-button-wrapper-checked"><span class="ant-radio-button ant-radio-button-checked"><input type="radio" class="ant-radio-button-input" value="top"><span class="ant-radio-button-inner"></span></span><span>
361-
Top
362-
</span></label><label class="ant-radio-button-wrapper"><span class="ant-radio-button"><input type="radio" class="ant-radio-button-input" value="bottom"><span class="ant-radio-button-inner"></span></span><span>
363-
Bottom
364-
</span></label><label class="ant-radio-button-wrapper"><span class="ant-radio-button"><input type="radio" class="ant-radio-button-input" value="left"><span class="ant-radio-button-inner"></span></span><span>
365-
Left
366-
</span></label><label class="ant-radio-button-wrapper"><span class="ant-radio-button"><input type="radio" class="ant-radio-button-input" value="right"><span class="ant-radio-button-inner"></span></span><span>
367-
Right
368-
</span></label></div>
360+
<div class="ant-radio-group ant-radio-group-outline ant-radio-group-default" style="margin-bottom: 8px;"><label class="ant-radio-button-wrapper ant-radio-button-wrapper-checked"><span class="ant-radio-button ant-radio-button-checked"><input type="radio" class="ant-radio-button-input" value="top"><span class="ant-radio-button-inner"></span></span><span>Top</span></label><label class="ant-radio-button-wrapper"><span class="ant-radio-button"><input type="radio" class="ant-radio-button-input" value="bottom"><span class="ant-radio-button-inner"></span></span><span>Bottom</span></label><label class="ant-radio-button-wrapper"><span class="ant-radio-button"><input type="radio" class="ant-radio-button-input" value="left"><span class="ant-radio-button-inner"></span></span><span>Left</span></label><label class="ant-radio-button-wrapper"><span class="ant-radio-button"><input type="radio" class="ant-radio-button-input" value="right"><span class="ant-radio-button-inner"></span></span><span>Right</span></label></div>
369361
<div class="ant-carousel">
370362
<div class="slick-slider slick-initialized">
371363
<div class="slick-list">
@@ -435,7 +427,7 @@ exports[`renders ./antdv-demo/docs/carousel/demo/position.md correctly 1`] = `
435427
</div>
436428
</div>
437429
</div>
438-
<ul class="slick-dots slick-dots-top undefined" style="display: block;">
430+
<ul class="slick-dots slick-dots-top" style="display: block;">
439431
<li class="slick-active"><button class="">1</button></li>
440432
<li class=""><button class="">2</button></li>
441433
<li class=""><button class="">3</button></li>

components/carousel/index.jsx

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import hasProp, {
99
import { ConfigConsumerProps } from '../config-provider';
1010
import Base from '../base';
1111
import warning from '../_util/warning';
12+
import classNames from 'classnames';
1213

1314
// matchMedia polyfill for
1415
// https://github.com/WickyNilliams/enquire.js/issues/82
@@ -164,7 +165,9 @@ const Carousel = {
164165
const dotsClass = 'slick-dots';
165166
const dotPosition = this.getDotPosition();
166167
props.vertical = dotPosition === 'left' || dotPosition === 'right';
167-
props.dotsClass = `${dotsClass} ${dotsClass}-${dotPosition || 'bottom'} ${props.dotsClass}`;
168+
props.dotsClass = classNames(`${dotsClass}`, `${dotsClass}-${dotPosition || 'bottom'}`, {
169+
[`${props.dotsClass}`]: !!props.dotsClass,
170+
});
168171
if (props.vertical) {
169172
className = `${className} ${className}-vertical`;
170173
}

0 commit comments

Comments
 (0)