Skip to content

Commit

Permalink
Merge branch 'master' into FE-6803-fieldset-formfield-rtl
Browse files Browse the repository at this point in the history
  • Loading branch information
nuria1110 committed Sep 20, 2024
2 parents 37f407f + 600ac5f commit 36d72ca
Show file tree
Hide file tree
Showing 68 changed files with 2,733 additions and 3,416 deletions.
43 changes: 43 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,46 @@
### [142.11.4](https://github.com/Sage/carbon/compare/v142.11.3...v142.11.4) (2024-09-20)


### Bug Fixes

* **toast:** ensure closed toasts do not trigger axe warnings ([6183351](https://github.com/Sage/carbon/commit/6183351ff6ba00bd032506e3ef61f296f720b080))

### [142.11.3](https://github.com/Sage/carbon/compare/v142.11.2...v142.11.3) (2024-09-19)


### Bug Fixes

* **tabs:** tab headers jump in width when navigating through them ([7c70261](https://github.com/Sage/carbon/commit/7c7026103f4f6b0f59b2c170f3f2523dd356832b)), closes [#6554](https://github.com/Sage/carbon/issues/6554)

### [142.11.2](https://github.com/Sage/carbon/compare/v142.11.1...v142.11.2) (2024-09-19)


### Bug Fixes

* **form, dialog:** tabbing in FireFox - focus incorrect ([43ff681](https://github.com/Sage/carbon/commit/43ff681be9365ba1ba4315bf50f04e79b9e88545))

### [142.11.1](https://github.com/Sage/carbon/compare/v142.11.0...v142.11.1) (2024-09-18)


### Bug Fixes

* **checkbox:** restore support for `labelHelp` and `fieldHelp` props ([b2fea4a](https://github.com/Sage/carbon/commit/b2fea4ac84f96252d12e2a0bbfbffe677a304938))
* **radio-button:** restore support for `labelHelp` and `fieldHelp` props ([81dfeb2](https://github.com/Sage/carbon/commit/81dfeb299bf89cf59a25009f1ace9b1a5938039a))

## [142.11.0](https://github.com/Sage/carbon/compare/v142.10.0...v142.11.0) (2024-09-18)


### Features

* **flat-table:** add `hasOuterVerticalBorders` and `bottomBorderRadius` props ([866137a](https://github.com/Sage/carbon/commit/866137a13ddcad40be0ec2ca2da124eac400dd06))

## [142.10.0](https://github.com/Sage/carbon/compare/v142.9.1...v142.10.0) (2024-09-16)


### Features

* **preview:** add `shape` and `disableAnimation` props ([bd071fe](https://github.com/Sage/carbon/commit/bd071fe3347317ccfb0c4262e10566ad31443869))

### [142.9.1](https://github.com/Sage/carbon/compare/v142.9.0...v142.9.1) (2024-09-12)


Expand Down
590 changes: 101 additions & 489 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "carbon-react",
"version": "142.9.1",
"version": "142.11.4",
"description": "A library of reusable React components for easily building user interfaces.",
"files": [
"lib",
Expand Down

This file was deleted.

12 changes: 5 additions & 7 deletions src/__internal__/checkable-input/checkable-input.component.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useRef, useContext } from "react";
import React, { useRef } from "react";

import {
StyledCheckableInput,
Expand All @@ -12,7 +12,6 @@ import HiddenCheckableInput, {
import guid from "../utils/helpers/guid";
import useInputAccessibility from "../../hooks/__internal__/useInputAccessibility";
import { ValidationProps } from "../validations";
import NewValidationContext from "../../components/carbon-provider/__internal__/new-validation.context";

export interface CommonCheckableInputProps
extends ValidationProps,
Expand All @@ -21,10 +20,10 @@ export interface CommonCheckableInputProps
disabled?: boolean;
/** @private @ignore */
loading?: boolean;
/** [Legacy] Help content to be displayed under an input */
/** Help content to be displayed under an input */
fieldHelp?: React.ReactNode;
/**
* [Legacy] If true, the FieldHelp will be displayed inline
* If true, the FieldHelp will be displayed inline
* To be used with labelInline prop set to true
*/
fieldHelpInline?: boolean;
Expand All @@ -34,7 +33,7 @@ export interface CommonCheckableInputProps
inputWidth?: number;
/** Label content */
label?: React.ReactNode;
/** [Legacy] The content for the help tooltip, to appear next to the Label */
/** The content for the help tooltip, to appear next to the Label */
labelHelp?: React.ReactNode;
/** Spacing between label and a field for inline label, given number will be multiplied by base spacing unit (8) */
labelSpacing?: 1 | 2;
Expand Down Expand Up @@ -101,7 +100,6 @@ const CheckableInput = React.forwardRef(
ref: React.ForwardedRef<HTMLInputElement>
) => {
const { current: id } = useRef(inputId || guid());
const { validationRedesignOptIn } = useContext(NewValidationContext);

const {
labelId,
Expand Down Expand Up @@ -139,7 +137,7 @@ const CheckableInput = React.forwardRef(
// However, we still want the input element to receive the required prop
isRequired: required,
isOptional,
useValidationIcon: validationRedesignOptIn ? false : validationOnLabel,
useValidationIcon: validationOnLabel,
};

const inputProps = {
Expand Down
Loading

0 comments on commit 36d72ca

Please sign in to comment.