diff --git a/apps/code-examples/src/app/app.component.html b/apps/code-examples/src/app/app.component.html index 0e0e2c28c5..470e4efe03 100644 --- a/apps/code-examples/src/app/app.component.html +++ b/apps/code-examples/src/app/app.component.html @@ -263,6 +263,7 @@ diff --git a/apps/code-examples/src/app/code-examples/modals/inline-help/modal-demo-modal.component.html b/apps/code-examples/src/app/code-examples/modals/inline-help/modal-demo-modal.component.html new file mode 100644 index 0000000000..73b436b424 --- /dev/null +++ b/apps/code-examples/src/app/code-examples/modals/inline-help/modal-demo-modal.component.html @@ -0,0 +1,23 @@ + + + Modal title + + + + + + + + diff --git a/apps/code-examples/src/app/code-examples/modals/inline-help/modal-demo-modal.component.ts b/apps/code-examples/src/app/code-examples/modals/inline-help/modal-demo-modal.component.ts new file mode 100644 index 0000000000..08e8566390 --- /dev/null +++ b/apps/code-examples/src/app/code-examples/modals/inline-help/modal-demo-modal.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; +import { SkyModalInstance } from '@skyux/modals'; + +@Component({ + selector: 'app-modal-demo-modal', + templateUrl: './modal-demo-modal.component.html', +}) +export class ModalDemoModalComponent { + constructor(public instance: SkyModalInstance) {} +} diff --git a/apps/code-examples/src/app/code-examples/modals/inline-help/modal-demo.component.html b/apps/code-examples/src/app/code-examples/modals/inline-help/modal-demo.component.html new file mode 100644 index 0000000000..c5b0c50b23 --- /dev/null +++ b/apps/code-examples/src/app/code-examples/modals/inline-help/modal-demo.component.html @@ -0,0 +1,7 @@ + diff --git a/apps/code-examples/src/app/code-examples/modals/inline-help/modal-demo.component.ts b/apps/code-examples/src/app/code-examples/modals/inline-help/modal-demo.component.ts new file mode 100644 index 0000000000..3f7c45a5d3 --- /dev/null +++ b/apps/code-examples/src/app/code-examples/modals/inline-help/modal-demo.component.ts @@ -0,0 +1,26 @@ +import { Component } from '@angular/core'; +import { SkyModalConfiguration, SkyModalService } from '@skyux/modals'; + +import { ModalDemoModalComponent } from './modal-demo-modal.component'; + +@Component({ + selector: 'app-modal-demo', + templateUrl: './modal-demo.component.html', +}) +export class ModalDemoComponent { + public modalSize = 'medium'; + + #modalSvc: SkyModalService; + + constructor(modalSvc: SkyModalService) { + this.#modalSvc = modalSvc; + } + + public onOpenModalClick(): void { + const options: SkyModalConfiguration = { + size: this.modalSize, + }; + + this.#modalSvc.open(ModalDemoModalComponent, options); + } +} diff --git a/apps/code-examples/src/app/code-examples/modals/inline-help/modal-demo.module.ts b/apps/code-examples/src/app/code-examples/modals/inline-help/modal-demo.module.ts new file mode 100644 index 0000000000..d88221bd82 --- /dev/null +++ b/apps/code-examples/src/app/code-examples/modals/inline-help/modal-demo.module.ts @@ -0,0 +1,24 @@ +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { SkyIdModule } from '@skyux/core'; +import { SkyInputBoxModule } from '@skyux/forms'; +import { SkyHelpInlineModule } from '@skyux/indicators'; +import { SkyModalModule } from '@skyux/modals'; + +import { ModalDemoModalComponent } from './modal-demo-modal.component'; +import { ModalDemoComponent } from './modal-demo.component'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + SkyIdModule, + SkyInputBoxModule, + SkyModalModule, + SkyHelpInlineModule, + ], + declarations: [ModalDemoComponent, ModalDemoModalComponent], + exports: [ModalDemoComponent], +}) +export class ModalDemoModule {} diff --git a/apps/code-examples/src/app/code-examples/modals/modal/modal-demo.component.ts b/apps/code-examples/src/app/code-examples/modals/modal/modal-demo.component.ts index fd8651db17..cf8224fb9c 100644 --- a/apps/code-examples/src/app/code-examples/modals/modal/modal-demo.component.ts +++ b/apps/code-examples/src/app/code-examples/modals/modal/modal-demo.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { SkyModalService } from '@skyux/modals'; +import { SkyModalConfiguration, SkyModalService } from '@skyux/modals'; import { ModalDemoModalComponent } from './modal-demo-modal.component'; @@ -19,12 +19,11 @@ export class ModalDemoComponent { } public onOpenModalClick(): void { - const modalInstanceType: any = ModalDemoModalComponent; - const options: any = { + const options: SkyModalConfiguration = { helpKey: this.helpKey, size: this.modalSize, }; - this.#modalSvc.open(modalInstanceType, options); + this.#modalSvc.open(ModalDemoModalComponent, options); } } diff --git a/apps/code-examples/src/app/features/modals.module.ts b/apps/code-examples/src/app/features/modals.module.ts index 7ff66ec992..15a981f735 100644 --- a/apps/code-examples/src/app/features/modals.module.ts +++ b/apps/code-examples/src/app/features/modals.module.ts @@ -3,12 +3,15 @@ import { RouterModule, Routes } from '@angular/router'; import { ConfirmDemoComponent as ConfirmConfirmDemoComponent } from '../code-examples/modals/confirm/confirm-demo.component'; import { ConfirmDemoModule as ConfirmConfirmDemoModule } from '../code-examples/modals/confirm/confirm-demo.module'; +import { ModalDemoComponent as ModalInlineHelpDemoComponent } from '../code-examples/modals/inline-help/modal-demo.component'; +import { ModalDemoModule as ModalInlineHelpModule } from '../code-examples/modals/inline-help/modal-demo.module'; import { ModalDemoComponent as ModalModalDemoComponent } from '../code-examples/modals/modal/modal-demo.component'; import { ModalDemoModule as ModalModalDemoModule } from '../code-examples/modals/modal/modal-demo.module'; const routes: Routes = [ { path: 'confirm', component: ConfirmConfirmDemoComponent }, { path: 'modal', component: ModalModalDemoComponent }, + { path: 'inline-help', component: ModalInlineHelpDemoComponent }, ]; @NgModule({ @@ -22,6 +25,7 @@ export class ModalsFeatureRoutingModule {} ConfirmConfirmDemoModule, ModalModalDemoModule, ModalsFeatureRoutingModule, + ModalInlineHelpModule, ], }) export class ModalsFeatureModule {} diff --git a/apps/playground/src/app/components/modal/modal-close-confirm.component.html b/apps/playground/src/app/components/modal/modal-close-confirm.component.html index db37c1922a..a23edababe 100644 --- a/apps/playground/src/app/components/modal/modal-close-confirm.component.html +++ b/apps/playground/src/app/components/modal/modal-close-confirm.component.html @@ -1,5 +1,11 @@ - Title + + Title + +