Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Support "onMouseEnter" and "onMouseLeave" props #231

Draft
wants to merge 15 commits into
base: window
Choose a base branch
from
Draft

Support "onMouseEnter" and "onMouseLeave" props #231

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a452209
feat: upgrade React to v16.6.3
aleclarson Jan 29, 2019
c3a959d
Log query name for fetchRelayQuery
alexeylang Jan 11, 2018
7d2f74b
RN: Remove React Stack Systrace Logic
yungsters Feb 20, 2018
a24dedb
Move TouchHistoryMath from React Repo to React Native
sebmarkbage Apr 6, 2018
d14d4a7
Move takeSnapshot from React repo to RN
sebmarkbage Apr 8, 2018
9246b13
fix: delete ReactNativePropRegistry
aleclarson Jan 28, 2019
a9c2266
fix: stop using ReactNativeComponentTree
aleclarson Jan 28, 2019
d2ad9c7
fix: stop using ReactNativeBridgeEventPlugin
aleclarson Jan 28, 2019
11144a8
throw when <View> exists in <Text>
aleclarson Jan 28, 2019
b412767
fix: remove unused Renderer shims
aleclarson Jan 28, 2019
9c0e377
fix: add @providesModule to updated Renderer shims
aleclarson Jan 28, 2019
d40506d
React sync for revisions 6bf5e85...aa94237
aleclarson Mar 14, 2019
d5420b4
Merge branch 'window' into enter-leave
aleclarson Mar 15, 2019
77998ae
fix: add "relatedTarget" to mouseOver and mouseOut events
aleclarson Mar 15, 2019
7681a87
feat: support "onMouseEnter" and "onMouseLeave" props
aleclarson Mar 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
RN: Remove React Stack Systrace Logic 
Reviewed By: sophiebits

Differential Revision: D7027263

fbshipit-source-id: f4eb3fab402eda337f464e4ebb0771202a9b93f2
  • Loading branch information
@yungsters @aleclarson
yungsters authored and aleclarson committed Jan 29, 2019
commit 7d2f74b1ac5ada0c191d3ae56bf76081da98503c
2 changes: 1 addition & 1 deletion Libraries/Core/InitializeCore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ Object.defineProperty(global.process, 'argv',
// Setup the Systrace profiling hooks if necessary
if (global.__RCTProfileIsProfiling) {
const Systrace = require('Systrace');
Systrace.installReactHook(true);
Systrace.installReactHook();
Systrace.setEnabled(true);
}

Expand Down
61 changes: 5 additions & 56 deletions Libraries/Performance/Systrace.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ let _asyncCookie = 0;
const _markStack = [];
let _markStackIndex = -1;
let _canInstallReactHook = false;
let _useFiber = false;

// Implements a subset of User Timing API necessary for React measurements.
// https://developer.mozilla.org/en-US/docs/Web/API/User_Timing_API
Expand Down Expand Up @@ -100,54 +99,13 @@ const userTimingPolyfill = __DEV__ ? {
},
} : null;

// A hook to get React Stack markers in Systrace.
const reactDebugToolHook = __DEV__ ? {
onBeforeMountComponent(debugID) {
const ReactComponentTreeHook = require('ReactGlobalSharedState').ReactComponentTreeHook;
const displayName = ReactComponentTreeHook.getDisplayName(debugID);
Systrace.beginEvent(`ReactReconciler.mountComponent(${displayName})`);
},
onMountComponent(debugID) {
Systrace.endEvent();
},
onBeforeUpdateComponent(debugID) {
const ReactComponentTreeHook = require('ReactGlobalSharedState').ReactComponentTreeHook;
const displayName = ReactComponentTreeHook.getDisplayName(debugID);
Systrace.beginEvent(`ReactReconciler.updateComponent(${displayName})`);
},
onUpdateComponent(debugID) {
Systrace.endEvent();
},
onBeforeUnmountComponent(debugID) {
const ReactComponentTreeHook = require('ReactGlobalSharedState').ReactComponentTreeHook;
const displayName = ReactComponentTreeHook.getDisplayName(debugID);
Systrace.beginEvent(`ReactReconciler.unmountComponent(${displayName})`);
},
onUnmountComponent(debugID) {
Systrace.endEvent();
},
onBeginLifeCycleTimer(debugID, timerType) {
const ReactComponentTreeHook = require('ReactGlobalSharedState').ReactComponentTreeHook;
const displayName = ReactComponentTreeHook.getDisplayName(debugID);
Systrace.beginEvent(`${displayName}.${timerType}()`);
},
onEndLifeCycleTimer(debugID, timerType) {
Systrace.endEvent();
},
} : null;

const Systrace = {
installReactHook(useFiber: boolean) {
installReactHook() {
if (_enabled) {
if (__DEV__) {
if (useFiber) {
global.performance = userTimingPolyfill;
} else {
require('ReactDebugTool').addHook(reactDebugToolHook);
}
global.performance = userTimingPolyfill;
}
}
_useFiber = useFiber;
_canInstallReactHook = true;
},

Expand All @@ -160,17 +118,8 @@ const Systrace = {
global.nativeTraceEndLegacy && global.nativeTraceEndLegacy(TRACE_TAG_JS_VM_CALLS);
}
if (_canInstallReactHook) {
if (_useFiber) {
if (enabled && global.performance === undefined) {
global.performance = userTimingPolyfill;
}
} else {
const ReactDebugTool = require('ReactDebugTool');
if (enabled) {
ReactDebugTool.addHook(reactDebugToolHook);
} else {
ReactDebugTool.removeHook(reactDebugToolHook);
}
if (enabled && global.performance === undefined) {
global.performance = userTimingPolyfill;
}
}
}
Expand Down Expand Up @@ -242,7 +191,7 @@ const Systrace = {
attachToRelayProfiler(relayProfiler: RelayProfiler) {
relayProfiler.attachProfileHandler('*', (name, state?) => {
if (state != null && state.queryName !== undefined) {
name += '_' + state.queryName
name += '_' + state.queryName;
}
const cookie = Systrace.beginAsyncEvent(name);
return () => {
Expand Down