Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
114 changes: 49 additions & 65 deletions package-lock.json

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* stylelint-disable max-nesting-depth */
@use 'sass:map';
@use 'sass:math';
@use '../../base' as *;
Expand Down Expand Up @@ -1253,9 +1254,9 @@
flex-grow: 0;
outline-style: none;

igx-icon {
--component-size: #{if($variant == 'indigo', 2, 3)};
}
// igx-icon {
// --component-size: #{if($variant == 'indigo', 2, 3)};
// }
}

%grid-cell--active {
Expand Down Expand Up @@ -1404,9 +1405,9 @@
}

%igx-grid__td--editing {
background: var-get($theme, 'cell-editing-background') !important;
box-shadow: inset 0 0 0 $editing-outline-width var-get($theme, 'edit-mode-color');
padding-inline: rem(4px);
// background: var-get($theme, 'cell-editing-background') !important;
// box-shadow: inset 0 0 0 $editing-outline-width var-get($theme, 'edit-mode-color');
// padding-inline: rem(4px);

&.igx-grid__td--invalid {
box-shadow: inset 0 0 0 rem(2px) color($color: 'error') !important;
Expand All @@ -1416,7 +1417,7 @@
justify-content: flex-start !important;
}

@extend %cell-input-overrides;
// @extend %cell-input-overrides;
}

