Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Undo template gen removal during deprecation property removal #19614

Merged
merged 3 commits into from
Nov 4, 2022
Merged

Undo template gen removal during deprecation property removal #19614

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88949d3
Undo template gen removal during deprecation property removal
Marklb Oct 25, 2022
902c4be
Merge remote-tracking branch 'origin/next' into marklb/undo-over-remo…
Marklb Nov 2, 2022
78cded6
Merge remote-tracking branch 'origin/next' into marklb/undo-over-remo…
Marklb Nov 2, 2022
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
12 changes: 11 additions & 1 deletion code/frameworks/angular/src/client/angular-beta/StorybookModule.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { storyPropsProvider } from './StorybookProvider';
import { isComponentAlreadyDeclaredInModules } from './utils/NgModulesAnalyzer';
import { isDeclarable, isStandaloneComponent } from './utils/NgComponentAnalyzer';
import { createStorybookWrapperComponent } from './StorybookWrapperComponent';
import { computesTemplateFromComponent } from './ComputesTemplateFromComponent';

export const getStorybookModuleMetadata = (
{
Expand All @@ -21,7 +22,12 @@ export const getStorybookModuleMetadata = (
storyProps$: Subject<ICollection>
): NgModule => {
const { props, styles, moduleMetadata = {} } = storyFnAngular;
const { template } = storyFnAngular;
let { template } = storyFnAngular;

const hasTemplate = !hasNoTemplate(template);
if (!hasTemplate && component) {
template = computesTemplateFromComponent(component, props, '');
}

/**
* Create a component that wraps generated template and gives it props
Expand Down Expand Up @@ -68,3 +74,7 @@ export const createStorybookModule = (ngModule: NgModule): Type<unknown> => {
class StorybookModule {}
return StorybookModule;
};

function hasNoTemplate(template: string | null | undefined): template is undefined {
return template === null || template === undefined;
}