From 1a022ce0e12933e9f01d776897da9206a8059633 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Mon, 14 Aug 2023 18:48:41 +0400
Subject: [PATCH] Up CanvasSpot id

---
 src/canvas/index.ts            | 6 ++++--
 src/canvas/model/CanvasSpot.ts | 4 ++++
 src/editor/model/Editor.ts     | 1 -
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/canvas/index.ts b/src/canvas/index.ts
index e42e2cae7..41678785b 100644
--- a/src/canvas/index.ts
+++ b/src/canvas/index.ts
@@ -741,9 +741,12 @@ export default class CanvasModule extends Module<CanvasConfig> {
       return spot;
     }
 
+    const cmp = spotProps.component;
+    const frame = spotProps.frame || cmp?.frame;
+    const frameId = frame?.id || frame?.cid;
     const spot = new CanvasSpot(this, {
       ...spotProps,
-      id: spotProps.id || `cs_${spotProps.frame?.id}_${spotProps.component?.getId()}`,
+      id: spotProps.id || `cs_${frameId}_${cmp?.getId()}`,
       // TODO type should be mandatory
       type: spotProps.type || '',
     });
@@ -751,7 +754,6 @@ export default class CanvasModule extends Module<CanvasConfig> {
     this.spots.add(spot, opts);
 
     return spot;
-    // 'canvas:spot:add' | 'canvas:spot:update'
     // 'canvas:spot'
   }
 
diff --git a/src/canvas/model/CanvasSpot.ts b/src/canvas/model/CanvasSpot.ts
index 7b673cb7e..e015c8c53 100644
--- a/src/canvas/model/CanvasSpot.ts
+++ b/src/canvas/model/CanvasSpot.ts
@@ -35,4 +35,8 @@ export default class CanvasSpot extends ModuleModel<CanvasModule, CanvasSpotProp
       }
     );
   }
+
+  get type() {
+    return this.get('type') || '';
+  }
 }
diff --git a/src/editor/model/Editor.ts b/src/editor/model/Editor.ts
index f643653b9..944d46250 100644
--- a/src/editor/model/Editor.ts
+++ b/src/editor/model/Editor.ts
@@ -578,7 +578,6 @@ export default class EditorModel extends Model {
       selected.addComponent(model, opts);
       this.trigger('component:select', model, opts);
       this.Canvas.setSpot({
-        id: 'select',
         type: 'select',
         component: model,
       });