Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resume using the upstream react-mosaic-component package #4125

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion __tests__/src/components/Window.test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { MosaicWindowContext } from 'react-mosaic-component2';
import { MosaicWindowContext } from 'react-mosaic-component/lib/contextTypes';
import { render, screen } from '@tests/utils/test-utils';

import { Window } from '../../../src/components/Window';
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"react-full-screen": "^1.1.1",
"react-image": "^4.0.1",
"react-intersection-observer": "^9.0.0",
"react-mosaic-component2": "^6.0.0",
"react-mosaic-component": "^6.0.0",
"react-redux": "^8.0.0 || ^9.0.0",
"react-resize-observer": "^1.1.1",
"react-rnd": "~10.4.0",
Expand Down
2 changes: 1 addition & 1 deletion src/components/Window.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useContext, useCallback } from 'react';
import PropTypes from 'prop-types';
import { styled } from '@mui/material/styles';
import Paper from '@mui/material/Paper';
import { MosaicWindowContext } from 'react-mosaic-component2';
import { MosaicWindowContext } from 'react-mosaic-component/lib/contextTypes';
import { ErrorBoundary } from 'react-error-boundary';
import { useTranslation } from 'react-i18next';
import ns from '../config/css-ns';
Expand Down
2 changes: 1 addition & 1 deletion src/components/WorkspaceMosaic.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import GlobalStyles from '@mui/material/GlobalStyles';
import { DndContext } from 'react-dnd';
import {
Mosaic, MosaicWindow, getLeaves, createBalancedTreeFromLeaves,
} from 'react-mosaic-component2';
} from 'react-mosaic-component';
import difference from 'lodash/difference';
import isEqual from 'lodash/isEqual';
import classNames from 'classnames';
Expand Down
4 changes: 2 additions & 2 deletions src/lib/MosaicLayout.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { createRemoveUpdate, updateTree } from 'react-mosaic-component/lib/util/mosaicUpdates';
import {
createRemoveUpdate, updateTree,
getNodeAtPath, getOtherDirection, getPathToCorner, Corner,
} from 'react-mosaic-component2';
} from 'react-mosaic-component/lib/util/mosaicUtilities';
import dropRight from 'lodash/dropRight';

/** */
Expand Down
Loading