diff --git a/.changeset/cyan-garlics-worry.md b/.changeset/cyan-garlics-worry.md new file mode 100644 index 00000000000..9907c3ead47 --- /dev/null +++ b/.changeset/cyan-garlics-worry.md @@ -0,0 +1,5 @@ +--- +'@siemens/ix': patch +--- + +fix(core/input-group): update margin diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 53e6a088084..324ec25c9f1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,6 +5,7 @@ on: branches: - 'main' - 'release/*' + workflow_dispatch: jobs: build: diff --git a/packages/core/src/components/input-group/input-group.scss b/packages/core/src/components/input-group/input-group.scss index 57f433e1304..c3a9353b243 100644 --- a/packages/core/src/components/input-group/input-group.scss +++ b/packages/core/src/components/input-group/input-group.scss @@ -28,7 +28,7 @@ .group-start { left: 0px; height: 2rem; - margin-left: 0.375rem; + margin-left: 0.5rem; color: var(--theme-color-soft-text); } diff --git a/packages/core/src/components/toast/toast.tsx b/packages/core/src/components/toast/toast.tsx index eae59b6003f..b896b10d1cb 100644 --- a/packages/core/src/components/toast/toast.tsx +++ b/packages/core/src/components/toast/toast.tsx @@ -67,21 +67,56 @@ export class Toast { private getIcon() { if (this.icon) { - return ; + return ( + + ); } switch (this.type) { case 'info': - return ; + return ( + + ); case 'error': - return ; + return ( + + ); case 'success': - return ; + return ( + + ); case 'warning': - return ; + return ( + + ); default: return ''; diff --git a/packages/core/src/tests/input-group/input-group.e2e.ts-snapshots/input-group-basic-1-chromium---theme-classic-dark-linux.png b/packages/core/src/tests/input-group/input-group.e2e.ts-snapshots/input-group-basic-1-chromium---theme-classic-dark-linux.png index 35a2f17f563..ea0cb49ee19 100644 Binary files a/packages/core/src/tests/input-group/input-group.e2e.ts-snapshots/input-group-basic-1-chromium---theme-classic-dark-linux.png and b/packages/core/src/tests/input-group/input-group.e2e.ts-snapshots/input-group-basic-1-chromium---theme-classic-dark-linux.png differ diff --git a/packages/core/src/tests/input-group/input-group.e2e.ts-snapshots/input-group-basic-1-chromium---theme-classic-light-linux.png b/packages/core/src/tests/input-group/input-group.e2e.ts-snapshots/input-group-basic-1-chromium---theme-classic-light-linux.png index ebcdab04425..68393d67a55 100644 Binary files a/packages/core/src/tests/input-group/input-group.e2e.ts-snapshots/input-group-basic-1-chromium---theme-classic-light-linux.png and b/packages/core/src/tests/input-group/input-group.e2e.ts-snapshots/input-group-basic-1-chromium---theme-classic-light-linux.png differ diff --git a/packages/react/package.json b/packages/react/package.json index 5997e3bb67b..a6c2f8c36d3 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -54,6 +54,7 @@ "rollup-plugin-peer-deps-external": "^2.2.4", "rollup-plugin-sourcemaps": "^0.6.3", "rollup-plugin-terser": "^7.0.2", + "shadow-dom-testing-library": "^1.11.2", "typescript": "^4.5.5", "vitest": "^1.3.1" }, diff --git a/packages/react/src/tests/toast/toast.spec.tsx b/packages/react/src/tests/toast/toast.spec.tsx index a81ec7bb3a0..707808c941d 100644 --- a/packages/react/src/tests/toast/toast.spec.tsx +++ b/packages/react/src/tests/toast/toast.spec.tsx @@ -6,10 +6,11 @@ * This source code is licensed under the MIT license found in the * LICENSE file in the root directory of this source tree. */ -import { render, screen, waitFor } from '@testing-library/react'; +import { render, waitFor } from '@testing-library/react'; import React from 'react'; import { describe, it } from 'vitest'; import Content from './toast'; +import { screen } from 'shadow-dom-testing-library'; describe(`toast`, () => { it(`basic`, async () => { @@ -22,25 +23,15 @@ describe(`toast`, () => { await customElements.whenDefined('ix-toast-container'); const toast = await screen.findByText('Foobar'); - const toastShadowRoot = toast.shadowRoot; - - expect(toast).toBeDefined(); - expect(toastShadowRoot).toBeDefined(); - expect(toast.innerText).toBe('Foobar'); - - await customElements.whenDefined('ix-icon'); - - const icon = toastShadowRoot?.querySelector( - '.toast-icon ix-icon' - ) as HTMLIxIconElement; - - expect(icon).toBeDefined(); await waitFor(() => { - expect(icon.shadowRoot).toBeDefined(); + expect(toast).toBeInTheDocument(); }); - expect(icon.shadowRoot).toBeDefined(); + const icon = (await screen.findByShadowTestId( + 'toast-icon' + )) as HTMLIxIconElement; + expect(icon.name).toEqual('star'); }); }); diff --git a/packages/react/tsconfig.json b/packages/react/tsconfig.json index 9144b37231d..2097d577544 100644 --- a/packages/react/tsconfig.json +++ b/packages/react/tsconfig.json @@ -11,6 +11,7 @@ "dom", "es2015" ], + "types": ["node", "@testing-library/jest-dom"], "importHelpers": true, "module": "es2015", "moduleResolution": "node", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 88920753969..01777224918 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -683,6 +683,9 @@ importers: rollup-plugin-terser: specifier: ^7.0.2 version: 7.0.2(rollup@2.79.1) + shadow-dom-testing-library: + specifier: ^1.11.2 + version: 1.11.2(@testing-library/dom@8.20.1) typescript: specifier: ^4.5.5 version: 4.9.5 @@ -23266,6 +23269,15 @@ packages: /setprototypeof@1.2.0: resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==} + /shadow-dom-testing-library@1.11.2(@testing-library/dom@8.20.1): + resolution: {integrity: sha512-iZW5mLQob5UlWfT2KEF8YYLuLYMLQeoda0mNeB+KEQIzzwb+mASR1mhKfGjDds9jWNZMX1V443FDYAbaaNMAVw==} + engines: {node: '>= 14', npm: '>= 7'} + peerDependencies: + '@testing-library/dom': '>= 8' + dependencies: + '@testing-library/dom': 8.20.1 + dev: true + /shallow-clone@3.0.1: resolution: {integrity: sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==} engines: {node: '>=8'}