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

AlignmentMatrixControl: keep the physical direction in RTL languages #43126

Merged
merged 9 commits into from
Aug 26, 2022
+18 −6
Merged

AlignmentMatrixControl: keep the physical direction in RTL languages #43126

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1881f34
AlignmentMatrixControl: Display tooltip labels considering RTL language
t-hamano Aug 10, 2022
53269d7
USe wrapper function
t-hamano Aug 12, 2022
c862019
Merge branch 'trunk' into fix/alignment-matrix-control-rtl
t-hamano Aug 18, 2022
b2d19dc
AlignmentMatrixControl: keep physical direction
t-hamano Aug 18, 2022
c572534
Update cover block to match AlignmentMatrixControl specifications
t-hamano Aug 18, 2022
d27efd2
Update changelog
t-hamano Aug 18, 2022
71e51e4
Merge branch 'trunk' into fix/alignment-matrix-control-rtl
t-hamano Aug 22, 2022
ca1f983
Merge branch 'trunk' into fix/alignment-matrix-control-rtl
t-hamano Aug 23, 2022
3af1b15
Merge branch 'trunk' into fix/alignment-matrix-control-rtl
t-hamano Aug 25, 2022
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
18 changes: 15 additions & 3 deletions packages/block-library/src/cover/edit/block-controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
__experimentalBlockAlignmentMatrixControl as BlockAlignmentMatrixControl,
__experimentalBlockFullHeightAligmentControl as FullHeightAlignmentControl,
} from '@wordpress/block-editor';
import { __ } from '@wordpress/i18n';
import { __, isRTL } from '@wordpress/i18n';

/**
* Internal dependencies
Expand Down Expand Up @@ -58,15 +58,27 @@ export default function CoverBlockControls( {
} );
};

// Flip value horizontally to match the physical direction indicated by
// AlignmentMatrixControl with the logical direction indicated by cover
// block in RTL languages.
const flipHorizontalPosition = ( ltrContentPosition ) => {
return isRTL()
? ltrContentPosition.replace( /left|right/, ( match ) =>
match === 'left' ? 'right' : 'left'
)
: ltrContentPosition;
};

return (
<>
<BlockControls group="block">
<BlockAlignmentMatrixControl
label={ __( 'Change content position' ) }
value={ contentPosition }
value={ flipHorizontalPosition( contentPosition ) }
onChange={ ( nextPosition ) =>
setAttributes( {
contentPosition: nextPosition,
contentPosition:
flipHorizontalPosition( nextPosition ),
} )
}
isDisabled={ ! hasInnerBlocks }
Expand Down
1 change: 1 addition & 0 deletions packages/components/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

### Bug Fix

- `AlignmentMatrixControl`: keep the physical direction in RTL languages ([#43126](https://github.com/WordPress/gutenberg/pull/43126)).
- `AlignmentMatrixControl`: Fix the `width` prop so it works as intended ([#43482](https://github.com/WordPress/gutenberg/pull/43482)).
- `SelectControl`, `CustomSelectControl`: Truncate long option strings ([#43301](https://github.com/WordPress/gutenberg/pull/43301)).
- `Popover`: fix and improve opening animation ([#43186](https://github.com/WordPress/gutenberg/pull/43186)).
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/alignment-matrix-control/styles/alignment-matrix-control-styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export const rootBase = () => {
return css`
border-radius: 2px;
box-sizing: border-box;
direction: ltr;
display: grid;
grid-template-columns: repeat( 3, 1fr );
outline: none;
Expand Down
4 changes: 1 addition & 3 deletions packages/data/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,5 @@
{ "path": "../priority-queue" },
{ "path": "../redux-routine" }
],
"include": [
"src/**/*"
]
"include": [ "src/**/*" ]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When the latest trunk was merged, unexpected code reformatting was performed.
But since this change was made by the linter, it appears to be OK.

}