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

[Components - ToggleGroupControlOption]: Calculate width from button content and remove LabelPlaceholderView #39345

Merged
merged 3 commits into from
Mar 11, 2022
Merged

[Components - ToggleGroupControlOption]: Calculate width from button content and remove LabelPlaceholderView #39345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33a2fd5
[Components - ToggleGroupControlOption]: Calculate widths from button…
ntsekouras Mar 10, 2022
8b91526
update changelog
ntsekouras Mar 10, 2022
1d0ec0a
fix tests
ntsekouras Mar 10, 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
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 @@ -7,6 +7,7 @@
- `ConfirmDialog`: Add support for custom label text on the confirmation and cancelation buttons ([#38994](https://github.com/WordPress/gutenberg/pull/38994))
- `InputControl`: Allow `onBlur` for empty values to commit the change when `isPressEnterToChange` is true, and move reset behavior to the ESCAPE key. ([#39109](https://github.com/WordPress/gutenberg/pull/39109)).
- `TreeGrid`: Add tests for Home/End keyboard navigation. Add `onFocusRow` callback for Home/End keyboard navigation, this was missed in the implementation PR. Modify test for expanding/collapsing a row as row 1 implements this now. Update README with latest changes. ([#39302](https://github.com/WordPress/gutenberg/pull/39302))
- `ToggleGroupControlOption`: Calculate width from button content and remove `LabelPlaceholderView` ([#39345](https://github.com/WordPress/gutenberg/pull/39345))

### Bug Fix

Expand Down
2 changes: 0 additions & 2 deletions packages/components/src/font-size-picker/test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,6 @@ describe( 'FontSizePicker', () => {
);
const element = screen.getByLabelText( 'Large' );
expect( element ).toBeInTheDocument();
expect( element.children ).toHaveLength( 2 );
expect( element.children[ 0 ].textContent ).toBe( '1.7' );
} );
it( 'should use incremental sequence of numbers as labels if we have complex css', () => {
Expand All @@ -223,7 +222,6 @@ describe( 'FontSizePicker', () => {
);
const element = screen.getByLabelText( 'Large' );
expect( element ).toBeInTheDocument();
expect( element.children ).toHaveLength( 2 );
expect( element.children[ 0 ].textContent ).toBe( '3' );
} );
} );
Expand Down
27 changes: 0 additions & 27 deletions packages/components/src/toggle-group-control/test/__snapshots__/index.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,21 +122,6 @@ exports[`ToggleGroupControl should render correctly 1`] = `
.emotion-11 {
font-size: 13px;
line-height: 1;
position: absolute;
top: 50%;
left: 50%;
-webkit-transform: translate( -50%, -50% );
-moz-transform: translate( -50%, -50% );
-ms-transform: translate( -50%, -50% );
transform: translate( -50%, -50% );
}

.emotion-13 {
font-size: 13px;
font-weight: bold;
height: 0;
overflow: hidden;
visibility: hidden;
}

<div
Expand Down Expand Up @@ -180,12 +165,6 @@ exports[`ToggleGroupControl should render correctly 1`] = `
>
R
</div>
<div
aria-hidden="true"
class="emotion-13 emotion-14"
>
R
</div>
</button>
</div>
<div
Expand All @@ -208,12 +187,6 @@ exports[`ToggleGroupControl should render correctly 1`] = `
>
J
</div>
<div
aria-hidden="true"
class="emotion-13 emotion-14"
>
J
</div>
</button>
</div>
</div>
Expand Down
5 changes: 1 addition & 4 deletions packages/components/src/toggle-group-control/toggle-group-control-option/component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import * as styles from './styles';
import { useCx } from '../../utils/hooks';
import Tooltip from '../../tooltip';

const { ButtonContentView, LabelPlaceholderView, LabelView } = styles;
const { ButtonContentView, LabelView } = styles;

const WithToolTip = ( { showTooltip, text, children }: WithToolTipProps ) => {
if ( showTooltip && text ) {
Expand Down Expand Up @@ -88,9 +88,6 @@ function ToggleGroupControlOption(
value={ value }
>
<ButtonContentView>{ label }</ButtonContentView>
<LabelPlaceholderView aria-hidden>
{ label }
</LabelPlaceholderView>
</Radio>
</WithToolTip>
</LabelView>
Expand Down
12 changes: 0 additions & 12 deletions packages/components/src/toggle-group-control/toggle-group-control-option/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,24 +61,12 @@ export const buttonActive = css`
export const ButtonContentView = styled.div`
font-size: ${ CONFIG.fontSize };
line-height: 1;
position: absolute;
top: 50%;
left: 50%;
transform: translate( -50%, -50% );
`;

export const separatorActive = css`
background: transparent;
`;

export const LabelPlaceholderView = styled.div`
font-size: ${ CONFIG.fontSize };
font-weight: bold;
height: 0;
overflow: hidden;
visibility: hidden;
`;

export const medium = css`
min-height: ${ CONFIG.controlHeight };
`;