Skip to content

Commit 1fa69ab

Browse files
committed
Merge branch 'next' of github.com:ionic-team/ionic-framework into ROU-11318
2 parents bde7da9 + c3a804d commit 1fa69ab

File tree

30 files changed

+33
-9
lines changed

30 files changed

+33
-9
lines changed

core/src/components/buttons/buttons.ionic.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// --------------------------------------------------
1414

1515
::slotted(*) .button-clear {
16-
--color: globals.$ion-primitives-neutral-1200;
16+
--color: #{globals.$ion-primitives-neutral-1200};
1717
--background: transparent;
1818
--background-activated: transparent;
1919
--background-focused: transparent;

core/src/components/datetime/datetime.common.scss

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -153,19 +153,14 @@
153153
overflow: hidden;
154154
}
155155

156-
// Calendar / Header / Action Buttons
156+
// Calendar / Footer / Action Buttons
157157
// -----------------------------------
158158

159159
:host .datetime-action-buttons.has-clear-button {
160160
width: 100%;
161161
}
162162

163-
:host .datetime-action-buttons ion-buttons {
164-
display: flex;
165-
166-
justify-content: space-between;
167-
}
168-
163+
:host .datetime-action-buttons ion-buttons,
169164
/**
170165
* The confirm and clear buttons are grouped in a
171166
* container so that they appear on the end opposite
@@ -178,6 +173,9 @@
178173
display: flex;
179174
}
180175

176+
// Calendar / Header / Action Buttons
177+
// -----------------------------------
178+
181179
/**
182180
* Date/Year button should be on
183181
* the opposite side of the component

core/src/components/datetime/datetime.ionic.scss

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,3 +200,19 @@
200200
background-color: globals.$ion-primitives-neutral-100;
201201
color: globals.$ion-primitives-neutral-1200;
202202
}
203+
204+
// Calendar / Footer / Action Buttons
205+
// -----------------------------------
206+
207+
:host .datetime-buttons ion-buttons,
208+
.datetime-action-buttons .datetime-action-buttons-container {
209+
flex-flow: column;
210+
align-items: stretch;
211+
gap: globals.$ion-space-200;
212+
}
213+
214+
:host .datetime-buttons ion-buttons ion-button {
215+
@include globals.typography(globals.$ion-body-action-lg);
216+
217+
min-height: globals.$ion-space-1200;
218+
}

core/src/components/datetime/datetime.native.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,3 +118,10 @@ ion-picker {
118118
--highlight-border-radius: var(--wheel-highlight-border-radius);
119119
--fade-background-rgb: var(--wheel-fade-background-rgb);
120120
}
121+
122+
// Calendar / Footer / Action Buttons
123+
// -----------------------------------
124+
125+
:host .datetime-action-buttons ion-buttons {
126+
justify-content: space-between;
127+
}

core/src/components/datetime/datetime.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1516,13 +1516,15 @@ export class Datetime implements ComponentInterface {
15161516
*/
15171517

15181518
private renderFooter() {
1519+
const theme = getIonTheme(this);
15191520
const { disabled, readonly, showDefaultButtons, showClearButton } = this;
15201521
/**
15211522
* The cancel, clear, and confirm buttons
15221523
* should not be interactive if the datetime
15231524
* is disabled or readonly.
15241525
*/
15251526
const isButtonDisabled = disabled || readonly;
1527+
const confirmFill = theme === 'ionic' ? 'solid' : undefined;
15261528
const hasSlottedButtons = this.el.querySelector('[slot="buttons"]') !== null;
15271529
if (!hasSlottedButtons && !showDefaultButtons && !showClearButton) {
15281530
return;
@@ -1578,6 +1580,7 @@ export class Datetime implements ComponentInterface {
15781580
color={this.color}
15791581
onClick={() => this.confirm(true)}
15801582
disabled={isButtonDisabled}
1583+
fill={confirmFill}
15811584
>
15821585
{this.doneText}
15831586
</ion-button>

core/src/components/datetime/test/basic/datetime.e2e.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ configs({ modes: ['ios'], directions: ['ltr'] }).forEach(({ title, config }) =>
251251
});
252252
});
253253

254-
configs().forEach(({ title, screenshot, config }) => {
254+
configs({ modes: ['ios', 'md', 'ionic-md'] }).forEach(({ title, screenshot, config }) => {
255255
test.describe(title('datetime: footer'), () => {
256256
test('should render default buttons', async ({ page }) => {
257257
await page.setContent('<ion-datetime value="2022-05-03" show-default-buttons="true"></ion-datetime>', config);
Loading
Loading
Loading
Loading

0 commit comments

Comments
 (0)