Skip to content

Commit 0b31b3d

Browse files
committed
refactor(locale): Replace any other occurances of formatting pipes.
1 parent 8a3b28c commit 0b31b3d

File tree

7 files changed

+47
-23
lines changed

7 files changed

+47
-23
lines changed

projects/igniteui-angular/src/lib/calendar/calendar.component.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
booleanAttribute,
1414
HostListener,
1515
} from '@angular/core';
16-
import { NgTemplateOutlet, DatePipe } from '@angular/common';
16+
import { NgTemplateOutlet } from '@angular/common';
1717
import { NG_VALUE_ACCESSOR } from '@angular/forms';
1818

1919
import {
@@ -34,6 +34,7 @@ import { areSameMonth, formatToParts, getClosestActiveDate, isDateInRanges } fro
3434
import { CalendarDay } from './common/model';
3535
import { IgxCalendarBaseDirective } from './calendar-base';
3636
import { KeyboardNavigationService } from './calendar.services';
37+
import { IgxDateFormatterPipe } from '../grids/common/pipes';
3738

3839
let NEXT_ID = 0;
3940

@@ -71,7 +72,7 @@ let NEXT_ID = 0;
7172
],
7273
selector: 'igx-calendar',
7374
templateUrl: 'calendar.component.html',
74-
imports: [NgTemplateOutlet, IgxCalendarScrollPageDirective, IgxIconComponent, IgxDaysViewComponent, IgxMonthsViewComponent, IgxYearsViewComponent, DatePipe, IgxMonthViewSlotsCalendar, IgxGetViewDateCalendar]
75+
imports: [NgTemplateOutlet, IgxCalendarScrollPageDirective, IgxIconComponent, IgxDaysViewComponent, IgxMonthsViewComponent, IgxYearsViewComponent, IgxDateFormatterPipe, IgxMonthViewSlotsCalendar, IgxGetViewDateCalendar]
7576
})
7677
export class IgxCalendarComponent extends IgxCalendarBaseDirective implements AfterViewInit, OnDestroy {
7778
/**

projects/igniteui-angular/src/lib/calendar/month-picker/month-picker.component.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
OnDestroy,
1010
OnInit,
1111
} from "@angular/core";
12-
import { NgTemplateOutlet, DatePipe } from "@angular/common";
12+
import { NgTemplateOutlet } from "@angular/common";
1313
import { NG_VALUE_ACCESSOR } from "@angular/forms";
1414

1515
import { IgxMonthsViewComponent } from "../months-view/months-view.component";
@@ -21,6 +21,7 @@ import { CalendarDay } from "../common/model";
2121
import { IgxCalendarBaseDirective } from "../calendar-base";
2222
import { KeyboardNavigationService } from "../calendar.services";
2323
import { formatToParts } from "../common/helpers";
24+
import { IgxDateFormatterPipe } from '../../grids/common/pipes';
2425

2526
let NEXT_ID = 0;
2627
@Component({
@@ -39,7 +40,7 @@ let NEXT_ID = 0;
3940
templateUrl: "month-picker.component.html",
4041
imports: [
4142
NgTemplateOutlet,
42-
DatePipe,
43+
IgxDateFormatterPipe,
4344
IgxIconComponent,
4445
IgxMonthsViewComponent,
4546
IgxYearsViewComponent,

projects/igniteui-angular/src/lib/core/utils.ts

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { CurrencyPipe, formatDate as _formatDate, isPlatformBrowser } from '@angular/common';
1+
import { formatDate as _formatDate, isPlatformBrowser } from '@angular/common';
22
import { Inject, Injectable, InjectionToken, PLATFORM_ID, inject } from '@angular/core';
33
import { mergeWith } from 'lodash-es';
44
import { NEVER, Observable } from 'rxjs';
@@ -587,7 +587,20 @@ export function formatDate(value: Date | string | number | null | undefined, for
587587
if (typeof value === "string") {
588588
value = new Date(value);
589589
}
590+
let dateStyle = undefined, timeStyle = undefined;
591+
if (format === 'short' || format === 'medium' || format === 'long' || format === 'full') {
592+
dateStyle = format;
593+
timeStyle = format;
594+
} else if (format.includes('Date')) {
595+
dateStyle = format.replace('Date', '');
596+
} else if (format.includes('Time')) {
597+
dateStyle = format.replace('Time', '');
598+
} else {
599+
// Match with Angular custom formatting?
600+
}
590601
const options: Intl.DateTimeFormatOptions = {
602+
dateStyle,
603+
timeStyle,
591604
timeZone: timezone
592605
};
593606
return getI18nManager().formatDateTime(value, locale, options);

projects/igniteui-angular/src/lib/grids/grid/expandable-cell.component.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ import {
1313
} from '@angular/core';
1414
import { IgxGridCellComponent } from '../cell.component';
1515
import { PlatformUtil } from '../../core/utils';
16-
import { NgClass, NgTemplateOutlet, DecimalPipe, PercentPipe, CurrencyPipe, DatePipe } from '@angular/common';
16+
import { NgClass, NgTemplateOutlet } from '@angular/common';
1717
import { IgxGridSelectionService } from '../selection/selection.service';
1818
import { HammerGesturesManager } from '../../core/touch';
1919
import { GridType, IGX_GRID_BASE } from '../common/grid.interface';
2020
import { IgxOverlayService } from '../../services/public_api';
21-
import { IgxGridCellImageAltPipe, IgxStringReplacePipe, IgxColumnFormatterPipe } from '../common/pipes';
21+
import { IgxGridCellImageAltPipe, IgxStringReplacePipe, IgxColumnFormatterPipe, IgxNumberFormatterPipe, IgxPercentFormatterPipe, IgxCurrencyFormatterPipe, IgxDateFormatterPipe } from '../common/pipes';
2222
import { IgxTooltipDirective } from '../../directives/tooltip/tooltip.directive';
2323
import { IgxTooltipTargetDirective } from '../../directives/tooltip/tooltip-target.directive';
2424
import { IgxSuffixDirective } from '../../directives/suffix/suffix.directive';
@@ -40,7 +40,11 @@ import { IgxChipComponent } from '../../chips/chip.component';
4040
selector: 'igx-expandable-grid-cell',
4141
templateUrl: 'expandable-cell.component.html',
4242
providers: [HammerGesturesManager],
43-
imports: [IgxChipComponent, IgxTextHighlightDirective, IgxIconComponent, NgClass, FormsModule, ReactiveFormsModule, IgxInputGroupComponent, IgxInputDirective, IgxFocusDirective, IgxCheckboxComponent, IgxDatePickerComponent, IgxTimePickerComponent, IgxDateTimeEditorDirective, IgxPrefixDirective, IgxSuffixDirective, NgTemplateOutlet, IgxTooltipTargetDirective, IgxTooltipDirective, IgxGridCellImageAltPipe, IgxStringReplacePipe, IgxColumnFormatterPipe, DecimalPipe, PercentPipe, CurrencyPipe, DatePipe]
43+
imports: [IgxChipComponent, IgxTextHighlightDirective, IgxIconComponent, NgClass, FormsModule, ReactiveFormsModule,
44+
IgxInputGroupComponent, IgxInputDirective, IgxFocusDirective, IgxCheckboxComponent, IgxDatePickerComponent,
45+
IgxTimePickerComponent, IgxDateTimeEditorDirective, IgxPrefixDirective, IgxSuffixDirective, NgTemplateOutlet,
46+
IgxTooltipTargetDirective, IgxTooltipDirective, IgxGridCellImageAltPipe, IgxStringReplacePipe,
47+
IgxColumnFormatterPipe, IgxNumberFormatterPipe, IgxPercentFormatterPipe, IgxCurrencyFormatterPipe, IgxDateFormatterPipe]
4448
})
4549
export class IgxGridExpandableCellComponent extends IgxGridCellComponent implements OnInit {
4650
/**

projects/igniteui-angular/src/lib/grids/grid/groupby-row.component.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
OnDestroy,
1212
Inject
1313
} from '@angular/core';
14-
import { NgTemplateOutlet, DecimalPipe, DatePipe, getLocaleCurrencyCode, PercentPipe, CurrencyPipe } from '@angular/common';
14+
import { NgTemplateOutlet,getLocaleCurrencyCode } from '@angular/common';
1515

1616
import { takeUntil } from 'rxjs/operators';
1717
import { Subject } from 'rxjs';
@@ -27,18 +27,18 @@ import { ISelectionNode } from '../common/types';
2727
import { IgxCheckboxComponent } from '../../checkbox/checkbox.component';
2828
import { IgxBadgeComponent } from '../../badge/badge.component';
2929
import { IgxIconComponent } from '../../icon/icon.component';
30-
import { IgxColumnFormatterPipe } from '../common/pipes';
30+
import { IgxColumnFormatterPipe, IgxCurrencyFormatterPipe, IgxDateFormatterPipe, IgxNumberFormatterPipe, IgxPercentFormatterPipe } from '../common/pipes';
3131

3232
@Component({
3333
changeDetection: ChangeDetectionStrategy.OnPush,
3434
selector: 'igx-grid-groupby-row',
3535
templateUrl: './groupby-row.component.html',
3636
imports: [
3737
NgTemplateOutlet,
38-
DecimalPipe,
39-
DatePipe,
40-
PercentPipe,
41-
CurrencyPipe,
38+
IgxNumberFormatterPipe,
39+
IgxDateFormatterPipe,
40+
IgxPercentFormatterPipe,
41+
IgxCurrencyFormatterPipe,
4242
IgxIconComponent,
4343
IgxBadgeComponent,
4444
IgxCheckboxComponent,

projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-cell.component.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { HammerGesturesManager } from '../../core/touch';
55
import { PlatformUtil } from '../../core/utils';
66
import { GridType, IGX_GRID_BASE } from '../common/grid.interface';
77
import { IgxOverlayService } from '../../services/public_api';
8-
import { IgxGridCellImageAltPipe, IgxStringReplacePipe, IgxColumnFormatterPipe } from '../common/pipes';
8+
import { IgxGridCellImageAltPipe, IgxStringReplacePipe, IgxColumnFormatterPipe, IgxNumberFormatterPipe, IgxPercentFormatterPipe, IgxCurrencyFormatterPipe, IgxDateFormatterPipe } from '../common/pipes';
99
import { IgxTooltipDirective } from '../../directives/tooltip/tooltip.directive';
1010
import { IgxTooltipTargetDirective } from '../../directives/tooltip/tooltip-target.directive';
1111
import { IgxSuffixDirective } from '../../directives/suffix/suffix.directive';
@@ -22,14 +22,19 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
2222
import { IgxIconComponent } from '../../icon/icon.component';
2323
import { IgxTextHighlightDirective } from '../../directives/text-highlight/text-highlight.directive';
2424
import { IgxChipComponent } from '../../chips/chip.component';
25-
import { NgClass, NgTemplateOutlet, DecimalPipe, PercentPipe, CurrencyPipe, DatePipe } from '@angular/common';
25+
import { NgClass, NgTemplateOutlet } from '@angular/common';
2626

2727
@Component({
2828
changeDetection: ChangeDetectionStrategy.OnPush,
2929
selector: 'igx-hierarchical-grid-cell',
3030
templateUrl: '../cell.component.html',
3131
providers: [HammerGesturesManager],
32-
imports: [IgxChipComponent, IgxTextHighlightDirective, IgxIconComponent, NgClass, FormsModule, ReactiveFormsModule, IgxInputGroupComponent, IgxInputDirective, IgxFocusDirective, IgxTextSelectionDirective, IgxCheckboxComponent, IgxDatePickerComponent, IgxTimePickerComponent, IgxDateTimeEditorDirective, IgxPrefixDirective, IgxSuffixDirective, NgTemplateOutlet, IgxTooltipTargetDirective, IgxTooltipDirective, IgxGridCellImageAltPipe, IgxStringReplacePipe, IgxColumnFormatterPipe, DecimalPipe, PercentPipe, CurrencyPipe, DatePipe]
32+
imports: [IgxChipComponent, IgxTextHighlightDirective, IgxIconComponent, NgClass, FormsModule, ReactiveFormsModule,
33+
IgxInputGroupComponent, IgxInputDirective, IgxFocusDirective, IgxTextSelectionDirective, IgxCheckboxComponent,
34+
IgxDatePickerComponent, IgxTimePickerComponent, IgxDateTimeEditorDirective, IgxPrefixDirective,
35+
IgxSuffixDirective, NgTemplateOutlet, IgxTooltipTargetDirective, IgxTooltipDirective, IgxGridCellImageAltPipe,
36+
IgxStringReplacePipe, IgxColumnFormatterPipe, IgxNumberFormatterPipe, IgxPercentFormatterPipe,
37+
IgxCurrencyFormatterPipe, IgxDateFormatterPipe]
3338
})
3439
export class IgxHierarchicalGridCellComponent extends IgxGridCellComponent implements OnInit {
3540
// protected hSelection;

projects/igniteui-angular/src/lib/grids/tree-grid/tree-cell.component.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import {
33
Component,
44
Input
55
} from '@angular/core';
6-
import { NgClass, NgStyle, NgTemplateOutlet, DecimalPipe, PercentPipe, CurrencyPipe, DatePipe } from '@angular/common';
6+
import { NgClass, NgStyle, NgTemplateOutlet } from '@angular/common';
77

88
import { HammerGesturesManager } from '../../core/touch';
99
import { IgxGridExpandableCellComponent } from '../grid/expandable-cell.component';
1010
import { IgxTreeGridRow } from '../grid-public-row';
1111
import { RowType } from '../common/grid.interface';
12-
import { IgxGridCellImageAltPipe, IgxStringReplacePipe, IgxColumnFormatterPipe } from '../common/pipes';
12+
import { IgxGridCellImageAltPipe, IgxStringReplacePipe, IgxColumnFormatterPipe, IgxNumberFormatterPipe, IgxPercentFormatterPipe, IgxCurrencyFormatterPipe, IgxDateFormatterPipe } from '../common/pipes';
1313
import { IgxTooltipDirective } from '../../directives/tooltip/tooltip.directive';
1414
import { IgxTooltipTargetDirective } from '../../directives/tooltip/tooltip-target.directive';
1515
import { IgxCircularProgressBarComponent } from '../../progressbar/progressbar.component';
@@ -37,10 +37,10 @@ import { IgxTextSelectionDirective } from '../../directives/text-selection/text-
3737
NgClass,
3838
NgStyle,
3939
NgTemplateOutlet,
40-
DecimalPipe,
41-
PercentPipe,
42-
CurrencyPipe,
43-
DatePipe,
40+
IgxNumberFormatterPipe,
41+
IgxPercentFormatterPipe,
42+
IgxCurrencyFormatterPipe,
43+
IgxDateFormatterPipe,
4444
IgxChipComponent,
4545
IgxTextHighlightDirective,
4646
IgxIconComponent,

0 commit comments

Comments
 (0)