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

Feature antd 3.0/spinning indicator #7977

Merged

Conversation

kossel
Copy link
Contributor

@kossel kossel commented Oct 23, 2017

Added indicator props to Spin component as discussed in #7950. re-submitting since I messed up with the rebase...

@kossel
Copy link
Contributor Author

kossel commented Oct 23, 2017

@afc163 I did everything again, my PR is aligned to antd-3.0 branch, I ran npm run test on my branch locally and shows all tests passed, however CI keep saying the snapshots don't match for Calendar component. any idea?

@jljsj33
Copy link
Member

jljsj33 commented Oct 23, 2017

感觉没啥意义,,如果不用这设计,,只要个旋转的动画,为什么要用 spin 组件??直接用你 indicator 的内容加个 antRotate 不是更简单?

It doesn't make sense. If you don't use this design, just rotate the animation, why use the spin component? More simple way to add antRotate to your indicator content.

@kossel
Copy link
Contributor Author

kossel commented Oct 23, 2017

This gives the flexibility to the developer to put other styles of loading animation such like, loading dots, loading bard or animation that many not include a "rotation" animation. Making it into Spin component makes the developers can still take the advantages of other props such as delay, loading. tip etc without having to rewrite a completely the same features in another component (that's what we are doing).

btw, I don't know why npm run test pass in local branch, but not in CI

@afc163
Copy link
Member

afc163 commented Oct 28, 2017

It conflict, try to resolve it.

@kossel kossel force-pushed the feature-antd-3.0/spinning-indicator branch from 6a96e4e to a57212f Compare October 29, 2017 04:24
@kossel
Copy link
Contributor Author

kossel commented Oct 29, 2017

I solved the conflicts, but CI is still broken, I had to run npm run test -- -u to update snapshot for the new props, but it also updated calendar's snapshot, what should I do? @afc163

@benjycui
Copy link
Contributor

@kossel just rebase, thanks.

@kossel kossel force-pushed the feature-antd-3.0/spinning-indicator branch from a57212f to b3e5e61 Compare October 31, 2017 14:59
@kossel
Copy link
Contributor Author

kossel commented Oct 31, 2017

rebased and solved conflict, still some snapshots don't match

@benjycui
Copy link
Contributor

benjycui commented Nov 1, 2017

Don't commit any snapshots except components/spin/__tests__/__snapshots__/demo.test.js.snap

@kossel
Copy link
Contributor Author

kossel commented Nov 1, 2017

Yes sir!

@codecov
Copy link

codecov bot commented Nov 1, 2017

Codecov Report

Merging #7977 into antd-3.0 will increase coverage by <.01%.
The diff coverage is 100%.

Impacted file tree graph

@@             Coverage Diff             @@
##           antd-3.0   #7977      +/-   ##
===========================================
+ Coverage     83.39%   83.4%   +<.01%     
===========================================
  Files           221     221              
  Lines          4433    4434       +1     
  Branches       1331    1332       +1     
===========================================
+ Hits           3697    3698       +1     
  Misses          736     736
Impacted Files Coverage Δ
components/spin/index.tsx 78.57% <100%> (+0.38%) ⬆️

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 dbe451a...22fd86c. Read the comment docs.

@afc163 afc163 merged commit 92aa34c into ant-design:antd-3.0 Nov 4, 2017
@jaspersorrio
Copy link

Wow this is a great PR! This means I can now customize the table spinner too!

@kossel kossel deleted the feature-antd-3.0/spinning-indicator branch November 15, 2017 19:58
@yesmeck yesmeck mentioned this pull request Nov 19, 2017
yesmeck added a commit that referenced this pull request Dec 1, 2017
* update @layout-body-background

* fix tag radius

* Add size="large" Tabs

* update card demo

* Fix upload loading

* bump

* Tweak card background

* rollback popconfirm padding

* Tweak progress dot step style

* Tweak popover arrow style

* update dark menu color

* update style

* update gray color

* bump

* Upgrade antd-tools

* fix tabs style

* bump

* Tweak style

* Oops.

* refactor: extract common locale logic (#7915)

* use @heading-color again

* Fix snapshot

* Fix autoprefix warning

* test: fix CI

* update card and tabs style

* bump

* fix snapshot

* Fix menu style

* Fix mini size pagination style

* deps: upgrade bisheng (#7985)

* fix: should not import moment while useless, close: #8013

* Fix upload style

* Fix menu active border

* bump

* Fix menu style

* bump

* Tweak list style

* Fix list border

* deps: upgrade deps

* Tweak select arrow style

* bump

* update demo

* Add Divider[dashed] prop

* tweak Card style

* update list grid padding bottom

* bump

* try to fix ci

* Upgrade rc-time-picker to 3.0.0

Add `hourStep` `minuteStep` `secondStep`

* update TimePicker demo snapshot

* Fix input shadow in iOS safari, ref #7974

* Fix snapshot

* update iconfont zip url

* update select group title style

* Fix api order

* chore: update size props order, ref: d12f247

* Add china mirror link in footer

* Remove modao

* 2.13.8 change log review (#8041)

bump 2.13.8

* add the 'selectable' attribute (#8048)

* Fix input checkbox or radio disappeared, ref #7974

* Fix progress dot step style

* fix: upgrade rc-form and refactor to be compatible with react@16

* Add form wrappedComponentRef test

* test: simplify snapshots for LocaleProvider

* bump beta

* vertical progressDot Steps style

* bump

* Fix Alert backgroun and border color

* bump

* deps: upgrade TypeScript to 2.6, close #8018

* update code style

* Support responsively grid gutter

* bump

* Fix test case

* Fix enquire in server render

* Fix responsive grid gutter

* bump

* Fix gutter PropTypes

* avoid triggering unmatch when unregister

* Add Badge[offset]

* Feature antd 3.0/spinning indicator (#7977)

* Added indicator props to Spin component

* Added indicator props to Spin component

* update snapshots

* fix defautl props

* revert some snapshot files

* Update snapshot

* Review fix (#8125)

* Fix style

* Fix style

* fix lint

* Fix more styles

* Fix more styles

* update snap

* bump new beta

* Fix ts compile error

* use development react in dev

* Fix key warning

* Run test against multiple react versions

* Fix test_node

* Fix snapshot

* Add support for column defaultSortOrder (#6449) (#8111)

Fixes #6449

* Fix snapshot

* Fix super argument

* Fix snapshot

* Fix Rate style under form item

* Tweak cascader arrow style

* update form demo

* site: clean cached before start, close: benjycui/bisheng#113

* Update dependendies (#8150)

* deps: upgrade rc-menu, and close: #2837

* test: update snapshots

* Update rc-calendar

* Update rc-cascader

* Update rc-dialog

* Update dropdown

* Update rc-select@7.1.0

* Update rc-slider

* Update rc-time-picker

* Update rc-tooltip

* Update rc-tree-select

* Mock rc-trigger and Portal

* Fix animation warning when inlineCollapsed changes

* fix: should use SubMenu[popupClassName]

* Fix typescript error

* Fix lint

* fix: style for menu

* Mock rc-trigger for React 15

* Remvoe allow_failures

* Add a variable to control processing colors (#8166)

* Allow Badge[status] usage with Badge[children], close #8164

* Fix badge style

* bump

* Add table filter test

* Feature: uk_UA locale (#8169)

* Add uk-UA localization

Ukrainian localization for the following components:

- locale-provider
- DatePicker
- TimePicker
- Calendar

* Add uk_UA locale to test suite

* Add uk_UA locale to tests snapshot

Tests on CI are failing because there are no snapshot for uk_UA locale.
Generate a snapshot with `npm test -u` command and add it to the test
suite.

* fix: should not throw error when keydown in menu, close: #8089 (#8211)

* List empty style (#8190)

* Fixed List snapshots

* Remove allowSyntheticDefaultImports (#8218)

* 3.0.0-beta.8

* Add source-map

* Fix footer nav

* Update rc-table (#8187)

* Update rc-table

* Add table drag sorting demo

* update menu responsive, ref #4682 (#8226)

* update menu responsive, ref #4682

* update popover menu style

* deps: upgrade form to 2.0.0 (#8207)

* Fix table row selected className

Close #8074 #8075

* Rename TableRow to BodyRow

* export BodyRowClass

* Fix message cannot hide bug, close #8201

* Fix MenuItem margin

* bump beta

* Allow fix table selection column (#8195)

* Focus && blur support (#8204)

* Add test for select

* Add focus() and blur() for AutoComplete

* Add focus() and blur() to Cascader

* Add focus test for input

* Add focus() and blur() for Checkbox

* Add focus() and blur() for Radio

* Add focus() and blur() for Switch

* Add blur() for TimePicker

* Add focus() and blur() to TreeSelect

* Update rc-input-number

* Update rc-rate

* Update rc-select

* Update rc-scroll-admin

* Update rc-scroll-anim

* Oops.

* Remove react@0.14 and react@15 from peerDependencies

* Update snapshot

* Update rc-time-picker

* Add use in TypeScript instruction (#8230)

* Bump 3.0.0-rc.1

* feat: upgrade rc-menu (#8235)

* Fix menu active style

close ant-design/ant-design-pro#222

* Fix submenu width, close #8236

* Fix submenu z-index

* site: fix demo, close: #8227

* Improve upload type definition.

* Improve upload type definition

* style: Use single quote

* Imporve tree and tree-select type definitions

* Improve Transfer type definitions.

* Improve Tooltip type definitions

* Improve TimePicker type definitions

* Fix implicit any error for Tabs.

* fix: submenu should work fine in dropdown, close: #8248

* fix mobile menu (#8252)

* Fix implicit any error for Table

* Fix implicit any for Select Slider Spin Switch

* Fix implicit any for Radio

* Fix implicit any error for Pagination PopConfirm Popover Progress

* Fix implicit any error for Notification

* Fix ssr site build, ref #8249

* Add bisheng build in travis test

* fix lint

* Fix implicit any error for Modal and Message

* Fix implicit any error for Modal and Menu

* fix register of undefined, #8249

* Fix home page style

* Fix implicit any error for List

* Fix implicit any error for Layout

* Fix implicit any error for Mention

* Fix implicit any error for LocalProvider

* Fix implicit any error for Input

* Fix implicit any error for Grid

* Fix implicit any error for Form

* Fix implicit any error for Divider

* Fix implicit any error for DatePicker

* Fix implicit any error for Checkbox

* Fix implicit any error for Cascader

* Fix implicit any error for Carousel

* Fix implicit any error for Calendar

* Fix implicit any error for Card

* Fix implicit any error for Breadcrumb

* Fix implicit any error for Badge

* Fix implicit any error for AutoComplete

* Fix implicit any error for Anchor

* Fix implicit any error for Affix

* Fix implicit any error for _util

* Fix code style

* Enable noImplicitAny

Close #5627

* docs: No require skipLibCheck

* Fix message destroy problem, close #8201

* upgrade rc-form

* 3.0.0-rc.2

* Fix table row create on every render.

Fix #8283

* Fix dark menu popup animation

* bump rc

* add 3 icons

* Fix enquire.js dep

close ant-design/ant-design-pro#280

* make children prop of RadioGroupProps optional (#8307)

* contextMenu Dropdown, close #7232

* change children prop of TableProps to React.ReactNode (#8317)

* make children prop of RadioGroupProps optional

* change children prop of TableProps to React.ReactNode

* Tweak components style detail

* Upgrade antd 3.0 site style (#8324)

* 3.0 site update

* update footer

* improve

* site: fix menu z-index

* tweak style

* site: Add replaceLib plugin to babel

* Upgrade rc-select

* Fix less path warning, close #8388

* Upgrade rc-rate

* Update snapshot

* update logo

* Better responsive style of Table

* reset text-color and etc.

* change lang-button pos & improve footer responsive

* fix menu text color

* improve footer style

* Link button (#8343)

* support link button

* Fix type

* upgrade rc-calendar dependency to 9.3.0 (#8353)

* fix menu style

* fix page jumper style

* Revise docs (#8368)

* Upgrade dev deps and fix lints (#8358)

* upgrade devDeps and fix lint

* Fix stylelint problems

* improve form demo

* seperate dark style of menu

* update introduce text

* bump 3.0.0-rc.4

* Remove deprecations (#8351)

* Add focus() blur() and autoFocus to DatePicker (#8345)

* update home page style, close #8238

* Fix npm run site

* feature:add onCalendarChange for RangePicker (#8355)

* feature:add onCalendarChange for RangePicker

The event trigger when start time or end time is changing, which is useful for districting range user can select.

* Update index.zh-CN.md

update doc

* Update index.zh-CN.md

* Update index.zh-CN.md

* fix style and favicon
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants