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

MrHeer · 2019-04-19T15:32:09Z

🤔 This is a ...

👻 What's the background?

close #16177 and #16148

💡 Solution

reuse 'alternate' less

📝 Changelog

add Timeline.Item.position

☑️ 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

View rendered components/timeline/index.en-US.md
View rendered components/timeline/index.zh-CN.md

netlify · 2019-04-19T15:42:30Z

Deploy preview for ant-design ready!

Built with commit 52a1370

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

afc163 · 2019-04-20T05:27:20Z

components/timeline/Timeline.tsx

@@ -12,7 +12,7 @@ export interface TimelineProps {
  pendingDot?: React.ReactNode;
  style?: React.CSSProperties;
  reverse?: boolean;
-  mode?: 'left' | 'alternate' | 'right';
+  mode?: 'left' | 'alternate' | 'right' | 'customize';


No need to add mode="customize", just follow postion of item in higher priority.

That's good idea

I think the mode shuld be in higher priority.

afc163 · 2019-04-22T07:20:57Z

You should pull and rebase feature branch to fix ci.

MrHeer · 2019-04-22T07:32:25Z

You should pull and rebase feature branch to fix ci.

I did rebase, I'll try again tonight. It is necessary to rewrite history(Squash bd925d4 and e28570b)?

afc163 · 2019-04-22T07:36:50Z

Not necessary but better~

MrHeer · 2019-04-22T07:42:16Z

Thank you very much.

codecov · 2019-04-22T12:38:37Z

Codecov Report

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

@@             Coverage Diff             @@
##           feature   #16193      +/-   ##
===========================================
- Coverage    95.29%   95.25%   -0.05%     
===========================================
  Files          255      255              
  Lines         6824     6826       +2     
  Branches      1972     1949      -23     
===========================================
- Hits          6503     6502       -1     
- Misses         320      323       +3     
  Partials         1        1

Impacted Files	Coverage Δ
components/timeline/TimelineItem.tsx	`90.9% <ø> (ø)`	⬆️
components/timeline/Timeline.tsx	`100% <100%> (ø)`	⬆️
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 30a798c...52a1370. Read the comment docs.

afc163 · 2019-04-22T12:43:45Z

components/timeline/TimelineItem.tsx

@@ -58,6 +60,7 @@ const TimelineItem: React.SFC<TimeLineItemProps> = props => (
 TimelineItem.defaultProps = {
  color: 'blue',
  pending: false,
+  position: 'left',


should follow <Timeline mode="xxx">, don't set in defaultProps.

After the mode is set, the position will be invalid.

zombieJ · 2019-04-22T15:07:12Z

components/timeline/Timeline.tsx

-            : '',
+            : ele.props.position === 'right'
+            ? `${prefixCls}-item-right`
+            : `${prefixCls}-item-left`,


这段代码原本就挺看不懂，现在更难懂了。抽出来吧。

MrHeer · 2019-04-25T00:48:29Z

@zombieJ I have modified. Is there other problem?

zombieJ · 2019-04-25T07:52:31Z

https://deploy-preview-16193--ant-design.netlify.com/components/timeline-cn/#header
Seems style different with current:
http://ant.design/components/timeline-cn/

MrHeer · 2019-04-25T08:07:30Z

Yes, I have to change the style to accommodate that you can set the position of the dot in the case of default. When you set mode, the position will be invalid.

zombieJ · 2019-04-25T08:30:05Z

We should not break origin behavior.

MrHeer · 2019-04-25T08:44:23Z

Yeah, I understand, so I started to consider adding a mode customize (#16148). but afc163 didn't think it is necessary (just follow postion of item in higher priority.)

I think you have to add a new mode except you have a good plan

afc163 · 2019-04-25T08:46:35Z

We can use mode="alternate" as the custom mode.

MrHeer · 2019-04-25T08:51:47Z

We can use mode="alternate" as the custom mode.

Haha, nice, I also consider it, but feel a bit strange, so I add a customize(as same as alternate) mode.

I'll be commit tonight!!

…blem (ant-design#16177)

MrHeer · 2019-04-25T12:03:00Z

I've updated, if you have time, please review it. Thank you!

zombieJ · 2019-04-26T02:57:16Z

components/timeline/index.en-US.md

@@ -41,3 +41,4 @@ Node of timeline
 | -------- | ----------- | ---- | ------- |
 | color | Set the circle's color to `blue`, `red`, `green` or other custom colors | string | `blue` |
 | dot | Customize timeline dot | string\|ReactNode | - |
+| position | Customize node position | `left` \| `right` | - |


One more column about avaliable version:

OK, I'll update tonight

version should be 3.16.6?

feature branch always released with minor version. Use 3.17.0 instead.

* 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

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

MrHeer changed the title ~~Feature issues#16148~~ feat: Add Timeline.Item.position (#16148) Apr 19, 2019

afc163 reviewed Apr 20, 2019

View reviewed changes

MrHeer force-pushed the feature-issues#16148 branch from fc4f12b to e28570b Compare April 20, 2019 10:49

MrHeer force-pushed the feature-issues#16148 branch from e28570b to 80b2618 Compare April 22, 2019 12:12

afc163 reviewed Apr 22, 2019

View reviewed changes

MrHeer force-pushed the feature-issues#16148 branch from 80b2618 to a8bebf3 Compare April 22, 2019 13:00

zombieJ reviewed Apr 22, 2019

View reviewed changes

MrHeer force-pushed the feature-issues#16148 branch 3 times, most recently from fb86a1c to 7b563b1 Compare April 23, 2019 12:55

MrHeer added 2 commits April 25, 2019 19:33

fix: Timeline.pendingDot interface documentation there is a small pro…

dfbdfcd

…blem (ant-design#16177)

feat: Add Timeline.Item.position (ant-design#16148)

19c3fef

MrHeer force-pushed the feature-issues#16148 branch from 7b563b1 to 19c3fef Compare April 25, 2019 11:49

zombieJ reviewed Apr 26, 2019

View reviewed changes

doc: add version infomation for Timeline.Item.position

52a1370

afc163 approved these changes Apr 27, 2019

View reviewed changes

pr-triage bot added PR: reviewed-approved and removed PR: unreviewed labels Apr 27, 2019

afc163 merged commit 6cb76a9 into ant-design:feature Apr 27, 2019

pr-triage bot added PR: merged and removed PR: reviewed-approved labels Apr 27, 2019

MrHeer deleted the feature-issues#16148 branch April 27, 2019 11:38

hsuanxyz mentioned this pull request Jun 28, 2020

feat(module:timeline): support custom position NG-ZORRO/ng-zorro-antd#5478

Merged

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

MrHeer commented Apr 19, 2019 •

edited by markdownify bot

netlify bot commented Apr 19, 2019 •

edited

afc163 Apr 20, 2019

MrHeer Apr 20, 2019 •

edited

MrHeer Apr 20, 2019

afc163 commented Apr 22, 2019

MrHeer commented Apr 22, 2019

afc163 commented Apr 22, 2019

MrHeer commented Apr 22, 2019

codecov bot commented Apr 22, 2019 •

edited

afc163 Apr 22, 2019

MrHeer Apr 22, 2019

zombieJ Apr 22, 2019

MrHeer Apr 22, 2019

MrHeer commented Apr 25, 2019

zombieJ commented Apr 25, 2019

MrHeer commented Apr 25, 2019 •

edited

zombieJ commented Apr 25, 2019

MrHeer commented Apr 25, 2019

afc163 commented Apr 25, 2019

MrHeer commented Apr 25, 2019 •

edited

MrHeer commented Apr 25, 2019

zombieJ Apr 26, 2019

MrHeer Apr 26, 2019

MrHeer Apr 26, 2019

zombieJ Apr 26, 2019

MrHeer Apr 26, 2019

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

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

Conversation

MrHeer commented Apr 19, 2019 • edited by markdownify bot

🤔 This is a ...

👻 What's the background?

💡 Solution

📝 Changelog

☑️ Self Check before Merge

netlify bot commented Apr 19, 2019 • edited

Choose a reason for hiding this comment

MrHeer Apr 20, 2019 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

afc163 commented Apr 22, 2019

MrHeer commented Apr 22, 2019

afc163 commented Apr 22, 2019

MrHeer commented Apr 22, 2019

codecov bot commented Apr 22, 2019 • edited

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MrHeer commented Apr 25, 2019

zombieJ commented Apr 25, 2019

MrHeer commented Apr 25, 2019 • edited

zombieJ commented Apr 25, 2019

MrHeer commented Apr 25, 2019

afc163 commented Apr 25, 2019

MrHeer commented Apr 25, 2019 • edited

MrHeer commented Apr 25, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MrHeer commented Apr 19, 2019 •

edited by markdownify bot

netlify bot commented Apr 19, 2019 •

edited

MrHeer Apr 20, 2019 •

edited

codecov bot commented Apr 22, 2019 •

edited

MrHeer commented Apr 25, 2019 •

edited

MrHeer commented Apr 25, 2019 •

edited