Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
4ca25b6
fileupload: стилизация, сторисы, обёртки
Apr 22, 2026
7a40401
фикс вызова аплоадера; стилизация интерфейса после загрузки файла
Apr 22, 2026
a4c934a
messageCss восстановлен в map-tokens.ts
Apr 23, 2026
dbd76b0
Merge feature/styles-debug into file.upload, resolve conflicts
Jun 1, 2026
01dd0d0
исправлен импорт ExtraButtonComponent в fileupload
Jun 1, 2026
f4da1ae
отключён hover у dropzone в состоянии disabled
Jun 1, 2026
acb5a63
добавлена поддержка drag and drop на кастомный dropzone
Jun 1, 2026
4458850
реализован ControlValueAccessor, добавлена стори с реактивной формой
Jun 1, 2026
bf84438
кнопки удаления файлов и управления отправкой
Jun 1, 2026
1fa6c4e
удалён отладочный вывод статуса формы
Jun 2, 2026
1a94e87
@khaliulin валидация accept по MIME-типу, фильтрация файлов при drop
Jun 5, 2026
d676b2b
Merge branch 'feature/styles-debug' into file.upload
khaliulin Jun 9, 2026
4221b2b
figma-to-code
Jun 16, 2026
ca15f0c
нейминг обёрток выровнен по Figma
Jun 18, 2026
601ff9a
синхронизация package-lock с @primeuix/themes
Jun 19, 2026
f7f41e0
OnPush-стратегия и markForCheck вместо detectChanges в fileupload
Jun 24, 2026
884a155
Типизация событий fileupload через типы PrimeNG вместо any
Jun 24, 2026
e3d8720
Регистрация CSS компонента fileupload в map-tokens
Jun 24, 2026
5246885
Merge pull request #71 from cdek-it/file.upload
persi14 Jun 24, 2026
d63b428
апдейт базы токенов
Jun 24, 2026
ade7de3
Merge pull request #83 from cdek-it/api-refactor
AxyIX Jun 26, 2026
b44323c
Merge pull request #84 from cdek-it/tokens-update
AxyIX Jun 26, 2026
e366690
public package preparation
AxyIX Jun 26, 2026
daa8ec5
Merge branch 'refs/heads/main' into feature/styles-debug
AxyIX Jun 26, 2026
a199484
public package preparation
AxyIX Jun 26, 2026
b810f86
public package preparation
AxyIX Jun 26, 2026
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 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,4 @@ src/assets/components/themes
.playwright-mcp/*

.claude/*
.qwen
1 change: 1 addition & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
"@angular/router": "20.3.15",
"@compodoc/compodoc": "1.1.32",
"@primeng/themes": "20.4.0",
"@primeuix/themes": "1.2.5",
"@storybook/addon-a11y": "10.1.8",
"@storybook/addon-docs": "10.1.8",
"@storybook/addon-themes": "^10.1.8",
Expand All @@ -65,9 +66,8 @@
"karma-chrome-launcher": "3.2.0",
"karma-coverage": "2.2.1",
"karma-jasmine": "5.1.0",
"ng-packagr": "20.3.2",
"@primeuix/themes": "1.2.5",
"karma-jasmine-html-reporter": "2.1.0",
"ng-packagr": "20.3.2",
"prettier": "3.7.4",
"primeng": "20.4.0",
"rxjs": "7.8.2",
Expand All @@ -78,6 +78,7 @@
"zone.js": "0.15.1"
},
"dependencies": {
"@tailwindcss/postcss": "^4.3.1",
"cpx": "1.5.0"
},
"eslintConfig": {
Expand Down
8 changes: 4 additions & 4 deletions src/lib/components/avatar/avatar.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, HostBinding, Input } from '@angular
import { Avatar } from 'primeng/avatar';
import { AvatarGroup } from 'primeng/avatargroup';

export type ExtraAvatarSize = 'normal' | 'large' | 'xlarge';
export type ExtraAvatarSize = 'base' | 'large' | 'xlarge';
export type ExtraAvatarShape = 'square' | 'circle';

@Component({
Expand All @@ -24,7 +24,7 @@ export class ExtraAvatarComponent {
@Input() label = '';
@Input() icon = '';
@Input() image = '';
@Input() size: ExtraAvatarSize = 'normal';
@Input() size: ExtraAvatarSize = 'base';
@Input() shape: ExtraAvatarShape = 'square';

@HostBinding('class') get hostClass(): string {
Expand All @@ -34,8 +34,8 @@ export class ExtraAvatarComponent {
return classes.join(' ');
}

get primeSize(): 'normal' | 'large' | 'xlarge' | undefined {
return this.size === 'normal' ? undefined : this.size;
get primeSize(): 'large' | 'xlarge' | undefined {
return this.size === 'base' ? undefined : this.size;
}
}

Expand Down
14 changes: 7 additions & 7 deletions src/lib/components/button/button.component.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
import { Button, ButtonSeverity as PrimeButtonSeverity } from 'primeng/button';

export type ExtraButtonVariant = 'primary' | 'secondary' | 'outlined' | 'text' | 'link';
export type ExtraButtonVariant = 'primary' | 'secondary' | 'tertiary' | 'text' | 'link';
export type ExtraButtonSeverity = 'success' | 'warning' | 'danger' | 'info' | null;
export type ExtraButtonSize = 'small' | 'base' | 'large' | 'xlarge';
export type ExtraButtonIconPos = 'prefix' | 'postfix' | null;
export type ExtraButtonIconPosition = 'prefix' | 'postfix' | null;
export type ExtraBadgeSeverity = 'success' | 'info' | 'warning' | 'danger' | 'secondary' | 'contrast' | null;
type PrimeBadgeSeverity = Extract<Button['badgeSeverity'], string | null>;
type ExtraButtonSeverityValue = PrimeButtonSeverity;
Expand All @@ -23,11 +23,11 @@ type ExtraBadgeSeverityValue = PrimeBadgeSeverity;
[size]="primeSize"
[styleClass]="size === 'xlarge' ? 'p-button-xlg' : ''"
[rounded]="rounded"
[outlined]="variant === 'outlined'"
[outlined]="variant === 'tertiary'"
[text]="variant === 'text' || text"
[link]="variant === 'link'"
[icon]="icon"
[iconPos]="primeIconPos"
[iconPos]="primeIconPosition"
[severity]="primeSeverity"
[badge]="showBadge ? badge || ' ' : undefined"
[badgeSeverity]="primeBadgeSeverity"
Expand All @@ -44,7 +44,7 @@ export class ExtraButtonComponent {
@Input() severity: ExtraButtonSeverity = null;
@Input() size: ExtraButtonSize = 'base';
@Input() rounded = false;
@Input() iconPos: ExtraButtonIconPos = null;
@Input() iconPosition: ExtraButtonIconPosition = null;
@Input() iconOnly = false;
@Input() icon = '';
@Input() disabled = false;
Expand All @@ -64,8 +64,8 @@ export class ExtraButtonComponent {
return undefined;
}

get primeIconPos(): 'left' | 'right' {
return this.iconPos === 'postfix' ? 'right' : 'left';
get primeIconPosition(): 'left' | 'right' {
return this.iconPosition === 'postfix' ? 'right' : 'left';
}

get primeSeverity(): ExtraButtonSeverityValue | null {
Expand Down
4 changes: 2 additions & 2 deletions src/lib/components/confirm-dialog/confirm-dialog.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { PrimeTemplate } from 'primeng/api';
import { ExtraButtonComponent } from '@cdek-it/angular-ui-kit/components/button';

export type ExtraConfirmDialogSize = 'sm' | 'default' | 'lg' | 'xlg';
export type ExtraConfirmDialogSeverity = 'success' | 'info' | 'warn' | 'help' | 'danger' | 'default';
export type ExtraConfirmDialogSeverity = 'success' | 'info' | 'warning' | 'help' | 'danger' | 'default';

@Directive({ selector: '[extraConfirmDialogHeader]', standalone: true })
export class ExtraConfirmDialogHeaderDirective {}
Expand Down Expand Up @@ -84,7 +84,7 @@ export class ExtraConfirmDialogComponent {
const severityMap: Record<ExtraConfirmDialogSeverity, string> = {
success: 'p-confirm-dialog-accept',
info: 'p-confirm-dialog-info',
warn: 'p-confirm-dialog-warn',
warning: 'p-confirm-dialog-warn',
help: 'p-confirm-dialog-help',
danger: 'p-confirm-dialog-error',
default: ''
Expand Down
Loading
Loading