Skip to content
Snippets Groups Projects
Unverified Commit 2903fd00 authored by Matiss Janis Aboltins's avatar Matiss Janis Aboltins Committed by GitHub
Browse files

:fire: remove unused `tableNavigatorOpts` code-path (#781)

Just cleaning up things: removing an unused code-path.
parent ce40e61a
No related branches found
No related tags found
No related merge requests found
...@@ -342,7 +342,6 @@ export const ManagePayees = React.forwardRef( ...@@ -342,7 +342,6 @@ export const ManagePayees = React.forwardRef(
payees, payees,
ruleCounts, ruleCounts,
categoryGroups, categoryGroups,
tableNavigatorOpts, // TODO: remove as it's unused
initialSelectedIds, initialSelectedIds,
ruleActions, ruleActions,
onBatchChange, onBatchChange,
...@@ -455,18 +454,15 @@ export const ManagePayees = React.forwardRef( ...@@ -455,18 +454,15 @@ export const ManagePayees = React.forwardRef(
let buttonsDisabled = selected.items.size === 0; let buttonsDisabled = selected.items.size === 0;
let tableNavigator = useTableNavigator( let tableNavigator = useTableNavigator(filteredPayees, item =>
filteredPayees, ['select', 'name', 'rule-count'].filter(name => {
item => switch (name) {
['select', 'name', 'rule-count'].filter(name => { case 'select':
switch (name) { return item.transfer_acct == null;
case 'select': default:
return item.transfer_acct == null; return true;
default: }
return true; }),
}
}),
tableNavigatorOpts,
); );
let payeesById = getPayeesById(payees); let payeesById = getPayeesById(payees);
......
...@@ -999,11 +999,10 @@ export const Table = React.forwardRef( ...@@ -999,11 +999,10 @@ export const Table = React.forwardRef(
}, },
); );
export function useTableNavigator(data, fields, opts = {}) { export function useTableNavigator(data, fields) {
let getFields = typeof fields !== 'function' ? () => fields : fields; let getFields = typeof fields !== 'function' ? () => fields : fields;
let { initialEditingId, initialFocusedField, moveKeys } = opts; let [editingId, setEditingId] = useState(null);
let [editingId, setEditingId] = useState(initialEditingId || null); let [focusedField, setFocusedField] = useState(null);
let [focusedField, setFocusedField] = useState(initialFocusedField || null);
let containerRef = useRef(); let containerRef = useRef();
// See `onBlur` for why we need this // See `onBlur` for why we need this
...@@ -1128,47 +1127,37 @@ export function useTableNavigator(data, fields, opts = {}) { ...@@ -1128,47 +1127,37 @@ export function useTableNavigator(data, fields, opts = {}) {
return; return;
} }
let fieldKeys = switch (e.code) {
moveKeys && moveKeys[focusedField] && moveKeys[focusedField]; case 'ArrowUp':
case 'KeyK':
if (fieldKeys && fieldKeys[e.keyCode]) { if (e.target.tagName !== 'INPUT') {
e.preventDefault(); onMove('up');
e.stopPropagation(); }
break;
onMove(fieldKeys[e.keyCode]); case 'ArrowDown':
} else { case 'KeyJ':
switch (e.code) { if (e.target.tagName !== 'INPUT') {
case 'ArrowUp': onMove('down');
case 'KeyK': }
if (e.target.tagName !== 'INPUT') { break;
onMove('up');
}
break;
case 'ArrowDown': case 'Enter':
case 'KeyJ': case 'Tab':
if (e.target.tagName !== 'INPUT') { e.preventDefault();
onMove('down'); e.stopPropagation();
}
break; onMove(
e.code === 'Enter'
case 'Enter': ? e.shiftKey
case 'Tab': ? 'up'
e.preventDefault(); : 'down'
e.stopPropagation(); : e.shiftKey
? 'left'
onMove( : 'right',
e.code === 'Enter' );
? e.shiftKey break;
? 'up' default:
: 'down'
: e.shiftKey
? 'left'
: 'right',
);
break;
default:
}
} }
}, },
......
---
category: Maintenance
authors: [MatissJanis]
---
Remove unused `tableNavigatorOpts` code-path
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment