refactor: defer loading of DragDropContext until mounted

measuredco · Nov 23, 2024 · c3557ab · c3557ab
1 parent fcdf346
commit c3557ab
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/packages/core/components/DragDropContext/index.tsx b/packages/core/components/DragDropContext/index.tsx
@@ -73,7 +73,7 @@ type DeepestParams = {
 
 const AREA_CHANGE_DEBOUNCE_MS = 150;
 
-export const DragDropContext = ({ children }: { children: ReactNode }) => {
+const DragDropContextClient = ({ children }: { children: ReactNode }) => {
   const { state, config, dispatch, resolveData } = useAppContext();
 
   const [preview, setPreview] = useState<Preview>(null);
@@ -401,3 +401,13 @@ export const DragDropContext = ({ children }: { children: ReactNode }) => {
     </dragListenerContext.Provider>
   );
 };
+
+export const DragDropContext = ({ children }: { children: ReactNode }) => {
+  const { status } = useAppContext();
+
+  if (status === "LOADING") {
+    return children;
+  }
+
+  return <DragDropContextClient>{children}</DragDropContextClient>;
+};