Merge pull request #906 from Joecha95/master

Improve type of baseListener

Author: dylanvorster

packages/react-canvas-core/src/core/BaseObserver.ts

@@ -22,6 +22,7 @@ export type BaseListener = {
 	 * Generic event that fires after a specific event was fired (even if it was consumed)
 	 */
 	eventDidFire?: (event: BaseEvent & { function: string }) => void;
+} & {
 	/**
 	 * Type for other events that will fire
 	 */