feat(module:slider): support nzTooltipVisible #2817

wzhudev · 2019-01-21T16:05:47Z

PR Checklist

Please check if your PR fulfills the following requirements:

The commit message follows our guidelines: https://github.com/NG-ZORRO/ng-zorro-antd/blob/master/CONTRIBUTING.md#commit
Tests for the changes have been added (for bug fixes / features)
Docs have been added / updated (for bug fixes / features)

PR Type

What kind of change does this PR introduce?

[x] Bugfix
[x] Feature
[ ] Code style update (formatting, local variables)
[x] Refactoring (no functional changes, no api changes)
[ ] Build related changes
[ ] CI related changes
[x] Documentation content changes
[ ] Application (the showcase website) / infrastructure changes
[ ] Other... Please describe:

What is the current behavior?

Issue Number: #2373

What is the new behavior?

Does this PR introduce a breaking change?

[ ] Yes
[x] No

Other information

netlify · 2019-01-21T16:17:32Z

Deploy preview for ng-zorro-master ready!

Built with commit 8155fcd

https://deploy-preview-2817--ng-zorro-master.netlify.com

netlify · 2019-01-21T16:25:49Z

Deploy preview for ng-zorro-master ready!

Built with commit 81aab73

https://deploy-preview-2817--ng-zorro-master.netlify.com

codecov · 2019-01-22T02:44:19Z

Codecov Report

Merging #2817 into master will increase coverage by <.01%.
The diff coverage is 92.42%.

@@            Coverage Diff             @@
##           master    #2817      +/-   ##
==========================================
+ Coverage   97.36%   97.37%   +<.01%     
==========================================
  Files         524      527       +3     
  Lines       11042    10995      -47     
  Branches      782      793      +11     
==========================================
- Hits        10751    10706      -45     
+ Misses        190      185       -5     
- Partials      101      104       +3

Impacted Files	Coverage Δ
components/core/util/getMentions.ts	`60% <ø> (ø)`	⬆️
components/slider/nz-slider.module.ts	`100% <ø> (ø)`	⬆️
components/core/util/check.ts	`91.17% <ø> (ø)`	⬆️
components/slider/nz-slider-track.component.ts	`100% <100%> (ø)`	⬆️
components/timeline/nz-timeline.component.ts	`97.87% <100%> (ø)`	⬆️
components/core/util/number.ts	`100% <100%> (ø)`
components/cascader/nz-cascader.component.ts	`99.22% <100%> (ø)`	⬆️
components/core/util/array.ts	`100% <100%> (ø)`	⬆️
components/slider/nz-slider-definitions.ts	`100% <100%> (ø)`
components/slider/nz-slider-error.ts	`50% <50%> (ø)`
... and 21 more

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 f2fde8c...81aab73. Read the comment docs.

vthinkxie · 2019-02-14T02:18:25Z

components/core/util/number.ts

