Skip to content

Commit 47d170a

Browse files
daniellerouxdanielleroux
committed
Merge remote-tracking branch 'origin/main' into refactor/split-button-item
2 parents 04f2a38 + 070c885 commit 47d170a

File tree

68 files changed

+1913
-158
lines changed

Some content is hidden

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

68 files changed

+1913
-158
lines changed

‎BREAKING_CHANGES.md

+18
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,24 @@
66

77
Use `ix-dropdown-item` instead of `ix-split-button-item`. `ix-split-button-item` will be removed in the next major release.
88

9+
### `ix-event-list-item` remove deprecated props
10+
11+
Remove deprecated props
12+
13+
- `opacity`
14+
15+
### `ix-dropdown-button` remove deprecated props
16+
17+
Remove deprecated props
18+
19+
- `active`
20+
21+
### `ix-chip` remove deprecated events
22+
23+
Remove deprecated events
24+
25+
- `close`
26+
927
### Change `itemSelectionChange` event from `ix-select`
1028

1129
Change type of CustomEvent to:

‎packages/angular-test-app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"@angular/platform-browser": "^14.2.0",
1919
"@angular/platform-browser-dynamic": "^14.2.0",
2020
"@angular/router": "^14.2.0",
21-
"@siemens/ix-icons": "^1.1.0",
21+
"@siemens/ix-icons": "^1.2.0",
2222
"@siemens/ix": "~2.0.0-beta.1",
2323
"@siemens/ix-aggrid": "~2.0.0-beta.1",
2424
"@siemens/ix-angular": "~2.0.0-beta.1",

‎packages/angular-test-app/src/app/app-routing.module.ts

