Skip to content

Commit

Permalink
Merge branch 'master' into fix/issue-2334
Browse files Browse the repository at this point in the history
  • Loading branch information
pavankjadda committed May 23, 2024
2 parents 6588921 + c02a6c4 commit e40f874
Show file tree
Hide file tree
Showing 9 changed files with 3,100 additions and 2,427 deletions.
2 changes: 0 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
"createDefaultProgram": true
},
"extends": [
"plugin:@angular-eslint/ng-cli-compat",
"plugin:@angular-eslint/ng-cli-compat--formatting-add-on",
"plugin:@angular-eslint/recommended",
"plugin:@angular-eslint/template/process-inline-templates"
],
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ See [Demo](https://ng-select.github.io/ng-select) page.

| Angular | ng-select |
|------------------|:---------:|
| >=18.0.0 <19.0.0 | v13.x |
| >=17.0.0 <18.0.0 | v12.x |
| >=16.0.0 <17.0.0 | v11.x |
| >=15.0.0 <16.0.0 | v10.x |
Expand Down Expand Up @@ -354,3 +355,4 @@ To release to npm just run `./release.sh`, of course if you have permissions ;)

## Inspiration
This component is inspired by [React select](https://github.com/JedWatson/react-select) and [Virtual scroll](https://github.com/rintoj/angular2-virtual-scroll). Check theirs amazing work and components :)

80 changes: 40 additions & 40 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,58 +35,58 @@
]
},
"dependencies": {
"@angular/animations": "^17.0.0",
"@angular/common": "^17.0.0",
"@angular/compiler": "^17.0.0",
"@angular/core": "^17.0.0",
"@angular/forms": "^17.0.0",
"@angular/localize": "^17.0.0",
"@angular/platform-browser": "^17.0.0",
"@angular/platform-browser-dynamic": "^17.0.0",
"@angular/router": "^17.0.0",
"@angular/ssr": "^17.0.0",
"@ng-bootstrap/ng-bootstrap": "^15.1.1",
"@angular/animations": "^18.0.0",
"@angular/common": "^18.0.0",
"@angular/compiler": "^18.0.0",
"@angular/core": "^18.0.0",
"@angular/forms": "^18.0.0",
"@angular/localize": "^18.0.0",
"@angular/platform-browser": "^18.0.0",
"@angular/platform-browser-dynamic": "^18.0.0",
"@angular/router": "^18.0.0",
"@angular/ssr": "^18.0.1",
"@ng-bootstrap/ng-bootstrap": "^16.0.0",
"@popperjs/core": "^2.11.8",
"bootstrap": "^5.3.2",
"bootstrap": "^5.3.3",
"rxjs": "^7.8.1",
"tslib": "^2.6.2",
"zone.js": "~0.14.2"
},
"devDependencies": {
"@angular-devkit/build-angular": "^17.0.0",
"@angular-eslint/builder": "14.1.2",
"@angular-eslint/eslint-plugin": "14.1.2",
"@angular-eslint/eslint-plugin-template": "14.1.2",
"@angular-eslint/schematics": "^14.1.2",
"@angular-eslint/template-parser": "14.1.2",
"@angular/cli": "^17.0.0",
"@angular/compiler-cli": "^17.0.0",
"@angular/language-service": "^17.0.0",
"@angular-devkit/build-angular": "^18.0.1",
"@angular-eslint/builder": "17.5.0",
"@angular-eslint/eslint-plugin": "17.5.0",
"@angular-eslint/eslint-plugin-template": "17.5.0",
"@angular-eslint/schematics": "17.5.0",
"@angular-eslint/template-parser": "17.5.0",
"@angular/cli": "^18.0.1",
"@angular/compiler-cli": "^18.0.0",
"@angular/language-service": "^18.0.0",
"@semantic-release/changelog": "^6.0.1",
"@stackblitz/sdk": "^1.6.0",
"@types/jasmine": "~4.0.3",
"@types/jasminewd2": "^2.0.10",
"@types/node": "^20.1.7",
"@typescript-eslint/eslint-plugin": "6.8.0",
"@typescript-eslint/parser": "6.8.0",
"@types/jasmine": "~5.1.4",
"@types/jasminewd2": "^2.0.13",
"@types/node": "^20.12.12",
"@typescript-eslint/eslint-plugin": "7.10.0",
"@typescript-eslint/parser": "7.10.0",
"coveralls": "^3.1.1",
"eslint": "8.52.0",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-jsdoc": "46.8.2",
"eslint-plugin-prefer-arrow": "^1.2.2",
"eslint": "^8.57.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-jsdoc": "48.2.5",
"eslint-plugin-prefer-arrow": "^1.2.3",
"gh-pages-travis": "^1.0.4",
"jasmine-core": "~4.1.1",
"jasmine-core": "~5.1.2",
"jasmine-spec-reporter": "~7.0.0",
"karma": "~6.3.20",
"karma-chrome-launcher": "~3.1.1",
"karma-coverage": "^2.2.0",
"karma-jasmine": "~5.0.1",
"karma-jasmine-html-reporter": "^2.0.0",
"ng-packagr": "^17.0.0-next.2",
"node-sass": "^7.0.1",
"karma": "~6.4.3",
"karma-chrome-launcher": "~3.2.0",
"karma-coverage": "^2.2.1",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "^2.1.0",
"ng-packagr": "^18.0.0",
"semantic-release": "^19.0.2",
"standard-version": "^9.5.0",
"ts-node": "~10.8.0",
"typescript": "~5.2.2"
"node-sass": "^9.0.0",
"ts-node": "~10.9.2",
"typescript": "~5.4.5"
}
}
2 changes: 1 addition & 1 deletion src/demo/styles.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* You can add global styles to this file, and also import other style files */
@import "bootstrap/scss/bootstrap";
@import 'bootstrap/scss/bootstrap';
@import "style/sidebar";
@import "style/content";

