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 page's more button #6741

Merged
merged 4 commits into from
Mar 17, 2025
Merged

Fix page's more button #6741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
132233c
Fix pages more button
dk981234 Mar 14, 2025
8a36b5b
Remove z-index from page's actions
dk981234 Mar 14, 2025
6a97986
Fix functional tests
dk981234 Mar 16, 2025
b024cba
Update legacy etalons
dk981234 Mar 16, 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
4 changes: 2 additions & 2 deletions functionalTests/designer/drag-drop.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,8 +572,8 @@ test("Drag Drop to collapsed page", async (t) => {
};
await setJSON(json);

const qCollapseButton = Selector(".svc-page__content #collapse");
await t.click(qCollapseButton.filterVisible());
const pCollapseButton = Selector(".svc-page__content > .svc-question__drag-area #collapse button");
await t.click(pCollapseButton.filterVisible());

const Page = Selector(".svc-page");
const toolboxToolAction = Selector(".svc-toolbox__tool > .sv-action__content");
Expand Down
28 changes: 14 additions & 14 deletions functionalTests/designer/question-wrapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ test("Question and page collapse button title", async (t) => {
await t.click(qCollapseButton);
await t.expect(qCollapseButton.getAttribute("title")).eql("Expand");

const pCollapseButton = Selector(".svc-page__content #collapse button");
const pCollapseButton = Selector(".svc-page__content > .svc-question__drag-area #collapse button");
await t.expect(pCollapseButton.getAttribute("title")).eql("Collapse");
await t.click(pCollapseButton);
await t.expect(pCollapseButton.getAttribute("title")).eql("Expand");
Expand Down Expand Up @@ -586,31 +586,31 @@ test("Page adorner - collapse button in differen modes", async (t) => {
};
await setJSON(json);
await t.hover(getToolboxItemByText("Single-Line Input"));
const qContent = Selector(".svc-page__content");
const qCollapseButton = Selector(".svc-page__content #collapse");
const pContent = Selector(".svc-page__content");
const pCollapseButton = Selector(".svc-page__content > .svc-question__drag-area #collapse button");
const actions = Selector(".svc-page__content-actions");
await t.hover(qContent, { offsetX: 10, offsetY: 10 });
await t.hover(pContent, { offsetX: 10, offsetY: 10 });
await t.expect(Selector(".svc-page__content").hasClass("svc-hovered")).ok({ timeout: 3000 });
await t.expect(qCollapseButton.visible).notOk();
await t.click(qContent, { offsetX: 10, offsetY: 10 });
await t.expect(qContent.hasClass("svc-page__content--selected")).ok();
await t.expect(qCollapseButton.visible).notOk();
await t.expect(pCollapseButton.visible).notOk();
await t.click(pContent, { offsetX: 10, offsetY: 10 });
await t.expect(pContent.hasClass("svc-page__content--selected")).ok();
await t.expect(pCollapseButton.visible).notOk();

await ClientFunction(() => { window["creator"].expandCollapseButtonVisibility = "onhover"; })();
json.elements[0].name = "question2";
await setJSON(json);
await t.hover(getToolboxItemByText("Single-Line Input"));
await t.expect(actions.getStyleProperty("opacity")).eql("0");
await t.hover(qContent, { offsetX: 10, offsetY: 10 });
await t.expect(qCollapseButton.visible).ok();
await t.click(qContent, { offsetX: 10, offsetY: 10 });
await t.expect(qContent.hasClass("svc-page__content--selected")).ok();
await t.expect(qCollapseButton.visible).ok();
await t.hover(pContent, { offsetX: 10, offsetY: 10 });
await t.expect(pCollapseButton.visible).ok();
await t.click(pContent, { offsetX: 10, offsetY: 10 });
await t.expect(pContent.hasClass("svc-page__content--selected")).ok();
await t.expect(pCollapseButton.visible).ok();

await ClientFunction(() => { window["creator"].expandCollapseButtonVisibility = "always"; })();
json.elements[0].name = "question3";
await t.hover(getToolboxItemByText("Single-Line Input"));
await setJSON(json);
await t.expect(qCollapseButton.visible).ok();
await t.expect(pCollapseButton.visible).ok();
await ClientFunction(() => { window["creator"].expandCollapseButtonVisibility = "never"; })();
});
4 changes: 2 additions & 2 deletions functionalTests/designer/surface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,9 +524,9 @@ test("Question adorner double click", async (t) => {
await t.doubleClick(Selector(".sd-question__title"));
await t.expect(isCollapsed()).notOk();

await t.doubleClick(Selector(".svc-question__drag-area").nth(1));
await t.doubleClick(Selector(".svc-question__drag-area").nth(0));
await t.expect(isCollapsed()).ok();
await t.doubleClick(Selector(".svc-question__drag-area").nth(1));
await t.doubleClick(Selector(".svc-question__drag-area").nth(0));
await t.expect(isCollapsed()).notOk();

});
Expand Down
12 changes: 6 additions & 6 deletions packages/survey-creator-angular/src/page.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
[id]="adorner.page.id" [attr.data-sv-drop-target-survey-page]="adorner.dropTargetName" #container>
<div class="svc-question__drop-indicator svc-question__drop-indicator--top"></div>
<div class="svc-question__drop-indicator svc-question__drop-indicator--bottom"></div>
<page [model]="model" [survey]="survey"></page>
<div *ngIf="adorner.showPlaceholder" class="svc-page__placeholder_frame">
<div class="svc-panel__placeholder_frame">
<div class="svc-panel__placeholder">{{adorner.placeholderText}}</div>
</div>
</div>
<div *ngIf="adorner.allowDragging && !adorner.isGhost" class="svc-question__drag-area"
(pointerdown)="adorner.onPointerDown($event)">
<svg class="svc-question__drag-element" [iconName]="'icon-drag-area-indicator_24x16'" [size]="'auto'"
Expand All @@ -18,12 +24,6 @@
<sv-action-bar [model]="adorner.actionContainer"></sv-action-bar>
<sv-action-bar *ngIf="adorner.topActionContainer.hasActions" [model]="adorner.topActionContainer"></sv-action-bar>
</div>
<page [model]="model" [survey]="survey"></page>
<div *ngIf="adorner.showPlaceholder" class="svc-page__placeholder_frame">
<div class="svc-panel__placeholder_frame">
<div class="svc-panel__placeholder">{{adorner.placeholderText}}</div>
</div>
</div>
<sv-action-bar [model]="adorner.footerActionsBar"></sv-action-bar>
</div>
</ng-template>
28 changes: 16 additions & 12 deletions packages/survey-creator-core/src/components/action-container-view-model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,23 @@ export class SurveyElementActionContainer extends AdaptiveActionContainer {
this.setModeForActions(true);
return;
}
if(this.visibleActions.length > 1) {
this.visibleActions.forEach((item) => {
if (item.id == "convertTo") {
item.mode = "small";
return;
}
if (item.id == "convertInputType") {
item.mode = "removed";
return;
}
item.mode = "popup";
});
this.dotsItem.visible = true;
} else {
this.visibleActions.forEach(i => i.mode = "small");
}

this.visibleActions.forEach((item) => {
if (item.id == "convertTo") {
item.mode = "small";
return;
}
if (item.id == "convertInputType") {
item.mode = "removed";
return;
}
item.mode = "popup";
});
this.dotsItem.visible = true;
this.hiddenItemsListModel.setItems(items.filter(i => i.mode == "popup").map(i => i.innerItem));
}
}
19 changes: 14 additions & 5 deletions 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 @@ -81,7 +81,6 @@ svc-page {
justify-content: flex-end;
box-sizing: border-box;
padding: 0 calcSize(1) 0 var(--ctr-survey-page-drag-indicator-width, var(--lbr-size-x3));
z-index: 12;
transition: opacity $creator-transition-duration;
white-space: nowrap;

Expand Down Expand Up @@ -109,6 +108,19 @@ svc-page {
.sv-action {
pointer-events: all;
}
& > .sv-dots {
width: auto;
.sv-dots__item {
width: auto;
}
&.sv-action--hidden {
width: 0;
}
.svc-list__item-icon {
width: var(--ctr-list-item-icon-width-small, var(--sjs-font-size-x2));
height: var(--ctr-list-item-icon-height-small, var(--sjs-font-size-x2));
}
}
}

.svc-page-toolbar--collapse {
Expand Down Expand Up @@ -138,7 +150,7 @@ svc-page {
var(--ctr-survey-question-panel-toolbar-gap, var(--lbr-spacing-x1)) / 2
);
margin: 0 var(--thm-survey-question-panel-toolbar-button-gap);
border-radius: var(--ctr-survey-page-toolbar-item-corner-radius, var(--lbr-corner-radius-x05));
border-radius: var(--ctr-survey-page-toolbar-item-corner-radius, var(--lbr-corner-radius-x075));
padding: var(--thm-survey-question-panel-toolbar-item-padding-top)
var(--thm-survey-question-panel-toolbar-item-padding-right)
var(--thm-survey-question-panel-toolbar-item-padding-bottom)
Expand Down Expand Up @@ -171,7 +183,6 @@ svc-page {
opacity: var(--ctr-survey-question-panel-toolbar-item-opacity-pressed, 0.5);
use {
fill: var(--ctr-menu-toolbar-button-icon-color, var(--sjs-layer-1-foreground-75, #000000bf));
opacity: 0.5;
}
}

Expand Down Expand Up @@ -264,8 +275,6 @@ svc-page {
}

& > .svc-question__drag-area {
z-index: 1;

.svc-question__drag-element {
width: var(--ctr-survey-page-drag-indicator-width, var(--lbr-size-x3));
height: var(--ctr-survey-page-drag-indicator-height, var(--lbr-size-x2));
Expand Down
27 changes: 13 additions & 14 deletions packages/survey-creator-core/src/components/question.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ svc-question {

.svc-survey-element-toolbar__item {
@include defaultActionButtonSettings;
--thm-icon-color: var(--ctr-survey-question-panel-toolbar-item-icon-color, var(--sjs-secondary-background-500, #19b394ff));
--thm-survey-question-panel-toolbar-button-gap: calc(
var(--ctr-survey-question-panel-toolbar-gap, var(--lbr-spacing-x1)) / 2
);
Expand All @@ -72,7 +73,7 @@ svc-question {
background-color: transparent;
transition: background $creator-transition-duration, opacity $creator-transition-duration;
use {
fill: var(--ctr-survey-question-panel-toolbar-item-icon-color, var(--sjs-secondary-background-500, #19b394ff));
fill: var(--thm-icon-color);
}
//hovered and focused state
&:hover,
Expand All @@ -84,10 +85,11 @@ svc-question {
&:active,
&.svc-survey-element-toolbar__item--pressed {
opacity: var(--ctr-survey-question-panel-toolbar-item-opacity-pressed, 0.5);
background-color: var(--ctr-survey-question-panel-toolbar-item-background-color-pressed, var(--sjs-layer-1-background-400, #f5f5f5ff));
background-color: var(--ctr-survey-question-panel-toolbar-item-background-color-pressed,
var(--sjs-layer-1-background-400, #f5f5f5ff));

use {
fill: var(--ctr-menu-toolbar-button-icon-color, var(--sjs-layer-1-foreground-75, #000000bf));
opacity: 0.45;
}
}

Expand Down Expand Up @@ -144,9 +146,7 @@ svc-question {
}
}


.svc-survey-element-toolbar-item__icon,
.svc-survey-element-toolbar__dots-item .sv-svg-icon.sv-action-bar-item__icon {
.svc-survey-element-toolbar-item__icon {
box-sizing: border-box;
display: block;
padding: var(--ctr-survey-question-panel-toolbar-item-icon-padding-top, var(--lbr-spacing-x05))
Expand Down Expand Up @@ -388,11 +388,8 @@ svc-question {
}

.svc-survey-element-toolbar-item__icon:last-child {
--thm-icon-color: var(--sjs-primary-background-500, #19b394);
margin-inline-start: 0;

use {
fill: var(--sjs-primary-background-500, #19b394);
}
}
}

Expand Down Expand Up @@ -434,10 +431,12 @@ svc-question {
var(--ctr-survey-question-panel-toolbar-item-icon-padding-bottom, var(--lbr-spacing-x05))
);
}

.svc-list__item:hover > .svc-list__item-body .sv-svg-icon use,
.sv-svg-icon use {
fill: var(--sjs-secondary-background-500, #19b394ff);
.svc-list__item {
&, &:hover {
& > .svc-list__item-body .sv-svg-icon use {
fill: var(--sjs-secondary-background-500, #19b394ff);
}
}
}
}

Expand Down
15 changes: 10 additions & 5 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 @@ -431,7 +431,7 @@
--ctr-list-item-icon-color-disabled: var(--sjs-layer-1-foreground-75);
--ctr-editor-button-background-color-hovered: var(--sjs-layer-3-background-400);
--ctr-survey-page-toolbar-item-background-color-hovered: var(--sjs-primary-background-10);
--ctr-survey-page-toolbar-item-corner-radius: var(--lbr-corner-radius-x05);
--ctr-survey-page-toolbar-item-corner-radius: var(--lbr-corner-radius-x075);
--ctr-list-search-icon-color: var(--sjs-layer-1-foreground-75);
--ctr-caption-with-actions-text-color: var(--sjs-layer-1-foreground-50);
--ctr-label-text-color: var(--sjs-layer-1-foreground-50);
Expand Down Expand Up @@ -755,7 +755,7 @@
--ctr-expression-item-background-color-button-hovered: var(--sjs-primary-background-500);
--ctr-expression-item-border-color-editing: var(--sjs-semantic-blue-background-500);
--ctr-expression-item-text-color-function: var(--sjs-layer-3-foreground-100);
--ctr-data-table-background-color: var(--sjs-layer-1-background-400);
--ctr-data-table-background-color: var(--sjs-layer-1-background-500);
--ctr-data-table-border-color: var(--sjs-border-25);
--ctr-data-table-border-width: var(--sjs-stroke-x1);
--ctr-separator-width: var(--sjs-stroke-x1);
Expand Down Expand Up @@ -2778,8 +2778,8 @@
--lbr-step-progress-bar-padding-right-fit-to-survey-with-number: var(--lbr-spacing-x1n);
--lbr-step-progress-bar-width: var(--lbr-size-x80);
--ctr-toolbox-min-width: var(--sjs-size-x20);
--ctr-popup-menu-margin-top-tablet: var(--sjs-spacing-x8);
--ctr-popup-menu-margin-bottom-tablet: var(--sjs-spacing-x8);
--ctr-popup-menu-margin-top-tablet: var(--sjs-spacing-x3);
--ctr-popup-menu-margin-bottom-tablet: var(--sjs-spacing-x3);
--ctr-popup-menu-margin-left-tablet: var(--sjs-spacing-x3);
--ctr-popup-menu-margin-right-tablet: var(--sjs-spacing-x3);
--ctr-popup-menu-max-width-tablet: var(--sjs-size-x40);
Expand Down Expand Up @@ -2864,7 +2864,7 @@
--lbr-page-loading-padding-bottom: var(--lbr-spacing-x8);
--lbr-page-loading-loading-icon-width: var(--lbr-size-x12);
--lbr-page-loading-loading-icon-height: var(--lbr-size-x12);
--lbr-page-loading-loading-icon-circle-color: var(--sjs-layer-1-foreground-100);
--lbr-page-loading-loading-icon-circle-color: var(--sjs-layer-3-foreground-100);
--lbr-page-loading-loading-icon-circle-color-spin: var(--sjs-primary-background-500);
--lbr-page-loading-title-color: var(--sjs-layer-3-foreground-100);
--lbr-page-loading-padding-top: var(--lbr-spacing-x3);
Expand Down Expand Up @@ -3447,5 +3447,10 @@
--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);
--ctr-surface-placeholder-image-max-width: var(--sjs-size-x43);
--lbr-popup-menu-background-color-global: var(--sjs-layer-3-background-500);
--lbr-list-item-text-color-action: var(--sjs-primary-background-500);
--ctr-list-item-icon-width-small: var(--sjs-font-size-x2);
--ctr-list-item-icon-height-small: var(--sjs-font-size-x2);
}

2 changes: 1 addition & 1 deletion packages/survey-creator-react/src/adorners/Page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ export class CreatorSurveyPageComponent extends CreatorModelElement<
>
<div className="svc-question__drop-indicator svc-question__drop-indicator--top"></div>
<div className="svc-question__drop-indicator svc-question__drop-indicator--bottom"></div>
{this.renderHeader()}
{this.renderContent()}
{this.renderPlaceholder()}
{this.renderHeader()}
{this.renderFooter()}
</div>)
);
Expand Down
26 changes: 13 additions & 13 deletions packages/survey-creator-vue/src/tabs/designer/Page.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,16 @@
<div
class="svc-question__drop-indicator svc-question__drop-indicator--bottom"
></div>
<SvComponent
:is="'survey-page'"
:survey="model.creator.survey"
:page="model.page"
/>
<div v-if="model.showPlaceholder" class="svc-page__placeholder_frame">
<div class="svc-panel__placeholder_frame">
<div class="svc-panel__placeholder">{{ model.placeholderText }}</div>
</div>
</div>
<div
v-if="model.allowDragging && !model.isGhost"
class="svc-question__drag-area"
Expand Down Expand Up @@ -59,21 +69,11 @@
:model="model.actionContainer"
></SvComponent>
<SvComponent
v-if="model.topActionContainer.hasActions"
:is="'sv-action-bar'"
:model="model.topActionContainer"
v-if="model.topActionContainer.hasActions"
:is="'sv-action-bar'"
:model="model.topActionContainer"
></SvComponent>
</div>
<SvComponent
:is="'survey-page'"
:survey="model.creator.survey"
:page="model.page"
/>
<div v-if="model.showPlaceholder" class="svc-page__placeholder_frame">
<div class="svc-panel__placeholder_frame">
<div class="svc-panel__placeholder">{{ model.placeholderText }}</div>
</div>
</div>
<SvComponent
:is="'sv-action-bar'"
:model="model.footerActionsBar"
Expand Down
Binary file modified visualRegressionTests-V2/tests/designer/etalons/page-button-pressed.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified visualRegressionTests-V2/tests/designer/etalons/question-button-pressed.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...RegressionTests-V2/tests/designer/etalons/question-tiny-dots-popup-required.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified visualRegressionTests-V2/tests/designer/etalons/question-tiny-dots-popup.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified visualRegressionTests/tests/designer/etalons/page-button-focused.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified visualRegressionTests/tests/designer/etalons/page-button-hover.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified visualRegressionTests/tests/designer/etalons/page-button-pressed.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified visualRegressionTests/tests/designer/etalons/question-button-pressed.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified visualRegressionTests/tests/designer/etalons/question-tiny-dots-popup-required.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified visualRegressionTests/tests/designer/etalons/question-tiny-dots-popup.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.