+  if (isNaN(num) || num < min) {
+    return min;
+  } else if (num > max) {
+    console.log('captured max');


vthinkxie · 2019-02-14T02:21:02Z

components/slider/nz-slider.spec.ts

-    it('should pass un-covered code testing', () => {
-      expect(sliderInstance.getValueToOffset()).toBe(sliderInstance.value);
+    it('should always display tooltip work', () => {
+


vthinkxie · 2019-02-14T02:21:09Z

components/slider/nz-slider.spec.ts

+    });
+
+    it('should never display tooltip word', () => {
+


vthinkxie · 2019-02-14T02:25:21Z

components/slider/doc/index.en-US.md

@@ -28,5 +28,6 @@ To input a value in a range.
 | `[nzTipFormatter]` | Slider will pass its value to `tipFormatter`, and display its value in Tooltip, and hide Tooltip when return value is null. | `(value: number) => string` | - |
 | `[ngModel]` | The value of slider. When `range` is `false`, use `number`, otherwise, use `[number, number]` | `number｜number[]` | - |
 | `[nzVertical]` | If true, the slider will be vertical. | `boolean` | `false` |
+| `[nzTooltipVisible]` | When set to `always` tooltips are always displayed. When set to `never` they are never displayed | `default｜always｜never` | `default` |


should be 'default'｜'always'｜'never'

vthinkxie · 2019-02-14T02:25:32Z

components/slider/doc/index.zh-CN.md

@@ -29,5 +29,6 @@ title: Slider
 | `[nzTipFormatter]` | Slider 会把当前值传给 `nzTipFormatter`，并在 Tooltip 中显示 `nzTipFormatter` 的返回值，若为 null，则隐藏 Tooltip。 | `(value: number) => string` | - |
 | `[ngModel]` | 设置当前取值。当 `range` 为 `false` 时，使用 `number`，否则用 `[number, number]` | `number｜number[]` | - |
 | `[nzVertical]` | 值为 `true` 时，Slider 为垂直方向 | `boolean` | `false` |
+| `[nzTooltipVisible]` | 值为 `always` 时总是显示，值为 `never` 时在任何情况下都不显示 | `default｜always｜never` | `default` |


'default'｜'always'｜'never'

vthinkxie · 2019-02-14T02:32:35Z

components/slider/nz-slider-handle.component.ts

  selector           : 'nz-slider-handle',
  preserveWhitespaces: false,
  templateUrl        : './nz-slider-handle.component.html'
 })
-export class NzSliderHandleComponent implements OnChanges {
+export class NzSliderHandleComponent implements OnChanges, AfterViewInit, OnDestroy {
+  @ViewChild('tooltip') tooltip: NzToolTipComponent;


@ViewChild(NzToolTipComponent)

vthinkxie · 2019-02-14T02:34:46Z

components/slider/nz-slider-handle.component.ts

+      }
+    }
+    if (nzTooltipVisible && !nzTooltipVisible.isFirstChange()) {
+      this.tooltip.show();


tooltip may be null

vthinkxie · 2019-02-14T02:36:19Z

components/slider/nz-slider-handle.component.ts

    }
+
+    // NOTE: run outside of Angular for performance consideration.
+    this.ngZone.runOutsideAngular(() => {


actually, there is no need to add runOutsideAngular here, use host:{ 'mouseenter' } is ok

vthinkxie · 2019-02-14T02:38:54Z

components/slider/nz-slider-handle.component.ts

+    }
+
+    if (show) {
+      this.tooltip.show();


this.tooltip maybe null

private toggleTooltip(show: boolean): void { if (this.nzTooltipVisible !== 'default' || !this.tooltip) { return; } if (show) { this.tooltip.show(); } else { this.tooltip.hide(); } }

If this.tooltip is null the method returns ahead of this.

wzhudev · 2019-02-19T09:16:47Z

@vthinkxie Fixed. Please review again.

close NG-ZORRO#2373 test: add test fix: fix hover handles rebase

wzhudev changed the title ~~feat(module:slider): support nzTooltipVisible~~ WIP(module:slider): support nzTooltipVisible Jan 21, 2019

wzhudev force-pushed the slider branch from 8155fcd to aa6b428 Compare January 21, 2019 16:09

wzhudev added the PR::eyes: Need Review label Jan 22, 2019

wzhudev requested a review from vthinkxie January 22, 2019 03:02

wzhudev changed the title ~~WIP(module:slider): support nzTooltipVisible~~ feat(module:slider): support nzTooltipVisible Jan 22, 2019

vthinkxie mentioned this pull request Jan 24, 2019

MILESTONE: LATE 2018 #2381

Closed

86 tasks

wzhudev force-pushed the slider branch from 6620f68 to e0a9043 Compare February 12, 2019 05:24

vthinkxie reviewed Feb 14, 2019

View reviewed changes

components/slider/nz-slider.spec.ts

});

it('should never display tooltip word', () => {

Copy link

Member

vthinkxie Feb 14, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

miss test

vthinkxie reviewed Feb 14, 2019

View reviewed changes

vthinkxie added PR::wave: Need Change and removed PR::eyes: Need Review labels Feb 14, 2019

wzhudev force-pushed the slider branch from 8cf4ebb to f002f24 Compare February 16, 2019 03:48

feat(module:slider): support nzTooltipVisible

81aab73

close NG-ZORRO#2373 test: add test fix: fix hover handles rebase

wzhudev force-pushed the slider branch from f002f24 to 81aab73 Compare February 19, 2019 09:20

wzhudev closed this Feb 19, 2019

wzhudev deleted the slider branch February 19, 2019 09:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(module:slider): support nzTooltipVisible #2817

feat(module:slider): support nzTooltipVisible #2817

wzhudev commented Jan 21, 2019 •

edited

Loading

netlify bot commented Jan 21, 2019

netlify bot commented Jan 21, 2019 •

edited

Loading

codecov bot commented Jan 22, 2019 •

edited

Loading

vthinkxie Feb 14, 2019

vthinkxie Feb 14, 2019

vthinkxie Feb 14, 2019

vthinkxie Feb 14, 2019

vthinkxie Feb 14, 2019

vthinkxie Feb 14, 2019

vthinkxie Feb 14, 2019

vthinkxie Feb 14, 2019 •

edited

Loading

vthinkxie Feb 14, 2019

wzhudev Feb 14, 2019 •

edited

Loading

wzhudev commented Feb 19, 2019

feat(module:slider): support nzTooltipVisible #2817

feat(module:slider): support nzTooltipVisible #2817

Conversation

wzhudev commented Jan 21, 2019 • edited Loading

PR Checklist

PR Type

What is the current behavior?

What is the new behavior?

Does this PR introduce a breaking change?

Other information

netlify bot commented Jan 21, 2019

netlify bot commented Jan 21, 2019 • edited Loading

codecov bot commented Jan 22, 2019 • edited Loading

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vthinkxie Feb 14, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wzhudev Feb 14, 2019 • edited Loading

Choose a reason for hiding this comment

wzhudev commented Feb 19, 2019

wzhudev commented Jan 21, 2019 •

edited

Loading

netlify bot commented Jan 21, 2019 •

edited

Loading

codecov bot commented Jan 22, 2019 •

edited

Loading

vthinkxie Feb 14, 2019 •

edited

Loading

wzhudev Feb 14, 2019 •

edited

Loading