Skip to content

fix(datetime): default sizing preserves shape of datetime #24104

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

Merged
merged 4 commits into from
Oct 21, 2021
Merged

fix(datetime): default sizing preserves shape of datetime #24104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
75fd545
add standalone test
liamdebeasi Oct 21, 2021
b08825b
fix(datetime): fix sizing, add tests
liamdebeasi Oct 21, 2021
8c159c2
chore(): lint
liamdebeasi Oct 21, 2021
16dcbd4
Update core/src/components/datetime/test/display/e2e.ts
liamdebeasi Oct 21, 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
2 changes: 1 addition & 1 deletion core/src/components/datetime/datetime.ios.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
:host(.datetime-presentation-date-time),
:host(.datetime-presentation-time-date),
:host(.datetime-presentation-date) {
min-height: 300px;
min-height: 350px;
}

// Header
Expand Down
11 changes: 3 additions & 8 deletions core/src/components/datetime/datetime.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,14 @@
overflow: hidden;
}

:host(.datetime-presentation-date-time),
:host(.datetime-presentation-time-date),
:host(.datetime-presentation-date) {
height: 100%;
}

:host(.datetime-size-fixed) {
width: 350px;
width: auto;
max-width: 350px;
height: auto;
}

:host(.datetime-size-cover) {
width: 100%;
min-width: 350px;
}

:host .calendar-body,
Expand Down
54 changes: 54 additions & 0 deletions core/src/components/datetime/test/display/e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import { newE2EPage } from '@stencil/core/testing';

test('display', async () => {
const page = await newE2EPage({
url: '/src/components/datetime/test/display?ionic:_testing=true'
});

const screenshotCompares = [];

await page.select('#presentation', 'date-time');
await page.waitForChanges();

screenshotCompares.push(await page.compareScreenshot());

await page.select('#presentation', 'time-date');
await page.waitForChanges();

screenshotCompares.push(await page.compareScreenshot());

await page.select('#presentation', 'time');
await page.waitForChanges();

screenshotCompares.push(await page.compareScreenshot());

await page.select('#presentation', 'date');
await page.waitForChanges();

screenshotCompares.push(await page.compareScreenshot());

await page.select('#size', 'cover');
await page.select('#presentation', 'date-time');
await page.waitForChanges();

screenshotCompares.push(await page.compareScreenshot());

await page.select('#presentation', 'time-date');
await page.waitForChanges();

screenshotCompares.push(await page.compareScreenshot());

await page.select('#presentation', 'time');
await page.waitForChanges();

screenshotCompares.push(await page.compareScreenshot());

await page.select('#presentation', 'date');
await page.waitForChanges();

screenshotCompares.push(await page.compareScreenshot());

for (const screenshotCompare of screenshotCompares) {
expect(screenshotCompare).toMatchScreenshot();
}
});
52 changes: 52 additions & 0 deletions core/src/components/datetime/test/display/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<!DOCTYPE html>
<html lang="en" dir="ltr">
<head>
<meta charset="UTF-8">
<title>Datetime - Standalone</title>
<meta name="viewport"
content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
<link href="../../../../../css/ionic.bundle.css" rel="stylesheet">
<link href="../../../../../scripts/testing/styles.css" rel="stylesheet">
<script src="../../../../../scripts/testing/scripts.js"></script>
<script type="module" src="../../../../../dist/ionic/ionic.esm.js"></script>
<style>
body {
padding: 20px;
}
ion-datetime {
border: 1px solid black;
}
</style>
</head>
<body>
<label for="presentation">Presentation</label>
<select id="presentation" onchange="changePresentation(event)">
<option value="date-time" selected>date-time</option>
<option value="time-date">time-date</option>
<option value="date">date</option>
<option value="time">time</option>
</select>


<label for="size">Size</label>
<select id="size" onchange="changeSize(event)">
<option value="fixed" selected>fixed</option>
<option value="cover">cover</option>
</select>

<br /><br />

<ion-datetime></ion-datetime>

<script>
const datetime = document.querySelector('ion-datetime');

const changePresentation = (ev) => {
datetime.presentation = ev.target.value;
}
const changeSize = (ev) => {
datetime.size = ev.target.value;
}
</script>
</body>
</html>