Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into v3
Browse files Browse the repository at this point in the history
  • Loading branch information
danielleroux committed May 21, 2024
2 parents 3f5903f + 9ee4aab commit 8d2199e
Show file tree
Hide file tree
Showing 273 changed files with 19,428 additions and 15,836 deletions.
6 changes: 6 additions & 0 deletions .changeset/clean-walls-bake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@siemens/ix": patch
"@siemens/ix-vue": patch
---

fix(core/date-dropdown): show year and month dropdown
2 changes: 1 addition & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@siemens/ix-vue"
]
],
"access": "restricted",
"access": "public",
"baseBranch": "main",
"updateInternalDependencies": "patch",
"ignore": [
Expand Down
5 changes: 5 additions & 0 deletions .changeset/cyan-plums-build.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix': patch
---

fix(core/event-list-item): add aria-disabled attribute to list element
5 changes: 5 additions & 0 deletions .changeset/dry-avocados-sneeze.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix': minor
---

feat(core/date-dropdown): add disabled property
5 changes: 5 additions & 0 deletions .changeset/dry-roses-brake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix-angular': patch
---

fix(angular/modal): avoid overflow of modal content
5 changes: 5 additions & 0 deletions .changeset/empty-sloths-burn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@siemens/ix": patch
---

fix(core/category-filter): open dropdown on text input and keep it open
5 changes: 5 additions & 0 deletions .changeset/giant-owls-explain.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix': patch
---

fix(core/blind): avoid unnecessary wrapping
5 changes: 5 additions & 0 deletions .changeset/giant-ways-wave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@siemens/ix": patch
---

fix(core/base-button): set aria disabled
5 changes: 5 additions & 0 deletions .changeset/gold-terms-develop.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix': patch
---

fix(core/group): show expand-collapse icon
5 changes: 5 additions & 0 deletions .changeset/hot-sloths-fold.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@siemens/ix": patch
---

fix(core/group-context-menu): set default cursor
5 changes: 5 additions & 0 deletions .changeset/large-oranges-float.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix': patch
---

fix(core/event-list): event-list-items not selectabe in chrome
5 changes: 5 additions & 0 deletions .changeset/popular-crabs-reply.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@siemens/ix": patch
---

fix(core/tooltip): null check before event listener gets registered on trigger
5 changes: 5 additions & 0 deletions .changeset/quiet-pillows-jog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix': patch
---

docs(core/menu-about): update jsdocs for label property
5 changes: 5 additions & 0 deletions .changeset/rare-eagles-laugh.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@siemens/ix": patch
---

fix(core/group): use correct cursors
5 changes: 5 additions & 0 deletions .changeset/silent-stingrays-pump.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix': minor
---

feat(core/button|icon-button): add danger variant
5 changes: 5 additions & 0 deletions .changeset/wise-games-relate.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix': patch
---

fix(core/workflow): add flexible layout
2 changes: 1 addition & 1 deletion .github/workflows/actions/turbo/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ runs:
- uses: pnpm/action-setup@v2
name: Install pnpm
with:
version: 8
version: 9
run_install: false

- name: Setup Node.js environment
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/deploy-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
- name: Build
run: pnpm build --cache-dir=.turbo --filter documentation --force
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
FIGMA_API_TOKEN: ${{ secrets.FIGMA_API_TOKEN }}
CSC: ${{ secrets.READ_CSC_TOKEN }}

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/deploy-preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ jobs:
env:
FIGMA_API_TOKEN: ${{ secrets.FIGMA_API_TOKEN }}
CSC: ${{ secrets.READ_CSC_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Publish
id: publish
Expand Down
15 changes: 10 additions & 5 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,19 @@ on:
- reopened
- synchronize

concurrency: pr-${{ github.ref }}
concurrency:
group: pr-${{ github.head_ref }}
cancel-in-progress: true

jobs:
changes:
runs-on: ubuntu-latest
outputs:
core_any_changed: ${{ steps.changes.outputs.core_any_changed }}
angular_any_changed: ${{ steps.changes.outputs.angular_any_changed }}
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 }}
unittests_any_changed: ${{ steps.changes.outputs.unittests_any_changed }}
steps:
- uses: actions/checkout@v3
- name: Track changes between commits
Expand All @@ -29,18 +31,21 @@ jobs:
files_yaml: |
core:
- packages/core/**
angular:
- packages/angular/**
aggrid:
- packages/aggrid/**
echarts:
- packages/echarts/**
docs:
- packages/documentation/**
- packages/example-styles/**
- packages/html-test-app/**
- packages/angular-test-app/**
- packages/react-test-app/**
- packages/vue-test-app/**
unittests:
- packages/core/**
- packages/angular/**
- packages/react/**
build:
needs: changes
Expand Down Expand Up @@ -165,7 +170,7 @@ jobs:
retention-days: 2

unit:
if: ${{ needs.changes.outputs.core_any_changed == 'true' || needs.changes.outputs.angular_any_changed == 'true' }}
if: ${{ needs.changes.outputs.unittests_any_changed == 'true' }}
needs: [build, changes]
timeout-minutes: 10
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ packages/html-test-app/src/public/additional-theme
# documentation
###

packages/documentation/docs/installation/CHANGELOG.md
packages/documentation/docs/auto-generated/
packages/documentation/.build-temp
packages/documentation/scripts/.typedoc/
Expand Down
2 changes: 2 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ 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
4 changes: 4 additions & 0 deletions ix.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@
"name": "eslint-config",
"path": "./packages/eslint-config-ix"
},
{
"name": "example-styles",
"path": "./packages/example-styles"
},
{
"name": "figma-plugin",
"path": "./packages/figma-plugin"
Expand Down
7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@
"bugs": {
"url": "https://www.github.com/siemens/ix/issues"
},
"packageManager": "[email protected]",
"engines": {
"npm": ">=8.x.x",
"node": ">=16.16.x"
"pnpm": ">=9.x.x",
"node": ">=18.x.x"
},
"scripts": {
"docs": "dotenv -- turbo run start --filter=documentation",
Expand All @@ -30,7 +29,7 @@
"test": "dotenv -- turbo run test",
"prepare": "husky install",
"ci:version": "pnpm changeset version && pnpm i --lockfile-only",
"ci:publish": "pnpm publish -r"
"ci:publish": "pnpm changeset publish"
},
"dependencies": {
"tslib": "^2.3.0"
Expand Down
1 change: 1 addition & 0 deletions packages/angular-test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"@siemens/ix-angular": "workspace:*",
"@siemens/ix-aggrid": "workspace:*",
"@siemens/ix-echarts": "workspace:*",
"example-styles": "workspace:*",
"ag-grid-angular": "^30.0.0",
"ag-grid-community": "^30.2.0",
"ngx-echarts": "~14.0.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<ix-button ghost variant="secondary"> Button </ix-button>
<ix-button disabled ghost variant="secondary"> Button </ix-button>
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: './button-danger-ghost.html',
})
export default class Buttons {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<ix-button outline variant="danger"> Button </ix-button>
<ix-button disabled outline variant="danger"> Button </ix-button>
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: './button-danger-outline.html',
})
export default class Buttons {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<ix-button variant="danger"> Button </ix-button>
<ix-button disabled variant="danger"> Button </ix-button>
16 changes: 16 additions & 0 deletions packages/angular-test-app/src/preview-examples/button-danger.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: './button-danger.html',
})
export default class Buttons {}
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@ import { Component } from '@angular/core';
@Component({
selector: 'app-example',
template: buttonGhost(),
styles: [`@import 'example-styles/dist/buttons.css';`],
})
export default class Buttons {}
function buttonGhost(): string | undefined {
return `
<ix-button class="m-1" ghost variant="primary">
<ix-button ghost variant="primary">
Button
</ix-button>
<ix-button class="m-1" disabled ghost variant="primary">
<ix-button disabled ghost variant="primary">
Button
</ix-button>
`;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@ import { Component } from '@angular/core';
@Component({
selector: 'app-example',
template: buttonGreyGhost(),
styles: [`@import 'example-styles/dist/buttons.css';`],
})
export default class Buttons {}
function buttonGreyGhost(): string | undefined {
return `
<ix-button class="m-1" ghost variant="secondary">
<ix-button ghost variant="secondary">
Button
</ix-button>
<ix-button class="m-1" disabled ghost variant="secondary">
<ix-button disabled ghost variant="secondary">
Button
</ix-button>
`;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@ import { Component } from '@angular/core';
@Component({
selector: 'app-example',
template: buttonGreySecondary(),
styles: [`@import 'example-styles/dist/buttons.css';`],
})
export default class Buttons {}
function buttonGreySecondary(): string | undefined {
return `
<ix-button class="m-1" outline variant="secondary">
<ix-button outline variant="secondary">
Button
</ix-button>
<ix-button class="m-1" disabled outline variant="secondary">
<ix-button disabled outline variant="secondary">
Button
</ix-button>
`;
Expand Down
5 changes: 3 additions & 2 deletions packages/angular-test-app/src/preview-examples/button-grey.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@ import { Component } from '@angular/core';
@Component({
selector: 'app-example',
template: buttonGrey(),
styles: [`@import 'example-styles/dist/buttons.css';`],
})
export default class Buttons {}
function buttonGrey(): string | undefined {
return `
<ix-button class="m-1" variant="secondary">
<ix-button variant="secondary">
Button
</ix-button>
<ix-button class="m-1" disabled variant="secondary">
<ix-button disabled variant="secondary">
Button
</ix-button>
`;
Expand Down
26 changes: 26 additions & 0 deletions packages/angular-test-app/src/preview-examples/button-loading.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<ix-button (click)="toggle()" [loading]="loading" outline variant="primary">
Button
</ix-button>

<ix-button
(click)="toggle2()"
[loading]="loading2"
icon="star"
outline
variant="primary"
>
Button
</ix-button>

<ix-icon-button
(click)="toggle3()"
[loading]="loading3"
icon="star"
outline
variant="primary"
>
</ix-icon-button>

<ix-button loading outline variant="primary"> Button </ix-button>

<ix-icon-button loading icon="star" outline variant="primary"></ix-icon-button>
Loading

0 comments on commit 8d2199e

Please sign in to comment.