From 598507744a19c7e94f5a90876ca9f76cf8356d22 Mon Sep 17 00:00:00 2001
From: Davide Mininni <davide.mininni@finconsgroup.com>
Date: Wed, 3 Apr 2024 14:36:52 +0200
Subject: [PATCH] fix: rebase

---
 .../autocomplete-grid-option/autocomplete-grid-option.ts    | 6 +-----
 .../autocomplete-grid/autocomplete-grid.ts                  | 4 ++--
 .../autocomplete-grid/autocomplete-grid/readme.md           | 6 +++---
 src/components/core/overlay/overlay-trigger-attributes.ts   | 2 +-
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/components/autocomplete-grid/autocomplete-grid-option/autocomplete-grid-option.ts b/src/components/autocomplete-grid/autocomplete-grid-option/autocomplete-grid-option.ts
index 54018412142..230fe3ebeb5 100644
--- a/src/components/autocomplete-grid/autocomplete-grid-option/autocomplete-grid-option.ts
+++ b/src/components/autocomplete-grid/autocomplete-grid-option/autocomplete-grid-option.ts
@@ -1,4 +1,4 @@
-import type { CSSResultGroup, PropertyValues, TemplateResult } from 'lit';
+import type { CSSResultGroup, PropertyValues } from 'lit';
 import { customElement } from 'lit/decorators.js';
 
 import { SbbOptionBaseElement } from '../../core/base-elements/option-base-element';
@@ -79,10 +79,6 @@ export class SbbAutocompleteGridOptionElement extends SbbOptionBaseElement {
 
     this.setSelectedViaUserInteraction(true);
   }
-
-  protected override render(): TemplateResult {
-    return super.render();
-  }
 }
 
 declare global {
diff --git a/src/components/autocomplete-grid/autocomplete-grid/autocomplete-grid.ts b/src/components/autocomplete-grid/autocomplete-grid/autocomplete-grid.ts
index 64b38a04714..487407fb9d5 100644
--- a/src/components/autocomplete-grid/autocomplete-grid/autocomplete-grid.ts
+++ b/src/components/autocomplete-grid/autocomplete-grid/autocomplete-grid.ts
@@ -23,9 +23,9 @@ let nextId = 0;
  * @event {CustomEvent<void>} didOpen - Emits whenever the `sbb-autocomplete-grid` is opened.
  * @event {CustomEvent<void>} willClose - Emits whenever the `sbb-autocomplete-grid` begins the closing transition. Can be canceled.
  * @event {CustomEvent<void>} didClose - Emits whenever the `sbb-autocomplete-grid` is closed.
- * @cssprop [--sbb-autocomplete-z-index=var(--sbb-overlay-z-index)] - To specify a custom stack order,
+ * @cssprop [--sbb-autocomplete-z-index=var(--sbb-overlay-default-z-index)] - To specify a custom stack order,
  * the `z-index` can be overridden by defining this CSS variable. The default `z-index` of the
- * component is set to `var(--sbb-overlay-z-index)` with a value of `1000`.
+ * component is set to `var(--sbb-overlay-default-z-index)` with a value of `1000`.
  */
 @customElement('sbb-autocomplete-grid')
 @hostAttributes({
diff --git a/src/components/autocomplete-grid/autocomplete-grid/readme.md b/src/components/autocomplete-grid/autocomplete-grid/readme.md
index 04240233d8f..5c6ea3d39cd 100644
--- a/src/components/autocomplete-grid/autocomplete-grid/readme.md
+++ b/src/components/autocomplete-grid/autocomplete-grid/readme.md
@@ -167,9 +167,9 @@ using `aria-activedescendant` to support navigation though the autocomplete opti
 
 ## CSS Properties
 
-| Name                         | Default                      | Description                                                                                                                                                                                           |
-| ---------------------------- | ---------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `--sbb-autocomplete-z-index` | `var(--sbb-overlay-z-index)` | To specify a custom stack order, the `z-index` can be overridden by defining this CSS variable. The default `z-index` of the component is set to `var(--sbb-overlay-z-index)` with a value of `1000`. |
+| Name                         | Default                              | Description                                                                                                                                                                                                   |
+| ---------------------------- | ------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `--sbb-autocomplete-z-index` | `var(--sbb-overlay-default-z-index)` | To specify a custom stack order, the `z-index` can be overridden by defining this CSS variable. The default `z-index` of the component is set to `var(--sbb-overlay-default-z-index)` with a value of `1000`. |
 
 ## Slots
 
diff --git a/src/components/core/overlay/overlay-trigger-attributes.ts b/src/components/core/overlay/overlay-trigger-attributes.ts
index 6e682a363f7..1adb2f907df 100644
--- a/src/components/core/overlay/overlay-trigger-attributes.ts
+++ b/src/components/core/overlay/overlay-trigger-attributes.ts
@@ -48,7 +48,7 @@ export function setAriaComboBoxAttributes(
   trigger.setAttribute('aria-autocomplete', 'list');
   trigger.setAttribute('aria-haspopup', hasPopup);
   trigger.setAttribute('aria-controls', overlayId);
-  trigger.setAttribute('aria-owns', overlayId); // From Aria 1.2 this should not be necessary but safari still needs it
+  trigger.setAttribute('aria-owns', overlayId); // From Aria 1.2 this should not be necessary, but safari still needs it
   trigger.setAttribute('aria-expanded', `${expanded}`);
 }