From 34e8a0e94696fc0186218dae537ab327a1422b92 Mon Sep 17 00:00:00 2001
From: Chris Beer <cabeer@stanford.edu>
Date: Tue, 4 Mar 2025 08:30:43 -0800
Subject: [PATCH] Revert "Temporarily use a fork of react-mosaic-component that
 works with ESM"

This reverts commit 48320145dfe98fad99206bf2de3ed393414b5137.
---
 __tests__/src/components/Window.test.js | 2 +-
 package.json                            | 2 +-
 src/components/Window.jsx               | 2 +-
 src/components/WorkspaceMosaic.jsx      | 2 +-
 src/lib/MosaicLayout.js                 | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/__tests__/src/components/Window.test.js b/__tests__/src/components/Window.test.js
index 5e81603766..cb27731185 100644
--- a/__tests__/src/components/Window.test.js
+++ b/__tests__/src/components/Window.test.js
@@ -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';
diff --git a/package.json b/package.json
index 83dc41381a..aac0e6eb60 100644
--- a/package.json
+++ b/package.json
@@ -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",
diff --git a/src/components/Window.jsx b/src/components/Window.jsx
index 6bbe954a79..be550d4427 100644
--- a/src/components/Window.jsx
+++ b/src/components/Window.jsx
@@ -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';
diff --git a/src/components/WorkspaceMosaic.jsx b/src/components/WorkspaceMosaic.jsx
index 33e3c5f635..4317b9e16f 100644
--- a/src/components/WorkspaceMosaic.jsx
+++ b/src/components/WorkspaceMosaic.jsx
@@ -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';
diff --git a/src/lib/MosaicLayout.js b/src/lib/MosaicLayout.js
index f9dfe3d5da..c64710a7c3 100644
--- a/src/lib/MosaicLayout.js
+++ b/src/lib/MosaicLayout.js
@@ -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';
 
 /** */