* fix: study list translations * Don't render until translations are ready * Try to wait for translations to load * Use null to render "nothing" * Try toggling useSuspense off up a layer * logging * Remove useSuspense false flags * DO NOT OPEN A PR WITH IT. Experimental changes only. Try to solve issues with useTranslation hooks #Please enter the commit message for your changes. Lines starting * Remove unecessary changes * feat: 🎸 useMedia hook to not use one more prop for upd state vl * docs: Add license scan report and status (#1161) Signed-off-by: fossabot <badges@fossa.io> * fix: 🐛 Fix for JS breaking on header (#1164) * feat: 🎸 Code review and refact Revised code based on PRs(variable alias,...). Changed hook for useMedia. Now, it provides two hooks: one to get displayMediaSize and other to get Entity(component, objects...) based on displayMediaSize. Implemented a similar solution for state manager to store mediaQueryList(s) and displaySize for app. * feat: 🎸 Fine tunning on mediaQuery value, fixed issue about it * fix: 🐛 Fixed issue and refactoring Fixed js exception and also refactoring userPreferences components to functional component * fix: 🐛 Code review. Localstorage fix minor bugs * fix: 🐛 Ensure hotkey lower case always * fix: translation switcher * chore(release): publish [skip ci] - @ohif/extension-vtk@0.53.6 - @ohif/ui@0.62.1 - @ohif/viewer@2.8.2 * Add new modal service * Change serviceManager prop to servicesManager * CR Update: fix casing and add required proptypes to providers * CR Update: Improve ohifmodal proptypes * CR Update: Fix typo in extensionmanager * CR Update: add default props to service and check service in provider * Refactor modal provider to better use its own state * ci: don't build our master branch (#1177) * ci: don't build our master branch * Add netlify-cli as a dev dependency * ci: trying a sheltered merge flow for promotions * Use modal instead of modal context * Ci/promotable builds (#1179) * ci: don't build our master branch * Add netlify-cli as a dev dependency * ci: trying a sheltered merge flow for promotions * ci: try building with QUICK_BUILD flag * Change modal children order * Ci/promotable builds (#1180) * ci: don't build our master branch * Add netlify-cli as a dev dependency * ci: trying a sheltered merge flow for promotions * ci: try building with QUICK_BUILD flag * Try using ~/repo prefix in command * Ci/promotable builds (#1181) * ci: don't build our master branch * Add netlify-cli as a dev dependency * ci: trying a sheltered merge flow for promotions * ci: try building with QUICK_BUILD flag * Try using ~/repo prefix in command * ci: make sure netlify command is available * Ci/promotable builds (#1182) * ci: don't build our master branch * Add netlify-cli as a dev dependency * ci: trying a sheltered merge flow for promotions * ci: try building with QUICK_BUILD flag * Try using ~/repo prefix in command * ci: make sure netlify command is available * ci: use sudo for global command * Fix OHIFModal proptypes * Ci/promotable builds (#1183) * ci: don't build our master branch * Add netlify-cli as a dev dependency * ci: trying a sheltered merge flow for promotions * ci: try building with QUICK_BUILD flag * Try using ~/repo prefix in command * ci: make sure netlify command is available * ci: use sudo for global command * Inline personal access token w/ env var * Ci/promotable builds (#1184) * ci: don't build our master branch * Add netlify-cli as a dev dependency * ci: trying a sheltered merge flow for promotions * ci: try building with QUICK_BUILD flag * Try using ~/repo prefix in command * ci: make sure netlify command is available * ci: use sudo for global command * Inline personal access token w/ env var * ci: workaround for sudo limitations * ci: restore release workflow (#1185) * ci: don't build our master branch * Add netlify-cli as a dev dependency * ci: trying a sheltered merge flow for promotions * ci: try building with QUICK_BUILD flag * Try using ~/repo prefix in command * ci: make sure netlify command is available * ci: use sudo for global command * Inline personal access token w/ env var * ci: workaround for sudo limitations * ci: restore release workflow * Pass services to each module, improve tests * Add servicesManager test and registerServices method * Fix key warning of snackbar elements * Remove netlify-cli; we';ll install this on CI server * Update staging and prod netlify site IDs * Clean up NPM_PUBLISH step * Clean up DOCS_PUBLISH step * Clean up Deploy workflow * Custom executor to override cypress config * Spacing * Use an existing docker hub image * Switch to npx instead of digging into npm bin location * Remove e2e test before prod deploy * Add workflow images * docs: continous integrationn * Add default props to modal * chore(release): publish [skip ci] - @ohif/extension-cornerstone@1.5.1 - @ohif/extension-vtk@0.53.7 - @ohif/core@1.9.1 - @ohif/ui@0.62.2 - @ohif/viewer@2.8.3 * chore(release): publish [skip ci] - @ohif/extension-vtk@0.53.8 - @ohif/core@1.10.0 - @ohif/ui@0.62.3 - @ohif/viewer@2.8.4 * ci: Redirect site traffic to index.html if file is not resolved * ci: fix typo * fix: 🐛 Code review. Remove 'global state' for displaySize * fix: 🐛 Code review. Ref back to useMedia and pass value down Code review. Ref back to useMedia and pass value down (components) instead of creating a specialized hook to tied any component on it * fix: translation switcher * fix * cleanup * add missed translation * fix: 🐛 Code review * fix: 🐛 Fix unit tests * fix: 🐛 Fix unit test * fix: 🐛 Code merge solve conflicts. Missing files changes * Merge from master. Missing files changes * feat: 🎸 Code review. Fix issues with DatePicker Fixed at least the minimum issue with datePicker and update some content on every translation changed * fix: 🐛 Code review. Style fix on modal * fixes in general preferences after merge * fix * export default i18n language * translation fixes * increase snackbar zindex * initialize language * WIP propagate props<>state fixes * fix state propagation * remove hotkey error when reset default * fix datePicker * i18n updates * fix i18n strings * fix reset default -- set right input value * fix default language * fix e2e for user preferences * small fix datePicker props * remove i18n from window -- debugging purposes only * lint fixes
453 lines
12 KiB
JavaScript
453 lines
12 KiB
JavaScript
/* eslint-disable react-hooks/exhaustive-deps */
|
|
import React, { useState, useEffect } from 'react';
|
|
import PropTypes from 'prop-types';
|
|
|
|
import './HotKeysPreferences.styl';
|
|
|
|
import {
|
|
allowedKeys,
|
|
disallowedCombinations,
|
|
specialKeys,
|
|
} from './hotKeysConfig.js';
|
|
|
|
import isEqual from 'lodash.isequal';
|
|
|
|
const 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;
|
|
};
|
|
|
|
const findConflictingCommand = (
|
|
originalHotKeys,
|
|
currentCommandName,
|
|
currentHotKeys
|
|
) => {
|
|
let firstConflictingCommand = undefined;
|
|
|
|
for (const commandName in originalHotKeys) {
|
|
const toolHotKeys = originalHotKeys[commandName].keys;
|
|
|
|
if (
|
|
isEqual(toolHotKeys, currentHotKeys) &&
|
|
commandName !== currentCommandName
|
|
) {
|
|
firstConflictingCommand = originalHotKeys[commandName];
|
|
break;
|
|
}
|
|
}
|
|
|
|
return firstConflictingCommand;
|
|
};
|
|
|
|
/**
|
|
* Splits given keysObj into arrays. Each array item will be a representation of column
|
|
* @param {obj} keysObj objects to be splitted into columns
|
|
* @param {number} columnSize How many rows per column
|
|
*/
|
|
const getHotKeysArrayColumns = (keysObj = {}, columnSize) => {
|
|
if (isNaN(columnSize)) {
|
|
return keysObj;
|
|
}
|
|
|
|
const keys = Object.keys(keysObj);
|
|
const keysValues = Object.values(keysObj);
|
|
const keysLength = keys.length;
|
|
|
|
// Columns from left should be bigger;
|
|
let currentColumn = 0;
|
|
const dividedKeys = [];
|
|
|
|
for (
|
|
let it = 0;
|
|
it < keysLength;
|
|
it++, it % columnSize === 0 ? currentColumn++ : currentColumn
|
|
) {
|
|
if (!dividedKeys[currentColumn]) {
|
|
dividedKeys[currentColumn] = [];
|
|
}
|
|
|
|
dividedKeys[currentColumn][keys[it]] = keysValues[it];
|
|
}
|
|
|
|
return dividedKeys;
|
|
};
|
|
|
|
const NO_FIELD_ERROR_MESSAGE = undefined;
|
|
const formatPressedKeys = pressedKeysArray => pressedKeysArray.join('+');
|
|
const unFormatPressedKeys = (pressedKeysStr = '') => pressedKeysStr.split('+');
|
|
const inputValidators = (
|
|
commandName,
|
|
inputValue,
|
|
pressedKeys,
|
|
lastPressedKey,
|
|
originalHotKeys
|
|
) => {
|
|
let hasError = false;
|
|
let errorMessage = NO_FIELD_ERROR_MESSAGE;
|
|
|
|
const modifierValidator = ({ lastPressedKey }) => {
|
|
// Check if it has a valid modifier
|
|
const isModifier = ['ctrl', 'alt', 'shift'].includes(lastPressedKey);
|
|
if (isModifier) {
|
|
hasError = true;
|
|
errorMessage =
|
|
"It's not possible to define only modifier keys (ctrl, alt and shift) as a shortcut";
|
|
return {
|
|
hasError,
|
|
errorMessage,
|
|
};
|
|
}
|
|
};
|
|
|
|
const emptyValidator = ({ inputValue }) => {
|
|
if (!inputValue) {
|
|
hasError = true;
|
|
errorMessage = "Field can't be empty.";
|
|
return {
|
|
hasError,
|
|
errorMessage,
|
|
};
|
|
}
|
|
};
|
|
const conflictingValidator = ({
|
|
commandName,
|
|
pressedKeys,
|
|
originalHotKeys,
|
|
}) => {
|
|
const conflictingCommand = findConflictingCommand(
|
|
originalHotKeys,
|
|
commandName,
|
|
pressedKeys
|
|
);
|
|
if (conflictingCommand) {
|
|
hasError = true;
|
|
errorMessage = `"${conflictingCommand.label}" is already using the "${pressedKeys}" shortcut.`;
|
|
return {
|
|
hasError,
|
|
errorMessage,
|
|
};
|
|
}
|
|
};
|
|
|
|
const disallowedValidator = ({ inputValue, pressedKeys, lastPressedKey }) => {
|
|
const modifierCommand = formatPressedKeys(
|
|
pressedKeys.slice(0, pressedKeys.length - 1)
|
|
);
|
|
|
|
const disallowedCombination = disallowedCombinations[modifierCommand];
|
|
const hasDisallowedCombinations = disallowedCombination
|
|
? disallowedCombination.includes(lastPressedKey)
|
|
: false;
|
|
|
|
if (hasDisallowedCombinations) {
|
|
hasError = true;
|
|
errorMessage = `"${inputValue}" shortcut combination is not allowed`;
|
|
return {
|
|
hasError,
|
|
errorMessage,
|
|
};
|
|
}
|
|
};
|
|
|
|
const validators = [
|
|
emptyValidator,
|
|
modifierValidator,
|
|
conflictingValidator,
|
|
disallowedValidator,
|
|
];
|
|
|
|
for (const validator of validators) {
|
|
const validation = validator({
|
|
commandName,
|
|
inputValue,
|
|
pressedKeys,
|
|
lastPressedKey,
|
|
originalHotKeys,
|
|
});
|
|
if (validation && validation.hasError) {
|
|
return validation;
|
|
}
|
|
}
|
|
|
|
// validation has passed successfully
|
|
return {
|
|
hasError,
|
|
errorMessage,
|
|
};
|
|
};
|
|
|
|
/**
|
|
* HotKeysPreferencesRow
|
|
* Renders row for hotkey preference
|
|
* It stores current state and whenever it changes, component messages parent of new value (through function callback)
|
|
* @param {object} props component props
|
|
* @param {string} props.commandName command name associated to given row
|
|
* @param {string[]} props.hotkeys keys associated to given command
|
|
* @param {object} props.originalHotKeys original hotkeys values
|
|
* @param {function} props.onSuccessChanged Callback function to communicate parent in case its states changes
|
|
* @param {function} props.onFailureChanged Callback Function in case any error on row
|
|
*/
|
|
function HotKeyPreferencesRow({
|
|
commandName,
|
|
hotkeys,
|
|
label,
|
|
originalHotKeys,
|
|
tabError,
|
|
onSuccessChanged,
|
|
onFailureChanged,
|
|
}) {
|
|
const [inputValue, setInputValue] = useState(formatPressedKeys(hotkeys));
|
|
const [error, setError] = useState(false);
|
|
|
|
const [fieldErrorMessage, setFieldErrorMessage] = useState(
|
|
NO_FIELD_ERROR_MESSAGE
|
|
);
|
|
|
|
// reset error count if tab has no errors
|
|
useEffect(() => {
|
|
if (!tabError) {
|
|
setError(false);
|
|
setFieldErrorMessage(NO_FIELD_ERROR_MESSAGE);
|
|
setInputValue(formatPressedKeys(hotkeys));
|
|
}
|
|
}, [tabError]);
|
|
|
|
// update state values if props changes
|
|
useEffect(() => {
|
|
setInputValue(formatPressedKeys(hotkeys));
|
|
}, [hotkeys]);
|
|
|
|
const updateInputText = (keyDownEvent, displayPressedKey = false) => {
|
|
const pressedKeys = getKeysPressedArray(keyDownEvent);
|
|
|
|
if (displayPressedKey) {
|
|
const specialKeyName = specialKeys[keyDownEvent.which];
|
|
const keyName =
|
|
specialKeyName ||
|
|
keyDownEvent.key ||
|
|
String.fromCharCode(keyDownEvent.keyCode);
|
|
|
|
// ensure lowerCase
|
|
pressedKeys.push(keyName.toLowerCase());
|
|
}
|
|
|
|
setInputValue(formatPressedKeys(pressedKeys));
|
|
};
|
|
|
|
// validate input value
|
|
const validateInput = () => {
|
|
const pressedKeys = unFormatPressedKeys(inputValue);
|
|
const lastPressedKey = pressedKeys[pressedKeys.length - 1];
|
|
|
|
const {
|
|
hasError = false,
|
|
errorMessage = NO_FIELD_ERROR_MESSAGE,
|
|
} = inputValidators(
|
|
commandName,
|
|
inputValue,
|
|
pressedKeys,
|
|
lastPressedKey,
|
|
originalHotKeys
|
|
);
|
|
|
|
if (hasError) {
|
|
setInputValue('');
|
|
} else {
|
|
onSuccessChanged([inputValue]);
|
|
}
|
|
|
|
if (hasError !== error) {
|
|
setError(hasError);
|
|
}
|
|
|
|
setFieldErrorMessage(errorMessage);
|
|
};
|
|
|
|
useEffect(() => {
|
|
onFailureChanged(error);
|
|
}, [error]);
|
|
|
|
const onInputKeyDown = event => {
|
|
// Prevent ESC key from propagating and closing the modal
|
|
if (event.key === 'Escape') {
|
|
event.stopPropagation();
|
|
}
|
|
|
|
updateInputText(event, allowedKeys.includes(event.keyCode));
|
|
event.preventDefault();
|
|
};
|
|
|
|
return (
|
|
<tr key={commandName}>
|
|
<td className="text-right p-r-1">{label}</td>
|
|
<td width="200">
|
|
<label
|
|
className={`wrapperLabel ${
|
|
fieldErrorMessage !== undefined ? 'state-error' : ''
|
|
} `}
|
|
data-key="defaultTool"
|
|
>
|
|
<input
|
|
readOnly={true}
|
|
type="text"
|
|
value={inputValue}
|
|
className="form-control hotkey text-center"
|
|
onKeyDown={onInputKeyDown}
|
|
onBlur={validateInput}
|
|
/>
|
|
<span className="wrapperText" />
|
|
<span className="errorMessage">{fieldErrorMessage}</span>
|
|
</label>
|
|
</td>
|
|
</tr>
|
|
);
|
|
}
|
|
|
|
HotKeyPreferencesRow.propTypes = {
|
|
commandName: PropTypes.string.isRequired,
|
|
hotkeys: PropTypes.array.isRequired,
|
|
label: PropTypes.string.isRequired,
|
|
originalHotKeys: PropTypes.object.isRequired,
|
|
tabError: PropTypes.bool.isRequired,
|
|
onSuccessChanged: PropTypes.func.isRequired,
|
|
onFailureChanged: PropTypes.func.isRequired,
|
|
};
|
|
|
|
/**
|
|
* HotKeysPreferences tab
|
|
* It renders all hotkeys displayed into columns/rows
|
|
*
|
|
* It stores current state and whenever it changes, component messages parent of new value (through function callback)
|
|
* @param {object} props component props
|
|
* @param {string} props.name Tab`s name
|
|
* @param {object} props.hotkeyDefinitions Data for initial state
|
|
* @param {function} props.onTabStateChanged Callback function to communicate parent in case its states changes
|
|
* @param {function} props.onTabErrorChanged Callback Function in case any error on tab
|
|
*/
|
|
function HotKeysPreferences({
|
|
hotkeyDefinitions,
|
|
name,
|
|
tabError,
|
|
onTabStateChanged,
|
|
onTabErrorChanged,
|
|
}) {
|
|
const [tabState, setTabState] = useState(hotkeyDefinitions);
|
|
const [tabErrorCounter, setTabErrorCounter] = useState(0);
|
|
|
|
const [numColumns] = useState(2);
|
|
const [columnSize] = useState(() =>
|
|
Math.ceil(Object.keys(tabState || {}).length / numColumns)
|
|
);
|
|
|
|
const splittedHotKeys = getHotKeysArrayColumns(tabState, columnSize);
|
|
|
|
const onHotKeyChanged = (commandName, hotkeyDefinition, keys) => {
|
|
const newState = {
|
|
...tabState,
|
|
[commandName]: { ...hotkeyDefinition, keys },
|
|
};
|
|
setTabState(newState);
|
|
onTabStateChanged(name, { hotkeyDefinitions: newState });
|
|
};
|
|
|
|
const onErrorChanged = (toInc = true) => {
|
|
const increment = toInc ? 1 : -1;
|
|
const newValue = tabErrorCounter + increment;
|
|
if (newValue >= 0) {
|
|
setTabErrorCounter(newValue);
|
|
}
|
|
};
|
|
|
|
// reset error count if tab has no errors
|
|
useEffect(() => {
|
|
if (!tabError) {
|
|
setTabErrorCounter(0);
|
|
// update tab state
|
|
setTabState({ ...hotkeyDefinitions });
|
|
}
|
|
}, [tabError]);
|
|
|
|
// tell parent to update its state
|
|
useEffect(() => {
|
|
if (tabErrorCounter === 0) {
|
|
onTabErrorChanged(name, false);
|
|
}
|
|
|
|
if (tabErrorCounter === 1) {
|
|
onTabErrorChanged(name, true);
|
|
}
|
|
}, [tabErrorCounter]);
|
|
|
|
// update local state if parent updates
|
|
useEffect(() => {
|
|
setTabState({ ...hotkeyDefinitions });
|
|
}, [hotkeyDefinitions]);
|
|
|
|
return (
|
|
<div className="HotKeysPreferences">
|
|
{splittedHotKeys.length > 0
|
|
? splittedHotKeys.map((columnHotKeys, index) => {
|
|
return (
|
|
<div className="column" key={index}>
|
|
<table className="full-width">
|
|
<thead>
|
|
<tr>
|
|
<th className="text-right p-r-1">Function</th>
|
|
<th className="text-center">Shortcut</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
{Object.entries(columnHotKeys).map(
|
|
hotkeyDefinitionTuple => (
|
|
<HotKeyPreferencesRow
|
|
key={hotkeyDefinitionTuple[0]}
|
|
commandName={hotkeyDefinitionTuple[0]}
|
|
hotkeys={hotkeyDefinitionTuple[1].keys}
|
|
label={hotkeyDefinitionTuple[1].label}
|
|
originalHotKeys={tabState}
|
|
tabError={tabError}
|
|
onSuccessChanged={keys =>
|
|
onHotKeyChanged(
|
|
hotkeyDefinitionTuple[0],
|
|
hotkeyDefinitionTuple[1],
|
|
keys
|
|
)
|
|
}
|
|
onFailureChanged={onErrorChanged}
|
|
></HotKeyPreferencesRow>
|
|
)
|
|
)}
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
);
|
|
})
|
|
: null}
|
|
</div>
|
|
);
|
|
}
|
|
|
|
HotKeysPreferences.propTypes = {
|
|
hotkeyDefinitions: PropTypes.any,
|
|
name: PropTypes.string,
|
|
tabError: PropTypes.bool,
|
|
onTabStateChanged: PropTypes.func,
|
|
onTabErrorChanged: PropTypes.func,
|
|
};
|
|
|
|
export { HotKeysPreferences };
|