Skip to content

Commit

Permalink
Merge pull request #57 from pkorchak/use-ngx-scrollbar
Browse files Browse the repository at this point in the history
feat: replace deprecated ngx-perfect-scrollbar with ngx-scrollbar
  • Loading branch information
pkorchak committed May 8, 2023
2 parents 0cce6f1 + f9c07a7 commit 984b077
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 32 deletions.
67 changes: 40 additions & 27 deletions package-lock.json

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

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"private": true,
"dependencies": {
"@angular/animations": "~10.2.5",
"@angular/cdk": "^10.2.7",
"@angular/common": "~10.2.5",
"@angular/compiler": "^10.2.5",
"@angular/core": "^10.2.5",
Expand All @@ -24,7 +25,7 @@
"module-alias": "^2.2.2",
"ng-mocks": "^10.5.4",
"ng-zorro-antd": "^10.2.2",
"ngx-perfect-scrollbar": "^9.0.0",
"ngx-scrollbar": "7.4",
"rxjs": "^6.5.5",
"tslib": "^2.0.0",
"zone.js": "^0.10.3"
Expand Down
4 changes: 2 additions & 2 deletions src/app/widgets/form-container/form-container.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ import { Component } from '@angular/core';
@Component({
selector: 'app-form-container',
template: `
<perfect-scrollbar>
<ng-scrollbar>
<div class="form-content">
<ng-content></ng-content>
</div>
</perfect-scrollbar>`,
</ng-scrollbar>`,
styleUrls: ['./form-container.component.less']
})
export class FormContainerComponent {
Expand Down
4 changes: 2 additions & 2 deletions src/app/widgets/form-container/form-container.module.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar';
import { NgScrollbarModule } from 'ngx-scrollbar';
import { FormContainerComponent } from './form-container.component';

@NgModule({
declarations: [FormContainerComponent],
imports: [
CommonModule,
PerfectScrollbarModule,
NgScrollbarModule,
],
exports: [FormContainerComponent]
})
Expand Down

0 comments on commit 984b077

Please sign in to comment.