Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into release-3.0.0 (#1623)
Browse files Browse the repository at this point in the history
  • Loading branch information
danielleroux authored Dec 18, 2024
1 parent c70bacb commit 0de0a67
Show file tree
Hide file tree
Showing 106 changed files with 4,649 additions and 2,592 deletions.
3 changes: 2 additions & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"html-test-app",
"ionic-test-app",
"figma-plugin",
"documentation"
"documentation",
"storybook-docs"
]
}
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.

11 changes: 11 additions & 0 deletions .changeset/khaki-moles-cry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
'@siemens/ix': minor
---

Add `meta`-tag feature to disable default load of `@siemens/ix-icons`

```html
<meta name="ix:legacy-icons" content="false" />
```

In addition the warning is removed if no icon component is provided.
5 changes: 0 additions & 5 deletions .changeset/lazy-birds-dream.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/lemon-monkeys-leave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@siemens/ix": patch
---

Automatically expand **ix-menu-category** if nested menu item becomes active.
5 changes: 5 additions & 0 deletions .changeset/long-meals-count.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@siemens/ix-aggrid": patch
---

Set typography globally for **ag-grid** theme.
5 changes: 0 additions & 5 deletions .changeset/tender-hounds-change.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.2"
},
"dependencies": {
"@siemens/ix": "~2.6.0"
"@siemens/ix": "~2.6.1"
},
"peerDependencies": {
"ag-grid-community": ">=28"
Expand Down
9 changes: 6 additions & 3 deletions packages/aggrid/scss/ix-aggrid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
@import '@siemens/ix/scss/mixins/fonts';

[class*='ag-theme-ix'] {
@include typography-body;

--ag-background-color: transparent;

--ag-foreground-color: var(--theme-color-std-text);
Expand Down Expand Up @@ -60,7 +62,6 @@
}

.ag-select-list {
@include typography-body;
color: var(--theme-color-std-text);
background-color: var(--ag-control-panel-background-color);
}
Expand Down Expand Up @@ -117,13 +118,11 @@
}

.ag-header-cell {
@include typography-body;
font-weight: 700;
color: var(--theme-table-header-cell--color);
}

.ag-cell {
@include typography-body;
color: var(--theme-table-data-cell--color);
line-height: min(var(--ag-internal-calculated-line-height), var(--ag-internal-padded-row-height));
}
Expand Down Expand Up @@ -169,4 +168,8 @@
}
}
}

.ag-sticky-bottom {
display: none;
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/aggrid/tests/basic.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
-->
<html>
<head>
<script src="https://cdn.jsdelivr.net/npm/ag-grid-community/dist/ag-grid-community.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/ag-grid-community@32.1/dist/ag-grid-community.min.js"></script>
<link rel="stylesheet" href="https://unpkg.com/ag-grid-community/styles/ag-grid.css" />
<link rel="stylesheet" href="https://unpkg.com/ag-grid-community/styles/ag-theme-alpine.css" />

Expand Down
2 changes: 1 addition & 1 deletion packages/aggrid/tests/pagination.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
-->
<html>
<head>
<script src="https://cdn.jsdelivr.net/npm/ag-grid-community/dist/ag-grid-community.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/ag-grid-community@32.1/dist/ag-grid-community.min.js"></script>
<link rel="stylesheet" href="https://unpkg.com/ag-grid-community/styles/ag-grid.css" />
<link rel="stylesheet" href="https://unpkg.com/ag-grid-community/styles/ag-theme-alpine.css" />

Expand Down
9 changes: 9 additions & 0 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 @@ -129,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 @@ -159,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 @@ -440,6 +443,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 @@ -776,6 +783,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 @@ -908,6 +916,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
6 changes: 6 additions & 0 deletions packages/angular-test-app/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,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 @@ -139,6 +140,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 @@ -169,6 +171,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 @@ -288,6 +291,7 @@ import MapNavigationMigration from '../preview-examples/map-navigation-migration
DateInputLabel,
DateInputReadonly,
DateInputValidation,
DateInputWithSlots,
ContentExample,
DateDropdown,
DateDropdownUserRange,
Expand Down Expand Up @@ -417,6 +421,7 @@ import MapNavigationMigration from '../preview-examples/map-navigation-migration
InputReadonly,
InputTypes,
InputValidation,
InputWithSlots,
InputPattern,
TextareaLegacyReadonly,
TextareaLegacy,
Expand Down Expand Up @@ -455,6 +460,7 @@ import MapNavigationMigration from '../preview-examples/map-navigation-migration
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 {}
Loading

0 comments on commit 0de0a67

Please sign in to comment.