Skip to content

Commit cb41172

Browse files
committed
Merge branch 'master' into bpachilova/range-editable-date-input
2 parents 5ee269f + 774899c commit cb41172

File tree

109 files changed

+2868
-2725
lines changed

Some content is hidden

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

109 files changed

+2868
-2725
lines changed

package-lock.json

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

package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@
5858
"lit": "^3.3.1"
5959
},
6060
"devDependencies": {
61-
"@biomejs/biome": "~2.1.1",
61+
"@biomejs/biome": "~2.1.2",
6262
"@custom-elements-manifest/analyzer": "^0.10.4",
6363
"@igniteui/material-icons-extended": "^3.1.0",
6464
"@open-wc/testing": "^4.0.0",
65-
"@storybook/addon-a11y": "^9.0.16",
66-
"@storybook/addon-docs": "^9.0.16",
67-
"@storybook/addon-links": "^9.0.16",
68-
"@storybook/web-components-vite": "^9.0.16",
65+
"@storybook/addon-a11y": "^9.0.18",
66+
"@storybook/addon-docs": "^9.0.18",
67+
"@storybook/addon-links": "^9.0.18",
68+
"@storybook/web-components-vite": "^9.0.18",
6969
"@types/mocha": "^10.0.10",
7070
"@web/dev-server-esbuild": "^1.0.4",
7171
"@web/test-runner": "^0.20.2",
@@ -78,8 +78,8 @@
7878
"custom-element-vs-code-integration": "^1.5.0",
7979
"globby": "^14.1.0",
8080
"husky": "^9.1.7",
81-
"ig-typedoc-theme": "^6.2.2",
82-
"igniteui-theming": "^19.1.2",
81+
"ig-typedoc-theme": "^6.2.3",
82+
"igniteui-theming": "^19.2.1",
8383
"keep-a-changelog": "^2.6.2",
8484
"lint-staged": "^16.1.2",
8585
"lit-analyzer": "^2.0.3",
@@ -91,8 +91,8 @@
9191
"rimraf": "^6.0.1",
9292
"sass-embedded": "~1.78.0",
9393
"sinon": "^21.0.0",
94-
"storybook": "^9.0.16",
95-
"stylelint": "^16.21.1",
94+
"storybook": "^9.0.18",
95+
"stylelint": "^16.22.0",
9696
"stylelint-config-standard-scss": "^15.0.1",
9797
"stylelint-prettier": "^5.0.3",
9898
"stylelint-scss": "^6.12.1",
@@ -101,7 +101,7 @@
101101
"typedoc": "~0.27.9",
102102
"typedoc-plugin-localization": "^3.0.6",
103103
"typescript": "^5.8.3",
104-
"vite": "^7.0.4"
104+
"vite": "^7.0.6"
105105
},
106106
"browserslist": [
107107
"defaults"

src/components/card/themes/content.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,24 @@ import { css } from 'lit';
33
import type { Themes } from '../../../theming/types.js';
44
// Shared Styles
55
import { styles as bootstrap } from './shared/content/card.content.bootstrap.css.js';
6+
import { styles as indigo } from './shared/content/card.content.indigo.css.js';
67

78
const light = {
89
bootstrap: css`
910
${bootstrap}
1011
`,
12+
indigo: css`
13+
${indigo}
14+
`,
1115
};
1216

1317
const dark = {
1418
bootstrap: css`
1519
${bootstrap}
1620
`,
21+
indigo: css`
22+
${indigo}
23+
`,
1724
};
1825

1926
export const all: Themes = { light, dark };
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
@use 'styles/utilities' as *;
2+
3+
:host {
4+
::slotted(igc-avatar) {
5+
--ig-size: 3;
6+
}
7+
}

src/components/carousel/carousel-indicator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export default class IgcCarouselIndicatorComponent extends LitElement {
3535
});
3636

