From 5c1920d60df50c029f8ef1871b4e5a6bb894c00c Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Thu, 11 Jun 2020 15:43:51 +0200 Subject: [PATCH] Revert "fixed incorrect paste on data grid" This reverts commit dda614165f8c3ed6d97f0a529cfb13bd60a53470. --- packages/web/src/datagrid/DataGridCore.js | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/packages/web/src/datagrid/DataGridCore.js b/packages/web/src/datagrid/DataGridCore.js index d99a400ae..e884e03ae 100644 --- a/packages/web/src/datagrid/DataGridCore.js +++ b/packages/web/src/datagrid/DataGridCore.js @@ -215,7 +215,7 @@ export default function DataGridCore(props) { const { isLoading, loadedRows, isLoadedAll, loadedTime, allRowCount, errorMessage } = loadProps; const loadedTimeRef = React.useRef(0); - const focusFieldRef = React.useRef(null); + const focusFieldRef = React.useRef(); const [vScrollValueToSet, setvScrollValueToSet] = React.useState(); const [vScrollValueToSetDate, setvScrollValueToSetDate] = React.useState(new Date()); @@ -237,7 +237,6 @@ export default function DataGridCore(props) { const changeSet = changeSetState && changeSetState.value; const setChangeSet = React.useCallback((value) => dispatchChangeSet({ type: 'set', value }), [dispatchChangeSet]); - const isFocusingRef = React.useRef(false); const changeSetRef = React.useRef(changeSet); @@ -333,9 +332,8 @@ export default function DataGridCore(props) { }; case 'close': { const [row, col] = currentCell || []; - if (focusFieldRef.current) { - focusFieldRef.current.focus(); - } + // @ts-ignore + if (focusFieldRef.current) focusFieldRef.current.focus(); // @ts-ignore if (action.mode == 'enter' && row) setTimeout(() => moveCurrentCell(row + 1, col), 0); if (action.mode == 'save') setTimeout(handleSave, 0); @@ -413,13 +411,7 @@ export default function DataGridCore(props) { React.useEffect(() => { if (tabVisible) { // @ts-ignore - if (focusFieldRef.current) { - isFocusingRef.current = true; - focusFieldRef.current.focus(); - setTimeout(() => { - isFocusingRef.current = false; - }, 1); - } + if (focusFieldRef.current) focusFieldRef.current.focus(); } }, [tabVisible, focusFieldRef.current]); @@ -631,7 +623,6 @@ export default function DataGridCore(props) { } function handlePaste(event) { - if (isFocusingRef.current) return; var pastedText = undefined; // @ts-ignore if (window.clipboardData && window.clipboardData.getData) {