Skip to content

Commit dd7e690

Browse files
authored
Merge branch 'master' into mdragnev/zoneless-sticky-tooltip
2 parents 623d8a9 + c4530b5 commit dd7e690

12 files changed

Lines changed: 50 additions & 39 deletions

File tree

.github/workflows/npm-publish.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ jobs:
1818
cache: 'npm'
1919
registry-url: 'https://registry.npmjs.org'
2020

21-
- name: Update NPM
22-
run: npm install -g npm@latest
23-
2421
- run: echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
2522
- run: echo ${VERSION}
2623

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"express": "^5.2.1",
8383
"fflate": "^0.8.1",
8484
"igniteui-i18n-core": "^1.0.2",
85-
"igniteui-theming": "^27.3.0",
85+
"igniteui-theming": "^27.4.0",
8686
"igniteui-trial-watermark": "^3.1.0",
8787
"jspdf": "^4.2.1",
8888
"lodash-es": "^4.17.21",

projects/igniteui-angular-elements/src/app/custom-strategy.spec.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,10 @@ describe('Elements: ', () => {
204204
</igc-column-layout>
205205
</igc-grid>`;
206206
testContainer.innerHTML = innerHtml;
207+
const grid = document.querySelector<IgcNgElement & InstanceType<typeof IgcGridComponent>>('#testGrid');
207208

208-
// TODO: Better way to wait - potentially expose the queue or observable for update on the strategy
209-
await firstValueFrom(timer(10 /* SCHEDULE_DELAY */ * 3));
209+
await firstValueFrom(fromEvent(grid, "childrenResolved"));
210210

211-
const grid = document.querySelector<IgcNgElement & InstanceType<typeof IgcGridComponent>>('#testGrid');
212211
const thirdGroup = document.querySelector<IgcNgElement>('igc-column-layout[header="Product Stock"]');
213212
const secondGroup = document.querySelector<IgcNgElement>('igc-column-layout[header="Product Details"]');
214213

@@ -217,7 +216,7 @@ describe('Elements: ', () => {
217216
expect(grid.getColumnByVisibleIndex(1).field).toEqual('ProductName');
218217

219218
grid.removeChild(secondGroup);
220-
await firstValueFrom(timer(10 /* SCHEDULE_DELAY */ * 3));
219+
await firstValueFrom(fromEvent(grid, "childrenResolved"));
221220

222221
expect(grid.columns.length).toEqual(4);
223222
expect(grid.getColumnByName('ProductID')).toBeTruthy();
@@ -229,7 +228,7 @@ describe('Elements: ', () => {
229228
newColumn.setAttribute('field', 'ProductName');
230229
newGroup.appendChild(newColumn);
231230
grid.insertBefore(newGroup, thirdGroup);
232-
await firstValueFrom(timer(10 /* SCHEDULE_DELAY */ * 3));
231+
await firstValueFrom(fromEvent(grid, "childrenResolved"));
233232

234233
expect(grid.columns.length).toEqual(6);
235234
expect(grid.getColumnByVisibleIndex(1).field).toEqual('ProductName');

projects/igniteui-angular/core/src/core/styles/components/navdrawer/_navdrawer-theme.scss

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,7 @@
3939
'indigo': rem(32px),
4040
), $variant);
4141

42-
$item-mini-size: map.get((
43-
'material': rem(56px),
44-
'fluent': rem(40px),
45-
'bootstrap': rem(88px),
46-
'indigo': rem(48px),
47-
), $variant);
48-
4942
%navdrawer-display {
50-
--ig-nav-drawer-size: #{rem(240px)};
51-
--ig-nav-drawer-size--mini: #{$item-mini-size};
52-
5343
flex-basis: 0;
5444
transition: flex-basis;
5545
transition-duration: .3s;
@@ -58,11 +48,11 @@
5848
}
5949

6050
%navdrawer-display-pinned {
61-
flex-basis: var(--ig-nav-drawer-size);
51+
flex-basis: var-get($theme, 'size');
6252
}
6353

6454
%navdrawer-display-mini-pinned {
65-
flex-basis: calc(var(--ig-mini-nav-drawer-size, #{$item-mini-size}) + rem(1px));
55+
flex-basis: calc(#{var-get($theme, 'size--mini')} + #{rem(1px)});
6656
}
6757

6858
%aside {
@@ -72,7 +62,7 @@
7262
overflow-x: hidden;
7363
background: var-get($theme, 'background');
7464
inset: 0 auto;
75-
width: var(--ig-nav-drawer-size);
65+
width: var-get($theme, 'size');
7666
inset-inline-start: 0;
7767
transition: width, padding, transform;
7868
transition-timing-function: $in-out-quad;
@@ -142,7 +132,7 @@
142132

143133
%aside--mini {
144134
transition-duration: .3s;
145-
width: var(--ig-nav-drawer-size--mini);
135+
width: var-get($theme, 'size--mini');
146136
min-width: fit-content;
147137

148138
%item {
@@ -168,7 +158,7 @@
168158

169159
%aside--normal {
170160
transition-duration: .3s;
171-
width: var(--ig-nav-drawer-size);
161+
width: var-get($theme, 'size');
172162
}
173163

174164
%overlay {

projects/igniteui-angular/core/src/core/styles/components/progress/circular/_circular-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,8 @@
212212

213213
animation: igx-initial-counter var(--_transition-duration) ease-in-out;
214214
counter-reset:
215-
progress-integer var(--_progress-integer, 0)
216-
progress-fraction var(--_progress-fraction, 0);
215+
progress-integer round(down, var(--_progress-integer, 0), 1)
216+
progress-fraction round(down, var(--_progress-fraction, 0), 1);
217217
transition:
218218
--_progress-integer var(--_transition-duration) ease-in-out,
219219
--_progress-fraction var(--_transition-duration) ease-in-out;

projects/igniteui-angular/core/src/core/styles/components/progress/linear/_linear-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,8 @@ $easing-curves: (
227227
color: var-get($theme, 'text-color');
228228
animation: initial-counter var(--_transition-duration) ease-in-out;
229229
counter-reset:
230-
progress-integer var(--_progress-integer, 0)
231-
progress-fraction var(--_progress-fraction, 0);
230+
progress-integer round(down, var(--_progress-integer, 0), 1)
231+
progress-fraction round(down, var(--_progress-fraction, 0), 1);
232232
transition:
233233
--_progress-integer var(--_transition-duration) ease-in-out,
234234
--_progress-fraction var(--_transition-duration) ease-in-out;

projects/igniteui-angular/core/src/core/styles/themes/_core.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,13 @@
118118
@include theming.spacing();
119119

120120
@property --_progress-integer {
121-
syntax: '<integer>';
121+
syntax: '<number>';
122122
initial-value: 0;
123123
inherits: true;
124124
}
125125

126126
@property --_progress-fraction {
127-
syntax: '<integer>';
127+
syntax: '<number>';
128128
initial-value: 0;
129129
inherits: true;
130130
}

projects/igniteui-angular/core/src/core/utils.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,7 @@ export const flatten = (arr: any[]) => {
416416
};
417417

418418
export interface CancelableEventArgs {
419+
/* csSuppress */
419420
/**
420421
* Provides the ability to cancel the event.
421422
*/

projects/igniteui-angular/navigation-drawer/src/navigation-drawer/navigation-drawer.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
[attr.popover]="pin ? null : 'manual'"
1313
class="igx-nav-drawer__overlay"
1414
[class.igx-nav-drawer__overlay--hidden]="!isOpen"
15-
[class.igx-nav-drawer--disable-animation]="disableAnimation"
15+
[class.igx-nav-drawer--disable-animation]="animationsDisabled"
1616
(click)="close()" #overlay>
1717
</div>
1818
<nav
@@ -23,7 +23,7 @@
2323
[class.igx-nav-drawer__aside--normal]="!miniTemplate || isOpen"
2424
[class.igx-nav-drawer__aside--pinned]="pin"
2525
[class.igx-nav-drawer__aside--right]="position === 'right'" #aside
26-
[class.igx-nav-drawer--disable-animation]="disableAnimation">
26+
[class.igx-nav-drawer--disable-animation]="animationsDisabled">
2727

2828
<ng-container *ngTemplateOutlet="template || defaultItemsTemplate"></ng-container>
2929
</nav>

0 commit comments

Comments
 (0)