Merge branch 'master' into ci/chore/upgrade-dependencies

Talend · Nov 30, 2023 · 3a43c41 · 3a43c41
2 parents 01a5221 + a07c9cb
commit 3a43c41
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 3 deletions.
diff --git a/.changeset/rich-kangaroos-fold.md b/.changeset/rich-kangaroos-fold.md
@@ -0,0 +1,5 @@
+---
+'@talend/design-system': patch
+---
+
+TDOPS-5762 - Fix Design System accordion button that would submit a form
diff --git a/.changeset/sharp-goats-obey.md b/.changeset/sharp-goats-obey.md
@@ -0,0 +1,5 @@
+---
+'@talend/react-faceted-search': patch
+---
+
+Move bootstrap-theme as dependency instead of devDependency
diff --git a/packages/design-system/src/components/Accordion/Primitive/CollapsiblePanelHeader.tsx b/packages/design-system/src/components/Accordion/Primitive/CollapsiblePanelHeader.tsx
@@ -1,16 +1,17 @@
 import { forwardRef, ReactChild, Ref } from 'react';
+
 import classnames from 'classnames';
 
 import tokens from '@talend/design-tokens';
 
 import { ButtonIcon } from '../../ButtonIcon';
-import { SizedIcon } from '../../Icon';
 import { Divider } from '../../Divider';
+import { SizedIcon } from '../../Icon';
 import { StackHorizontal } from '../../Stack';
 import { Status } from '../../Status';
 import { variants } from '../../Status/Primitive/StatusPrimitive';
-
 import { PanelHeaderAction } from './types';
+
 import styles from './CollapsiblePanelHeader.module.scss';
 
 export type CollapsiblePanelHeaderPropsType = {
@@ -149,6 +150,7 @@ const CollapsiblePanelHeader = forwardRef(
 				ref={ref}
 				data-test="panel.header"
 				data-testid="panel.header"
+				type="button"
 			>
 				{getContent()}
 			</button>

diff --git a/packages/design-system/src/components/Accordion/__snapshots__/Accordion.test.tsx.snap b/packages/design-system/src/components/Accordion/__snapshots__/Accordion.test.tsx.snap
@@ -12,6 +12,7 @@ exports[`Accordion should render a11y html 1`] = `
       data-test="panel.header"
       data-testid="panel.header"
       id="CollapsiblePanel__control--id-mocked-uuid-0"
+      type="button"
     >
       <div
         class="theme-iconWrapper"
@@ -67,6 +68,7 @@ exports[`Accordion should render a11y html 1`] = `
       data-test="panel.header"
       data-testid="panel.header"
       id="CollapsiblePanel__control--id-mocked-uuid-1"
+      type="button"
     >
       <div
         class="theme-iconWrapper"
@@ -122,6 +124,7 @@ exports[`Accordion should render a11y html 1`] = `
       data-test="panel.header"
       data-testid="panel.header"
       id="CollapsiblePanel__control--id-mocked-uuid-2"
+      type="button"
     >
       <div
         class="theme-iconWrapper"
@@ -192,6 +195,7 @@ exports[`Accordion should render a11y html 1`] = `
       data-test="panel.header"
       data-testid="panel.header"
       id="CollapsiblePanel__control--id-mocked-uuid-3"
+      type="button"
     >
       <div
         class="theme-iconWrapper"
@@ -247,6 +251,7 @@ exports[`Accordion should render a11y html 1`] = `
       data-test="panel.header"
       data-testid="panel.header"
       id="CollapsiblePanel__control--id-mocked-uuid-4"
+      type="button"
     >
       <div
         class="theme-iconWrapper"

diff --git a/packages/faceted-search/package.json b/packages/faceted-search/package.json
@@ -33,6 +33,7 @@
     "url": "https://github.com/Talend/ui.git"
   },
   "dependencies": {
+    "@talend/bootstrap-theme": "^8.3.0",
     "@talend/daikon-tql-client": "^1.3.1",
     "@talend/utils": "^2.8.0",
     "@talend/react-bootstrap": "^2.1.1",
@@ -52,7 +53,6 @@
     "@talend/icons": "^7.3.0",
     "@talend/locales-tui-components": "^11.4.5",
     "@talend/locales-tui-faceted-search": "^11.3.0",
-    "@talend/react-components": "^12.2.0",
     "@talend/scripts-core": "^16.3.0",
     "@talend/scripts-config-babel": "^13.2.0",
     "@talend/scripts-config-jest": "^13.1.1",

diff --git a/...rm/fieldsets/CollapsibleFieldset/__snapshots__/CollapsibleFieldset.component.test.js.snap b/...rm/fieldsets/CollapsibleFieldset/__snapshots__/CollapsibleFieldset.component.test.js.snap
@@ -14,6 +14,7 @@ exports[`CollapsibleFieldset should render 1`] = `
       data-test="panel.header"
       data-testid="panel.header"
       id="CollapsiblePanel__control--id-42"
+      type="button"
     >
       <div
         class="theme-iconWrapper"