Merge branch '14278-unexpected-behavior-with-property-tags'

[arvados-workbench2.git] / src / store / dialog / with-dialog.ts

diff --git a/src/store/dialog/with-dialog.ts b/src/store/dialog/with-dialog.ts
index d53a79d6efe19f5ccde771f05d1590bd77199f0e..41dcd559c6a47033d779a339bd82f5953d05835e 100644 (file)
--- a/src/store/dialog/with-dialog.ts
+++ b/src/store/dialog/with-dialog.ts
@@ -18,9 +18,9 @@ export type WithDialogDispatchProps = {
 };
 
 export type WithDialogProps<T> = WithDialogStateProps<T> & WithDialogDispatchProps;
-
 export const withDialog = (id: string) =>
-    <T, P>(component: React.ComponentType<WithDialogProps<T> & P>) =>
+    // TODO: How to make compiler happy with & P instead of & any?
+    <T, P>(component: React.ComponentType<WithDialogProps<T> & any>) =>
         connect(mapStateToProps(id), mapDispatchToProps(id))(component);
 
 export const mapStateToProps = (id: string) => <T>(state: { dialog: DialogState }): WithDialogStateProps<T> => {
@@ -32,4 +32,4 @@ export const mapDispatchToProps = (id: string) => (dispatch: Dispatch): WithDial
     closeDialog: () => {
         dispatch(dialogActions.CLOSE_DIALOG({ id }));
     }
-});
\ No newline at end of file
+});