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.

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

Disable zoom in icon until a user zooms out. #6496

Merged
merged 1 commit into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions functionalTests/helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,11 @@ export async function setExpandCollapseButtonVisibility(newVal: string) {
window["creator"].expandCollapseButtonVisibility = newVal;
})(newVal);
}
export async function setAllowZoom(newVal: boolean) {
await ClientFunction((newVal) => {
window["creator"].allowZoom = newVal;
})(newVal);
}

export const explicitErrorHandler = ClientFunction(() => {
window.addEventListener("error", e => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,16 @@ svc-page-navigator,
}
}

.svc-page-navigator__button:disabled {
opacity: var(--ctr-page-navigator-button-icon-opacity-disabled, 0.25);
background-color: transparent;
cursor: default;

use {
fill: var(--ctr-page-navigator-button-icon-color-disabled, var(--sjs-layer-3-foreground-100, #000000e6));
}
}

.svc-page-navigator__button--pressed,
.svc-page-navigator__button:active {
.svc-page-navigator__button-icon {
Expand Down
4 changes: 3 additions & 1 deletion packages/survey-creator-core/src/components/tabs/designer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ export class TabDesignerViewModel extends Base {
private stepSurfaceScaling = 10;
private cssUpdater: ComputedUpdater;
private pagesControllerValue: PagesController;
public surfaceScale = 100;

unitDictionary: { [index: string]: number } = {
"--ctr-surface-base-unit": 8,
Expand All @@ -38,6 +37,7 @@ export class TabDesignerViewModel extends Base {
objectInstance.updateSurveyScaleStartDimensions();
},
}) showPlaceholder: boolean;
@property() surfaceScale = 100;
public scaleCssVariables: { [index: string]: string } = {};
public creator: SurveyCreatorModel;

Expand Down Expand Up @@ -135,6 +135,7 @@ export class TabDesignerViewModel extends Base {
locTooltipName: "ed.zoomInTooltip",
iconName: "icon-zoomin-24x24",
iconSize: "auto",
enabled: new ComputedUpdater<boolean>(() => this.surfaceScale < this.maxSurfaceScaling),
visible: new ComputedUpdater<boolean>(() => this.creator.allowZoom),
action: () => { this.scaleSurface(this.surfaceScale + this.stepSurfaceScaling); }
});
Expand All @@ -151,6 +152,7 @@ export class TabDesignerViewModel extends Base {
locTooltipName: "ed.zoomOutTooltip",
iconName: "icon-zoomout-24x24",
iconSize: "auto",
enabled: new ComputedUpdater<boolean>(() => this.surfaceScale > this.minSurfaceScaling),
visible: new ComputedUpdater<boolean>(() => this.creator.allowZoom),
action: () => {
this.scaleSurface(this.surfaceScale - this.stepSurfaceScaling);
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion visualRegressionTests/tests/designer/surface.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ClientFunction, Selector } from "testcafe";
import { url, setJSON, takeElementScreenshot, addQuestionByAddQuestionButton, wrapVisualTest, getTabbedMenuItemByText, creatorTabPreviewName, creatorTabDesignerName, resetHoverToCreator, getPropertyGridCategory, generalGroupName, getListItemByText, surveySettingsButtonSelector, changeToolboxScrolling, changeToolboxSearchEnabled, getToolboxItemByAriaLabel, setAllowEditSurveyTitle, setShowAddQuestionButton, setExpandCollapseButtonVisibility, setShowToolbox, setShowSidebar, getSurveyListItemByText, upArrowImageLink } from "../../helper";
import { url, setJSON, takeElementScreenshot, addQuestionByAddQuestionButton, wrapVisualTest, getTabbedMenuItemByText, creatorTabPreviewName, creatorTabDesignerName, resetHoverToCreator, getPropertyGridCategory, generalGroupName, getListItemByText, surveySettingsButtonSelector, changeToolboxScrolling, changeToolboxSearchEnabled, getToolboxItemByAriaLabel, setAllowEditSurveyTitle, setShowAddQuestionButton, setExpandCollapseButtonVisibility, setShowToolbox, setShowSidebar, getSurveyListItemByText, upArrowImageLink, setAllowZoom } from "../../helper";

const title = "Designer surface";

Expand Down Expand Up @@ -2476,6 +2476,10 @@ test("Collapse all and expand all toolbar", async (t) => {
await t.click("#lockQuestions");
await t.hover("#collapseAll");
await takeElementScreenshot("design-surface-toolbar.png", Selector(".svc-tab-designer"), t, comparer);

await setAllowZoom(true);
await t.hover("#zoom100");
await takeElementScreenshot("design-surface-toolbar-with-zoom.png", Selector(".svc-tab-designer__surface-toolbar"), t, comparer);
});
});

Expand Down