Skip to content
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

fix: add null check before accessing props #19

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: add null check before accessing props #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
124 changes: 62 additions & 62 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,97 +163,97 @@ CHANGELOG.md -- history of changes to the module
README.md -- this file
/lib
└───/es5
└───/_private
└───utils.d.ts - 60 Bytes
└───utils.js - 890 Bytes
└───/getChild
└───index.d.ts - 1.23 KB
└───index.js - 1.81 KB
└───index.d.ts - 1.2 KB
└───index.js - 1.82 KB
└───/getChildByType
└───index.d.ts - 4.16 KB
└───index.js - 6.08 KB
└───index.d.ts - 4.09 KB
└───index.js - 5.97 KB
└───/getChildren
└───index.d.ts - 1.21 KB
└───index.d.ts - 1.19 KB
└───index.js - 2.07 KB
└───/getChildrenByType
└───index.d.ts - 3.86 KB
└───index.js - 5.41 KB
└───index.d.ts - 3.8 KB
└───index.js - 5.36 KB
└───/getChildrenWithDescendant
└───index.d.ts - 638 Bytes
└───index.js - 1.31 KB
└───index.d.ts - 626 Bytes
└───index.js - 1.28 KB
└───/getChildrenWithDescendantByType
└───index.d.ts - 2.26 KB
└───index.js - 3.02 KB
└───index.d.ts - 2.22 KB
└───index.js - 2.96 KB
└───/getDescendantDepth
└───index.d.ts - 1.14 KB
└───index.js - 2.46 KB
└───index.d.ts - 1.12 KB
└───index.js - 2.45 KB
└───/getDescendantDepthByType
└───index.d.ts - 2.39 KB
└───index.js - 3.93 KB
└───index.d.ts - 1.1 KB
└───index.js - 4.23 KB
└───index.d.ts - 2.35 KB
└───index.js - 3.91 KB
└───index.d.ts - 1.08 KB
└───index.js - 4.19 KB
└───/noEmptyChildren
└───index.d.ts - 1.75 KB
└───index.js - 3.43 KB
└───index.d.ts - 1.72 KB
└───index.js - 3.37 KB
└───/overrideProps
└───index.d.ts - 2.72 KB
└───index.js - 4.66 KB
└───index.d.ts - 2.68 KB
└───index.js - 4.57 KB
└───/removeChildren
└───index.d.ts - 1.22 KB
└───index.js - 2.57 KB
└───index.d.ts - 1.2 KB
└───index.js - 2.56 KB
└───/removeChildrenByType
└───index.d.ts - 3.71 KB
└───index.js - 5.63 KB
└───index.d.ts - 3.65 KB
└───index.js - 5.58 KB
└───/typeOfComponent
└───index.d.ts - 614 Bytes
└───index.js - 1.75 KB
└───types.d.ts - 249 Bytes
└───types.js - 79 Bytes
└───/_private
└───utils.d.ts - 61 Bytes
└───utils.js - 913 Bytes
└───index.d.ts - 603 Bytes
└───index.js - 1.72 KB
└───types.d.ts - 240 Bytes
└───types.js - 77 Bytes
└───/es6
└───/_private
└───utils.d.ts - 60 Bytes
└───utils.js - 681 Bytes
└───/getChild
└───index.d.ts - 1.23 KB
└───index.d.ts - 1.2 KB
└───index.js - 1.63 KB
└───/getChildByType
└───index.d.ts - 4.16 KB
└───index.js - 5.78 KB
└───index.d.ts - 4.09 KB
└───index.js - 5.68 KB
└───/getChildren
└───index.d.ts - 1.21 KB
└───index.d.ts - 1.19 KB
└───index.js - 1.87 KB
└───/getChildrenByType
└───index.d.ts - 3.86 KB
└───index.js - 5.12 KB
└───index.d.ts - 3.8 KB
└───index.js - 5.08 KB
└───/getChildrenWithDescendant
└───index.d.ts - 638 Bytes
└───index.js - 1.13 KB
└───index.d.ts - 626 Bytes
└───index.js - 1.1 KB
└───/getChildrenWithDescendantByType
└───index.d.ts - 2.26 KB
└───index.js - 2.81 KB
└───index.d.ts - 2.22 KB
└───index.js - 2.76 KB
└───/getDescendantDepth
└───index.d.ts - 1.14 KB
└───index.d.ts - 1.12 KB
└───index.js - 2.3 KB
└───/getDescendantDepthByType
└───index.d.ts - 2.39 KB
└───index.js - 3.74 KB
└───index.d.ts - 1.1 KB
└───index.js - 905 Bytes
└───index.d.ts - 2.35 KB
└───index.js - 3.72 KB
└───index.d.ts - 1.08 KB
└───index.js - 892 Bytes
└───/noEmptyChildren
└───index.d.ts - 1.75 KB
└───index.js - 3.2 KB
└───index.d.ts - 1.72 KB
└───index.js - 3.15 KB
└───/overrideProps
└───index.d.ts - 2.72 KB
└───index.js - 4.44 KB
└───index.d.ts - 2.68 KB
└───index.js - 4.36 KB
└───/removeChildren
└───index.d.ts - 1.22 KB
└───index.js - 2.34 KB
└───index.d.ts - 1.2 KB
└───index.js - 2.33 KB
└───/removeChildrenByType
└───index.d.ts - 3.71 KB
└───index.js - 5.32 KB
└───index.d.ts - 3.65 KB
└───index.js - 5.28 KB
└───/typeOfComponent
└───index.d.ts - 614 Bytes
└───index.js - 1.6 KB
└───types.d.ts - 249 Bytes
└───types.js - 12 Bytes
└───/_private
└───utils.d.ts - 61 Bytes
└───utils.js - 700 Bytes
└───index.d.ts - 603 Bytes
└───index.js - 1.58 KB
└───types.d.ts - 240 Bytes
└───types.js - 11 Bytes
````
124 changes: 62 additions & 62 deletions dist/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,97 +163,97 @@ CHANGELOG.md -- history of changes to the module
README.md -- this file
/lib
└───/es5
└───/_private
└───utils.d.ts - 60 Bytes
└───utils.js - 890 Bytes
└───/getChild
└───index.d.ts - 1.23 KB
└───index.js - 1.81 KB
└───index.d.ts - 1.2 KB
└───index.js - 1.82 KB
└───/getChildByType
└───index.d.ts - 4.16 KB
└───index.js - 6.08 KB
└───index.d.ts - 4.09 KB
└───index.js - 5.97 KB
└───/getChildren
└───index.d.ts - 1.21 KB
└───index.d.ts - 1.19 KB
└───index.js - 2.07 KB
└───/getChildrenByType
└───index.d.ts - 3.86 KB
└───index.js - 5.41 KB
└───index.d.ts - 3.8 KB
└───index.js - 5.36 KB
└───/getChildrenWithDescendant
└───index.d.ts - 638 Bytes
└───index.js - 1.31 KB
└───index.d.ts - 626 Bytes
└───index.js - 1.28 KB
└───/getChildrenWithDescendantByType
└───index.d.ts - 2.26 KB
└───index.js - 3.02 KB
└───index.d.ts - 2.22 KB
└───index.js - 2.96 KB
└───/getDescendantDepth
└───index.d.ts - 1.14 KB
└───index.js - 2.46 KB
└───index.d.ts - 1.12 KB
└───index.js - 2.45 KB
└───/getDescendantDepthByType
└───index.d.ts - 2.39 KB
└───index.js - 3.93 KB
└───index.d.ts - 1.1 KB
└───index.js - 4.23 KB
└───index.d.ts - 2.35 KB
└───index.js - 3.91 KB
└───index.d.ts - 1.08 KB
└───index.js - 4.19 KB
└───/noEmptyChildren
└───index.d.ts - 1.75 KB
└───index.js - 3.43 KB
└───index.d.ts - 1.72 KB
└───index.js - 3.37 KB
└───/overrideProps
└───index.d.ts - 2.72 KB
└───index.js - 4.66 KB
└───index.d.ts - 2.68 KB
└───index.js - 4.57 KB
└───/removeChildren
└───index.d.ts - 1.22 KB
└───index.js - 2.57 KB
└───index.d.ts - 1.2 KB
└───index.js - 2.56 KB
└───/removeChildrenByType
└───index.d.ts - 3.71 KB
└───index.js - 5.63 KB
└───index.d.ts - 3.65 KB
└───index.js - 5.58 KB
└───/typeOfComponent
└───index.d.ts - 614 Bytes
└───index.js - 1.75 KB
└───types.d.ts - 249 Bytes
└───types.js - 79 Bytes
└───/_private
└───utils.d.ts - 61 Bytes
└───utils.js - 913 Bytes
└───index.d.ts - 603 Bytes
└───index.js - 1.72 KB
└───types.d.ts - 240 Bytes
└───types.js - 77 Bytes
└───/es6
└───/_private
└───utils.d.ts - 60 Bytes
└───utils.js - 681 Bytes
└───/getChild
└───index.d.ts - 1.23 KB
└───index.d.ts - 1.2 KB
└───index.js - 1.63 KB
└───/getChildByType
└───index.d.ts - 4.16 KB
└───index.js - 5.78 KB
└───index.d.ts - 4.09 KB
└───index.js - 5.68 KB
└───/getChildren
└───index.d.ts - 1.21 KB
└───index.d.ts - 1.19 KB
└───index.js - 1.87 KB
└───/getChildrenByType
└───index.d.ts - 3.86 KB
└───index.js - 5.12 KB
└───index.d.ts - 3.8 KB
└───index.js - 5.08 KB
└───/getChildrenWithDescendant
└───index.d.ts - 638 Bytes
└───index.js - 1.13 KB
└───index.d.ts - 626 Bytes
└───index.js - 1.1 KB
└───/getChildrenWithDescendantByType
└───index.d.ts - 2.26 KB
└───index.js - 2.81 KB
└───index.d.ts - 2.22 KB
└───index.js - 2.76 KB
└───/getDescendantDepth
└───index.d.ts - 1.14 KB
└───index.d.ts - 1.12 KB
└───index.js - 2.3 KB
└───/getDescendantDepthByType
└───index.d.ts - 2.39 KB
└───index.js - 3.74 KB
└───index.d.ts - 1.1 KB
└───index.js - 905 Bytes
└───index.d.ts - 2.35 KB
└───index.js - 3.72 KB
└───index.d.ts - 1.08 KB
└───index.js - 892 Bytes
└───/noEmptyChildren
└───index.d.ts - 1.75 KB
└───index.js - 3.2 KB
└───index.d.ts - 1.72 KB
└───index.js - 3.15 KB
└───/overrideProps
└───index.d.ts - 2.72 KB
└───index.js - 4.44 KB
└───index.d.ts - 2.68 KB
└───index.js - 4.36 KB
└───/removeChildren
└───index.d.ts - 1.22 KB
└───index.js - 2.34 KB
└───index.d.ts - 1.2 KB
└───index.js - 2.33 KB
└───/removeChildrenByType
└───index.d.ts - 3.71 KB
└───index.js - 5.32 KB
└───index.d.ts - 3.65 KB
└───index.js - 5.28 KB
└───/typeOfComponent
└───index.d.ts - 614 Bytes
└───index.js - 1.6 KB
└───types.d.ts - 249 Bytes
└───types.js - 12 Bytes
└───/_private
└───utils.d.ts - 61 Bytes
└───utils.js - 700 Bytes
└───index.d.ts - 603 Bytes
└───index.js - 1.58 KB
└───types.d.ts - 240 Bytes
└───types.js - 11 Bytes
````
2 changes: 1 addition & 1 deletion src/getChild/index.deep.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ let children = [
{ type: 'span' },
{ type: 'div' },
];
React.Children.toArray = x => (x && Array.isArray(x) ? x : [x]).filter(z => z != undefined);
React.Children.toArray = x => (x && Array.isArray(x) ? x : [x]);

