Skip to content

Commit c42fb3f

Browse files
authored
Fix query builder expression actions (#14884)
1 parent d494717 commit c42fb3f

File tree

2 files changed

+26
-37
lines changed

2 files changed

+26
-37
lines changed

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

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -247,20 +247,10 @@
247247
%filter-tree__expression-actions {
248248
display: inline-flex;
249249
margin: 0 rem(8px);
250+
gap: rem(8px);
250251

251-
igx-icon {
252-
cursor: pointer;
253-
color: color(null, 'gray', 500);
254-
outline-style: none;
255-
256-
&:hover,
257-
&:focus {
258-
color: color(null, 'gray', 800);
259-
}
260-
}
261-
262-
igx-icon + igx-icon {
263-
margin-inline-start: rem(8px);
252+
%igx-icon-button-display {
253+
--size: #{sizable(rem(20px), rem(24px), rem(32px))};
264254
}
265255
}
266256

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

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -147,32 +147,31 @@ <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"
151153
(keydown)="invokeClick($event)"
152-
(click)="enterExpressionEdit(expressionItem)">
153-
<igx-icon
154-
family="default"
155-
name="edit"
156-
>
157-
</igx-icon>
158-
</span>
159-
<span tabindex="0"
154+
(click)="enterExpressionEdit(expressionItem)"
155+
>
156+
<igx-icon id="edit-expression">edit</igx-icon>
157+
</button>
158+
159+
<button
160+
igxIconButton="flat"
161+
aria-labelledby="add-expression"
160162
(keydown)="invokeClick($event)"
161-
(click)="enterExpressionAdd(expressionItem)">
162-
<igx-icon
163-
family="default"
164-
name="add"
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>
175-
</span>
163+
(click)="enterExpressionAdd(expressionItem)"
164+
*ngIf="
165+
!expressionItem.inAddMode &&
166+
(expressionItem.parent !== currentGroup ||
167+
expressionItem !==
168+
currentGroup.children[
169+
currentGroup.children.length - 1
170+
])
171+
"
172+
>
173+
<igx-icon id="add-expression">add</igx-icon>
174+
</button>
176175
</div>
177176
</div>
178177

0 commit comments

Comments
 (0)