Skip to content
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.

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

MultiColumnHeaders should not be grouped - 6.2.x #2970

Merged
merged 7 commits into from
Nov 14, 2018

Conversation

nrobakova
Copy link
Contributor

Closes #2944 .

Additional information related to this pull request:

@zdrawku
Copy link
Contributor

zdrawku commented Nov 9, 2018

@mpavlinov @MayaKirova same comment as #2968 (comment)

MayaKirova
MayaKirova previously approved these changes Nov 12, 2018
@hanastasov hanastasov added 💥 status: in-test PRs currently being tested ✅ status: verified Applies to PRs that have passed manual verification and removed ❌ status: awaiting-test PRs awaiting manual verification 💥 status: in-test PRs currently being tested labels Nov 12, 2018
ChronosSF
ChronosSF previously approved these changes Nov 13, 2018
@kdinev kdinev dismissed stale reviews from ChronosSF and MayaKirova via e9843df November 14, 2018 08:34
@kdinev kdinev merged commit 626156a into 6.2.x Nov 14, 2018
@kdinev kdinev deleted the nrobakova/fix-issue-2944-6.2.x branch November 14, 2018 12:28
kdinev added a commit that referenced this pull request Nov 19, 2018
* feat(grid, chip): add display density DI token to igxGrid and igxChip

* Resolving confilcts related to the new structure(grids ->grid)

* Fixing styling issue

* Adding event arguments for DenistyChanged

* Renaming IDisplayDenisty to IDisplayDenistyOptions and setting IDensityChangedEventArgs type to be DisplayDenisty

* Trigger onDensityChanged only for components that do not have displayDenisty explicitly set when the global denisty is changed

* Adding displayDenisty DI in tree grid constructor

* Group by chips are now affected from the global display denisty option

* fix(igxGrid): dirty check only checks if value exists, #2940

* fix(igx-grid): Open date-picker only if condition is not unary, #2937

* Summaries display denisty classes are now correctly applied

* Removing dsiplayDenisty property since it is not needed any more

* fix(igx-grid): Clear filter when value is cleared from input, #2945

* test(treeGrid): Update treeGrid Keyboard navigation tests #2953

