* init * more shifting * Move @babel dependencies up to workspace root * Begin updating dependent libraries to use sync'd webpack builds w/ watches * Commit changes before a long weekend * Split packages into platform and extensions * Consolidate how/where we specify file/module type entrypoints * Make it possible to pass in extensions as App props * Resolve viewer's modules * Target for UMD bundle * Add Webpack Stylus loader * Provide WebPack build options for microscopy, vtk, and ui * Better entrypoint for extensions * Push changes up to switch PCs * Fix ESM symlink build for Viewers * Shift docs to root * Specify additional lerna config props * Begin providing basic readme info * Rename example extension folder * Shift links to bottom of doc * First attempt at a netlify deploy preview * Attempt to fix deploy preview build * push workspace enabled to initial command; remove second yarn install; use npx to call gitbook cli commands * Try to use global gitbook-cli * Export node_modules path * More agressive with modifying PATH * Follow deploy log output advice * try again to set bin path * Try swapping bash with a new shell * Try bash -l instead of exec bash * Annd let's try again * and again * We may have figured it out johnny, boy * We need to pull cornerstone-wado-image-loader files from hoisted node_modules * Attempt to fix ticks/escapes * Change copy syntax; try running tests on viewers from root for circleci * Lower version to match circleci image * Try alternative jest-canvas-mock location and version file syntax * Run version command instead of calling node directly * Try alternative jest transform * Set path and enable workspaces * Add codecov flags * Use cpx so our copying finishes? * Get all platform unit tests to run * Run and report individually and in parallel * Try once relying on codecov yaml to split w/ flags * Add projects to split by flags * Generate separate reports * Trigger codecov after everything has finished running; these may not support flags * Use recommended flags from issue comments for codecov * Fix typo * Remove clear flag * Shift back to calling codecov from root * Generate example for codecov issue * Try fixing paths * Simplify * Try using codecov orb * Bump circleci version * Upload core and viewer * Use full string paths * Remove individual codecov calls * Fix dir * Combine files before upload * Escape anchors * tryfix syntax * Escape string literal * Combine lines to reduce path * long paths * Use home alias * Fix filename * Try to see the contents of our cat'd file * Also upload `core` * Try running with aliased folder * Fix path; split PR and Merge unit tests into separate jobs * Set default threshold * Fix typo * Changing to scoped package names * Adding note * Catch more updates * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.0 - @ohif/extension-dicom-html@0.0.4-alpha.0 - @ohif/extension-dicom-microscopy@0.0.9-alpha.0 - @ohif/extension-dicom-pdf@0.0.8-alpha.0 - @ohif/extension-vtk@0.1.4-alpha.0 - @ohif/core@0.11.1-alpha.0 - @ohif/i18n@0.2.3-alpha.0 - @ohif/ui@0.2.18-alpha.0 - @ohif/viewer@0.0.22-alpha.0 * Clean up primary readme * Support for dev and dev:* commands * Shift build command; satisfy default PWA build * Remove old scripts * Clean up UI to set webpack scripts * Tidy up project links * Clean duplicate code in UI project * Update UI project's docs * Clean up ui and i18n config * Reduce duplicate code in `@ohif/core` * Fix @ohif/ui versions * bump @ohif/core versions * Redux testkit dep * Remove unused/duplicate config files for projects/packages * ohif-core --> @ohif/core * Safer publish command * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.1 - @ohif/extension-dicom-html@0.0.4-alpha.1 - @ohif/extension-dicom-microscopy@0.0.9-alpha.1 - @ohif/extension-dicom-pdf@0.0.8-alpha.1 - @ohif/extension-vtk@0.1.4-alpha.1 - @ohif/core@0.11.1-alpha.1 - @ohif/i18n@0.2.3-alpha.1 - @ohif/ui@0.2.18-alpha.1 - @ohif/viewer@0.0.22-alpha.1 * test version bump * Add global prettier config * chore(release): publish %s [skip ci] - @ohif/viewer@0.0.22-alpha.2 * test lerna publish * Update package.jsons * Fix build scripts * catch changes * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.2 - @ohif/extension-dicom-html@0.0.4-alpha.2 - @ohif/extension-dicom-microscopy@0.0.9-alpha.2 - @ohif/extension-dicom-pdf@0.0.8-alpha.2 - @ohif/extension-vtk@0.1.4-alpha.2 - @ohif/core@0.11.1-alpha.2 - @ohif/i18n@0.2.3-alpha.2 - @ohif/ui@0.2.18-alpha.2 - @ohif/viewer@0.0.22-alpha.3 * fix eslint issues caused by eslint 6 and our react-app config * Publish with canary tag * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.3 - @ohif/extension-dicom-html@0.0.4-alpha.3 - @ohif/extension-dicom-microscopy@0.0.9-alpha.3 - @ohif/extension-dicom-pdf@0.0.8-alpha.3 - @ohif/extension-vtk@0.1.4-alpha.3 - @ohif/core@0.11.1-alpha.3 - @ohif/i18n@0.2.3-alpha.3 - @ohif/ui@0.2.18-alpha.3 - @ohif/viewer@0.0.22-alpha.4 * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.4 - @ohif/extension-dicom-html@0.0.4-alpha.4 - @ohif/extension-dicom-microscopy@0.0.9-alpha.4 - @ohif/extension-dicom-pdf@0.0.8-alpha.4 - @ohif/extension-vtk@0.1.4-alpha.4 - @ohif/core@0.11.1-alpha.4 - @ohif/i18n@0.2.3-alpha.4 - @ohif/ui@0.2.18-alpha.4 - @ohif/viewer@0.0.22-alpha.5 * Simplify build * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.5 - @ohif/extension-dicom-html@0.0.4-alpha.5 - @ohif/extension-dicom-microscopy@0.0.9-alpha.5 - @ohif/extension-dicom-pdf@0.0.8-alpha.5 - @ohif/extension-vtk@0.1.4-alpha.5 - @ohif/core@0.11.1-alpha.5 - @ohif/i18n@0.2.3-alpha.5 - @ohif/ui@0.2.18-alpha.5 - @ohif/viewer@0.0.22-alpha.6 * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.6 - @ohif/extension-dicom-html@0.0.4-alpha.6 - @ohif/extension-dicom-microscopy@0.0.9-alpha.6 - @ohif/extension-dicom-pdf@0.0.8-alpha.6 - @ohif/extension-vtk@0.1.4-alpha.6 - @ohif/core@0.11.1-alpha.6 - @ohif/i18n@0.2.3-alpha.6 - @ohif/ui@0.2.18-alpha.6 - @ohif/viewer@0.0.22-alpha.7 * Split version and publish * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.7 - @ohif/extension-dicom-html@0.0.4-alpha.7 - @ohif/extension-dicom-microscopy@0.0.9-alpha.7 - @ohif/extension-dicom-pdf@0.0.8-alpha.7 - @ohif/extension-vtk@0.1.4-alpha.7 - @ohif/core@0.11.1-alpha.7 - @ohif/i18n@0.2.3-alpha.7 - @ohif/ui@0.2.18-alpha.7 - @ohif/viewer@0.0.22-alpha.8 * Try simplify netlify build * react-viewerbase --> @ohif/ui * add test for stylus loader * Try new way to specify publish path * Use an output folder that won't be ignored * Try move command * fiddle with paths * Dig for some information * Make sure we're in root for our commands * Remove discovery * Setup script-tag example * Fix typo * Move config folder * Update cornerstone extension to use shared/root webpack configs * capture changes * Update extension webpack configs * Don't check in docz output * Fix babel runtime resolution issue * Simplify ui build steps * Push in progress * Shift directories * Get viewer dev path to work * Fix viewer commonjs build * Fix build pwa config for viewers * Make sure our package specific command can be called from root * Update notes * Fix imports and misc. merge notes * Bump wado-image-loader version * Switch up commands to remove webworkers copy * Fix CI config * Fix more broken package references * Add react-dropzone * Persist so e2e test can use * Fix lockfile * Use cypress orb to simplify CI * Fix config * Try again * Install yarn latest for orb * Install yarn a different way * Wait on correct port * Run tests in viewer project * Fix cypress config * Make Cypress happier - use default location * Simplify e2e testing * Capture UI changes since fork * Catch core up * Grab latest deps after merge * Fix broken import * Make sure cornerstone-wado-image-loader resolves to 3+ * Note regarding orbs * Fix refresh on 404 routes * Fix odd error for cornerstone-wado-image-loader * Different target for UMD * Simplify dev script * Try to get fancy with netlify output * Let's do it again * Try to fix measurementTools issue * See if we can get our lerna magic to work on merge to monorepo branch
278 lines
7.6 KiB
JavaScript
278 lines
7.6 KiB
JavaScript
import './HotKeysPreferences.styl';
|
|
import React, { Component } from 'react';
|
|
import {
|
|
allowedKeys,
|
|
disallowedCombinations,
|
|
specialKeys,
|
|
} from './hotKeysConfig.js';
|
|
|
|
import PropTypes from 'prop-types';
|
|
|
|
export class HotKeysPreferences extends Component {
|
|
static propTypes = {
|
|
hotKeysData: PropTypes.objectOf(
|
|
PropTypes.shape({
|
|
keys: PropTypes.arrayOf(PropTypes.string).isRequired,
|
|
label: PropTypes.string.isRequired,
|
|
})
|
|
).isRequired,
|
|
onChange: PropTypes.func,
|
|
};
|
|
|
|
constructor(props) {
|
|
super(props);
|
|
|
|
const hotkeyCommands = Object.keys(this.props.hotKeysData);
|
|
const localHotKeys = hotkeyCommands.map(commandName => {
|
|
const definition = this.props.hotKeysData[commandName];
|
|
|
|
return {
|
|
commandName,
|
|
keys: definition.keys,
|
|
label: definition.label,
|
|
};
|
|
});
|
|
|
|
this.state = {
|
|
hotKeys: localHotKeys,
|
|
errorMessages: {},
|
|
};
|
|
|
|
this.onInputKeyDown = this.onInputKeyDown.bind(this);
|
|
}
|
|
|
|
/**
|
|
* Normalizes the keys used in a KeyPress event and returns an array of the
|
|
* keys pressed
|
|
*
|
|
* @param {KeyDownEvent} keyDownEvent
|
|
* @returns {string[]}
|
|
*/
|
|
getKeysPressedArray(keyDownEvent) {
|
|
const keysPressedArray = [];
|
|
const { ctrlKey, altKey, shiftKey } = keyDownEvent;
|
|
|
|
if (ctrlKey && !altKey) {
|
|
keysPressedArray.push('CTRL');
|
|
}
|
|
|
|
if (shiftKey && !altKey) {
|
|
keysPressedArray.push('SHIFT');
|
|
}
|
|
|
|
if (altKey && !ctrlKey) {
|
|
keysPressedArray.push('ALT');
|
|
}
|
|
|
|
return keysPressedArray;
|
|
}
|
|
|
|
getConflictingCommand(currentToolKey, hotKeyCommand) {
|
|
return Object.keys(this.state.hotKeys).find(tool => {
|
|
const value = this.state.hotKeys[tool].command;
|
|
return value && value === hotKeyCommand && tool !== currentToolKey;
|
|
});
|
|
}
|
|
|
|
/**
|
|
*
|
|
* @param {String} commandName
|
|
* @param {KeyDownEvent} keyDownEvent
|
|
* @param {Boolean} [displayPressedKey=false]
|
|
*/
|
|
updateInputText(commandName, keyDownEvent, displayPressedKey = false) {
|
|
const pressedKeys = this.getKeysPressedArray(keyDownEvent);
|
|
|
|
if (displayPressedKey) {
|
|
const specialKeyName = specialKeys[keyDownEvent.which];
|
|
const keyName =
|
|
specialKeyName ||
|
|
keyDownEvent.key ||
|
|
String.fromCharCode(keyDownEvent.keyCode);
|
|
pressedKeys.push(keyName.toUpperCase());
|
|
}
|
|
|
|
this.updateHotKeysState(commandName, pressedKeys.join('+'));
|
|
}
|
|
|
|
updateHotKeysState(commandName, keys) {
|
|
const hotKeys = this.state.hotKeys;
|
|
const hotKeyIndex = this.state.hotKeys.findIndex(
|
|
x => x.commandName === commandName
|
|
);
|
|
hotKeys[hotKeyIndex].keys[0] = keys;
|
|
this.setState({ hotKeys });
|
|
}
|
|
|
|
updateErrorsState(toolKey, errorMessage) {
|
|
const errorMessages = this.state.errorMessages;
|
|
errorMessages[toolKey] = errorMessage;
|
|
this.setState({ errorMessages });
|
|
}
|
|
|
|
onInputKeyDown(event, commandName) {
|
|
// Prevent ESC key from propagating and closing the modal
|
|
if (event.key === 'Escape') {
|
|
event.stopPropagation();
|
|
}
|
|
|
|
if (allowedKeys.includes(event.keyCode)) {
|
|
this.updateInputText(commandName, event, true);
|
|
} else {
|
|
this.updateInputText(commandName, event, false);
|
|
}
|
|
|
|
event.preventDefault();
|
|
}
|
|
|
|
onChange(event, commandName) {
|
|
if (event.ctrlKey || event.altKey || event.shiftKey) {
|
|
return;
|
|
}
|
|
|
|
const hotKeyIndex = this.state.hotKeys.findIndex(
|
|
x => x.commandName === commandName
|
|
);
|
|
const hotKey = this.state.hotKeys[hotKeyIndex];
|
|
const keys = hotKey.keys[0];
|
|
const pressedKeys = keys.split('+');
|
|
const lastPressedKey = pressedKeys[pressedKeys.length - 1].toUpperCase();
|
|
|
|
// clear the prior errors
|
|
this.setState({ errorMessages: {} }, () => {
|
|
// Check if it has a valid modifier
|
|
const isModifier = ['CTRL', 'ALT', 'SHIFT'].includes(lastPressedKey);
|
|
if (isModifier) {
|
|
this.updateHotKeysState(commandName, '');
|
|
this.updateErrorsState(
|
|
commandName,
|
|
"It's not possible to define only modifier keys (CTRL, ALT and SHIFT) as a shortcut"
|
|
);
|
|
return;
|
|
}
|
|
|
|
/*
|
|
* Check if it has some conflict
|
|
*/
|
|
const conflictedCommandKey = this.getConflictingCommand(
|
|
commandName,
|
|
keys
|
|
);
|
|
if (conflictedCommandKey) {
|
|
const conflictedCommand = this.state.hotKeys[conflictedCommandKey];
|
|
|
|
this.updateErrorsState(
|
|
commandName,
|
|
`"${conflictedCommand.label}" is already using the "${
|
|
conflictedCommand.command
|
|
}" shortcut.`
|
|
);
|
|
this.updateErrorsState(conflictedCommandKey, '');
|
|
this.updateHotKeysState(commandName, '');
|
|
return;
|
|
}
|
|
|
|
/*
|
|
* Check if is a valid combination
|
|
*/
|
|
const modifierCommand = pressedKeys
|
|
.slice(0, pressedKeys.length - 1)
|
|
.join('+')
|
|
.toUpperCase();
|
|
|
|
const disallowedCombination = disallowedCombinations[modifierCommand];
|
|
const hasDisallowedCombinations = disallowedCombination
|
|
? disallowedCombination.includes(lastPressedKey)
|
|
: false;
|
|
|
|
if (hasDisallowedCombinations) {
|
|
this.updateHotKeysState(commandName, '');
|
|
this.updateErrorsState(
|
|
commandName,
|
|
"It's not possible to define only modifier keys (CTRL, ALT and SHIFT) as a shortcut"
|
|
);
|
|
return;
|
|
}
|
|
});
|
|
}
|
|
|
|
renderRow({ commandName, label, keys }) {
|
|
return (
|
|
<tr key={commandName}>
|
|
<td className="text-right p-r-1">{label}</td>
|
|
<td width="200">
|
|
<label
|
|
className={`wrapperLabel ${
|
|
this.state.errorMessages[commandName] !== undefined
|
|
? 'state-error'
|
|
: ''
|
|
} `}
|
|
ref={input => (this[commandName] = input)}
|
|
data-key="defaultTool"
|
|
>
|
|
<input
|
|
readOnly={true}
|
|
type="text"
|
|
value={keys[0]}
|
|
vali="true"
|
|
className="form-control hotkey text-center"
|
|
onKeyDown={event => this.onInputKeyDown(event, commandName)}
|
|
onKeyUp={event => this.onChange(event, commandName)}
|
|
/>
|
|
<span className="wrapperText" />
|
|
<span className="errorMessage">
|
|
{this.state.errorMessages[commandName]}
|
|
</span>
|
|
</label>
|
|
</td>
|
|
</tr>
|
|
);
|
|
}
|
|
|
|
render() {
|
|
const halfWayThough = Math.floor(this.state.hotKeys.length / 2);
|
|
const firstHalfHotkeys = this.state.hotKeys.slice(0, halfWayThough);
|
|
const secondHalfHotkeys = this.state.hotKeys.slice(
|
|
halfWayThough,
|
|
this.state.hotKeys.length
|
|
);
|
|
|
|
return (
|
|
<div className="HotKeysPreferences">
|
|
{/* <!-- Column 1 --> */}
|
|
<div className="column">
|
|
<table className="full-width">
|
|
<thead>
|
|
<tr>
|
|
<th className="text-right p-r-1">Function</th>
|
|
<th className="text-center">Shortcut</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
{firstHalfHotkeys.map(hotkeyDefinition =>
|
|
this.renderRow(hotkeyDefinition)
|
|
)}
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
{/* <!-- Column 2 --> */}
|
|
<div className="column">
|
|
<table className="full-width">
|
|
<thead>
|
|
<tr>
|
|
<th className="text-right p-r-1">Function</th>
|
|
<th className="text-center">Shortcut</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
{secondHalfHotkeys.map(hotkeyDefinition =>
|
|
this.renderRow(hotkeyDefinition)
|
|
)}
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
</div>
|
|
);
|
|
}
|
|
}
|