Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Canvas] Fix: lose element selection on page flip #32111

Merged
merged 2 commits into from
Mar 8, 2019
Merged

[Canvas] Fix: lose element selection on page flip #32111

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
272faae
Fix: lose element selection on page flip
monfera Feb 27, 2019
6ba1b3d
Fix: remove selection in Redux too (PR feedback from Joe)
monfera Mar 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion x-pack/plugins/canvas/public/state/middleware/aeroelastic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
} from '../actions/elements';
import { restoreHistory } from '../actions/history';
import { selectElement } from '../actions/transient';
import { addPage, removePage, duplicatePage } from '../actions/pages';
import { addPage, removePage, duplicatePage, gotoPage } from '../actions/pages';
import { appReady } from '../actions/app';
import { setWorkpad } from '../actions/workpad';
import { getNodes, getPages, getSelectedPage, getSelectedElement } from '../selectors/workpad';
Expand Down Expand Up @@ -59,6 +59,8 @@ const aeroelasticConfiguration = {

const isGroupId = id => id.startsWith(aeroelasticConfiguration.groupName);

const pageChangerActions = [gotoPage.toString(), duplicatePage.toString(), addPage.toString()];

/**
* elementToShape
*
Expand Down Expand Up @@ -320,6 +322,14 @@ export const aeroelastic = ({ dispatch, getState }) => {
aero.removeStore(action.payload);
}

if (pageChangerActions.indexOf(action.type) >= 0) {
if (getSelectedElement(getState())) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't this the same as prevPage from above (which you're also using in the else condition)?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

prevPage is bound to the result of getSelectedPage, not getSelectedElement to which the comment seems attached.

In any case, the overall point about common subexpression elimination is true. I had a provisional commit, which extracts out all the getState() etc. calls in this file, in some cases, reused like 10 times. I ended up not pushing it because this middleware file is mostly going away if the local (workpadPage) state based approach proves solid, and there is no notable perf difference.

Also, my mental model is slightly hazy if there are middleware statements that dispatch Redux actions: the dispatched action will re-execute the middleware part (I believe synchronously), and coming back from that dispatch to the original middleware call, what you have in getState and what you might have originally bound getState to might deviate. Ideally it's not the case (ie. calling getState from within the same execution of the middleware function should yield the snapshot) but again, I'm lacking a clear model, and I don't currently see how either way can be semantically clear (getState() giving old results, or giving new results both have their problems), so I'd be glad to hear or read info on this.

dispatch(selectElement(null)); // ensure sidebar etc. get updated; will update the layout engine too
} else {
unselectShape(prevPage); // deselect persistent groups as they're not currently selections in Redux
}
}

next(action);

switch (action.type) {
Expand Down