Expand Down
6 changes: 3 additions & 3 deletions src/ng-option-highlight/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "@ng-select/ng-option-highlight",
"version": "11.0.0",
"version": "13.0.0",
"author": "@ng-select/ng-select",
"license": "MIT",
"repository": "ng-select/ng-select",
"peerDependencies": {
"@angular/common": "^17.0.0-rc.0",
"@angular/core": "^17.0.0-rc.0"
"@angular/common": "^18.0.0",
"@angular/core": "^18.0.0"
}
}
2 changes: 1 addition & 1 deletion src/ng-select/lib/ng-dropdown-panel.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ export class NgDropdownPanelComponent implements OnInit, OnChanges, OnDestroy {
this._zone.runOutsideAngular(() => {
merge(
fromEvent(this._document, 'touchstart', { capture: true }),
fromEvent(this._document, 'mousedown', { capture: true })
fromEvent(this._document, 'click', { capture: true })
).pipe(takeUntil(this._destroy$))
.subscribe($event => this._checkToClose($event));
});
Expand Down
10 changes: 5 additions & 5 deletions src/ng-select/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "@ng-select/ng-select",
"version": "11.0.0",
"version": "13.0.0",
"description": "Angular ng-select - All in One UI Select, Multiselect and Autocomplete",
"author": "@ng-select/ng-select",
"license": "MIT",
"repository": "ng-select/ng-select",
"engines": {
"node": ">= 16",
"node": ">= 18",
"npm": ">= 8"
},
"keywords": [
Expand Down Expand Up @@ -39,9 +39,9 @@
}
},
"peerDependencies": {
"@angular/common": "^17.0.0-rc.0",
"@angular/core": "^17.0.0-rc.0",
"@angular/forms": "^17.0.0-rc.0"
"@angular/common": "^18.0.0",
"@angular/core": "^18.0.0",
"@angular/forms": "^18.0.0"
},
"dependencies": {
"tslib": "^2.3.1"
Expand Down
2 changes: 1 addition & 1 deletion src/ng-select/public-api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
export { NgSelectComponent, SELECTION_MODEL_FACTORY } from './lib/ng-select.component';
export { NgSelectModule } from './lib/ng-select.module';
export { NgOption, DropdownPosition } from './lib/ng-select.types';
export { SelectionModel } from './lib/selection-model';
export { DefaultSelectionModelFactory, DefaultSelectionModel, SelectionModel } from './lib/selection-model';
export { NgSelectConfig } from './lib/config.service';
export { NgOptionComponent } from './lib/ng-option.component';
export {
Expand Down

0 comments on commit e40f874

Please sign in to comment.