Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
49 changes: 0 additions & 49 deletions packages/legacy-events/__tests__/accumulate-test.internal.js

This file was deleted.

49 changes: 0 additions & 49 deletions packages/legacy-events/__tests__/accumulateInto-test.internal.js

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,9 @@

'use strict';

let EventPluginGetListener;
let EventPluginRegistry;
let React;
let ReactDOM;
let ReactDOMComponentTree;
let listenToEvent;
let ReactDOMEventListener;
let ReactTestUtils;
let ReactFeatureFlags;

let idCallOrder;
const recordID = function(id) {
Expand All @@ -33,50 +27,27 @@ const recordIDAndReturnFalse = function(id, event) {
};
const LISTENER = jest.fn();
const ON_CLICK_KEY = 'onClick';
const ON_CHANGE_KEY = 'onChange';
const ON_MOUSE_ENTER_KEY = 'onMouseEnter';

let GRANDPARENT;
let PARENT;
let CHILD;
let BUTTON;

let getListener;
let putListener;
let deleteAllListeners;

let container;

function registerSimpleTestHandler() {
putListener(CHILD, ON_CLICK_KEY, LISTENER);
const listener = getListener(CHILD, ON_CLICK_KEY);
expect(listener).toEqual(LISTENER);
return getListener(CHILD, ON_CLICK_KEY);
}

// We should probably remove this file at some point, it's just full of
// internal API usage.
// This test is written in a bizarre way because it was previously using internals.
// It should probably be rewritten but we're keeping it for some extra coverage.
describe('ReactBrowserEventEmitter', () => {
beforeEach(() => {
jest.resetModules();
LISTENER.mockClear();

ReactFeatureFlags = require('shared/ReactFeatureFlags');
EventPluginGetListener = require('react-dom/src/events/getListener')
.default;
EventPluginRegistry = require('legacy-events/EventPluginRegistry');
React = require('react');
ReactDOM = require('react-dom');
ReactDOMComponentTree = require('../client/ReactDOMComponentTree');
if (ReactFeatureFlags.enableModernEventSystem) {
listenToEvent = require('../events/DOMModernPluginEventSystem')
.listenToEvent;
} else {
listenToEvent = require('../events/DOMLegacyEventPluginSystem')
.legacyListenToEvent;
}

ReactDOMEventListener = require('../events/ReactDOMEventListener');
ReactTestUtils = require('react-dom/test-utils');

container = document.createElement('div');
Expand Down Expand Up @@ -111,10 +82,6 @@ describe('ReactBrowserEventEmitter', () => {

renderTree();

getListener = function(node, eventName) {
const inst = ReactDOMComponentTree.getInstanceFromNode(node);
return EventPluginGetListener(inst, eventName);
};
putListener = function(node, eventName, listener) {
switch (node) {
case CHILD:
Expand Down Expand Up @@ -159,47 +126,6 @@ describe('ReactBrowserEventEmitter', () => {
container = null;
});

it('should store a listener correctly', () => {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Meh on these.

registerSimpleTestHandler();
const listener = getListener(CHILD, ON_CLICK_KEY);
expect(listener).toBe(LISTENER);
});

it('should retrieve a listener correctly', () => {
registerSimpleTestHandler();
const listener = getListener(CHILD, ON_CLICK_KEY);
expect(listener).toEqual(LISTENER);
});

it('should not retrieve listeners on a disabled interactive element', () => {
putListener(BUTTON, ON_MOUSE_ENTER_KEY, recordID.bind(null, BUTTON));
const listener = getListener(BUTTON, ON_MOUSE_ENTER_KEY);
expect(listener).toBe(null);
});

it('should clear all handlers when asked to', () => {
registerSimpleTestHandler();
deleteAllListeners(CHILD);
const listener = getListener(CHILD, ON_CLICK_KEY);
expect(listener).toBe(undefined);
});

it('should invoke a simple handler registered on a node', () => {
registerSimpleTestHandler();
CHILD.click();
expect(LISTENER).toHaveBeenCalledTimes(1);
});

it('should not invoke handlers if ReactDOMEventListener is disabled', () => {
registerSimpleTestHandler();
ReactDOMEventListener.setEnabled(false);
CHILD.click();
expect(LISTENER).toHaveBeenCalledTimes(0);
ReactDOMEventListener.setEnabled(true);
CHILD.click();
expect(LISTENER).toHaveBeenCalledTimes(1);
});

it('should bubble simply', () => {
putListener(CHILD, ON_CLICK_KEY, recordID.bind(null, CHILD));
putListener(PARENT, ON_CLICK_KEY, recordID.bind(null, PARENT));
Expand Down Expand Up @@ -356,41 +282,4 @@ describe('ReactBrowserEventEmitter', () => {
expect(idCallOrder.length).toBe(1);
expect(idCallOrder[0]).toBe(CHILD);
});

it('should listen to events only once', () => {
spyOnDevAndProd(EventTarget.prototype, 'addEventListener');
listenToEvent(ON_CLICK_KEY, document);
listenToEvent(ON_CLICK_KEY, document);
expect(EventTarget.prototype.addEventListener).toHaveBeenCalledTimes(1);
});

it('should work with event plugins without dependencies', () => {
spyOnDevAndProd(EventTarget.prototype, 'addEventListener');

listenToEvent(ON_CLICK_KEY, document);

expect(EventTarget.prototype.addEventListener.calls.argsFor(0)[0]).toBe(
'click',
);
});

it('should work with event plugins with dependencies', () => {
spyOnDevAndProd(EventTarget.prototype, 'addEventListener');

listenToEvent(ON_CHANGE_KEY, document);

const setEventListeners = [];
const listenCalls = EventTarget.prototype.addEventListener.calls.allArgs();
for (let i = 0; i < listenCalls.length; i++) {
setEventListeners.push(listenCalls[i][1]);
}

const module = EventPluginRegistry.registrationNameModules[ON_CHANGE_KEY];
const dependencies = module.eventTypes.change.dependencies;
expect(setEventListeners.length).toEqual(dependencies.length);

for (let i = 0; i < setEventListeners.length; i++) {
expect(dependencies.indexOf(setEventListeners[i])).toBeTruthy();
}
});
});
2 changes: 2 additions & 0 deletions packages/react-dom/src/events/ReactDOMEventListener.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ const {
// TODO: can we stop exporting these?
export let _enabled = true;

// This is exported in FB builds for use by legacy FB layer infra.
// We'd like to remove this but it's not clear if this is safe.
export function setEnabled(enabled: ?boolean) {
_enabled = !!enabled;
}
Expand Down