Skip to content

Commit 3307119

Browse files
authored
Fix query builder expression actions (#14883)
1 parent 0787040 commit 3307119

File tree

2 files changed

+27
-34
lines changed

2 files changed

+27
-34
lines changed

projects/igniteui-angular/src/lib/core/styles/components/query-builder/_query-builder-theme.scss

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225
.igx-filter-tree__expression-column {
226226
padding-inline: pad-inline(rem(3px), rem(6px), rem(8px));
227227
}
228-
228+
229229
igx-prefix {
230230
display: flex;
231231
}
@@ -239,20 +239,10 @@
239239
%filter-tree__expression-actions {
240240
display: inline-flex;
241241
margin: 0 rem(8px);
242+
gap: rem(8px);
242243

243-
igx-icon {
244-
cursor: pointer;
245-
color: color(null, 'gray', 500);
246-
outline-style: none;
247-
248-
&:hover,
249-
&:focus {
250-
color: color(null, 'gray', 800);
251-
}
252-
}
253-
254-
igx-icon + igx-icon {
255-
margin-inline-start: rem(8px);
244+
%igx-icon-button-display {
245+
--size: #{sizable(rem(20px), rem(24px), rem(32px))};
256246
}
257247
}
258248

projects/igniteui-angular/src/lib/query-builder/query-builder.component.html

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -147,29 +147,32 @@ <h6 class="igx-filter-empty__title">
147147
expressionItem.hovered
148148
"
149149
>
150-
<span tabindex="0"
150+
<button
151+
igxIconButton="flat"
152+
aria-labelledby="edit-expression"
153+
[style.--component-size]="getComponentSizeStyles()"
151154
(keydown)="invokeClick($event)"
152155
(click)="enterExpressionEdit(expressionItem)">
153-
<igx-icon>
154-
edit
155-
</igx-icon>
156-
</span>
157-
<span tabindex="0"
156+
<igx-icon id="edit-expression">edit</igx-icon>
157+
</button>
158+
159+
<button
160+
igxIconButton="flat"
161+
aria-labelledby="add-expression"
162+
[style.--component-size]="getComponentSizeStyles()"
158163
(keydown)="invokeClick($event)"
159-
(click)="enterExpressionAdd(expressionItem)">
160-
<igx-icon
161-
*ngIf="
162-
!expressionItem.inAddMode &&
163-
(expressionItem.parent !== currentGroup ||
164-
expressionItem !==
165-
currentGroup.children[
166-
currentGroup.children.length - 1
167-
])
168-
"
169-
>
170-
add
171-
</igx-icon>
172-
</span>
164+
(click)="enterExpressionAdd(expressionItem)"
165+
*ngIf="
166+
!expressionItem.inAddMode &&
167+
(expressionItem.parent !== currentGroup ||
168+
expressionItem !==
169+
currentGroup.children[
170+
currentGroup.children.length - 1
171+
])
172+
"
173+
>
174+
<igx-icon id="add-expression">add</igx-icon>
175+
</button>
173176
</div>
174177
</div>
175178

0 commit comments

Comments
 (0)