Merge branch 'main' into icon-update-scheduler

sbb-design-systems · Nov 21, 2024 · 2a5ff10 · 2a5ff10
2 parents df10a39 + 23d1fea
commit 2a5ff10
Show file tree

Hide file tree

Showing 9 changed files with 197 additions and 196 deletions.
diff --git a/.github/workflows/continuous-integration-secure.yml b/.github/workflows/continuous-integration-secure.yml
@@ -73,7 +73,7 @@ jobs:
         uses: kitabisa/docker-slim-action@v1
         with:
           target: '${{ env.IMAGE_REPO_PREVIEW }}:pr${{ env.PR_NUMBER }}'
-          tag: '${{ env.IMAGE_REPO_PREVIEW }}:pr${{ env.PR_NUMBER }}-slim'
+          tag: 'pr${{ env.PR_NUMBER }}-slim'
         env:
           DSLIM_PRESERVE_PATH: /usr/share/nginx/html
       - name: Push slim image
@@ -196,12 +196,12 @@ jobs:
         uses: kitabisa/docker-slim-action@v1
         with:
           target: '${{ env.IMAGE_REPO_VISUAL_REGRESSION }}:pr${{ env.PR_NUMBER }}'
-          tag: '${{ env.IMAGE_REPO_VISUAL_REGRESSION }}:pr${{ env.PR_NUMBER }}-slim'
+          tag: 'pr${{ env.PR_NUMBER }}-slim'
         env:
           DSLIM_PRESERVE_PATH: /usr/share/nginx/html
       - name: Push slim image
         run: |
-          docker push $IMAGE_REPO_VISUAL_REGRESSION:pr{{ env.PR_NUMBER }}-slim
+          docker push $IMAGE_REPO_VISUAL_REGRESSION:pr$PR_NUMBER-slim
           docker image list
 
       - name: Apply labels

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -163,7 +163,7 @@ jobs:
         uses: kitabisa/docker-slim-action@v1
         with:
           target: '${{ env.IMAGE_REPO_VISUAL_REGRESSION }}:baseline'
-          tag: '${{ env.IMAGE_REPO_VISUAL_REGRESSION }}:baseline-slim'
+          tag: baseline-slim
         env:
           DSLIM_PRESERVE_PATH: /usr/share/nginx/html
       - name: Push slim image

diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -99,15 +99,15 @@ jobs:
         uses: kitabisa/docker-slim-action@v1
         with:
           target: '${{ env.IMAGE_REPO_STORYBOOK }}:${{ steps.release.outputs.version }}'
-          tag: '${{ env.IMAGE_REPO_STORYBOOK }}:${{ steps.release.outputs.version }}-slim'
+          tag: '${{ steps.release.outputs.version }}-slim'
         env:
           DSLIM_PRESERVE_PATH: /usr/share/nginx/html
       - name: Build slim image with latest
         if: ${{ steps.release.outputs.release_created }}
         uses: kitabisa/docker-slim-action@v1
         with:
           target: '${{ env.IMAGE_REPO_STORYBOOK }}:latest'
-          tag: '${{ env.IMAGE_REPO_STORYBOOK }}:latest-slim'
+          tag: latest-slim
         env:
           DSLIM_PRESERVE_PATH: /usr/share/nginx/html
       - name: Push slim image
@@ -128,7 +128,7 @@ jobs:
         uses: kitabisa/docker-slim-action@v1
         with:
           target: '${{ env.IMAGE_REPO_STORYBOOK }}:dev'
-          tag: '${{ env.IMAGE_REPO_STORYBOOK }}:dev-slim'
+          tag: dev-slim
         env:
           DSLIM_PRESERVE_PATH: /usr/share/nginx/html
       - name: Push slim image

diff --git a/package.json b/package.json
@@ -84,21 +84,21 @@
     "@open-wc/lit-helpers": "0.7.0",
     "@open-wc/testing": "4.0.0",
     "@sbb-esta/lyne-design-tokens": "1.3.0",
-    "@storybook/addon-a11y": "8.4.4",
-    "@storybook/addon-actions": "8.4.4",
-    "@storybook/addon-essentials": "8.4.4",
-    "@storybook/addon-interactions": "8.4.4",
-    "@storybook/addon-links": "8.4.4",
-    "@storybook/blocks": "8.4.4",
-    "@storybook/manager-api": "8.4.4",
-    "@storybook/preview-api": "8.4.4",
-    "@storybook/test": "8.4.4",
-    "@storybook/theming": "8.4.4",
-    "@storybook/types": "8.4.4",
-    "@storybook/web-components": "8.4.4",
-    "@storybook/web-components-vite": "8.4.4",
+    "@storybook/addon-a11y": "8.4.5",
+    "@storybook/addon-actions": "8.4.5",
+    "@storybook/addon-essentials": "8.4.5",
+    "@storybook/addon-interactions": "8.4.5",
+    "@storybook/addon-links": "8.4.5",
+    "@storybook/blocks": "8.4.5",
+    "@storybook/manager-api": "8.4.5",
+    "@storybook/preview-api": "8.4.5",
+    "@storybook/test": "8.4.5",
+    "@storybook/theming": "8.4.5",
+    "@storybook/types": "8.4.5",
+    "@storybook/web-components": "8.4.5",
+    "@storybook/web-components-vite": "8.4.5",
     "@types/glob": "8.1.0",
