Skip to content

Commit

Permalink
Merge branch 'master' into fix/TDOPS-5510/add-data-attributes-for-inl…
Browse files Browse the repository at this point in the history
…ine-edit
  • Loading branch information
ybaskaran authored Feb 6, 2024
2 parents 6bba978 + e034360 commit 3c9c805
Show file tree
Hide file tree
Showing 11 changed files with 34 additions and 5 deletions.
6 changes: 6 additions & 0 deletions packages/design-system/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @talend/design-system

## 9.4.0

### Minor Changes

- 5f9334f: feat: remove restrictions on stacks for height and width

## 9.3.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/design-system/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@talend/design-system",
"version": "9.3.0",
"version": "9.4.0",
"description": "Talend Design System",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { forwardRef } from 'react';
import type { Ref } from 'react';

import StackPrimitive, { StackPrimitiveProps } from './Primitive/StackPrimitive';

export type StackHorizontalProps = Omit<StackPrimitiveProps, 'direction' | 'height'>;
export type StackHorizontalProps = Omit<StackPrimitiveProps, 'direction'>;

export const StackHorizontal = forwardRef((props: StackHorizontalProps, ref: Ref<any>) => {
return (
Expand Down
2 changes: 2 additions & 0 deletions packages/design-system/src/components/Stack/StackItem.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { forwardRef, ReactNode } from 'react';
import type { Ref } from 'react';

import classnames from 'classnames';

import styles from './StackItem.module.scss';

export const alignOptions = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { forwardRef } from 'react';
import type { Ref } from 'react';

import StackPrimitive, { StackPrimitiveProps } from './Primitive/StackPrimitive';

export type StackVerticalProps = Omit<StackPrimitiveProps, 'direction' | 'isFullWidth'>;
export type StackVerticalProps = Omit<StackPrimitiveProps, 'direction'>;

export const StackVertical = forwardRef((props: StackVerticalProps, ref: Ref<any>) => {
return (
Expand Down
11 changes: 11 additions & 0 deletions packages/forms/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# @talend/react-forms

## 13.2.0

### Minor Changes

- e38e9f3: fix(DFD-629): Add array item delete button tooltip

### Patch Changes

- Updated dependencies [5f9334f]
- @talend/design-system@9.4.0

## 13.1.0

### Minor Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/forms/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@talend/icons": "^7.7.0",
"@talend/json-schema-form-core": "^1.2.1",
"@talend/react-components": "^15.1.0",
"@talend/design-system": "^9.2.0",
"@talend/design-system": "^9.4.0",
"@talend/design-tokens": "^3.1.0",
"@talend/utils": "^3.0.0",
"ace-builds": "1.10.1",
Expand Down Expand Up @@ -93,5 +93,5 @@
"publishConfig": {
"access": "public"
},
"version": "13.1.0"
"version": "13.2.0"
}
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ function ArrayItem(props) {
onClick: event => onRemove(event, index),
disabled: widgetIsDisabled,
icon: 'trash',
tooltip: t('ARRAY_ITEM_DELETE', 'Delete'),
};
const actions = [];
if (!readOnly) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ exports[`Array component should render array 1`] = `
class="theme-clickable theme-buttonIcon"
id="talend-array-control-0-delete"
tabindex="0"
tooltip="Delete"
type="button"
>
<span
Expand Down Expand Up @@ -371,6 +372,7 @@ exports[`Array component should render array 1`] = `
class="theme-clickable theme-buttonIcon"
id="talend-array-control-1-delete"
tabindex="0"
tooltip="Delete"
type="button"
>
<span
Expand Down Expand Up @@ -554,6 +556,7 @@ exports[`Array component should render array 1`] = `
class="theme-clickable theme-buttonIcon"
id="talend-array-control-2-delete"
tabindex="0"
tooltip="Delete"
type="button"
>
<span
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ exports[`Array Item component should render control panel with item content 1`]
class="theme-clickable theme-buttonIcon"
id="talend-control-3-delete"
tabindex="0"
tooltip="Delete"
type="button"
>
<span
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ exports[`Default Array Template component should render default array template 1
class="theme-clickable theme-buttonIcon"
id="my-template-control-0-delete"
tabindex="0"
tooltip="Delete"
type="button"
>
<span
Expand Down Expand Up @@ -221,6 +222,7 @@ exports[`Default Array Template component should render default array template 1
class="theme-clickable theme-buttonIcon"
id="my-template-control-1-delete"
tabindex="0"
tooltip="Delete"
type="button"
>
<span
Expand Down Expand Up @@ -314,6 +316,7 @@ exports[`Default Array Template component should render default array template 1
class="theme-clickable theme-buttonIcon"
id="my-template-control-2-delete"
tabindex="0"
tooltip="Delete"
type="button"
>
<span
Expand Down

0 comments on commit 3c9c805

Please sign in to comment.