Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
c6a17dc
feat(slider): poc ticks implementation
Aleksandyr Oct 24, 2019
20fdb80
feat(slider): merge ticks feat with master
Aleksandyr Oct 28, 2019
e7dafce
feat(slider): set ticks and labels dimensions and indentions
Aleksandyr Oct 30, 2019
27786f6
Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular…
Aleksandyr Oct 30, 2019
5d42727
feat(slider): ticks feat as a separate component
Aleksandyr Oct 31, 2019
4b4887b
feat(slider): finish label orientations
Aleksandyr Nov 1, 2019
ac86fbe
feat(slider): integrate tick labels with labels feat
Aleksandyr Nov 6, 2019
866604a
Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular…
Aleksandyr Nov 6, 2019
7fe44cb
feat(slider): show/hide secondary/primary tick labels
Aleksandyr Nov 6, 2019
e3336a4
feat(slider): top|bottom|mirror ticks orientation
Aleksandyr Nov 7, 2019
6723a12
fix(slider): top ticks integration with labels feat
Aleksandyr Nov 7, 2019
cbd80c2
feat(slider): allow tick labels custom template
Aleksandyr Nov 8, 2019
a6f7af9
feat(slider): drop svg and change template structure
Aleksandyr Nov 11, 2019
9abb681
Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular…
Aleksandyr Nov 11, 2019
3f7a50a
fix(slider): remove resizeObserver
Aleksandyr Nov 11, 2019
a0aa55b
fix(slider): Adding styles for slider ticks
Nov 11, 2019
97ff935
Merge remote-tracking branch 'IGX/slider-ticks-drop-svg-master' into …
Nov 11, 2019
a1c68ca
feat(slider): expose classes for label hide/show and orientation
Aleksandyr Nov 11, 2019
a4507d8
fix(slider): expose tick labels orientation properly
Aleksandyr Nov 11, 2019
75f1411
Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular…
Aleksandyr Nov 12, 2019
6383966
Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular…
Aleksandyr Nov 13, 2019
e9e2b62
feat(slider): Adding styling to ticks and labels of the slider component
Nov 13, 2019
fc18430
feat(slider): Fix the template to work as expected in chrome and add …
Nov 13, 2019
96bfb4b
feat(slider): move the transition on the correct selector to work bot…
Nov 13, 2019
b5f0f10
Merge branch 'slider-ticks-drop-svg-master' of https://github.com/Ign…
Aleksandyr Nov 13, 2019
bdbe25f
fix(slider): remove default lebal horizontal class
Aleksandyr Nov 13, 2019
756437c
fix(slider): remove all comented code
Aleksandyr Nov 13, 2019
997a994
Fix some minor issues
Nov 13, 2019
493aa25
fix steps
Nov 13, 2019
24c8170
fix(slider): workaround for querylist changes ovservable
Aleksandyr Nov 13, 2019
c7aafe3
Merge branch 'master' into slider-ticks-drop-svg-master
Aleksandyr Nov 18, 2019
d547c46
feat(slider): Fix bottom to top and top to bottom orientation
Nov 18, 2019
6150a1b
Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular…
Aleksandyr Nov 18, 2019
a2f567f
feat(slider): Fix label line height issue
Nov 18, 2019
618af81
Merge branch 'slider-ticks-drop-svg-master' of https://github.com/Ign…
Aleksandyr Nov 18, 2019
b99f1c2
feat(slider): Fix label top position
Nov 18, 2019
15581dd
Merge branch 'slider-ticks-drop-svg-master' of https://github.com/Ign…
Aleksandyr Nov 18, 2019
da5a721
feat(slider): Fix label bottom position
Nov 18, 2019
afa0e9f
Merge branch 'slider-ticks-drop-svg-master' of https://github.com/Ign…
Aleksandyr Nov 18, 2019
6e0148e
fix(slider): snap to the lowerBound if value exceed it
Aleksandyr Nov 18, 2019
2df9021
fix(slider): refresh travel zone when change labels runtime
Aleksandyr Nov 19, 2019
2cea62d
Merge branch 'master' into slider-ticks-drop-svg-master
ddincheva Nov 19, 2019
015acf6
feat(slider): Fix short secondary label top position when there is a …
Nov 19, 2019
e4c3b64
Merge remote-tracking branch 'IGX/slider-ticks-drop-svg-master' into …
Nov 19, 2019
d9b5083
Merge branch 'master' into slider-ticks-drop-svg-master
desig9stein Nov 19, 2019
bff3a55
feat(slider): Adding color for disabled state
Nov 19, 2019
a5ade4a
Merge remote-tracking branch 'IGX/slider-ticks-drop-svg-master' into …
Nov 19, 2019
c32495f
fix(slider): fix slider in grid
Nov 20, 2019
3917349
fix(slider): slider labels negative range values
Aleksandyr Nov 20, 2019
ba0fe48
Merge branch 'slider-ticks-drop-svg-master' of https://github.com/Ign…
Aleksandyr Nov 20, 2019
e556c2a
fix(slider): hide thumb label when change ticks orientation
Aleksandyr Nov 20, 2019
ef52391
fix(slider): allow setting min/max vals simultaneously
Aleksandyr Nov 20, 2019
ee182f5
Merge branch 'master' into slider-ticks-drop-svg-master
ddincheva Nov 21, 2019
95816da
fix(slider): dipslay right amount of primary/secondary ticks
Aleksandyr Nov 21, 2019
9f763df
Merge branch 'slider-ticks-drop-svg-master' of https://github.com/Ign…
Aleksandyr Nov 21, 2019
5af738a
Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular…
Aleksandyr Nov 21, 2019
3bc644a
fix(slider): show/hide ticks input property
Aleksandyr Nov 21, 2019
ea92278
fix(slider): snapping thumbs on range | slider show/hide ticks
Aleksandyr Nov 21, 2019
0036b79
fix(slider): document any new inputs in regards of ticks feat
Aleksandyr Nov 21, 2019
8a04867
docs(slider): update changelog with new slider ticks feat
Aleksandyr Nov 21, 2019
c36b257
Merge branch 'master' into slider-ticks-drop-svg-master
ddincheva Nov 22, 2019
8f88720
Merge branch 'slider-ticks-drop-svg-master' of https://github.com/Ign…
Aleksandyr Nov 22, 2019
a63c69e
test(slider): add some base tests of ticks feat Closes #4594
Aleksandyr Nov 22, 2019
517bd5a
merge
Aleksandyr Nov 22, 2019
c45d18a
test(slider): fix lint errors Closes #4594
Aleksandyr Nov 22, 2019
5632d57
merge
Aleksandyr Nov 25, 2019
e1890d3
merge
Aleksandyr Nov 25, 2019
2d22b45
Merge branch 'master' into slider-ticks-drop-svg-master
rkaraivanov Nov 26, 2019
684ba72
Merge branch 'master' of https://github.com/IgniteUI/igniteui-angular…
Aleksandyr Nov 27, 2019
768a1a2
Merge branch 'slider-ticks-drop-svg-master' of https://github.com/Ign…
Aleksandyr Nov 27, 2019
d0478b9
chore(*): update slider ticks labels tests
nrobakova Nov 27, 2019
418bc20
fix(slider): hiding thumb label properly
Aleksandyr Nov 27, 2019
3a814f5
Merge branch 'slider-ticks-drop-svg-master' of https://github.com/Ign…
Aleksandyr Nov 27, 2019
cf69d2e
Merge branch 'master' into slider-ticks-drop-svg-master
kdinev Nov 27, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,19 +56,30 @@ All notable changes for each version of this project will be documented in this
</ng-template>
</igx-grid>
```
- `IgxCarousel`:
- `keyboardSupport` input is added, which can be used to enable and disable keyboard navigation
- `gesturesSupport` input is added, which can be used to enable and disable gestures
- `maximumIndicatorsCount` input is added, which can be used to set the number of visible indicators
- `indicatorsOrientation` input is added, which can be used to set the position of indicators it can be top or bottom
- `animationType` input is added, which can be used to set animation when changing slides
- `indicatorTemplate` directive is added, which can be used to provide a custom indicator for carousel. If this property is not provided, a default indicator template will be used instead.
- `nextButtonTemplate` directive is added, which is used to provide a custom next button template. If not provided, a default next button is used.
- `prevButtonTemplate` directive is added, which is used to provide a custom previous button template. If not provided, a default previous button is used.
- `IgxSlider`:
- `primaryTicks` input was added. Which sets the number of primary ticks
- `secondaryTicks` input was added. Which sets the number of secondary ticks.
- `showTicks` input was added. Which show/hide all slider ticks and tick labels.
- `primaryTickLabels` input was added. Which shows/hides all primary tick labels.
- `secondaryTickLabels` input was added. Shows/hides all secondary tick labels.
- `ticksOrientation` input was added. Allows to change ticks orientation to top|bottom|mirror.
- `tickLabelsOrientation` input was added. Allows you to change the rotation of all tick labels from horizontal to vertical(toptobottom, bottomtotop).
- `igxSliderTickLabel` directive has been introduced. Allows you to set a custom template for all tick labels.

- `IgxCarousel`:
- `keyboardSupport` input is added, which can be used to enable and disable keyboard navigation
- `gesturesSupport` input is added, which can be used to enable and disable gestures
- `maximumIndicatorsCount` input is added, which can be used to set the number of visible indicators
- `indicatorsOrientation` input is added, which can be used to set the position of indicators it can be top or bottom
- `animationType` input is added, which can be used to set animation when changing slides
- `indicatorTemplate` directive is added, which can be used to provide a custom indicator for carousel. If this property is not provided, a default indicator template will be used instead.
- `nextButtonTemplate` directive is added, which is used to provide a custom next button template. If not provided, a default next button is used.
- `prevButtonTemplate` directive is added, which is used to provide a custom previous button template. If not provided, a default previous button is used.

- `IgxSelect`:
- adding `IgxSelectHeaderDirective` and `IgxSelectFooterDirective`. These can be used to provide a custom header, respectively footer templates for the `igxSelect` drop-down list. If there are no templates marked with these directives - no default templates will be used so the drop-down list will not have header nor footer.


## 8.2.6

### New Features
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,44 @@
@extend %igx-slider-track-fill !optional;
}

@include e(track-ticks) {
@extend %igx-slider-track-ticks !optional;
@include e(ticks) {
@extend %igx-slider__ticks !optional;
}

@include e(ticks, $m: tall) {
@extend %igx-slider__ticks--tall !optional;
}

@include e(ticks, $m: top) {
@extend %igx-slider__ticks--top !optional;
}

@include e(tick-label, $m: hidden) {
@extend %igx-slider__tick-label--hidden !optional;
}

@include e(tick-labels, $m: top-bottom) {
@extend %igx-slider__tick-labels--top-bottom !optional;
}

@include e(tick-labels, $m: bottom-top) {
@extend %igx-slider__tick-labels--bottom-top !optional;
}

@include e(ticks-group) {
@extend %igx-slider__ticks-group !optional;
}

@include e(ticks-group, $m: tall) {
@extend %igx-slider__ticks-group--tall !optional;
}

@include e(ticks-tick) {
@extend %igx-slider__ticks-tick !optional;
}

@include e(ticks-label) {
@extend %igx-slider__ticks-label !optional;
}

@include e(thumbs) {
Expand Down Expand Up @@ -76,6 +112,10 @@
}
}

@include e(track-steps) {
@extend %igx-slider-track-steps !optional;
}

@include m(disabled) {
@extend %igx-slider-display !optional;

Expand All @@ -84,14 +124,21 @@
@extend %igx-slider-track--disabled !optional;
}

@include e(track-steps) {
@extend %igx-slider-track-steps--disabled !optional;
}

@include e(track-fill) {
@extend %igx-slider-track-fill !optional;
@extend %igx-slider-track-fill--disabled !optional;
}

@include e(track-ticks) {
@extend %igx-slider-track-ticks !optional;
@extend %igx-slider-track-ticks--disabled !optional;
@include e(ticks-tick) {
@extend %igx-slider__tick--disabled !optional;
}

@include e(ticks-label) {
@extend %igx-slider__ticks-labels--disabled !optional;
}

@each $t in $thumbs {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
/// @param {Color} $base-track-color [null] - The base background color of the track.
/// @param {Color} $disabled-base-track-color [null] - The base background color of the track when is disabled.
///
/// @param {Color} $tick-label-color [null] - The color of the tick label.
/// @param {Color} $tick-label-color--tall [null] - The color of the tall tick label .
/// @param {Color} $tick-color [null] - The background-color of the tick.
/// @param {Color} $tick-color--tall [null] - The background-color of the tall tick.
///
/// @requires $default-palette
/// @requires $light-schema
/// @requires apply-palette
Expand Down Expand Up @@ -44,7 +49,11 @@
$thumb-disabled-border-color: null,
$track-hover-color: null,
$thumb-hover-color: null,
$base-track-hover-color: null
$base-track-hover-color: null,
$tick-label-color: null,
$tick-label-color-tall: null,
$tick-color: null,
$tick-color-tall: null,
) {
$name: 'igx-slider';
$slider-schema: ();
Expand Down Expand Up @@ -75,7 +84,11 @@
disabled-base-track-color: $disabled-base-track-color,
thumb-border-color: $thumb-border-color,
thumb-disabled-border-color: $thumb-disabled-border-color,
base-track-hover-color: $base-track-hover-color
base-track-hover-color: $base-track-hover-color,
tick-label-color: $tick-label-color,
tick-label-color-tall: $tick-label-color-tall,
tick-color: $tick-color,
tick-color-tall: $tick-color-tall,
));
}

Expand All @@ -96,6 +109,13 @@
fluent: 4px
), map-get($theme, variant));

// Slide ticks
$tick-push: rem(4px);
$base-tick-height: rem(8px);
$tick-height: $base-tick-height;
$tick-height--tall: $base-tick-height * 2;
$tick-width: rem(2px);

$thumb-border-width: map-get((
material: 0,
fluent: 2px
Expand Down Expand Up @@ -165,10 +185,11 @@
height: 0;
cursor: default;
z-index: 1;
left: 0;
}

%igx-slider-track {
position: absolute;
position: relative;
width: 100%;
height: rem($slider-track-height);
background: --var($theme, 'base-track-color');
Expand All @@ -179,7 +200,110 @@
background: --var($theme, 'disabled-base-track-color');
}

%igx-slider-track-ticks {
%igx-slider-track-fill {
position: absolute;
width: 100%;
height: inherit;
background: --var($theme, 'track-color');
transform-origin: #{$left} center;
transform: scaleX(0);
}

%igx-slider-track-fill--disabled {
visibility: hidden;
}

%igx-slider__ticks {
width: 100%;
display: flex;
position: absolute;
top: $tick-push;
justify-content: space-between;
z-index: 1;

&%igx-slider__ticks--top {
bottom: $tick-push;
top: auto;
align-items: flex-end;
}
}

%igx-slider__ticks-group {
display: flex;
flex-direction: column;
align-items: center;
position: relative;

&:first-of-type {
margin-left: rem(-1px);
}

&:last-of-type {
margin-left: rem(-1px);
}
}

%igx-slider__ticks-label {
color: --var($theme, 'tick-label-color');
position: absolute;
top: $tick-height--tall;
transform: translate(-50%);
line-height: .7;
opacity: 1;
transition: opacity .2s $ease-in-out-quad;
}

%igx-slider__ticks-tick {
background: --var($theme, 'tick-color');
height: $tick-height;
width: $tick-width;
}

%igx-slider__ticks--tall {
%igx-slider__ticks-label {
top: calc(#{$tick-height--tall} + #{$tick-height});
}
}

%igx-slider__tick--disabled {
background: --var($theme, 'disabled-base-track-color')!important;
}

%igx-slider__ticks-labels--disabled {
color: --var($theme, 'disabled-base-track-color')!important;
}

%igx-slider__ticks-group--tall {
%igx-slider__ticks-tick {
height: $tick-height--tall;
background: --var($theme, 'tick-color-tall');
}

%igx-slider__ticks-label {
top: calc(#{$tick-height--tall} + #{$tick-height});
color: --var($theme, 'tick-label-color-tall');
}
}

%igx-slider__ticks--top {
%igx-slider__ticks-label {
bottom: calc(#{$tick-height} + #{$tick-height});
top: auto;
}

&%igx-slider__ticks--tall {
%igx-slider__ticks-label {
bottom: calc(#{$tick-height--tall} + #{$tick-height});
top: auto;
}
}
}

%igx-slider__tick-label--hidden {
opacity: 0;
}

%igx-slider-track-steps {
position: absolute;
width: 100%;
height: rem($slider-track-height);
Expand All @@ -189,21 +313,63 @@
z-index: 1;
}

%igx-slider-track-ticks--disabled {
%igx-slider-track-steps--disabled {
visibility: hidden;
}

%igx-slider-track-fill {
position: absolute;
width: 100%;
height: inherit;
background: --var($theme, 'track-color');
transform-origin: #{$left} center;
transform: scaleX(0);
%igx-slider__tick-labels--top-bottom {
%igx-slider__ticks-group {
display: block;
}

%igx-slider__ticks-label {
writing-mode: vertical-rl;
transform: translate(-50%) rotate(0deg);
}

%igx-slider__ticks--tall {
%igx-slider__ticks-label {
top: calc(#{$tick-height--tall} + #{rem(2px)});
}
}

&%igx-slider__ticks--top {
%igx-slider__ticks-label {
writing-mode: vertical-rl;
transform: translate(-50%) rotate(0deg);
}

%igx-slider__ticks--tall {
%igx-slider__ticks-label {
bottom: calc(#{$tick-height--tall} + #{rem(2px)});
}
}
}
}

%igx-slider-track-fill--disabled {
visibility: hidden;
%igx-slider__tick-labels--bottom-top {
%igx-slider__ticks-group {
display: block;
}


%igx-slider__ticks-label {
writing-mode: vertical-rl;
transform: translate(-50%) rotate(180deg);
}

&%igx-slider__ticks--top {
%igx-slider__ticks-label {
writing-mode: vertical-rl;
transform: translate(-50%) rotate(180deg);
}

%igx-slider__ticks--tall {
%igx-slider__ticks-label {
bottom: calc(#{$tick-height--tall} + #{rem(2px)});
}
}
}
}

%igx-thumb-display {
Expand Down
Loading