Skip to content

Commit 4ac2be0

Browse files
committed
fix: try to fix problem with missing parentViewModel
1 parent 64dde18 commit 4ac2be0

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/hoc/with-view-model.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,13 @@ export function withViewModel(
122122
VM: Model,
123123
viewModels,
124124
parentViewModel:
125-
(parentViewModel && instances.get(parentViewModel?.id)) || null,
125+
(parentViewModel && instances.get(parentViewModel.id)) ||
126+
parentViewModel,
126127
fallback: config?.fallback,
127128
instances,
128129
ctx,
129130
component: ConnectedViewModel,
131+
componentProps,
130132
};
131133

132134
viewModels?.processCreateConfig(configCreate);

src/view-model/view-model.store.types.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ import { ComponentType } from 'react';
33
import { ComponentWithViewModel } from '../hoc';
44
import { AnyObject, Class, Maybe } from '../utils/types';
55

6-
import { AbstractViewModelParams } from './abstract-view-model.types';
76
import { ViewModel } from './view-model';
8-
import { AnyViewModel } from './view-model.types';
7+
import { AnyViewModel, ViewModelParams } from './view-model.types';
98

109
export interface ViewModelGenerateIdConfig<VM extends AnyViewModel> {
1110
VM: Class<VM>;
@@ -17,11 +16,12 @@ export interface ViewModelGenerateIdConfig<VM extends AnyViewModel> {
1716
}
1817

1918
export interface ViewModelCreateConfig<VM extends AnyViewModel>
20-
extends AbstractViewModelParams<VM['payload'], VM['parentViewModel']> {
19+
extends ViewModelParams<VM['payload'], VM['parentViewModel']> {
2120
VM: Class<VM>;
2221
fallback?: ComponentType;
2322
instances: Map<string, ViewModel>;
2423
component: ComponentWithViewModel<AnyViewModel, any>;
24+
componentProps: AnyObject;
2525
}
2626

2727
/**

0 commit comments

Comments
 (0)