Skip to content
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.

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

Feat/input date #264

Merged
merged 25 commits into from
May 18, 2023
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
24a2999
feat(components): created new prizm-select-input component
ZurabDev May 10, 2023
050fcd4
Merge branch 'main' of github.com:zyfra/Prizm into feat/select-input
ZurabDev May 11, 2023
fc7fda8
fix: lint errors
ZurabDev May 11, 2023
56ee1d5
chore(components/select): update export structure
ZurabDev May 11, 2023
67792ca
fix(chore/input): fix export errors
ZurabDev May 11, 2023
d41eaf8
fix(components/select-input): build errors and fix logic
ZurabDev May 11, 2023
674c580
feat(components/input-select): stage 2
ZurabDev May 11, 2023
3455cf9
feat(components/select): rename select-input to input-select
ZurabDev May 12, 2023
4565a05
Merge branch 'main' of github.com:zyfra/Prizm into feat/select-input
ZurabDev May 12, 2023
227930b
feat(doc/select-input): update api page
ZurabDev May 12, 2023
ddc66f7
feat(component/input-multi-select): stage 1
ZurabDev May 12, 2023
bc85d2f
feat(component/input-layout): change logic appear layers on disabled
ZurabDev May 15, 2023
75a9f5f
feat(components/input): update input
ZurabDev May 15, 2023
f818bd3
feat(components/input): update input
ZurabDev May 15, 2023
2c28438
Merge branch 'feat/select-input' of github.com:zyfra/Prizm into feat/…
ZurabDev May 15, 2023
1bf22a0
feat(components/input-multi-select): added new component which work w…
ZurabDev May 15, 2023
066e7ff
feat(components/input-date): add work with input-layout
ZurabDev May 15, 2023
d39e3de
feat(components/input-date): stage 2
ZurabDev May 15, 2023
539ce18
feat(doc/date): update doc
ZurabDev May 15, 2023
48e24eb
fix(components/input-select): update doc page and small fixes
ZurabDev May 16, 2023
afbee3d
Merge branch 'main' of github.com:zyfra/Prizm into feat/multi-select-…
ZurabDev May 16, 2023
3b82e7d
feat(layout): add hidden controll
ZurabDev May 17, 2023
e4fba6d
fix: merge conflicts
ZurabDev May 17, 2023
82e5e00
fix: merge conflicts
ZurabDev May 17, 2023
da55f34
feat(components/input-date): restore old names
ZurabDev May 17, 2023
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
9 changes: 8 additions & 1 deletion apps/doc/src/app/app.routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -410,12 +410,19 @@ export const ROUTES: Routes = [
title: 'Input Chips',
},
},
{
path: 'components/date',
loadChildren: () => import('./components/input/date/date.module').then(i => i.DateModule),
data: {
title: 'Date',
},
},
{
path: 'components/input-date',
loadChildren: () =>
import('./components/input/input-date/input-date.module').then(i => i.InputDateModule),
data: {
title: 'Input Date',
title: 'InputDate',
},
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@
<prizm-doc-demo>
<prizm-accordion
#element
key="PrizmAccordionComponent"
prizmDocHostElementKey="PrizmAccordionComponent"
[prizmDocHostElement]="element"
[onlyOneExpanded]="onlyOneExpanded"
>
<prizm-accordion-item
#elementAccordionItem
key="PrizmAccordionItemComponent"
prizmDocHostElementKey="PrizmAccordionItemComponent"
[prizmDocHostElement]="elementAccordionItem"
[disabled]="disabled"
[title]="title"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<prizm-input-layout label="Заголовок">
<prizm-input-select [formControl]="control" [items]="items"> </prizm-input-select>
</prizm-input-layout>

<br />
<br />
<div>
<button prizmButton (click)="setDefaultValue()">
Set default value: <b>{{ items[0] }}</b>
</button>
</div>

<br />
<br />
<div>Current value: {{ control.value }}</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { Component } from '@angular/core';
import { FormControl, Validators } from '@angular/forms';

@Component({
selector: 'prizm-select-input-example',
templateUrl: './select-input-example.component.html',
styles: [
`
.box {
display: flex;
gap: 1rem;
}
`,
],
})
export class PrizmSelectInputExampleComponent {
readonly items = [
'One',
'Two',
'Three',
'Very long text with a lot of characters and spaces and other stuff and things',
];
readonly control = new FormControl(this.items[1], [Validators.required]);

public setDefaultValue(): void {
this.control.setValue(this.items[0], { emitEvent: false });
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<prizm-select [formControl]="control" [items]="items"></prizm-select>
<!--<prizm-select [formControl]="control" [items]="items"></prizm-select>-->
<prizm-input-layout label="Validators">
<prizm-input-select [formControl]="control" [items]="items"></prizm-input-select>
</prizm-input-layout>
<br />
<br />
<div style="display: flex; flex-flow: column; gap: 1rem; width: 20rem">
Expand Down
Loading