feat(forms): migrate to DS Tabs + CollapsibleFieldset

.changeset/beige-terms-yell.md

@@ -0,0 +1,5 @@
+---
+'@talend/react-forms': minor
+---
+
+Use DS tabs in UIForm

.changeset/few-months-tickle.md

@@ -0,0 +1,5 @@
+---
+'@talend/design-system': minor
+---
+
+Error state for tabs

packages/design-system/src/components/Tabs/Primitive/TabStyles.module.scss

@@ -102,4 +102,24 @@
 			margin-right: tokens.$coral-spacing-s;
 		}
 	}
+
+	&_error {
+		color: tokens.$coral-color-danger-text;
+
+		&[aria-selected='true'] {
+			color: tokens.$coral-color-danger-text;
+		}
+	}
+
+	&_error::after {
+		content: '';
+		position: absolute;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		border-top: tokens.$coral-border-m-solid tokens.$coral-color-danger-text;
+		opacity: 0;
+		transition: tokens.$coral-transition-fast;
+		transform: translateY(100%);
+	}
 }

packages/design-system/src/components/Tabs/Primitive/Tabs.tsx

@@ -1,12 +1,12 @@
 import { useContext } from 'react';
 import { SizedIcon } from '../../Icon';
 import { TagDefault } from '../../Tag';
 import { StackHorizontal } from '../../Stack';
 import { TabsInternalContext } from './TabsProvider';
 import { Tooltip } from '../../Tooltip';
 import style from './TabStyles.module.scss';
 import { IconNameWithSize } from '@talend/icons';
 import classNames from 'classnames';
 
 export type TabsPropTypes = {
 	children: React.ReactNode[];
@@ -28,6 +28,7 @@
 	icon?: IconNameWithSize<'S'>;
 	tag?: string | number;
 	tooltip?: string;
+	error?: boolean;
 };
 
 export function Tab(props: TabPropTypes) {
@@ -36,7 +37,10 @@
 		<button
 			role="tab"
 			aria-selected={props['aria-controls'] === context?.value}
-			className={classNames(style.tab, { [style.tab_large]: context?.size === 'L' })}
+			className={classNames(style.tab, {
+				[style.tab_large]: context?.size === 'L',
+				[style.tab_error]: props.error === true,
+			})}
 			onClick={e => context?.onChange(e, props['aria-controls'])}
 			disabled={props.disabled}
 			type="button"

packages/design-system/src/components/Tabs/variants/Tabs.tsx

@@ -1,8 +1,8 @@
 import { TabsProvider, TabsProviderPropTypes } from '../Primitive/TabsProvider';
 import { Tabs as TabList, Tab, TabPropTypes } from '../Primitive/Tabs';
 import { TabPanel, TabPanelPropTypes } from '../Primitive/TabPanel';
 import { useEffect, useState } from 'react';
 import { randomUUID } from '@talend/utils';
 
 type TabTitlePropTypes = Omit<TabPropTypes, 'aria-controls'> & {
 	id?: string;
@@ -50,12 +50,9 @@
 							tabProps['aria-controls'] = ids[index];
 							tabProps.title = tab.tabTitle;
 						} else if (typeof tab.tabTitle === 'object') {
-							tabProps['aria-controls'] = tab.tabTitle.id || ids[index];
-							tabProps.title = tab.tabTitle.title;
-							tabProps.icon = tab.tabTitle.icon;
-							tabProps.tag = tab.tabTitle.tag;
-							tabProps.tooltip = tab.tabTitle.tooltip;
-							tabProps.disabled = tab.tabTitle.disabled;
+							const { id, ...rest } = tab.tabTitle;
+							tabProps['aria-controls'] = id || ids[index];
+							Object.assign(tabProps, rest);
 						}
 						return <Tab key={index} {...(tabProps as TabPropTypes)} />;
 					})}

packages/design-system/src/stories/navigation/Tabs.stories.tsx

@@ -1,5 +1,5 @@
 import { useState } from 'react';
 import { StackHorizontal, StackVertical, Tabs } from '../../';
 
 export default { component: Tabs, title: 'Navigation/Tabs' };
 
@@ -34,6 +34,28 @@
 	</StackHorizontal>
 );
 
