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
9 changes: 5 additions & 4 deletions src/utils/_Popper.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import classnames from 'classnames';
import Foco from 'react-foco';
import { getModalManager } from './modalManager';
import keycode from 'keycode';
import { modalManager } from './modalManager';
import PropTypes from 'prop-types';
import React from 'react';
import ReactDOM from 'react-dom';
Expand All @@ -11,6 +11,7 @@ import { POPPER_PLACEMENTS, POPPER_SIZING_TYPES } from './constants';
class Popper extends React.Component {
constructor(props) {
super(props);
this.modalManager = getModalManager();
}

componentDidMount() {
Expand All @@ -36,19 +37,19 @@ class Popper extends React.Component {
_onShow() {
const container = ReactDOM.findDOMNode(this) || document.body;

modalManager.add(this, container);
this.modalManager.add(this, container);

document.addEventListener('keydown', this._handleDocumentKeyDown);
}

_onHide() {
modalManager.remove(this);
this.modalManager.remove(this);

document.removeEventListener('keydown', this._handleDocumentKeyDown);
}

_handleDocumentKeyDown = (e) => {
if (modalManager.isTopModal(this)) {
if (this.modalManager.isTopModal(this)) {
this.props.onKeyDown(e);

if (e.keyCode === keycode.codes.esc && this.props.onEscapeKey) {
Expand Down
10 changes: 9 additions & 1 deletion src/utils/modalManager.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
import ModalManager from 'react-overlays/ModalManager';

export let modalManager = new ModalManager({ hideSiblingNodes: false, handleContainerOverflow: false });
let modalManager;

export const getModalManager = () => {
if (modalManager) {
return modalManager;
}
modalManager = new ModalManager({ hideSiblingNodes: false, handleContainerOverflow: false });
return modalManager;
};
9 changes: 9 additions & 0 deletions src/utils/modalManager.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { getModalManager } from './modalManager';

describe('modal manager', () => {
it('is a singleton created on demand', () => {
const manager1 = getModalManager();
const manager2 = getModalManager();
expect(manager1).toBe(manager2);
});
});