Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Talend/ui into dcaldeira/feature/…
Browse files Browse the repository at this point in the history
…TDC-7256-fix-stepper-layout
  • Loading branch information
dlcaldeira committed Jul 31, 2023
2 parents e042451 + b36165a commit ea31db2
Show file tree
Hide file tree
Showing 32 changed files with 7,125 additions and 6,010 deletions.
5 changes: 0 additions & 5 deletions .changeset/clever-snails-whisper.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/hungry-parrots-mate.md

This file was deleted.

9 changes: 0 additions & 9 deletions .changeset/long-pigs-lie.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/old-onions-remain.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@talend/design-tokens': minor
---

feat: add brand & info tokens
6 changes: 6 additions & 0 deletions fork/module-to-cdn/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# @talend/module-to-cdn

## 9.9.0

### Minor Changes

- f65073eb9: feat: add ace-builds

## 9.8.5

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion fork/module-to-cdn/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@talend/module-to-cdn",
"version": "9.8.5",
"version": "9.9.0",
"description": "Get cdn config from npm module name",
"license": "MIT",
"repository": "https://github.com/Talend/ui",
Expand Down
19 changes: 19 additions & 0 deletions packages/components/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,24 @@
# @talend/react-components

## 11.1.2

### Patch Changes

- 62bcde608: fix: setup the interactive stuff in accent color for the subheader bar

## 11.1.1

### Patch Changes

- a38d7b28a: fix: change icon color to neutral in subheader as it's not an interactive component
fix: change the border color of the grid layout to be weaker

## 11.1.0

### Minor Changes

- c15088d3b: TDOPS-4856 - Fix List colors taken from DS tokens

## 11.0.0

### Major 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 @@ -113,5 +113,5 @@
"publishConfig": {
"access": "public"
},
"version": "11.0.0"
"version": "11.1.2"
}
2 changes: 1 addition & 1 deletion packages/components/src/GridLayout/Grid.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
:global(.react-grid-item) {
display: flex;
flex-direction: column;
border: 1px solid tokens.$coral-color-neutral-border;
border: 1px solid tokens.$coral-color-neutral-border-weak;
border-radius: 4px;
}

