Skip to content

Commit

Permalink
Merge master down
Browse files Browse the repository at this point in the history
  • Loading branch information
tonyholt committed Apr 29, 2019
2 parents 6ec0468 + 09aa915 commit cd4a41f
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 9 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## 1.7.2
* Enhancement: Allow setting type of the search input field with `@Input() type`
[#138](https://github.com/bithost-gmbh/ngx-mat-select-search/issues/138)

Thanks to @botoxparty

* Enhancement: Tested and update peer dependency compatibility to allow
`@angular/core`: `^8.0.0`, `@angular/material`: `^8.0.0`

## 1.7.1
* Enhancement: allow disabling scrolling active element into view when option list changes
with `@Input() disableScrollToActiveOnOptionsChanged` [#130](https://github.com/bithost-gmbh/ngx-mat-select-search/issues/130)
Expand Down
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,8 @@ In order to change the labels, use the inputs specified in the [API](#api) secti

### Compatibility

* `@angular/core`: `^5.0.0 || ^6.0.0 || ^7.0.0`,
* `@angular/cdk`: `^5.0.0 || ^6.0.0 || ^7.0.0`,
* `@angular/material`: `^5.0.0 || ^6.0.0 || ^7.0.0`,
* `@angular/core`: `^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0`,
* `@angular/material`: `^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0`,
* `rxjs`: `^5.5.2 || ^6.0.0`

### API
Expand All @@ -96,6 +95,9 @@ Furthermore, it provides the following inputs:
/** Label of the search placeholder */
@Input() placeholderLabel = 'Suche';

/** Type of the search input field */
@Input() type = "text";

/** Label to be shown when no entries are found. Set to null if no message should be shown. */
@Input() noEntriesFoundLabel = 'Keine Optionen gefunden';

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ngx-mat-select-search",
"description": "Angular component providing an input field for searching / filtering MatSelect options of the Angular Material library.",
"version": "1.7.1",
"version": "1.7.2",
"license": "MIT",
"scripts": {
"ng": "ng",
Expand Down Expand Up @@ -33,9 +33,8 @@
],
"homepage": "https://github.com/bithost-gmbh/ngx-mat-select-search",
"peerDependencies": {
"@angular/core": "^5.0.0 || ^6.0.0 || ^7.0.0",
"@angular/cdk": "^5.0.0 || ^6.0.0 || ^7.0.0",
"@angular/material": "^5.0.0 || ^6.0.0 || ^7.0.0",
"@angular/core": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0",
"@angular/material": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0",
"rxjs": "^5.5.2 || ^6.0.0"
},
"devDependencies": {
Expand Down
1 change: 1 addition & 0 deletions src/app/mat-select-search/mat-select-search.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<input matInput
class="mat-select-search-input"
autocomplete="off"
[type]="type"
#searchSelectInput
(keydown)="_handleKeydown($event)"
(input)="onInputChange($event.target.value)"
Expand Down
3 changes: 3 additions & 0 deletions src/app/mat-select-search/mat-select-search.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,9 @@ export class MatSelectSearchComponent implements OnInit, OnDestroy, AfterViewIni

/** Label of the search placeholder */
@Input() placeholderLabel = 'Suche';

/** Type of the search input field */
@Input() type = "text";

/** Label to be shown when no entries are found. Set to null if no message should be shown. */
@Input() noEntriesFoundLabel = 'Keine Optionen gefunden';
Expand Down
2 changes: 1 addition & 1 deletion src/app/mat-select-search/ngx-mat-select-search.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {MatButtonModule, MatInputModule, MatIconModule, MatProgressSpinnerModule
import { CommonModule } from '@angular/common';
import { MatSelectSearchClearDirective } from './mat-select-search-clear.directive';

export const MatSelectSearchVersion = '1.7.1';
export const MatSelectSearchVersion = '1.7.2';


@NgModule({
Expand Down

0 comments on commit cd4a41f

Please sign in to comment.