Skip to content

Commit f5b3448

Browse files
authored
Merge branch '9.0.x' into mpopov/6733-9.0.x
2 parents 0c0b03c + dcb00a2 commit f5b3448

File tree

100 files changed

+769
-822
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+769
-822
lines changed

projects/igniteui-angular/src/lib/calendar/calendar.component.spec.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,8 @@ describe('IgxCalendar - ', () => {
424424
const parent = dom.query(
425425
By.css(`${HelperTestFunctions.CALENDAR_ROW_CSSCLASS}:last-child`)
426426
);
427-
const target = parent.childNodes.pop();
427+
const parentDates = parent.queryAll(By.css(HelperTestFunctions.INACTIVE_DAYS_CSSCLASS));
428+
const target = parentDates[parentDates.length - 1];
428429

429430
target.nativeElement.click();
430431
fixture.detectChanges();

projects/igniteui-angular/src/lib/carousel/carousel.component.spec.ts

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ describe('Carousel', () => {
705705
carousel = fixture.componentInstance.carousel;
706706
});
707707

708-
it('should stop/play on tap ', async () => {
708+
it('should stop/play on tap ', () => {
709709
carousel.interval = 1000;
710710
carousel.play();
711711
fixture.detectChanges();
@@ -715,15 +715,13 @@ describe('Carousel', () => {
715715

716716
expect(carousel.isPlaying).toBeTruthy();
717717

718-
HelperTestFunctions.simulateTap(carousel);
718+
HelperTestFunctions.simulateTap(fixture, carousel);
719719
fixture.detectChanges();
720-
await wait(200);
721720

722721
expect(carousel.isPlaying).toBeFalsy();
723722

724-
HelperTestFunctions.simulateTap(carousel);
723+
HelperTestFunctions.simulateTap(fixture, carousel);
725724
fixture.detectChanges();
726-
await wait(200);
727725

728726
expect(carousel.isPlaying).toBeTruthy();
729727

@@ -733,15 +731,13 @@ describe('Carousel', () => {
733731

734732
expect(carousel.isPlaying).toBeFalsy();
735733

736-
HelperTestFunctions.simulateTap(carousel);
734+
HelperTestFunctions.simulateTap(fixture, carousel);
737735
fixture.detectChanges();
738-
await wait(200);
739736

740737
expect(carousel.isPlaying).toBeFalsy();
741738

742-
HelperTestFunctions.simulateTap(carousel);
739+
HelperTestFunctions.simulateTap(fixture, carousel);
743740
fixture.detectChanges();
744-
await wait(200);
745741

746742
expect(carousel.isPlaying).toBeFalsy();
747743
});
@@ -881,9 +877,11 @@ class HelperTestFunctions {
881877
expect(carousel.slides.find((slide) => slide.active && slide.index !== index)).toBeUndefined();
882878
}
883879

884-
public static simulateTap(carousel) {
880+
public static simulateTap(fixture, carousel) {
885881
const activeSlide = carousel.get(carousel.current).nativeElement;
886-
Simulator.gestures.press(activeSlide, { duration: 180 });
882+
const carouselElement = fixture.debugElement.query(By.css('igx-carousel'));
883+
carouselElement.triggerEventHandler('tap', {target: activeSlide});
884+
// Simulator.gestures.press(activeSlide, { duration: 180 });
887885
}
888886

889887
public static simulatePan(fixture, carousel, deltaXOffset, velocity) {

projects/igniteui-angular/src/lib/core/styles/base/utilities/_functions.scss

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
/// @access public
116116
/// @requires {function} to-string
117117
/// @param {Color} $rgba - The rgba color to convert.
118-
/// @param {Color} $background - The background color to convert against.
118+
/// @param {Color} $background [#fff] - The background color to convert against.
119119
/// @return {Color} - The hexidecimal representation of the rgba value.
120120
@function hexrgba($rgba, $background: #fff) {
121121
@if type-of($rgba) == color {
@@ -155,7 +155,7 @@
155155
/// @group Palettes
156156
/// @param {Map} $palette - The source palette map.
157157
/// @param {string} $color - The target color from the color palette.
158-
/// @param {number|variant} $variant - The target color shade from the color palette.
158+
/// @param {number|variant} $variant [500] - The target color shade from the color palette.
159159
/// @requires igx-color
160160
/// @requires text-contrast
161161
/// @requires hexrgba
@@ -181,7 +181,7 @@
181181
/// Test if a component, or list of components
182182
/// is in the list of known components.
183183
/// @access private
184-
/// @param {String|List} $excludes - The components list to check in.
184+
/// @param {String|List} $items - The components list to check in.
185185
/// @return {List} - The list of passed items.
186186
@function is-component($items) {
187187
$register: map-keys($components);
@@ -196,7 +196,7 @@
196196
/// Converts numbers to HEX value strings.
197197
/// @access private
198198
/// @param {number} $num - The number to convert.
199-
/// @param {radix} $radix - The base radix to use for the conversion.
199+
/// @param {radix} $radix [16] - The base radix to use for the conversion.
200200
/// @return {String} - The resulting string.
201201
@function to-string($num, $radix: 16) {
202202
$chars: '0123456789abcdef';
@@ -301,7 +301,6 @@
301301
/// @param {Color} $surface [#fff] - The color used as a background in components, such as cards, sheets, and menus.
302302
/// @returns {Map} - A map consisting of 74 color variations, including the `primary`, `secondary`, `grays`,
303303
/// `info`, `success`, `warn`, and `error` colors.
304-
/// @see $igx-foreground-color
305304
@function igx-palette(
306305
$primary,
307306
$secondary,
@@ -548,7 +547,6 @@
548547
/// @example scss Set variable values based on $direction
549548
/// $left: if-ltr(left, right);
550549
/// $right: if-ltr(right, left);
551-
/// @requires $direction
552550
@function if-ltr($if, $else: null) {
553551
$dir: if(global-variable-exists('direction'), $direction, 'ltr');
554552

@@ -566,7 +564,6 @@
566564
/// @example scss Set variable values based on $direction
567565
/// $left: if-rtl(left, right);
568566
/// $right: if-rtl(right, left);
569-
/// @requires $direction
570567
@function if-rtl($if, $else: null) {
571568
@return if-ltr($else, $if);
572569
}

projects/igniteui-angular/src/lib/core/styles/base/utilities/_mixins.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,8 @@
215215
/// optional prefix and suffix attached to the class name.
216216
/// @access private
217217
/// @param {string} $prop - The CSS property to assign the palette color to.
218-
/// @param {string} $prefix [null] - A prefix to be attached to the class name.
219-
/// @param {string} $suffix [igx] - A suffix to be attached to the class name.
218+
/// @param {string} $prefix [igx] - A prefix to be attached to the class name.
219+
/// @param {string} $suffix [null] - A suffix to be attached to the class name.
220220
/// @example scss Generate background classes with colors from the palette.
221221
/// // Will generate class names like
222222
/// // .igx-primary-500-bg { ... };
@@ -265,7 +265,7 @@
265265

266266
/// Add theme colors to a scope.
267267
/// @access public
268-
/// @param {map} $theme - The component theme to get the
268+
/// @param {map} $theme - The component theme to be used
269269
/// @requires {mixin} css-vars-from-theme
270270
@mixin igx-css-vars($theme) {
271271
$scope: if(is-root(), ':root', '&');

projects/igniteui-angular/src/lib/core/styles/components/_common/_igx-vhelper.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/// @group themes
2+
/// @access private
13
@mixin igx-vhelper {
24
$left: if-ltr(left, right);
35
$right: if-ltr(right, left);

projects/igniteui-angular/src/lib/core/styles/components/banner/_banner-theme.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
/// @param {Color} $banner-background [null]- The background color used banner background.
1313
/// @param {Color} $banner-message-color [null]- The color used for banner label.
1414
/// @param {Color} $banner-border-color [null] - The border color used banner border.
15-
/// @param {Color} $banner-illustration-background [null] - The background color used for banner illustration.
1615
/// @param {Color} $banner-illustration-color [null] - The color used banner illustration.
1716
///
1817
/// @requires $default-palette
@@ -149,7 +148,7 @@
149148
/// Uses the 'body-2' category from the typographic scale.
150149
/// @group typography
151150
/// @param {Map} $type-scale - A typographic scale as produced by igx-type-scale.
152-
/// @param {Map} $categories [(label: 'body-2')] - The categories from the typographic scale used for type styles.
151+
/// @param {Map} $categories [(message: 'body-2')] - The categories from the typographic scale used for type styles.
153152
/// @requires {mixin} igx-type-style
154153
@mixin igx-banner-typography($type-scale, $categories: (
155154
message: 'body-2')

projects/igniteui-angular/src/lib/core/styles/components/button-group/_button-group-theme.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
/// @param {Color} $item-text-color [null]- The text color for button group items.
1616
/// @param {Color} $item-background [null] - The background color for button group items .
1717
/// @param {Color} $item-border-color [null] - The border color between button group items.
18+
/// @param {Color} $item-disabled-border [null] - The border color for a disabled item in the button group.
1819
///
1920
/// @param {Color} $item-hover-text-color [null] - The hover text color for button group items.
2021
/// @param {Color} $item-hover-background [null] - The hover background color for button group items.

projects/igniteui-angular/src/lib/core/styles/components/card/_card-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@
443443
/// category from the typographic scale.
444444
/// @group typography
445445
/// @param {Map} $type-scale - A typographic scale as produced by igx-type-scale.
446-
/// @param {Map} $categories [(title: 'h5', title-small: 'subtitle-2', subtitle: 'subtitle-2', content: 'body-2')] - The categories from the typographic scale used for type styles.
446+
/// @param {Map} $categories [(title: 'h6', title-small: 'subtitle-2', subtitle: 'subtitle-2', content: 'body-2')] - The categories from the typographic scale used for type styles.
447447
/// @requires {mixin} igx-type-style
448448
@mixin igx-card-typography($type-scale, $categories: (
449449
title: 'h6',

projects/igniteui-angular/src/lib/core/styles/components/carousel/_carousel-theme.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
/// @param {Map} $palette [$default-palette] - The palette used as basis for styling the component.
99
/// @param {Map} $schema [$light-schema] - The schema used as basis for styling the component.
10+
/// @param {Map} $elevations [$elevations] - The elevations (shadows) map to be used.
1011
/// @param {Color} $slide-background [null] - The slide background color.
1112
/// @param {Color} $button-background [null] - The previous/next buttons idle background color.
1213
/// @param {Color} $button-hover-background [null] - The previous/next buttons hover background color.

projects/igniteui-angular/src/lib/core/styles/components/checkbox/_checkbox-theme.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
/// @param {Color} $fill-color [null] - The checked border and fill colors.
1717
/// @param {Color} $tick-color [null] - The checked mark color.
1818
/// @param {Color} $disabled-color [null] - The disabled border and fill colors.
19+
/// @param {Color} $disabled-color-label [null] - The disabled label color.
1920
/// @param {border-radius} $border-radius [null] - The border radius used for checkbox component.
2021
/// @param {border-radius} $border-radius-ripple [null] - The border radius used for checkbox ripple.
2122
/// Set to light when the surrounding area is dark.

0 commit comments

Comments
 (0)