-    "@types/mocha": "10.0.9",
+    "@types/mocha": "10.0.10",
     "@types/node": "20.17.6",
     "@types/react": "18.3.12",
     "@typescript-eslint/eslint-plugin": "8.15.0",
@@ -114,7 +114,7 @@
     "eslint": "9.15.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-import-resolver-typescript": "3.6.3",
-    "eslint-plugin-import-x": "4.4.2",
+    "eslint-plugin-import-x": "4.4.3",
     "eslint-plugin-lit": "1.15.0",
     "eslint-plugin-react": "7.37.2",
     "eslint-plugin-storybook": "0.11.1",
@@ -134,11 +134,11 @@
     "rollup-plugin-postcss-lit": "2.1.0",
     "sass": "1.81.0",
     "sinon": "19.0.2",
-    "storybook": "8.4.4",
+    "storybook": "8.4.5",
     "stylelint": "16.10.0",
     "stylelint-config-prettier-scss": "1.0.0",
     "stylelint-config-standard-scss": "13.1.0",
-    "stylelint-scss": "6.9.0",
+    "stylelint-scss": "6.10.0",
     "ts-lit-plugin": "2.0.2",
     "tslib": "2.8.1",
     "typescript": "5.6.3",

diff --git a/src/elements/datepicker/common/datepicker-button.ts b/src/elements/datepicker/common/datepicker-button.ts
@@ -111,8 +111,6 @@ export abstract class SbbDatepickerButton<T = Date> extends SbbNegativeMixin(Sbb
     if (formField) {
       this.negative = formField.hasAttribute('negative');
 
-      // We can't use getInputElement of SbbFormFieldElement as async awaiting is not supported in connectedCallback.
-      // We here only have to look for input.
       const inputElement = formField.querySelector('input');
 
       if (inputElement) {

diff --git a/src/elements/form-field/form-field/form-field.ts b/src/elements/form-field/form-field/form-field.ts
@@ -427,14 +427,6 @@ class SbbFormFieldElement extends SbbNegativeMixin(SbbHydrationMixin(LitElement)
     this._checkAndUpdateInputEmpty();
   }
 
-  /**
-   * Returns the input element.
-   * @deprecated Use the 'inputElement' property instead
-   */
-  public getInputElement(): HTMLInputElement | HTMLSelectElement | HTMLElement | undefined {
-    return this._input;
-  }
-
   private _syncNegative(): void {
     this.querySelectorAll?.(
       'sbb-form-error,sbb-mini-button,sbb-popover-trigger,sbb-form-field-clear,sbb-datepicker-next-day,sbb-datepicker-previous-day,sbb-datepicker-toggle,sbb-select,sbb-autocomplete,sbb-autocomplete-grid',

diff --git a/src/elements/form-field/form-field/readme.md b/src/elements/form-field/form-field/readme.md
@@ -162,11 +162,10 @@ technology will announce errors when they appear.
 
 ## Methods
 
-| Name              | Privacy | Description                                                                           | Parameters | Return                                                              | Inherited From |
-| ----------------- | ------- | ------------------------------------------------------------------------------------- | ---------- | ------------------------------------------------------------------- | -------------- |
-| `clear`           | public  | Manually clears the input value. It only works for inputs, selects are not supported. |            | `void`                                                              |                |
-| `getInputElement` | public  | Returns the input element.                                                            |            | `HTMLInputElement \| HTMLSelectElement \| HTMLElement \| undefined` |                |
-| `reset`           | public  | Manually reset the form field. Currently, this only resets the floating label.        |            | `void`                                                              |                |
+| Name    | Privacy | Description                                                                           | Parameters | Return | Inherited From |
+| ------- | ------- | ------------------------------------------------------------------------------------- | ---------- | ------ | -------------- |
+| `clear` | public  | Manually clears the input value. It only works for inputs, selects are not supported. |            | `void` |                |
+| `reset` | public  | Manually reset the form field. Currently, this only resets the floating label.        |            | `void` |                |
 
 ## Slots
 

diff --git a/src/elements/option/option/option-base-element.ts b/src/elements/option/option/option-base-element.ts
@@ -3,7 +3,7 @@ import { html, LitElement, nothing, type PropertyValues, type TemplateResult } f
 import { property, state } from 'lit/decorators.js';
 
 import { SbbConnectedAbortController } from '../../core/controllers.js';
-import { forceType, slotState } from '../../core/decorators.js';
+import { slotState } from '../../core/decorators.js';
 import { isAndroid, isSafari, setOrRemoveAttribute } from '../../core/dom.js';
 import type { EventEmitter } from '../../core/eventing.js';
 import { SbbDisabledMixin, SbbHydrationMixin } from '../../core/mixins.js';
@@ -46,16 +46,6 @@ abstract class SbbOptionBaseElement extends SbbDisabledMixin(
     return this.getAttribute('value') ?? '';
   }
 
-  /**
-   * Whether the option is currently active.
-   * TODO: remove with next major version.
-   * @deprecated
-   * @internal
-   */
-  @forceType()
-  @property({ reflect: true, type: Boolean })
-  public accessor active: boolean = false;
-
   /** Whether the option is selected. */
   @property({ type: Boolean })
   public set selected(value: boolean) {