-
Notifications
You must be signed in to change notification settings - Fork 161
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.
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
React Hooks v16.8 #121
Merged
Merged
React Hooks v16.8 #121
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -120,3 +120,29 @@ fun <P : RProps> forwardRef(handler: RBuilder.(RProps, RRef) -> Unit): RClass<P> | |
buildElements { handler(props, ref) } | ||
} | ||
} | ||
|
||
typealias FunctionalComponent<P> = (props: P) -> dynamic | ||
|
||
/** | ||
* Get functional component from [func] | ||
*/ | ||
fun <P : RProps> functionalComponent( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
func: RBuilder.(props: P) -> Unit | ||
): FunctionalComponent<P> { | ||
return { props: P -> | ||
buildElements { | ||
func(props) | ||
} | ||
} | ||
} | ||
|
||
/** | ||
* Append functional component [functionalComponent] as child of current builder | ||
*/ | ||
fun <P : RProps> RBuilder.child( | ||
functionalComponent: FunctionalComponent<P>, | ||
props: P = jsObject {}, | ||
handler: RHandler<P> = {} | ||
): ReactElement { | ||
return child(functionalComponent, props, handler) | ||
} |
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
package react | ||
|
||
typealias RDependenciesArray = Array<dynamic> | ||
typealias RDependenciesList = List<dynamic> | ||
|
||
typealias RSetState<T> = (value: T) -> Unit | ||
fun <T> useState(initValue: T): Pair<T, RSetState<T>> { | ||
val jsTuple = rawUseState(initValue) | ||
val currentValue = jsTuple[0] as T | ||
val setState = jsTuple[1] as RSetState<T> | ||
return currentValue to setState | ||
} | ||
|
||
typealias RReducer<S, A> = (state: S, action: A) -> S | ||
typealias RDispatch<A> = (action: A) -> Unit | ||
fun <S, A> useReducer(reducer: RReducer<S, A>, initState: S, initialAction: A? = null): Pair<S, RDispatch<A>> { | ||
val jsTuple = if (initialAction != null) { | ||
rawUseReducer(reducer, initState, initialAction) | ||
} else { | ||
rawUseReducer(reducer, initState) | ||
} | ||
val currentState = jsTuple[0] as S | ||
val dispatch = jsTuple[1] as RDispatch<A> | ||
return currentState to dispatch | ||
} | ||
|
||
fun <S, A> useReducer(reducer: RReducer<S?, A>): Pair<S?, RDispatch<A>> { | ||
return useReducer(reducer, null) | ||
} | ||
|
||
typealias RCleanup = () -> Unit | ||
fun useEffectWithCleanup(dependencies: RDependenciesList? = null, effect: () -> RCleanup) { | ||
if (dependencies != null) { | ||
rawUseEffect(effect, dependencies.toTypedArray()) | ||
} else { | ||
rawUseEffect(effect) | ||
} | ||
} | ||
|
||
fun useEffect(dependencies: RDependenciesList? = null, effect: () -> Unit) { | ||
val rawEffect = { | ||
effect() | ||
undefined | ||
} | ||
if (dependencies != null) { | ||
rawUseEffect(rawEffect, dependencies.toTypedArray()) | ||
} else { | ||
rawUseEffect(rawEffect) | ||
} | ||
} | ||
|
||
fun useLayoutEffectWithCleanup(dependencies: RDependenciesList? = null, effect: () -> RCleanup) { | ||
if (dependencies != null) { | ||
rawUseLayoutEffect(effect, dependencies.toTypedArray()) | ||
} else { | ||
rawUseLayoutEffect(effect) | ||
} | ||
} | ||
|
||
fun useLayoutEffect(dependencies: RDependenciesList? = null, effect: () -> Unit) { | ||
val rawEffect = { | ||
effect() | ||
undefined | ||
} | ||
if (dependencies != null) { | ||
rawUseLayoutEffect(rawEffect, dependencies.toTypedArray() | ||
) | ||
} else { | ||
rawUseLayoutEffect(rawEffect) | ||
} | ||
} |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we use
initialAction: A = definedExternally
and avoid duplicating the function?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't sure that it's equal in converted js. And this "optimisation" is unnecessary.