Skip to content

Commit d08f3a7

Browse files
committed
Update annotations
1 parent 3f9bcb7 commit d08f3a7

File tree

5 files changed

+71
-81
lines changed

5 files changed

+71
-81
lines changed

src/ResizeObservation.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@ export default class ResizeObservation {
2929
/**
3030
* Reference to the last observed content rectangle.
3131
*
32-
* @private
33-
* @type {DOMRectInit}
32+
* @private {DOMRectInit}
3433
*/
35-
_contentRect = createRectInit(0, 0, 0, 0);
34+
contentRect_ = createRectInit(0, 0, 0, 0);
3635

3736
/**
3837
* Creates an instance of ResizeObservation.
@@ -52,7 +51,7 @@ export default class ResizeObservation {
5251
isActive() {
5352
const rect = getContentRect(this.target);
5453

55-
this._contentRect = rect;
54+
this.contentRect_ = rect;
5655

5756
return (
5857
rect.width !== this.broadcastWidth ||
@@ -67,7 +66,7 @@ export default class ResizeObservation {
6766
* @returns {DOMRectInit} Last observed content rectangle.
6867
*/
6968
broadcastRect() {
70-
const rect = this._contentRect;
69+
const rect = this.contentRect_;
7170

7271
this.broadcastWidth = rect.width;
7372
this.broadcastHeight = rect.height;

src/ResizeObserver.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class ResizeObserver {
1717
/**
1818
* Creates a new instance of ResizeObserver.
1919
*
20-
* @param {Function} callback - Callback that is invoked when dimensions of
20+
* @param {ResizeObserverCallback} callback - Callback that is invoked when dimensions of
2121
* the observed elements change.
2222
*/
2323
constructor(callback) {

src/ResizeObserverController.js

Lines changed: 36 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -26,34 +26,30 @@ export default class ResizeObserverController {
2626
/**
2727
* Continuous updates must be enabled if MutationObserver is not supported.
2828
*
29-
* @private
30-
* @type {boolean}
29+
* @private {boolean}
3130
*/
32-
_isCycleContinuous = !mutationsSupported;
31+
isCycleContinuous_ = !mutationsSupported;
3332

3433
/**
3534
* Indicates whether DOM listeners have been added.
3635
*
37-
* @private
38-
* @type {boolean}
36+
* @private {boolean}
3937
*/
40-
_listenersEnabled = false;
38+
listenersEnabled_ = false;
4139

4240
/**
4341
* Keeps reference to the instance of MutationObserver.
4442
*
45-
* @private
46-
* @type {MutationObserver}
43+
* @private {MutationObserver}
4744
*/
48-
_mutationsObserver;
45+
mutationsObserver_;
4946

5047
/**
5148
* A list of connected observers.
5249
*
53-
* @private
54-
* @type {ResizeObserver[]}
50+
* @private {Array<ResizeObserverSPI>}
5551
*/
56-
_observers = [];
52+
observers_ = [];
5753

5854
/**
5955
* Creates a new instance of ResizeObserverController.
@@ -64,34 +60,34 @@ export default class ResizeObserverController {
6460
this.refresh = throttle(this.refresh.bind(this), REFRESH_DELAY, true);
6561

6662
// Additionally postpone invocation of the continuous updates.
67-
this._continuousUpdateHandler = throttle(this.refresh, CONTINUOUS_HANDLER_DELAY);
63+
this.continuousUpdateHandler_ = throttle(this.refresh, CONTINUOUS_HANDLER_DELAY);
6864
}
6965

7066
/**
7167
* Adds observer to observers list.
7268
*
73-
* @param {ResizeObserver} observer - Observer to be added.
69+
* @param {ResizeObserverSPI} observer - Observer to be added.
7470
* @returns {void}
7571
*/
7672
connect(observer) {
7773
if (!this.isConnected(observer)) {
78-
this._observers.push(observer);
74+
this.observers_.push(observer);
7975
}
8076

8177
// Add listeners if they haven't been added yet.
82-
if (!this._listenersEnabled) {
83-
this._addListeners();
78+
if (!this.listenersEnabled_) {
79+
this.addListeners_();
8480
}
8581
}
8682

8783
/**
8884
* Removes observer from observers list.
8985
*
90-
* @param {ResizeObserver} observer - Observer to be removed.
86+
* @param {ResizeObserverSPI} observer - Observer to be removed.
9187
* @returns {void}
9288
*/
9389
disconnect(observer) {
94-
const observers = this._observers;
90+
const observers = this.observers_;
9591
const index = observers.indexOf(observer);
9692

9793
// Remove observer if it's present in registry.
@@ -100,19 +96,19 @@ export default class ResizeObserverController {
10096
}
10197

10298
// Remove listeners if controller has no connected observers.
103-
if (!observers.length && this._listenersEnabled) {
104-
this._removeListeners();
99+
if (!observers.length && this.listenersEnabled_) {
100+
this.removeListeners_();
105101
}
106102
}
107103

108104
/**
109105
* Tells whether the provided observer is connected to controller.
110106
*
111-
* @param {ResizeObserver} observer - Observer to be checked.
107+
* @param {ResizeObserverSPI} observer - Observer to be checked.
112108
* @returns {boolean}
113109
*/
114110
isConnected(observer) {
115-
return !!~this._observers.indexOf(observer);
111+
return !!~this.observers_.indexOf(observer);
116112
}
117113

118114
/**
@@ -122,15 +118,15 @@ export default class ResizeObserverController {
122118
* @returns {void}
123119
*/
124120
refresh() {
125-
const hasChanges = this._updateObservers();
121+
const hasChanges = this.updateObservers_();
126122

127123
// Continue running updates if changes have been detected as there might
128124
// be future ones caused by CSS transitions.
129125
if (hasChanges) {
130126
this.refresh();
131-
} else if (this._isCycleContinuous && this._listenersEnabled) {
127+
} else if (this.isCycleContinuous_ && this.listenersEnabled_) {
132128
// Automatically repeat cycle if it's necessary.
133-
this._continuousUpdateHandler();
129+
this.continuousUpdateHandler_();
134130
}
135131
}
136132

@@ -142,10 +138,10 @@ export default class ResizeObserverController {
142138
* @returns {boolean} Returns "true" if any observer has detected changes in
143139
* dimensions of it's elements.
144140
*/
145-
_updateObservers() {
141+
updateObservers_() {
146142
let hasChanges = false;
147143

148-
for (const observer of this._observers) {
144+
for (const observer of this.observers_) {
149145
// Collect active observations.
150146
observer.gatherActive();
151147

@@ -167,10 +163,10 @@ export default class ResizeObserverController {
167163
* @private
168164
* @returns {void}
169165
*/
170-
_addListeners() {
166+
addListeners_() {
171167
// Do nothing if running in a non-browser environment or if listeners
172168
// have been already added.
173-
if (!isBrowser || this._listenersEnabled) {
169+
if (!isBrowser || this.listenersEnabled_) {
174170
return;
175171
}
176172

@@ -184,21 +180,21 @@ export default class ResizeObserverController {
184180
// Subscribe to DOM mutations if it's possible as they may lead to
185181
// changes in the dimensions of elements.
186182
if (mutationsSupported) {
187-
this._mutationsObserver = new MutationObserver(this.refresh);
183+
this.mutationsObserver_ = new MutationObserver(this.refresh);
188184

189-
this._mutationsObserver.observe(document, {
185+
this.mutationsObserver_.observe(document, {
190186
attributes: true,
191187
childList: true,
192188
characterData: true,
193189
subtree: true
194190
});
195191
}
196192

197-
this._listenersEnabled = true;
193+
this.listenersEnabled_ = true;
198194

199195
// Don't wait for a possible event that might trigger the update of
200196
// observers and manually initiate the update process.
201-
if (this._isCycleContinuous) {
197+
if (this.isCycleContinuous_) {
202198
this.refresh();
203199
}
204200
}
@@ -209,21 +205,21 @@ export default class ResizeObserverController {
209205
* @private
210206
* @returns {void}
211207
*/
212-
_removeListeners() {
208+
removeListeners_() {
213209
// Do nothing if running in a non-browser environment or if listeners
214210
// have been already removed.
215-
if (!isBrowser || !this._listenersEnabled) {
211+
if (!isBrowser || !this.listenersEnabled_) {
216212
return;
217213
}
218214

219215
window.removeEventListener('resize', this.refresh);
220216
document.removeEventListener('transitionend', this.refresh);
221217

222-
if (this._mutationsObserver) {
223-
this._mutationsObserver.disconnect();
218+
if (this.mutationsObserver_) {
219+
this.mutationsObserver_.disconnect();
224220
}
225221

226-
this._mutationsObserver = null;
227-
this._listenersEnabled = false;
222+
this.mutationsObserver_ = null;
223+
this.listenersEnabled_ = false;
228224
}
229225
}

0 commit comments

Comments
 (0)