status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use mergeFast in a hotspot 

Summary:
In profiling our app, we found that the usage
of `merge` in `Text.js` was showing up as a
hotspot. We've replaced this usage of `merge`
with `mergeFast`.

**Test plan (required)**

This change is used in my team's app.

Adam Comella
Microsoft Corp.
Closes https://github.com/facebook/react-native/pull/9654

Differential Revision: D3801791

fbshipit-source-id: 004652ed6537b557d00541ab2e5fbe64b56fa73b
This commit is contained in:
Adam Comella 2016-08-31 17:26:51 -07:00 committed by Facebook Github Bot 7
parent 17205aac57
commit 5d7227a822
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Libraries/Text/Text.js
View File

@ -22,11 +22,12 @@ const Touchable = require('Touchable');
const createReactNativeComponentClass = const createReactNativeComponentClass =
require('react/lib/createReactNativeComponentClass'); require('react/lib/createReactNativeComponentClass');
const merge = require('merge'); const merge = require('merge');
const mergeFast = require('mergeFast');
const stylePropType = StyleSheetPropType(TextStylePropTypes); const stylePropType = StyleSheetPropType(TextStylePropTypes);
const viewConfig = { const viewConfig = {
validAttributes: merge(ReactNativeViewAttributes.UIView, { validAttributes: mergeFast(ReactNativeViewAttributes.UIView, {
isHighlighted: true, isHighlighted: true,
numberOfLines: true, numberOfLines: true,
ellipsizeMode: true, ellipsizeMode: true,
@ -189,7 +190,7 @@ const Text = React.createClass({
}; };
}, },
getInitialState: function(): Object { getInitialState: function(): Object {
return merge(Touchable.Mixin.touchableGetInitialState(), { return mergeFast(Touchable.Mixin.touchableGetInitialState(), {
isHighlighted: false, isHighlighted: false,
}); });
}, },
@ -334,7 +335,7 @@ var RCTVirtualText = RCTText;
if (Platform.OS === 'android') { if (Platform.OS === 'android') {
RCTVirtualText = createReactNativeComponentClass({ RCTVirtualText = createReactNativeComponentClass({
validAttributes: merge(ReactNativeViewAttributes.UIView, { validAttributes: mergeFast(ReactNativeViewAttributes.UIView, {
isHighlighted: true, isHighlighted: true,
}), }),
uiViewClassName: 'RCTVirtualText', uiViewClassName: 'RCTVirtualText',