Merge pull request neos#1714 from neos/dimaip-fix-focus-again

BUGFIX: only re-focust when selecting a different node
theDex · Mar 23, 2018 · d32c7a1 · d32c7a1
2 parents 122842e + 340709b
commit d32c7a1
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/packages/neos-ui-guest-frame/src/initializeGuestFrame.js b/packages/neos-ui-guest-frame/src/initializeGuestFrame.js
@@ -1,4 +1,5 @@
 import {takeEvery, put, select} from 'redux-saga/effects';
+import {$get} from 'plow-js';
 
 import {selectors, actions, actionTypes} from '@neos-project/neos-ui-redux-store';
 import {requestIdleCallback} from '@neos-project/utils-helpers';
@@ -79,10 +80,13 @@ export default ({globalRegistry, store}) => function * initializeGuestFrame() {
         } else if (selectedDomNode) {
             const contextPath = selectedDomNode.getAttribute('data-__neos-node-contextpath');
             const fusionPath = selectedDomNode.getAttribute('data-__neos-fusion-path');
-
-            store.dispatch(
-                actions.CR.Nodes.focus(contextPath, fusionPath)
-            );
+            const state = store.getState();
+            const focusedNodeContextPath = $get('cr.nodes.focused.contextPath', state);
+            if (focusedNodeContextPath !== contextPath) {
+                store.dispatch(
+                    actions.CR.Nodes.focus(contextPath, fusionPath)
+                );
+            }
         } else {
             store.dispatch(actions.UI.ContentCanvas.setCurrentlyEditedPropertyName(''));
             store.dispatch(