* Improve keyboard navigation in filtering (#2964)

* fix(igx-grid): Improve keyboard navigation in filtering, #2951

* fix(igx-grid): Get scroll from first row, when there is one, #2951

* chore(igx-grid): Refactor code, #2951

* chore(igx-grid): Add cases for groupbyrow and pinned columns, #2951

* chore(igx-grid): Fix lint errors, #2951

* feat(igx-grid): Close filter row on Esc, #2979

* test(igx-grid): Add test, #2979

* chore(*): Merging master into 6.2.x

* Sorting strategy merge 6.2.x (#2998)

* feat(grid sorting): Merging the new sorting strategy into 6.2.x #2734

* chore(*): Adding missing imports to grid-selection tests

* chore(*): More test import fixes

* chore(*): Applying the groupby changes with the new sorting strategy

* chore(*): Resolving the column moving test issue

* chore(*): This should be it with the test fixes

* chore(*): Removing the fdescribe

* Add igxDropDown maxHeight input (#3005)

* feat(igxDropDown): introduce itemsMaxHeight property #3001

* test(igxDropDown): test for max height #3001

* docs(igxDropDown): changelog update #3001

* test(igxCombo): adjust tests according to new dropdown structure #3001

* test(igxDropDown): add more tests #3001

* fix(grid): MultiColumn headers should not be grouped #2944 (#2970)

* chore(*): Fixing the demos

* feat(themes): add theme schemas (#3006)

* refactor(themes): introduce presets as basis for component themes

* refactor(themes): create schemas for more comopnents

* refactor(themes): create schemas for more comopnents

* refactor(themes): introduce presets as basis for component themes

* refactor(themes): create schemas for more comopnents

* refactor(themes): create schemas for more comopnents

* refactor(themes): introduce presets as basis for component themes

* refactor(themes): create schemas for more comopnents

* refactor(themes): create schemas for more comopnents

* refactor(themes): introduce presets as basis for component themes

* refactor(themes): create schemas for more comopnents

* refactor(themes): add schemas for the remaining component themes

* refactor(themes): change presets to schemas

* fix(themes): value resolver always returns  string

* refactor(themes): remove all $default-theme references

* docs(themes): add docs for newly introduced functions

* refactor(demos): update demos theme

* build(themes): fix css theme not building

* refactor(themes): optimize palette generation

* refactor(combo) - navigation (#2999)

* refactor(combo): refactor combo navigation, WIP

* refactor(combo): refactor combo navigation

* refactor(combo): add comments, trim, remove console.log

* refactor(combo): add comments, trim, remove console.log

* chore(combo): adjust failing tests

* refactor(igxCombo): remove focusItem, use super.navigateItem instead

* refactor(igxCombo): add navigate virtual

* refactor(igxCombo): add focus add button + findFocusableIndex methods

* refactor(igxCombo): adjust incorrect `navigateItem` calls

* refactor(igxCombo): first header is not loaded and focus search - scroll, #2999

* The grid should update groupsRecords before raising the onGroupingDone event - 6.2.x,  #2967 (#3009)

* fix(groupBy): update the state before raising onGroupingDone event #2967

* fix(groupBy): calling detectChanges instead of ngDoCheck  #2967
kdinev added a commit that referenced this pull request Nov 20, 2018
* feat(grid, chip): add display density DI token to igxGrid and igxChip

* Resolving confilcts related to the new structure(grids ->grid)

* Fixing styling issue

* Adding event arguments for DenistyChanged

* Renaming IDisplayDenisty to IDisplayDenistyOptions and setting IDensityChangedEventArgs type to be DisplayDenisty

* Trigger onDensityChanged only for components that do not have displayDenisty explicitly set when the global denisty is changed

* Adding displayDenisty DI in tree grid constructor

* Group by chips are now affected from the global display denisty option

* fix(igxGrid): dirty check only checks if value exists, #2940

* fix(igx-grid): Open date-picker only if condition is not unary, #2937

* Summaries display denisty classes are now correctly applied

* Removing dsiplayDenisty property since it is not needed any more

* fix(igx-grid): Clear filter when value is cleared from input, #2945

* test(treeGrid): Update treeGrid Keyboard navigation tests #2953

* Improve keyboard navigation in filtering (#2964)

* fix(igx-grid): Improve keyboard navigation in filtering, #2951

* fix(igx-grid): Get scroll from first row, when there is one, #2951

* chore(igx-grid): Refactor code, #2951

* chore(igx-grid): Add cases for groupbyrow and pinned columns, #2951

* chore(igx-grid): Fix lint errors, #2951

* fix(grid): update method _updateVScrollOffset to calculate top #2957

* fix(grid): update lint #2957

* feat(igx-grid): Close filter row on Esc, #2979

* fix(grid): Recalculate start index on _applyChanges #2957

* fix(grid): Update lint #2957

* test(igx-grid): Add test, #2979

* fix(IgxTreeGrid): refocus row when expand/collapse tree row #2935

* fix(IgxGrid): shound not toggle expand on arrowLeft when row is expanded #2950

* chore(*): Merging master into 6.2.x

* Sorting strategy merge 6.2.x (#2998)

* feat(grid sorting): Merging the new sorting strategy into 6.2.x #2734

* chore(*): Adding missing imports to grid-selection tests

* chore(*): More test import fixes

* chore(*): Applying the groupby changes with the new sorting strategy

* chore(*): Resolving the column moving test issue

* chore(*): This should be it with the test fixes

* chore(*): Removing the fdescribe

* Add igxDropDown maxHeight input (#3005)

* feat(igxDropDown): introduce itemsMaxHeight property #3001

* test(igxDropDown): test for max height #3001

* docs(igxDropDown): changelog update #3001

* test(igxCombo): adjust tests according to new dropdown structure #3001

* test(igxDropDown): add more tests #3001

* fix(grid): MultiColumn headers should not be grouped #2944 (#2970)

* chore(*): Fixing the demos

* feat(themes): add theme schemas (#3006)

* refactor(themes): introduce presets as basis for component themes

* refactor(themes): create schemas for more comopnents

* refactor(themes): create schemas for more comopnents

* refactor(themes): introduce presets as basis for component themes

* refactor(themes): create schemas for more comopnents

* refactor(themes): create schemas for more comopnents

* refactor(themes): introduce presets as basis for component themes

* refactor(themes): create schemas for more comopnents

* refactor(themes): create schemas for more comopnents

* refactor(themes): introduce presets as basis for component themes

* refactor(themes): create schemas for more comopnents

* refactor(themes): add schemas for the remaining component themes

* refactor(themes): change presets to schemas

* fix(themes): value resolver always returns  string

* refactor(themes): remove all $default-theme references

* docs(themes): add docs for newly introduced functions

* refactor(demos): update demos theme

* build(themes): fix css theme not building

* refactor(themes): optimize palette generation

* refactor(combo) - navigation (#2999)

* refactor(combo): refactor combo navigation, WIP

* refactor(combo): refactor combo navigation

* refactor(combo): add comments, trim, remove console.log

* refactor(combo): add comments, trim, remove console.log

* chore(combo): adjust failing tests

* refactor(igxCombo): remove focusItem, use super.navigateItem instead

* refactor(igxCombo): add navigate virtual

* refactor(igxCombo): add focus add button + findFocusableIndex methods

* refactor(igxCombo): adjust incorrect `navigateItem` calls

* refactor(igxCombo): first header is not loaded and focus search - scroll, #2999

* The grid should update groupsRecords before raising the onGroupingDone event - 6.2.x,  #2967 (#3009)

* fix(groupBy): update the state before raising onGroupingDone event #2967

* fix(groupBy): calling detectChanges instead of ngDoCheck  #2967

* fix(grid): #2507 prevent scrolling on arrow keys (#2989)

* fix(grid): #2507 prevent scrolling on arrow keys

* fix(grid): #2507 prevent scrolling for default columns only

* Feat - Combo - Add DisplayDensity Input to Combo and Drop Down (#3007)

* feat(igxCombo): add display density to combo component, refactor template,#2410

* feat(igxCombo): add hidden to binding, add display: block, fix tests, #2410

* feat(igxCombo): move display styling in styles, remove hostbinding, #2410

* chore(*): Updating the PR template (#3036)

* chore(*): Updating the PR template

* chore(*): Addressing Stamen's comment

* fix(grid): removing checks which prevent scrolling #2971 (#3022)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
grid: general grid: groupby version: 6.2.x ✅ status: verified Applies to PRs that have passed manual verification
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants