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.

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

feat: add optional to support top and left slick dots (#16186) #16225

Merged
merged 12 commits into from Apr 29, 2019

Conversation

Projects
None yet
4 participants
@yociduo
Copy link
Contributor

commented Apr 22, 2019

🤔 This is a ...

  • New feature
  • Bug fix
  • Site / document update
  • Component style update
  • TypeScript definition update
  • Refactoring
  • Code style optimization
  • Branch merge
  • Other (about what?)

👻 What's the background?

#16186 走马灯位置和自定义样式问题

💡 Solution

Add dots placement

📝 Changelog

  • English Changelog:
    Carousel Support dotsPlacement prop
  • Chinese Changelog (optional):
    Carousel 支持自定义面板指示点的位置

☑️ Self Check before Merge

  • Doc is updated/provided or not needed
  • Demo is updated/provided or not needed
  • TypeScript definition is updated/provided or not needed
  • Changelog is provided or not needed

@pr-triage pr-triage bot added the PR: unreviewed label Apr 22, 2019

@netlify

This comment has been minimized.

Copy link

commented Apr 22, 2019

Deploy preview for ant-design ready!

Built with commit 522ad80

https://deploy-preview-16225--ant-design.netlify.com

@yociduo yociduo force-pushed the yociduo:feature branch 2 times, most recently from e44cad9 to 244a125 Apr 22, 2019

@codecov

This comment has been minimized.

Copy link

commented Apr 22, 2019

Codecov Report

Merging #16225 into feature will decrease coverage by 0.04%.
The diff coverage is 100%.

Impacted file tree graph

@@             Coverage Diff             @@
##           feature   #16225      +/-   ##
===========================================
- Coverage    95.27%   95.23%   -0.05%     
===========================================
  Files          252      252              
  Lines         6773     6776       +3     
  Branches      1959     1938      -21     
===========================================
  Hits          6453     6453              
- Misses         319      322       +3     
  Partials         1        1
Impacted Files Coverage Δ
components/carousel/index.tsx 95.55% <100%> (+0.31%) ⬆️
components/_util/wave.tsx 85.57% <0%> (-2.89%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 252e1dd...244a125. Read the comment docs.

@codecov

This comment has been minimized.

Copy link

commented Apr 22, 2019

Codecov Report

Merging #16225 into feature will decrease coverage by 0.03%.
The diff coverage is 100%.

Impacted file tree graph

@@             Coverage Diff             @@
##           feature   #16225      +/-   ##
===========================================
- Coverage    95.29%   95.26%   -0.04%     
===========================================
  Files          256      256              
  Lines         6845     6857      +12     
  Branches      1953     1959       +6     
===========================================
+ Hits          6523     6532       +9     
- Misses         321      324       +3     
  Partials         1        1
Impacted Files Coverage Δ
components/carousel/index.tsx 96.29% <100%> (+1.05%) ⬆️
components/_util/wave.tsx 85.57% <0%> (-2.89%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6e6e1ec...522ad80. Read the comment docs.

@zombieJ

This comment has been minimized.

Copy link
Member

commented Apr 22, 2019

Demo 里也加一下

@yociduo

This comment has been minimized.

Copy link
Contributor Author

commented Apr 22, 2019

Demo和Doc都更新了

@zombieJ

This comment has been minimized.

Copy link
Member

commented Apr 24, 2019

placement 一般用在弹出层,位置使用 dotPosition 命名。
ref: #16048

@afc163

This comment has been minimized.

Copy link
Member

commented Apr 24, 2019

vertical 这个属性等于 dotsPosition="right" 了,感觉可以废弃掉。

@yociduo

This comment has been minimized.

Copy link
Contributor Author

commented Apr 24, 2019

@afc163 我也觉得是,是否需要考虑兼容性?

@afc163

This comment has been minimized.

Copy link
Member

commented Apr 24, 2019

肯定要的,优先读 dotsPosition 吧,给 vertical 一个废弃的警告。文档里也可以删掉了。

@zombieJ

This comment has been minimized.

Copy link
Member

commented Apr 24, 2019

dotPosition 吧,现在都是单数的。

@yociduo

This comment has been minimized.

Copy link
Contributor Author

commented Apr 24, 2019

dotsPosition比较好吧,现在有一个参数控制是否显示dots的是dots

@zombieJ

This comment has been minimized.

Copy link
Member

commented Apr 24, 2019

tabPosition 也是单数,统一用单数就行了。
另外,dots 名字也没起好,应该是 showDot,但是有了就不改了。

@afc163

This comment has been minimized.

Copy link
Member

commented Apr 24, 2019

dots 是直接用的 react-slick 的 API 命名。

@yociduo yociduo force-pushed the yociduo:feature branch 2 times, most recently from 6725b02 to 167abf4 Apr 24, 2019

Show resolved Hide resolved components/carousel/index.tsx Outdated

@yociduo yociduo force-pushed the yociduo:feature branch 2 times, most recently from 44de1a1 to cb5d7e7 Apr 24, 2019

Show resolved Hide resolved components/carousel/index.tsx Outdated
Show resolved Hide resolved components/carousel/index.tsx Outdated
@buildsize

This comment has been minimized.

Copy link

commented Apr 26, 2019

File name Previous Size New Size Change
package-lock.json 825.35 KB 823.64 KB -1.71 KB (0%)

@yociduo yociduo force-pushed the yociduo:feature branch from 1919b9c to c8b9f5f Apr 28, 2019

@yociduo yociduo force-pushed the yociduo:feature branch from c8b9f5f to 522ad80 Apr 28, 2019

@zombieJ

This comment has been minimized.

Copy link
Member

commented Apr 29, 2019

I'm OK with this. Will merge today if no additional comment.
@afc163 @ztplz @yesmeck

@ztplz

ztplz approved these changes Apr 29, 2019

@zombieJ zombieJ merged commit 19f0ca4 into ant-design:feature Apr 29, 2019

27 of 29 checks passed

Header rules No header rules processed
Details
Pages changed 246 new files uploaded
Details
Codacy/PR Quality Review Up to standards. A positive pull request.
Details
LGTM analysis: JavaScript No new or fixed alerts
Details
Mixed content No mixed content detected
Details
Redirect rules 18 redirect rules processed
Details
Semantic Pull Request ready to be squashed
Details
WIP Ready for review
Details
ant-design.ant-design #ant design succeeded
Details
buildsize No significant change
Details
ci/circleci: compile Your tests passed on CircleCI!
Details
ci/circleci: dist Your tests passed on CircleCI!
Details
ci/circleci: lint Your tests passed on CircleCI!
Details
ci/circleci: setup Your tests passed on CircleCI!
Details
ci/circleci: test_dist Your tests passed on CircleCI!
Details
ci/circleci: test_dist_15 Your tests passed on CircleCI!
Details
ci/circleci: test_dom Your tests passed on CircleCI!
Details
ci/circleci: test_dom_15 Your tests passed on CircleCI!
Details
ci/circleci: test_es Your tests passed on CircleCI!
Details
ci/circleci: test_es_15 Your tests passed on CircleCI!
Details
ci/circleci: test_lib Your tests passed on CircleCI!
Details
ci/circleci: test_lib_15 Your tests passed on CircleCI!
Details
ci/circleci: test_node Your tests passed on CircleCI!
Details
ci/circleci: test_node_15 Your tests passed on CircleCI!
Details
codebeat Target branch is not tracked
Details
codecov/patch 100% of diff hit (target 95.29%)
Details
codecov/project Absolute coverage decreased by -0.03% but relative coverage increased by +4.7% compared to 6e6e1ec
Details
deploy/netlify Deploy preview ready!
Details
security/snyk - package.json (paranoidjk) No manifest changes detected

chenshuai2144 added a commit that referenced this pull request May 6, 2019

meger feature to master (#16421)
* use ul in list

* update snapshot

* update comment

* feat: TreeSelect support `showSearch` in multiple mode (#15933)

* update rc-tree-select

* typo

* update desc & snapshot

* update desc & snapshot

* check default showSearch

* feat: table customizing variable (#15971)

* feat: added table selected row color variable

* fix: @table-selected-row-color default is inherit

* feat: Upload support customize previewFile (#15984)

* support preview file

* use promise

* dealy load

* use canvas of render

* use domHook of test

* update demo

* add snapshot

* update types

* update testcase

* feat: form customizing variables (#15954)

* fix: added styling form input background-color

* feat: added '@form-warning-input-bg' variable

* feat: added '@form-error-input-bg' variable

* use li wrap with comment

* feat: Support append theme less file with less-variable (#16118)

* add override

* add override support

* update doc

* feat: dropdown support set right icon

* docs: update doc of dropdown component

* style: format dropdown-button.md

* test: update updateSnapshot

* style: format dropdown-button.md

* test: update updateSnapshot

* test: update updateSnapshot

* style: change style of dropdown-button demo

* fix: fix document table order

* feat: Support SkeletonAvatarProps.size accept number (#16078) (#16128)

* chore:update style of demo

* feat: Notification functions accept top, bottom and getContainer as arguments

* drawer: add afterVisibleChange

* rm onVisibleChange

* update

* feat: 🇭🇷 hr_HR locale (#16258)

* Added Croatian locale

* fixed lint error

*  Add test cases for hr_HR

* 📝 update i18n documentation

* feat:  add `htmlFor` in Form.Item (#16278)

* add htmlFor in Form.Item

* update doc

* feat: Button support `link` type (#16289)

close #15892

* feat: Add Timeline.Item.position (#16148) (#16193)

* fix: Timeline.pendingDot interface documentation there is a small problem (#16177)

* feat: Add Timeline.Item.position (#16148)

* doc: add version infomation for Timeline.Item.position

* refactor: Update Tree & TreeSelect deps (#16330)

* use CSSMotion

* update snapshot

* feat: Collapse support `expandIconPosition` (#16365)

* update doc

* support expandIconPosition

* update snapshot

* feat: Breadcrumb  support DropDown (#16315)

* breadcrumbs support drop down menu

* update doc

* add require less

* fix test

* fix md doc

* less code

* fix  style warning

* update snap

* add children render test

* feat: TreeNode support checkable

* feat: add optional to support top and left slick dots (#16186) (#16225)

* add optional to support top and left slick dots

* update carousel snapshot

* Update doc, add placement demo

* update carousel placement demo snapshots

* rename dots placement to position

* update vertical as deprecated

* rename dotsPosition to dotPosition

* refine code

* add warning testcase for vertical

* remove unused warning

* update expression

* Additional test case for dotPosition

* refactor: Upgrade `rc-tree-select` to support pure React motion (#16402)

* upgrade `rc-tree-select`

* update snapshot

* 3.17.0 changelog

* fix warning

* fix review warning
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.