Skip to content

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.

fix: Remove keywords for transition delay and duration, enable sorting layers (#3062)

Jaya Krishna Namburu14904077c72e
diff --git a/apps/builder/app/builder/features/style-panel/sections/transitions/transition-content.tsx b/apps/builder/app/builder/features/style-panel/sections/transitions/transition-content.tsx
index 8451b25895..5ae0424b2e 100644
--- a/apps/builder/app/builder/features/style-panel/sections/transitions/transition-content.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/transitions/transition-content.tsx
@@ -54,25 +54,13 @@ export const TransitionContent = ({
>({ type: "intermediate", value: transition });
const { property, timing, delay, duration } =
- useMemo<ExtractedTransitionProperties>(() => {
- // @todo remove the effect from useMemo
- setIntermediateValue({ type: "intermediate", value: transition });
- return extractTransitionProperties(layer);
- }, [layer, transition]);
+ useMemo<ExtractedTransitionProperties>(
+ () => extractTransitionProperties(layer),
+ [layer]
+ );
const transitionDurationConfig = styleConfigByName("transitionDuration");
- const transitionDurationKeywords = transitionDurationConfig.items.map(
- (item) => ({
- type: "keyword" as const,
- value: item.name,
- })
- );
-
const transitionDelayConfig = styleConfigByName("transitionDelay");
- const transitionDelayKeywords = transitionDelayConfig.items.map((item) => ({
- type: "keyword" as const,
- value: item.name,
- }));
const handleChange = (value: string) => {
setIntermediateValue({
@@ -165,7 +153,7 @@ export const TransitionContent = ({
styleSource="local"
/* Browser default for transition-duration */
value={duration ?? { type: "unit", value: 0, unit: "ms" }}
- keywords={transitionDurationKeywords}
+ keywords={[]}
deleteProperty={() => {
handlePropertyUpdate({ duration });
}}
@@ -202,8 +190,8 @@ export const TransitionContent = ({
styleSource="local"
/* Browser default for transition-delay */
value={delay ?? { type: "unit", value: 0, unit: "ms" }}
- label={transitionDurationConfig.label}
- keywords={transitionDelayKeywords}
+ label={transitionDelayConfig.label}
+ keywords={[]}
deleteProperty={() => handlePropertyUpdate({ delay })}
setValue={(value, options) => {
if (value === undefined) {
diff --git a/apps/builder/app/builder/features/style-panel/sections/transitions/transition-layer.tsx b/apps/builder/app/builder/features/style-panel/sections/transitions/transition-layer.tsx
index 303a3a3d54..15477f1fdb 100644
--- a/apps/builder/app/builder/features/style-panel/sections/transitions/transition-layer.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/transitions/transition-layer.tsx
@@ -54,6 +54,7 @@ export const TransitionLayer = <T extends TupleValue>(props: LayerProps<T>) => {
>
<CssValueListItem
id={id}
+ draggable
active={isHighlighted}
index={index}
label={<Label truncate>{label}</Label>}