Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into release-3.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
danielleroux committed Sep 5, 2024
2 parents 71411db + f2622bd commit bcab451
Show file tree
Hide file tree
Showing 211 changed files with 821 additions and 1,839 deletions.
5 changes: 5 additions & 0 deletions .changeset/curvy-sloths-prove.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix-aggrid': minor
---

feat(aggrid): update peerDependency to latest major version
5 changes: 5 additions & 0 deletions .changeset/green-carrots-drum.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix': patch
---

fix(core/tooltip): styles bleeding in
5 changes: 5 additions & 0 deletions .changeset/ninety-ligers-invite.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix': patch
---

fix(core/tooltip): cancel tooltip positioning when reference is not visible
5 changes: 5 additions & 0 deletions .changeset/strong-impalas-flow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix': patch
---

fix(core/menu-item): occasionally empty tooltips in menu-item
5 changes: 5 additions & 0 deletions .changeset/wicked-glasses-pump.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@siemens/ix': minor
---

feat(core/application-header): hide toggle menu if header used outside of application frame
22 changes: 22 additions & 0 deletions .github/workflows/issue-needs-repo.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: needs reproduction labeling

on:
issues:
types: [labeled]

jobs:
comment-issue:
if: ${{ github.repository == 'siemens/ix' }}
runs-on: ubuntu-latest
steps:
- name: Needs reproduction comment created
if: "contains(github.event.label.name, 'needs reproduction')"
uses: actions-cool/issues-helper@v3
with:
actions: 'create-comment'
token: ${{ secrets.GITHUB_TOKEN }}
body: |
Thank you for creating this issue! It has been labeled as `needs reproduction`.
To help us assist you better, could you please provide a way for us to access the code (such as a GitHub repository or a StackBlitz link). Without a reliable code reproduction, it might be challenging for us to resolve the issue, and we may have to close it.
Thank you for your understanding!
11 changes: 5 additions & 6 deletions packages/aggrid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,17 @@
],
"scripts": {
"build": "gulp",
"test:e2e": "playwright test",
"visual-regression": "playwright test",
"host-root": "http-server -a 127.0.0.1"
},
"devDependencies": {
"@playwright/test": "^1.45.3",
"@siemens/ix": "workspace:*",
"@siemens/ix-icons": "0.0.0-20240827135516",
"@types/gulp": "^4.0.17",
"@types/gulp-postcss": "^8.0.6",
"@types/gulp-sass": "^5.0.4",
"ag-grid-community": "30.2.0",
"@types/gulp": "^4.0.14",
"@types/gulp-postcss": "^8.0.4",
"@types/gulp-sass": "^5.0.2",
"ag-grid-community": "^32.1.0",
"autoprefixer": "10.4.5",
"cssnano": "^6.1.2",
"gulp": "^4.0.2",
Expand All @@ -42,6 +41,6 @@
"@siemens/ix": "~2.4.1"
},
"peerDependencies": {
"ag-grid-community": "^28 || ^29 || ^30"
"ag-grid-community": ">=28"
}
}
10 changes: 10 additions & 0 deletions packages/aggrid/scss/ix-aggrid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,16 @@
line-height: min(var(--ag-internal-calculated-line-height), var(--ag-internal-padded-row-height));
}

.ag-header-icon.ag-header-cell-filter-button:not(.ag-filter-active):not(.ag-has-popup-positioned-under) {
opacity: 0;
}

.ag-cell-label-container:hover {
.ag-header-icon.ag-header-cell-filter-button {
opacity: 1;
}
}

.ag-filter-active .ag-icon-filter {
color: var(--theme-btn-primary--background);
}
Expand Down
12 changes: 9 additions & 3 deletions packages/angular/src/components.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,25 +52,31 @@ export declare interface IxApplication extends Components.IxApplication {}


@ProxyCmp({
inputs: ['name']
inputs: ['name', 'showMenu']
})
@Component({
selector: 'ix-application-header',
changeDetection: ChangeDetectionStrategy.OnPush,
template: '<ng-content></ng-content>',
// eslint-disable-next-line @angular-eslint/no-inputs-metadata-property
inputs: ['name'],
inputs: ['name', 'showMenu'],
})
export class IxApplicationHeader {
protected el: HTMLElement;
constructor(c: ChangeDetectorRef, r: ElementRef, protected z: NgZone) {
c.detach();
this.el = r.nativeElement;
proxyOutputs(this, this.el, ['menuToggle']);
}
}


