Remove Platform check from WebSocket module #18056
Closed
Conversation
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
WebSocket uses the Platform module to check how many arguments for the `close` method should be used. In react-native-windows, we have the same number of arguments for `close` as Android, so we're prevented from using this module as-is because of the platform check (see https://github.com/Microsoft/react-native-windows/blob/master/Libraries/WebSocket/WebSocket.windows.js#L136). By switching to an argument count check, this module becomes more useful cross-platform. If you'd like to keep the platform check, I'm also open to inverting the conditional, e.g., `if (Platform.OS !== 'ios')`.
facebook-github-bot
added
CLA Signed
elicwhite
reviewed
Feb 22, 2018
Libraries/WebSocket/WebSocket.js
Outdated
| @@ -203,7 +202,7 @@ class WebSocket extends EventTarget(...WEBSOCKET_EVENTS) { | |||
| } | |||
|
|
|||
| _close(code?: number, reason?: string): void { | |||
| if (Platform.OS === 'android') { | |||
| if (WebSocketModule.close.length > 1) { | |||
There was a problem hiding this comment.
How about WebSocketModule.close.length === 3?
There was a problem hiding this comment.
Works for me. Coming right up.
elicwhite
approved these changes
Feb 23, 2018
facebook-github-bot
added
the
Import Started
facebook-github-bot
approved these changes
Feb 23, 2018
There was a problem hiding this comment.
@TheSavior is landing this pull request. If you are a Facebook employee, you can view this diff on Phabricator.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
WebSocket uses the Platform module to check how many arguments for the
closemethod should be used. In react-native-windows, we have the same number of arguments forcloseas Android, so we're prevented from using this module as-is because of the platform check (see https://github.com/Microsoft/react-native-windows/blob/master/Libraries/WebSocket/WebSocket.windows.js#L136).By switching to an argument count check, this module becomes more useful cross-platform. If you'd like to keep the platform check, I'm also open to inverting the conditional, e.g.,
if (Platform.OS !== 'ios').Motivation
I'd like to minimize the amount of code I need to copy over to react-native-windows for platform-specific overrides.
Test Plan
Run jest tests.
Related PRs
N/A
Release Notes
[GENERAL][MINOR][ENHANCEMENT][Libraries/WebSocket/WebSocket.js] - Better enable cross-platform support of WebSocket.js