mirror of
https://github.com/Kong/insomnia
synced 2024-11-12 17:26:32 +00:00
0a616fba6b
* VCS proof of concept underway! * Stuff * Some things * Replace deprecated Electron makeSingleInstance * Rename `window` variables so not to be confused with window object * Don't unnecessarily update request when URL does not change * Regenerate package-lock * Fix tests + ESLint * Publish - insomnia-app@1.0.49 - insomnia-cookies@0.0.12 - insomnia-httpsnippet@1.16.18 - insomnia-importers@2.0.13 - insomnia-libcurl@0.0.23 - insomnia-prettify@0.1.7 - insomnia-url@0.1.6 - insomnia-xpath@1.0.9 - insomnia-plugin-base64@1.0.6 - insomnia-plugin-cookie-jar@1.0.8 - insomnia-plugin-core-themes@1.0.5 - insomnia-plugin-default-headers@1.1.9 - insomnia-plugin-file@1.0.7 - insomnia-plugin-hash@1.0.7 - insomnia-plugin-jsonpath@1.0.12 - insomnia-plugin-now@1.0.11 - insomnia-plugin-os@1.0.13 - insomnia-plugin-prompt@1.1.9 - insomnia-plugin-request@1.0.18 - insomnia-plugin-response@1.0.16 - insomnia-plugin-uuid@1.0.10 * Broken but w/e * Some tweaks * Big refactor. Create local snapshots and push done * POC merging and a lot of improvements * Lots of work done on initial UI/UX * Fix old tests * Atomic writes and size-based batches * Update StageEntry definition once again to be better * Factor out GraphQL query logic * Merge algorithm, history modal, other minor things * Fix test * Merge, checkout, revert w/ user changes now work * Force UI to refresh when switching branches changes active request * Rough draft pull() and some cleanup * E2EE stuff and some refactoring * Add ability to share project with team and fixed tests * VCS now created in root component and better remote project handling * Remove unused definition * Publish - insomnia-account@0.0.2 - insomnia-app@1.1.1 - insomnia-cookies@0.0.14 - insomnia-httpsnippet@1.16.20 - insomnia-importers@2.0.15 - insomnia-libcurl@0.0.25 - insomnia-prettify@0.1.9 - insomnia-sync@0.0.2 - insomnia-url@0.1.8 - insomnia-xpath@1.0.11 - insomnia-plugin-base64@1.0.8 - insomnia-plugin-cookie-jar@1.0.10 - insomnia-plugin-core-themes@1.0.7 - insomnia-plugin-file@1.0.9 - insomnia-plugin-hash@1.0.9 - insomnia-plugin-jsonpath@1.0.14 - insomnia-plugin-now@1.0.13 - insomnia-plugin-os@1.0.15 - insomnia-plugin-prompt@1.1.11 - insomnia-plugin-request@1.0.20 - insomnia-plugin-response@1.0.18 - insomnia-plugin-uuid@1.0.12 * Move some deps around * Fix Flow errors * Update package.json * Fix eslint errors * Fix tests * Update deps * bootstrap insomnia-sync * TRy fixing appveyor * Try something else * Bump lerna * try powershell * Try again * Fix imports * Fixed errors * sync types refactor * Show remote projects in workspace dropdown * Improved pulling of non-local workspaces * Loading indicators and some tweaks * Clean up sync staging modal * Some sync improvements: - No longer store stage - Upgrade Electron - Sync UI/UX improvements * Fix snyc tests * Upgraded deps and hot loader tweaks (it's broken for some reason) * Fix tests * Branches dialog, network refactoring, some tweaks * Fixed merging when other branch is empty * A bunch of small fixes from real testing * Fixed pull merge logic * Fix tests * Some bug fixes * A few small tweaks * Conflict resolution and other improvements * Fix tests * Add revert changes * Deal with duplicate projects per workspace * Some tweaks and accessibility improvements * Tooltip accessibility * Fix API endpoint * Fix tests * Remove jest dep from insomnia-importers
174 lines
4.0 KiB
JavaScript
174 lines
4.0 KiB
JavaScript
import React, { PureComponent } from 'react';
|
|
import PropTypes from 'prop-types';
|
|
import autobind from 'autobind-decorator';
|
|
import classnames from 'classnames';
|
|
import KeydownBinder from '../keydown-binder';
|
|
import { hotKeyRefs } from '../../../common/hotkeys';
|
|
import { pressedHotKey } from '../../../common/hotkeys-listener';
|
|
|
|
// Keep global z-index reference so that every modal will
|
|
// appear over top of an existing one.
|
|
let globalZIndex = 1000;
|
|
|
|
@autobind
|
|
class Modal extends PureComponent {
|
|
constructor(props) {
|
|
super(props);
|
|
|
|
this.state = {
|
|
open: false,
|
|
forceRefreshCounter: 0,
|
|
zIndex: globalZIndex,
|
|
};
|
|
}
|
|
|
|
async _handleKeyDown(e) {
|
|
if (!this.state.open) {
|
|
return;
|
|
}
|
|
|
|
// Don't check for close keys if we don't want them
|
|
if (this.props.noEscape) {
|
|
return;
|
|
}
|
|
|
|
const closeOnKeyCodes = this.props.closeOnKeyCodes || [];
|
|
const pressedEscape = await pressedHotKey(e, hotKeyRefs.CLOSE_MODAL);
|
|
const pressedCloseButton = closeOnKeyCodes.find(c => c === e.keyCode);
|
|
|
|
// Pressed escape
|
|
if (pressedEscape || pressedCloseButton) {
|
|
e.preventDefault();
|
|
this.hide();
|
|
this.props.onCancel && this.props.onCancel();
|
|
}
|
|
}
|
|
|
|
_handleClick(e) {
|
|
// Don't check for close keys if we don't want them
|
|
if (this.props.noEscape) {
|
|
return;
|
|
}
|
|
|
|
// Did we click a close button. Let's check a few parent nodes up as well
|
|
// because some buttons might have nested elements. Maybe there is a better
|
|
// way to check this?
|
|
let target = e.target;
|
|
let shouldHide = false;
|
|
|
|
for (let i = 0; i < 5; i++) {
|
|
if (target instanceof HTMLElement && target.hasAttribute('data-close-modal')) {
|
|
shouldHide = true;
|
|
break;
|
|
}
|
|
|
|
target = target.parentNode;
|
|
}
|
|
|
|
if (shouldHide) {
|
|
this.hide();
|
|
this.props.onCancel && this.props.onCancel();
|
|
}
|
|
}
|
|
|
|
_setModalRef(n) {
|
|
this._node = n;
|
|
}
|
|
|
|
show(options) {
|
|
const { freshState } = this.props;
|
|
const { forceRefreshCounter } = this.state;
|
|
|
|
this.setState({
|
|
open: true,
|
|
zIndex: globalZIndex++,
|
|
forceRefreshCounter: forceRefreshCounter + (freshState ? 1 : 0),
|
|
});
|
|
|
|
if (this.props.dontFocus) {
|
|
return;
|
|
}
|
|
|
|
// Allow instance-based onHide method
|
|
this.onHide = options ? options.onHide : null;
|
|
|
|
setTimeout(() => this._node && this._node.focus());
|
|
}
|
|
|
|
toggle() {
|
|
if (this.state.open) {
|
|
this.hide();
|
|
} else {
|
|
this.show();
|
|
}
|
|
}
|
|
|
|
isOpen() {
|
|
return this.state.open;
|
|
}
|
|
|
|
hide() {
|
|
this.setState({ open: false });
|
|
this.props.onHide && this.props.onHide();
|
|
this.onHide && this.onHide();
|
|
}
|
|
|
|
render() {
|
|
const { tall, wide, noEscape, className, children } = this.props;
|
|
const { open, zIndex, forceRefreshCounter } = this.state;
|
|
|
|
if (!open) {
|
|
return null;
|
|
}
|
|
|
|
const classes = classnames(
|
|
'modal',
|
|
'theme--dialog',
|
|
className,
|
|
{ 'modal--fixed-height': tall },
|
|
{ 'modal--noescape': noEscape },
|
|
{ 'modal--wide': wide },
|
|
);
|
|
|
|
const styles = {};
|
|
if (open) {
|
|
styles.zIndex = zIndex;
|
|
}
|
|
console.log('OPEN', open);
|
|
|
|
return (
|
|
<KeydownBinder stopMetaPropagation scoped onKeydown={this._handleKeyDown}>
|
|
<div
|
|
ref={this._setModalRef}
|
|
tabIndex="-1"
|
|
className={classes}
|
|
style={styles}
|
|
aria-hidden={!open}
|
|
onClick={this._handleClick}>
|
|
<div className="modal__backdrop overlay theme--transparent-overlay" data-close-modal />
|
|
<div className="modal__content__wrapper">
|
|
<div className="modal__content" key={forceRefreshCounter}>
|
|
{children}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</KeydownBinder>
|
|
);
|
|
}
|
|
}
|
|
|
|
Modal.propTypes = {
|
|
tall: PropTypes.bool,
|
|
wide: PropTypes.bool,
|
|
noEscape: PropTypes.bool,
|
|
dontFocus: PropTypes.bool,
|
|
closeOnKeyCodes: PropTypes.array,
|
|
onHide: PropTypes.func,
|
|
onCancel: PropTypes.func,
|
|
freshState: PropTypes.bool,
|
|
children: PropTypes.node,
|
|
className: PropTypes.string,
|
|
};
|
|
|
|
export default Modal;
|