Skip to content

refactor(query-builder): add entities to query builder styling sample #3531

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
Parent: Updating prod with fixes from vnext
merged 4 commits into from
Oct 10, 2024
Merged

refactor(query-builder): add entities to query builder styling sample #3531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e8f901
refactor(query-builder): add entities to query builder styling sample
teodosiah Sep 19, 2024
be217d1
fix(query-builder): apply inputs action buttons color correctly
teodosiah Sep 25, 2024
9c94f60
fix(query-builder): apply theme to styling sample
teodosiah Sep 25, 2024
9ac2be4
Merge branch 'vnext' of https://github.com/IgniteUI/igniteui-angular-…
teodosiah Oct 10, 2024
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
2 changes: 1 addition & 1 deletion src/app/interactions/query-builder/query-builder-style/query-builder-style.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<igx-query-builder #queryBuilder
[entities]="[{ name: '', fields: fields}]">
[entities]="entities">
</igx-query-builder>
139 changes: 64 additions & 75 deletions src/app/interactions/query-builder/query-builder-style/query-builder-style.component.scss
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems that ".igx-filter-tree__expression-actions igx-icon" selector is wrong and it's not effecting the button's icons.
Should be ".igx-filter-tree__expression". This way the buttons are rendered yellow and are now visible on the black background.
This issue is present on master as well.

Original file line number Diff line number Diff line change
Expand Up @@ -4,86 +4,75 @@ $yellow: #ffcd0f;
$black: #292826;
$muted-yellow: #ffe482;

$custom-query-builder: query-builder-theme(
$background: $black,
$header-background: $black,
$header-foreground: $yellow
);

$custom-button: button-theme(
$schema: $dark-material-schema,
$background: $black,
$foreground: $yellow,
$hover-foreground: $black,
$hover-background: $yellow,
$focus-foreground: $yellow,
$focus-background: $black,
$border-color: $yellow
);

$custom-contained-button: button-theme(
$schema: $dark-material-schema,
$background: $yellow,
$foreground: $black,
$active-background: $muted-yellow,
$active-foreground: $black,
$hover-background: $muted-yellow,
$hover-foreground: $black,
$border-color: $yellow,
$active-border-color: $muted-yellow,
$hover-border-color: $muted-yellow,
$focus-border-color: $yellow
);

$custom-button-group: button-group-theme(
$schema: $dark-material-schema,
$item-background: $black,
$item-text-color: $yellow,
$item-border-color: $yellow,
$item-selected-background: $yellow,
$item-hover-background: $yellow,
$item-selected-hover-background: $yellow
);

$custom-input-group: input-group-theme(
$schema: $dark-material-schema,
$idle-text-color: $yellow,
$focused-text-color: $yellow,
$filled-text-color: $yellow,
$idle-bottom-line-color: $muted-yellow,
$focused-secondary-color: $yellow
);

$custom-chip: chip-theme(
$schema: $dark-material-schema,
$background: $yellow,
$text-color: $black
);

$custom-drop-down: drop-down-theme(
$schema: $dark-material-schema,
$background-color: $black,
$item-text-color: $yellow,
$hover-item-background: $yellow,
$hover-item-text-color: $black,
$focused-item-background: $yellow,
$focused-item-text-color: $black,
$selected-item-background: $yellow,
$selected-item-text-color: $black,
$selected-focus-item-background: $yellow,
$selected-focus-item-text-color: $black,
$selected-hover-item-background: $yellow,
$selected-hover-item-text-color: $black
);
$custom-query-builder: query-builder-theme($background: $black,
$tree-background: $black,
$header-background: $black,
$header-foreground: $yellow);

$custom-button: button-theme($schema: $dark-material-schema,
$background: $black,
$foreground: $yellow,
$hover-foreground: $black,
$hover-background: $yellow,
$focus-foreground: $yellow,
$focus-background: $black,
$border-color: $yellow);

$custom-contained-button: button-theme($schema: $dark-material-schema,
$background: $yellow,
$foreground: $black,
$active-background: $muted-yellow,
$active-foreground: $black,
$hover-background: $muted-yellow,
$hover-foreground: $black,
$border-color: $yellow,
$active-border-color: $muted-yellow,
$hover-border-color: $muted-yellow,
$focus-border-color: $yellow);

$custom-button-group: button-group-theme($schema: $dark-material-schema,
$item-background: $black,
$item-text-color: $yellow,
$item-border-color: $yellow,
$item-selected-background: $yellow,
$item-hover-background: $yellow,
$item-selected-hover-background: $yellow);

