Skip to content

Commit d71a661

Browse files
committed
Revert accidental function replacement, disable some of the new eslint rules
1 parent 2822b1f commit d71a661

File tree

4 files changed

+42
-34
lines changed

4 files changed

+42
-34
lines changed

.eslintignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
.eslintrc.js
1+
.eslintrc.js

.eslintrc.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ module.exports = {
3434
"no-use-before-define": "off",
3535
"@typescript-eslint/no-use-before-define": ["error"],
3636
"@shopify/react-prefer-private-members": "off",
37-
"@typescript-eslint/member-ordering": "off"
37+
"@shopify/typescript/prefer-pascal-case-enums": "off",
38+
"@typescript-eslint/member-ordering": "off",
39+
"@typescript-eslint/naming-convention": "off"
3840
},
3941
settings: {
4042
"import/ignore": ["node_modules", "\\.s?css"],

src/SizeAndPositionManager.ts

+12-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Forked from react-virtualized 💖 */
2-
import {ALIGNMENT} from './constants';
2+
import { ALIGNMENT } from './constants';
33

44
export type ItemSizeGetter = (index: number) => number;
55
export type ItemSize = number | number[] | ItemSizeGetter;
@@ -26,7 +26,7 @@ export default class SizeAndPositionManager {
2626
private lastMeasuredIndex: number;
2727
private itemSizeAndPositionData: SizeAndPositionData;
2828

29-
constructor({itemCount, itemSizeGetter, estimatedItemSize}: Options) {
29+
constructor({ itemCount, itemSizeGetter, estimatedItemSize }: Options) {
3030
this.itemSizeGetter = itemSizeGetter;
3131
this.itemCount = itemCount;
3232
this.estimatedItemSize = estimatedItemSize;
@@ -67,7 +67,7 @@ export default class SizeAndPositionManager {
6767
getSizeAndPositionForIndex(index: number) {
6868
if (index < 0 || index >= this.itemCount) {
6969
throw Error(
70-
`Requested index ${index} is outside of range 0..${this.itemCount}`,
70+
`Requested index ${index} is outside of range 0..${this.itemCount}`
7171
);
7272
}
7373

@@ -100,7 +100,7 @@ export default class SizeAndPositionManager {
100100
getSizeAndPositionOfLastMeasuredItem() {
101101
return this.lastMeasuredIndex >= 0
102102
? this.itemSizeAndPositionData[this.lastMeasuredIndex]
103-
: {offset: 0, size: 0};
103+
: { offset: 0, size: 0 };
104104
}
105105

106106
/**
@@ -173,7 +173,7 @@ export default class SizeAndPositionManager {
173173
containerSize: number;
174174
offset: number;
175175
overscanCount: number;
176-
}): {start?: number; stop?: number} {
176+
}): { start?: number; stop?: number } {
177177
const totalSize = this.getTotalSize();
178178

179179
if (totalSize === 0) {
@@ -285,7 +285,13 @@ export default class SizeAndPositionManager {
285285
return 0;
286286
}
287287

288-
private exponentialSearch({index, offset}: {index: number; offset: number}) {
288+
private exponentialSearch({
289+
index,
290+
offset,
291+
}: {
292+
index: number;
293+
offset: number;
294+
}) {
289295
let interval = 1;
290296

291297
while (

src/index.tsx

+26-26
Original file line numberDiff line numberDiff line change
@@ -159,32 +159,6 @@ export default class VirtualList extends React.PureComponent<Props, State> {
159159

160160
private styleCache: StyleCache = {};
161161

162-
private getRef = (node: HTMLDivElement): void => {
163-
this.rootNode = node;
164-
};
165-
166-
private handleScroll = (event: UIEvent) => {
167-
const { onScroll } = this.props;
168-
const offset = this.getNodeOffset();
169-
170-
if (
171-
offset < 0 ||
172-
this.state.offset === offset ||
173-
event.target !== this.rootNode
174-
) {
175-
return;
176-
}
177-
178-
this.setState({
179-
offset,
180-
scrollChangeReason: SCROLL_CHANGE_REASON.OBSERVED,
181-
});
182-
183-
if (typeof onScroll === 'function') {
184-
onScroll(offset, event);
185-
}
186-
};
187-
188162
componentDidMount() {
189163
const { scrollOffset, scrollToIndex } = this.props;
190164
this.rootNode.addEventListener('scroll', this.handleScroll, {
@@ -384,6 +358,32 @@ export default class VirtualList extends React.PureComponent<Props, State> {
384358
);
385359
}
386360

361+
private getRef = (node: HTMLDivElement): void => {
362+
this.rootNode = node;
363+
};
364+
365+
private handleScroll = (event: UIEvent) => {
366+
const { onScroll } = this.props;
367+
const offset = this.getNodeOffset();
368+
369+
if (
370+
offset < 0 ||
371+
this.state.offset === offset ||
372+
event.target !== this.rootNode
373+
) {
374+
return;
375+
}
376+
377+
this.setState({
378+
offset,
379+
scrollChangeReason: SCROLL_CHANGE_REASON.OBSERVED,
380+
});
381+
382+
if (typeof onScroll === 'function') {
383+
onScroll(offset, event);
384+
}
385+
};
386+
387387
private getNodeOffset() {
388388
const { scrollDirection = DIRECTION.VERTICAL } = this.props;
389389

0 commit comments

Comments
 (0)