Skip to content

Avoid crash if WeakSet is not available #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bvaughn merged 3 commits into from
Mar 8, 2019
+16 −12
Merged

Avoid crash if WeakSet is not available #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8f35e2
Use Set if WeakSet is not available
jgoz Mar 8, 2019
b48c94f
Ensure WeakSet has proper type
jgoz Mar 8, 2019
b0c5115
Only create sets if WeakSet exists
jgoz Mar 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/createGridComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,10 @@ const defaultItemKey = ({ columnIndex, data, rowIndex }) =>
let devWarningsOverscanCount = null;
let devWarningsTagName = null;
if (process.env.NODE_ENV !== 'production') {
devWarningsOverscanCount = new WeakSet();
devWarningsTagName = new WeakSet();
if (typeof window.WeakSet !== 'undefined') {
devWarningsOverscanCount = new WeakSet();
devWarningsTagName = new WeakSet();
}
}

export default function createGridComponent({
Expand Down Expand Up @@ -746,8 +748,8 @@ const validateSharedProps = (
): void => {
if (process.env.NODE_ENV !== 'production') {
if (typeof overscanCount === 'number') {
if (!((devWarningsOverscanCount: any): WeakSet<any>).has(instance)) {
((devWarningsOverscanCount: any): WeakSet<any>).add(instance);
if (devWarningsOverscanCount && !devWarningsOverscanCount.has(instance)) {
devWarningsOverscanCount.add(instance);
console.warn(
'The overscanCount prop has been deprecated. ' +
'Please use the overscanColumnsCount and overscanRowsCount props instead.'
Expand All @@ -756,8 +758,8 @@ const validateSharedProps = (
}

if (innerTagName != null || outerTagName != null) {
if (!((devWarningsTagName: any): WeakSet<any>).has(instance)) {
((devWarningsTagName: any): WeakSet<any>).add(instance);
if (devWarningsTagName && !devWarningsTagName.has(instance)) {
devWarningsTagName.add(instance);
console.warn(
'The innerTagName and outerTagName props have been deprecated. ' +
'Please use the innerElementType and outerElementType props instead.'
Expand Down
14 changes: 8 additions & 6 deletions src/createListComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,10 @@ const defaultItemKey = (index: number, data: any) => index;
let devWarningsDirection = null;
let devWarningsTagName = null;
if (process.env.NODE_ENV !== 'production') {
devWarningsDirection = new WeakSet();
devWarningsTagName = new WeakSet();
if (typeof window.WeakSet !== 'undefined') {
devWarningsDirection = new WeakSet();
devWarningsTagName = new WeakSet();
}
}

export default function createListComponent({
Expand Down Expand Up @@ -587,8 +589,8 @@ const validateSharedProps = (
): void => {
if (process.env.NODE_ENV !== 'production') {
if (innerTagName != null || outerTagName != null) {
if (!((devWarningsTagName: any): WeakSet<any>).has(instance)) {
((devWarningsTagName: any): WeakSet<any>).add(instance);
if (devWarningsTagName && !devWarningsTagName.has(instance)) {
devWarningsTagName.add(instance);
console.warn(
'The innerTagName and outerTagName props have been deprecated. ' +
'Please use the innerElementType and outerElementType props instead.'
Expand All @@ -602,8 +604,8 @@ const validateSharedProps = (
switch (direction) {
case 'horizontal':
case 'vertical':
if (!((devWarningsDirection: any): WeakSet<any>).has(instance)) {
((devWarningsDirection: any): WeakSet<any>).add(instance);
if (devWarningsDirection && !devWarningsDirection.has(instance)) {
devWarningsDirection.add(instance);
console.warn(
'The direction prop should be either "ltr" (default) or "rtl". ' +
'Please use the layout prop to specify "vertical" (default) or "horizontal" orientation.'
Expand Down