Skip to content

Commit 184c313

Browse files
Shanon LeeShanon Lee
authored andcommitted
FUNCTIONAL componentDisplay with VueDraggableResizable; fix bug in handles. Working
1 parent f485539 commit 184c313

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

package-lock.json

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/components/ComponentDisplay.vue

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ Description:
2424
:z="componentData.z"
2525
:w="componentData.w"
2626
:h="componentData.h"
27-
:parent="true"
2827
:preventDeactivation="true"
2928
@activated="onActivated(componentData)"
3029
@deactivated="onDeactivated(componentData)"
@@ -231,7 +230,7 @@ export default {
231230
if (
232231
// this.activeComponent === element.$attrs.id &&
233232
// element.enabled === false
234-
this.activeComponent === element.id &&
233+
this.activeComponent === element.$attrs.id &&
235234
element.enabled === false
236235
) {
237236
element.enabled = true;
@@ -339,7 +338,7 @@ export default {
339338
// console.log('onActivated - comp display, componentData', componentData)
340339
if (this.$refs.boxes) {
341340
this.$refs.boxes.forEach(element => {
342-
if (element.id !== componentData.componentName) {
341+
if (element.$attrs.id !== componentData.componentName) {
343342
console.log('Emit')
344343
element.enabled = false;
345344
element.$emit("deactivated");
@@ -355,7 +354,7 @@ export default {
355354
this.activeComponentData.isActive = true;
356355
},
357356
// deactivated is emitted before activated
358-
onDeactivated() {
357+
onDeactivated(type) {
359358
console.log('This is DEACTIVATED')
360359
if (this.activeComponent !== "") {
361360
this.activeComponentData.isActive = false;
@@ -401,7 +400,7 @@ export default {
401400
if (this.activeComponent) {
402401
this.onActivated(this.activeComponentObj);
403402
} else {
404-
this.onDeactivated();
403+
this.onDeactivated('bgClick');
405404
}
406405
}
407406
}

0 commit comments

Comments
 (0)