Skip to content

Commit

Permalink
Merge branch 'refs/heads/main' into fix/1625-menu-category-auto-expand
Browse files Browse the repository at this point in the history
  • Loading branch information
matthiashader committed Dec 17, 2024
2 parents c5e0e93 + de65408 commit 6489ed5
Show file tree
Hide file tree
Showing 50 changed files with 502 additions and 108 deletions.
5 changes: 0 additions & 5 deletions .changeset/cyan-mugs-travel.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/fresh-suns-cry.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/giant-melons-worry.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/good-mayflies-accept.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/lazy-birds-dream.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/quick-bugs-thank.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/real-timers-relate.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/small-games-act.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/tender-hounds-change.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/thin-frogs-relax.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/weak-singers-cover.md

This file was deleted.

9 changes: 9 additions & 0 deletions packages/aggrid/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# @siemens/ix-aggrid

## 2.2.2

### Patch Changes

- [#1615](https://github.com/siemens/ix/pull/1615) [`e6bbb44a43`](https://github.com/siemens/ix/commit/e6bbb44a43fd131a290719a27b423bceab91e3f6) Thanks [@nuke-ellington](https://github.com/nuke-ellington)! - Hide border sticky bottom in **ag-grid**.

- Updated dependencies [[`0e173504ea`](https://github.com/siemens/ix/commit/0e173504ea5a73f2822c7a322d7a23a9ddfd1fa1), [`0e173504ea`](https://github.com/siemens/ix/commit/0e173504ea5a73f2822c7a322d7a23a9ddfd1fa1), [`57586a7fd1`](https://github.com/siemens/ix/commit/57586a7fd1766d0b8bef04d7c0e32f348775b977), [`77f76febbc`](https://github.com/siemens/ix/commit/77f76febbc00df91a3d27f43845f2cfadd9234ac), [`0fe4d521ed`](https://github.com/siemens/ix/commit/0fe4d521ed0c269e63136d31d17a21022866988c), [`0e173504ea`](https://github.com/siemens/ix/commit/0e173504ea5a73f2822c7a322d7a23a9ddfd1fa1), [`1c65a17d69`](https://github.com/siemens/ix/commit/1c65a17d6911e5be72e7612e87d0b7fbeeeacc73), [`0e173504ea`](https://github.com/siemens/ix/commit/0e173504ea5a73f2822c7a322d7a23a9ddfd1fa1)]:
- @siemens/ix@2.6.1

## 2.2.1

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/aggrid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"directory": "packages/aggrid"
},
"description": "AG Grid theme based on ix theme variables",
"version": "2.2.1",
"version": "2.2.2",
"files": [
"LICENSE",
"README.md",
Expand Down Expand Up @@ -38,7 +38,7 @@
"ts-node": "^10.9.1"
},
"dependencies": {
"@siemens/ix": "~2.6.0"
"@siemens/ix": "~2.6.1"
},
"peerDependencies": {
"ag-grid-community": ">=28"
Expand Down
13 changes: 11 additions & 2 deletions packages/angular-test-app/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ import DateInputDisabled from '../preview-examples/date-input-disabled';
import DateInputLabel from '../preview-examples/date-input-label';
import DateInputReadonly from '../preview-examples/date-input-readonly';
import DateInputValidation from '../preview-examples/date-input-validation';
import DateInputWithSlots from '../preview-examples/date-input-with-slots';
import Datepicker from '../preview-examples/datepicker';
import DatepickerLocale from '../preview-examples/datepicker-locale';
import DatepickerRange from '../preview-examples/datepicker-range';
Expand Down Expand Up @@ -99,6 +100,8 @@ import FormCheckboxDisabled from '../preview-examples/form-checkbox-disabled';
import FormCheckboxGroup from '../preview-examples/form-checkbox-group';
import FormCheckboxGroupIndeterminate from '../preview-examples/form-checkbox-group-indeterminate';
import FormCheckboxValidation from '../preview-examples/form-checkbox-validation';
import FormLayoutAuto from '../preview-examples/form-layout-auto';
import FormLayoutGrid from '../preview-examples/form-layout-grid';
import FormValidation from '../preview-examples/form-validation';
import Grid from '../preview-examples/grid';
import GridPadding from '../preview-examples/grid-padding';
Expand Down Expand Up @@ -127,6 +130,7 @@ import InputPattern from '../preview-examples/input-pattern';
import InputReadonly from '../preview-examples/input-readonly';
import InputTypes from '../preview-examples/input-types';
import InputValidation from '../preview-examples/input-validation';
import InputWithSlots from '../preview-examples/input-with-slots';
import KeyValue from '../preview-examples/key-value';
import KeyValueList from '../preview-examples/key-value-list';
import KeyValueListStriped from '../preview-examples/key-value-list-striped';
Expand Down Expand Up @@ -157,6 +161,7 @@ import NumberInputLabel from '../preview-examples/number-input-label';
import NumberInputReadonly from '../preview-examples/number-input-readonly';
import NumberInputStepperButton from '../preview-examples/number-input-stepper-button';
import NumberInputValidation from '../preview-examples/number-input-validation';
import NumberInputWithSlots from '../preview-examples/number-input-with-slots';
import Pagination from '../preview-examples/pagination';
import PaginationAdvanced from '../preview-examples/pagination-advanced';
import Pane from '../preview-examples/pane';
Expand Down Expand Up @@ -222,8 +227,6 @@ import VerticalTabs from '../preview-examples/vertical-tabs';
import VerticalTabsWithAvatar from '../preview-examples/vertical-tabs-with-avatar';
import Workflow from '../preview-examples/workflow';
import WorkflowVertical from '../preview-examples/workflow-vertical';
import FormLayoutAuto from 'src/preview-examples/form-layout-auto';
import FormLayoutGrid from 'src/preview-examples/form-layout-grid';

const routes: Routes = [
{
Expand Down Expand Up @@ -434,6 +437,10 @@ const routes: Routes = [
path: 'date-input-validation',
component: DateInputValidation,
},
{
path: 'date-input-with-slots',
component: DateInputWithSlots,
},
{
path: 'datepicker',
component: Datepicker,
Expand Down Expand Up @@ -770,6 +777,7 @@ const routes: Routes = [
{ path: 'input-readonly', component: InputReadonly },
{ path: 'input-types', component: InputTypes },
{ path: 'input-validation', component: InputValidation },
{ path: 'input-with-slots', component: InputWithSlots },
{ path: 'theme-switcher', component: ThemeService },
{ path: 'tile', component: Tile },
{ path: 'timepicker', component: Timepicker },
Expand Down Expand Up @@ -901,6 +909,7 @@ const routes: Routes = [
component: NumberInputStepperButton,
},
{ path: 'number-input-validation', component: NumberInputValidation },
{ path: 'number-input-with-slots', component: NumberInputWithSlots },
{ path: 'tooltip', component: Tooltip },
{ path: 'modal-by-instance', component: ModalByInstance },
{ path: 'push-card', component: PushCard },
Expand Down
10 changes: 8 additions & 2 deletions packages/angular-test-app/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ import DateInputDisabled from '../preview-examples/date-input-disabled';
import DateInputLabel from '../preview-examples/date-input-label';
import DateInputReadonly from '../preview-examples/date-input-readonly';
import DateInputValidation from '../preview-examples/date-input-validation';
import DateInputWithSlots from '../preview-examples/date-input-with-slots';
import Datepicker from '../preview-examples/datepicker';
import DatepickerLocale from '../preview-examples/datepicker-locale';
import DatepickerRange from '../preview-examples/datepicker-range';
Expand Down Expand Up @@ -107,6 +108,8 @@ import FormCheckboxDisabled from '../preview-examples/form-checkbox-disabled';
import FormCheckboxGroup from '../preview-examples/form-checkbox-group';
import FormCheckboxGroupIndeterminate from '../preview-examples/form-checkbox-group-indeterminate';
import FormCheckboxValidation from '../preview-examples/form-checkbox-validation';
import FormLayoutAuto from '../preview-examples/form-layout-auto';
import FormLayoutGrid from '../preview-examples/form-layout-grid';
import FormValidation from '../preview-examples/form-validation';
import Grid from '../preview-examples/grid';
import GridPadding from '../preview-examples/grid-padding';
Expand Down Expand Up @@ -135,6 +138,7 @@ import InputPattern from '../preview-examples/input-pattern';
import InputReadonly from '../preview-examples/input-readonly';
import InputTypes from '../preview-examples/input-types';
import InputValidation from '../preview-examples/input-validation';
import InputWithSlots from '../preview-examples/input-with-slots';
import KeyValue from '../preview-examples/key-value';
import KeyValueList from '../preview-examples/key-value-list';
import KeyValueListStriped from '../preview-examples/key-value-list-striped';
Expand Down Expand Up @@ -165,6 +169,7 @@ import NumberInputLabel from '../preview-examples/number-input-label';
import NumberInputReadonly from '../preview-examples/number-input-readonly';
import NumberInputStepperButton from '../preview-examples/number-input-stepper-button';
import NumberInputValidation from '../preview-examples/number-input-validation';
import NumberInputWithSlots from '../preview-examples/number-input-with-slots';
import Pagination from '../preview-examples/pagination';
import PaginationAdvanced from '../preview-examples/pagination-advanced';
import Pane from '../preview-examples/pane';
Expand Down Expand Up @@ -230,8 +235,6 @@ import VerticalTabs from '../preview-examples/vertical-tabs';
import VerticalTabsWithAvatar from '../preview-examples/vertical-tabs-with-avatar';
import Workflow from '../preview-examples/workflow';
import WorkflowVertical from '../preview-examples/workflow-vertical';
import FormLayoutAuto from 'src/preview-examples/form-layout-auto';
import FormLayoutGrid from 'src/preview-examples/form-layout-grid';

@NgModule({
declarations: [
Expand Down Expand Up @@ -284,6 +287,7 @@ import FormLayoutGrid from 'src/preview-examples/form-layout-grid';
DateInputLabel,
DateInputReadonly,
DateInputValidation,
DateInputWithSlots,
ContentExample,
DateDropdown,
DateDropdownUserRange,
Expand Down Expand Up @@ -413,6 +417,7 @@ import FormLayoutGrid from 'src/preview-examples/form-layout-grid';
InputReadonly,
InputTypes,
InputValidation,
InputWithSlots,
InputPattern,
TextareaLegacyReadonly,
TextareaLegacy,
Expand Down Expand Up @@ -450,6 +455,7 @@ import FormLayoutGrid from 'src/preview-examples/form-layout-grid';
NumberInputReadonly,
NumberInputStepperButton,
NumberInputValidation,
NumberInputWithSlots,
TabsRounded,
DatepickerRange,
Tooltip,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!--
SPDX-FileCopyrightText: 2024 Siemens AG
SPDX-License-Identifier: MIT
This source code is licensed under the MIT license found in the
LICENSE file in the root directory of this source tree.
-->

<ix-date-input value="1970/01/01">
<ix-icon name="bulb" slot="start" size="16"></ix-icon>
<ix-typography slot="end">Slot</ix-typography>
</ix-date-input>
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/*
* SPDX-FileCopyrightText: 2024 Siemens AG
*
* SPDX-License-Identifier: MIT
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

import { Component } from '@angular/core';

@Component({
selector: 'app-example',
templateUrl: './date-input-with-slots.html',
})
export default class DateInputWithSlots {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!--
SPDX-FileCopyrightText: 2024 Siemens AG
SPDX-License-Identifier: MIT
This source code is licensed under the MIT license found in the
LICENSE file in the root directory of this source tree.
-->

<ix-input>
<ix-icon name="bulb" slot="start" size="16"></ix-icon>
<ix-typography slot="end">unit</ix-typography>
</ix-input>
16 changes: 16 additions & 0 deletions packages/angular-test-app/src/preview-examples/input-with-slots.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/*
* SPDX-FileCopyrightText: 2024 Siemens AG
*
* SPDX-License-Identifier: MIT
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

import { Component } from '@angular/core';

@Component({
selector: 'app-example',
templateUrl: './input-with-slots.html'
})
export default class InputWithSlots {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!--
SPDX-FileCopyrightText: 2024 Siemens AG
SPDX-License-Identifier: MIT
This source code is licensed under the MIT license found in the
LICENSE file in the root directory of this source tree.
-->

<ix-number-input>
<ix-icon name="bulb" slot="start" size="16"></ix-icon>
<ix-typography slot="end">unit</ix-typography>
</ix-number-input>
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/*
* SPDX-FileCopyrightText: 2024 Siemens AG
*
* SPDX-License-Identifier: MIT
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

import { Component } from '@angular/core';

@Component({
selector: 'app-example',
templateUrl: './number-input-with-slots.html'
})
export default class NumberInputWithSlots {}
9 changes: 9 additions & 0 deletions packages/angular/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# @siemens/ix-angular

## 2.6.1

### Patch Changes

- [#1589](https://github.com/siemens/ix/pull/1589) [`ce681e2baf`](https://github.com/siemens/ix/commit/ce681e2baf0954c8d3479453cff8b1c858272360) Thanks [@Johanneslueke](https://github.com/Johanneslueke)! - Use `ix-number-input` selector in text-value-accessor for **ix-number-input**

- Updated dependencies [[`0e173504ea`](https://github.com/siemens/ix/commit/0e173504ea5a73f2822c7a322d7a23a9ddfd1fa1), [`0e173504ea`](https://github.com/siemens/ix/commit/0e173504ea5a73f2822c7a322d7a23a9ddfd1fa1), [`57586a7fd1`](https://github.com/siemens/ix/commit/57586a7fd1766d0b8bef04d7c0e32f348775b977), [`77f76febbc`](https://github.com/siemens/ix/commit/77f76febbc00df91a3d27f43845f2cfadd9234ac), [`0fe4d521ed`](https://github.com/siemens/ix/commit/0fe4d521ed0c269e63136d31d17a21022866988c), [`0e173504ea`](https://github.com/siemens/ix/commit/0e173504ea5a73f2822c7a322d7a23a9ddfd1fa1), [`1c65a17d69`](https://github.com/siemens/ix/commit/1c65a17d6911e5be72e7612e87d0b7fbeeeacc73), [`0e173504ea`](https://github.com/siemens/ix/commit/0e173504ea5a73f2822c7a322d7a23a9ddfd1fa1)]:
- @siemens/ix@2.6.1

## 2.6.0

### Minor Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"url": "https://github.com/siemens/ix",
"directory": "packages/angular"
},
"version": "2.6.0",
"version": "2.6.1",
"description": "Siemens iX for Angular",
"scripts": {
"build": "ng-packagr -c tsconfig.json",
Expand All @@ -16,7 +16,7 @@
},
"license": "MIT",
"dependencies": {
"@siemens/ix": "~2.6.0"
"@siemens/ix": "~2.6.1"
},
"peerDependencies": {
"@angular/core": ">=13.4.0",
Expand Down
20 changes: 20 additions & 0 deletions packages/core/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
# @siemens/ix

## 2.6.1

### Patch Changes

- [#1587](https://github.com/siemens/ix/pull/1587) [`0e173504ea`](https://github.com/siemens/ix/commit/0e173504ea5a73f2822c7a322d7a23a9ddfd1fa1) Thanks [@danielleroux](https://github.com/danielleroux)! - Adjust the spacing of the toggle

- [#1587](https://github.com/siemens/ix/pull/1587) [`0e173504ea`](https://github.com/siemens/ix/commit/0e173504ea5a73f2822c7a322d7a23a9ddfd1fa1) Thanks [@danielleroux](https://github.com/danielleroux)! - Align label overflow behavior of **ix-toggle** to wrap

- [#1574](https://github.com/siemens/ix/pull/1574) [`57586a7fd1`](https://github.com/siemens/ix/commit/57586a7fd1766d0b8bef04d7c0e32f348775b977) Thanks [@matthiashader](https://github.com/matthiashader)! - Hide clear button in **ix-select** for disabled and readonly states.

- [#1595](https://github.com/siemens/ix/pull/1595) [`77f76febbc`](https://github.com/siemens/ix/commit/77f76febbc00df91a3d27f43845f2cfadd9234ac) Thanks [@danielleroux](https://github.com/danielleroux)! - Fix undefined access of **ix-select** during rendering of label

- [#1603](https://github.com/siemens/ix/pull/1603) [`0fe4d521ed`](https://github.com/siemens/ix/commit/0fe4d521ed0c269e63136d31d17a21022866988c) Thanks [@danielleroux](https://github.com/danielleroux)! - Remove _hyperlist_ from the dependencies

- [#1587](https://github.com/siemens/ix/pull/1587) [`0e173504ea`](https://github.com/siemens/ix/commit/0e173504ea5a73f2822c7a322d7a23a9ddfd1fa1) Thanks [@danielleroux](https://github.com/danielleroux)! - Increase gap between switch and label of **ix-toggle**

- [#1588](https://github.com/siemens/ix/pull/1588) [`1c65a17d69`](https://github.com/siemens/ix/commit/1c65a17d6911e5be72e7612e87d0b7fbeeeacc73) Thanks [@nuke-ellington](https://github.com/nuke-ellington)! - Enable the possibility to use autofocus within **ix-modal**

- [#1587](https://github.com/siemens/ix/pull/1587) [`0e173504ea`](https://github.com/siemens/ix/commit/0e173504ea5a73f2822c7a322d7a23a9ddfd1fa1) Thanks [@danielleroux](https://github.com/danielleroux)! - Make **ix-toggle** not clickable if disabled property is present (Fixes #1585)

## 2.6.0

### Minor Changes
Expand Down
Loading

0 comments on commit 6489ed5

Please sign in to comment.