fix: rebase

sbb-design-systems · Mar 28, 2024 · 673be75 · 673be75
1 parent c3200b4
commit 673be75
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 45 deletions.
diff --git a/...omplete-grid/autocomplete-grid-button/__snapshots__/autocomplete-grid-button.spec.snap.js b/...omplete-grid/autocomplete-grid-button/__snapshots__/autocomplete-grid-button.spec.snap.js
@@ -54,7 +54,7 @@ snapshots["sbb-autocomplete-grid-button renders disabled Dom"] =
   dir="ltr"
   disabled=""
   icon-name="pie-small"
-  id="sbb-autocomplete-grid-item-4x1x0"
+  id="sbb-autocomplete-grid-item-3x1x0"
   role="button"
 >
 </sbb-autocomplete-grid-button>
@@ -115,7 +115,7 @@ snapshots["sbb-autocomplete-grid-button renders negative without icon Dom"] =
   data-action=""
   data-button=""
   dir="ltr"
-  id="sbb-autocomplete-grid-item-7x1x0"
+  id="sbb-autocomplete-grid-item-5x1x0"
   negative=""
   role="button"
 >

diff --git a/...onents/autocomplete-grid/autocomplete-grid-optgroup/autocomplete-grid-optgroup.stories.ts b/...onents/autocomplete-grid/autocomplete-grid-optgroup/autocomplete-grid-optgroup.stories.ts
@@ -135,7 +135,8 @@ const TemplateOptgroup = ({ label, disabled, ...args }: Args): TemplateResult =>
 
 const Template = (args: Args): TemplateResult => {
   return html`
-    <sbb-form-field label="Autocomplete" ?negative=${args.negative}>
+    <sbb-form-field ?negative=${args.negative}>
+      <label>Autocomplete</label>
       <input placeholder="Placeholder" />
       <sbb-autocomplete-grid>${TemplateOptgroup(args)}</sbb-autocomplete-grid>
     </sbb-form-field>

diff --git a/...omplete-grid/autocomplete-grid-option/__snapshots__/autocomplete-grid-option.spec.snap.js b/...omplete-grid/autocomplete-grid-option/__snapshots__/autocomplete-grid-option.spec.snap.js
@@ -54,7 +54,7 @@ snapshots["sbb-autocomplete-grid-option disabled Dom"] =
   aria-selected="false"
   data-slot-names="unnamed"
   disabled=""
-  id="sbb-autocomplete-grid-item-4x0"
+  id="sbb-autocomplete-grid-item-3x0"
   role="gridcell"
   value="1"
 >

diff --git a/...components/autocomplete-grid/autocomplete-grid-option/autocomplete-grid-option.stories.ts b/...components/autocomplete-grid/autocomplete-grid-option/autocomplete-grid-option.stories.ts
@@ -125,7 +125,8 @@ const createOptions = ({
 const StandaloneTemplate = (args: Args): TemplateResult => html`${createOptions(args)}`;
 
 const AutocompleteTemplate = (args: Args): TemplateResult => html`
-  <sbb-form-field label="sbb-autocomplete-grid" ?negative=${args.negative}>
+  <sbb-form-field ?negative=${args.negative}>
+    <label>sbb-autocomplete-grid</label>
     <input placeholder="Please select." />
     <sbb-autocomplete-grid> ${createOptions(args)} </sbb-autocomplete-grid>
   </sbb-form-field>

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
@@ -5,7 +5,7 @@ import { hostAttributes, SbbOptionBaseElement } from '../../core/common-behavior
 import { EventEmitter } from '../../core/eventing';
 
 import '../../icon';
-import '../../screenreader-only';
+import '../../screen-reader-only';
 import style from './autocomplete-grid-option.scss?lit&inline';
 
 /**

diff --git a/src/components/autocomplete-grid/autocomplete-grid/autocomplete-grid.stories.ts b/src/components/autocomplete-grid/autocomplete-grid/autocomplete-grid.stories.ts
@@ -314,12 +314,12 @@ const createRows2 = (buttonIconName: string, disableOption: boolean): TemplateRe
 const Template = (args: Args): TemplateResult => html`
   <div>
     <sbb-form-field
-      label="Label"
       ?negative=${args.negative}
       ?borderless=${args.borderless}
       ?floating-label=${args.floatingLabel}
       data-testid="form-field"
     >
+      <label>Label</label>
       <input
         placeholder="Placeholder"
         data-testid="autocomplete-input"
@@ -348,12 +348,12 @@ const Template = (args: Args): TemplateResult => html`
 const OptionGroupTemplate = (args: Args): TemplateResult => html`
   <div>
     <sbb-form-field
-      label="Label"
       ?negative=${args.negative}
       ?borderless=${args.borderless}
       ?floating-label=${args.floatingLabel}
       data-testid="form-field"
     >
+      <label>Label</label>
       <input
         placeholder="Placeholder"
         data-testid="autocomplete-input"

diff --git a/src/components/core/common-behaviors/option-base-element.ts b/src/components/core/common-behaviors/option-base-element.ts
@@ -195,8 +195,8 @@ export abstract class SbbOptionBaseElement extends SbbDisabledMixin(SbbIconNameM
             <slot @slotchange=${this.setupHighlightHandler}></slot>
             ${this.renderLabel()}
             ${this._inertAriaGroups && this.getAttribute('data-group-label')
-              ? html` <sbb-screenreader-only>
-                  (${this.getAttribute('data-group-label')})</sbb-screenreader-only
+              ? html` <sbb-screen-reader-only>
+                  (${this.getAttribute('data-group-label')})</sbb-screen-reader-only
                 >`
               : nothing}
           </span>

diff --git a/src/components/screenreader-only/__snapshots__/screenreader-only.spec.snap.js b/src/components/screenreader-only/__snapshots__/screenreader-only.spec.snap.js