Skip to content

Commit

Permalink
feat(kit): add InputMultiDate
Browse files Browse the repository at this point in the history
  • Loading branch information
splincode committed Oct 12, 2023
1 parent 0e61adf commit ebe9149
Show file tree
Hide file tree
Showing 22 changed files with 969 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export class TuiMobileCalendarDialogComponent {
constructor(
@Inject(POLYMORPHEUS_CONTEXT)
readonly context: TuiDialogContext<
TuiDay | TuiDayRange,
TuiDay | TuiDayRange | readonly TuiDay[],
TuiMobileCalendarData | undefined
>,
) {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import {
TUI_CANCEL_WORD,
TUI_CHOOSE_DAY_OR_RANGE_TEXTS,
TUI_DONE_WORD,
tuiImmutableUpdateMultiDates,
} from '@taiga-ui/kit';
import {identity, MonoTypeOperatorFunction, Observable, race, timer} from 'rxjs';
import {
Expand Down Expand Up @@ -98,9 +99,9 @@ export class TuiMobileCalendarComponent implements AfterViewInit {
readonly cancel = new EventEmitter<void>();

@Output()
readonly confirm = new EventEmitter<TuiDay | TuiDayRange>();
readonly confirm = new EventEmitter<TuiDay | TuiDayRange | readonly TuiDay[]>();

value: TuiDay | TuiDayRange | null = null;
value: TuiDay | TuiDayRange | readonly TuiDay[] | null = null;

readonly years = Array.from({length: RANGE}, (_, i) => i + STARTING_YEAR);

Expand Down Expand Up @@ -167,11 +168,13 @@ export class TuiMobileCalendarComponent implements AfterViewInit {
return;
}

if (
this.value === null ||
this.value instanceof TuiDay ||
!this.value.isSingleDay
) {
if (!(this.value instanceof TuiDayRange) && !(this.value instanceof TuiDay)) {
this.value = tuiImmutableUpdateMultiDates(this.value ?? [], day);

return;
}

if (this.value instanceof TuiDay || !this.value?.isSingleDay) {
this.value = new TuiDayRange(day, day);

return;
Expand Down Expand Up @@ -242,6 +245,10 @@ export class TuiMobileCalendarComponent implements AfterViewInit {
return this.value.year;
}

if (!(this.value instanceof TuiDayRange)) {
return this.value?.[0].year ?? this.today.year;
}

return this.value.from.year;
}

Expand All @@ -254,6 +261,14 @@ export class TuiMobileCalendarComponent implements AfterViewInit {
return this.value.month + (this.value.year - STARTING_YEAR) * MONTHS_IN_YEAR;
}

if (!(this.value instanceof TuiDayRange)) {
return (
(this.value?.[0].month ?? this.today.month) +
((this.value?.[0].year ?? this.today.year) - STARTING_YEAR) *
MONTHS_IN_YEAR
);
}

return (
this.value.from.month +
(this.value.from.year - STARTING_YEAR) * MONTHS_IN_YEAR
Expand Down
9 changes: 9 additions & 0 deletions projects/demo/src/modules/app/app.routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,15 @@ export const ROUTES: Routes = [
title: `InputDate`,
},
},
{
path: `components/input-multi-date`,
loadChildren: async () =>
(await import(`../components/input-multi-date/input-multi-date.module`))
.ExampleTuiInputMultiDateModule,
data: {
title: `InputMultiDate`,
},
},
{
path: `components/input-card`,
loadChildren: async () =>
Expand Down
8 changes: 8 additions & 0 deletions projects/demo/src/modules/app/pages.ts
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,14 @@ export const pages: TuiDocPages = [
`неделя, месяц, год, дата, calendar`,
route: `/components/input-date`,
},
{
section: `Components`,
title: `InputMultiDate`,
keywords:
`поле, инпут, форма, ввод, input, календарь, день, ` +
`неделя, месяц, год, дата, calendar, multiple`,
route: `/components/input-multi-date`,
},
{
section: `Components`,
title: `InputDateRange`,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<form [formGroup]="testForm">
<tui-input-date
formControlName="testValue"
multiple
[tuiTextfieldLabelOutside]="true"
>
Choose a dates
</tui-input-date>
</form>
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import {Component} from '@angular/core';
import {FormControl, FormGroup} from '@angular/forms';
import {changeDetection} from '@demo/emulate/change-detection';
import {encapsulation} from '@demo/emulate/encapsulation';
import {TuiDay} from '@taiga-ui/cdk';

@Component({
selector: 'tui-input-multi-date-example-1',
templateUrl: './index.html',
changeDetection,
encapsulation,
})
export class TuiInputMultiDateExample1 {
readonly testForm = new FormGroup({
testValue: new FormControl([
new TuiDay(2017, 0, 7),
new TuiDay(2017, 0, 10),
new TuiDay(2017, 0, 15),
]),
});
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<form
class="b-form"
[formGroup]="testForm"
[tuiTextfieldCleaner]="true"
>
<tui-input-date
formControlName="testValue"
multiple
>
Choose a dates
</tui-input-date>
</form>
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import {Component} from '@angular/core';
import {FormControl, FormGroup} from '@angular/forms';
import {changeDetection} from '@demo/emulate/change-detection';
import {encapsulation} from '@demo/emulate/encapsulation';
import {TuiDay} from '@taiga-ui/cdk';
import {tuiInputDateOptionsProvider} from '@taiga-ui/kit';

@Component({
selector: 'tui-input-multi-date-example-2',
templateUrl: './index.html',
changeDetection,
encapsulation,
providers: [tuiInputDateOptionsProvider({nativePicker: true})],
})
export class TuiInputMultiDateExample2 {
readonly testForm = new FormGroup({
testValue: new FormControl([new TuiDay(2017, 0, 15)]),
});
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
```ts
import {FormControl, FormGroup} from '@angular/forms';

@Component({
// ...
})
export class MyComponent {
testForm = new FormGroup({
testValue: new FormControl([]),
});
}
```
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
```ts
import {ReactiveFormsModule} from '@angular/forms';
import {TuiInputDateModule} from '@taiga-ui/kit';

@NgModule({
imports: [
// ...
ReactiveFormsModule,
TuiInputDateModule,
],
// ...
})
export class MyModule {}
```
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
```html
<form [formGroup]="testForm">
<tui-input-date
formControlName="testValue"
multiple
>
Choose a date
</tui-input-date>
</form>
```
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
import {Component, forwardRef} from '@angular/core';
import {FormControl, Validators} from '@angular/forms';
import {changeDetection} from '@demo/emulate/change-detection';
import {TuiDocExample} from '@taiga-ui/addon-doc';
import {
ALWAYS_FALSE_HANDLER,
TUI_FIRST_DAY,
TUI_LAST_DAY,
TuiBooleanHandler,
TuiDay,
} from '@taiga-ui/cdk';
import {TUI_DEFAULT_MARKER_HANDLER, TuiMarkerHandler} from '@taiga-ui/core';
import {TuiNamedDay} from '@taiga-ui/kit';

import {AbstractExampleTuiControl} from '../abstract/control';
import {ABSTRACT_PROPS_ACCESSOR} from '../abstract/inherited-documentation/abstract-props-accessor';

const TWO_DOTS: [string, string] = ['var(--tui-primary)', 'var(--tui-info-fill)'];
const ONE_DOT: [string] = ['var(--tui-success-fill)'];

@Component({
selector: 'example-tui-input-multi-date',
templateUrl: './input-multi-date.template.html',
changeDetection,
providers: [
{
provide: ABSTRACT_PROPS_ACCESSOR,
useExisting: forwardRef(() => ExampleTuiInputMultiDateComponent),
},
],
})
export class ExampleTuiInputMultiDateComponent extends AbstractExampleTuiControl {
readonly exampleForm = import('./examples/import/declare-form.md?raw');

readonly exampleModule = import('./examples/import/import-module.md?raw');

readonly exampleHtml = import('./examples/import/insert-template.md?raw');

readonly example1: TuiDocExample = {
TypeScript: import('./examples/1/index.ts?raw'),
HTML: import('./examples/1/index.html?raw'),
};

readonly example2: TuiDocExample = {
TypeScript: import('./examples/2/index.ts?raw'),
HTML: import('./examples/2/index.html?raw'),
};

minVariants = [
TUI_FIRST_DAY,
new TuiDay(2017, 2, 5),
new TuiDay(1900, 0, 1),
new TuiDay(new Date().getFullYear() + 3, 1, 1),
];

min = this.minVariants[0];

maxVariants = [
TUI_LAST_DAY,
new TuiDay(2017, 11, 11),
new TuiDay(2020, 2, 5),
new TuiDay(2300, 0, 1),
];

max = this.maxVariants[0];

rowsVariants = [Infinity, 10, 3, 2];

rows = this.rowsVariants[0];

readonly disabledItemHandlerVariants: ReadonlyArray<TuiBooleanHandler<TuiDay>> = [
ALWAYS_FALSE_HANDLER,
({day}) => day % 3 === 0,
];

disabledItemHandler = this.disabledItemHandlerVariants[0];

readonly itemsVariants = [
[],
[new TuiNamedDay(TUI_LAST_DAY.append({year: -1}), 'Until today')],
];

readonly markerHandlerVariants: readonly TuiMarkerHandler[] = [
TUI_DEFAULT_MARKER_HANDLER,
(day: TuiDay) => (day.day % 2 === 0 ? TWO_DOTS : ONE_DOT),
];

markerHandler: TuiMarkerHandler = this.markerHandlerVariants[0];

items = this.itemsVariants[0];

override cleaner = false;

expandable = false;

control = new FormControl([], Validators.required);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
import {CommonModule} from '@angular/common';
import {NgModule} from '@angular/core';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {RouterModule} from '@angular/router';
import {TuiAddonDocModule, tuiGenerateRoutes} from '@taiga-ui/addon-doc';
import {TuiMobileCalendarDialogModule} from '@taiga-ui/addon-mobile';
import {
TuiButtonModule,
TuiDropdownModule,
TuiErrorModule,
TuiHintModule,
TuiLinkModule,
TuiNotificationModule,
TuiTextfieldControllerModule,
} from '@taiga-ui/core';
import {
TuiFieldErrorPipeModule,
TuiInputDateModule,
TuiRadioListModule,
TuiUnfinishedValidatorModule,
} from '@taiga-ui/kit';

import {InheritedDocumentationModule} from '../abstract/inherited-documentation/inherited-documentation.module';
import {TuiInputMultiDateExample1} from './examples/1';
import {TuiInputMultiDateExample2} from './examples/2';
import {ExampleTuiInputMultiDateComponent} from './input-multi-date.component';

@NgModule({
imports: [
TuiAddonDocModule,
InheritedDocumentationModule,
ReactiveFormsModule,
FormsModule,
CommonModule,
TuiLinkModule,
TuiRadioListModule,
TuiButtonModule,
TuiInputDateModule,
TuiMobileCalendarDialogModule,
TuiUnfinishedValidatorModule,
TuiTextfieldControllerModule,
TuiHintModule,
TuiErrorModule,
TuiFieldErrorPipeModule,
TuiNotificationModule,
RouterModule.forChild(tuiGenerateRoutes(ExampleTuiInputMultiDateComponent)),
TuiDropdownModule,
],
declarations: [
ExampleTuiInputMultiDateComponent,
TuiInputMultiDateExample1,
TuiInputMultiDateExample2,
],
exports: [ExampleTuiInputMultiDateComponent],
})
export class ExampleTuiInputMultiDateModule {}
Loading

0 comments on commit ebe9149

Please sign in to comment.