fix: cross-tab copy in same project

GitOrigin-RevId: 119fb7db89a2f51f83635197527c149680e6c4ec
plasmicapp · Jan 6, 2025 · 31cc51b · 31cc51b
1 parent 30b3efc
commit 31cc51b
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 4 deletions.
diff --git a/platform/wab/src/wab/client/clipboard/local.ts b/platform/wab/src/wab/client/clipboard/local.ts
@@ -3,12 +3,12 @@ import {
   PasteResult,
   ensureViewCtxOrThrowUserError,
 } from "@/wab/client/clipboard/common";
-import { ensure } from "@/wab/shared/common";
 import { unwrap } from "@/wab/commons/failable-utils";
 import { cloneArenaFrame } from "@/wab/shared/Arenas";
 import { VariantCombo } from "@/wab/shared/Variants";
-import { ArenaFrame, Component, TplNode } from "@/wab/shared/model/classes";
+import { ensure } from "@/wab/shared/common";
 import * as Tpls from "@/wab/shared/core/tpls";
+import { ArenaFrame, Component, TplNode } from "@/wab/shared/model/classes";
 
 export interface StyleClip {
   type: "style";
@@ -81,8 +81,10 @@ export function cloneClip(x: Clippable): Clippable {
  */
 export class LocalClipboard {
   _contents: undefined | Clippable = undefined;
+  _timeStamp: number = Date.now();
 
   copy(x: Clippable) {
+    this._timeStamp = Date.now();
     this._contents = cloneClip(x);
   }
 
@@ -109,6 +111,10 @@ export class LocalClipboard {
   contents() {
     return this._contents;
   }
+
+  timeStamp() {
+    return this._timeStamp;
+  }
 }
 
 export type LocalClipboardAction = "cut" | "copy";

diff --git a/platform/wab/src/wab/client/clipboard/paste.tsx b/platform/wab/src/wab/client/clipboard/paste.tsx
@@ -154,6 +154,14 @@ function shouldPerformCrossTabCopy(
   if (copyState.bundleRef.type === "pkg") {
     return true;
   }
+  // We are dealing with the same project and branch, but different tab
+  // perform a cross-tab copy, if local clipboard is empty or the cross-tab clipboard is more recent.
+  if (
+    sc.clipboard.isEmpty() ||
+    sc.clipboard.timeStamp() < copyState.timeStamp
+  ) {
+    return true;
+  }
   // It may be the case that we are dealing with a different revisionNum here
   // but we will assume it's fine, considering the expected time for user to copy/paste
   return false;

diff --git a/platform/wab/src/wab/client/components/canvas/view-ops.tsx b/platform/wab/src/wab/client/components/canvas/view-ops.tsx
@@ -2194,7 +2194,10 @@ export class ViewOps {
     );
     console.log("Copied styles", props);
     // TODO: also copy mixins
-    this.clipboard().copy({ type: "style", cssProps: props });
+    this.clipboard().copy({
+      type: "style",
+      cssProps: props,
+    });
   }
 
   tryPasteStyleFromClipboard(targetTpl?: TplNode, cssProps?: string[]) {

diff --git a/platform/wab/src/wab/client/insertable-templates.ts b/platform/wab/src/wab/client/insertable-templates.ts
@@ -390,6 +390,7 @@ export function getCopyState(
     componentUuid: currentComponent.uuid,
     componentName: currentComponent.name,
     references,
+    timeStamp: viewCtx.clipboard.timeStamp(),
   };
 
   return state;

diff --git a/platform/wab/src/wab/shared/insertable-templates/component-importer.ts b/platform/wab/src/wab/shared/insertable-templates/component-importer.ts
@@ -172,7 +172,8 @@ export function mkInsertableComponentImporter(
             (c.templateInfo?.name &&
               c.templateInfo?.name === comp.templateInfo?.name) ||
             (c.templateInfo?.componentId === comp.uuid &&
-              c.templateInfo?.projectId === info.projectId)
+              c.templateInfo?.projectId === info.projectId) ||
+            c.uuid === comp.uuid
         );
     if (existing) {
       oldToNewComponent.set(comp, existing);

diff --git a/platform/wab/src/wab/shared/insertable-templates/types.ts b/platform/wab/src/wab/shared/insertable-templates/types.ts
@@ -71,6 +71,7 @@ export interface CopyState {
   branchId?: string;
   bundleRef: CopyStateBundleRef;
   references: CopyElementsReference[];
+  timeStamp: number;
 }
 
 export interface CopyStateExtraInfo