core(user-flow): add base flags option #14459
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| */ | ||
| _getNextFlags(flags) { | ||
| const clonedFlowFlags = this._options?.flags && deepClone(this._options?.flags); | ||
| if (!flags) return clonedFlowFlags; |
Collaborator
There was a problem hiding this comment.
nit: can this line be first?
Contributor
Author
There was a problem hiding this comment.
No, because then modifying the return value could affect the base flow flags when flags is undefined.
core/user-flow.js
Outdated
| */ | ||
| _getNextNavigationFlags(flags) { | ||
| const newStepFlags = {...flags}; | ||
| const newStepFlags = this._getNextFlags(flags) || {}; |
Collaborator
There was a problem hiding this comment.
nit: change name, or put || {} inside _getNextFlags
Contributor
Author
There was a problem hiding this comment.
I wanted _getNextFlags to return undefined if undefined is passed in.
_getNextNavigationFlags will never return undefined because we ensure that skipAboutBlank is set.
connorjclark
approved these changes
Oct 21, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Sorry for the churn, we did have this option before #14388. However, the step flags object would completely override the flow flags even if there were settings defined on the flow flags that were not defined on the step flags.
This PR should handle the flow flags and step flags properly, by merging them together with step specific flags taking precedence.