Fix activatable blocks on drop. Closes #3579

5 years ago · bb4a661cd6
1 changed files with 6 additions and 5 deletions
--- a/src/block_manager/view/BlockView.js
+++ b/src/block_manager/view/BlockView.js
@ -99,14 +99,15 @@ export default Backbone.View.extend({
    if (result) {
      const oldKey = 'activeOnRender';
      const oldActive = result.get && result.get(oldKey);
+      const toActive = model.get('activate') || oldActive;

-      if (model.get('activate') || oldActive) {
-        result.trigger('active');
-        result.unset(oldKey);
+      if (model.get('select') || toActive) {
+        em.setSelected(result);
      }

-      if (model.get('select')) {
-        em.setSelected(result);
+      if (toActive) {
+        result.trigger('active');
+        result.unset(oldKey);
      }

      if (model.get('resetId')) {