X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/c797842bdaa32813315936961c0756cb76ce48a9..196524296dd9ddc5558c6296f0d7b69ae66f155d:/src/store/dialog/with-dialog.ts diff --git a/src/store/dialog/with-dialog.ts b/src/store/dialog/with-dialog.ts index e42cd5b4..41dcd559 100644 --- a/src/store/dialog/with-dialog.ts +++ b/src/store/dialog/with-dialog.ts @@ -10,7 +10,7 @@ import { dialogActions } from './dialog-actions'; export type WithDialogStateProps = { open: boolean; - data?: T; + data: T; }; export type WithDialogDispatchProps = { @@ -18,18 +18,18 @@ export type WithDialogDispatchProps = { }; export type WithDialogProps = WithDialogStateProps & WithDialogDispatchProps; - export const withDialog = (id: string) => - (component: React.ComponentType & P>) => + // TODO: How to make compiler happy with & P instead of & any? + (component: React.ComponentType & any>) => connect(mapStateToProps(id), mapDispatchToProps(id))(component); export const mapStateToProps = (id: string) => (state: { dialog: DialogState }): WithDialogStateProps => { const dialog = state.dialog[id]; - return dialog ? dialog : { open: false }; + return dialog ? dialog : { open: false, data: {} }; }; export const mapDispatchToProps = (id: string) => (dispatch: Dispatch): WithDialogDispatchProps => ({ closeDialog: () => { dispatch(dialogActions.CLOSE_DIALOG({ id })); } -}); \ No newline at end of file +});