A local-first personal finance app
:arrow_up: upgrade React from v16 to v18 (#696)
Matiss Janis Aboltins5d7ead44aa4c
diff --git a/packages/desktop-client/package.json b/packages/desktop-client/package.jsonindex 977e91ab5c..43321fc5a4 100644--- a/packages/desktop-client/package.json+++ b/packages/desktop-client/package.json@@ -15,6 +15,8 @@"@react-stately/collections": "^3.4.3","@react-stately/list": "^3.5.3","@reactions/component": "^2.0.2",+ "@testing-library/react": "14.0.0",+ "@testing-library/user-event": "14.4.3","chalk": "2.4.1","cross-env": "^7.0.3","customize-cra": "^1.0.0",@@ -28,10 +30,10 @@"jest-watch-typeahead": "^2.2.2","mitt": "^3.0.0","prop-types": "15.6.0",- "react": "16.13.1",+ "react": "18.2.0","react-app-rewired": "^2.2.1","react-dnd": "^10.0.2",- "react-dom": "16.13.1",+ "react-dom": "18.2.0","react-redux": "7.2.1","react-router": "5.2.0","react-router-dom": "5.2.0",diff --git a/packages/desktop-client/src/browser-preload.browser.js b/packages/desktop-client/src/browser-preload.browser.jsindex dd24ff5aa2..4909bd6d94 100644--- a/packages/desktop-client/src/browser-preload.browser.js+++ b/packages/desktop-client/src/browser-preload.browser.js@@ -119,12 +119,12 @@ global.Actual = {document.addEventListener('keydown', e => {if (e.metaKey || e.ctrlKey) {// Cmd/Ctrl+o- if (e.keyCode === 79) {+ if (e.code === 'KeyO') {e.preventDefault();window.__actionsForMenu.closeBudget();}// Cmd/Ctrl+z- else if (e.keyCode === 90) {+ else if (e.code === 'KeyZ') {if (e.target.tagName === 'INPUT' ||e.target.tagName === 'TEXTAREA' ||diff --git a/packages/desktop-client/src/components/GlobalKeys.js b/packages/desktop-client/src/components/GlobalKeys.jsindex daa9ca8065..dc37943ec1 100644--- a/packages/desktop-client/src/components/GlobalKeys.js+++ b/packages/desktop-client/src/components/GlobalKeys.js@@ -12,17 +12,17 @@ class GlobalKeys extends React.Component {if (e.metaKey) {const { history } = this.props;- switch (e.keyCode) {- case 49:+ switch (e.code) {+ case 'Digit1':history.push('/budget');break;- case 50:+ case 'Digit2':history.push('/reports');break;- case 51:+ case 'Digit3':history.push('/accounts');break;- case 188: // ,+ case 'Comma':if (Platform.OS === 'mac') {history.push('/settings');}diff --git a/packages/desktop-client/src/components/accounts/TransactionsTable.js b/packages/desktop-client/src/components/accounts/TransactionsTable.jsindex 104d67c2ac..52f89c1b7a 100644--- a/packages/desktop-client/src/components/accounts/TransactionsTable.js+++ b/packages/desktop-client/src/components/accounts/TransactionsTable.js@@ -1157,7 +1157,7 @@ function NewTransaction({}}data-testid="new-transaction"onKeyDown={e => {- if (e.keyCode === 27) {+ if (e.code === 'Escape') {onClose();}}}@@ -1619,9 +1619,7 @@ export let TransactionTable = React.forwardRef((props, ref) => {}function onCheckNewEnter(e) {- const ENTER = 13;-- if (e.keyCode === ENTER) {+ if (e.code === 'Enter') {if (e.metaKey) {e.stopPropagation();onAddTemporary();@@ -1665,9 +1663,7 @@ export let TransactionTable = React.forwardRef((props, ref) => {}function onCheckEnter(e) {- const ENTER = 13;-- if (e.keyCode === ENTER && !e.shiftKey) {+ if (e.code === 'Enter' && !e.shiftKey) {let { editingId: id, focusedField } = tableNavigator;afterSave(props => {diff --git a/packages/desktop-client/src/components/accounts/TransactionsTable.test.js b/packages/desktop-client/src/components/accounts/TransactionsTable.test.jsindex 742c42ed0d..cb58fdfee6 100644--- a/packages/desktop-client/src/components/accounts/TransactionsTable.test.js+++ b/packages/desktop-client/src/components/accounts/TransactionsTable.test.js@@ -1,8 +1,8 @@import React from 'react';-import { render, fireEvent } from '@testing-library/react';+import { render, screen, fireEvent } from '@testing-library/react';+import userEvent from '@testing-library/user-event';import { format as formatDate, parse as parseDate } from 'date-fns';-import { act } from 'react-dom/test-utils';import {generateTransaction,@@ -204,52 +204,10 @@ const categories = categoryGroups.reduce([],);-const keys = {- ESC: {- key: 'Esc',- keyCode: 27,- which: 27,- },- ENTER: {- key: 'Enter',- keyCode: 13,- which: 13,- },- TAB: {- key: 'Tab',- keyCode: 9,- which: 9,- },- DOWN: {- key: 'Down',- keyCode: 40,- which: 40,- },- UP: {- key: 'Up',- keyCode: 38,- which: 38,- },- LEFT: {- key: 'Left',- keyCode: 37,- which: 37,- },- RIGHT: {- key: 'Right',- keyCode: 39,- which: 39,- },-};-function prettyDate(date) {return formatDate(parseDate(date, 'yyyy-MM-dd', new Date()), 'MM/dd/yyyy');}-function keyWithShift(key) {- return { ...key, shiftKey: true };-}-function renderTransactions(extraProps) {let transactions = generateTransactions(5, [6]);// Hardcoding the first value makes it easier for tests to do@@ -305,7 +263,7 @@ function queryField(container, name, subSelector = '', idx) {return field;}-function _editField(field, container) {+async function _editField(field, container) {// We only short-circuit this for inputslet input = field.querySelector(`input`);if (input) {@@ -318,11 +276,11 @@ function _editField(field, container) {if (field.querySelector(buttonQuery)) {let btn = field.querySelector(buttonQuery);- fireEvent.click(btn);+ await userEvent.click(btn);element = field.querySelector(':focus');expect(element).toBeTruthy();} else {- fireEvent.click(field.querySelector('div'));+ await userEvent.click(field.querySelector('div'));element = field.querySelector('input');expect(element).toBeTruthy();expect(container.ownerDocument.activeElement).toBe(element);@@ -393,123 +351,122 @@ describe('Transactions', () => {});});- test('keybindings enter/tab/alt should move around', () => {+ test('keybindings enter/tab/alt should move around', async () => {const { container } = renderTransactions();// Enter/tab goes down/right- let input = editField(container, 'notes', 2);- fireEvent.keyDown(input, keys.ENTER);+ let input = await editField(container, 'notes', 2);+ await userEvent.type(input, '[Enter]');expectToBeEditingField(container, 'notes', 3);- input = editField(container, 'payee', 2);- fireEvent.keyDown(input, keys.TAB);+ input = await editField(container, 'payee', 2);+ await userEvent.type(input, '[Tab]');expectToBeEditingField(container, 'notes', 2);// Shift+enter/tab goes up/left- input = editField(container, 'notes', 2);- fireEvent.keyDown(input, keyWithShift(keys.ENTER));+ input = await editField(container, 'notes', 2);+ await userEvent.type(input, '{Shift>}[Enter]{/Shift}');expectToBeEditingField(container, 'notes', 1);- input = editField(container, 'payee', 2);- fireEvent.keyDown(input, keyWithShift(keys.TAB));+ input = await editField(container, 'payee', 2);+ await userEvent.type(input, '{Shift>}[Tab]{/Shift}');expectToBeEditingField(container, 'account', 2);// Moving forward on the last cell moves to the next row- input = editField(container, 'cleared', 2);- fireEvent.keyDown(input, keys.TAB);+ input = await editField(container, 'cleared', 2);+ await userEvent.type(input, '[Tab]');expectToBeEditingField(container, 'select', 3);// Moving backward on the first cell moves to the previous row- editField(container, 'date', 2);- input = editField(container, 'select', 2);- fireEvent.keyDown(input, keyWithShift(keys.TAB));+ await editField(container, 'date', 2);+ input = await editField(container, 'select', 2);+ await userEvent.type(input, '{Shift>}[Tab]{/Shift}');expectToBeEditingField(container, 'cleared', 1);// Blurring should close the input- input = editField(container, 'credit', 1);+ input = await editField(container, 'credit', 1);fireEvent.blur(input);expect(container.querySelector('input')).toBe(null);// When reaching the bottom it shouldn't error- input = editField(container, 'notes', 4);- fireEvent.keyDown(input, keys.ENTER);+ input = await editField(container, 'notes', 4);+ await userEvent.type(input, '[Enter]');// When reaching the top it shouldn't error- input = editField(container, 'notes', 0);- fireEvent.keyDown(input, keyWithShift(keys.ENTER));+ input = await editField(container, 'notes', 0);+ await userEvent.type(input, '{Shift>}[Enter]{/Shift}');});- test('keybinding escape resets the value', () => {+ test('keybinding escape resets the value', async () => {const { container } = renderTransactions();- let input = editField(container, 'notes', 2);+ let input = await editField(container, 'notes', 2);let oldValue = input.value;- fireEvent.change(input, { target: { value: 'yo new value' } });+ await userEvent.clear(input);+ await userEvent.type(input, 'yo new value');expect(input.value).toEqual('yo new value');- fireEvent.keyDown(input, keys.ESC);+ await userEvent.type(input, '[Escape]');expect(input.value).toEqual(oldValue);- input = editField(container, 'category', 2);+ input = await editField(container, 'category', 2);oldValue = input.value;- fireEvent.change(input, { target: { value: 'Gener' } });+ await userEvent.clear(input);+ await userEvent.type(input, 'Gener');expect(input.value).toEqual('Gener');- fireEvent.keyDown(input, keys.ESC);+ await userEvent.type(input, '[Escape]');expect(input.value).toEqual(oldValue);});- test('text fields save when moved away from', () => {+ test('text fields save when moved away from', async () => {const { container, getTransactions } = renderTransactions();- function runWithMovementKeys(func) {- // All of these keys move to a different field, and the value in- // the previous input should be saved- const ks = [- keys.TAB,- keys.ENTER,- keyWithShift(keys.TAB),- keyWithShift(keys.ENTER),- ];-- ks.forEach((k, i) => func(k, i));- }-- runWithMovementKeys((key, idx) => {- let input = editField(container, 'notes', 2);+ // All of these keys move to a different field, and the value in+ // the previous input should be saved+ const ks = [+ '[Tab]',+ '[Enter]',+ '{Shift>}[Tab]{/Shift}',+ '{Shift>}[Enter]{/Shift}',+ ];++ for (let idx in ks) {+ let input = await editField(container, 'notes', 2);let oldValue = input.value;- fireEvent.change(input, {- target: { value: 'a happy little note' + idx },- });+ await userEvent.clear(input);+ await userEvent.type(input, 'a happy little note' + idx);// It's not saved yetexpect(getTransactions()[2].notes).toBe(oldValue);- fireEvent.keyDown(input, keys.TAB);+ await userEvent.type(input, '[Tab]');// Now it should be saved!expect(getTransactions()[2].notes).toBe('a happy little note' + idx);expect(queryField(container, 'notes', 'div', 2).textContent).toBe('a happy little note' + idx,);- });+ }- let input = editField(container, 'notes', 2);+ let input = await editField(container, 'notes', 2);let oldValue = input.value;- fireEvent.change(input, { target: { value: 'another happy note' } });+ await userEvent.clear(input);+ await userEvent.type(input, 'another happy note');// It's not saved yetexpect(getTransactions()[2].notes).toBe(oldValue);// Blur the input to make it stop editing- fireEvent.blur(input);+ await userEvent.tab();expect(getTransactions()[2].notes).toBe('another happy note');});- test('dropdown automatically opens and can be filtered', () => {+ test('dropdown automatically opens and can be filtered', async () => {const { container } = renderTransactions();- let input = editField(container, 'category', 2);+ let input = await editField(container, 'category', 2);let tooltip = container.querySelector('[data-testid="tooltip"]');expect(tooltip).toBeTruthy();expect([...tooltip.querySelectorAll('[data-testid*="category-item"]')].length,).toBe(9);- fireEvent.change(input, { target: { value: 'Gener' } });+ await userEvent.clear(input);+ await userEvent.type(input, 'Gener');// Make sure the list is filtered, the right items exist, and the// first item is highlighted@@ -520,7 +477,8 @@ describe('Transactions', () => {expect(items[1].dataset['testid']).toBe('category-item-highlighted');// It should also allow filtering on group names- fireEvent.change(input, { target: { value: 'Usual' } });+ await userEvent.clear(input);+ await userEvent.type(input, 'Usual');items = tooltip.querySelectorAll('[data-testid*="category-item"]');expect(items.length).toBe(4);@@ -534,7 +492,7 @@ describe('Transactions', () => {test('dropdown selects an item with keyboard', async () => {const { container, getTransactions } = renderTransactions();- let input = editField(container, 'category', 2);+ let input = await editField(container, 'category', 2);let tooltip = container.querySelector('[data-testid="tooltip"]');// No item should be highlighted@@ -543,10 +501,7 @@ describe('Transactions', () => {);expect(highlighted).toBe(null);- fireEvent.keyDown(input, keys.DOWN);- fireEvent.keyDown(input, keys.DOWN);- fireEvent.keyDown(input, keys.DOWN);- fireEvent.keyDown(input, keys.DOWN);+ await userEvent.keyboard('[ArrowDown][ArrowDown][ArrowDown][ArrowDown]');// The right item should be highlightedhighlighted = tooltip.querySelector(@@ -559,7 +514,7 @@ describe('Transactions', () => {categories.find(category => category.name === 'Food').id,);- fireEvent.keyDown(input, keys.ENTER);+ await userEvent.type(input, '[Enter]');await waitForAutocomplete();// The transactions data should be updated with the right category@@ -573,14 +528,14 @@ describe('Transactions', () => {expect(container.querySelector('[data-testid="tooltip"]')).toBe(null);// Pressing enter should now move down- fireEvent.keyDown(input, keys.ENTER);+ await userEvent.type(input, '[Enter]');expectToBeEditingField(container, 'category', 3);});test('dropdown selects an item when clicking', async () => {const { container, getTransactions } = renderTransactions();- editField(container, 'category', 2);+ await editField(container, 'category', 2);let tooltip = container.querySelector('[data-testid="tooltip"]');@@ -592,7 +547,7 @@ describe('Transactions', () => {expect(highlighted).toBe(null);// Hover over an item- fireEvent.mouseMove(items[2]);+ await userEvent.hover(items[2]);// Make sure the expected category is highlightedhighlighted = tooltip.querySelector(@@ -605,7 +560,7 @@ describe('Transactions', () => {expect(getTransactions()[2].category).toBe(categories.find(c => c.name === 'Food').id,);- fireEvent.click(items[2]);+ await userEvent.click(items[2]);await waitForAutocomplete();expect(getTransactions()[2].category).toBe(categories.find(c => c.name === 'General').id,@@ -617,18 +572,18 @@ describe('Transactions', () => {expectToBeEditingField(container, 'category', 2);});- test("dropdown hovers but doesn't change value", () => {+ test("dropdown hovers but doesn't change value", async () => {const { container, getTransactions } = renderTransactions();- let input = editField(container, 'category', 2);+ let input = await editField(container, 'category', 2);let oldCategory = getTransactions()[2].category;let tooltip = container.querySelector('[data-testid="tooltip"]');let items = tooltip.querySelectorAll('[data-testid="category-item"]');// Hover over a few of the items to highlight them- fireEvent.mouseMove(items[2]);- fireEvent.mouseMove(items[3]);+ await userEvent.hover(items[2]);+ await userEvent.hover(items[3]);// Make sure one of them is highlightedlet highlighted = tooltip.querySelector(@@ -637,7 +592,7 @@ describe('Transactions', () => {expect(highlighted).toBeTruthy();// Navigate away from the field with the keyboard- fireEvent.keyDown(input, keys.TAB);+ await userEvent.type(input, '[Tab]');// Make sure the category didn't update, and that the highlighted// field was different than the transactions' category@@ -653,8 +608,9 @@ describe('Transactions', () => {const { container, getTransactions } = renderTransactions();// Invalid values should be rejected and nullified- let input = editField(container, 'category', 2);- fireEvent.change(input, { target: { value: 'aaabbbccc' } });+ let input = await editField(container, 'category', 2);+ await userEvent.clear(input);+ await userEvent.type(input, 'aaabbbccc');// For this first test case, make sure the tooltip is gone. We// don't need to check this in all the other cases@@ -664,36 +620,35 @@ describe('Transactions', () => {expect(tooltipItems.length).toBe(0);expect(getTransactions()[2].category).not.toBe(null);- fireEvent.keyDown(input, keys.TAB);+ await userEvent.tab();expect(getTransactions()[2].category).toBe(null);// Clear out the category value- input = editField(container, 'category', 3);- fireEvent.change(input, { target: { value: '' } });+ input = await editField(container, 'category', 3);+ await userEvent.clear(input);// The category should be null when the value is clearedexpect(getTransactions()[3].category).not.toBe(null);- fireEvent.keyDown(input, keys.TAB);+ await userEvent.tab();expect(getTransactions()[3].category).toBe(null);// Clear out the payee value- input = editField(container, 'payee', 3);+ input = await editField(container, 'payee', 3);await new Promise(resolve => setTimeout(resolve, 10));- fireEvent.change(input, { target: { value: '' } });+ await userEvent.clear(input);// The payee should be empty when the value is clearedexpect(getTransactions()[3].payee).not.toBe('');- fireEvent.keyDown(input, keys.TAB);+ await userEvent.tab();expect(getTransactions()[3].payee).toBe(null);});- test('dropdown escape resets the value ', () => {+ test('dropdown escape resets the value ', async () => {const { container } = renderTransactions();- let input = editField(container, 'category', 2);+ let input = await editField(container, 'category', 2);let oldValue = input.value;- fireEvent.change(input, { target: { value: 'aaabbbccc' } });- fireEvent.keyDown(input, keys.ESC);+ await userEvent.type(input, 'aaabbbccc[Escape]');expect(input.value).toBe(oldValue);// The tooltip be closed@@ -717,17 +672,15 @@ describe('Transactions', () => {expect(container.ownerDocument.activeElement).toBe(input);expect(input.value).not.toBe('');- input = editNewField(container, 'notes');- fireEvent.change(input, { target: { value: 'a transaction' } });- fireEvent.keyDown(input, keys.ENTER);+ input = await editNewField(container, 'notes');+ await userEvent.clear(input);+ await userEvent.type(input, 'a transaction[Enter]');- input = editNewField(container, 'debit');+ input = await editNewField(container, 'debit');expect(input.value).toBe('0.00');- fireEvent.change(input, { target: { value: '100' } });+ await userEvent.clear(input);+ await userEvent.type(input, '100[Enter]');- act(() => {- fireEvent.keyDown(input, keys.ENTER);- });expect(getTransactions().length).toBe(6);expect(getTransactions()[0].amount).toBe(-10000);expect(getTransactions()[0].notes).toBe('a transaction');@@ -743,33 +696,34 @@ describe('Transactions', () => {const { container, getTransactions, updateProps } = renderTransactions();updateProps({ isAdding: true });- let input = editNewField(container, 'debit');- fireEvent.change(input, { target: { value: '55.00' } });- fireEvent.blur(input);+ let input = await editNewField(container, 'debit');+ await userEvent.clear(input);+ await userEvent.type(input, '55.00');- editNewField(container, 'category');+ await editNewField(container, 'category');let splitButton = document.body.querySelector('[data-testid="tooltip"] [data-testid="split-transaction-button"]',);- fireEvent.click(splitButton);+ await userEvent.click(splitButton);await waitForAutocomplete();await waitForAutocomplete();await waitForAutocomplete();- fireEvent.click(+ await userEvent.click(container.querySelector('[data-testid="transaction-error"] button'),);- input = editNewField(container, 'debit', 1);- fireEvent.change(input, { target: { value: '45.00' } });- fireEvent.blur(input);+ input = await editNewField(container, 'debit', 1);+ await userEvent.clear(input);+ await userEvent.type(input, '45.00');expect(container.querySelector('[data-testid="transaction-error"]'),).toBeTruthy();- input = editNewField(container, 'debit', 2);- fireEvent.change(input, { target: { value: '10.00' } });- fireEvent.blur(input);+ input = await editNewField(container, 'debit', 2);+ await userEvent.clear(input);+ await userEvent.type(input, '10.00');+ await userEvent.tab();expect(container.querySelector('[data-testid="transaction-error"]')).toBe(null,);@@ -777,7 +731,7 @@ describe('Transactions', () => {let addButton = container.querySelector('[data-testid="add-button"]');expect(getTransactions().length).toBe(5);- fireEvent.click(addButton);+ await userEvent.click(addButton);expect(getTransactions().length).toBe(8);expect(getTransactions()[0].is_parent).toBe(true);expect(getTransactions()[0].amount).toBe(-5500);@@ -787,7 +741,7 @@ describe('Transactions', () => {expect(getTransactions()[2].amount).toBe(-1000);});- test('escape closes the new transaction rows', () => {+ test('escape closes the new transaction rows', async () => {const { container, updateProps } = renderTransactions({onCloseAddTransaction: () => {updateProps({ isAdding: false });@@ -798,17 +752,17 @@ describe('Transactions', () => {// While adding a transaction, pressing escape should close the// new transaction formlet input = expectToBeEditingField(container, 'date', 0, true);- fireEvent.keyDown(input, keys.TAB);+ await userEvent.type(input, '[Tab]');input = expectToBeEditingField(container, 'account', 0, true);// The first escape closes the dropdown- fireEvent.keyDown(input, keys.ESC);+ await userEvent.type(input, '[Escape]');expect(container.querySelector('[data-testid="new-transaction"]'),).toBeTruthy();- // TOOD: Fix this+ // TODO: Fix this// Now it should close the new transaction form- // fireEvent.keyDown(input, keys.ESC);+ // await userEvent.type(input, '[Escape]');// expect(// container.querySelector('[data-testid="new-transaction"]')// ).toBeNull();@@ -818,16 +772,16 @@ describe('Transactions', () => {let cancelButton = container.querySelectorAll('[data-testid="new-transaction"] [data-testid="cancel-button"]',)[0];- fireEvent.click(cancelButton);+ await userEvent.click(cancelButton);expect(container.querySelector('[data-testid="new-transaction"]')).toBe(null,);});- test('transaction can be selected', () => {+ test('transaction can be selected', async () => {const { container } = renderTransactions();- editField(container, 'date', 2);+ await editField(container, 'date', 2);const selectCell = queryField(container,'select',@@ -835,7 +789,7 @@ describe('Transactions', () => {2,);- fireEvent.click(selectCell);+ await userEvent.click(selectCell);// The header is is selected as well as the single transactionexpect(container.querySelectorAll('[data-testid=select] svg').length).toBe(2,@@ -868,7 +822,7 @@ describe('Transactions', () => {});}- let input = editField(container, 'category', 0);+ let input = await editField(container, 'category', 0);let tooltip = container.querySelector('[data-testid="tooltip"]');let splitButton = tooltip.querySelector('[data-testid="split-transaction-button"]',@@ -880,7 +834,7 @@ describe('Transactions', () => {// Make sure splitting a transaction worksexpect(getTransactions().length).toBe(5);- fireEvent.click(splitButton);+ await userEvent.click(splitButton);await waitForAutocomplete();expect(getTransactions().length).toBe(6);expect(getTransactions()[0].is_parent).toBe(true);@@ -897,26 +851,25 @@ describe('Transactions', () => {// Enter an amount for the new split transaction and make sure the// toolbar updates- input = editField(container, 'debit', 1);- fireEvent.change(input, { target: { value: '10.00' } });- fireEvent.keyDown(input, keys.TAB);+ input = await editField(container, 'debit', 1);+ await userEvent.clear(input);+ await userEvent.type(input, '10.00[tab]');expect(toolbar.innerHTML.includes('17.77')).toBeTruthy();// Add another split transaction and make sure everything is// updated properly- fireEvent.click(toolbar.querySelector('button'));+ await userEvent.click(toolbar.querySelector('button'));expect(getTransactions().length).toBe(7);expect(getTransactions()[2].amount).toBe(0);expectErrorToExist(getTransactions().slice(0, 3));// Change the amount to resolve the whole transaction. The toolbar// should disappear and no error should exist- input = editField(container, 'debit', 2);- fireEvent.change(input, { target: { value: '17.77' } });- fireEvent.keyDown(input, keys.TAB);- expect(- container.querySelectorAll('[data-testid="transaction-error"]').length,- ).toBe(0);+ input = await editField(container, 'debit', 2);+ await userEvent.clear(input);+ await userEvent.type(input, '17.77[tab]');+ await userEvent.tab();+ expect(screen.queryAllByTestId('transaction-error')).toHaveLength(0);expectErrorToNotExist(getTransactions().slice(0, 3));// This snapshot makes sure the data is as we expect. It also@@ -972,20 +925,20 @@ describe('Transactions', () => {// yet because it doesn't do any batch editing//// const deleteCell = queryField(container, 'delete', '', 2);- // fireEvent.click(deleteCell);+ // await userEvent.click(deleteCell);// expect(getTransactions().length).toBe(6);// toolbar = container.querySelector('[data-testid="transaction-error"]');// expect(toolbar).toBeTruthy();// expect(toolbar.innerHTML.includes('17.77')).toBeTruthy();- // fireEvent.click(queryField(container, 'delete', '', 1));+ // await userEvent.click(queryField(container, 'delete', '', 1));// expect(getTransactions()[0].isParent).toBe(false);});test('transaction with splits shows 0 in correct column', async () => {const { container, getTransactions } = renderTransactions();- let input = editField(container, 'category', 0);+ let input = await editField(container, 'category', 0);let tooltip = container.querySelector('[data-testid="tooltip"]');let splitButton = tooltip.querySelector('[data-testid="split-transaction-button"',@@ -996,9 +949,9 @@ describe('Transactions', () => {// Add two new split transactionsexpect(getTransactions().length).toBe(5);- fireEvent.click(splitButton);+ await userEvent.click(splitButton);await waitForAutocomplete();- fireEvent.click(+ await userEvent.click(container.querySelector('[data-testid="transaction-error"] button'),);expect(getTransactions().length).toBe(7);@@ -1010,9 +963,8 @@ describe('Transactions', () => {expect(queryField(container, 'credit', '', 2).textContent).toBe('');// Change it to a credit transaction- input = editField(container, 'credit', 0);- fireEvent.change(input, { target: { value: '55.00' } });- fireEvent.keyDown(input, keys.TAB);+ input = await editField(container, 'credit', 0);+ await userEvent.type(input, '55.00{Tab}');// The zeros should now display in the credit columnexpect(queryField(container, 'debit', '', 1).textContent).toBe('');diff --git a/packages/desktop-electron/about/index.js b/packages/desktop-electron/about/index.jsindex 1823ea78b6..728d5e27c5 100644--- a/packages/desktop-electron/about/index.js+++ b/packages/desktop-electron/about/index.js@@ -89,7 +89,7 @@ ipcRenderer.on('update-error', (event, msg) => {document.addEventListener('keydown', e => {// Disable zoom with keys + and -- if (e.keyCode === 187 || e.keyCode === 189) {+ if (e.key === '+' || e.key === '-') {e.preventDefault();}});diff --git a/packages/loot-design/package.json b/packages/loot-design/package.jsonindex 7022e5fd81..e28b01f7e3 100644--- a/packages/loot-design/package.json+++ b/packages/loot-design/package.json@@ -9,7 +9,7 @@"@babel/types": "^7.0.0-rc.1","@jlongster/lively": "0.0.4","@svgr/cli": "^6.5.1",- "@testing-library/react": "^9.1.4",+ "@testing-library/react": "14.0.0","chroma-js": "^1.3.3","date-fns": "2.0.0-alpha.27","downshift": "1.31.16",@@ -21,9 +21,9 @@"node-noop": "1.0.0","npm-run-all": "^4.1.3","prop-types": "15.6.0",- "react": "16.13.1",+ "react": "18.2.0","react-dnd-html5-backend": "^10.0.2",- "react-dom": "16.13.1",+ "react-dom": "18.2.0","wobble": "^1.5.0"},"dependencies": {diff --git a/packages/loot-design/src/components/Autocomplete.js b/packages/loot-design/src/components/Autocomplete.jsindex eca7f37aa3..299f0bc25a 100644--- a/packages/loot-design/src/components/Autocomplete.js+++ b/packages/loot-design/src/components/Autocomplete.js@@ -328,14 +328,12 @@ function onKeyDown(},e,) {- let ENTER = 13;- let ESC = 27;let { onKeyDown } = inputProps || {};// If the dropdown is open, an item is highlighted, and the user// pressed enter, always capture that and handle it ourselvesif (isOpen) {- if (e.keyCode === ENTER) {+ if (e.code === 'Enter') {if (highlightedIndex != null) {if (inst.lastChangeType === Downshift.stateChangeTypes.itemMouseEnter) {// If the last thing the user did was hover an item, intentionally@@ -365,7 +363,7 @@ function onKeyDown(}// Handle escape ourselves- if (e.keyCode === ESC) {+ if (e.code === 'Escape') {e.preventDefault();if (!embedded) {@@ -414,8 +412,7 @@ function defaultRenderItems(items, getItemProps, highlightedIndex) {}function defaultShouldSaveFromKey(e) {- // Enter- return e.keyCode === 13;+ return e.code === 'Enter';}function onFocus({ inst, props: { inputProps = {}, openOnFocus = true } }, e) {diff --git a/packages/loot-design/src/components/DateSelect.js b/packages/loot-design/src/components/DateSelect.jsindex 8b78ece85b..cb2c951916 100644--- a/packages/loot-design/src/components/DateSelect.js+++ b/packages/loot-design/src/components/DateSelect.js@@ -75,20 +75,20 @@ export let DatePicker = React.forwardRef(() => ({handleInputKeyDown(e) {let newDate = null;- switch (e.keyCode) {- case 37:+ switch (e.code) {+ case 'ArrowLeft':e.preventDefault();newDate = d.subDays(picker.current.getDate(), 1);break;- case 38:+ case 'ArrowUp':e.preventDefault();newDate = d.subDays(picker.current.getDate(), 7);break;- case 39:+ case 'ArrowRight':e.preventDefault();newDate = d.addDays(picker.current.getDate(), 1);break;- case 40:+ case 'ArrowDown':e.preventDefault();newDate = d.addDays(picker.current.getDate(), 7);break;@@ -140,8 +140,7 @@ export let DatePicker = React.forwardRef();function defaultShouldSaveFromKey(e) {- // Enter- return e.keyCode === 13;+ return e.code === 'Enter';}export default function DateSelect({@@ -224,18 +223,15 @@ export default function DateSelect({}, [value]);function onKeyDown(e) {- let ESC = 27;-if (- e.keyCode >= 37 &&- e.keyCode <= 40 &&+ ['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'].includes(e.code) &&!e.shiftKey &&!e.metaKey &&!e.altKey &&open) {picker.current.handleInputKeyDown(e);- } else if (e.keyCode === ESC) {+ } else if (e.code === 'Escape') {setValue(parsedDefaultValue);setSelectedValue(parsedDefaultValue);diff --git a/packages/loot-design/src/components/budget/index.js b/packages/loot-design/src/components/budget/index.jsindex 05b54cb85d..76b6115d05 100644--- a/packages/loot-design/src/components/budget/index.js+++ b/packages/loot-design/src/components/budget/index.js@@ -133,14 +133,11 @@ export class BudgetTable extends React.Component {};onKeyDown = e => {- const TAB = 9;- const ENTER = 13;-if (!this.state.editing) {return null;}- if (e.keyCode === ENTER || e.keyCode === TAB) {+ if (e.code === 'Enter' || e.code === 'Tab') {e.preventDefault();this.moveVertically(e.shiftKey ? -1 : 1);}@@ -392,8 +389,7 @@ export function SidebarCategory({style,]}onKeyDown={e => {- const ENTER = 13;- if (e.keyCode === ENTER) {+ if (e.code === 'Enter') {onEditName(null);e.stopPropagation();}@@ -548,8 +544,7 @@ export function SidebarGroup({},]}onKeyDown={e => {- const ENTER = 13;- if (e.keyCode === ENTER) {+ if (e.code === 'Enter') {onEdit(null);e.stopPropagation();}diff --git a/packages/loot-design/src/components/budget/rollover/rollover-components.js b/packages/loot-design/src/components/budget/rollover/rollover-components.jsindex 1622570e37..559bbf8064 100644--- a/packages/loot-design/src/components/budget/rollover/rollover-components.js+++ b/packages/loot-design/src/components/budget/rollover/rollover-components.js@@ -72,7 +72,7 @@ function CoverTooltip({inputProps={{inputRef: node,onKeyDown: e => {- if (e.keyCode === 13) {+ if (e.code === 'Enter') {submit();}},diff --git a/packages/loot-design/src/components/common.js b/packages/loot-design/src/components/common.jsindex 1d7ac6b0d1..deed2fad9d 100644--- a/packages/loot-design/src/components/common.js+++ b/packages/loot-design/src/components/common.js@@ -348,7 +348,7 @@ export function Input({)}{...nativeProps}onKeyDown={e => {- if (e.keyCode === 13 && onEnter) {+ if (e.code === 'Enter' && onEnter) {onEnter(e);}@@ -546,18 +546,15 @@ export function Keybinding({ keyName }) {}export function Menu({ header, footer, items: allItems, onMenuSelect }) {- let el = useRef(null);+ let elRef = useRef(null);let items = allItems.filter(x => x);let [hoveredIndex, setHoveredIndex] = useState(null);useEffect(() => {- el.current.focus();+ const el = elRef.current;+ el.focus();let onKeyDown = e => {- const UP = 38;- const DOWN = 40;- const ENTER = 13;-let filteredItems = items.filter(item => item && item !== Menu.line && item.type !== Menu.label,);@@ -565,8 +562,8 @@ export function Menu({ header, footer, items: allItems, onMenuSelect }) {let transformIndex = idx => items.indexOf(filteredItems[idx]);- switch (e.keyCode) {- case UP:+ switch (e.code) {+ case 'ArrowUp':e.preventDefault();setHoveredIndex(hoveredIndex === null@@ -574,7 +571,7 @@ export function Menu({ header, footer, items: allItems, onMenuSelect }) {: transformIndex(Math.max(currentIndex - 1, 0)),);break;- case DOWN:+ case 'ArrowDown':e.preventDefault();setHoveredIndex(hoveredIndex === null@@ -584,7 +581,7 @@ export function Menu({ header, footer, items: allItems, onMenuSelect }) {),);break;- case ENTER:+ case 'Enter':e.preventDefault();if (hoveredIndex !== null) {onMenuSelect && onMenuSelect(items[hoveredIndex].name);@@ -594,10 +591,10 @@ export function Menu({ header, footer, items: allItems, onMenuSelect }) {}};- el.current.addEventListener('keydown', onKeyDown);+ el.addEventListener('keydown', onKeyDown);return () => {- el.current.removeEventListener('keydown', onKeyDown);+ el.removeEventListener('keydown', onKeyDown);};}, [hoveredIndex]);@@ -605,7 +602,7 @@ export function Menu({ header, footer, items: allItems, onMenuSelect }) {<Viewstyle={{ outline: 'none', borderRadius: 4, overflow: 'hidden' }}tabIndex={1}- innerRef={el}+ innerRef={elRef}>{header}{items.map((item, idx) => {diff --git a/packages/loot-design/src/components/payees.js b/packages/loot-design/src/components/payees.jsindex f964d308c8..43410ee003 100644--- a/packages/loot-design/src/components/payees.js+++ b/packages/loot-design/src/components/payees.js@@ -342,7 +342,7 @@ export const ManagePayees = React.forwardRef(payees,ruleCounts,categoryGroups,- tableNavigatorOpts,+ tableNavigatorOpts, // TODO: remove as it's unusedinitialSelectedIds,ruleActions,onBatchChange,diff --git a/packages/loot-design/src/components/spreadsheet/CellDebugger.js b/packages/loot-design/src/components/spreadsheet/CellDebugger.jsdeleted file mode 100644index 5eec18bb7e..0000000000--- a/packages/loot-design/src/components/spreadsheet/CellDebugger.js+++ /dev/null@@ -1,56 +0,0 @@-import React, { Component } from 'react';--import * as spreadsheet from '../../sheetql/spreadsheet';--class CellDebugger extends Component {- constructor() {- super();- this.state = { expr: '', value: '' };- }-- componentDidMount() {- this.unbind = spreadsheet.bind(this.props.name, node => {- if (this.mode !== 'edit') {- this.setState({ expr: node.expr, value: node.value });- }- });- }-- componentWillUnmount() {- this.unbind();- }-- onChange(e) {- spreadsheet.set(this.props.name, e.target.value);- this.setState({ expr: e.target.value });- }-- onKeyDown(e) {- if (e.keyCode === 13) {- this.setState({ mode: 'view' });- e.target.blur();- }- }-- render() {- return (- <tr>- <td>{this.props.name}: </td>- <td>- <input- type="text"- value={- this.state.mode === 'edit' ? this.state.expr : this.state.value- }- onFocus={() => this.setState({ mode: 'edit' })}- onBlur={() => this.setState({ mode: 'view' })}- onChange={this.onChange.bind(this)}- onKeyDown={this.onKeyDown.bind(this)}- />- </td>- </tr>- );- }-}--export default CellDebugger;diff --git a/packages/loot-design/src/components/table.js b/packages/loot-design/src/components/table.jsindex 6b43927c9e..1603065cfe 100644--- a/packages/loot-design/src/components/table.js+++ b/packages/loot-design/src/components/table.js@@ -16,7 +16,6 @@ import AnimatedLoading from '../svg/AnimatedLoading';import DeleteIcon from '../svg/v0/Delete';import ExpandArrow from '../svg/v0/ExpandArrow';import Checkmark from '../svg/v1/Checkmark';-import { keys } from '../util/keys';import {View,@@ -322,11 +321,11 @@ function InputValue({ value: defaultValue, onUpdate, onBlur, ...props }) {function onKeyDown(e) {// Only enter and tab to escape (which allows the user to move// around)- if (e.keyCode !== keys.ENTER && e.keyCode !== keys.TAB) {+ if (e.code !== 'Enter' && e.code !== 'Tab') {e.stopPropagation();}- if (e.keyCode === keys.ESC) {+ if (e.code === 'Escape') {if (value !== defaultValue) {setValue(defaultValue);}@@ -387,9 +386,9 @@ export function InputCell({}export function shouldSaveFromKey(e) {- switch (e.keyCode) {- case keys.TAB:- case keys.ENTER:+ switch (e.code) {+ case 'Tab':+ case 'Enter':e.preventDefault();return true;default:@@ -484,7 +483,7 @@ export const CellButton = React.forwardRef(className="cell-button"tabIndex="0"onKeyDown={e => {- if (e.keyCode === keys.X || e.keyCode === keys.SPACE) {+ if (e.code === 'KeyX' || e.code === 'Space') {e.preventDefault();if (!disabled) {onSelect && onSelect();@@ -1135,28 +1134,28 @@ export function useTableNavigator(data, fields, opts = {}) {onMove(fieldKeys[e.keyCode]);} else {- switch (e.keyCode) {- case keys.UP:- case keys.K:+ switch (e.code) {+ case 'ArrowUp':+ case 'KeyK':if (e.target.tagName !== 'INPUT') {onMove('up');}break;- case keys.DOWN:- case keys.J:+ case 'ArrowDown':+ case 'KeyJ':if (e.target.tagName !== 'INPUT') {onMove('down');}break;- case keys.ENTER:- case keys.TAB:+ case 'Enter':+ case 'Tab':e.preventDefault();e.stopPropagation();onMove(- e.keyCode === keys.ENTER+ e.code === 'Enter'? e.shiftKey? 'up': 'down'diff --git a/packages/loot-design/src/components/tooltips.js b/packages/loot-design/src/components/tooltips.jsindex dcd9309af4..f386ddc0d3 100644--- a/packages/loot-design/src/components/tooltips.js+++ b/packages/loot-design/src/components/tooltips.js@@ -59,7 +59,7 @@ export class Tooltip extends React.Component {};let escHandler = e => {- if (e.keyCode === 27) {+ if (e.code === 'Escape') {this.props.onClose && this.props.onClose();}};diff --git a/packages/loot-design/src/util/keys.js b/packages/loot-design/src/util/keys.jsindex b6f3a15900..e9db15a5c7 100644--- a/packages/loot-design/src/util/keys.js+++ b/packages/loot-design/src/util/keys.js@@ -1,22 +1,6 @@// TODO: This is a barebones module for now, need to think about a// generic way keys are handled across the app-export const keys = {- ESC: 27,- TAB: 9,- ENTER: 13,- SHIFT: 16,- ALT: 18,- META: 91,- CTRL: 17,- SPACE: 32,- UP: 38,- DOWN: 40,- J: 74,- K: 75,- X: 88,-};-let _keyHandlers = {};let _modifierState = {@@ -42,16 +26,16 @@ export function registerKeyHandler(key, func) {}document.addEventListener('keydown', e => {- if (e.keyCode === keys.SHIFT) {+ if (e.key === 'Shift') {_modifierState.shift = true;}- if (e.keyCode === keys.CTRL) {+ if (e.key === 'Control') {_modifierState.ctrl = true;}- if (e.keyCode === keys.ALT) {+ if (e.key === 'Alt') {_modifierState.alt = true;}- if (e.keyCode === keys.META) {+ if (e.key === 'Meta') {_modifierState.meta = true;}@@ -66,16 +50,16 @@ document.addEventListener('keydown', e => {});document.addEventListener('keyup', e => {- if (e.keyCode === keys.SHIFT) {+ if (e.key === 'Shift') {_modifierState.shift = false;}- if (e.keyCode === keys.CTRL) {+ if (e.key === 'Control') {_modifierState.ctrl = false;}- if (e.keyCode === keys.ALT) {+ if (e.key === 'Alt') {_modifierState.alt = false;}- if (e.keyCode === keys.META) {+ if (e.key === 'Meta') {_modifierState.meta = false;}});diff --git a/upcoming-release-notes/696.md b/upcoming-release-notes/696.mdnew file mode 100644index 0000000000..782610e5ea--- /dev/null+++ b/upcoming-release-notes/696.md@@ -0,0 +1,6 @@+---+category: Maintenance+authors: [MatissJanis]+---++Upgrade React to v18diff --git a/yarn.lock b/yarn.lockindex 19585b2b39..6f02989c89 100644--- a/yarn.lock+++ b/yarn.lock@@ -61,6 +61,8 @@ __metadata:"@react-stately/collections": ^3.4.3"@react-stately/list": ^3.5.3"@reactions/component": ^2.0.2+ "@testing-library/react": 14.0.0+ "@testing-library/user-event": 14.4.3chalk: 2.4.1cross-env: ^7.0.3customize-cra: ^1.0.0@@ -74,10 +76,10 @@ __metadata:jest-watch-typeahead: ^2.2.2mitt: ^3.0.0prop-types: 15.6.0- react: 16.13.1+ react: 18.2.0react-app-rewired: ^2.2.1react-dnd: ^10.0.2- react-dom: 16.13.1+ react-dom: 18.2.0react-redux: 7.2.1react-router: 5.2.0react-router-dom: 5.2.0@@ -1576,17 +1578,7 @@ __metadata:languageName: nodelinkType: hard-"@babel/runtime-corejs3@npm:^7.10.2":- version: 7.17.8- resolution: "@babel/runtime-corejs3@npm:7.17.8"- dependencies:- core-js-pure: ^3.20.2- regenerator-runtime: ^0.13.4- checksum: 91f96437393b48c51000d1bb9d7a219de9394c5cf5227f1d263b6653fac3ff78e9d5e445e7c4410e9e3b24497715098ea6ade6fcad6cf964b0cf3ff161a85bd9- languageName: node- linkType: hard--"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":+"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":version: 7.21.0resolution: "@babel/runtime@npm:7.21.0"dependencies:@@ -2322,29 +2314,6 @@ __metadata:languageName: nodelinkType: hard-"@jest/types@npm:^24.9.0":- version: 24.9.0- resolution: "@jest/types@npm:24.9.0"- dependencies:- "@types/istanbul-lib-coverage": ^2.0.0- "@types/istanbul-reports": ^1.1.1- "@types/yargs": ^13.0.0- checksum: 603698f774cf22f9d16a0e0fac9e10e7db21052aebfa33db154c8a5940e0eb1fa9c079a8c91681041ad3aeee2adfa950608dd0c663130316ba034b8bca7b301c- languageName: node- linkType: hard--"@jest/types@npm:^25.5.0":- version: 25.5.0- resolution: "@jest/types@npm:25.5.0"- dependencies:- "@types/istanbul-lib-coverage": ^2.0.0- "@types/istanbul-reports": ^1.1.1- "@types/yargs": ^15.0.0- chalk: ^3.0.0- checksum: 785b67521a2c54f290ad4b53f49fec6b14fa25828bf26a838f7bbe08dd42122f27f71a620ea9a33286346786e9b120dd370abf589e6ef8c5fde9dc56906880b1- languageName: node- linkType: hard-"@jest/types@npm:^27.5.1":version: 27.5.1resolution: "@jest/types@npm:27.5.1"@@ -3070,13 +3039,6 @@ __metadata:languageName: nodelinkType: hard-"@sheerun/mutationobserver-shim@npm:^0.3.2":- version: 0.3.3- resolution: "@sheerun/mutationobserver-shim@npm:0.3.3"- checksum: 1bf2984b1ac69459ebd5adefd767439533c73c1fcba54678b73dd37f092b1471e322e6ac8937e899231315fc08c4e818d7e7cb2204babab8b32460872f2de868- languageName: node- linkType: hard-"@sinclair/typebox@npm:^0.24.1":version: 0.24.28resolution: "@sinclair/typebox@npm:0.24.28"@@ -3455,48 +3417,42 @@ __metadata:languageName: nodelinkType: hard-"@testing-library/dom@npm:*":- version: 8.12.0- resolution: "@testing-library/dom@npm:8.12.0"+"@testing-library/dom@npm:^9.0.0":+ version: 9.0.0+ resolution: "@testing-library/dom@npm:9.0.0"dependencies:"@babel/code-frame": ^7.10.4"@babel/runtime": ^7.12.5- "@types/aria-query": ^4.2.0+ "@types/aria-query": ^5.0.1aria-query: ^5.0.0chalk: ^4.1.0dom-accessibility-api: ^0.5.9lz-string: ^1.4.4pretty-format: ^27.0.2- checksum: 2bbf5fa5c1e883571c440ccee76c0568fa5153b43c097456dd7146797256687352bfca9db574e0e78a022ce14722a6acaaba5f680ee16b95e12405501713d34d+ checksum: 5381bf9438f0ee35f795e7f9b203564aa455e7cd838b6677084c82dd56396779c38cc49ddffed4e57a8bcc3c62b4bc96ea684bb4b24d13655152db745327b2cdlanguageName: nodelinkType: hard-"@testing-library/dom@npm:^6.15.0":- version: 6.16.0- resolution: "@testing-library/dom@npm:6.16.0"+"@testing-library/react@npm:14.0.0":+ version: 14.0.0+ resolution: "@testing-library/react@npm:14.0.0"dependencies:- "@babel/runtime": ^7.8.4- "@sheerun/mutationobserver-shim": ^0.3.2- "@types/testing-library__dom": ^6.12.1- aria-query: ^4.0.2- dom-accessibility-api: ^0.3.0- pretty-format: ^25.1.0- wait-for-expect: ^3.0.2- checksum: bc6a8e073caf4d427777d1d43df581f5befd543ea396831fcf7421bd28dc168f85c03251932ea01593e6fc214022b14178e702aa7aa97137d0fba9baecd98f93+ "@babel/runtime": ^7.12.5+ "@testing-library/dom": ^9.0.0+ "@types/react-dom": ^18.0.0+ peerDependencies:+ react: ^18.0.0+ react-dom: ^18.0.0+ checksum: 4a54c8f56cc4a39b50803205f84f06280bb76521d6d5d4b3b36651d760c7c7752ef142d857d52aaf4fad4848ed7a8be49afc793a5dda105955d2f8bef24901aclanguageName: nodelinkType: hard-"@testing-library/react@npm:^9.1.4":- version: 9.5.0- resolution: "@testing-library/react@npm:9.5.0"- dependencies:- "@babel/runtime": ^7.8.4- "@testing-library/dom": ^6.15.0- "@types/testing-library__react": ^9.1.2+"@testing-library/user-event@npm:14.4.3":+ version: 14.4.3+ resolution: "@testing-library/user-event@npm:14.4.3"peerDependencies:- react: "*"- react-dom: "*"- checksum: 41a7ba9f944774b180e907df7e8e0a309d68199e9ad1bcdc571fa062c2cf73c76b5b5291f14fd63633506a6cdcbb7b6f31733ff886303fc5e4d7616c78f0747b+ "@testing-library/dom": ">=7.21.4"+ checksum: 852c48ea6db1c9471b18276617c84fec4320771e466cd58339a732ca3fd73ad35e5a43ae14f51af51a8d0a150dcf60fcaab049ef367871207bea8f92c4b8195elanguageName: nodelinkType: hard@@ -3549,10 +3505,10 @@ __metadata:languageName: nodelinkType: hard-"@types/aria-query@npm:^4.2.0":- version: 4.2.2- resolution: "@types/aria-query@npm:4.2.2"- checksum: 6f2ce11d91e2d665f3873258db19da752d91d85d3679eb5efcdf9c711d14492287e1e4eb52613b28e60375841a9e428594e745b68436c963d8bad4bf72188df3+"@types/aria-query@npm:^5.0.1":+ version: 5.0.1+ resolution: "@types/aria-query@npm:5.0.1"+ checksum: 69fd7cceb6113ed370591aef04b3fd0742e9a1b06dd045c43531448847b85de181495e4566f98e776b37c422a12fd71866e0a1dfd904c5ec3f84d271682901delanguageName: nodelinkType: hard@@ -3866,16 +3822,6 @@ __metadata:languageName: nodelinkType: hard-"@types/istanbul-reports@npm:^1.1.1":- version: 1.1.2- resolution: "@types/istanbul-reports@npm:1.1.2"- dependencies:- "@types/istanbul-lib-coverage": "*"- "@types/istanbul-lib-report": "*"- checksum: 00866e815d1e68d0a590d691506937b79d8d65ad8eab5ed34dbfee66136c7c0f4ea65327d32046d5fe469f22abea2b294987591dc66365ebc3991f7e413b2d78- languageName: node- linkType: hard-"@types/istanbul-reports@npm:^3.0.0":version: 3.0.1resolution: "@types/istanbul-reports@npm:3.0.1"@@ -4005,12 +3951,12 @@ __metadata:languageName: nodelinkType: hard-"@types/react-dom@npm:*":- version: 17.0.14- resolution: "@types/react-dom@npm:17.0.14"+"@types/react-dom@npm:^18.0.0":+ version: 18.0.11+ resolution: "@types/react-dom@npm:18.0.11"dependencies:"@types/react": "*"- checksum: b54cd0ef573236b3d87fe7493e6d1c36d8b4ca37a3b46364272a5c91ac178e3296b68ea1aeb299ce68f12ad663c5720ee890d0539b14881c6754bdcbdb0befa0+ checksum: 579691e4d5ec09688087568037c35edf8cfb1ab3e07f6c60029280733ee7b5c06d66df6fcc90786702c93ac8cb13bc7ff16c79ddfc75d082938fbaa36e1cdbf4languageName: nodelinkType: hard@@ -4099,35 +4045,6 @@ __metadata:languageName: nodelinkType: hard-"@types/testing-library__dom@npm:*":- version: 7.5.0- resolution: "@types/testing-library__dom@npm:7.5.0"- dependencies:- "@testing-library/dom": "*"- checksum: fe38a1f42c6f35178c39ae3e465b6762467344bffab818163a18f6727abd402c8a27b4da41444789cbde4c7d08f3e5e9eceb8daed7be02187d757c22b06d07e6- languageName: node- linkType: hard--"@types/testing-library__dom@npm:^6.12.1":- version: 6.14.0- resolution: "@types/testing-library__dom@npm:6.14.0"- dependencies:- pretty-format: ^24.3.0- checksum: 1563762a685bb15da02499e826e0dd217c209e8bcdde9f65d98090cc0d50fc74a22af0ecb8803edd48159f8cc2bb0d750acdea0f2a11d0c59e969e69ab2fc8b8- languageName: node- linkType: hard--"@types/testing-library__react@npm:^9.1.2":- version: 9.1.3- resolution: "@types/testing-library__react@npm:9.1.3"- dependencies:- "@types/react-dom": "*"- "@types/testing-library__dom": "*"- pretty-format: ^25.1.0- checksum: 2fc33f97d17fea35f1215cd1cd5899cbec4be897f2e21b13bf32cbac4234c88ca685517bdd142c1cebc8ee1ff74fa5ce5aff770f907f3bc116dc578e85972685- languageName: node- linkType: hard-"@types/trusted-types@npm:^2.0.2":version: 2.0.3resolution: "@types/trusted-types@npm:2.0.3"@@ -4176,16 +4093,7 @@ __metadata:languageName: nodelinkType: hard-"@types/yargs@npm:^13.0.0":- version: 13.0.12- resolution: "@types/yargs@npm:13.0.12"- dependencies:- "@types/yargs-parser": "*"- checksum: 4eb34d8c071892299646e5a3fb02a643f5a5ea8da8f4d1817001882ebbcfa4fbda235b8978732f8eb55fa16433296e2087907fe69678a69125f0dca627a91426- languageName: node- linkType: hard--"@types/yargs@npm:^15.0.0, @types/yargs@npm:^15.0.13":+"@types/yargs@npm:^15.0.13":version: 15.0.14resolution: "@types/yargs@npm:15.0.14"dependencies:@@ -5020,14 +4928,14 @@ __metadata:languageName: nodelinkType: hard-"ansi-regex@npm:^4.0.0, ansi-regex@npm:^4.1.0":+"ansi-regex@npm:^4.1.0":version: 4.1.1resolution: "ansi-regex@npm:4.1.1"checksum: b1a6ee44cb6ecdabaa770b2ed500542714d4395d71c7e5c25baa631f680fb2ad322eb9ba697548d498a6fd366949fc8b5bfcf48d49a32803611f648005b01888languageName: nodelinkType: hard-"ansi-regex@npm:^5.0.0, ansi-regex@npm:^5.0.1":+"ansi-regex@npm:^5.0.1":version: 5.0.1resolution: "ansi-regex@npm:5.0.1"checksum: 2aa4bb54caf2d622f1afdad09441695af2a83aa3fe8b8afa581d205e57ed4261c183c4d3877cee25794443fde5876417d859c108078ab788d6af7e4fe52eb66b@@ -5188,16 +5096,6 @@ __metadata:languageName: nodelinkType: hard-"aria-query@npm:^4.0.2":- version: 4.2.2- resolution: "aria-query@npm:4.2.2"- dependencies:- "@babel/runtime": ^7.10.2- "@babel/runtime-corejs3": ^7.10.2- checksum: 38401a9a400f26f3dcc24b84997461a16b32869a9893d323602bed8da40a8bcc0243b8d2880e942249a1496cea7a7de769e93d21c0baa439f01e1ee936fed665- languageName: node- linkType: hard-"aria-query@npm:^5.0.0, aria-query@npm:^5.1.3":version: 5.1.3resolution: "aria-query@npm:5.1.3"@@ -6391,16 +6289,6 @@ __metadata:languageName: nodelinkType: hard-"chalk@npm:^3.0.0":- version: 3.0.0- resolution: "chalk@npm:3.0.0"- dependencies:- ansi-styles: ^4.1.0- supports-color: ^7.1.0- checksum: 8e3ddf3981c4da405ddbd7d9c8d91944ddf6e33d6837756979f7840a29272a69a5189ecae0ff84006750d6d1e92368d413335eab4db5476db6e6703a1d1e0505- languageName: node- linkType: hard-"chalk@npm:^4.0.0, chalk@npm:^4.0.2, chalk@npm:^4.1.0, chalk@npm:^4.1.2":version: 4.1.2resolution: "chalk@npm:4.1.2"@@ -7052,7 +6940,7 @@ __metadata:languageName: nodelinkType: hard-"core-js-pure@npm:^3.20.2, core-js-pure@npm:^3.23.3":+"core-js-pure@npm:^3.23.3":version: 3.28.0resolution: "core-js-pure@npm:3.28.0"checksum: 8bef96a435783ea7e62b2bd4d6cc3d427a7bfeb053954aadabb33b5dba14a85c6297f7638bba9676a144f9cd7a5a0185a576d41d67baaae15227a4c9982a8cef@@ -8195,13 +8083,6 @@ __metadata:languageName: nodelinkType: hard-"dom-accessibility-api@npm:^0.3.0":- version: 0.3.0- resolution: "dom-accessibility-api@npm:0.3.0"- checksum: d54996748e8c81d4fe095edde0a601c94133c2f4c7e0e245310272c4c04af2c4daf476e5150d27b94b22a6e11816ea97d16125ed135e2607a2a63477fcc7feb8- languageName: node- linkType: hard-"dom-accessibility-api@npm:^0.5.9":version: 0.5.13resolution: "dom-accessibility-api@npm:0.5.13"@@ -13457,7 +13338,7 @@ __metadata:"@jlongster/lively": 0.0.4"@juggle/resize-observer": ^3.1.2"@svgr/cli": ^6.5.1- "@testing-library/react": ^9.1.4+ "@testing-library/react": 14.0.0chroma-js: ^1.3.3date-fns: 2.0.0-alpha.27downshift: 1.31.16@@ -13471,10 +13352,10 @@ __metadata:npm-run-all: ^4.1.3pikaday: 1.8.0prop-types: 15.6.0- react: 16.13.1+ react: 18.2.0react-dnd: ^10.0.2react-dnd-html5-backend: ^10.0.2- react-dom: 16.13.1+ react-dom: 18.2.0react-merge-refs: ^1.1.0react-modal: 3.16.1react-spring: ^8.0.27@@ -16446,30 +16327,6 @@ __metadata:languageName: nodelinkType: hard-"pretty-format@npm:^24.3.0":- version: 24.9.0- resolution: "pretty-format@npm:24.9.0"- dependencies:- "@jest/types": ^24.9.0- ansi-regex: ^4.0.0- ansi-styles: ^3.2.0- react-is: ^16.8.4- checksum: ba9291c8dafd50d2fea1fbad5d2863a6f94e0c8835cce9778ec03bc11bb0f52b9ed0e4ee56aaa331d022ccae2fe52b92f73465a0af58fd0edb59deb6391c6847- languageName: node- linkType: hard--"pretty-format@npm:^25.1.0":- version: 25.5.0- resolution: "pretty-format@npm:25.5.0"- dependencies:- "@jest/types": ^25.5.0- ansi-regex: ^5.0.0- ansi-styles: ^4.0.0- react-is: ^16.12.0- checksum: 76f022d2c911d9733a961467545f5aef2cae892da289fff92ba6a6868a10df4d8ef79794ff791e353f67f0edfa85765240f1e7d552e27c94029ae6af1c95174b- languageName: node- linkType: hard-"pretty-format@npm:^27.0.0, pretty-format@npm:^27.0.2, pretty-format@npm:^27.5.1":version: 27.5.1resolution: "pretty-format@npm:27.5.1"@@ -16914,17 +16771,15 @@ __metadata:languageName: nodelinkType: hard-"react-dom@npm:16.13.1":- version: 16.13.1- resolution: "react-dom@npm:16.13.1"+"react-dom@npm:18.2.0":+ version: 18.2.0+ resolution: "react-dom@npm:18.2.0"dependencies:loose-envify: ^1.1.0- object-assign: ^4.1.1- prop-types: ^15.6.2- scheduler: ^0.19.1+ scheduler: ^0.23.0peerDependencies:- react: ^16.13.1- checksum: 5009f3ee9bca06d6d4b9cf92c832eca102c284e6d019e832179c8de3e353534571474c95b7ab975935b22823726710dcd73783596c11dd71304beb11c19281c5+ react: ^18.2.0+ checksum: 7d323310bea3a91be2965f9468d552f201b1c27891e45ddc2d6b8f717680c95a75ae0bc1e3f5cf41472446a2589a75aed4483aee8169287909fcd59ad149e8cclanguageName: nodelinkType: hard@@ -16942,7 +16797,7 @@ __metadata:languageName: nodelinkType: hard-"react-is@npm:^16.12.0, react-is@npm:^16.13.1, react-is@npm:^16.6.0, react-is@npm:^16.7.0, react-is@npm:^16.8.4, react-is@npm:^16.9.0":+"react-is@npm:^16.13.1, react-is@npm:^16.6.0, react-is@npm:^16.7.0, react-is@npm:^16.9.0":version: 16.13.1resolution: "react-is@npm:16.13.1"checksum: f7a19ac3496de32ca9ae12aa030f00f14a3d45374f1ceca0af707c831b2a6098ef0d6bdae51bd437b0a306d7f01d4677fcc8de7c0d331eb47ad0f46130e53c5f@@ -17179,14 +17034,12 @@ __metadata:languageName: nodelinkType: hard-"react@npm:16.13.1":- version: 16.13.1- resolution: "react@npm:16.13.1"+"react@npm:18.2.0":+ version: 18.2.0+ resolution: "react@npm:18.2.0"dependencies:loose-envify: ^1.1.0- object-assign: ^4.1.1- prop-types: ^15.6.2- checksum: 4508f4207caca6bef55736284cbf2ce18d2edfee4c1457fc0bb2086b34ed5bcf9b44acdb71e27574e73a5b5d4d093720b5b4ec0bf92bb89394ee3a0a7c42c2d4+ checksum: 88e38092da8839b830cda6feef2e8505dec8ace60579e46aa5490fc3dc9bba0bd50336507dc166f43e3afc1c42939c09fe33b25fae889d6f402721dcd78fca1blanguageName: nodelinkType: hard@@ -17345,7 +17198,7 @@ __metadata:languageName: nodelinkType: hard-"regenerator-runtime@npm:^0.13.11, regenerator-runtime@npm:^0.13.4, regenerator-runtime@npm:^0.13.9":+"regenerator-runtime@npm:^0.13.11, regenerator-runtime@npm:^0.13.9":version: 0.13.11resolution: "regenerator-runtime@npm:0.13.11"checksum: 27481628d22a1c4e3ff551096a683b424242a216fee44685467307f14d58020af1e19660bf2e26064de946bad7eff28950eae9f8209d55723e2d9351e632bbb4@@ -17939,13 +17792,12 @@ __metadata:languageName: nodelinkType: hard-"scheduler@npm:^0.19.1":- version: 0.19.1- resolution: "scheduler@npm:0.19.1"+"scheduler@npm:^0.23.0":+ version: 0.23.0+ resolution: "scheduler@npm:0.23.0"dependencies:loose-envify: ^1.1.0- object-assign: ^4.1.1- checksum: 73e185a59e2ff5aa3609f5b9cb97ddd376f89e1610579d29939d952411ca6eb7a24907a4ea4556569dacb931467a1a4a56d94fe809ef713aa76748642cd96a6c+ checksum: d79192eeaa12abef860c195ea45d37cbf2bbf5f66e3c4dcd16f54a7da53b17788a70d109ee3d3dde1a0fd50e6a8fc171f4300356c5aee4fc0171de526bf35f8alanguageName: nodelinkType: hard@@ -20678,13 +20530,6 @@ __metadata:languageName: nodelinkType: hard-"wait-for-expect@npm:^3.0.2":- version: 3.0.2- resolution: "wait-for-expect@npm:3.0.2"- checksum: 2ec1ebd78023fa10bdcf53d78bbd65feea68fdfa0de0b00f3a72f3df089118b91517839ff3926e5ef6cfd1ede65085326d85b0378d4db62c266cc9c859c2de56- languageName: node- linkType: hard-"walker@npm:^1.0.7, walker@npm:^1.0.8":version: 1.0.8resolution: "walker@npm:1.0.8"