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

fix: input-carousel #395

Merged
merged 4 commits into from
Jun 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1,210 changes: 0 additions & 1,210 deletions .firebase/hosting.ZGlzdC9hcHBzL2RvYw.cache

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
/tmp
/out-tsc
/.angular
/.firebase

# dependencies
/node_modules
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<!--<prizm-input-layout [label]="'Карусель'" [size]="'l'" [outer]="true" [position]="'center'">-->
<!-- <prizm-input-carousel-->
<!-- [required]="true"-->
<!-- [carouselContent]="arrayWithObjects"-->
<!-- [ngModel]="arrayWithObjects.set[0]"-->
<!-- >-->
<!-- {{ arrayWithObjects.currentValue.title }}-->
<!-- </prizm-input-carousel>-->
<!-- <ng-template prizmInputStatusText>Текст статуса</ng-template>-->
<!--</prizm-input-layout>-->
<prizm-input-layout [label]="'Карусель'" [size]="'l'" [outer]="true" [position]="'center'">
<prizm-input-carousel
[required]="true"
[carouselContent]="arrayWithObjects"
[ngModel]="arrayWithObjects.set[0]"
>
{{ arrayWithObjects.currentValue?.title }}
</prizm-input-carousel>
<ng-template prizmInputStatusText>Текст статуса</ng-template>
</prizm-input-layout>
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ export class PrizmInputCarouselArrayOfObjectsExampleComponent {
description: 'description 3',
},
],
(item, el) => item.id === el.id
(item, el) => item?.id === el?.id
);
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Component, Input } from '@angular/core';

import { PrizmCarouselComponent } from './carousel.component';
import { PrizmInputCarouselComponent } from './input-carousel.component';

/**
* @deprecated
* use PrizmInputCarouselAuxiliaryLeftComponent
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, Input } from '@angular/core';
import { PrizmInputCarouselComponent } from './input-carousel.component';
import { PrizmInputCarousel } from './types';

@Component({
selector: 'prizm-input-carousel-auxiliary-left',
Expand Down Expand Up @@ -29,5 +29,5 @@ import { PrizmInputCarouselComponent } from './input-carousel.component';
],
})
export class PrizmInputCarouselAuxiliaryLeftComponent {
@Input() carousel: PrizmInputCarouselComponent;
@Input() carousel: PrizmInputCarousel;
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Component, Input } from '@angular/core';
import { PrizmInputCarouselComponent } from './input-carousel.component';
import { PrizmInputCarousel } from './types';

@Component({
selector: 'prizm-input-carousel-auxiliary-right',
Expand Down Expand Up @@ -29,5 +29,5 @@ import { PrizmInputCarouselComponent } from './input-carousel.component';
],
})
export class PrizmInputCarouselAuxiliaryRightComponent {
@Input() carousel: PrizmInputCarouselComponent;
@Input() carousel: PrizmInputCarousel;
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

<ng-template #emptyTpl>&nbsp;</ng-template>

<!--<ng-container *prizmInputLayoutLeft>-->
<!-- <prizm-input-carousel-auxiliary-left [carousel]="this"> </prizm-input-carousel-auxiliary-left>-->
<!--</ng-container>-->
<ng-container *prizmInputLayoutLeft>
<prizm-input-carousel-auxiliary-left [carousel]="this"> </prizm-input-carousel-auxiliary-left>
</ng-container>

<!--<ng-container *prizmInputLayoutRight>-->
<!-- <prizm-input-carousel-auxiliary-right [carousel]="this"> </prizm-input-carousel-auxiliary-right>-->
<!--</ng-container>-->
<ng-container *prizmInputLayoutRight>
<prizm-input-carousel-auxiliary-right [carousel]="this"> </prizm-input-carousel-auxiliary-right>
</ng-container>
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { PrizmInputControl } from '../common/base/input-control.class';
import { PrizmInputCarouselContent } from './carousel-content/carousel-content.interface';
import { PrizmInputNgControl } from '../common';
import { takeUntil, tap } from 'rxjs/operators';
import { PrizmInputCarousel } from './types';

@Component({
selector: 'prizm-input-carousel',
Expand All @@ -42,7 +43,10 @@ import { takeUntil, tap } from 'rxjs/operators';
'[attr.tabindex]': "disabled ? null : '0'",
},
})
export class PrizmInputCarouselComponent extends PrizmInputNgControl<any> implements ControlValueAccessor {
export class PrizmInputCarouselComponent
extends PrizmInputNgControl<any>
implements ControlValueAccessor, PrizmInputCarousel
{
@HostBinding('attr.data-testid')
readonly testId = 'ui-area--carousel';
@Input() carouselContent: PrizmInputCarouselContent;
Expand Down
11 changes: 11 additions & 0 deletions libs/components/src/lib/components/input/carousel/types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { PrizmInputCarouselContent } from './carousel-content';

export interface PrizmInputCarousel {
carouselContent: PrizmInputCarouselContent;
lightMode: boolean;
disabled: boolean;
stepLeft(): void;
left(): void;
stepRight(): void;
right(): void;
}