Merge remote-tracking branch 'origin/main' into release-3.0.0

siemens · Nov 4, 2024 · 89ad820 · 89ad820
2 parents 9e90dd9 + 8bf9ad4
commit 89ad820
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 53 deletions.
diff --git a/packages/angular/src/components.ts b/packages/angular/src/components.ts
@@ -350,14 +350,14 @@ export declare interface IxCardTitle extends Components.IxCardTitle {}
 
 
 @ProxyCmp({
-  inputs: ['ariaLabel', 'categories', 'disabled', 'filterState', 'hideIcon', 'i18nPlainText', 'icon', 'labelCategories', 'nonSelectableCategories', 'placeholder', 'readonly', 'repeatCategories', 'staticOperator', 'suggestions']
+  inputs: ['categories', 'disabled', 'filterState', 'hideIcon', 'i18nPlainText', 'icon', 'labelCategories', 'nonSelectableCategories', 'placeholder', 'readonly', 'repeatCategories', 'staticOperator', 'suggestions']
 })
 @Component({
   selector: 'ix-category-filter',
   changeDetection: ChangeDetectionStrategy.OnPush,
   template: '<ng-content></ng-content>',
   // eslint-disable-next-line @angular-eslint/no-inputs-metadata-property
-  inputs: ['ariaLabel', 'categories', 'disabled', 'filterState', 'hideIcon', 'i18nPlainText', 'icon', 'labelCategories', 'nonSelectableCategories', 'placeholder', 'readonly', 'repeatCategories', 'staticOperator', 'suggestions'],
+  inputs: ['categories', 'disabled', 'filterState', 'hideIcon', 'i18nPlainText', 'icon', 'labelCategories', 'nonSelectableCategories', 'placeholder', 'readonly', 'repeatCategories', 'staticOperator', 'suggestions'],
 })
 export class IxCategoryFilter {
   protected el: HTMLElement;

diff --git a/packages/angular/standalone/src/directives/proxies.ts b/packages/angular/standalone/src/directives/proxies.ts
@@ -471,14 +471,14 @@ export declare interface IxCardTitle extends Components.IxCardTitle {}
 
 @ProxyCmp({
   defineCustomElementFn: defineIxCategoryFilter,
-  inputs: ['ariaLabel', 'categories', 'disabled', 'filterState', 'hideIcon', 'i18nPlainText', 'icon', 'labelCategories', 'nonSelectableCategories', 'placeholder', 'readonly', 'repeatCategories', 'staticOperator', 'suggestions']
+  inputs: ['categories', 'disabled', 'filterState', 'hideIcon', 'i18nPlainText', 'icon', 'labelCategories', 'nonSelectableCategories', 'placeholder', 'readonly', 'repeatCategories', 'staticOperator', 'suggestions']
 })
 @Component({
   selector: 'ix-category-filter',
   changeDetection: ChangeDetectionStrategy.OnPush,
   template: '<ng-content></ng-content>',
   // eslint-disable-next-line @angular-eslint/no-inputs-metadata-property
-  inputs: ['ariaLabel', 'categories', 'disabled', 'filterState', 'hideIcon', 'i18nPlainText', 'icon', 'labelCategories', 'nonSelectableCategories', 'placeholder', 'readonly', 'repeatCategories', 'staticOperator', 'suggestions'],
+  inputs: ['categories', 'disabled', 'filterState', 'hideIcon', 'i18nPlainText', 'icon', 'labelCategories', 'nonSelectableCategories', 'placeholder', 'readonly', 'repeatCategories', 'staticOperator', 'suggestions'],
   standalone: true
 })
 export class IxCategoryFilter {

diff --git a/packages/core/component-doc.json b/packages/core/component-doc.json
@@ -2160,33 +2160,6 @@
         ]
       },
       "props": [
-        {
-          "name": "ariaLabel",
-          "type": "string",
-          "complexType": {
-            "original": "string",
-            "resolved": "string",
-            "references": {}
-          },
-          "mutable": false,
-          "attr": "aria-label",
-          "reflectToAttr": false,
-          "docs": "Aria label for the filter input field",
-          "docsTags": [
-            {
-              "name": "since",
-              "text": "2.6.0"
-            }
-          ],
-          "default": "'Filter'",
-          "values": [
-            {
-              "type": "string"
-            }
-          ],
-          "optional": false,
-          "required": false
-        },
         {
           "name": "categories",
           "type": "{ [id: string]: { label: string; options: string[]; }; }",

diff --git a/packages/core/src/components.d.ts b/packages/core/src/components.d.ts
@@ -366,11 +366,6 @@ export namespace Components {
     interface IxCardTitle {
     }
     interface IxCategoryFilter {
-        /**
-          * Aria label for the filter input field
-          * @since 2.6.0
-         */
-        "ariaLabel": string;
         /**
           * Configuration object hash used to populate the dropdown menu for type-ahead and quick selection functionality. Each ID maps to an object with a label and an array of options to select from.
          */
@@ -4432,11 +4427,6 @@ declare namespace LocalJSX {
     interface IxCardTitle {
     }
     interface IxCategoryFilter {
-        /**
-          * Aria label for the filter input field
-          * @since 2.6.0
-         */
-        "ariaLabel"?: string;
         /**
           * Configuration object hash used to populate the dropdown menu for type-ahead and quick selection functionality. Each ID maps to an object with a label and an array of options to select from.
          */

diff --git a/packages/core/src/components/category-filter/category-filter.tsx b/packages/core/src/components/category-filter/category-filter.tsx
@@ -23,6 +23,7 @@ import { FilterState } from './filter-state';
 import { InputState } from './input-state';
 import { LogicalFilterOperator } from './logical-filter-operator';
 import { iconClear, iconSearch } from '@siemens/ix-icons/icons';
+import { A11yAttributes, a11yHostAttributes } from '../utils/a11y';
 
 @Component({
   tag: 'ix-category-filter',
@@ -36,6 +37,7 @@ export class CategoryFilter {
   @State() private textInput?: HTMLInputElement;
   private formElement?: HTMLFormElement;
   private isScrollStateDirty?: boolean;
+  private a11yAttributes?: A11yAttributes;
 
   @Element() hostElement!: HTMLIxCategoryFilterElement;
 
@@ -139,13 +141,6 @@ export class CategoryFilter {
    */
   @Prop() i18nPlainText = 'Filter by text';
 
-  /**
-   * Aria label for the filter input field
-   *
-   * @since 2.6.0
-   */
-  @Prop() ariaLabel = 'Filter';
-
   /**
    * Event dispatched whenever a category gets selected in the dropdown
    */
@@ -170,6 +165,10 @@ export class CategoryFilter {
     this.setFilterState(newValue);
   }
 
+  componentWillLoad() {
+    this.a11yAttributes = a11yHostAttributes(this.hostElement);
+  }
+
   componentDidLoad() {
     if (this.filterState !== undefined) {
       setTimeout(() => this.setFilterState(this.filterState));
@@ -764,7 +763,7 @@ export class CategoryFilter {
                   ref={(el) => (this.textInput = el)}
                   type="text"
                   placeholder={this.placeholder}
-                  aria-label={this.ariaLabel}
+                  {...this.a11yAttributes}
                 ></input>
               </div>
             </div>

diff --git a/packages/documentation/docs/faq.md b/packages/documentation/docs/faq.md
@@ -13,8 +13,8 @@ Welcome to the Industrial Experience Design System FAQ. This document serves as
 ## System access and use
 </div>
 
-<Accordion title="What’s the difference between the Siemens brand and the open-source libraries?" id="brand-vs-os">
-The Siemens brand library within the design system is only available to Siemens employees and business partners as it contains Siemens brand elements. The open source library comes with the classic theme that can be used by non-Siemens applications. It’s possible to create custom themes that fit third-party style guides. Both libraries are available in dark and light modes.
+<Accordion title="What’s the difference between the classic theme and the Siemens brand theme?" id="brand-vs-os">
+The classic theme is the default that can be utilized by any application, including non-Siemens applications. In contrast, the Siemens brand theme is exclusively available to Siemens employees and business partners, incorporating specific Siemens brand elements. Both themes are offered in dark and light modes. Additionally, you have the flexibility to create custom themes that align with third-party style guides. 
 </Accordion>
 
 <Accordion title="Which browsers are supported?" id="vendor-support">

diff --git a/packages/documentation/static/uxt/uxt-ix-css.css b/packages/documentation/static/uxt/uxt-ix-css.css
diff --git a/packages/vue/src/components.ts b/packages/vue/src/components.ts
@@ -235,7 +235,6 @@ export const IxCategoryFilter = /*@__PURE__*/ defineContainer<JSX.IxCategoryFilt
   'tmpDisableScrollIntoView',
   'labelCategories',
   'i18nPlainText',
-  'ariaLabel',
   'categoryChanged',
   'inputChanged',
   'filterChanged'