Skip to content

Commit

Permalink
Fixed #5486 - Cannot read properties of undefined (reading 'getRootCs…
Browse files Browse the repository at this point in the history
…s') - removed progress from design surface for a while (#5497)

Co-authored-by: tsv2013 <[email protected]>
  • Loading branch information
tsv2013 and tsv2013 authored May 15, 2024
1 parent 6e2a85a commit fb6e22e
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
<div *ngIf="survey.renderedHasHeader" [class]="survey.css.header" [survey]="survey" sv-ng-survey-header></div>
</div>

<!-- ko if: survey.isShowProgressBarOnTop -->
<!-- ko component: { name: survey.getProgressTypeComponent(), params: { model: survey } } -->
<!-- /ko -->
<!-- /ko -->
<ng-container *ngIf="creator.pageEditMode !== 'bypage'">
<ng-container *ngFor="let page of survey.pages">
<ng-container *ngIf="!model.showNewPage || page !== model.newPage">
Expand All @@ -22,10 +18,6 @@
<svc-designer-pages [model]="model"></svc-designer-pages>
</ng-container>

<!-- ko if: survey.isShowProgressBarOnBottom -->
<!-- ko component: { name: survey.getProgressTypeComponent(), params: { model: survey } } -->
<!-- /ko -->
<!-- /ko -->
</div>

<div *ngIf="creator.showPageNavigator" class="svc-tab-designer__page-navigator">
Expand Down
4 changes: 2 additions & 2 deletions packages/survey-creator-knockout/src/tabs/designer.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</div>
<!-- /ko -->

<!-- ko if: survey.isShowProgressBarOnTop -->
<!-- ko if: false && survey.isShowProgressBarOnTop -->
<!-- ko component: { name: survey.getProgressTypeComponent(), params: { model: survey } } -->
<!-- /ko -->
<!-- /ko -->
Expand All @@ -52,7 +52,7 @@
params="survey: survey, page: pagesController.page2Display, creator: creator"></svc-page>
<!-- /ko -->

<!-- ko if: survey.isShowProgressBarOnBottom -->
<!-- ko if: false && survey.isShowProgressBarOnBottom -->
<!-- ko component: { name: survey.getProgressTypeComponent(), params: { model: survey } } -->
<!-- /ko -->
<!-- /ko -->
Expand Down
6 changes: 3 additions & 3 deletions packages/survey-creator-react/src/tabs/Designer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -168,13 +168,13 @@ export class TabDesignerComponent extends SurveyElementBase<ITabDesignerComponen
return (<React.Fragment>
<div className={this.model.designerCss} style={style}>
{surveyHeader}
<SurveyNavigation survey={survey} location="top" />
{/* <SurveyNavigation survey={survey} location="top" /> */}
{this.getRenderedPages()}
<SurveyNavigation
{/* <SurveyNavigation
survey={survey}
location="bottom"
css={survey.css}
/>
/> */}
</div>
{this.creator.showPageNavigator ?
<div className="svc-tab-designer__page-navigator"><SurveyPageNavigator
Expand Down
5 changes: 4 additions & 1 deletion packages/survey-creator-vue/src/tabs/designer/Designer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,13 @@
>
<survey-header :survey="model.creator.survey"></survey-header>
</div>
<!--
<component
v-if="survey.isShowProgressBarOnTop"
:is="model.creator.survey.getProgressTypeComponent()"
:survey="model.creator.survey"
></component>

-->
<template v-if="model.creator.pageEditMode !== 'bypage'">
<div
v-for="page in pages"
Expand Down Expand Up @@ -90,11 +91,13 @@
:creator="model.creator"
></svc-page>
</div>
<!--
<component
v-if="survey.isShowProgressBarOnBottom"
:is="model.creator.survey.getProgressTypeComponent()"
:survey="model.creator.survey"
></component>
-->
</div>
<div
v-if="model.creator.showPageNavigator"
Expand Down

0 comments on commit fb6e22e

Please sign in to comment.