Skip to content

Commit c1f9357

Browse files
edoparearyeeedoparearyee
committed
feat(scrollCollapse): update inviewport module to 4.0.0
fixes !13
1 parent 26cdf34 commit c1f9357

File tree

6 files changed

+87
-104
lines changed

6 files changed

+87
-104
lines changed

‎README.md

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,18 @@ This is a simple library for [Angular][angular], implemented in the [Angular Pac
1616
`app.module.ts`
1717

1818
```ts
19-
import { InViewportModule, WindowRef } from '@thisissoon/angular-inviewport';
19+
import { InViewportModule } from '@thisissoon/angular-inviewport';
2020
import { ScrollSpyModule } from '@thisissoon/angular-scrollspy';
2121

22-
// Provide window object for browser and a suitable replacement
23-
// on other platforms
24-
const getWindow = () => window;
25-
const providers: Provider[] = [{ provide: WindowRef, useFactory: getWindow }];
26-
2722
@NgModule({
28-
imports: [InViewportModule.forRoot(providers), ScrollSpyModule.forRoot()]
23+
imports: [InViewportModule, ScrollSpyModule.forRoot()],
2924
})
3025
export class AppModule {}
3126
```
3227

3328
## Example
3429

35-
A working example can be forund in the [src](https://github.com/thisissoon/angular-scrollspy/tree/master/src) folder.
30+
A working example can be found in the [src](https://github.com/thisissoon/angular-scrollspy/tree/master/src) folder.
3631

3732
`app.component.html`
3833

‎package.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -46,23 +46,23 @@
4646
},
4747
"peerDependencies": {
4848
"@angular/core": ">=5.0.0 <7.0.0 || >=5.0.0-beta <7.0.0",
49-
"@thisissoon/angular-inviewport": ">=3.0.0 <4.0.0"
49+
"@thisissoon/angular-inviewport": ">=4.0.0 <5.0.0"
5050
},
5151
"devDependencies": {
5252
"@angular-devkit/build-angular": "~0.6.5",
53-
"@angular/animations": "6.0.3",
53+
"@angular/animations": "^6.1.10",
5454
"@angular/cli": "^6.0.5",
55-
"@angular/common": "6.0.3",
56-
"@angular/compiler": "6.0.3",
57-
"@angular/compiler-cli": "6.0.3",
58-
"@angular/core": "6.0.3",
59-
"@angular/forms": "6.0.3",
60-
"@angular/http": "6.0.3",
61-
"@angular/language-service": "6.0.3",
62-
"@angular/platform-browser": "6.0.3",
63-
"@angular/platform-browser-dynamic": "6.0.3",
64-
"@angular/router": "6.0.3",
65-
"@thisissoon/angular-inviewport": "^3.0.0",
55+
"@angular/common": "^6.1.10",
56+
"@angular/compiler": "^6.1.10",
57+
"@angular/compiler-cli": "^6.1.10",
58+
"@angular/core": "^6.1.10",
59+
"@angular/forms": "^6.1.10",
60+
"@angular/http": "^6.1.10",
61+
"@angular/language-service": "^6.1.10",
62+
"@angular/platform-browser": "^6.1.10",
63+
"@angular/platform-browser-dynamic": "^6.1.10",
64+
"@angular/router": "^6.1.10",
65+
"@thisissoon/angular-inviewport": "^4.0.0",
6666
"@thisissoon/schematics": "^1.0.0-alpha.18",
6767
"@types/jasmine": "~2.5.53",
6868
"@types/jasminewd2": "~2.0.2",
@@ -80,25 +80,25 @@
8080
"karma-coverage-istanbul-reporter": "^1.2.1",
8181
"karma-jasmine": "~1.1.0",
8282
"karma-jasmine-html-reporter": "^0.2.2",
83+
"karma-mocha-reporter": "^2.2.5",
8384
"karma-spec-reporter": "0.0.31",
85+
"lint-staged": "^7.3.0",
8486
"ng-packagr": "^3.0.0",
8587
"prettier": "^1.14.3",
8688
"protractor": "~5.1.2",
8789
"rxjs": "^6.2.0",
8890
"standard-version": "^4.2.0",
8991
"stylelint": "^9.6.0",
92+
"stylelint-config-prettier": "^4.0.0",
9093
"stylelint-config-recommended-scss": "^3.2.0",
9194
"stylelint-config-standard": "^18.2.0",
9295
"stylelint-order": "^1.0.0",
9396
"stylelint-scss": "^3.3.1",
9497
"ts-node": "~3.2.0",
9598
"tslint": "~5.7.0",
96-
"typescript": "~2.7.2",
97-
"zone.js": "^0.8.26",
98-
"lint-staged": "^7.3.0",
99-
"stylelint-config-prettier": "^4.0.0",
10099
"tslint-config-prettier": "^1.15.0",
101-
"karma-mocha-reporter": "^2.2.5"
100+
"typescript": "~2.7.2",
101+
"zone.js": "^0.8.26"
102102
},
103103
"config": {
104104
"commitizen": {
@@ -133,4 +133,4 @@
133133
"git add"
134134
]
135135
}
136-
}
136+
}

