Skip to content

Commit f93c5c6

Browse files
authored
Fix query builder expression actions (#14885)
1 parent 71f7d84 commit f93c5c6

File tree

2 files changed

+28
-39
lines changed

2 files changed

+28
-39
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
@@ -257,20 +257,10 @@
257257
%filter-tree__expression-actions {
258258
display: inline-flex;
259259
margin: 0 rem(8px);
260+
gap: rem(8px);
260261

261-
igx-icon {
262-
cursor: pointer;
263-
color: color(null, 'gray', 500);
264-
outline-style: none;
265-
266-
&:hover,
267-
&:focus {
268-
color: color(null, 'gray', 800);
269-
}
270-
}
271-
272-
igx-icon + igx-icon {
273-
margin-inline-start: rem(8px);
262+
%igx-icon-button-display {
263+
--size: #{sizable(rem(20px), rem(24px), if($variant != 'indigo', rem(32px), rem(28px)))};
274264
}
275265
}
276266

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

Lines changed: 25 additions & 26 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">
151-
<igx-icon
152-
family="default"
153-
name="edit"
154-
(keydown)="invokeClick($event)"
155-
(click)="enterExpressionEdit(expressionItem)"
156-
>
157-
</igx-icon>
158-
</span>
159-
<span tabindex="0">
160-
<igx-icon
161-
family="default"
162-
name="add"
163-
(keydown)="invokeClick($event)"
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>
175-
</span>
150+
<button
151+
igxIconButton="flat"
152+
aria-labelledby="edit-expression"
153+
(keydown)="invokeClick($event)"
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"
162+
(keydown)="invokeClick($event)"
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)