javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-10 00:27:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(datetime): add hourCycle property (#23686)

Browse Source 
resolves #23661

Co-authored-by: Liam DeBeasi <liamdebeasi@icloud.com>
This commit is contained in:
Hans Krywalsky
2021-08-10 19:20:17 +02:00
committed by GitHub
parent ea39c70b3e
commit 6342fde56c
17 changed files with 218 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/components/datetime/datetime.tsx
View File

@ -318,6 +318,12 @@ export class Datetime implements ComponentInterface {
*/
@Prop() showDefaultTimeLabel = true;
/**
* The hour cycle of the `ion-datetime`. If no value is set, this is
* specified by the current locale.
*/
@Prop() hourCycle?: 'h23' | 'h12';
/**
* If `cover`, the `ion-datetime` will expand to cover the full width of its container.
* If `fixed`, the `ion-datetime` will have a fixed width.
@ -1397,9 +1403,10 @@ export class Datetime implements ComponentInterface {
* should just be the default segment.
*/
private renderTime(mode: Mode) {
const use24Hour = is24Hour(this.locale);
const { hourCycle } = this;
const use24Hour = is24Hour(this.locale, hourCycle);
const { ampm } = this.workingParts;
const { hours, minutes, am, pm } = generateTime(this.locale, this.workingParts, this.minParts, this.maxParts, this.parsedHourValues, this.parsedMinuteValues);
const { hours, minutes, am, pm } = generateTime(this.workingParts, use24Hour ? 'h23' : 'h12', this.minParts, this.maxParts, this.parsedHourValues, this.parsedMinuteValues);
return (
<div class="datetime-time">
<div class="time-header">