export declare interface IxApplicationHeader extends Components.IxApplicationHeader {}
export declare interface IxApplicationHeader extends Components.IxApplicationHeader {
/**
* Event emitted when the menu toggle button is clicked @since 2.5.0
*/
menuToggle: EventEmitter<CustomEvent<boolean>>;
}


@ProxyCmp({
Expand Down
12 changes: 9 additions & 3 deletions packages/angular/standalone/src/directives/proxies.ts
Original file line number Diff line number Diff line change
Expand Up @@ -149,26 +149,32 @@ export declare interface IxApplication extends Components.IxApplication {}

@ProxyCmp({
defineCustomElementFn: defineIxApplicationHeader,
inputs: ['name']
inputs: ['name', 'showMenu']
})
@Component({
selector: 'ix-application-header',
changeDetection: ChangeDetectionStrategy.OnPush,
template: '<ng-content></ng-content>',
// eslint-disable-next-line @angular-eslint/no-inputs-metadata-property
inputs: ['name'],
inputs: ['name', 'showMenu'],
standalone: true
})
export class IxApplicationHeader {
protected el: HTMLElement;
constructor(c: ChangeDetectorRef, r: ElementRef, protected z: NgZone) {
c.detach();
this.el = r.nativeElement;
proxyOutputs(this, this.el, ['menuToggle']);
}
}


export declare interface IxApplicationHeader extends Components.IxApplicationHeader {}
export declare interface IxApplicationHeader extends Components.IxApplicationHeader {
/**
* Event emitted when the menu toggle button is clicked @since 2.5.0
*/
menuToggle: EventEmitter<CustomEvent<boolean>>;
}


@ProxyCmp({
Expand Down
61 changes: 55 additions & 6 deletions packages/core/component-doc.json
Original file line number Diff line number Diff line change
Expand Up @@ -461,10 +461,57 @@
],
"optional": true,
"required": false
},
{
"name": "showMenu",
"type": "boolean",
"complexType": {
"original": "boolean",
"resolved": "boolean",
"references": {}
},
"mutable": true,
"attr": "show-menu",
"reflectToAttr": false,
"docs": "Controls the visibility of the menu toggle button based on the context of the application header.\n\nWhen the application header is utilized outside the application frame, the menu toggle button is displayed.\nConversely, if the header is within the application frame, this property is ineffective.",
"docsTags": [
{
"name": "since",
"text": "2.5.0"
}
],
"default": "false",
"values": [
{
"type": "boolean"
}
],
"optional": true,
"required": false
}
],
"methods": [],
"events": [],
"events": [
{
"event": "menuToggle",
"detail": "boolean",
"bubbles": true,
"complexType": {
"original": "boolean",
"resolved": "boolean",
"references": {}
},
"cancelable": true,
"composed": true,
"docs": "Event emitted when the menu toggle button is clicked",
"docsTags": [
{
"name": "since",
"text": "2.5.0"
}
]
}
],
"styles": [],
"slots": [
{
Expand Down Expand Up @@ -10542,6 +10589,7 @@
"reflectToAttr": false,
"docs": "State to display active",
"docsTags": [],
"default": "false",
"values": [
{
"type": "boolean"
Expand Down Expand Up @@ -10585,6 +10633,7 @@
"reflectToAttr": false,
"docs": "Disable tab and remove event handlers",
"docsTags": [],
"default": "false",
"values": [
{
"type": "boolean"
Expand Down Expand Up @@ -10638,7 +10687,7 @@
"type": "string"
}
],
"optional": false,
"optional": true,
"required": false
},
{
Expand All @@ -10664,7 +10713,7 @@
"type": "string"
}
],
"optional": false,
"optional": true,
"required": false
},
{
Expand All @@ -10685,7 +10734,7 @@
"type": "number"
}
],
"optional": false,
"optional": true,
"required": false
},
{
Expand Down Expand Up @@ -10716,7 +10765,7 @@
"type": "string"
}
],
"optional": false,
"optional": true,
"required": false
}
],
Expand Down Expand Up @@ -16012,7 +16061,7 @@
"mutable": false,
"attr": "placement",
"reflectToAttr": false,
"docs": "Initial placement of the tooltip. If the placement don\"t have enough space,\nthe tooltip will placed on another location.",
"docs": "Initial placement of the tooltip.\nIf the selected placement doesn't have enough space, the tooltip will be repositioned to another location.",
"docsTags": [
{
"name": "since",
Expand Down
42 changes: 36 additions & 6 deletions packages/core/src/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,11 @@ export namespace Components {
* Application name
*/
"name"?: string;
/**
* Controls the visibility of the menu toggle button based on the context of the application header. When the application header is utilized outside the application frame, the menu toggle button is displayed. Conversely, if the header is within the application frame, this property is ineffective.
* @since 2.5.0
*/
"showMenu"?: boolean;
}
interface IxApplicationSidebar {
}
Expand Down Expand Up @@ -1538,23 +1543,23 @@ export namespace Components {
* Name of the icon you want to display. Icon names can be resolved from the documentation
* @link https://ix.siemens.io/docs/icon-library/icons
*/
"icon": string;
"icon"?: string;
"isCategory": boolean;
/**
* Label of the menu item. Will also be used as tooltip text
* @since 2.2.0
*/
"label": string;
"label"?: string;
/**
* Show notification count on tab
*/
"notifications": number;
"notifications"?: number;
/**
* Name of the icon you want to display. Icon names can be resolved from the documentation
* @link https://ix.siemens.io/docs/icon-library/icons
* @deprecated since 2.0.0 use `icon` property. Will be removed in 3.0.0
*/
"tabIcon": string;
"tabIcon"?: string;
}
interface IxMenuSettings {
/**
Expand Down Expand Up @@ -2256,7 +2261,7 @@ export namespace Components {
*/
"interactive": boolean;
/**
* Initial placement of the tooltip. If the placement don"t have enough space, the tooltip will placed on another location.
* Initial placement of the tooltip. If the selected placement doesn't have enough space, the tooltip will be repositioned to another location.
* @since 1.5.0
*/
"placement": 'top' | 'right' | 'bottom' | 'left';
Expand Down Expand Up @@ -2443,6 +2448,10 @@ export namespace Components {
"vertical": boolean;
}
}
export interface IxApplicationHeaderCustomEvent<T> extends CustomEvent<T> {
detail: T;
target: HTMLIxApplicationHeaderElement;
}
export interface IxBlindCustomEvent<T> extends CustomEvent<T> {
detail: T;
target: HTMLIxBlindElement;
Expand Down Expand Up @@ -2674,7 +2683,18 @@ declare global {
prototype: HTMLIxApplicationElement;
new (): HTMLIxApplicationElement;
};
interface HTMLIxApplicationHeaderElementEventMap {
"menuToggle": boolean;
}
interface HTMLIxApplicationHeaderElement extends Components.IxApplicationHeader, HTMLStencilElement {
addEventListener<K extends keyof HTMLIxApplicationHeaderElementEventMap>(type: K, listener: (this: HTMLIxApplicationHeaderElement, ev: IxApplicationHeaderCustomEvent<HTMLIxApplicationHeaderElementEventMap[K]>) => any, options?: boolean | AddEventListenerOptions): void;
addEventListener<K extends keyof DocumentEventMap>(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
addEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
addEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | AddEventListenerOptions): void;
removeEventListener<K extends keyof HTMLIxApplicationHeaderElementEventMap>(type: K, listener: (this: HTMLIxApplicationHeaderElement, ev: IxApplicationHeaderCustomEvent<HTMLIxApplicationHeaderElementEventMap[K]>) => any, options?: boolean | EventListenerOptions): void;
removeEventListener<K extends keyof DocumentEventMap>(type: K, listener: (this: Document, ev: DocumentEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
removeEventListener(type: string, listener: EventListenerOrEventListenerObject, options?: boolean | EventListenerOptions): void;
}
var HTMLIxApplicationHeaderElement: {
prototype: HTMLIxApplicationHeaderElement;
Expand Down Expand Up @@ -4154,6 +4174,16 @@ declare namespace LocalJSX {
* Application name
*/
"name"?: string;
/**
* Event emitted when the menu toggle button is clicked
* @since 2.5.0
*/
"onMenuToggle"?: (event: IxApplicationHeaderCustomEvent<boolean>) => void;
/**
* Controls the visibility of the menu toggle button based on the context of the application header. When the application header is utilized outside the application frame, the menu toggle button is displayed. Conversely, if the header is within the application frame, this property is ineffective.
* @since 2.5.0
*/
"showMenu"?: boolean;
}
interface IxApplicationSidebar {
}
Expand Down Expand Up @@ -6479,7 +6509,7 @@ declare namespace LocalJSX {
*/
"interactive"?: boolean;
/**
* Initial placement of the tooltip. If the placement don"t have enough space, the tooltip will placed on another location.
* Initial placement of the tooltip. If the selected placement doesn't have enough space, the tooltip will be repositioned to another location.
* @since 1.5.0
*/
"placement"?: 'top' | 'right' | 'bottom' | 'left';
Expand Down
Loading

0 comments on commit bcab451

Please sign in to comment.