Skip to content
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
17 changes: 9 additions & 8 deletions docs/components-api/message.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@

Сообщение-уведомление.

| Свойство | Описание | Типизация |
| ------------ | --------------------------------------------------------------------------------------------- | -------------------------------------- |
| `severity` | тип сообщения | `info \| success \| warning \| danger` |
| `timer` | таймер автоскрытия | `boolean` |
| `message` | заголовок сообщения | `string` |
| `caption` | пояснение сообщения | `string` |
| `icon` | класс иконки tabler icon (вместо стандартной для `severity`). значение `null` скрывает иконку | `string \| null` |
| `show-close` | кнопка закрытия | `boolean` |
| Свойство | Описание | Типизация |
| ------------ | --------------------------------------------------------------------------------------------- | ------------------------------------------ |
| `severity` | тип сообщения | `info \| success \| warning \| danger` |
| `timer` | таймер автоскрытия | `boolean` |
| `message` | заголовок сообщения | `string` |
| `caption` | пояснение сообщения | `string` |
| `icon` | класс иконки tabler icon (вместо стандартной для `severity`). значение `null` скрывает иконку | `string \| null` |
| `show-close` | кнопка закрытия | `boolean` |
| `size` | ширина сообщения; `fill` — на всю ширину контейнера | `small \| base \| large \| xlarge \| fill` |

# Слоты (content projection)

Expand Down
10 changes: 9 additions & 1 deletion src/lib/components/message/message.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ import { ExtraMessageTemplateDirective } from './message-template.directive';

export type ExtraMessageSeverity = 'info' | 'success' | 'warning' | 'danger';

export type ExtraMessageSize = 'small' | 'base' | 'large' | 'xlarge' | 'fill';

type PrimeMessageSeverity = 'success' | 'info' | 'warn' | 'error';

const SEVERITY_ICONS: Record<ExtraMessageSeverity, string> = {
Expand All @@ -38,7 +40,7 @@ const TIMER_LIFE = 3000;
changeDetection: ChangeDetectionStrategy.OnPush,
imports: [Message, ButtonDirective, SharedModule, NgTemplateOutlet],
template: `
<p-message [severity]="primeSeverity" [closable]="false">
<p-message [severity]="primeSeverity" [closable]="false" [styleClass]="sizeClass">
<ng-template pTemplate="container">
<div class="p-message-accent-line"></div>
@if (resolvedIcon) {
Expand Down Expand Up @@ -81,6 +83,8 @@ export class ExtraMessageComponent implements AfterContentInit, OnDestroy {
/** Класс иконки tabler icon; null скрывает иконку; undefined (не задан) — стандартная по severity. */
@Input() icon: string | null | undefined = undefined;
@Input() showClose = false;
/** Ширина сообщения; `fill` — на всю ширину контейнера. */
@Input() size: ExtraMessageSize = 'base';

@Output() onClose = new EventEmitter<void>();

Expand All @@ -100,6 +104,10 @@ export class ExtraMessageComponent implements AfterContentInit, OnDestroy {
return this.icon ?? SEVERITY_ICONS[this.severity];
}

get sizeClass(): string {
return this.size === 'base' ? '' : `p-message-size-${this.size}`;
}

get primeSeverity(): PrimeMessageSeverity {
if (this.severity === 'warning') return 'warn';
if (this.severity === 'danger') return 'error';
Expand Down
21 changes: 19 additions & 2 deletions src/lib/providers/prime-preset/tokens/components/message.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,30 @@
* Подключается в map-tokens.ts: `import { messageCss } from './tokens/components/message'`
*/
export const messageCss = ({ dt }: { dt: (token: string) => string }): string => `
/* Основной контейнер message */
/* Основной контейнер message: ширина по размеру (base по умолчанию) */
.p-message {
width: ${dt('message.extend.width')};
width: ${dt('message.extend.overlayWidth.base')};
overflow: hidden;
position: relative;
}

.p-message.p-message-size-small {
width: ${dt('message.extend.overlayWidth.small')};
}

.p-message.p-message-size-large {
width: ${dt('message.extend.overlayWidth.large')};
}

.p-message.p-message-size-xlarge {
width: ${dt('message.extend.overlayWidth.xlarge')};
}

/* fill — сообщение занимает всю ширину контейнера */
.p-message.p-message-size-fill {
width: 100%;
}

/* Контент message с приоритизацией align-items */
.p-message .p-message-content {
display: flex;
Expand Down
7 changes: 7 additions & 0 deletions src/lib/providers/prime-preset/tokens/tokens.json
Original file line number Diff line number Diff line change
Expand Up @@ -1054,6 +1054,7 @@
"1800": "{sizing.152x}",
"1900": "{sizing.168x}",
"2000": "{sizing.200x}",
"2200": "{sizing.315x}",
"max": "{sizing.max}"
},
"borderRadius": {
Expand Down Expand Up @@ -3677,6 +3678,12 @@
"message": {
"extend": {
"width": "{dimension.size.2000}",
"overlayWidth": {
"small": "{dimension.size.1700}",
"base": "{dimension.size.1900}",
"large": "{dimension.size.2000}",
"xlarge": "{dimension.size.2200}"
},
"extText": {
"gap": "{dimension.space.100}"
},
Expand Down
14 changes: 13 additions & 1 deletion src/stories/components/message/message.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,16 @@ import { ExtraMessageComponent } from '@cdek-it/angular-ui-kit';
type: { summary: 'boolean' }
}
},
size: {
control: 'select',
options: ['small', 'base', 'large', 'xlarge', 'fill'],
description: 'Ширина сообщения; fill растягивает на всю ширину контейнера',
table: {
category: 'Свойства',
defaultValue: { summary: "'base'" },
type: { summary: "'small' | 'base' | 'large' | 'xlarge' | 'fill'" }
}
},
// ── События ─────────────────────────────────────────────────
onClose: {
control: false,
Expand All @@ -113,7 +123,8 @@ import { ExtraMessageComponent } from '@cdek-it/angular-ui-kit';
message: 'Message',
caption: 'caption',
icon: undefined,
showClose: false
showClose: false,
size: 'base'
}
};

Expand All @@ -132,6 +143,7 @@ export const Default: Story = {
if (args.icon) parts.push(`icon="${args.icon}"`);
if (args.showClose) parts.push(`[showClose]="true"`);
if (args.timer) parts.push(`[timer]="true"`);
if (args.size && args.size !== 'base') parts.push(`size="${args.size}"`);

const template = parts.length
? `<extra-message\n ${parts.join('\n ')}\n (onClose)="onClose()"\n></extra-message>`
Expand Down
Loading