Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add eslint rule for curly brace presence in JSX #62026

Merged
merged 7 commits into from
May 29, 2024
Merged

Add eslint rule for curly brace presence in JSX #62026

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
036ca5d
Add rule.
DaniGuardiola May 27, 2024
34addec
Run autofixes.
DaniGuardiola May 27, 2024
27d76eb
Merge branch 'trunk' of https://github.com/WordPress/gutenberg into l…
DaniGuardiola May 28, 2024
b5bc5f4
Disable react/no-unescaped-entities
DaniGuardiola May 28, 2024
0627c45
Use useInstanceId
DaniGuardiola May 28, 2024
c3922be
Disable entities rule inline.
DaniGuardiola May 28, 2024
57e1807
Merge branch 'trunk' of https://github.com/WordPress/gutenberg into l…
DaniGuardiola May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@ module.exports = {
rules: {
'jest/expect-expect': 'off',
'react/jsx-boolean-value': 'error',
'react/jsx-curly-brace-presence': [
'error',
{ props: 'never', children: 'never' },
],
'@wordpress/dependency-group': 'error',
'@wordpress/wp-global-usage': 'error',
'@wordpress/react-no-unsafe-timeout': 'error',
Expand Down
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/alignment-control/test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ describe( 'AlignmentUI', () => {
const { container } = render(
<AlignmentUI
isToolbar
value={ 'custom-right' }
value="custom-right"
onChange={ onChangeSpy }
isCollapsed={ false }
alignmentControls={ [
Expand Down
4 changes: 2 additions & 2 deletions packages/block-editor/src/components/audio-player/index.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ function Player( {
{ ! isDisabled && (
<TouchableWithoutFeedback
accessibilityLabel={ __( 'Audio Player' ) }
accessibilityRole={ 'button' }
accessibilityRole="button"
accessibilityHint={ __(
'Double tap to listen the audio file'
) }
Expand All @@ -204,7 +204,7 @@ function Player( {
this.player = ref;
} }
controls={ false }
ignoreSilentSwitch={ 'ignore' }
ignoreSilentSwitch="ignore"
onFullscreenPlayerWillPresent={ () => {
setPaused( false );
} }
Expand Down
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/block-bindings-toolbar-indicator/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default function BlockBindingsToolbarIndicator() {
return (
<ToolbarGroup>
<ToolbarItem
as={ 'div' }
as="div"
aria-label={ _x( 'Connected', 'block toolbar button label' ) }
className="block-editor-block-bindings-toolbar-indicator"
>
Expand Down
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/block-list/block-invalid-warning.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export default function BlockInvalidWarning( { clientId } ) {
<TouchableWithoutFeedback
onPress={ attemptBlockRecovery }
accessible
accessibilityRole={ 'button' }
accessibilityRole="button"
>
<Warning
title={ blockTitle }
Expand Down
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/border-radius-control/all-input-control.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export default function AllInputControl( {
onChange={ handleOnChange }
onUnitChange={ handleOnUnitChange }
placeholder={ allPlaceholder }
size={ '__unstable-large' }
size="__unstable-large"
/>
);
}
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/border-radius-control/input-controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export default function BoxInputControls( {
onUnitChange={ createHandleOnUnitChange(
corner
) }
size={ '__unstable-large' }
size="__unstable-large"
/>
</div>
</Tooltip>
Expand Down
24 changes: 12 additions & 12 deletions packages/block-editor/src/components/child-layout-control/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export default function ChildLayoutControl( {
>
<ToggleGroupControl
__nextHasNoMarginBottom
size={ '__unstable-large' }
size="__unstable-large"
label={ childLayoutOrientation( parentLayout ) }
value={ selfStretch || 'fit' }
help={ helpText( selfStretch, parentLayout ) }
Expand All @@ -126,24 +126,24 @@ export default function ChildLayoutControl( {
isBlock
>
<ToggleGroupControlOption
key={ 'fit' }
value={ 'fit' }
key="fit"
value="fit"
label={ __( 'Fit' ) }
/>
<ToggleGroupControlOption
key={ 'fill' }
value={ 'fill' }
key="fill"
value="fill"
label={ __( 'Fill' ) }
/>
<ToggleGroupControlOption
key={ 'fixed' }
value={ 'fixed' }
key="fixed"
value="fixed"
label={ __( 'Fixed' ) }
/>
</ToggleGroupControl>
{ selfStretch === 'fixed' && (
<UnitControl
size={ '__unstable-large' }
size="__unstable-large"
onChange={ ( value ) => {
onChange( {
selfStretch,
Expand All @@ -166,7 +166,7 @@ export default function ChildLayoutControl( {
panelId={ panelId }
>
<InputControl
size={ '__unstable-large' }
size="__unstable-large"
label={ __( 'Column span' ) }
type="number"
onChange={ ( value ) => {
Expand All @@ -181,7 +181,7 @@ export default function ChildLayoutControl( {
min={ 1 }
/>
<InputControl
size={ '__unstable-large' }
size="__unstable-large"
label={ __( 'Row span' ) }
type="number"
onChange={ ( value ) => {
Expand Down Expand Up @@ -210,7 +210,7 @@ export default function ChildLayoutControl( {
>
<FlexItem style={ { width: '50%' } }>
<InputControl
size={ '__unstable-large' }
size="__unstable-large"
label={ __( 'Column' ) }
type="number"
onChange={ ( value ) => {
Expand All @@ -234,7 +234,7 @@ export default function ChildLayoutControl( {
</FlexItem>
<FlexItem style={ { width: '50%' } }>
<InputControl
size={ '__unstable-large' }
size="__unstable-large"
label={ __( 'Row' ) }
type="number"
onChange={ ( value ) => {
Expand Down
8 changes: 2 additions & 6 deletions packages/block-editor/src/components/colors-gradients/control.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,18 +145,14 @@ function ColorGradientControlInner( {
</Tabs.TabList>
<Tabs.TabPanel
tabId={ TAB_IDS.color }
className={
'block-editor-color-gradient-control__panel'
}
className="block-editor-color-gradient-control__panel"
focusable={ false }
>
{ tabPanels.color }
</Tabs.TabPanel>
<Tabs.TabPanel
tabId={ TAB_IDS.gradient }
className={
'block-editor-color-gradient-control__panel'
}
className="block-editor-color-gradient-control__panel"
focusable={ false }
>
{ tabPanels.gradient }
Expand Down
16 changes: 8 additions & 8 deletions packages/block-editor/src/components/contrast-checker/test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ describe( 'ContrastChecker', () => {
render(
<ContrastChecker
backgroundColor={ backgroundColor }
textColor={ 'rgba(0,0,0,0.9)' }
textColor="rgba(0,0,0,0.9)"
linkColor={ linkColor }
isLargeText={ isLargeText }
enableAlphaChecker
Expand All @@ -396,7 +396,7 @@ describe( 'ContrastChecker', () => {
render(
<ContrastChecker
backgroundColor={ backgroundColor }
linkColor={ 'rgba(0,0,0,0.9)' }
linkColor="rgba(0,0,0,0.9)"
textColor={ textColor }
isLargeText={ isLargeText }
enableAlphaChecker
Expand All @@ -416,7 +416,7 @@ describe( 'ContrastChecker', () => {
test( 'should render nothing when the colors meet AA WCAG guidelines but the background color only has alpha transparency with alpha checker enabled.', () => {
const { container } = render(
<ContrastChecker
backgroundColor={ 'rgba(255,255,255,0.7)' }
backgroundColor="rgba(255,255,255,0.7)"
textColor={ textColor }
linkColor={ linkColor }
isLargeText={ isLargeText }
Expand Down Expand Up @@ -450,7 +450,7 @@ describe( 'ContrastChecker', () => {
<ContrastChecker
backgroundColor={ colorWithTransparency }
textColor={ sameShade }
linkColor={ 'rgba(0,0,0,0.9)' }
linkColor="rgba(0,0,0,0.9)"
isLargeText={ isLargeText }
fallbackBackgroundColor={ fallbackBackgroundColor }
fallbackTextColor={ fallbackTextColor }
Expand All @@ -472,7 +472,7 @@ describe( 'ContrastChecker', () => {
render(
<ContrastChecker
backgroundColor={ sameShade }
textColor={ 'rgba(0,0,0,0.9)' }
textColor="rgba(0,0,0,0.9)"
linkColor={ sameShade }
isLargeText={ isLargeText }
fallbackBackgroundColor={ fallbackBackgroundColor }
Expand All @@ -494,9 +494,9 @@ describe( 'ContrastChecker', () => {
test( 'should render component when the colors meet AA WCAG guidelines but all colors have alpha transparency with alpha checker enabled.', () => {
render(
<ContrastChecker
backgroundColor={ 'rgba(255,255,255,0.7)' }
linkColor={ 'rgba(0,0,0,0.7)' }
textColor={ 'rgba(0,0,0,0.7)' }
backgroundColor="rgba(255,255,255,0.7)"
linkColor="rgba(0,0,0,0.7)"
textColor="rgba(0,0,0,0.7)"
isLargeText={ isLargeText }
enableAlphaChecker
/>
Expand Down
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/dimensions-tool/aspect-ratio-tool.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export default function AspectRatioTool( {
value={ displayValue }
options={ options ?? aspectRatioOptions }
onChange={ onChange }
size={ '__unstable-large' }
size="__unstable-large"
__nextHasNoMarginBottom
/>
</ToolsPanelItem>
Expand Down
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/dimensions-tool/scale-tool.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export default function ScaleTool( {
help={ scaleHelp[ displayValue ] }
value={ displayValue }
onChange={ onChange }
size={ '__unstable-large' }
size="__unstable-large"
>
{ options.map( ( option ) => (
<ToggleGroupControlOption
Expand Down
4 changes: 2 additions & 2 deletions packages/block-editor/src/components/dimensions-tool/width-height-tool.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export default function WidthHeightTool( {
min={ 0 }
value={ width }
onChange={ onDimensionChange( 'width' ) }
size={ '__unstable-large' }
size="__unstable-large"
/>
</SingleColumnToolsPanelItem>
<SingleColumnToolsPanelItem
Expand All @@ -105,7 +105,7 @@ export default function WidthHeightTool( {
min={ 0 }
value={ height }
onChange={ onDimensionChange( 'height' ) }
size={ '__unstable-large' }
size="__unstable-large"
/>
</SingleColumnToolsPanelItem>
</>
Expand Down
16 changes: 8 additions & 8 deletions packages/block-editor/src/components/global-styles/background-panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ function BackgroundSizeToolsPanelItem( {
onChange={ updateBackgroundPosition }
/>
<ToggleGroupControl
size={ '__unstable-large' }
size="__unstable-large"
label={ __( 'Size' ) }
value={ currentValueForToggle }
onChange={ updateBackgroundSize }
Expand All @@ -519,18 +519,18 @@ function BackgroundSizeToolsPanelItem( {
) }
>
<ToggleGroupControlOption
key={ 'cover' }
value={ 'cover' }
key="cover"
value="cover"
label={ __( 'Cover' ) }
/>
<ToggleGroupControlOption
key={ 'contain' }
value={ 'contain' }
key="contain"
value="contain"
label={ __( 'Contain' ) }
/>
<ToggleGroupControlOption
key={ 'tile' }
value={ 'auto' }
key="tile"
value="auto"
label={ __( 'Tile' ) }
/>
</ToggleGroupControl>
Expand All @@ -542,7 +542,7 @@ function BackgroundSizeToolsPanelItem( {
aria-label={ __( 'Background image width' ) }
onChange={ updateBackgroundSize }
value={ sizeValue }
size={ '__unstable-large' }
size="__unstable-large"
__unstableInputWidth="100px"
min={ 0 }
/>
Expand Down
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/global-styles/border-panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ export default function BorderPanel( {
popoverPlacement="left-start"
value={ border }
__experimentalIsRenderedInSidebar
size={ '__unstable-large' }
size="__unstable-large"
hideLabelFromVision={ ! hasShadowControl }
label={ __( 'Border' ) }
/>
Expand Down
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/height-control/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ export default function HeightControl( {
onChange={ onChange }
onUnitChange={ handleUnitChange }
min={ 0 }
size={ '__unstable-large' }
size="__unstable-large"
label={ label }
hideLabelFromVision
/>
Expand Down
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/inner-blocks/warning-max-depth-exceeded.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ const WarningMaxDepthExceeded = ( { clientId } ) => {
<TouchableWithoutFeedback
disabled={ ! isSelected }
accessibilityLabel={ __( 'Warning message' ) }
accessibilityRole={ 'button' }
accessibilityRole="button"
accessibilityHint={ __( 'Tap here to show more details.' ) }
onPress={ () => setShowDetails( true ) }
>
Expand Down
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/inserter/block-patterns-explorer/pattern-list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function PatternsListHeader( { filterValue, filteredBlockPatternsLength } ) {
return (
<Heading
level={ 2 }
lineHeight={ '48px' }
lineHeight="48px"
className="block-editor-block-patterns-explorer__search-results-count"
>
{ sprintf(
Expand Down
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/inserter/category-tabs/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function CategoryTabs( {
className="block-editor-inserter__category-tabs"
selectOnMove={ false }
selectedTabId={ selectedCategory ? selectedCategory.name : null }
orientation={ 'vertical' }
orientation="vertical"
onSelect={ ( categoryId ) => {
// Pass the full category object
onSelectCategory(
Expand Down
8 changes: 3 additions & 5 deletions packages/block-editor/src/components/inspector-controls/fill.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,9 @@ export default function InspectorControlsFill( {
return (
<>
<Fill { ...props }>
{
<BottomSheetConsumer>
{ () => <View>{ children }</View> }
</BottomSheetConsumer>
}
<BottomSheetConsumer>
{ () => <View>{ children }</View> }
</BottomSheetConsumer>
</Fill>
{ Children.count( children ) > 0 && <BlockSettingsButton /> }
</>
Expand Down
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/list-view/block-contents.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ const ListViewBlockContents = forwardRef(
<BlockDraggable
appendToOwnerDocument
clientIds={ draggableClientIds }
cloneClassname={ 'block-editor-list-view-draggable-chip' }
cloneClassname="block-editor-list-view-draggable-chip"
>
{ ( { draggable, onDragStart, onDragEnd } ) => (
<ListViewBlockSelectButton
Expand Down
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/media-placeholder/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ export function MediaPlaceholder( {
multiple={ multiple }
onSelect={ onSelect }
allowedTypes={ allowedTypes }
mode={ 'browse' }
mode="browse"
value={
Array.isArray( value )
? value.map( ( { id } ) => id )
Expand Down
Loading
Loading