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

Merge Multi column sorting into current Materal #2

Merged
merged 9 commits into from
Feb 8, 2019

Conversation

FirstVertex
Copy link
Owner

No description provided.

Marcin added 9 commits October 10, 2018 17:13
Extended the Sort interface for active to allow string array and SortDirection to allow dictionary object. Adding matMultiColumn property to MatSort that will allow multi column sorting. Updating MatTableDataSource to handle multi column sorting. Adding a counter for sort-header that shows sorting precedence.

Because of extended interface of MatSort, properties active and direction now need to be cast to string for existing usages. Fixes angular#7226.
…ti-column-sorting

# Conflicts:
#	src/demo-app/table/custom-table/custom-table.html
#	src/demo-app/table/custom-table/custom-table.ts
#	src/demo-app/table/data-input-table/data-input-table.ts
#	src/demo-app/table/element-data.ts
Creating separate directive for MatMultiSort. Moving common code to MatSortBase. Creating SortHeaderStrategy to keep the logic for simple and multi column sort consolidated.
Making setting getSortCounter optional.
…ti-column-sorting

# Conflicts:
#	src/lib/sort/sort-header.ts
@FirstVertex FirstVertex merged commit 531d2fc into FirstVertex:master Feb 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant