Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/npm_and_yarn/floating-ui/react-…
Browse files Browse the repository at this point in the history
…0.26.28
  • Loading branch information
jmfrancois authored Dec 9, 2024
2 parents 737d2d5 + 1421219 commit 8630031
Show file tree
Hide file tree
Showing 19 changed files with 49 additions and 29 deletions.
6 changes: 6 additions & 0 deletions packages/components/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @talend/react-components

## 17.3.0

### Minor Changes

- d4da631: fix(QualityBar): fix tooltip label typo

## 17.2.1

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -130,5 +130,5 @@
"publishConfig": {
"access": "public"
},
"version": "17.2.1"
"version": "17.3.0"
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export const QualityBar = ({
tooltipLabels={{
empty: t('EMPTY_VALUES', {
defaultValue: '{{value}} empty value ({{percentage}}%)',
defaultValue_other: '{{value}} empty valuesssss ({{percentage}}%)',
defaultValue_other: '{{value}} empty values ({{percentage}}%)',
count: empty,
percentage: percentages.empty,
value: QualityBarDS.formatNumber(empty),
Expand Down
2 changes: 1 addition & 1 deletion packages/containers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"@talend/icons": "^7.10.3",
"@talend/locales-tui-components": "^16.0.1",
"@talend/locales-tui-containers": "^9.1.3",
"@talend/locales-tui-forms": "^10.2.4",
"@talend/locales-tui-forms": "^15.2.0",
"@talend/locales-design-system": "^7.15.1",
"@talend/react-storybook-cmf": "^10.0.0",
"@talend/eslint-config": "^13.2.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/design-docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"@talend/locales-tui-components": "^16.0.1",
"@talend/locales-tui-containers": "^9.1.3",
"@talend/locales-tui-faceted-search": "^11.3.0",
"@talend/locales-tui-forms": "^10.2.4",
"@talend/locales-tui-forms": "^15.2.0",
"@talend/scripts-core": "^16.5.1",
"@talend/scripts-config-babel": "^13.5.0",
"@talend/scripts-config-react-webpack": "^16.8.1",
Expand Down
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

## 11.3.1

### Patch Changes

- e742b73: TMC-4293 - Design System link should not be accent/grey while using qlik-light theme

## 11.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": "11.3.0",
"version": "11.3.1",
"description": "Talend Design System",
"main": "lib/index.js",
"types": "lib/index.d.ts",
Expand Down
14 changes: 7 additions & 7 deletions packages/design-system/src/components/Link/Link.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ $icon-alignment-offset-s: -0.0625rem;

.link {
font: tokens.$coral-paragraph-m-bold;
color: tokens.$coral-color-accent-text;
color: tokens.$coral-color-info-text;
background: none;
border: none;
border-bottom-color: currentColor;
Expand All @@ -26,18 +26,18 @@ $icon-alignment-offset-s: -0.0625rem;
}

&:hover {
color: tokens.$coral-color-accent-text-hover;
color: tokens.$coral-color-info-text-hover;

.link__text {
border-bottom-color: tokens.$coral-color-accent-border-hover;
border-bottom-color: tokens.$coral-color-info-border-hover;
}
}

&:active {
color: tokens.$coral-color-accent-text-active;
color: tokens.$coral-color-info-text-active;

.link__text {
border-bottom-color: tokens.$coral-color-accent-border-active;
border-bottom-color: tokens.$coral-color-info-border-active;
}
}

Expand All @@ -54,11 +54,11 @@ $icon-alignment-offset-s: -0.0625rem;
color: tokens.$coral-color-neutral-text;

&:hover {
color: tokens.$coral-color-accent-text-hover;
color: tokens.$coral-color-info-text-hover;
}

&:active {
color: tokens.$coral-color-accent-text-active;
color: tokens.$coral-color-info-text-active;
}
}
}
6 changes: 6 additions & 0 deletions packages/forms/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @talend/react-forms

## 15.2.1

### Patch Changes

- 0efaf0b: fix(TMC-861): Enhance translation for some cancel actions on ListView and Enumeration

## 15.2.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 @@ -68,7 +68,7 @@
"devDependencies": {
"@storybook/addon-actions": "^7.6.20",
"@storybook/addon-controls": "^7.6.20",
"@talend/locales-tui-forms": "^10.2.4",
"@talend/locales-tui-forms": "^15.2.0",
"@talend/react-components": "^17.2.0",
"@talend/eslint-config": "^13.2.1",
"@talend/eslint-plugin": "^1.3.1",
Expand Down Expand Up @@ -102,5 +102,5 @@
"publishConfig": {
"access": "public"
},
"version": "15.2.0"
"version": "15.2.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class EnumerationForm extends Component {
onClick: this.onSingleAddHandler.bind(this),
},
{
label: t('ENUMERATION_WIDGET_ABORT', { defaultValue: 'Abort' }),
label: t('ENUMERATION_WIDGET_CANCEL', { defaultValue: 'Cancel' }),
icon: 'talend-cross',
id: 'abort',
key: 'abort',
Expand All @@ -112,7 +112,7 @@ class EnumerationForm extends Component {
];
this.searchInputsActions = [
{
label: t('ENUMERATION_WIDGET_ABORT', { defaultValue: 'Abort' }),
label: t('ENUMERATION_WIDGET_REMOVE', { defaultValue: 'Remove filter' }),
icon: 'talend-cross',
id: 'abort',
key: 'abort',
Expand All @@ -137,7 +137,7 @@ class EnumerationForm extends Component {
},
{
disabled: false,
label: t('ENUMERATION_WIDGET_ABORT', { defaultValue: 'Abort' }),
label: t('ENUMERATION_WIDGET_CANCEL', { defaultValue: 'Cancel' }),
icon: 'talend-cross',
id: 'abort',
onClick: this.onAbortItem.bind(this),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class ListViewWidget extends Component {
{
id: 'abort',
icon: 'talend-cross',
label: t('LISTVIEW_WIDGET_ABORT', { defaultValue: 'Abort' }),
label: t('LISTVIEW_WIDGET_REMOVE', { defaultValue: 'Remove filter' }),
onClick: this.switchToDefaultMode.bind(this),
},
];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ describe('ListView field', () => {
target: { value: 'aaaaaa' },
});
// jest.runAllTimers();
fireEvent.click(screen.getByRole('link', { name: 'Abort' }));
fireEvent.click(screen.getByRole('link', { name: 'Remove filter' }));

// then
expect(screen.queryAllByRole('option').length).toBe(4);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class NestedListViewWidget extends Component {
{
id: 'abort',
icon: 'talend-cross',
label: t('LISTVIEW_WIDGET_ABORT', { defaultValue: 'Abort' }),
label: t('LISTVIEW_WIDGET_REMOVE', { defaultValue: 'Remove filter' }),
onClick: this.switchToDefaultMode.bind(this),
},
];
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { screen, render, fireEvent } from '@testing-library/react';
import ReactDOM from 'react-dom';

import { fireEvent, render, screen } from '@testing-library/react';

import { NestedListViewWidget } from './NestedListView.component';
import { getDisplayedItems, prepareItemsFromSchema } from './NestedListView.utils';

Expand Down Expand Up @@ -457,7 +459,7 @@ describe('NestedListView component', () => {
fireEvent.click(screen.getByRole('link', { name: 'Search for specific values' }));

// when clicking on the close action
fireEvent.click(screen.getByRole('link', { name: 'Abort' }));
fireEvent.click(screen.getByRole('link', { name: 'Remove filter' }));

// then switches to default mode
expect(screen.getByRole('link', { name: 'Search for specific values' })).toBeInTheDocument();
Expand Down
2 changes: 1 addition & 1 deletion packages/playground-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"@talend/locales-tui-components": "^16.0.1",
"@talend/locales-tui-containers": "^9.1.3",
"@talend/locales-tui-faceted-search": "^11.3.0",
"@talend/locales-tui-forms": "^10.2.4",
"@talend/locales-tui-forms": "^15.2.0",
"@talend/react-cmf": "^10.0.1",
"@talend/react-cmf-router": "^7.0.1",
"@talend/react-components": "^17.1.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@talend/icons": "^7.10.3",
"@talend/locales-tui-components": "^16.0.1",
"@talend/locales-tui-containers": "^9.1.3",
"@talend/locales-tui-forms": "^10.2.4",
"@talend/locales-tui-forms": "^15.2.0",
"@talend/react-cmf": "^10.0.1",
"@talend/react-cmf-router": "^7.0.1",
"@talend/react-components": "^17.1.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/storybook-one/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@talend/locales-tui-components": "^16.0.1",
"@talend/locales-tui-containers": "^9.1.3",
"@talend/locales-tui-faceted-search": "^11.3.0",
"@talend/locales-tui-forms": "^10.2.4",
"@talend/locales-tui-forms": "^15.2.0",
"@talend/scripts-config-babel": "^13.5.0",
"@talend/scripts-config-react-webpack": "^16.8.1",
"@talend/scripts-config-storybook-lib": "^5.4.0",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4322,10 +4322,10 @@
resolved "https://registry.yarnpkg.com/@talend/locales-tui-faceted-search/-/locales-tui-faceted-search-11.3.0.tgz#6a8d6e256ac9082cd3e3187f68cd67459b105107"
integrity sha512-Wj1t2puu/0vsNLHDgYwMiOCAh4vcHSfA76++vxSfQ0oZLnwXYoIDERcT1NaEnwu6Cpleue5MAuTKgDHryvWiqw==

"@talend/locales-tui-forms@^10.2.4":
version "10.2.4"
resolved "https://registry.yarnpkg.com/@talend/locales-tui-forms/-/locales-tui-forms-10.2.4.tgz#ea71b0d4876a82bea209d85f7da9d7b5c9bf248c"
integrity sha512-3rHgRKv9bc4rpLA3p4CQ7cGEWbHVITv6aRDLjhca6ZFmlQECC0JsghrqUYZ3GZeJmHezWGZm0LLRw4nNXBHwUA==
"@talend/locales-tui-forms@^15.2.0":
version "15.2.0"
resolved "https://registry.yarnpkg.com/@talend/locales-tui-forms/-/locales-tui-forms-15.2.0.tgz#dee8f65820b7e4e26de8b7972a48fd108bb0ffeb"
integrity sha512-6UMXC8/2qSB7u0ovYsvTqw0mtDsMUWTp/ahmuf4VtRGZDaHxwKl1TMhNgcVKDzwQc7AVzP4DBwG3MbzXqBEYlA==

"@testing-library/cypress@^10.0.2":
version "10.0.2"
Expand Down

0 comments on commit 8630031

Please sign in to comment.