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

fix(FormItem): display colons correctly in Firefox in rtl direction #5385

Merged
merged 2 commits into from
Jan 8, 2024
Merged

fix(FormItem): display colons correctly in Firefox in rtl direction #5385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33ec703
fix(FormItem): display colons correctly in Firefox with rtl direction
Lukas742 Jan 3, 2024
ee663f1
fix tests
Lukas742 Jan 3, 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
20 changes: 10 additions & 10 deletions packages/main/src/components/Form/Form.cy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,29 +76,29 @@ describe('Form', () => {
it('size S - labels and fields should cover full width', () => {
cy.viewport(393, 852); // iPhone 14 Pro
cy.mount(component);
cy.findByText('item 1:').should('have.css', 'grid-column', '1 / span 12');
cy.get('[ui5-label]').contains('item 1').should('have.css', 'grid-column', '1 / span 12');
cy.findByTestId('formInput').parent().should('have.css', 'grid-column', '1 / span 12');
});

it('size M - label should cover 2/12, field 10/12', () => {
cy.viewport(834, 1194); // iPad Pro
cy.mount(component);
cy.findByText('item 1:').should('have.css', 'grid-column', '1 / span 2');
cy.get('[ui5-label]').contains('item 1').should('have.css', 'grid-column', '1 / span 2');
cy.findByTestId('formInput').parent().should('have.css', 'grid-column', '3 / span 10');
});

it('size L - label should cover 1/3, field 2/3', () => {
cy.viewport(1280, 1024);
cy.mount(component);
cy.findByText('item 1:').should('have.css', 'grid-column', '1 / span 4');
cy.get('[ui5-label]').contains('item 1').should('have.css', 'grid-column', '1 / span 4');
cy.findByTestId('formInput').parent().should('have.css', 'grid-column', '5 / span 8');
});

it('size XL - render two columns with 1/3 and 2/3 each', () => {
cy.viewport(1920, 1080);
cy.mount(component);
cy.findByText('item 1:').should('have.css', 'grid-column', '1 / span 4');
cy.findByText('item 3:').should('have.css', 'grid-column', '13 / span 4');
cy.get('[ui5-label]').contains('item 1').should('have.css', 'grid-column', '1 / span 4');
cy.get('[ui5-label]').contains('item 3').should('have.css', 'grid-column', '13 / span 4');
cy.findByTestId('formInput').parent().should('have.css', 'grid-column', '5 / span 8');
cy.findByTestId('formInput2').parent().should('have.css', 'grid-column', '17 / span 8');
});
Expand All @@ -117,8 +117,8 @@ describe('Form', () => {
it('a11y labels', () => {
cy.mount(component);
for (let i = 1; i <= 3; i++) {
cy.findByText(`item ${i}`).should('exist').should('not.be.visible');
cy.findByText(`item ${i}:`).should('be.visible');
cy.get('label').contains(`item ${i}`).should('exist').should('not.be.visible');
cy.get('[ui5-label]').contains(`item ${i}`).should('be.visible');
}
// custom `Label`
cy.findAllByText(`item 4`).eq(0).should('be.visible');
Expand All @@ -137,16 +137,16 @@ describe('Form', () => {
</FormItem>
</Form>
);
cy.findByText('Portal:').should('be.visible');
cy.get('[ui5-label]').contains('Portal').should('be.visible');
cy.findByTestId('notSupported').should('not.exist');
});

it('conditionally render FormItems & FormGroups', () => {
cy.mount(<ConditionRenderingExample />);
cy.findByText('Item 2').should('not.exist');
cy.findAllByText('Item 2').should('not.exist');

cy.findByText('Toggle Input').click();
cy.findByText('Item 2').should('exist');
cy.findAllByText('Item 2').should('exist');
cy.findByTestId('2').should('be.visible').as('item2');
cy.get('@item2').parent().should('have.css', 'grid-column-start', '17').and('have.css', 'grid-row-start', '1');

Expand Down
3 changes: 2 additions & 1 deletion packages/main/src/components/FormItem/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,9 @@ function FormItemLabel({ label, style, className }: { label: ReactNode; style?:
style={style}
wrappingType={WrappingType.Normal}
data-label-span={labelSpan}
showColon={!!label}
>
{label ? `${label}:` : ''}
{label}
</Label>
);
}
Expand Down
Loading