Skip to content

Commit

Permalink
Merge branch 'main' into fix/1670-event-list
Browse files Browse the repository at this point in the history
  • Loading branch information
AndreasBerliner authored Nov 5, 2024
2 parents 72c8213 + 7347c40 commit 871958c
Show file tree
Hide file tree
Showing 1,057 changed files with 7,969 additions and 2,079 deletions.
5 changes: 5 additions & 0 deletions .changeset/afraid-mugs-argue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@siemens/ix": minor
---

feat(core/message): add options to set size and position
5 changes: 5 additions & 0 deletions .changeset/clever-pandas-chew.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@siemens/ix": patch
---

fix(core): replace font styles with actual formats
5 changes: 5 additions & 0 deletions .changeset/clever-rings-sneeze.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix': patch
---

fix(core/modal): figma - code mismatch
7 changes: 7 additions & 0 deletions .changeset/eight-windows-shout.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@siemens/ix-angular": minor
"@siemens/ix": minor
"@siemens/ix-vue": minor
---

feat(core): improve component a11y
5 changes: 5 additions & 0 deletions .changeset/eighty-clocks-bake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix': patch
---

fix(core/content-header): adapt spacing
5 changes: 5 additions & 0 deletions .changeset/few-eels-smell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix': patch
---

fix(core/checkbox): page jumps on checkbox click in scrollable ix-content
5 changes: 5 additions & 0 deletions .changeset/nasty-mangos-love.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix': patch
---

fix(core/button): fix keyboard navigation & accessibility
5 changes: 5 additions & 0 deletions .changeset/nice-pianos-serve.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@siemens/ix": patch
---

fix(core/spinner): move styling into shadow dom
5 changes: 5 additions & 0 deletions .changeset/nine-pugs-pump.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix': patch
---

fix(core/select): update input value on slot change
5 changes: 5 additions & 0 deletions .changeset/pink-spoons-obey.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix': patch
---

fix(core/input): remove hover state from readonly and disabled variant
5 changes: 5 additions & 0 deletions .changeset/quiet-tools-study.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@siemens/ix": patch
---

fix(core/icon-toggle-button): remove console.log
5 changes: 5 additions & 0 deletions .changeset/short-dolls-perform.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@siemens/ix": patch
---

fix(card): card-filled colors for hover/active states
5 changes: 5 additions & 0 deletions .changeset/small-meals-think.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix': patch
---

fix(core/card-list): adapt title margin to figma
5 changes: 5 additions & 0 deletions .changeset/tricky-hornets-work.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@siemens/ix": patch
---

fix(core/dropdown): clean up disconnected dropdowns
5 changes: 5 additions & 0 deletions .changeset/yellow-goats-wash.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix': patch
---

fix(core/upload): disable file browser if control is disabled
39 changes: 39 additions & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
runs-on: ubuntu-latest
outputs:
core_any_changed: ${{ steps.changes.outputs.core_any_changed }}
core_all_changed_files: ${{ steps.changes.outputs.core_all_changed_files }}
aggrid_any_changed: ${{ steps.changes.outputs.aggrid_any_changed }}
echarts_any_changed: ${{ steps.changes.outputs.echarts_any_changed }}
docs_any_changed: ${{ steps.changes.outputs.docs_any_changed }}
Expand Down Expand Up @@ -192,3 +193,41 @@ jobs:

- name: Test
run: pnpm run test --cache-dir=.turbo --filter !\documentation

strict:
if: ${{ needs.changes.outputs.core_any_changed == 'true' }}
needs: [changes]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: ./.github/workflows/actions/turbo
- name: Strict
id: report
env:
ALL_CHANGED_FILES: ${{ needs.changes.outputs.core_all_changed_files }}
run: pnpm --filter @siemens/ix exec strict-check ${ALL_CHANGED_FILES}

- name: Find Comment
uses: peter-evans/find-comment@v3
id: find-comment
with:
issue-number: ${{ github.event.pull_request.number }}
comment-author: 'github-actions[bot]'
body-includes: '### Report of `strict` check'

- name: Delete comment
if: ${{ steps.report.outputs.has_errors != 'true' }}
uses: actions-cool/issues-helper@v3
with:
actions: 'delete-comment'
token: ${{ secrets.GITHUB_TOKEN }}
comment-id: ${{ steps.find-comment.outputs.comment-id }}

