From 35017bb94c4b3aaed23274166f2d16fb12d0aec1 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Thu, 17 Aug 2023 18:10:47 +0400
Subject: [PATCH] Up select spot

---
 src/canvas/index.ts        |  6 ++----
 src/editor/model/Editor.ts | 16 ++++++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/canvas/index.ts b/src/canvas/index.ts
index b5451800b..85856b43a 100644
--- a/src/canvas/index.ts
+++ b/src/canvas/index.ts
@@ -733,12 +733,10 @@ 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 cmpView = spotProps.componentView || spotProps.component?.view;
     const spot = new CanvasSpot<T>(this, {
       ...spotProps,
-      id: spotProps.id || `cs_${frameId}_${cmp?.getId()}`,
+      id: spotProps.id || `cs_${cmpView?.cid}`,
       type: spotProps.type || '',
     } as T);
 
diff --git a/src/editor/model/Editor.ts b/src/editor/model/Editor.ts
index 275b705a6..eafdbb577 100644
--- a/src/editor/model/Editor.ts
+++ b/src/editor/model/Editor.ts
@@ -578,9 +578,11 @@ export default class EditorModel extends Model {
 
       selected.addComponent(model, opts);
       this.trigger('component:select', model, opts);
-      this.Canvas.setSpot({
-        type: CanvasSpotBuiltInTypes.Select,
-        component: model,
+      model.views.forEach(view => {
+        this.Canvas.setSpot({
+          type: CanvasSpotBuiltInTypes.Select,
+          componentView: view,
+        });
       });
     });
   }
@@ -596,9 +598,11 @@ export default class EditorModel extends Model {
     this.selected.removeComponent(component, opts);
     const cmps: Component[] = isArray(component) ? component : [component];
     cmps.forEach(component =>
-      this.Canvas.removeSpot({
-        type: CanvasSpotBuiltInTypes.Select,
-        component,
+      component.views.forEach(view => {
+        this.Canvas.removeSpot({
+          type: CanvasSpotBuiltInTypes.Select,
+          componentView: view,
+        });
       })
     );
   }