+export const TabsWithError = () => (
+	<Tabs
+		tabs={[
+			{
+				tabTitle: {
+					icon: 'user',
+					title: 'User',
+					error: true,
+				},
+				tabContent: <h2>Users tab content</h2>,
+			},
+			{
+				tabTitle: {
+					icon: 'calendar',
+					title: 'Calendar',
+				},
+				tabContent: <h2>Calendar tab content</h2>,
+			},
+		]}
+	/>
+);
+
 export const TabsWithIcon = () => (
 	<Tabs.Container defaultActiveKey="profile">
 		<Tabs.List>

packages/forms/src/UIForm/fieldsets/Array/Array.component.js

@@ -1,10 +1,10 @@
 import PropTypes from 'prop-types';
 import { Component } from 'react';
 import { head, get } from 'lodash';
 import Widget from '../../Widget';
 import { shiftArrayErrorsKeys } from '../../utils/validation';
 import defaultTemplates from '../../utils/templates';
 import { getArrayElementSchema } from '../../utils/array';
 
 function getRange(previousIndex, nextIndex) {
 	if (previousIndex < nextIndex) {
@@ -124,6 +124,7 @@
 			<Widget
 				{...this.props}
 				{...extraProps}
+				index={index}
 				disabled={this.props.schema.disabled}
 				id={this.props.id && `${this.props.id}-${index}`}
 				schema={getArrayElementSchema(this.props.schema, index)}
@@ -155,7 +156,7 @@
 	widgets: {},
 };
 
 if (process.env.NODE_ENV !== 'production') {
 	ArrayWidget.propTypes = {
 		displayMode: PropTypes.string,
 		id: PropTypes.string,

packages/forms/src/UIForm/fieldsets/CollapsibleFieldset/CollapsibleFieldset.component.js

@@ -1,10 +1,11 @@
+import { useCallback } from 'react';
+
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { InlineMessageInformation } from '@talend/design-system';
-import CollapsiblePanel from '@talend/react-components/lib/CollapsiblePanel';
+import { InlineMessageInformation, CollapsiblePanel } from '@talend/design-system';
 import get from 'lodash/get';
 import Widget from '../../Widget';
 import { generateDescriptionId } from '../../Message/generateId';
 
 import theme from './CollapsibleFieldset.module.scss';
 
@@ -72,11 +73,18 @@
  * @param {function} title the function called by the component to compute the title
  * @return {function} CollapsibleFieldset react component
  */
+// eslint-disable-next-line @typescript-eslint/default-param-last
 export default function createCollapsibleFieldset(title = defaultTitle) {
 	function CollapsibleFieldset(props) {
-		function toggle(event) {
-			event.stopPropagation();
-			event.preventDefault();
+		const { id, schema, value, actions, index, ...restProps } = props;
+		const { items, managed } = schema;
+
+		function onToggleClick(event) {
+			if (event) {
+				event.stopPropagation();
+				event.preventDefault();
+			}
+
 			const payload = {
 				schema: props.schema,
 				value: {
@@ -87,22 +95,31 @@
 			props.onChange(event, payload);
 		}
 
-		const { id, schema, value, actions, ...restProps } = props;
-		const { items } = schema;
-		const displayAction = actions.map(action => ({
-			...action,
-			displayMode: CollapsiblePanel.displayModes.TYPE_ACTION,
-		}));
+		const getAction = useCallback(() => {
+			if (!actions || actions.length === 0 || actions[0] === undefined) {
+				return undefined;
+			}
+
+			const action = actions[0];
+
+			return {
+				...action,
+				tooltip: action.tooltip || action.label,
+				callback: action.onClick,
+			};
+		}, [actions]);
 
 		return (
 			<fieldset
 				className={classNames('form-group', theme['collapsible-panel'], 'collapsible-panel')}
 			>
 				<CollapsiblePanel
-					id={`${id}`}
-					header={[{ label: title(value, schema) }, displayAction]}
-					onToggle={toggle}
+					title={title(value, schema)}
+					onToggleExpanded={onToggleClick}
+					index={index}
+					managed={!!managed}
 					expanded={!value.isClosed}
+					action={getAction()}
 				>
 					{schema.description ? (
 						<InlineMessageInformation
@@ -115,8 +132,8 @@
 					) : (
 						''
 					)}
-					{items.map((itemSchema, index) => (
-						<Widget {...restProps} id={id} key={index} schema={itemSchema} value={value} />
+					{items.map((itemSchema, idx) => (
+						<Widget {...restProps} id={id} key={`${id}-${idx}`} schema={itemSchema} value={value} />
 					))}
 				</CollapsiblePanel>
 			</fieldset>
@@ -129,12 +146,14 @@
 	};
 	CollapsibleFieldset.isCloseable = true;
 
 	if (process.env.NODE_ENV !== 'production') {
 		CollapsibleFieldset.propTypes = {
 			id: PropTypes.string,
+			index: PropTypes.number,
 			onChange: PropTypes.func.isRequired,
 			schema: PropTypes.shape({
 				items: PropTypes.array.isRequired,
+				managed: PropTypes.bool,
 				description: PropTypes.string,
 			}).isRequired,
 			value: PropTypes.object,

packages/forms/src/UIForm/fieldsets/CollapsibleFieldset/CollapsibleFieldset.component.test.js

@@ -1,10 +1,10 @@
 import set from 'lodash/set';
 import cloneDeep from 'lodash/cloneDeep';
 import { screen, render } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import createCollapsibleFieldset, { defaultTitle } from './CollapsibleFieldset.component';
 import { WidgetContext } from '../../context';
 import widgets from '../../utils/widgets';
 
 jest.unmock('@talend/design-system');
 
@@ -90,7 +90,7 @@
 				<CollapsibleFieldset {...props} value={{ ...value, isClosed: true }} />
 			</WidgetContext.Provider>,
 		);
-		expect(screen.getByRole('tab')).toHaveTextContent('Jimmy, Somsanith');
+		expect(screen.getByText('Jimmy, Somsanith')).toBeInTheDocument();
 		expect(screen.getByRole('button')).toHaveAttribute('aria-expanded', 'false');
 	});
 	it('should render a custom title', () => {
@@ -101,7 +101,7 @@
 				<CollapsibleFieldset {...props} />
 			</WidgetContext.Provider>,
 		);
-		expect(screen.getByRole('tab')).toHaveTextContent('Basic: Jimmy Somsanith');
+		expect(screen.getByText('Basic: Jimmy Somsanith')).toBeInTheDocument();
 	});
 	it('should render without value', () => {
 		const CollapsibleFieldset = createCollapsibleFieldset();
@@ -110,42 +110,48 @@
 				<CollapsibleFieldset {...props} value={{}} />
 			</WidgetContext.Provider>,
 		);
-		expect(screen.getByRole('tab')).toHaveTextContent('Basic');
+		expect(screen.getByText('Basic')).toBeInTheDocument();
 	});
 
 	it('should toggle', async () => {
 		// given
 		const CollapsibleFieldset = createCollapsibleFieldset();
 
+		const extendedSchema = {
+			...props.schema,
+			managed: true,
+		};
+
 		render(
 			<WidgetContext.Provider value={widgets}>
-				<CollapsibleFieldset {...props} value={{ ...value, isClosed: true }} />
+				<CollapsibleFieldset
+					{...props}
+					value={{ ...value, isClosed: true }}
+					schema={extendedSchema}
+					index={0}
+				/>
 			</WidgetContext.Provider>,
 		);
 		// when
 		await userEvent.click(screen.getByRole('button'));
 
 		// then
 		expect(props.onChange).toBeCalledWith(expect.anything(), {
-			schema,
+			schema: extendedSchema,
 			value: { ...value, isClosed: false },
 		});
 	});
 
 	it('should render Actions component if actions are provided', () => {
 		const CollapsibleFieldset = createCollapsibleFieldset();
-		const actions = [
-			{ id: 'action1', label: 'Action1', onClick: jest.fn() },
-			{ id: 'action2', label: 'Action 2', onClick: jest.fn() },
-		];
+		const actions = [{ id: 'action1', label: 'Action1', onClick: jest.fn(), icon: 'talend-trash' }];
 
 		render(
 			<WidgetContext.Provider value={widgets}>
 				<CollapsibleFieldset {...props} actions={actions} />
 			</WidgetContext.Provider>,
 		);
 		expect(screen.getByRole('button', { name: 'Action1' })).toBeVisible();
-		expect(screen.getByRole('button', { name: 'Action 2' })).toBeVisible();
 	});
 
 	it('should not render Actions component if actions are not provided', () => {