describe('getChildDeep', () => {
test('Deep find', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/getChild/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const getChildDeep = <T=React.ReactNode, TC=React.ReactNode>(children: T,
for (const child of _children) {
if (predicate(child as TC)) return child as TC;

if ((child as any).props?.children) {
if ((child as any)?.props?.children) {
const result = getChildDeep<T, TC>((child as NannyNode).props.children, predicate);

if (result) return result;
Expand Down
2 changes: 1 addition & 1 deletion src/getChildByType/index.deep.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const children = [
{ type: 'span' },
{ type: 'div' },
];
React.Children.toArray = x => (x && Array.isArray(x) ? x : [x]).filter(z => z != undefined);
React.Children.toArray = x => (x && Array.isArray(x) ? x : [x]);

describe('getChildByTypeDeep', () => {
test('Deep find => single', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/getChildByType/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const React = require('react');
const { getChildByType } = require('../../dist/lib/es5/index');

describe('getChildByType', () => {
React.Children.toArray = x => (x && Array.isArray(x) ? x : [x]).filter(z => z != undefined);
React.Children.toArray = x => (x && Array.isArray(x) ? x : [x]);

test('Single', () => {
let children = { props: { __TYPE: 'CustomComponent' }};
Expand Down
4 changes: 3 additions & 1 deletion src/getChildren/index.deep.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@ const children = [
{ props: { __TYPE: 'CustomComponent', active: true, children: 'Outer child active' }},
{ type: 'span' },
{ type: 'div' },
undefined,
{ type: 'div', props: { children: [null, {type: 'div'}] } },
];
React.Children.toArray = x => (x && Array.isArray(x) ? x : [x]).filter(z => z != undefined);
React.Children.toArray = x => (x && Array.isArray(x) ? x : [x]);

describe('getChildrenDeep', () => {
test('Deep find', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/getChildren/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const getChildrenDeep = <T=React.ReactNode, TC=React.ReactNode>(children:
output = [...output, child as TC];
}

if ((child as NannyNode).props?.children) {
if ((child as NannyNode)?.props?.children) {
output = [...output, ...getChildrenDeep<T, TC>((child as NannyNode).props.children, predicate)];
}
}
Expand Down
4 changes: 3 additions & 1 deletion src/getChildrenByType/index.deep.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@ const children = [
},
{ type: 'span' },
{ type: 'div' },
undefined,
{ type: 'div', props: { children: [null, {type: 'div'}] } },
];
React.Children.toArray = x => (x && Array.isArray(x) ? x : [x]).filter(z => z != undefined);
React.Children.toArray = x => (x && Array.isArray(x) ? x : [x]);

describe('getChildrenByTypeDeep', () => {
test('Deep Single', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/getChildrenByType/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export const getChildrenByTypeDeep = <T=React.ReactNode, TC=unknown>(children: T
output = [...output, child as T];
}

if ((child as NannyNode).props?.children && !(skipWhenFound && found)) {
if ((child as NannyNode)?.props?.children && !(skipWhenFound && found)) {
output = [...output, ...getChildrenByTypeDeep<T>((child as NannyNode).props.children, _types, { customTypeKey, skipWhenFound })];
}
}
Expand Down
Loading