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

Jump to bottom

fix(item): remove empty padding space for item bottom #24323

Merged
merged 3 commits into from
Dec 8, 2021
Merged

fix(item): remove empty padding space for item bottom #24323

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
7bc8d10
fix(item): remove empty padding space for item bottom
sean-perkins Dec 6, 2021
35a4b07
test(item): padding CSS variable screenshot test
sean-perkins Dec 7, 2021
eded080
fix(item): remove --bottom-padding-start CSS variable
sean-perkins Dec 7, 2021
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
7 changes: 0 additions & 7 deletions core/src/components/item/item.ios.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,13 +225,6 @@
--padding-start: 0;
}

// Item Bottom
// --------------------------------------------------

:host(.item-has-start-slot) .item-bottom {
--bottom-padding-start: 48px;
}

// FROM TEXTAREA
// iOS Stacked & Floating Textarea
// --------------------------------------------------
Expand Down
36 changes: 20 additions & 16 deletions core/src/components/item/item.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,26 @@ button, a {
box-sizing: border-box;
}


// Item Bottom
// --------------------------------------------------

.item-bottom {
@include margin(0);
@include padding(
0,
var(--inner-padding-end),
0,
calc(var(--padding-start) + var(--ion-safe-area-left, 0px))
);

display: flex;

justify-content: space-between;

}


// Item Detail Icon
// --------------------------------------------------

Expand Down Expand Up @@ -490,22 +510,6 @@ ion-ripple-effect {
color: var(--ripple-color);
}

// Item Button Ripple effect
// --------------------------------------------------

.item-bottom {
@include margin(0);
@include padding(
var(--padding-top),
var(--inner-padding-end),
var(--padding-bottom),
calc(var(--padding-start) + var(--ion-safe-area-left, 0px) + var(--bottom-padding-start, 0px))
);
display: flex;

justify-content: space-between;
}

:host(.item-fill-solid) ::slotted([slot="start"]),
:host(.item-fill-solid) ::slotted([slot="end"]),
:host(.item-fill-outline) ::slotted([slot="start"]),
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/item/item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ export class Item implements ComponentInterface, AnchorInterface, ButtonInterfac
// Only set onClick if the item is clickable to prevent screen
// readers from reading all items as clickable
const clickFn = clickable ? {
onClick: (ev: Event) => {openURL(href, ev, routerDirection, routerAnimation); }
onClick: (ev: Event) => { openURL(href, ev, routerDirection, routerAnimation); }
} : {};
const showDetail = detail !== undefined ? detail : mode === 'ios' && clickable;
this.itemStyles.forEach(value => {
Expand Down
10 changes: 10 additions & 0 deletions core/src/components/item/test/css-variables/e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { newE2EPage } from '@stencil/core/testing';

test('item: CSS variables', async () => {
const page = await newE2EPage({
url: '/src/components/item/test/css-variables?ionic:_testing=true'
});

const compare = await page.compareScreenshot();
expect(compare).toMatchScreenshot();
});
51 changes: 51 additions & 0 deletions core/src/components/item/test/css-variables/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<!DOCTYPE html>
<html lang="en" dir="ltr">

<head>
<meta charset="UTF-8">
<title>Item - CSS Variables</title>
<meta name="viewport"
content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
<link href="../../../../../css/ionic.bundle.css" rel="stylesheet">
<link href="../../../../../scripts/testing/styles.css" rel="stylesheet">
<script src="../../../../../scripts/testing/scripts.js"></script>
<script nomodule src="../../../../../dist/ionic/ionic.js"></script>
<script type="module" src="../../../../../dist/ionic/ionic.esm.js"></script>
</head>

<style>
ion-item {
--padding-top: 20px;
--background: #eee;
}
</style>

<body>
<ion-app>

<ion-header>
<ion-toolbar>
<ion-title>Item CSS variables</ion-title>
</ion-toolbar>
</ion-header>

<ion-content class="ion-padding-vertical">
<ion-list class="basic">
<ion-item>
<ion-label>Item 1</ion-label>
</ion-item>

<ion-item>
<ion-label>Item 2</ion-label>
</ion-item>

<ion-item>
<ion-label>Item 3</ion-label>
</ion-item>
</ion-list>
</ion-content>
</ion-app>

</body>

</html>