Browse Source

Improve Components.canMove

pull/4427/head
Artur Arseniev 4 years ago
parent
commit
2a49bb2605
  1. 5
      src/dom_components/index.ts
  2. 2
      src/dom_components/model/Component.js

5
src/dom_components/index.ts

@ -646,7 +646,10 @@ export default class ComponentManager extends ItemManagerModule {
} }
} }
if (!droppable) return { ...result, reason: 2 }; // Ensure the target is not inside the source
const isTargetInside = [target].concat(target.parents()).indexOf(srcModel) > -1;
if (!droppable || isTargetInside) return { ...result, reason: 2 };
return { ...result, result: true }; return { ...result, result: true };
} }

2
src/dom_components/model/Component.js

@ -1052,7 +1052,7 @@ export default class Component extends StyleableModel {
/** /**
* Return all parents of the component. * Return all parents of the component.
* @returns {Array<[Component]>} * @returns {Array<Component>}
*/ */
parents() { parents() {
const parent = this.parent(); const parent = this.parent();

Loading…
Cancel
Save