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

fix placeholder #6578

Merged
merged 7 commits into from
Feb 13, 2025
Merged

fix placeholder #6578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ebdf809
fix placeholder work for https://github.com/surveyjs/private-tasks/is…
Feb 11, 2025
a6bbed7
update etalons work for https://github.com/surveyjs/private-tasks/iss…
Feb 11, 2025
f0b382b
update themes
Feb 12, 2025
4429c1a
fix placeholder work for https://github.com/surveyjs/private-tasks/is…
Feb 12, 2025
340e93b
Merge branch 'master' of github.com:surveyjs/survey-creator into fix-…
Feb 12, 2025
8bfb329
fix placeholder work for https://github.com/surveyjs/private-tasks/is…
Feb 12, 2025
5ffa223
fix placeholder work for https://github.com/surveyjs/private-tasks/is…
Feb 13, 2025
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
23 changes: 15 additions & 8 deletions packages/survey-creator-angular/src/tabs/logic/logic.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,21 @@
<ng-template #template>
<div class="svc-creator-tab__content">
<div class="svc-plugin-tab__content svc-logic-tab__content" [class.svc-logic-tab--empty]="!model.hasItems">
<survey-content [model]="model.itemsSurvey"></survey-content>
<div *ngIf="!model.hasItems" class="svc-logic-tab__content-empty">
<svc-surface-placeholder [name]="'logic'" [placeholderTitleText]="model.placeholderTitleText"
[placeholderDescriptionText]="model.placeholderDescriptionText">
</svc-surface-placeholder>
</div>
<ng-container *ngIf="!model.readOnly">
<svc-tab-logic-add-btn [model]="model.addNewButton"></svc-tab-logic-add-btn>
<ng-container *ngIf="model.hasItems">
<survey-content [model]="model.itemsSurvey"></survey-content>
<ng-container *ngIf="!model.readOnly">
<svc-tab-logic-add-btn [model]="model.addNewButton"></svc-tab-logic-add-btn>
</ng-container>
</ng-container>
<ng-container *ngIf="!model.hasItems">
<div class="svc-logic-tab__content-empty">
<svc-surface-placeholder [name]="'logic'" [placeholderTitleText]="model.placeholderTitleText"
[placeholderDescriptionText]="model.placeholderDescriptionText">
</svc-surface-placeholder>
<ng-container *ngIf="!model.readOnly">
<svc-tab-logic-add-btn [model]="model.addNewButton"></svc-tab-logic-add-btn>
</ng-container>
</div>
</ng-container>
</div>
</div>
Expand Down
8 changes: 3 additions & 5 deletions packages/survey-creator-angular/src/tabs/preview/test.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<ng-template #template>
<div class="svc-creator-tab__content svc-test-tab__content"
[class.svc-creator-tab__content--with-toolbar]="model.isPageToolbarVisible">
<div *ngIf="model.survey.isEmpty" class="svc-test-tab--empty">
<svc-surface-placeholder [name]="'preview'" [placeholderTitleText]="model.placeholderTitleText"
[placeholderDescriptionText]="model.placeholderDescriptionText">
</svc-surface-placeholder>
</div>
<svc-surface-placeholder *ngIf="model.survey.isEmpty" [name]="'preview'" [placeholderTitleText]="model.placeholderTitleText"
[placeholderDescriptionText]="model.placeholderDescriptionText">
</svc-surface-placeholder>
<div *ngIf="!model.survey.isEmpty" class="svc-plugin-tab__content">
<survey-simulator [model]="model.simulator"></survey-simulator>
<ng-container *ngIf="model.showResults">
Expand Down
8 changes: 3 additions & 5 deletions packages/survey-creator-angular/src/tabs/theme/theme.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<ng-template #template>
<div class="svc-creator-tab__content svc-test-tab__content"
[class.svc-creator-tab__content--with-toolbar]="model.isPageToolbarVisible">
<div *ngIf="model.survey.isEmpty" class="svc-test-tab--empty">
<svc-surface-placeholder [name]="'theme'" [placeholderTitleText]="model.placeholderTitleText"
[placeholderDescriptionText]="model.placeholderDescriptionText">
</svc-surface-placeholder>
</div>
<svc-surface-placeholder *ngIf="model.survey.isEmpty" [name]="'theme'" [placeholderTitleText]="model.placeholderTitleText"
[placeholderDescriptionText]="model.placeholderDescriptionText">
</svc-surface-placeholder>
<div *ngIf="!model.survey.isEmpty" class="svc-plugin-tab__content">
<survey-simulator [model]="model.simulator"></survey-simulator>
<ng-container *ngIf="model.showResults">
Expand Down
2 changes: 2 additions & 0 deletions packages/survey-creator-core/src/components/creator.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,15 @@ survey-creator,
position: relative;
width: 100%;
height: 100%;
min-height: min-content;
box-sizing: border-box;
display: flex;
flex-direction: column;
}

