Skip to content

починить ступень xlg у select-button #148

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.

Sign up for GitHub

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

Merged
AxyIX merged 2 commits into from
Sep 8, 2026
Merged

починить ступень xlg у select-button #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b71d1f1
починить ступень xlg у select-button: класс на корне вместо styleClass
Sep 7, 2026
d0eaf1e
задать паддинги ступени xlg у select-button
Sep 7, 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
14 changes: 6 additions & 8 deletions src/lib/components/select-button/select-button.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Component, EventEmitter, Input, Optional, Output, Self } from '@angular/core';
import { NgClass } from '@angular/common';
import { ControlValueAccessor, FormsModule, NgControl } from '@angular/forms';
import { SelectButton, SelectButtonChangeEvent } from 'primeng/selectbutton';
import { SharedModule } from 'primeng/api';
Expand All @@ -21,8 +20,11 @@ export type ExtraSelectButtonSize = 'sm' | 'base' | 'lg' | 'xlg';
@Component({
selector: 'extra-select-button',
standalone: true,
imports: [SelectButton, SharedModule, FormsModule, NgClass],
imports: [SelectButton, SharedModule, FormsModule],
template: `
<!-- Ступень xlg навешивается классом на корень: styleClass в PrimeNG 20 на корне
p-selectbutton не остаётся, а раздаётся вниз каждому p-togglebutton, и стили
ступени (.p-selectbutton-xlarge .p-togglebutton) не находят свой корень. -->
<p-selectbutton
[options]="options"
[ngModel]="value"
Expand All @@ -35,7 +37,7 @@ export type ExtraSelectButtonSize = 'sm' | 'base' | 'lg' | 'xlg';
[allowEmpty]="allowEmpty"
[disabled]="isDisabled"
[size]="primeSize"
[styleClass]="primeStyleClass"
[class.p-selectbutton-xlarge]="size === 'xlg'"
>
<ng-template pTemplate="item" let-item>
@if ($any(item)['icon']) {
Expand All @@ -44,7 +46,7 @@ export type ExtraSelectButtonSize = 'sm' | 'base' | 'lg' | 'xlg';
<span>{{ $any(item)[optionLabel] }}</span>
</ng-template>
</p-selectbutton>
`,
`
})
export class ExtraSelectButtonComponent implements ControlValueAccessor {
@Input() options: ExtraSelectButtonOption[] | any[] = [];
Expand Down Expand Up @@ -77,10 +79,6 @@ export class ExtraSelectButtonComponent implements ControlValueAccessor {
return undefined;
}

get primeStyleClass(): string {
return this.size === 'xlg' ? 'p-selectbutton-xlarge' : '';
}

writeValue(value: any): void {
this.value = value ?? null;
}
Expand Down
5 changes: 4 additions & 1 deletion src/lib/providers/prime-preset/tokens/components/selectbutton.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,11 @@ export const selectbuttonCss = ({ dt }: { dt: (token: string) => string }): stri
font-size: ${dt('selectbutton.extend.iconSize.lg')};
}

/* Size: xlarge */
/* Size: xlarge — PrimeNG не вешает на дочерний p-togglebutton класс размера (у него нет
ступени xlg), поэтому паддинги остаются базовыми: задаём их сами, как у отдельного
togglebutton в этой же ступени. */
.p-selectbutton.p-selectbutton-xlarge.p-component .p-togglebutton.p-component {
padding: ${dt('togglebutton.extend.extXlg.padding')};
font-size: ${dt('fonts.fontSize.600')};
line-height: ${dt('fonts.lineHeight.550')};
height: ${dt('togglebutton.extend.extXlg.iconOnlyWidth')};
Expand Down
Loading