‎src/app/app.module.ts

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,13 @@
11
import { BrowserModule } from '@angular/platform-browser';
2-
import { NgModule, Provider } from '@angular/core';
3-
import { InViewportModule, WindowRef } from '@thisissoon/angular-inviewport';
2+
import { NgModule } from '@angular/core';
3+
import { InViewportModule } from '@thisissoon/angular-inviewport';
44

55
import { ScrollSpyModule } from './scroll-spy';
66
import { AppComponent } from './app.component';
77

8-
export const getWindow = () => window;
9-
10-
export const inViewportProviders: Provider[] = [
11-
{ provide: WindowRef, useFactory: getWindow },
12-
];
13-
148
@NgModule({
159
declarations: [AppComponent],
16-
imports: [
17-
BrowserModule,
18-
InViewportModule.forRoot(inViewportProviders),
19-
ScrollSpyModule.forRoot(),
20-
],
10+
imports: [BrowserModule, InViewportModule, ScrollSpyModule.forRoot()],
2111
bootstrap: [AppComponent],
2212
})
2313
export class AppModule {}

‎src/app/scroll-spy/scroll-spy-section/scroll-spy-section.component.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<div
22
class="sn-hidden"
33
snInViewport
4-
(inViewportChange)="onInViewportChange($event)"
5-
[debounce]="debounce">
4+
(inViewportChange)="onInViewportChange($event)">
65
</div>
76
<ng-content></ng-content>