%grid-cell--pinned {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,158 +2,158 @@

/// @access private
@mixin header-row {
@include b(igx-grid-thead) {
@extend %grid-thead-container !optional;

@include e(wrapper) {
@extend %grid-thead !optional;

igx-display-container {
@extend %grid-display-container-thead !optional;
}

&:focus {
@extend %disable-focus-styles !optional;
}
}

@include e(wrapper, $m: 'pivot') {
@extend %igx-grid-thead__wrapper--pivot !optional;
}

@include e(title) {
@extend %grid-cell-display !optional;
@extend %grid-cell-header !optional;
@extend %grid-thead-title !optional;
}

@include e(title, $m: pinned-last) {
@extend %grid-thead-title--pinned !optional;
}

@include e(group) {
@extend %grid-thead-group !optional;
}

@include e(subgroup) {
@extend %grid-thead-subgroup !optional;
}

@include e(item) {
@extend %grid-thead-item !optional;
}

@include e(thumb) {
@extend %grid-thead-thumb !optional;
}

@include m(pivot) {
@extend %grid-thead--pivot !optional;
}

@include m(virtualizationWrapper) {
@extend %grid-thead--virtualizationWrapper !optional;
}

@include m(virtualizationContainer) {
@extend %grid-thead--virtualizationContainer !optional;
}
}

@include b(igx-grid-th) {
@extend %grid-cell-display !optional;
@extend %grid-cell-header !optional;

@include e(expander) {
@extend %igx-grid-th__expander !optional
}

@include e(group-title) {
@extend %igx-grid-th__group-title !optional
}

@include e(title) {
@extend %grid-cell-header-title !optional;
}

@include e(icons) {
@extend %grid-cell-header-icons !optional;
}

@include e(resize-handle) {
@extend %grid__resize-handle !optional;
}

@include e(resize-line) {
@extend %grid__resize-line !optional;
}

@include m(collapsible) {
@extend %igx-grid-th--collapsible !optional;
}

@include m(sortable) {
@extend %igx-grid-th--sortable !optional;
}

@include m(selectable) {
@extend %igx-grid-th--selectable !optional;
}

@include m(filtrable) {
@extend %igx-grid-th--filtrable !optional;
}

@include mx(filtrable, sortable) {
@extend %igx-grid-th--filtrable-sortable !optional;
}

@include m(sorted) {
@extend %igx-grid-th--sorted !optional;
}

@include m(selected) {
@extend %igx-grid-th--selected !optional;
}

@include m(active) {
@extend %igx-grid-th--active !optional;
}

@include m(number) {
@extend %grid-cell-number !optional;
}

@include m(pinned) {
@extend %grid-cell--pinned !optional;
}

@include m(pinned-last) {
@extend %grid-cell--pinned-last !optional;
}

@include m(pinned-first) {
@extend %grid-cell--pinned-first !optional;
}

@include m(fw) {
@extend %grid-cell--fixed-width !optional;
}

@include m(filtering) {
@extend %grid-cell-header--filtering !optional;
}

@include e(drop-indicator-left) {
@extend %igx-grid-th__drop-indicator-left !optional;
}

@include e(drop-indicator-right) {
@extend %igx-grid-th__drop-indicator-right !optional;
}

@include e(drop-indicator, $m: active) {
@extend %igx-grid-th__drop-indicator--active !optional;
}
}
// @include b(igx-grid-thead) {
// @extend %grid-thead-container !optional;
//
// @include e(wrapper) {
// @extend %grid-thead !optional;
//
// igx-display-container {
// @extend %grid-display-container-thead !optional;
// }
//
// &:focus {
// @extend %disable-focus-styles !optional;
// }
// }
//
// @include e(wrapper, $m: 'pivot') {
// @extend %igx-grid-thead__wrapper--pivot !optional;
// }
//
// @include e(title) {
// @extend %grid-cell-display !optional;
// @extend %grid-cell-header !optional;
// @extend %grid-thead-title !optional;
// }
//
// @include e(title, $m: pinned-last) {
// @extend %grid-thead-title--pinned !optional;
// }
//
// @include e(group) {
// @extend %grid-thead-group !optional;
// }
//
// @include e(subgroup) {
// @extend %grid-thead-subgroup !optional;
// }
//
// @include e(item) {
// @extend %grid-thead-item !optional;
// }
//
// @include e(thumb) {
// @extend %grid-thead-thumb !optional;
// }
//
// @include m(pivot) {
// @extend %grid-thead--pivot !optional;
// }
//
// @include m(virtualizationWrapper) {
// @extend %grid-thead--virtualizationWrapper !optional;
// }
//
// @include m(virtualizationContainer) {
// @extend %grid-thead--virtualizationContainer !optional;
// }
// }

// @include b(igx-grid-th) {
// @extend %grid-cell-display !optional;
// @extend %grid-cell-header !optional;
//
// @include e(expander) {
// @extend %igx-grid-th__expander !optional
// }
//
// @include e(group-title) {
// @extend %igx-grid-th__group-title !optional
// }
//
// @include e(title) {
// @extend %grid-cell-header-title !optional;
// }
//
// @include e(icons) {
// @extend %grid-cell-header-icons !optional;
// }
//
// @include e(resize-handle) {
// @extend %grid__resize-handle !optional;
// }
//
// @include e(resize-line) {
// @extend %grid__resize-line !optional;
// }
//
// @include m(collapsible) {
// @extend %igx-grid-th--collapsible !optional;
// }
//
// @include m(sortable) {
// @extend %igx-grid-th--sortable !optional;
// }
//
// @include m(selectable) {
// @extend %igx-grid-th--selectable !optional;
// }
//
// @include m(filtrable) {
// @extend %igx-grid-th--filtrable !optional;
// }
//
// @include mx(filtrable, sortable) {
// @extend %igx-grid-th--filtrable-sortable !optional;
// }
//
// @include m(sorted) {
// @extend %igx-grid-th--sorted !optional;
// }
//
// @include m(selected) {
// @extend %igx-grid-th--selected !optional;
// }
//
// @include m(active) {
// @extend %igx-grid-th--active !optional;
// }
//
// @include m(number) {
// @extend %grid-cell-number !optional;
// }
//
// @include m(pinned) {
// @extend %grid-cell--pinned !optional;
// }
//
// @include m(pinned-last) {
// @extend %grid-cell--pinned-last !optional;
// }
//
// @include m(pinned-first) {
// @extend %grid-cell--pinned-first !optional;
// }
//
// @include m(fw) {
// @extend %grid-cell--fixed-width !optional;
// }
//
// @include m(filtering) {
// @extend %grid-cell-header--filtering !optional;
// }
//
// @include e(drop-indicator-left) {
// @extend %igx-grid-th__drop-indicator-left !optional;
// }
//
// @include e(drop-indicator-right) {
// @extend %igx-grid-th__drop-indicator-right !optional;
// }
//
// @include e(drop-indicator, $m: active) {
// @extend %igx-grid-th__drop-indicator--active !optional;
// }
// }
}
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,14 @@ export class IgxGridFilteringCellComponent implements AfterViewInit, OnInit, DoC
@ViewChild('complexChip', { read: IgxChipComponent })
protected complexChip: IgxChipComponent;

@HostBinding('class.igx-grid__filtering-cell')
protected defaultClass = 'igx-grid__filtering-cell';

@HostBinding('class.igx-grid__filtering-cell--selected')
protected get selectedClass() {
return this.column && this.column.selected;
}

@HostBinding('class')
public get styleClasses(): string {
return this.column && this.column.selected ?
'igx-grid__filtering-cell--selected' :
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@use '../themes/base';
@use '../themes/shared';
@use '../themes/light';
@use '../themes/dark';
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import {
Component, ChangeDetectionStrategy, Input, Output, EventEmitter, ContentChild, ViewChildren,
QueryList, ViewChild, TemplateRef, DoCheck, AfterContentInit, HostBinding,
OnInit, AfterViewInit, ContentChildren, CUSTOM_ELEMENTS_SCHEMA, booleanAttribute
OnInit, AfterViewInit, ContentChildren, CUSTOM_ELEMENTS_SCHEMA, booleanAttribute,
ViewEncapsulation
} from '@angular/core';
import { NgTemplateOutlet, NgClass, NgStyle } from '@angular/common';

Expand Down Expand Up @@ -116,6 +117,8 @@ export interface IGroupingDoneEventArgs extends IBaseEventArgs {
],
selector: 'igx-grid',
templateUrl: './grid.component.html',
styleUrls: ['./grid.component.css'],
encapsulation: ViewEncapsulation.None,
imports: [
NgClass,
NgStyle,
Expand Down
Loading