Skip to content
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
24 changes: 13 additions & 11 deletions packages/core/src/api/renderDiffViewer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,27 +48,27 @@ export function DiffViewerLayoutComponent(): React.ReactElement {
);
}

export const DiffViewerRenderer = (_props: IDiffViewerProps) => {
const props = merge({
export const DiffViewerRenderer = (props: IDiffViewerProps) => {
const mergedProps = merge({
appConfig: {},
runtimeConfig: {
onWillApplyTheme: _props.onWillApplyTheme,
tabBarRightExtraContent: _props.tabBarRightExtraContent,
onWillApplyTheme: props.onWillApplyTheme,
tabBarRightExtraContent: props.tabBarRightExtraContent,
} as RuntimeConfig,
}, _props) as IAppRendererProps;
}, props) as IAppRendererProps;

if (!props.appConfig.injector) {
props.appConfig.injector = new Injector();
if (!mergedProps.appConfig.injector) {
mergedProps.appConfig.injector = new Injector();
}

const injector = props.appConfig.injector;
const injector = mergedProps.appConfig.injector;

injector.addProviders({
token: IDiffViewerProps,
useValue: props,
useValue: mergedProps,
});

const appConfig = props.appConfig;
const appConfig = mergedProps.appConfig;

let appModules: ModuleConstructor[] = appConfig?.modules || [];
if (!appModules.includes(DiffViewerModule)) {
Expand Down Expand Up @@ -133,11 +133,13 @@ export const DiffViewerRenderer = (_props: IDiffViewerProps) => {
},
},
}),
}, props);
}, mergedProps);

return (
<AppRenderer
{...diffViewerAppConfig}
/>
);
};

export const DiffPreviewer = DiffViewerRenderer;
9 changes: 9 additions & 0 deletions packages/core/src/core/diff-viewer/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,16 @@ export interface IOverrideAppRendererProps extends IOverrideAppRendererConfig {
}

export const IDiffViewerProps = Symbol('IDiffViewerProps');

export interface IDiffItem {
path: string;
oldCode: string;
newCode: string;
}

export interface IDiffViewerProps extends Partial<IOverrideAppRendererProps> {
data?: IDiffItem[];

onRef: (handle: IDiffViewerHandle) => void;

onWillApplyTheme?: (theme: ITheme) => Record<string, string | undefined>;
Expand Down
Loading