‎src/app/scroll-spy/scroll-spy-section/scroll-spy-section.component.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,6 @@ export class ScrollSpySectionComponent {
3232
*/
3333
@Input()
3434
public for: string;
35-
/**
36-
* Amount of time in ms to wait for other scroll events
37-
* before running event handler
38-
*
39-
* @default 0
40-
* @memberof ScrollSpySectionComponent
41-
*/
42-
@Input()
43-
public debounce = 0;
4435
/**
4536
* Creates an instance of ScrollSpySectionComponent.
4637
* @memberof ScrollSpySectionComponent

‎yarn.lock

Lines changed: 61 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@
114114
"@angular-devkit/core" "0.8.6"
115115
rxjs "~6.2.0"
116116

117-
"@angular/animations@6.0.3":
118-
version "6.0.3"
119-
resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-6.0.3.tgz#703f18c3b72d1df446a2b5059b8e51098fd5c899"
120-
integrity sha512-X8ey0dvh2ielxPCJOCcdNPAmKW5toCpzHdbjdZqlR9o6uP1UmzEKHd7Un7jVIINRtq9ZB7vnFWIJl0BA7C8U0g==
117+
"@angular/animations@^6.1.10":
118+
version "6.1.10"
119+
resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-6.1.10.tgz#4ab9b9a6c25e0cca781588700daa9efc33a722e4"
120+
integrity sha512-dd/lq7kw3uwfHPICan8psu2nthuUpp7PvMLuNIm0XxObZ4oNs0ls6uxKEDPnEkRKoGdiJpvmsyzZZN9ACMPEAA==
121121
dependencies:
122122
tslib "^1.9.0"
123123

@@ -138,74 +138,74 @@
138138
symbol-observable "^1.2.0"
139139
yargs-parser "^10.0.0"
140140

141-
"@angular/common@6.0.3":
142-
version "6.0.3"
143-
resolved "https://registry.yarnpkg.com/@angular/common/-/common-6.0.3.tgz#8b2af3bb74add35c10cd969a5d179cb6a8b21545"
144-
integrity sha512-tqEYeEXoaw2kzSUfTrmC3ruJ87trS61SHayIf56f/jtEVn+4pbgJDTNvLSnB6QEaMTn7sX6QBroauMWmdTVSvA==
141+
"@angular/common@^6.1.10":
142+
version "6.1.10"
143+
resolved "https://registry.yarnpkg.com/@angular/common/-/common-6.1.10.tgz#96e01564031b23cf54e4264e4c9defd6e10a0e11"
144+
integrity sha512-73xxTSYJNKfiJ7C1Ajg+sz5l8y+blb/vNgHYg7O3yem5zLBnfPpidJ1UGg4W4d2Y+jwUVJbZKh8SKJarqAJVUQ==
145145
dependencies:
146146
tslib "^1.9.0"
147147

148-
"@angular/compiler-cli@6.0.3":
149-
version "6.0.3"
150-
resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-6.0.3.tgz#4cdda9f28e3387811423c980f3e195ac2322057d"
151-
integrity sha512-n7L/g2leGSl1LffZ3ZuB5bY4sJoZWjkG5tg9IafXQ8nAIUtKPl+ovoiNUhAaA4CvlUlgYHMcbezKpc9285LnyQ==
148+
"@angular/compiler-cli@^6.1.10":
149+
version "6.1.10"
150+
resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-6.1.10.tgz#df7c645017a73ee577f812d801ef1313b2097829"
151+
integrity sha512-GCWdyeNQSnF4RfzO4A0+WHsNEgxKpl5arg4ldLSWMNkj/DrhMD4TnmxhR+IVY+7ieMkUBwpcuWRnjdOdnbmV+w==
152152
dependencies:
153153
chokidar "^1.4.2"
154154
minimist "^1.2.0"
155155
reflect-metadata "^0.1.2"
156-
tsickle "^0.27.2"
156+
tsickle "^0.32.1"
157157

158-
"@angular/compiler@6.0.3":
159-
version "6.0.3"
160-
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-6.0.3.tgz#47e988012e94f9e3477a4c5557c997d7910a3b2d"
161-
integrity sha512-nS65UI6f7grs2k+ggtkwXSBUQ1D/LVSFfXjWR5olxATx25QbIKABec90JphPE4FfhhVm1uonQ/vaSVCjh83Euw==
158+
"@angular/compiler@^6.1.10":
159+
version "6.1.10"
160+
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-6.1.10.tgz#6ab35c8584fbda13a6708df14b8b03cc8f849a94"
161+
integrity sha512-FPIb2j3zfoBwb6vo/u0gQeu70h8InGlSisBr3xMACs/35/pwB6kbQR+JQiUr0D7k6QApg7AuMkvq8aFNelg0aw==
162162
dependencies:
163163
tslib "^1.9.0"
164164

165-
"@angular/core@6.0.3":
166-
version "6.0.3"
167-
resolved "https://registry.yarnpkg.com/@angular/core/-/core-6.0.3.tgz#50502115105c3784d24338dd8ffb7dddcb55b58d"
168-
integrity sha512-YJk0kS/V9C2JFKMHfiw6TNxmfkYWGW4HzqGOm/VoPkvj9O4Erkz/OtOOc8hYGmXFmQz1UpOAByzY2XIlEi72XQ==
165+
"@angular/core@^6.1.10":
166+
version "6.1.10"
167+
resolved "https://registry.yarnpkg.com/@angular/core/-/core-6.1.10.tgz#9f3d8b7e44ec0a68c88745d25a920f98bfb2bc43"
168+
integrity sha512-61l3rIQTVdT45eOf6/fBJIeVmV10mcrxqS4N/1OWkuDT29YSJTZSxGcv8QjAyyutuhcqWWpO6gVRkN07rWmkPg==
169169
dependencies:
170170
tslib "^1.9.0"
171171

172-
"@angular/forms@6.0.3":
173-
version "6.0.3"
174-
resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-6.0.3.tgz#57328c9ec0ddf4ae7823ec807315501813c22752"
175-
integrity sha512-YAjRMERggkzb3cIo8iKOz1xB89Ko4fSh4A1suqrv9o2Xu41Qxs6LwrWVW+6x+N5kBzvbKFZyADqSz1otMQP83Q==
172+
"@angular/forms@^6.1.10":
173+
version "6.1.10"
174+
resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-6.1.10.tgz#c9cd0f716cf91272e8e09e17a51fc20313df31b0"
175+
integrity sha512-zAPx2kMV1/FbP5DrY472Sd/ze1m+GS6T5ullZCtP392r62p2RkwzDCXieR51YiRJjZj3M6c3AcRND7PWBdXT7A==
176176
dependencies:
177177
tslib "^1.9.0"
178178

179-
"@angular/http@6.0.3":
180-
version "6.0.3"
181-
resolved "https://registry.yarnpkg.com/@angular/http/-/http-6.0.3.tgz#0fee74a820650700517fbc84185ee9b3bd17ebad"
182-
integrity sha512-9GF4hEsm/mK/kk+skn1y54IpsSGcgGnFxHctEFSSyUKTub9gFirkbuLOx9T9fXIKtXqCxnXolHCE7ncfOfS7GA==
179+
"@angular/http@^6.1.10":
180+
version "6.1.10"
181+
resolved "https://registry.yarnpkg.com/@angular/http/-/http-6.1.10.tgz#91239b27990b992cdb312056d3f11cc804bfeaf4"
182+
integrity sha512-LDsSqyexh8fj23y+G2oSGLWSZVhbxBBo2ehYHnRgH/jlp0pmZVLRaGgUMNSCVtZc1rxLzpEjZjtw+P+qlutAtw==
183183
dependencies:
184184
tslib "^1.9.0"
185185

186-
"@angular/language-service@6.0.3":
187-
version "6.0.3"
188-
resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-6.0.3.tgz#7182f3824520fd5f5f6173fdee80284356d29d08"
189-
integrity sha512-yeEMS8GwEhyMKD4nlzg/0Ug56k5Zb58uShjVlh+kr6WWHMRzAtecvNHePlakPjxyWzf/EIDWnMJV31HGOGQYZg==
186+
"@angular/language-service@^6.1.10":
187+
version "6.1.10"
188+
resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-6.1.10.tgz#9f87b740befca8bf9a5fb499446425519389f52f"
189+
integrity sha512-nN29Ovomg21eL8acwOSUFAYwWFI1TuFwUgUu37ZssfVQrYdaV+BFx3yv3P0nKU90h3Hp+oIkWHd8U34UYrvBCg==
190190

191-
"@angular/platform-browser-dynamic@6.0.3":
192-
version "6.0.3"
193-
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.0.3.tgz#b27e26c06df4ce34879cefd818e7ff394764f834"
194-
integrity sha512-OSaBiog3jH52c+pJhG6qsZjVipzw3ThTcFaymetlBwdRkZ9ch7eIQFhlIXPe4oM3wJt39LTG7peRymWPbnx4uw==
191+
"@angular/platform-browser-dynamic@^6.1.10":
192+
version "6.1.10"
193+
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.1.10.tgz#f7e192454e221cbe25ab0b8dc250bad4f6a2605b"
194+
integrity sha512-DmBSUyFPoyKqkmBXyJ2CrP1oXDioeoBlPA8lmWUDUv2yBuoHIzIkdY/OkTZbdyu/QYa1hK2Jl9OlfoeoenKddg==
195195
dependencies:
196196
tslib "^1.9.0"
197197

198-
"@angular/platform-browser@6.0.3":
199-
version "6.0.3"
200-
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-6.0.3.tgz#67941ac1dc0e89c1a18bb97ef17d574f469be6d2"
201-
integrity sha512-OTgOE6WzytV9fnnCwvoyyXI4Avzmfu9RbBUhVRVontov6LlN9XL8BrzLidT7/lPAEQmHuoRCuNrSSY8TokPJCA==
198+
"@angular/platform-browser@^6.1.10":
199+
version "6.1.10"
200+
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-6.1.10.tgz#ef9d6408db7ae9443daa355f3655adeb496f1216"
201+
integrity sha512-CB7pqMwtgb7KjdHDAJlsXcs0rrU+2xQVaoOaqEfJtUrKhtGMLaZh8Qoic5l92SoGattkOw7SYarAOsWlAsVfvw==
202202
dependencies:
203203
tslib "^1.9.0"
204204

205-
"@angular/router@6.0.3":
206-
version "6.0.3"
207-
resolved "https://registry.yarnpkg.com/@angular/router/-/router-6.0.3.tgz#c2b63401c30788b78c90e4209cd06a653eae6428"
208-
integrity sha512-7pQYu5DnNXwZ8nZrKtTpBo3HQoirKSP2hGAoHA0rPsqZvavBfuhUzsksYVvKvFEtoPmBe69uEYydhr115MTTNQ==
205+
"@angular/router@^6.1.10":
206+
version "6.1.10"
207+
resolved "https://registry.yarnpkg.com/@angular/router/-/router-6.1.10.tgz#c7ee00897f6659b08378ea08d153d6f4c718004e"
208+
integrity sha512-tekI3dkdvd65oMoxjjgRA+16uDgPUBWHhYxids6pgO8vobZNtCo8VaVlcDyLUhdmtS5kONELx0iL5E2M0Y2Bag==
209209
dependencies:
210210
tslib "^1.9.0"
211211

@@ -381,10 +381,10 @@
381381
semver "^5.3.0"
382382
semver-intersect "^1.1.2"
383383

384-
"@thisissoon/angular-inviewport@^3.0.0":
385-
version "3.0.1"
386-
resolved "https://registry.yarnpkg.com/@thisissoon/angular-inviewport/-/angular-inviewport-3.0.1.tgz#3f17ab5f25d694a0bdb7b0c7506e948fc6a99a30"
387-
integrity sha512-twIb1S+K7EOffgZ6o6zGJVKdHl9kHqoA7bljN1scRv6OzlLj7M7tmVTmqAOePb+Ue+xMhCiaZ56sKyNySqArAA==
384+
"@thisissoon/angular-inviewport@^4.0.0":
385+
version "4.0.0"
386+
resolved "https://registry.yarnpkg.com/@thisissoon/angular-inviewport/-/angular-inviewport-4.0.0.tgz#82054ee0a8cef28af13225fba7f4a4461abb1fe8"
387+
integrity sha512-3Z+S4VHWzejpK4pNFazTlKRwnpCx5Y9cIcgovUsYqUh1kEBBzb0n4LdWyu1raA8ViHLzGacxNV0m2HjxXJ3/tw==
388388
dependencies:
389389
tslib "^1.9.0"
390390

@@ -4765,6 +4765,13 @@ jasmine-core@~2.99.0:
47654765
resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.99.1.tgz#e6400df1e6b56e130b61c4bcd093daa7f6e8ca15"
47664766
integrity sha1-5kAN8ea1bhMLYcS80JPap/boyhU=
47674767

4768+
jasmine-diff@^0.1.3:
4769+
version "0.1.3"
4770+
resolved "https://registry.yarnpkg.com/jasmine-diff/-/jasmine-diff-0.1.3.tgz#93ccc2dcc41028c5ddd4606558074839f2deeaa8"
4771+
integrity sha1-k8zC3MQQKMXd1GBlWAdIOfLe6qg=
4772+
dependencies:
4773+
diff "^3.2.0"
4774+
47684775
jasmine-spec-reporter@~4.1.0:
47694776
version "4.1.1"
47704777
resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-4.1.1.tgz#5a6d58ab5d61bea7309fbc279239511756b1b588"
@@ -8750,11 +8757,12 @@ tsconfig@^6.0.0:
87508757
strip-bom "^3.0.0"
87518758
strip-json-comments "^2.0.0"
87528759

8753-
tsickle@^0.27.2:
8754-
version "0.27.5"
8755-
resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.27.5.tgz#41e1a41a5acf971cbb2b0558a9590779234d591f"
8756-
integrity sha512-NP+CjM1EXza/M8mOXBLH3vkFEJiu1zfEAlC5WdJxHPn8l96QPz5eooP6uAgYtw1CcKfuSyIiheNUdKxtDWCNeg==
8760+
tsickle@^0.32.1:
8761+
version "0.32.1"
8762+
resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.32.1.tgz#f16e94ba80b32fc9ebe320dc94fbc2ca7f3521a5"
8763+
integrity sha512-JW9j+W0SaMSZGejIFZBk0AiPfnhljK3oLx5SaqxrJhjlvzFyPml5zqG1/PuScUj6yTe1muEqwk5CnDK0cOZmKw==
87578764
dependencies:
8765+
jasmine-diff "^0.1.3"
87588766
minimist "^1.2.0"
87598767
mkdirp "^0.5.1"
87608768
source-map "^0.6.0"

0 commit comments

Comments
 (0)