Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
feat: spacing and position ui modifier enhancement (#5735)
Shrek058e9d405e54
diff --git a/apps/builder/app/builder/features/style-panel/sections/shared/input-popover-utils.ts b/apps/builder/app/builder/features/style-panel/sections/shared/input-popover-utils.tsnew file mode 100644index 0000000000..fc516305bc--- /dev/null+++ b/apps/builder/app/builder/features/style-panel/sections/shared/input-popover-utils.ts@@ -0,0 +1,15 @@+import type { Modifiers } from "../../shared/modifier-keys";++export const getChangeCompleteModifiers = (event: {+ type: string;+ altKey: boolean;+ shiftKey: boolean;+}): Modifiers | undefined =>+ event.type === "delta"+ ? undefined+ : {+ altKey: event.altKey,+ shiftKey: event.shiftKey,+ ctrlKey: false,+ metaKey: false,+ };diff --git a/apps/builder/app/builder/features/style-panel/sections/shared/input-popover.test.ts b/apps/builder/app/builder/features/style-panel/sections/shared/input-popover.test.tsnew file mode 100644index 0000000000..b56485d567--- /dev/null+++ b/apps/builder/app/builder/features/style-panel/sections/shared/input-popover.test.ts@@ -0,0 +1,78 @@+import { describe, expect, test } from "vitest";+import type { CssProperty } from "@webstudio-is/css-engine";+import type { Modifiers } from "../../shared/modifier-keys";+import { getChangeCompleteModifiers } from "./input-popover-utils";++describe("getChangeCompleteModifiers", () => {+ const getActiveProperties = (modifiers?: Modifiers): CssProperty[] => {+ if (modifiers?.shiftKey) {+ return ["padding-top", "padding-right", "padding-bottom", "padding-left"];+ }+ if (modifiers?.altKey) {+ return ["padding-top", "padding-bottom"];+ }+ return ["padding-top"];+ };++ test("ignores shift key for arrow key deltas", () => {+ const modifiers = getChangeCompleteModifiers({+ type: "delta",+ altKey: false,+ shiftKey: true,+ });++ expect(getActiveProperties(modifiers)).toEqual(["padding-top"]);+ expect(modifiers).toBeUndefined();+ });++ test("ignores alt key for arrow key deltas", () => {+ const modifiers = getChangeCompleteModifiers({+ type: "delta",+ altKey: true,+ shiftKey: false,+ });++ expect(getActiveProperties(modifiers)).toEqual(["padding-top"]);+ expect(modifiers).toBeUndefined();+ });++ test("preserves shift key for non-delta completions", () => {+ const modifiers = getChangeCompleteModifiers({+ type: "enter",+ altKey: false,+ shiftKey: true,+ });++ expect(getActiveProperties(modifiers)).toEqual([+ "padding-top",+ "padding-right",+ "padding-bottom",+ "padding-left",+ ]);+ expect(modifiers).toEqual({+ altKey: false,+ shiftKey: true,+ ctrlKey: false,+ metaKey: false,+ });+ });++ test("preserves alt key for non-delta completions", () => {+ const modifiers = getChangeCompleteModifiers({+ type: "enter",+ altKey: true,+ shiftKey: false,+ });++ expect(getActiveProperties(modifiers)).toEqual([+ "padding-top",+ "padding-bottom",+ ]);+ expect(modifiers).toEqual({+ altKey: true,+ shiftKey: false,+ ctrlKey: false,+ metaKey: false,+ });+ });+});diff --git a/apps/builder/app/builder/features/style-panel/sections/shared/input-popover.tsx b/apps/builder/app/builder/features/style-panel/sections/shared/input-popover.tsxindex 3df535cd5d..7eb769cff8 100644--- a/apps/builder/app/builder/features/style-panel/sections/shared/input-popover.tsx+++ b/apps/builder/app/builder/features/style-panel/sections/shared/input-popover.tsx@@ -20,6 +20,7 @@ import { $availableUnitVariables } from "../../shared/model";import type { Modifiers } from "../../shared/modifier-keys";import { PropertyLabel } from "../../property-label";import { humanizeString } from "~/shared/string-utils";+import { getChangeCompleteModifiers } from "./input-popover-utils";const slideUpAndFade = keyframes({"0%": { opacity: 0, transform: "scale(0.8)" },@@ -85,13 +86,10 @@ const Input = ({batch.setProperty(property)(styleValue);batch.publish({ isEphemeral: true });}}- onChangeComplete={({ value, close = true, altKey, shiftKey }) => {- const activeProperties = getActiveProperties({- altKey,- shiftKey,- ctrlKey: false,- metaKey: false,- });+ onChangeComplete={({ value, close = true, type, altKey, shiftKey }) => {+ const activeProperties = getActiveProperties(+ getChangeCompleteModifiers({ type, altKey, shiftKey })+ );setIntermediateValue(undefined);const batch = createBatchUpdate();