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

Jump to bottom

[Canvas] Only change handlers as the element changes #56782

Merged
merged 3 commits into from
Feb 5, 2020
Merged

[Canvas] Only change handlers as the element changes #56782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b187a7
Only change handlers as the element changes
Feb 4, 2020
ea88795
Merge branch 'master' into dont-recreate-handlers
elasticmachine Feb 4, 2020
d6bd022
Merge branch 'master' into dont-recreate-handlers
elasticmachine Feb 5, 2020
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
6 changes: 2 additions & 4 deletions x-pack/legacy/plugins/canvas/public/components/element_wrapper/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,10 @@ function selectorFactory(dispatch) {
export const ElementWrapper = compose(
connectAdvanced(selectorFactory),
withPropsOnChange(
(props, nextProps) =>
!isEqual(props.element, nextProps.element) ||
!isEqual(props.selectedPage, nextProps.selectedPage),
(props, nextProps) => !isEqual(props.element, nextProps.element),
props => {
const { element, createHandlers } = props;
const handlers = createHandlers(element, props.selectedPage);
const handlers = createHandlers(element);
// this removes element and createHandlers from passed props
return { handlers };
}
Expand Down
4 changes: 2 additions & 2 deletions x-pack/legacy/plugins/canvas/public/components/element_wrapper/lib/handlers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const createHandlers = dispatch => {
let oldElement;
let completeFn = () => {};

return (element, pageId) => {
return element => {
// reset isComplete when element changes
if (!isEqual(oldElement, element)) {
isComplete = false;
Expand All @@ -25,7 +25,7 @@ export const createHandlers = dispatch => {

return {
setFilter(text) {
dispatch(setFilter(text, element.id, pageId, true));
dispatch(setFilter(text, element.id, true));
},

getFilter() {
Expand Down
4 changes: 2 additions & 2 deletions x-pack/legacy/plugins/canvas/public/state/actions/elements.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,9 @@ export const removeElements = createThunk(

export const setFilter = createThunk(
'setFilter',
({ dispatch }, filter, elementId, pageId, doRender = true) => {
({ dispatch }, filter, elementId, doRender = true) => {
const _setFilter = createAction('setFilter');
dispatch(_setFilter({ filter, elementId, pageId }));
dispatch(_setFilter({ filter, elementId }));

if (doRender === true) {
dispatch(fetchAllRenderables());
Expand Down
15 changes: 14 additions & 1 deletion x-pack/legacy/plugins/canvas/public/state/reducers/elements.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,18 @@ const trimElement = ({ id, position, expression, filter }) => ({
...(filter !== void 0 && { filter }),
});

const getPageWithElementId = (workpad, elementId) => {
const matchingPage = workpad.pages.find(page =>
page.elements.map(element => element.id).includes(elementId)
);

if (matchingPage) {
return matchingPage.id;
}

return undefined;
};

export const elementsReducer = handleActions(
{
// TODO: This takes the entire element, which is not necessary, it could just take the id.
Expand All @@ -95,7 +107,8 @@ export const elementsReducer = handleActions(
return assignNodeProperties(workpadState, pageId, elementId, { expression });
},
[actions.setFilter]: (workpadState, { payload }) => {
const { filter, pageId, elementId } = payload;
const { filter, elementId } = payload;
const pageId = getPageWithElementId(workpadState, elementId);
return assignNodeProperties(workpadState, pageId, elementId, { filter });
},
[actions.setMultiplePositions]: (workpadState, { payload }) =>
Expand Down