2
0
Эх сурвалжийг харах

feat: export reconciliation (#7917)

Marcel Mraz 1 жил өмнө
parent
commit
1bd2b1fe55

+ 2 - 4
excalidraw-app/App.tsx

@@ -27,6 +27,7 @@ import {
   TTDDialog,
   TTDDialog,
   TTDDialogTrigger,
   TTDDialogTrigger,
   StoreAction,
   StoreAction,
+  reconcileElements,
 } from "../packages/excalidraw";
 } from "../packages/excalidraw";
 import {
 import {
   AppState,
   AppState,
@@ -107,10 +108,7 @@ import { OverwriteConfirmDialog } from "../packages/excalidraw/components/Overwr
 import Trans from "../packages/excalidraw/components/Trans";
 import Trans from "../packages/excalidraw/components/Trans";
 import { ShareDialog, shareDialogStateAtom } from "./share/ShareDialog";
 import { ShareDialog, shareDialogStateAtom } from "./share/ShareDialog";
 import CollabError, { collabErrorIndicatorAtom } from "./collab/CollabError";
 import CollabError, { collabErrorIndicatorAtom } from "./collab/CollabError";
-import {
-  RemoteExcalidrawElement,
-  reconcileElements,
-} from "../packages/excalidraw/data/reconcile";
+import type { RemoteExcalidrawElement } from "../packages/excalidraw/data/reconcile";
 import {
 import {
   CommandPalette,
   CommandPalette,
   DEFAULT_CATEGORIES,
   DEFAULT_CATEGORIES,

+ 2 - 2
excalidraw-app/collab/Collab.tsx

@@ -17,6 +17,7 @@ import {
   getSceneVersion,
   getSceneVersion,
   restoreElements,
   restoreElements,
   zoomToFitBounds,
   zoomToFitBounds,
+  reconcileElements,
 } from "../../packages/excalidraw";
 } from "../../packages/excalidraw";
 import { Collaborator, Gesture } from "../../packages/excalidraw/types";
 import { Collaborator, Gesture } from "../../packages/excalidraw/types";
 import {
 import {
@@ -80,10 +81,9 @@ import { Mutable, ValueOf } from "../../packages/excalidraw/utility-types";
 import { getVisibleSceneBounds } from "../../packages/excalidraw/element/bounds";
 import { getVisibleSceneBounds } from "../../packages/excalidraw/element/bounds";
 import { withBatchedUpdates } from "../../packages/excalidraw/reactUtils";
 import { withBatchedUpdates } from "../../packages/excalidraw/reactUtils";
 import { collabErrorIndicatorAtom } from "./CollabError";
 import { collabErrorIndicatorAtom } from "./CollabError";
-import {
+import type {
   ReconciledExcalidrawElement,
   ReconciledExcalidrawElement,
   RemoteExcalidrawElement,
   RemoteExcalidrawElement,
-  reconcileElements,
 } from "../../packages/excalidraw/data/reconcile";
 } from "../../packages/excalidraw/data/reconcile";
 
 
 export const collabAPIAtom = atom<CollabAPI | null>(null);
 export const collabAPIAtom = atom<CollabAPI | null>(null);

+ 2 - 4
excalidraw-app/data/firebase.ts

@@ -1,3 +1,4 @@
+import { reconcileElements } from "../../packages/excalidraw";
 import {
 import {
   ExcalidrawElement,
   ExcalidrawElement,
   FileId,
   FileId,
@@ -22,10 +23,7 @@ import { MIME_TYPES } from "../../packages/excalidraw/constants";
 import { getSyncableElements, SyncableExcalidrawElement } from ".";
 import { getSyncableElements, SyncableExcalidrawElement } from ".";
 import { ResolutionType } from "../../packages/excalidraw/utility-types";
 import { ResolutionType } from "../../packages/excalidraw/utility-types";
 import type { Socket } from "socket.io-client";
 import type { Socket } from "socket.io-client";
-import {
-  RemoteExcalidrawElement,
-  reconcileElements,
-} from "../../packages/excalidraw/data/reconcile";
+import type { RemoteExcalidrawElement } from "../../packages/excalidraw/data/reconcile";
 
 
 // private
 // private
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------

+ 2 - 0
packages/excalidraw/index.tsx

@@ -220,6 +220,8 @@ export {
   restoreLibraryItems,
   restoreLibraryItems,
 } from "./data/restore";
 } from "./data/restore";
 
 
+export { reconcileElements } from "./data/reconcile";
+
 export {
 export {
   exportToCanvas,
   exportToCanvas,
   exportToBlob,
   exportToBlob,