Skip to content

Add cursor to visitor #34

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

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

Add cursor to visitor #34

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
15 changes: 8 additions & 7 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,10 @@ export default function reactTreeWalker(
return undefined
}

const recursive = (currentElement, currentContext) => {
const recursive = (currentElement, currentContext, cursor) => {
if (Array.isArray(currentElement)) {
return Promise.all(
currentElement.map(item => recursive(item, currentContext)),
currentElement.map(item => recursive(item, currentContext, cursor.concat(currentElement))),
)
}

Expand All @@ -109,7 +109,7 @@ export default function reactTreeWalker(
typeof currentElement === 'number'
) {
// Just visit these, they are leaves so we don't keep traversing.
safeVisitor(currentElement, null, currentContext)
safeVisitor(currentElement, null, currentContext, null, cursor)
return Promise.resolve()
}

Expand All @@ -127,6 +127,7 @@ export default function reactTreeWalker(
compInstance,
elContext,
childContext,
cursor,
),
)
.then(result => {
Expand All @@ -144,14 +145,14 @@ export default function reactTreeWalker(
children,
child =>
child
? recursive(child, childContext)
? recursive(child, childContext, cursor.concat(currentElement))
: Promise.resolve(),
)
.then(innerResolve, reject)
.catch(reject)
}
// Otherwise we pass the individual child to the next recursion.
return recursive(children, childContext)
return recursive(children, childContext, cursor.concat(currentElement))
.then(innerResolve, reject)
.catch(reject)
}
Expand Down Expand Up @@ -252,14 +253,14 @@ export default function reactTreeWalker(
) {
return Promise.all(
currentElement.children.props.children.map(child =>
recursive(child, currentContext),
recursive(child, currentContext, cursor.concat(currentElement)),
),
)
}

return Promise.resolve()
}

recursive(tree, context).then(resolve, reject)
recursive(tree, context, []).then(resolve, reject)
})
}