+8
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ import SelectEditable from 'src/preview-examples/select-editable';
8686
import SelectMultiple from 'src/preview-examples/select-multiple';
8787
import SelectNgModel from 'src/preview-examples/select-ng-model';
8888
import Settings from 'src/preview-examples/settings';
89+
import Slider from 'src/preview-examples/slider';
90+
import SliderError from 'src/preview-examples/slider-error';
91+
import SliderMarker from 'src/preview-examples/slider-marker';
92+
import SliderTrace from 'src/preview-examples/slider-trace';
8993
import Spinner from 'src/preview-examples/spinner';
9094
import SpinnerLarge from 'src/preview-examples/spinner-large';
9195
import SplitButton from 'src/preview-examples/split-button';
@@ -362,6 +366,10 @@ const routes: Routes = [
362366
{ path: 'key-value-list-with-icon', component: KeyValueListWithIcon },
363367
{ path: 'key-value-list-striped', component: KeyValueListStriped },
364368
{ path: 'menu-category', component: MenuCategory },
369+
{ path: 'slider', component: Slider },
370+
{ path: 'slider-trace', component: SliderTrace },
371+
{ path: 'slider-marker', component: SliderMarker },
372+
{ path: 'slider-error', component: SliderError },
365373
{ path: 'grid', component: Grid },
366374
{ path: 'grid-size', component: GridSize },
367375
{ path: 'grid-padding', component: GridPadding },

‎packages/angular-test-app/src/app/app.module.ts

+8
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@ import SelectEditable from 'src/preview-examples/select-editable';
9494
import SelectMultiple from 'src/preview-examples/select-multiple';
9595
import SelectNgModel from 'src/preview-examples/select-ng-model';
9696
import Settings from 'src/preview-examples/settings';
97+
import Slider from 'src/preview-examples/slider';
98+
import SliderError from 'src/preview-examples/slider-error';
99+
import SliderMarker from 'src/preview-examples/slider-marker';
100+
import SliderTrace from 'src/preview-examples/slider-trace';
97101
import Spinner from 'src/preview-examples/spinner';
98102
import SpinnerLarge from 'src/preview-examples/spinner-large';
99103
import SplitButton from 'src/preview-examples/split-button';
@@ -241,6 +245,10 @@ import { NavigationTestComponent } from './components/navigation-test.component'
241245
ContentHeader,
242246
ContentHeaderNoBack,
243247
MenuCategory,
248+
Slider,
249+
SliderTrace,
250+
SliderMarker,
251+
SliderError,
244252
Grid,
245253
GridSize,
246254
GridPadding,

‎packages/angular-test-app/src/preview-examples/slider-error.html

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<ix-slider trace trace-reference="50" [marker]="[0, 25, 50, 75, 100]" error>
2+
<span slot="label-start">0</span>
3+
<span slot="label-end">100</span>
4+
</ix-slider>
5+
6+
<ix-slider
7+
min="0"
8+
max="50"
9+
step="10"
10+
value="20"
11+
trace
12+
trace-reference="50"
13+
[marker]="[0, 10, 20, 30, 40, 50]"
14+
error="Error message"
15+
>
16+
<span slot="label-start">0</span>
17+
<span slot="label-end">100</span>
18+
</ix-slider>

‎packages/angular-test-app/src/preview-examples/slider-error.ts

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/*
2+
* SPDX-FileCopyrightText: 2023 Siemens AG
3+
*
4+
* SPDX-License-Identifier: MIT
5+
*
6+
* This source code is licensed under the MIT license found in the
7+
* LICENSE file in the root directory of this source tree.
8+
*/
9+
10+
import { Component } from '@angular/core';
11+
12+
@Component({
13+
selector: 'app-example',
14+
templateUrl: './slider-error.html',
15+
})
16+
export default class SliderError {}

‎packages/angular-test-app/src/preview-examples/slider-marker.html

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<ix-slider value="25" [marker]="[0, 25, 50, 75, 100]">
2+
<span slot="label-start">0</span>
3+
<span slot="label-end">100</span>
4+
</ix-slider>
5+
6+
<ix-slider
7+
min="0"
8+
max="50"
9+
step="10"
10+
value="10"
11+
marker="[0, 10, 20, 30, 40, 50]"
12+
>
13+
<span slot="label-start">0</span>
14+
<span slot="label-end">100</span>
15+
</ix-slider>

‎packages/angular-test-app/src/preview-examples/slider-marker.ts

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/*
2+
* SPDX-FileCopyrightText: 2023 Siemens AG
3+
*
4+
* SPDX-License-Identifier: MIT
5+
*
6+
* This source code is licensed under the MIT license found in the
7+
* LICENSE file in the root directory of this source tree.
8+
*/
9+
10+
import { Component } from '@angular/core';
11+
12+
@Component({
13+
selector: 'app-example',
14+
templateUrl: './slider-marker.html',
15+
})
16+
export default class SliderMarker {}

‎packages/angular-test-app/src/preview-examples/slider-trace.html

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<ix-slider
2+
trace
3+
trace-reference="50"
4+
[marker]="[0, 25, 50, 75, 100]"
5+
value="25"
6+
>
7+
<span slot="label-start">0</span>
8+
<span slot="label-end">100</span>
9+
</ix-slider>
10+
11+
<ix-slider
12+
min="0"
13+
max="50"
14+
value="20"
15+
step="10"
16+
trace
17+
trace-reference="10"
18+
[marker]="[0, 10, 20, 30, 40, 50]"
19+
>
20+
<span slot="label-start">0</span>
21+
<span slot="label-end">100</span>
22+
</ix-slider>

‎packages/angular-test-app/src/preview-examples/slider-trace.ts

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/*
2+
* SPDX-FileCopyrightText: 2023 Siemens AG
3+
*
4+
* SPDX-License-Identifier: MIT
5+
*
6+
* This source code is licensed under the MIT license found in the
7+
* LICENSE file in the root directory of this source tree.
8+
*/
9+
10+
import { Component } from '@angular/core';
11+
12+
@Component({
13+
selector: 'app-example',
14+
templateUrl: './slider-trace.html',
15+
})
16+
export default class SliderTrace {}

‎packages/angular-test-app/src/preview-examples/slider.html

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<ix-slider value="25">
2+
<span slot="label-start">0</span>
3+
<span slot="label-end">100</span>
4+
</ix-slider>
5+
6+
<ix-slider min="0" max="50" step="10" value="10">
7+
<span slot="label-start">0</span>
8+
<span slot="label-end">100</span>
9+
</ix-slider>

‎packages/angular-test-app/src/preview-examples/slider.ts

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/*
2+
* SPDX-FileCopyrightText: 2023 Siemens AG
3+
*
4+
* SPDX-License-Identifier: MIT
5+
*
6+
* This source code is licensed under the MIT license found in the
7+
* LICENSE file in the root directory of this source tree.
8+
*/
9+
10+
import { Component } from '@angular/core';
11+
12+
@Component({
13+
selector: 'app-example',
14+
templateUrl: './slider.html',
15+
})
16+
export default class Slider {}

‎packages/angular/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"license": "MIT",
1818
"dependencies": {
1919
"@siemens/ix": "~2.0.0-beta.1",
20-
"@siemens/ix-icons": "^1.1.0"
20+
"@siemens/ix-icons": "^1.2.0"
2121
},
2222
"peerDependencies": {
2323
"@angular/core": ">=13.3.12"

‎packages/angular/src/components.ts

+31-9
Original file line numberDiff line numberDiff line change
@@ -374,16 +374,12 @@ export class IxChip {
374374
constructor(c: ChangeDetectorRef, r: ElementRef, protected z: NgZone) {
375375
c.detach();
376376
this.el = r.nativeElement;
377-
proxyOutputs(this, this.el, ['close', 'closeChip']);
377+
proxyOutputs(this, this.el, ['closeChip']);
378378
}
379379
}
380380

381381

382382
export declare interface IxChip extends Components.IxChip {
383-
/**
384-
* Fire event if close button is clicked @deprecated Will be removed in 2.0.0. Use `closeChip`
385-
*/
386-
close: EventEmitter<CustomEvent<any>>;
387383
/**
388384
* Fire event if close button is clicked @since 1.5.0
389385
*/
@@ -618,14 +614,14 @@ export declare interface IxDropdown extends Components.IxDropdown {
618614

619615

620616
@ProxyCmp({
621-
inputs: ['active', 'disabled', 'ghost', 'icon', 'label', 'outline', 'placement', 'variant']
617+
inputs: ['disabled', 'ghost', 'icon', 'label', 'outline', 'placement', 'variant']
622618
})
623619
@Component({
624620
selector: 'ix-dropdown-button',
625621
changeDetection: ChangeDetectionStrategy.OnPush,
626622
template: '<ng-content></ng-content>',
627623
// eslint-disable-next-line @angular-eslint/no-inputs-metadata-property
628-
inputs: ['active', 'disabled', 'ghost', 'icon', 'label', 'outline', 'placement', 'variant'],
624+
inputs: ['disabled', 'ghost', 'icon', 'label', 'outline', 'placement', 'variant'],
629625
})
630626
export class IxDropdownButton {
631627
protected el: HTMLElement;
@@ -762,14 +758,14 @@ export declare interface IxEventList extends Components.IxEventList {}
762758

763759

764760
@ProxyCmp({
765-
inputs: ['chevron', 'color', 'disabled', 'opacity', 'selected']
761+
inputs: ['chevron', 'color', 'disabled', 'selected']
766762
})
767763
@Component({
768764
selector: 'ix-event-list-item',
769765
changeDetection: ChangeDetectionStrategy.OnPush,
770766
template: '<ng-content></ng-content>',
771767
// eslint-disable-next-line @angular-eslint/no-inputs-metadata-property
772-
inputs: ['chevron', 'color', 'disabled', 'opacity', 'selected'],
768+
inputs: ['chevron', 'color', 'disabled', 'selected'],
773769
})
774770
export class IxEventListItem {
775771
protected el: HTMLElement;
@@ -1841,6 +1837,32 @@ export declare interface IxSelectItem extends Components.IxSelectItem {
18411837
}
18421838

18431839

1840+
@ProxyCmp({
1841+
inputs: ['disabled', 'error', 'marker', 'max', 'min', 'step', 'trace', 'traceReference', 'value']
1842+
})
1843+
@Component({
1844+
selector: 'ix-slider',
1845+
changeDetection: ChangeDetectionStrategy.OnPush,
1846+
template: '<ng-content></ng-content>',
1847+
// eslint-disable-next-line @angular-eslint/no-inputs-metadata-property
1848+
inputs: ['disabled', 'error', 'marker', 'max', 'min', 'step', 'trace', 'traceReference', 'value'],
1849+
})
1850+
export class IxSlider {
1851+
protected el: HTMLElement;
1852+
constructor(c: ChangeDetectorRef, r: ElementRef, protected z: NgZone) {
1853+
c.detach();
1854+
this.el = r.nativeElement;
1855+
proxyOutputs(this, this.el, ['valueChange']);
1856+
}
1857+
}
1858+
1859+
1860+
export declare interface IxSlider extends Components.IxSlider {
1861+
1862+
valueChange: EventEmitter<CustomEvent<number>>;
1863+
}
1864+
1865+
18441866
@ProxyCmp({
18451867
inputs: ['size', 'variant']
18461868
})

‎packages/angular/src/declare-components.ts

+1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ export const DIRECTIVES = [
7272
d.IxRow,
7373
d.IxSelect,
7474
d.IxSelectItem,
75+
d.IxSlider,
7576
d.IxSpinner,
7677
d.IxSplitButton,
7778
d.IxSplitButtonItem,

0 commit comments

Comments
 (0)