diff --git a/client/package.json b/client/package.json index 87f6422d5..4216b0991 100644 --- a/client/package.json +++ b/client/package.json @@ -1,12 +1,12 @@ { "name": "ontime-ui", - "version": "1.2.2", + "version": "1.2.3", "private": true, "dependencies": { "@chakra-ui/react": "^2.0.0-next.3", - "@dnd-kit/core": "^5.0.3", - "@dnd-kit/sortable": "^6.0.1", - "@dnd-kit/utilities": "^3.1.0", + "@dnd-kit/core": "^6.0.5", + "@dnd-kit/sortable": "^7.0.1", + "@dnd-kit/utilities": "^3.2.0", "@emotion/react": "^11.7.1", "@emotion/styled": "^11.6.0", "@react-icons/all-files": "^4.1.0", diff --git a/client/src/features/table/OntimeTable.jsx b/client/src/features/table/OntimeTable.jsx index 5e525456e..c808b722f 100644 --- a/client/src/features/table/OntimeTable.jsx +++ b/client/src/features/table/OntimeTable.jsx @@ -81,6 +81,7 @@ export default function OntimeTable({ tableData, userFields, handleUpdate, selec ); const handleResetReordering = useCallback(() => { + console.log('called reset', defaultColumnOrder) saveColumnOrder(defaultColumnOrder); setColumnOrder(defaultColumnOrder); }, [saveColumnOrder, setColumnOrder]); @@ -105,12 +106,7 @@ export default function OntimeTable({ tableData, userFields, handleUpdate, selec // cancel if delta y is greater than 200 if (delta.y > 200) return; - // create temp object and remove hidden columns - const cols = [...columnOrder].filter((col) => !hiddenColumns.includes(col)); - - if (cols === null) { - return; - } + const cols = [...columnOrder]; // get index of from const fromIndex = cols.findIndex((i) => i === active.id); @@ -118,13 +114,17 @@ export default function OntimeTable({ tableData, userFields, handleUpdate, selec // get index of to const toIndex = cols.findIndex((i) => i === over.id); + if (toIndex === -1) { + return; + } + // reorder const [reorderedItem] = cols.splice(fromIndex, 1); cols.splice(toIndex, 0, reorderedItem); saveColumnOrder(cols); setColumnOrder(cols); - }, [columnOrder, hiddenColumns, saveColumnOrder, setColumnOrder]); + }, [columnOrder, saveColumnOrder, setColumnOrder]); // save hidden columns object to local storage useEffect(() => { diff --git a/client/src/features/table/tableElements/EditableCell.jsx b/client/src/features/table/tableElements/EditableCell.jsx index 61eeafd20..757f6ee95 100644 --- a/client/src/features/table/tableElements/EditableCell.jsx +++ b/client/src/features/table/tableElements/EditableCell.jsx @@ -43,7 +43,6 @@ return ( rows={3} transition='none' spellCheck={false} - autoComplete={false} /> ); } diff --git a/client/yarn.lock b/client/yarn.lock index d408e3b61..eac20a013 100644 --- a/client/yarn.lock +++ b/client/yarn.lock @@ -1744,27 +1744,27 @@ dependencies: tslib "^2.0.0" -"@dnd-kit/core@^5.0.3": - version "5.0.3" - resolved "https://registry.yarnpkg.com/@dnd-kit/core/-/core-5.0.3.tgz#028d7e543e9fd3756f9cb857b34f818d73020810" - integrity sha512-IribcBLsaPqHdYLpc5xG0TqwYIaD+65offdEYxoKh38WDjzRxUjDmrt7hj9oa/ooUKL0epux20u+mBTd92i/zw== +"@dnd-kit/core@^6.0.5": + version "6.0.5" + resolved "https://registry.yarnpkg.com/@dnd-kit/core/-/core-6.0.5.tgz#5670ad0dcc83cd51dbf2fa8c6a5c8af4ac0c1989" + integrity sha512-3nL+Zy5cT+1XwsWdlXIvGIFvbuocMyB4NBxTN74DeBaBqeWdH9JsnKwQv7buZQgAHmAH+eIENfS1ginkvW6bCw== dependencies: "@dnd-kit/accessibility" "^3.0.0" - "@dnd-kit/utilities" "^3.1.0" + "@dnd-kit/utilities" "^3.2.0" tslib "^2.0.0" -"@dnd-kit/sortable@^6.0.1": - version "6.0.1" - resolved "https://registry.yarnpkg.com/@dnd-kit/sortable/-/sortable-6.0.1.tgz#08d046efa85c546fd21979836b007d6fea1001f9" - integrity sha512-FGpRHBcflpwWpSP8bMJ4zNcDywDXssZDJBwGYuHd1RqUU/+JX43pEU0u0OHw06LabEZMOLBbyWoIaZJ0abCOEA== +"@dnd-kit/sortable@^7.0.1": + version "7.0.1" + resolved "https://registry.yarnpkg.com/@dnd-kit/sortable/-/sortable-7.0.1.tgz#99c6012bbab4d8bb726c0eef7b921a338c404fdb" + integrity sha512-n77qAzJQtMMywu25sJzhz3gsHnDOUlEjTtnRl8A87rWIhnu32zuP+7zmFjwGgvqfXmRufqiHOSlH7JPC/tnJ8Q== dependencies: - "@dnd-kit/utilities" "^3.1.0" + "@dnd-kit/utilities" "^3.2.0" tslib "^2.0.0" -"@dnd-kit/utilities@^3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@dnd-kit/utilities/-/utilities-3.1.0.tgz#330ef24303da05f85ff20bb8f74b385c96caee58" - integrity sha512-2JBdIgjJ7xjMRpKagdMuYKWJdDoVVw9Wc6lfMrLjrq8t4QlMEjtsab5JVUlzWvHgANn7w3Y3VhalFfbp4dQrKg== +"@dnd-kit/utilities@^3.2.0": + version "3.2.0" + resolved "https://registry.yarnpkg.com/@dnd-kit/utilities/-/utilities-3.2.0.tgz#b3e956ea63a1347c9d0e1316b037ddcc6140acda" + integrity sha512-h65/pn2IPCCIWwdlR2BMLqRkDxpTEONA+HQW3n765HBijLYGyrnTCLa2YQt8VVjjSQD6EfFlTE6aS2Q/b6nb2g== dependencies: tslib "^2.0.0" @@ -9880,16 +9880,21 @@ tslib@^1.0.0, tslib@^1.8.1, tslib@^1.9.3: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.0, tslib@^2.1.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" - integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== +tslib@^2.0.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" + integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== tslib@^2.0.3: version "2.1.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== +tslib@^2.1.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" + integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== + tsutils@^3.21.0: version "3.21.0" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"