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.

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] Use unique Id for Canvas Embeddables #56783

Merged
merged 2 commits into from
Feb 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ const embeddable = () => ({
{ input, embeddableType }: EmbeddableExpression<EmbeddableInput>,
handlers: RendererHandlers
) => {
if (!embeddablesRegistry[input.id]) {
const uniqueId = handlers.getElementId();

if (!embeddablesRegistry[uniqueId]) {
const factory = Array.from(start.getEmbeddableFactories()).find(
embeddableFactory => embeddableFactory.type === embeddableType
) as EmbeddableFactory<EmbeddableInput>;
Expand All @@ -82,7 +84,7 @@ const embeddable = () => ({

const embeddableObject = await factory.createFromSavedObject(input.id, input);

embeddablesRegistry[input.id] = embeddableObject;
embeddablesRegistry[uniqueId] = embeddableObject;
ReactDOM.unmountComponentAtNode(domNode);

const subscription = embeddableObject.getInput$().subscribe(function(updatedInput) {
Expand All @@ -100,12 +102,12 @@ const embeddable = () => ({
subscription.unsubscribe();
handlers.onEmbeddableDestroyed();

delete embeddablesRegistry[input.id];
delete embeddablesRegistry[uniqueId];

return ReactDOM.unmountComponentAtNode(domNode);
});
} else {
embeddablesRegistry[input.id].updateInput(input);
embeddablesRegistry[uniqueId].updateInput(input);
}
},
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ export const ElementContent = compose(
onComplete,
onEmbeddableInputChange,
onEmbeddableDestroyed,
getElementId,
} = handlers;

return Style.it(
Expand All @@ -76,7 +77,14 @@ export const ElementContent = compose(
config={renderable.value}
css={renderable.css} // This is an actual CSS stylesheet string, it will be scoped by RenderElement
size={size} // Size is only passed for the purpose of triggering the resize event, it isn't really used otherwise
handlers={{ getFilter, setFilter, done, onEmbeddableInputChange, onEmbeddableDestroyed }}
handlers={{
getFilter,
setFilter,
done,
onEmbeddableInputChange,
onEmbeddableDestroyed,
getElementId,
}}
/>
</ElementShareContainer>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ export const createHandlers = dispatch => {
completeFn = fn;
},

getElementId: () => element.id,

onEmbeddableInputChange(embeddableExpression) {
dispatch(updateEmbeddableExpression({ elementId: element.id, embeddableExpression }));
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ export class RenderedElementComponent extends PureComponent<Props> {
done: () => {},
onDestroy: () => {},
onResize: () => {},
getElementId: () => '',
setFilter: () => {},
getFilter: () => '',
onEmbeddableInputChange: () => {},
Expand Down
2 changes: 2 additions & 0 deletions x-pack/legacy/plugins/canvas/types/renderers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ type GenericCallback = (callback: () => void) => void;
export interface RendererHandlers {
/** Handler to invoke when an element has finished rendering */
done: () => void;
/** Get the id of the element being rendered. Can be used as a unique ID in a render function */
getElementId: () => string;
/** Handler to invoke when an element is deleted or changes to a different render type */
onDestroy: GenericCallback;
/** Handler to invoke when an element's dimensions have changed*/
Expand Down