- name: Create or update comment
if: ${{ steps.report.outputs.has_errors == 'true' }}
uses: peter-evans/create-or-update-comment@v4
with:
comment-id: ${{ steps.find-comment.outputs.comment-id }}
issue-number: ${{ github.event.pull_request.number }}
body: ${{ steps.report.outputs.body }}
edit-mode: replace
4 changes: 0 additions & 4 deletions ix.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@
"name": "eslint-config",
"path": "./packages/eslint-config-ix"
},
{
"name": "example-styles",
"path": "./packages/example-styles"
},
{
"name": "figma-plugin",
"path": "./packages/figma-plugin"
Expand Down
2 changes: 1 addition & 1 deletion packages/angular-test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"ag-grid-community": "^30.2.0",
"echarts": "^5.5.1",
"echarts-gl": "^2.0.9",
"example-styles": "workspace:*",
"html-test-app": "workspace:*",
"ngx-echarts": "~14.0.0",
"rxjs": "~7.5.0",
"tslib": "^2.3.0",
Expand Down
31 changes: 27 additions & 4 deletions packages/angular-test-app/scripts/copy-preview.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,33 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
import { copyPreviewStyles } from 'example-styles';
import path from 'path';

import fs from 'fs';
import fsp from 'fs/promises';
const __dirname = path.resolve();

const stylesPath = path.resolve(__dirname, 'src', 'preview-examples', 'styles');
copyPreviewStyles(stylesPath);
const previewPath = path.join(
__dirname,
'node_modules',
'html-test-app',
'src',
'preview-examples'
);

(async () => {
console.log('Copying preview styles to html-test-app...');
const cssFiles = fs
.readdirSync(previewPath)
.filter((f) => f.endsWith('.css'));

await Promise.all(
cssFiles.map((cssFile) =>
fsp.copyFile(
path.join(previewPath, cssFile),
path.join(__dirname, 'src', 'preview-examples', cssFile)
)
)
);

console.log('Done');
})();
17 changes: 17 additions & 0 deletions packages/angular-test-app/src/preview-examples/about-and-legal.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/*
* 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.
*/
/*
* Styles get overwritten by html-test-app css files each build or dev task.
* If you want to modify the example styles do this only inside the html-test-app
*/

ix-application {
width: 100vw;
height: 100vh;
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { AfterViewInit, Component, ElementRef, ViewChild } from '@angular/core';
@Component({
selector: 'app-example',
templateUrl: './about-and-legal.html',
styleUrls: ['./styles/application.css'],
styleUrls: ['./about-and-legal.css'],
})
export default class AboutAndLegal implements AfterViewInit {
@ViewChild('menu', { read: ElementRef })
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/*
* 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.
*/
/*
* Styles get overwritten by html-test-app css files each build or dev task.
* If you want to modify the example styles do this only inside the html-test-app
*/

ix-application {
width: 100vw;
height: 100vh;
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { AppSwitchConfiguration } from '@siemens/ix';
@Component({
selector: 'app-example',
templateUrl: './application-app-switch.html',
styleUrls: ['./styles/application.css'],
styleUrls: ['./application-app-switch.css'],
})
export default class ApplicationAppSwitchExample {
appSwitchConfig: AppSwitchConfiguration = {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/*
* 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.
*/
/*
* Styles get overwritten by html-test-app css files each build or dev task.
* If you want to modify the example styles do this only inside the html-test-app
*/

ix-application {
width: 100vw;
height: 100vh;
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { Breakpoint } from '@siemens/ix';

@Component({
selector: 'app-example',
styleUrls: ['./styles/application.css'],
styleUrls: ['./application-breakpoints.css'],
templateUrl: './application-breakpoints.html',
})
export default class ApplicationBreakpointExample {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
/*
* Styles get overwritten by html-test-app css files each build or dev task.
* If you want to modify the example styles do this only inside the html-test-app
*/

ix-application {
width: 100vw;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ import { Component } from '@angular/core';
@Component({
selector: 'app-example',
templateUrl: './application.html',
styleUrls: ['./styles/application.css'],
styleUrls: ['./application.css'],
})
export default class ApplicationExample {}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
/*
* Styles get overwritten by html-test-app css files each build or dev task.
* If you want to modify the example styles do this only inside the html-test-app
*/

ix-basic-navigation {
width: 100vw;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ import { Component } from '@angular/core';
</ix-menu>
</ix-basic-navigation>
`,
styleUrls: ['./styles/basic-navigation.css'],
styleUrls: ['./basic-navigation.css'],
})
export default class BasicNavigation {}
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.
*/
/*
* Styles get overwritten by html-test-app css files each build or dev task.
* If you want to modify the example styles do this only inside the html-test-app
*/

ix-blind {
margin: 0.5rem 0;
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import { Component } from '@angular/core';
icon="context-menu"
icon-color="color-primary"
></ix-icon-button>
<ix-dropdown trigger="context-menu">test</ix-dropdown>
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy
eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam
voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet
Expand All @@ -31,7 +30,11 @@ import { Component } from '@angular/core';
Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor
sit amet.
</ix-blind>
<ix-dropdown trigger="context-menu">
<ix-dropdown-item icon="rename">Rename...</ix-dropdown-item>
<ix-dropdown-item icon="trashcan">Delete...</ix-dropdown-item>
</ix-dropdown>
`,
styleUrls: ['./styles/blind.css'],
styleUrls: ['./blind-header-actions.css'],
})
export default class Blind {}
16 changes: 16 additions & 0 deletions packages/angular-test-app/src/preview-examples/blind-variants.css
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.
*/
/*
* Styles get overwritten by html-test-app css files each build or dev task.
* If you want to modify the example styles do this only inside the html-test-app
*/

ix-blind {
margin: 0.5rem 0;
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ import { Component } from '@angular/core';
@Component({
selector: 'app-example',
templateUrl: './blind-variants.html',
styleUrls: ['./styles/blind.css'],
styleUrls: ['./blind-variants.css'],
})
export default class Blind {}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/
/*
* Styles get overwritten by html-test-app css files each build or dev task.
* If you want to modify the example styles do this only inside the html-test-app
*/

ix-blind {
margin: 0.5rem 0;
Expand Down
Loading

0 comments on commit 871958c

Please sign in to comment.