diff --git a/react/react-addons-test-utils.d.ts b/react/react-addons-test-utils.d.ts
index 8bf50366e9..9807300ff4 100644
--- a/react/react-addons-test-utils.d.ts
+++ b/react/react-addons-test-utils.d.ts
@@ -6,7 +6,22 @@
///
declare namespace __React {
- interface SyntheticEventData {
+ interface OptionalEventProperties {
+ bubbles?: boolean;
+ cancelable?: boolean;
+ currentTarget?: EventTarget;
+ defaultPrevented?: boolean;
+ eventPhase?: number;
+ isTrusted?: boolean;
+ nativeEvent?: Event;
+ preventDefault?(): void;
+ stopPropagation?(): void;
+ target?: EventTarget;
+ timeStamp?: Date;
+ type?: string;
+ }
+
+ interface SyntheticEventData extends OptionalEventProperties {
altKey?: boolean;
button?: number;
buttons?: number;
@@ -41,8 +56,7 @@ declare namespace __React {
}
interface EventSimulator {
- (element: Element, eventData?: SyntheticEventData): void;
- (component: Component, eventData?: SyntheticEventData): void;
+ (element: Element | Component, eventData?: SyntheticEventData): void;
}
interface MockedComponentClass {
diff --git a/react/react-global-tests.ts b/react/react-global-tests.ts
index 3aaf4b2c1f..1ed7f8484e 100644
--- a/react/react-global-tests.ts
+++ b/react/react-global-tests.ts
@@ -418,9 +418,10 @@ React.createClass({
// TestUtils addon
// --------------------------------------------------------------------------
var node: Element;
+
React.addons.TestUtils.Simulate.click(node);
React.addons.TestUtils.Simulate.change(node);
-React.addons.TestUtils.Simulate.keyDown(node, { key: "Enter" });
+React.addons.TestUtils.Simulate.keyDown(node, { key: "Enter", cancelable: false });
var renderer: React.ShallowRenderer =
React.addons.TestUtils.createRenderer();
diff --git a/react/react-tests.ts b/react/react-tests.ts
index dc0a409dcf..5976fb23bd 100644
--- a/react/react-tests.ts
+++ b/react/react-tests.ts
@@ -553,7 +553,7 @@ var node: Element = TestUtils.renderIntoDocument(React.DOM.div());
TestUtils.Simulate.click(node);
TestUtils.Simulate.change(node);
-TestUtils.Simulate.keyDown(node, { key: "Enter" });
+TestUtils.Simulate.keyDown(node, { key: "Enter", cancelable: false });
var renderer: React.ShallowRenderer =
TestUtils.createRenderer();