Skip to content

Commit

Permalink
Partial React Sync from 241c4467...ad84625f8
Browse files Browse the repository at this point in the history
Summary:
Test sync of facebook/react#18068

- **[ad84625f8](facebook/react@ad84625f8 )**: [Native] Migrate focus/blur to call TextInputState with the host component (#18068) //<Eli White>//
- **[edab5c074](facebook/react@edab5c074 )**: Re-throw errors thrown by the renderer at the root in the complete phase (#18029) //<Andrew Clark>//
- **[a6dfe9aa4](facebook/react@a6dfe9aa4 )**: [Native] Delete NativeComponent and NativeMethodsMixin (#18036) //<Eli White>//

Changelog:
[Changed][General] Partial React Sync from 241c4467...ad84625f8

Reviewed By: mdvacca

Differential Revision: D19459322

fbshipit-source-id: daefcf854e3da1c849f8376671065c53a1319ef9
  • Loading branch information
elicwhite authored and facebook-github-bot committed Feb 19, 2020
1 parent 3b813ca commit 862c719
Show file tree
Hide file tree
Showing 12 changed files with 24 additions and 32 deletions.
6 changes: 2 additions & 4 deletions Libraries/Renderer/implementations/ReactFabric-dev.fb.js
Original file line number Diff line number Diff line change
Expand Up @@ -3963,13 +3963,11 @@ var ReactFabricHostComponent =
var _proto = ReactFabricHostComponent.prototype;

_proto.blur = function blur() {
ReactNativePrivateInterface.TextInputState.blurTextInput(this._nativeTag);
ReactNativePrivateInterface.TextInputState.blurTextInput(this);
};

_proto.focus = function focus() {
ReactNativePrivateInterface.TextInputState.focusTextInput(
this._nativeTag
);
ReactNativePrivateInterface.TextInputState.focusTextInput(this);
};

_proto.measure = function measure(callback) {
Expand Down
6 changes: 2 additions & 4 deletions Libraries/Renderer/implementations/ReactFabric-dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -3961,13 +3961,11 @@ var ReactFabricHostComponent =
var _proto = ReactFabricHostComponent.prototype;

_proto.blur = function blur() {
ReactNativePrivateInterface.TextInputState.blurTextInput(this._nativeTag);
ReactNativePrivateInterface.TextInputState.blurTextInput(this);
};

_proto.focus = function focus() {
ReactNativePrivateInterface.TextInputState.focusTextInput(
this._nativeTag
);
ReactNativePrivateInterface.TextInputState.focusTextInput(this);
};

_proto.measure = function measure(callback) {
Expand Down
4 changes: 2 additions & 2 deletions Libraries/Renderer/implementations/ReactFabric-prod.fb.js
Original file line number Diff line number Diff line change
Expand Up @@ -1540,10 +1540,10 @@ var ReactFabricHostComponent = (function() {
}
var _proto = ReactFabricHostComponent.prototype;
_proto.blur = function() {
ReactNativePrivateInterface.TextInputState.blurTextInput(this._nativeTag);
ReactNativePrivateInterface.TextInputState.blurTextInput(this);
};
_proto.focus = function() {
ReactNativePrivateInterface.TextInputState.focusTextInput(this._nativeTag);
ReactNativePrivateInterface.TextInputState.focusTextInput(this);
};
_proto.measure = function(callback) {
fabricMeasure(
Expand Down
4 changes: 2 additions & 2 deletions Libraries/Renderer/implementations/ReactFabric-prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -1531,10 +1531,10 @@ var ReactFabricHostComponent = (function() {
}
var _proto = ReactFabricHostComponent.prototype;
_proto.blur = function() {
ReactNativePrivateInterface.TextInputState.blurTextInput(this._nativeTag);
ReactNativePrivateInterface.TextInputState.blurTextInput(this);
};
_proto.focus = function() {
ReactNativePrivateInterface.TextInputState.focusTextInput(this._nativeTag);
ReactNativePrivateInterface.TextInputState.focusTextInput(this);
};
_proto.measure = function(callback) {
fabricMeasure(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1541,10 +1541,10 @@ var ReactFabricHostComponent = (function() {
}
var _proto = ReactFabricHostComponent.prototype;
_proto.blur = function() {
ReactNativePrivateInterface.TextInputState.blurTextInput(this._nativeTag);
ReactNativePrivateInterface.TextInputState.blurTextInput(this);
};
_proto.focus = function() {
ReactNativePrivateInterface.TextInputState.focusTextInput(this._nativeTag);
ReactNativePrivateInterface.TextInputState.focusTextInput(this);
};
_proto.measure = function(callback) {
fabricMeasure(
Expand Down
4 changes: 2 additions & 2 deletions Libraries/Renderer/implementations/ReactFabric-profiling.js
Original file line number Diff line number Diff line change
Expand Up @@ -1532,10 +1532,10 @@ var ReactFabricHostComponent = (function() {
}
var _proto = ReactFabricHostComponent.prototype;
_proto.blur = function() {
ReactNativePrivateInterface.TextInputState.blurTextInput(this._nativeTag);
ReactNativePrivateInterface.TextInputState.blurTextInput(this);
};
_proto.focus = function() {
ReactNativePrivateInterface.TextInputState.focusTextInput(this._nativeTag);
ReactNativePrivateInterface.TextInputState.focusTextInput(this);
};
_proto.measure = function(callback) {
fabricMeasure(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4047,13 +4047,11 @@ var ReactNativeFiberHostComponent =
var _proto = ReactNativeFiberHostComponent.prototype;

_proto.blur = function blur() {
ReactNativePrivateInterface.TextInputState.blurTextInput(this._nativeTag);
ReactNativePrivateInterface.TextInputState.blurTextInput(this);
};

_proto.focus = function focus() {
ReactNativePrivateInterface.TextInputState.focusTextInput(
this._nativeTag
);
ReactNativePrivateInterface.TextInputState.focusTextInput(this);
};

_proto.measure = function measure(callback) {
Expand Down
6 changes: 2 additions & 4 deletions Libraries/Renderer/implementations/ReactNativeRenderer-dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -4045,13 +4045,11 @@ var ReactNativeFiberHostComponent =
var _proto = ReactNativeFiberHostComponent.prototype;

_proto.blur = function blur() {
ReactNativePrivateInterface.TextInputState.blurTextInput(this._nativeTag);
ReactNativePrivateInterface.TextInputState.blurTextInput(this);
};

_proto.focus = function focus() {
ReactNativePrivateInterface.TextInputState.focusTextInput(
this._nativeTag
);
ReactNativePrivateInterface.TextInputState.focusTextInput(this);
};

_proto.measure = function measure(callback) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1554,10 +1554,10 @@ var ReactNativeFiberHostComponent = (function() {
}
var _proto = ReactNativeFiberHostComponent.prototype;
_proto.blur = function() {
ReactNativePrivateInterface.TextInputState.blurTextInput(this._nativeTag);
ReactNativePrivateInterface.TextInputState.blurTextInput(this);
};
_proto.focus = function() {
ReactNativePrivateInterface.TextInputState.focusTextInput(this._nativeTag);
ReactNativePrivateInterface.TextInputState.focusTextInput(this);
};
_proto.measure = function(callback) {
ReactNativePrivateInterface.UIManager.measure(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1544,10 +1544,10 @@ var ReactNativeFiberHostComponent = (function() {
}
var _proto = ReactNativeFiberHostComponent.prototype;
_proto.blur = function() {
ReactNativePrivateInterface.TextInputState.blurTextInput(this._nativeTag);
ReactNativePrivateInterface.TextInputState.blurTextInput(this);
};
_proto.focus = function() {
ReactNativePrivateInterface.TextInputState.focusTextInput(this._nativeTag);
ReactNativePrivateInterface.TextInputState.focusTextInput(this);
};
_proto.measure = function(callback) {
ReactNativePrivateInterface.UIManager.measure(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1555,10 +1555,10 @@ var ReactNativeFiberHostComponent = (function() {
}
var _proto = ReactNativeFiberHostComponent.prototype;
_proto.blur = function() {
ReactNativePrivateInterface.TextInputState.blurTextInput(this._nativeTag);
ReactNativePrivateInterface.TextInputState.blurTextInput(this);
};
_proto.focus = function() {
ReactNativePrivateInterface.TextInputState.focusTextInput(this._nativeTag);
ReactNativePrivateInterface.TextInputState.focusTextInput(this);
};
_proto.measure = function(callback) {
ReactNativePrivateInterface.UIManager.measure(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1545,10 +1545,10 @@ var ReactNativeFiberHostComponent = (function() {
}
var _proto = ReactNativeFiberHostComponent.prototype;
_proto.blur = function() {
ReactNativePrivateInterface.TextInputState.blurTextInput(this._nativeTag);
ReactNativePrivateInterface.TextInputState.blurTextInput(this);
};
_proto.focus = function() {
ReactNativePrivateInterface.TextInputState.focusTextInput(this._nativeTag);
ReactNativePrivateInterface.TextInputState.focusTextInput(this);
};
_proto.measure = function(callback) {
ReactNativePrivateInterface.UIManager.measure(
Expand Down

0 comments on commit 862c719

Please sign in to comment.