diff --git a/packages/survey-angular-ui/src/components/progress/toc/progress.component.html b/packages/survey-angular-ui/src/components/progress/toc/progress.component.html index ecec701108..5b7df5af74 100644 --- a/packages/survey-angular-ui/src/components/progress/toc/progress.component.html +++ b/packages/survey-angular-ui/src/components/progress/toc/progress.component.html @@ -1,3 +1,5 @@ -
- -
+ +
+ +
+
\ No newline at end of file diff --git a/packages/survey-angular-ui/src/components/progress/toc/progress.component.ts b/packages/survey-angular-ui/src/components/progress/toc/progress.component.ts index 16db44732f..b98e8edb8a 100644 --- a/packages/survey-angular-ui/src/components/progress/toc/progress.component.ts +++ b/packages/survey-angular-ui/src/components/progress/toc/progress.component.ts @@ -1,19 +1,22 @@ import { Component, Input, OnChanges, OnInit, SimpleChanges, ChangeDetectorRef } from "@angular/core"; +import { EmbeddedViewContentComponent } from "../../../embedded-view-content.component"; import { createTOCListModel, ListModel, SurveyModel } from "survey-core"; import { AngularComponentFactory } from "../../../component-factory"; @Component({ selector: "sv-progress-toc, sv-ng-progress-toc", - templateUrl: "./progress.component.html" - }) -export class ProgressTocComponent implements OnChanges, OnInit { + templateUrl: "./progress.component.html", + styles: [":host { display: none; }"] +}) +export class ProgressTocComponent extends EmbeddedViewContentComponent implements OnChanges, OnInit { public listModel!: ListModel; public containerCss = "sv_progress-toc"; @Input() model!: SurveyModel; private createProgressTOCModel() { this.listModel = createTOCListModel(this.model); } - ngOnInit(): void { + override ngOnInit(): void { + super.ngOnInit(); this.createProgressTOCModel(); } ngOnChanges(changes: SimpleChanges): void { diff --git a/src/common-styles/sv-progress-toc.scss b/src/common-styles/sv-progress-toc.scss index 7f55dd5884..28da95c9ba 100644 --- a/src/common-styles/sv-progress-toc.scss +++ b/src/common-styles/sv-progress-toc.scss @@ -2,11 +2,12 @@ $font-family: var(--font-family); .sv_progress-toc { padding: 8px; - max-width: 320px; + max-width: 336px; height: 100%; background: #FFFFFF; border-right: 1px solid #D6D6D6; margin-top: 2px; + box-sizing: border-box; .sv-list__item.sv-list__item--selected .sv-list__item-body { background: rgba(25, 179, 148, 0.1); @@ -18,4 +19,9 @@ $font-family: var(--font-family); .sv-list__item span { white-space: break-spaces; } + + .sv-list__item-body { + padding-inline-start: 16px; + padding-inline-end: 16px; + } } \ No newline at end of file diff --git a/src/defaultV2-theme/blocks/sd-progress-toc.scss b/src/defaultV2-theme/blocks/sd-progress-toc.scss index 59423e1212..131535ffc1 100644 --- a/src/defaultV2-theme/blocks/sd-progress-toc.scss +++ b/src/defaultV2-theme/blocks/sd-progress-toc.scss @@ -2,11 +2,12 @@ $font-family: var(--font-family); .sv_progress-toc { padding: calcSize(1); - max-width: calcSize(40); + max-width: calcSize(42); height: 100%; background: $background; border-right: 1px solid $border; margin-top: 2px; + box-sizing: border-box; .sv-list__item.sv-list__item--selected .sv-list__item-body { background: $primary-light; @@ -18,4 +19,9 @@ $font-family: var(--font-family); .sv-list__item span { white-space: break-spaces; } + + .sv-list__item-body { + padding-inline-start: calcSize(2); + padding-inline-end: calcSize(2); + } } \ No newline at end of file diff --git a/visualRegressionTests/tests/defaultV2/etalons/survey-navigation-toc-left.png b/visualRegressionTests/tests/defaultV2/etalons/survey-navigation-toc-left.png index e89dc5158e..d16848b3d8 100644 Binary files a/visualRegressionTests/tests/defaultV2/etalons/survey-navigation-toc-left.png and b/visualRegressionTests/tests/defaultV2/etalons/survey-navigation-toc-left.png differ diff --git a/visualRegressionTests/tests/defaultV2/etalons/survey-navigation-toc-right.png b/visualRegressionTests/tests/defaultV2/etalons/survey-navigation-toc-right.png index 3887540573..ed921a29c9 100644 Binary files a/visualRegressionTests/tests/defaultV2/etalons/survey-navigation-toc-right.png and b/visualRegressionTests/tests/defaultV2/etalons/survey-navigation-toc-right.png differ