Expand Down
23 changes: 14 additions & 9 deletions packages/components/src/SubHeaderBar/SubHeaderBar.component.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import has from 'lodash/has';
import PropTypes from 'prop-types';
import classNames from 'classnames';
import { useTranslation } from 'react-i18next';
import { ButtonIcon } from '@talend/design-system';
import I18N_DOMAIN_COMPONENTS from '../constants';
import getDefaultT from '../translate';
import { Action } from '../Actions';
Expand Down Expand Up @@ -111,16 +112,20 @@ function SubHeaderBar({
<SubHeaderBarActions left>
{injected('before-back')}
{onGoBack && (
<Renderer.Action
id="backArrow"
onClick={onGoBack}
label={t('BACK_ARROW_TOOLTIP', { defaultValue: 'Go back' })}
icon="talend-arrow-left"
bsStyle="link"
data-feature={goBackDataFeature}
<div
className={classNames(theme['tc-subheader-back-button'], 'tc-subheader-back-button')}
hideLabel
/>
>
<ButtonIcon
icon="arrow-left"
size="M"
onClick={onGoBack}
id="backArrow"
data-testid="tc-subheader-backArrow"
data-feature={goBackDataFeature}
>
{t('BACK_ARROW_TOOLTIP', { defaultValue: 'Go back' })}
</ButtonIcon>
</div>
)}
{injected('before-title')}
<TitleSubHeader t={t} getComponent={getComponent} {...rest} />
Expand Down
9 changes: 6 additions & 3 deletions packages/components/src/SubHeaderBar/SubHeaderBar.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ $tc-svg-icon-size: $padding-large !default;

:global(.btn-link),
:global(.btn-icon-only) {
color: $tc-subheader-color;
color: tokens.$coral-color-accent-icon;

&:focus,
&:hover {
color: tokens.$coral-color-accent-text-hover;
color: tokens.$coral-color-accent-icon-hover;
}

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

Expand Down Expand Up @@ -79,6 +79,9 @@ $tc-svg-icon-size: $padding-large !default;
background-color: tokens.$coral-color-neutral-background-strong !important;
width: $tc-subheader-bar-height;
height: $tc-subheader-bar-height;
display: flex;
align-items: center;
justify-content: center;

&:focus,
&:hover,
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/SubHeaderBar/SubHeaderBar.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ describe('SubHeaderBar', () => {
};
render(<SubHeaderBar {...props} />);
expect(screen.getByText('myTitle')).toBeVisible();
expect(screen.getByLabelText('Go back')).toBeVisible();
expect(screen.getByTestId('tc-subheader-backArrow')).toBeVisible();
});

it('Should render SubHeader component if right actions are in loading state', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ $header-title-max-width: 90rem;
align-self: center;
width: $tc-input-subheader-size-large;
height: $tc-input-subheader-size-large;
color: tokens.$coral-color-accent-icon;
color: tokens.$coral-color-neutral-icon;
margin-right: $padding-large;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ exports[`SubHeaderBar should render 1`] = `
<div
class="theme-navbar-left navbar-left"
>
<button
aria-describedby="42"
aria-label="Go back"
class="theme-tc-subheader-back-button tc-subheader-back-button btn-icon-only btn btn-link"
id="backArrow"
type="button"
<div
class="theme-tc-subheader-back-button tc-subheader-back-button"
>
<span
class="CoralIcon"
name="talend-arrow-left"
/>
</button>
class="CoralButtonIcon"
data-testid="tc-subheader-backArrow"
icon="arrow-left"
id="backArrow"
>
Go back
</span>
</div>
<div
class="tc-subheader-details theme-tc-subheader-details"
>
Expand Down
5 changes: 3 additions & 2 deletions packages/containers/src/SubHeaderBar/SubHeaderBar.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ describe('SubHeaderBar container', () => {
};
// When
render(<Container {...props} />);
fireEvent.click(screen.getByLabelText('Go back'));

fireEvent.click(screen.getByTestId('tc-subheader-backArrow'));
// Then
expect(props.onGoBack).toHaveBeenCalled();
});
Expand All @@ -35,7 +36,7 @@ describe('SubHeaderBar container', () => {
};
// When
render(<Container {...props} />);
fireEvent.click(screen.getByLabelText('Go back'));
fireEvent.click(screen.getByTestId('tc-subheader-backArrow'));
// Then
expect(props.dispatchActionCreator).toHaveBeenCalledWith(
props.actionCreatorGoBack,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ exports[`SubHeaderBar container should render 1`] = `
<div
class="theme-navbar-left navbar-left"
>
<button
aria-describedby="42"
aria-label="Go back"
class="theme-tc-subheader-back-button tc-subheader-back-button btn-icon-only btn btn-link"
id="backArrow"
type="button"
<div
class="theme-tc-subheader-back-button tc-subheader-back-button"
>
<span
class="CoralIcon"
name="talend-arrow-left"
/>
</button>
class="CoralButtonIcon"
data-testid="tc-subheader-backArrow"
icon="arrow-left"
id="backArrow"
>
Go back
</span>
</div>
<div
class="tc-subheader-details theme-tc-subheader-details"
>
Expand Down
8 changes: 8 additions & 0 deletions packages/dataviz/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## 3.0.1

### Patch Changes

- eeac0f188: fix: bundle typing in the package that produce the following error:

Could not find a declaration file for module '@talend/react-dataviz' since the 3.0

## 3.0.0

### Major Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/dataviz/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@talend/react-dataviz",
"version": "3.0.0",
"version": "3.0.1",
"description": "Talend charts and visualization components",
"main": "lib/index.js",
"mainSrc": "src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/dataviz/tsconfig.build.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"extends": "./tsconfig.json",
"exclude": ["src/**/*.test.*", "src/**/*.stories.*"]
"exclude": ["src/**/*.cy.*", "src/**/*.test.*", "src/**/*.stories.*"]
}
2 changes: 1 addition & 1 deletion packages/dataviz/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"extends": "@talend/scripts-config-typescript/tsconfig.json",
"include": ["src/**/*", "./cypress.d.ts", "./cypress/**/*.ts", "./cypress.config.ts"],
"include": ["src/**/*"],
"compilerOptions": {
"baseUrl": ".",
"declaration": true,
Expand Down
3 changes: 2 additions & 1 deletion packages/design-tokens/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"root": true,
"extends": ["@talend"],
"rules": {
"react/display-name": "warn"
"react/display-name": "warn",
"@typescript-eslint/quotes": "off"
}
}
2 changes: 1 addition & 1 deletion packages/design-tokens/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"test": "echo no test for @talend/design-tokens",
"test:cov": "echo no test for @talend/design-tokens",
"test:umd": "jest scripts/umd.test.js",
"lint": "talend-scripts lint ./src ./scripts"
"lint": "talend-scripts lint"
},
"keywords": [
"talend",
Expand Down
Loading

0 comments on commit ea31db2

Please sign in to comment.