.svc-plugin-tab__content {
flex-basis: 0;
width: 100%;
max-height: 100%;
overflow-y: auto;
flex-grow: 1;
Expand Down
2 changes: 1 addition & 1 deletion packages/survey-creator-core/src/components/page.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ svc-page {
}
.svc-designer-placeholder-page {
.svc-page__content--new.svc-page__content--new {
padding-top: var(--ctr-survey-page-margin-top, var(--lbr-spacing-x2));
padding: 0;
}
}

Expand Down
58 changes: 10 additions & 48 deletions packages/survey-creator-core/src/components/surface-placeholder.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,18 @@
align-items: center;
justify-content: center;
gap: 0px;
padding: calcSize(2);
box-sizing: border-box;
}

.svc-creator--mobile {
.svc-surface-placeholder {
padding: var(--ctr-surface-placeholder-padding-top, 0px) var(--ctr-surface-placeholder-padding-right, var(--sjs-spacing-x6)) var(--ctr-surface-placeholder-padding-bottom, var(--sjs-spacing-x16)) var(--ctr-surface-placeholder-padding-left, var(--sjs-spacing-x6));
}

.svc-surface-placeholder__text {
padding: var(--ctr-surface-placeholder-text-margin-top, var(--sjs-spacing-x4)) var(--ctr-surface-placeholder-text-margin-right, 32px) var(--ctr-surface-placeholder-text-margin-bottom, var(--sjs-spacing-x6)) var(--ctr-surface-placeholder-text-margin-left, 32px);
}
}

.svc-surface-placeholder__image {
display: flex;
flex-direction: row;
gap: 0px;
align-items: center;
justify-content: center;
flex-shrink: 0;
position: relative;
overflow: hidden;
padding: 135px 170px;
display: flex;
flex-direction: row;
gap: 0px;
align-items: center;
justify-content: center;
}

.svc-surface-placeholder__image--designer {
Expand All @@ -60,7 +43,8 @@
}

.svc-surface-placeholder__text {
padding: var(--ctr-surface-placeholder-text-margin-top, var(--sjs-spacing-x4)) 0px var(--ctr-surface-placeholder-text-margin-bottom, var(--sjs-spacing-x6)) 0px;
padding: var(--ctr-surface-placeholder-text-margin-top, var(--sjs-spacing-x4)) 0px
var(--ctr-surface-placeholder-text-margin-bottom, var(--sjs-spacing-x6)) 0px;
display: flex;
flex-direction: column;
gap: var(--ctr-surface-placeholder-text-gap, var(--sjs-spacing-x1));
Expand All @@ -85,35 +69,13 @@
align-self: stretch;
}

.svc-logic-tab__content-empty,
.svc-test-tab__content .svc-surface-placeholder,
.svc-translation-tab--empty .svc-surface-placeholder,
.svc-designer__placeholder-container {
padding-bottom: calcSize(8);
}