$custom-input-group: input-group-theme($schema: $dark-material-schema,
$idle-text-color: $yellow,
$focused-text-color: $yellow,
$filled-text-color: $yellow,
$idle-bottom-line-color: $muted-yellow,
$focused-secondary-color: $yellow);

$custom-chip: chip-theme($schema: $dark-material-schema,
$background: $yellow,
$text-color: $black);

$custom-drop-down: drop-down-theme($schema: $dark-material-schema,
$background-color: $black,
$item-text-color: $yellow,
$hover-item-background: $yellow,
$hover-item-text-color: $black,
$focused-item-background: $yellow,
$focused-item-text-color: $black,
$selected-item-background: $yellow,
$selected-item-text-color: $black,
$selected-focus-item-background: $yellow,
$selected-focus-item-text-color: $black,
$selected-hover-item-background: $yellow,
$selected-hover-item-text-color: $black);


:host {
display: block;
margin: 16px;

::ng-deep {
@include css-vars($custom-drop-down);
@include theme($palette: $dark-material-palette );

@include css-vars($custom-query-builder);
@include css-vars($custom-drop-down);
@include css-vars($custom-button-group);
@include css-vars($custom-input-group);
@include css-vars($custom-chip);
Expand All @@ -102,15 +91,15 @@ $custom-drop-down: drop-down-theme(
color: $yellow
}

.igx-filter-tree__expression-actions igx-icon {
.igx-filter-tree__inputs-actions igx-icon {
color: $yellow
}

.igx-filter-tree__expression-actions igx-icon:hover {
.igx-filter-tree__inputs-actions igx-icon:hover {
color: $muted-yellow
}

.igx-filter-tree__expression-actions igx-icon:focus {
.igx-filter-tree__inputs-actions igx-icon:focus {
color: $muted-yellow
}

Expand Down
69 changes: 50 additions & 19 deletions src/app/interactions/query-builder/query-builder-style/query-builder-style.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,57 @@
import { Component } from '@angular/core';
import { Component, OnInit } from '@angular/core';

@Component({
selector: 'app-query-builder-style-sample',
styleUrls: ['./query-builder-style.component.scss'],
templateUrl: 'query-builder-style.component.html'
})
export class QueryBuilderStyleComponent {

public fields: any[] = [
{ field: 'ID', dataType: 'string' },
{ field: 'CompanyName', dataType: 'string' },
{ field: 'ContactName', dataType: 'string' },
{ field: 'Employees', dataType: 'number' },
{ field: 'ContactTitle', dataType: 'string' },
{ field: 'DateCreated', dataType: 'date' },
{ field: 'TimeCreated', dataType: 'time' },
{ field: 'Address', dataType: 'string' },
{ field: 'City', dataType: 'string' },
{ field: 'Region', dataType: 'string' },
{ field: 'PostalCode', dataType: 'string' },
{ field: 'Phone', dataType: 'string' },
{ field: 'Fax', dataType: 'string' },
{ field: 'Contract', dataType: 'boolean' }
];
export class QueryBuilderStyleComponent implements OnInit {
public entities: any[];
public companiesFields: any[];
public ordersFields: any[];

public ngOnInit(): void {
this.companiesFields = [
{ field: "ID", dataType: "string" },
{ field: "CompanyName", dataType: "string" },
{ field: "ContactName", dataType: "string" },
{ field: "Employees", dataType: "number" },
{ field: "ContactTitle", dataType: "string" },
{ field: "DateCreated", dataType: "date" },
{ field: "TimeCreated", dataType: "time" },
{ field: "Address", dataType: "string" },
{ field: "City", dataType: "string" },
{ field: "Region", dataType: "string" },
{ field: "PostalCode", dataType: "string" },
{ field: "Phone", dataType: "string" },
{ field: "Fax", dataType: "string" },
{ field: "Contract", dataType: "boolean" }
];

this.ordersFields = [
{ field: "OrderId", dataType: "number" },
{ field: "EmployeeId", dataType: "number" },
{ field: "OrderDate", dataType: "date" },
{ field: "RequiredDate", dataType: "date" },
{ field: "ShippedDate", dataType: "date" },
{ field: "ShipVia", dataType: "number" },
{ field: "Freight", dataType: "number" },
{ field: "ShipName", dataType: "string" },
{ field: "ShipCity", dataType: "string" },
{ field: "ShipPostalCode", dataType: "string" },
{ field: "ShipCountry", dataType: "string" },
{ field: "Region", dataType: "string" }
];

this.entities = [
{
name: "Companies",
fields: this.companiesFields
},
{
name: "Orders",
fields: this.ordersFields
}
];
}
}
Loading