Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main into release-3.0.0 #1528

Merged
merged 28 commits into from
Oct 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
a5d718f
chore: avoid shameful hoisting (#1471)
danielleroux Sep 18, 2024
80c0504
chore(.npmrc): add eslint to public-hosting
danielleroux Sep 19, 2024
cc6091f
fix(core/menu-about): set index if selected is set on tab-item (#1469)
matthiashader Sep 19, 2024
24dbdee
docs(modal): adapted preview examples for angular modal (#1478)
matthiashader Sep 19, 2024
6041b3d
fix(core/modal): fires 2 events on closing (#1489)
matthiashader Sep 23, 2024
a0316f5
fix(core/dropdown): clean up disconnected dropdowns (#1483)
nuke-ellington Sep 23, 2024
c37edc0
Docs/uxt migration (#1426)
kathrinschalber Sep 24, 2024
aa641d5
refactor(docs): remove example-styles project (#1472)
danielleroux Sep 24, 2024
7f37165
fix(core/input): remove hover state from readonly and disabled varianโ€ฆ
matthiashader Sep 24, 2024
665469f
docs(uxt): move css to static folder
danielleroux Sep 25, 2024
2d17535
docs(panes): rename file to match structure
danielleroux Sep 30, 2024
99f35e1
ci(strict-check): add tsconfig strict check to pull requests (#1494)
danielleroux Oct 1, 2024
d201c55
refactor(core): reduce strict errors (#1488)
danielleroux Oct 2, 2024
c2879f6
docs: add dropdown items to angular blind-header-actions example (#1503)
cma5 Oct 7, 2024
393b51d
fix(core/upload): disable file browser if control is disabled (#1506)
danielleroux Oct 10, 2024
93c4916
Merge remote-tracking branch 'origin/main' into release-3.0.0
danielleroux Oct 14, 2024
43a7447
chore: use latest output wrapper
danielleroux Oct 16, 2024
dbb7c34
build(react): switch to vite for building library
danielleroux Oct 16, 2024
72ad8e7
chore(react): migrate to latest testing versions
danielleroux Oct 17, 2024
ad05b3b
build(react): use latest rollup
danielleroux Oct 17, 2024
f4b0730
chore(react-test-app): update to latest vite version
danielleroux Oct 17, 2024
bf1d1be
refactor(core): use own hyperlist implementation
danielleroux Oct 21, 2024
3f633a9
refactor: remove ssr generation from tree
danielleroux Oct 21, 2024
d148c57
fix: eslint
danielleroux Oct 21, 2024
efbbc79
fix: load icons in ct indexhtml
danielleroux Oct 21, 2024
7d4513f
fix(angular-test-app): symlink
danielleroux Oct 21, 2024
1168aba
fix: update broken tests containing icons
danielleroux Oct 21, 2024
91b9f7f
fix: build meta
danielleroux Oct 21, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 5 additions & 0 deletions .changeset/breezy-hotels-tap.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix': patch
---

fix(core/modal): duplicate event firing
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/eighty-mails-collect.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix': patch
---

fix(core/menu-about): set index if selected is set on tab-item
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/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 @@ -195,3 +196,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
15 changes: 14 additions & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
registry=https://registry.npmjs.org
@siemens:registry=https://registry.npmjs.org
shamefully-hoist=true
puppeteer_skip_chromium_download=true
puppeteer_skip_chrome_headless_shell_download=true
puppeteer_skip_download=true
link-workspace-packages=deep
prefer-workspace-packages=true

# angular-test-app echarts dependency needs public hoisting
public-hoist-pattern[]=zrender
public-hoist-pattern[]=claygl

# documentation
public-hoist-pattern[]=@docusaurus/*
public-hoist-pattern[]=hogan.js
public-hoist-pattern[]=autocomplete.js
public-hoist-pattern[]=mark.js
public-hoist-pattern[]=lunr

public-hoist-pattern[]=playwright
public-hoist-pattern[]=eslint**
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
10 changes: 5 additions & 5 deletions packages/aggrid/tests/aggrid.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ regressionTest.describe('aggrid', () => {
regressionTest('basic', async ({ page }) => {
await page.goto('basic.html');

await page.getByRole('columnheader').nth(0).hover();
expect(await page.screenshot({ fullPage: true })).toMatchSnapshot();
await page.getByRole('columnheader').nth(1).hover();
expect(await page.screenshot({ fullPage: true, animations: 'disabled' })).toMatchSnapshot();
});

regressionTest('filter', async ({ page }) => {
Expand All @@ -29,7 +29,7 @@ regressionTest.describe('aggrid', () => {
const inputHandle = filterMenu.getByPlaceholder('Filter...');
await inputHandle.fill('Test');

expect(await page.screenshot({ fullPage: true })).toMatchSnapshot();
expect(await page.screenshot({ fullPage: true, animations: 'disabled' })).toMatchSnapshot();
});

regressionTest('editor', async ({ page }) => {
Expand All @@ -38,11 +38,11 @@ regressionTest.describe('aggrid', () => {
const editorCellHandle = page.locator('.ag-cell-not-inline-editing[col-id="price"]').nth(0);
await editorCellHandle.dblclick();

expect(await page.screenshot({ fullPage: true })).toMatchSnapshot();
expect(await page.screenshot({ fullPage: true, animations: 'disabled' })).toMatchSnapshot();
});

regressionTest('pagination', async ({ page }) => {
await page.goto('pagination.html');
expect(await page.screenshot({ fullPage: true })).toMatchSnapshot();
expect(await page.screenshot({ fullPage: true, animations: 'disabled' })).toMatchSnapshot();
});
});
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.
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: 2 additions & 0 deletions packages/angular-test-app/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
},
"analytics": false
},

"newProjectRoot": "projects",
"projects": {
"angular-test-app": {
Expand Down Expand Up @@ -95,6 +96,7 @@
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"preserveSymlinks": true,
"polyfills": ["zone.js", "zone.js/testing"],
"tsConfig": "tsconfig.spec.json",
"assets": [
Expand Down
3 changes: 2 additions & 1 deletion packages/angular-test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@
"@angular/router": "^18.1.2",
"@siemens/ix": "workspace:*",
"@siemens/ix-angular": "workspace:*",
"@siemens/ix-echarts": "workspace:*",
"@siemens/ix-icons": "0.0.0-20240827135516",
"ag-grid-angular": "^30.2.1",
"ag-grid-community": "^32.0.2",
"echarts": "5.4.3",
"echarts-gl": "^2.0.9",
"example-styles": "workspace:*",
"html-test-app": "workspace:*",
"ngx-echarts": "^18.0.0",
"rxjs": "~7.8.1",
"tslib": "^2.6.3",
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');
})();
3 changes: 2 additions & 1 deletion packages/angular-test-app/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ 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 * as echarts from 'echarts';

@NgModule({
declarations: [
Expand Down Expand Up @@ -374,7 +375,7 @@ import WorkflowVertical from '../preview-examples/workflow-vertical';
AgGridModule,
FormsModule,
NgxEchartsModule.forRoot({
echarts: () => import('echarts'),
echarts,
}),
],
providers: [],
Expand Down
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
@@ -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-basic-navigation {
width: 100vw;
height: 100vh;
}
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;
}
Loading
Loading