.svc-logic-tab--empty> :last-child {
margin-bottom: calcSize(12);
}

.svc-test-tab--empty,
.svc-translation-tab--empty {
.svc-surface-placeholder {
padding-bottom: calcSize(12);
}
}

.svc-creator--mobile {
.svc-designer__placeholder-container {
padding-bottom: calcSize(2);
}

.svc-logic-tab--empty> :last-child {
margin-bottom: calcSize(2);
}

.svc-test-tab--empty,
.svc-translation-tab--empty {
.svc-surface-placeholder {
padding-bottom: calcSize(2);
}
}

max-width: var(--ctr-surface-placeholder-max-width, var(--sjs-size-x90));
padding: var(--ctr-surface-placeholder-padding-top, var(--sjs-spacing-x4))
var(--ctr-surface-placeholder-padding-right, var(--sjs-spacing-x6))
var(--ctr-surface-placeholder-padding-bottom, var(--sjs-spacing-x16))
var(--ctr-surface-placeholder-padding-left, var(--sjs-spacing-x6));
}
7 changes: 4 additions & 3 deletions packages/survey-creator-core/src/components/tabs/designer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
svc-tab-designer {
width: 100%;
height: 100%;
background: $background-dim;
background: var(--ctr-surface-background-color, var(--sjs-special-background, #edf9f7ff));
}

.svc-tab-designer {
Expand All @@ -18,7 +18,8 @@ svc-tab-designer {
}

.svc-tab-designer--with-placeholder .svc-designer-header {
min-width: calcSize(84);
width: 100%;
min-width: var(--sjs-size-x90);
}

.svc-content-wrapper {
Expand Down Expand Up @@ -106,6 +107,7 @@ svc-tab-designer {
.svc-tab-designer--with-placeholder {
.svc-tab-designer_content {
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
min-height: 100%;
Expand All @@ -127,7 +129,6 @@ svc-tab-designer {

.svc-designer__placeholder-container {
display: flex;
flex-grow: 1;
flex-shrink: 0;
width: 100%;
flex-direction: column;
Expand Down
15 changes: 7 additions & 8 deletions packages/survey-creator-core/src/components/tabs/logic-ui.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,14 +219,10 @@
flex-direction: column;
align-items: center;
justify-content: center;
flex-grow: 1;
flex-shrink: 0;
width: 100%;
gap: 0px;

.svc-logic-tab__content-action {
// width: calcSize(33);
margin-top: calcSize(1);
margin: 0;
}
}

Expand Down Expand Up @@ -260,16 +256,19 @@
}

.svc-logic-tab__content-empty {
.svc-btn__text {
color: var(--ctr-surface-placeholder-text-description-color, var(--sjs-layer-3-foreground-50, #00000080));
}
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
gap: 0;
}

.svc-logic-paneldynamic {
.sd-row--multiple {
padding: 0;
background: none;
box-shadow: none;

border-radius: 0;
overflow: visible;
}
Expand Down
10 changes: 2 additions & 8 deletions packages/survey-creator-core/src/components/tabs/test.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,9 @@ svc-tab-preview {
background: $background-dim;
}

.svc-test-tab--empty {
display: flex;
flex-direction: column;
.svc-test-tab__content {
align-items: center;
justify-content: center;
flex-grow: 1;
flex-shrink: 0;
width: 100%;
height: 100%;
gap: 0px;
}

.svc-test-tab__content .svc-plugin-tab__content {
Expand Down Expand Up @@ -46,6 +39,7 @@ svc-tab-preview {

.svc-test-tab__content-actions {
position: relative;
width: 100%;

.sv-action-bar {
padding: var(--ctr-preview-pager-padding-top, var(--sjs-spacing-x1)) var(--ctr-preview-pager-padding-right, 0px) var(--ctr-preview-pager-padding-bottom, var(--sjs-spacing-x1)) var(--ctr-preview-pager-padding-left, 0px);
Expand Down
10 changes: 8 additions & 2 deletions packages/survey-creator-core/src/themes/predefined-themes/v2-20.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
--ctr-shadow-x-large-blur: 0px;
--ctr-shadow-x-large-spread: 0px;
--ctr-property-grid-placeholder-text-max-width: 320px;
--ctr-surface-placeholder-padding-top: 0px;
--ctr-property-grid-placeholder-padding-bottom: 0px;
--ctr-popup-menu-footer-padding-right: 0px;
--ctr-editor-content-text-opacity-disabled: 25px;
Expand Down Expand Up @@ -485,6 +484,7 @@
--ctr-surface-placeholder-text-margin-bottom: var(--sjs-spacing-x6);
--ctr-surface-placeholder-text-gap: var(--sjs-spacing-x1);
--ctr-surface-placeholder-max-width: var(--sjs-size-x90);
--ctr-surface-placeholder-padding-top: var(--sjs-spacing-x4);
--ctr-surface-placeholder-padding-right: var(--sjs-spacing-x6);
--ctr-toolbox-group-header-margin-right: var(--sjs-spacing-x2);
--ctr-property-grid-tabs-padding-right: var(--sjs-spacing-x150);
Expand Down Expand Up @@ -3268,7 +3268,6 @@
--lbr-slider-margin-top: var(--lbr-spacing-x1);
--lbr-button-padding-right-mobile: var(--lbr-spacing-x3);
--lbr-button-padding-left-mobile: var(--lbr-spacing-x3);
--ctr-image-gallery-item-height: var(--sjs-size-x18);
--ctr-image-gallery-item-min-width: var(--sjs-size-x28);
--ctr-image-gallery-item-title-margin-top: var(--sjs-spacing-x05);
--ctr-image-gallery-item-title-color: var(--sjs-layer-3-foreground-100);
Expand Down Expand Up @@ -3441,5 +3440,12 @@
--lbr-separator-width: var(--lbr-stroke-x1);
--lbr-cover-row-gap: var(--lbr-spacing-x150);
--lbr-cover-column-gap: var(--lbr-spacing-x6);
--ctr-info-panel-background-color-primary: var(--sjs-primary-background-10);
--ctr-info-panel-padding-left: var(--sjs-spacing-x4);
--ctr-info-panel-padding-right: var(--sjs-spacing-x4);
--ctr-info-panel-padding-top: var(--sjs-spacing-x3);
--ctr-info-panel-padding-bottom: var(--sjs-spacing-x3);
--ctr-info-panel-corner-radius: var(--sjs-corner-radius-x1);
--ctr-info-panel-text-color-primary: var(--sjs-layer-3-foreground-100);
}

10 changes: 8 additions & 2 deletions packages/survey-creator-core/src/themes/predefined-themes/v2-24.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
--ctr-shadow-x-large-blur: 64px;
--ctr-shadow-x-large-spread: 0px;
--ctr-property-grid-placeholder-text-max-width: 320px;
--ctr-surface-placeholder-padding-top: 0px;
--ctr-toolbox-group-header-margin-right: 0px;
--ctr-property-grid-placeholder-padding-bottom: 0px;
--ctr-editor-content-text-opacity-disabled: 25px;
Expand Down Expand Up @@ -476,6 +475,7 @@
--ctr-surface-placeholder-text-margin-bottom: var(--sjs-spacing-x6);
--ctr-surface-placeholder-text-gap: var(--sjs-spacing-x1);
--ctr-surface-placeholder-max-width: var(--sjs-size-x90);
--ctr-surface-placeholder-padding-top: var(--sjs-spacing-x4);
--ctr-surface-placeholder-padding-right: var(--sjs-spacing-x6);
--ctr-property-grid-tabs-padding-right: var(--sjs-spacing-x150);
--ctr-property-grid-tabs-padding-top: var(--sjs-spacing-x150);
Expand Down Expand Up @@ -3266,7 +3266,6 @@
--lbr-slider-margin-top: var(--lbr-spacing-x1);
--lbr-button-padding-right-mobile: var(--lbr-spacing-x3);
--lbr-button-padding-left-mobile: var(--lbr-spacing-x3);
--ctr-image-gallery-item-height: var(--sjs-size-x18);
--ctr-image-gallery-item-min-width: var(--sjs-size-x28);
--ctr-image-gallery-item-title-margin-top: var(--sjs-spacing-x05);
--ctr-image-gallery-item-title-color: var(--sjs-layer-1-foreground-100);
Expand Down Expand Up @@ -3441,5 +3440,12 @@
--lbr-separator-width: var(--lbr-stroke-x1);
--lbr-cover-row-gap: var(--lbr-spacing-x150);
--lbr-cover-column-gap: var(--lbr-spacing-x6);
--ctr-info-panel-background-color-primary: var(--sjs-primary-background-10);
--ctr-info-panel-padding-left: var(--sjs-spacing-x4);
--ctr-info-panel-padding-right: var(--sjs-spacing-x4);
--ctr-info-panel-padding-top: var(--sjs-spacing-x3);
--ctr-info-panel-padding-bottom: var(--sjs-spacing-x3);
--ctr-info-panel-corner-radius: var(--sjs-corner-radius-x1);
--ctr-info-panel-text-color-primary: var(--sjs-layer-3-foreground-100);
}

16 changes: 10 additions & 6 deletions packages/survey-creator-react/src/tabs/Logic.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,18 @@ export class TabLogicComponent extends SurveyElementBase<any, any> {
return (
<Fragment>
<div className={logicTabClassName}>
<Survey model={this.model.itemsSurvey}></Survey>
{this.model.hasItems ? null : (
<div className="svc-logic-tab__content-empty" >
{this.model.hasItems ?
(<>
<Survey model={this.model.itemsSurvey}></Survey>
{addLogic}
</>)
: (<div className="svc-logic-tab__content-empty" >
<SurfacePlaceholder name={"logic"} placeholderTitleText={this.model.placeholderTitleText} placeholderDescriptionText={this.model.placeholderDescriptionText} />
</div>)}
{addLogic}
{addLogic}
</div>)
}
</div>
</Fragment>
</Fragment >
);
}
}
Expand Down
4 changes: 1 addition & 3 deletions packages/survey-creator-react/src/tabs/Preview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,7 @@ export class TabPreviewSurveyComponent extends SurveyElementBase<any, any> {
return this.model;
}
renderPlaceholder(): React.JSX.Element {
return (<div className="svc-test-tab--empty">
<SurfacePlaceholder name={"preview"} placeholderTitleText={this.model.placeholderTitleText} placeholderDescriptionText={this.model.placeholderDescriptionText} />
</div>);
return <SurfacePlaceholder name={"preview"} placeholderTitleText={this.model.placeholderTitleText} placeholderDescriptionText={this.model.placeholderDescriptionText} />;
}
renderSimulator(): React.JSX.Element {
return (<div className="svc-plugin-tab__content">
Expand Down
4 changes: 1 addition & 3 deletions packages/survey-creator-react/src/tabs/Theme.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ export class TabThemeSurveyComponent extends SurveyElementBase<any, any> {
return this.model;
}
renderPlaceholder(): React.JSX.Element {
return (<div className="svc-test-tab--empty">
<SurfacePlaceholder name={"theme"} placeholderTitleText={this.model.placeholderTitleText} placeholderDescriptionText={this.model.placeholderDescriptionText} />
</div>);
return <SurfacePlaceholder name={"theme"} placeholderTitleText={this.model.placeholderTitleText} placeholderDescriptionText={this.model.placeholderDescriptionText} />;
}
renderSimulator(): React.JSX.Element {
return (<div className="svc-plugin-tab__content">
Expand Down
Loading