3737
@consume({ context: carouselContext, subscribe: true })
38-
private _carousel?: IgcCarouselComponent;
38+
private readonly _carousel?: IgcCarouselComponent;
3939

4040
protected get _labelFormat(): string {
4141
return this._carousel ? this._carousel.indicatorsLabelFormat : '';

src/components/carousel/carousel-slide.ts

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ import { addAnimationController } from '../../animations/player.js';
66
import { carouselContext } from '../common/context.js';
77
import { addInternalsController } from '../common/controllers/internals.js';
88
import { registerComponent } from '../common/definitions/register.js';
9-
import { createCounter, formatString } from '../common/util.js';
9+
import { formatString } from '../common/util.js';
1010
import { animations } from './animations.js';
1111
import type IgcCarouselComponent from './carousel.js';
1212
import { styles } from './themes/carousel-slide.base.css.js';
1313

14+
let nextId = 1;
15+
1416
/**
1517
* A single content container within a set of containers used in the context of an `igc-carousel`.
1618
*
@@ -27,25 +29,23 @@ export default class IgcCarouselSlideComponent extends LitElement {
2729
registerComponent(IgcCarouselSlideComponent);
2830
}
2931

30-
private static readonly increment = createCounter();
31-
3232
private readonly _internals = addInternalsController(this, {
3333
initialARIA: {
3434
role: 'tabpanel',
3535
ariaRoleDescription: 'slide',
3636
},
3737
});
3838

39-
private readonly _animationPlayer = addAnimationController(this);
39+
private readonly _player = addAnimationController(this);
4040

4141
@consume({ context: carouselContext, subscribe: true })
42-
private _carousel?: IgcCarouselComponent;
42+
private readonly _carousel?: IgcCarouselComponent;
4343

44-
protected get _index() {
44+
protected get _index(): number {
4545
return this._carousel ? this._carousel.slides.indexOf(this) : 0;
4646
}
4747

48-
protected get _total() {
48+
protected get _total(): number {
4949
return this._carousel ? this._carousel.slides.length : 0;
5050
}
5151

@@ -59,7 +59,7 @@ export default class IgcCarouselSlideComponent extends LitElement {
5959
return animation;
6060
}
6161

62-
protected get _labelFormat() {
62+
protected get _labelFormat(): string {
6363
return this._carousel ? this._carousel.slidesLabelFormat : '';
6464
}
6565

@@ -81,21 +81,16 @@ export default class IgcCarouselSlideComponent extends LitElement {
8181
public async toggleAnimation(
8282
type: 'in' | 'out',
8383
direction: 'normal' | 'reverse' = 'normal'
84-
) {
84+
): Promise<boolean> {
8585
const animation = animations.get(this._animation)!.get(type)!;
8686

87-
const options: KeyframeAnimationOptions = {
88-
duration: 320,
89-
easing: EaseInOut.Quad,
90-
direction,
91-
};
92-
93-
const [_, event] = await Promise.all([
94-
this._animationPlayer.stopAll(),
95-
this._animationPlayer.play(animation(options)),
96-
]);
97-
98-
return event.type === 'finish';
87+
return await this._player.playExclusive(
88+
animation({
89+
duration: 320,
90+
easing: EaseInOut.Quad,
91+
direction,
92+
})
93+
);
9994
}
10095

10196
protected override willUpdate(): void {
@@ -104,15 +99,14 @@ export default class IgcCarouselSlideComponent extends LitElement {
10499
});
105100
}
106101

102+
/** @internal */
107103
public override connectedCallback(): void {
108104
super.connectedCallback();
109-
110-
this.id =
111-
this.id || `igc-carousel-slide-${IgcCarouselSlideComponent.increment()}`;
105+
this.id = this.id || `igc-carousel-slide-${nextId++}`;
112106
}
113107

114108
protected override render() {
115-
return html` <slot></slot> `;
109+
return html`<slot></slot>`;
116110
}
117111
}
118112

0 commit comments

Comments
 (0)