@agent-native/core 0.85.6 → 0.85.7

package/corpus/templates/design/app/components/design/EditPanel.tsx

@@ -67,6 +67,7 @@ import {
 } from "@tabler/icons-react";
 import { useQueryClient } from "@tanstack/react-query";
 import {
+  memo,
   useCallback,
   useEffect,
   useMemo,
@@ -82,6 +83,7 @@ import {
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuItem,
+  DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { Input } from "@/components/ui/input";
@@ -152,7 +154,7 @@ function sameOrMixed(values: string[]): string {
   return values.every((value) => value === first) ? first : MIXED_VALUE;
 }
 
-function mixedElementFromSelection(
+export function mixedElementFromSelection(
   elements: ElementInfo[],
 ): ElementInfo | null {
   const base = elements[elements.length - 1];
@@ -167,6 +169,27 @@ function mixedElementFromSelection(
       sameOrMixed(elements.map((element) => element.computedStyles[key] ?? "")),
     ]),
   );
+  // Mix inlineStyles the same way as computedStyles so authoredStyleValue()
+  // sees a proper Mixed sentinel across a multi-selection instead of
+  // silently inheriting the last-selected element's raw inline value
+  // (spreading ...base alone would leak that stale single-element value).
+  const inlineStyleKeys = new Set<string>();
+  elements.forEach((element) => {
+    Object.keys(element.inlineStyles ?? {}).forEach((key) =>
+      inlineStyleKeys.add(key),
+    );
+  });
+  const inlineStyles =
+    inlineStyleKeys.size > 0
+      ? Object.fromEntries(
+          Array.from(inlineStyleKeys).map((key) => [
+            key,
+            sameOrMixed(
+              elements.map((element) => element.inlineStyles?.[key] ?? ""),
+            ),
+          ]),
+        )
+      : undefined;
   const minX = Math.min(...elements.map((element) => element.boundingRect.x));
   const minY = Math.min(...elements.map((element) => element.boundingRect.y));
   const maxX = Math.max(
@@ -187,6 +210,12 @@ function mixedElementFromSelection(
     selector: base.selector,
     classes: [],
     computedStyles,
+    inlineStyles,
+    // Mix like tagName above — otherwise isTextElement() would trust
+    // base.primitiveKind alone and misclassify a mixed text+shape selection.
+    primitiveKind: sameOrMixed(
+      elements.map((element) => element.primitiveKind ?? ""),
+    ),
     boundingRect: {
       x: minX,
       y: minY,
@@ -393,6 +422,9 @@ function PropInput({
 }) {
   const [draft, setDraft] = useState(value);
   const mixed = isMixedValue(value);
+  // Escape reverts and blurs; the blur handler must then skip its commit or it
+  // would re-commit the stale draft closure (mirrors ScrubInput's Escape path).
+  const skipNextBlurCommitRef = useRef(false);
 
   useEffect(() => {
     setDraft(value);
@@ -431,12 +463,27 @@ function PropInput({
           // defaultUnit) keep the responsive live-update behavior.
           if (defaultUnit === undefined) onChange(e.target.value);
         }}
-        onBlur={commit}
+        onBlur={() => {
+          if (skipNextBlurCommitRef.current) {
+            skipNextBlurCommitRef.current = false;
+            return;
+          }
+          commit();
+        }}
         onKeyDown={(e) => {
           if (e.key === "Enter") {
             e.preventDefault();
             commit();
             (e.currentTarget as HTMLInputElement).blur();
+            return;
+          }
+          if (e.key === "Escape") {
+            e.preventDefault();
+            // Revert the draft to the last committed value and blur, matching
+            // ScrubInput's Escape behavior.
+            setDraft(value);
+            skipNextBlurCommitRef.current = true;
+            (e.currentTarget as HTMLInputElement).blur();
           }
         }}
         placeholder={placeholder}
@@ -534,6 +581,19 @@ function ColorInput({
   }, [activeStopIds, selectedStopId]);
 
   const setNext = (next: string) => {
+    // Guard rail for callers that don't wire onBackgroundImageChange (i.e.
+    // supportsLayeredFills is false, e.g. the text-fill "color" row): the
+    // picker manages gradient/image paint-type selection as *local* UI state
+    // independent of props (see DesignColorPicker's localPaintType), so a
+    // user can still open the Gradient/Image tab there even when this
+    // ColorInput never offered layered fills. When that happens,
+    // emitPaintValue falls back to this onChange with a full gradient/url()
+    // CSS string, which is invalid for a plain color property (color /
+    // backgroundColor) and gets silently dropped by the browser — but not
+    // before clobbering the last-known-good value in this component's own
+    // state. Reject anything that doesn't parse as a plain solid color in
+    // that case instead of forwarding it.
+    if (!supportsLayeredFills && !parseCssColor(next)) return;
     setDraft(next);
     onChange(next);
   };
@@ -911,6 +971,46 @@ function averageGradientOpacity(stops: DesignGradientStop[]): number {
   return Math.round(total / stops.length);
 }
 
+/**
+ * Marker used to non-destructively hide a single backgroundImage layer
+ * (gradient or image). CSS strips comments from computed style values — a
+ * trailing comment appended to a backgroundImage layer does not survive
+ * getComputedStyle (verified: browsers normalize/serialize computed values
+ * without their source comments) — so we can't tag the layer text itself.
+ * Instead we pair the untouched original layer with a zero-size
+ * background-size entry at the same index: `background-size: 0px 0px` makes
+ * that layer render nothing while backgroundImage keeps the exact original
+ * CSS text. Both backgroundImage and backgroundSize are real, valid,
+ * positionally-paired CSS lists that DO round-trip through computed style,
+ * so hiding survives reselect/reload with no React state stash required.
+ */
+const HIDDEN_LAYER_SIZE_MARKER = "0px 0px";
+
+export function isLayerHiddenBySize(sizeEntry: string | undefined): boolean {
+  return (
+    (sizeEntry ?? "").trim().replace(/\s+/g, " ") === HIDDEN_LAYER_SIZE_MARKER
+  );
+}
+
+/**
+ * Rewrites the background-size list so `index` is hidden/shown via the
+ * zero-size marker, padding shorter lists with "auto" (the CSS default) so
+ * every other layer keeps rendering at its current/default size.
+ */
+export function withLayerSizeMarker(
+  sizeLayers: string[],
+  layerCount: number,
+  index: number,
+  hidden: boolean,
+): string {
+  const next = Array.from(
+    { length: layerCount },
+    (_, i) => sizeLayers[i] || "auto",
+  );
+  next[index] = hidden ? HIDDEN_LAYER_SIZE_MARKER : "auto";
+  return joinCssLayers(next);
+}
+
 function splitCssLayers(value: string): string[] {
   const trimmed = value.trim();
   if (!trimmed || trimmed === "none") return [];
@@ -1578,8 +1678,30 @@ function parseScaleValue(value: string | undefined): [number, number] {
   return [Number.isFinite(x) ? x : 1, Number.isFinite(y) ? y : 1];
 }
 
-function mergeRotationValue(transform: string | undefined, degrees: number) {
-  const nextRotate = `rotate(${Math.round(degrees * 10) / 10}deg)`;
+/**
+ * Normalize an angle in degrees into the (-180, 180] range the inspector
+ * displays and commits (design-tool convention: 270° reads as -90°, a full
+ * 360° turn reads as 0°). Exported for tests.
+ */
+export function normalizeRotationDegrees(degrees: number): number {
+  if (!Number.isFinite(degrees)) return 0;
+  let normalized = degrees % 360;
+  if (normalized > 180) normalized -= 360;
+  else if (normalized <= -180) normalized += 360;
+  return Object.is(normalized, -0) ? 0 : normalized;
+}
+
+/** Exported for tests. */
+export function mergeRotationValue(
+  transform: string | undefined,
+  degrees: number,
+) {
+  // Round first, then normalize, so a rounded -179.96 → -180 still lands
+  // inside (-180, 180] as +180.
+  const normalizedDegrees = normalizeRotationDegrees(
+    Math.round(degrees * 10) / 10,
+  );
+  const nextRotate = `rotate(${normalizedDegrees}deg)`;
   if (!transform || transform === "none") return nextRotate;
   // Replace an existing rotate()/rotateZ() in ANY unit so we don't append a
   // second rotate() (which would compound, e.g. "rotate(0.5turn) rotate(30deg)").
@@ -1695,6 +1817,11 @@ function cssLengthNumber(value: string | undefined, fallback = 0): number {
   return Number.isFinite(parsed) ? parsed : fallback;
 }
 
+/** Round to one decimal place — matches the `precision={1}` ScrubInput controls advertise (e.g. stroke weight, font size) so 0.5-unit values aren't silently floored to whole numbers. */
+export function roundToOneDecimal(value: number): number {
+  return Math.round(value * 10) / 10;
+}
+
 function cssColorOrFallback(value: string | undefined, fallback: string) {
   const normalized = value?.trim();
   if (
@@ -1711,6 +1838,17 @@ function strokeIsVisible(width: string | undefined, style: string | undefined) {
   return cssLengthNumber(width) > 0 && style !== "none";
 }
 
+/**
+ * True when a stroke's own color is the reason it's invisible (alpha
+ * zeroed) rather than its width/style. Used so the eye toggle can hide a
+ * stroke by zeroing color alpha — preserving the original border-style
+ * (solid/dashed/dotted/etc, which has no "unset" round-trip once written as
+ * "none") — instead of forcing borderStyle back to "solid" on every show.
+ */
+export function strokeHiddenByColor(color: string | undefined): boolean {
+  return Boolean(color) && !colorHasVisibleAlpha(color);
+}
+
 function swatchStyle(value: string | undefined) {
   return {
     background:
@@ -1894,8 +2032,29 @@ function parentFlexDirection(element: ElementInfo): AutoLayoutSizingAxis {
     : "horizontal";
 }
 
-function isTextElement(element: ElementInfo): boolean {
-  return TEXT_TAGS.has((element.tagName || "").toLowerCase());
+export function isTextElement(element: ElementInfo): boolean {
+  const tag = (element.tagName || "").toLowerCase();
+  if (TEXT_TAGS.has(tag)) return true;
+  // T-tool text primitives are plain `div`s stamped with
+  // data-an-primitive="text" (see DesignEditor primitive creation). The
+  // bridge now forwards that marker as ElementInfo.primitiveKind — prefer it
+  // when present since it's exact.
+  if (element.primitiveKind) return element.primitiveKind === "text";
+  // Fallback for older payloads that predate primitiveKind: approximate a
+  // T-tool text div with a content heuristic — a childless div that has its
+  // own text content and isn't already flagged as a layout container. This
+  // intentionally excludes empty frames/shapes (no text) and containers with
+  // element children.
+  if (
+    tag === "div" &&
+    !element.isFlexContainer &&
+    !element.isGridContainer &&
+    (element.childElementCount ?? 0) === 0 &&
+    Boolean(element.textContent?.trim())
+  ) {
+    return true;
+  }
+  return false;
 }
 
 /**
@@ -3331,36 +3490,80 @@ function CornerRadiusControl({
 }) {
   const t = useT();
   const independentCornersLabel = t("editPanel.labels.independentCorners");
+  const cornerSources = {
+    topLeft: styles.borderTopLeftRadius || styles.borderRadius,
+    topRight: styles.borderTopRightRadius || styles.borderRadius,
+    bottomRight: styles.borderBottomRightRadius || styles.borderRadius,
+    bottomLeft: styles.borderBottomLeftRadius || styles.borderRadius,
+  };
+  const cornerMixed = {
+    topLeft: isMixedValue(cornerSources.topLeft),
+    topRight: isMixedValue(cornerSources.topRight),
+    bottomRight: isMixedValue(cornerSources.bottomRight),
+    bottomLeft: isMixedValue(cornerSources.bottomLeft),
+  };
+  // Guard cssLengthNumber against the Mixed sentinel — parseFloat("Mixed")
+  // would silently coerce it to 0 and render a concrete value.
   const corners = {
-    topLeft: cssLengthNumber(styles.borderTopLeftRadius || styles.borderRadius),
-    topRight: cssLengthNumber(
-      styles.borderTopRightRadius || styles.borderRadius,
-    ),
-    bottomRight: cssLengthNumber(
-      styles.borderBottomRightRadius || styles.borderRadius,
-    ),
-    bottomLeft: cssLengthNumber(
-      styles.borderBottomLeftRadius || styles.borderRadius,
-    ),
+    topLeft: cornerMixed.topLeft ? 0 : cssLengthNumber(cornerSources.topLeft),
+    topRight: cornerMixed.topRight
+      ? 0
+      : cssLengthNumber(cornerSources.topRight),
+    bottomRight: cornerMixed.bottomRight
+      ? 0
+      : cssLengthNumber(cornerSources.bottomRight),
+    bottomLeft: cornerMixed.bottomLeft
+      ? 0
+      : cssLengthNumber(cornerSources.bottomLeft),
   };
-  const cornersDiffer =
-    corners.topLeft !== corners.topRight ||
-    corners.topLeft !== corners.bottomRight ||
-    corners.topLeft !== corners.bottomLeft;
+  const anyCornerMixed =
+    cornerMixed.topLeft ||
+    cornerMixed.topRight ||
+    cornerMixed.bottomRight ||
+    cornerMixed.bottomLeft;
+  const allCornersMixed =
+    cornerMixed.topLeft &&
+    cornerMixed.topRight &&
+    cornerMixed.bottomRight &&
+    cornerMixed.bottomLeft;
+  // With mixed sentinels the parsed numbers are placeholders, so compare
+  // mixed-ness instead: all-mixed reads as uniform (each element may still be
+  // uniform), partially-mixed means at least one element has differing corners.
+  const cornersDiffer = anyCornerMixed
+    ? !allCornersMixed
+    : corners.topLeft !== corners.topRight ||
+      corners.topLeft !== corners.bottomRight ||
+      corners.topLeft !== corners.bottomLeft;
   const [showIndependentCorners, setShowIndependentCorners] =
     useState(cornersDiffer);
-  const radius = cornersDiffer
-    ? corners.topLeft
-    : cssLengthNumber(styles.borderRadius || String(corners.topLeft));
+  const radiusMixed =
+    anyCornerMixed || (!cornersDiffer && isMixedValue(styles.borderRadius));
+  const radius = radiusMixed
+    ? 0
+    : cornersDiffer
+      ? corners.topLeft
+      : cssLengthNumber(styles.borderRadius || String(corners.topLeft));
   const commitRadius = (value: number) => {
     const next = `${Math.max(0, Math.round(value))}px`;
+    // Always write the longhands along with the shorthand: stale inline
+    // longhand declarations serialize after the shorthand and would override
+    // it, turning uniform-radius commits into silent no-ops.
     onStyleChange("borderRadius", next);
-    if (!showIndependentCorners) return;
     onStyleChange("borderTopLeftRadius", next);
     onStyleChange("borderTopRightRadius", next);
     onStyleChange("borderBottomRightRadius", next);
     onStyleChange("borderBottomLeftRadius", next);
   };
+  const toggleIndependentCorners = () => {
+    // Collapsing while corners differ flattens them to the displayed uniform
+    // value; otherwise the stale longhands would keep overriding the shorthand
+    // and the single field would silently no-op. Mixed selections collapse the
+    // UI only — committing would stamp the placeholder 0 onto every object.
+    if (showIndependentCorners && cornersDiffer && !radiusMixed) {
+      commitRadius(radius);
+    }
+    setShowIndependentCorners(!showIndependentCorners);
+  };
 
   useEffect(() => {
     if (cornersDiffer) setShowIndependentCorners(true);
@@ -3373,6 +3576,7 @@ function CornerRadiusControl({
         icon={IconBorderRadius}
         value={radius}
         onChange={commitRadius}
+        mixed={radiusMixed}
         min={0}
         precision={0}
       />
@@ -3389,7 +3593,7 @@ function CornerRadiusControl({
             )}
             aria-label={independentCornersLabel}
             aria-pressed={showIndependentCorners}
-            onClick={() => setShowIndependentCorners((value) => !value)}
+            onClick={toggleIndependentCorners}
           >
             <IconBorderCorners className="size-3.5" />
           </Button>
@@ -3409,6 +3613,7 @@ function CornerRadiusControl({
                 `${Math.max(0, Math.round(value))}px`,
               )
             }
+            mixed={cornerMixed.topLeft}
             min={0}
             precision={1}
           />
@@ -3423,6 +3628,7 @@ function CornerRadiusControl({
                 `${Math.max(0, Math.round(value))}px`,
               )
             }
+            mixed={cornerMixed.topRight}
             min={0}
             precision={1}
           />
@@ -3438,6 +3644,7 @@ function CornerRadiusControl({
                 `${Math.max(0, Math.round(value))}px`,
               )
             }
+            mixed={cornerMixed.bottomLeft}
             min={0}
             precision={1}
           />
@@ -3452,6 +3659,7 @@ function CornerRadiusControl({
                 `${Math.max(0, Math.round(value))}px`,
               )
             }
+            mixed={cornerMixed.bottomRight}
             min={0}
             precision={1}
           />
@@ -3520,8 +3728,16 @@ function BlendModeMenu({
     styles.mixBlendMode || "normal",
     "normal",
   );
-  const selectedBlendMode =
-    blendMode === "normal" && styles.isolation !== "isolate"
+  // Recognize the Mixed sentinel BEFORE optionValue's fallback maps it to
+  // "normal" — a mixed selection must not check a wrong concrete mode.
+  // Isolation only disambiguates pass-through vs normal, so it only makes the
+  // state mixed when the blend mode itself resolves to normal.
+  const blendModeMixed =
+    isMixedValue(styles.mixBlendMode) ||
+    (blendMode === "normal" && isMixedValue(styles.isolation));
+  const selectedBlendMode = blendModeMixed
+    ? MIXED_VALUE
+    : blendMode === "normal" && styles.isolation !== "isolate"
       ? "pass-through"
       : blendMode;
   const options = [
@@ -3565,6 +3781,20 @@ function BlendModeMenu({
         sideOffset={8}
         className="z-[100010] w-48 rounded-xl border-[var(--design-editor-control-border)] bg-[var(--design-editor-panel-bg)] p-1 text-[13px] text-foreground shadow-2xl"
       >
+        {blendModeMixed ? (
+          <>
+            {/* Placeholder state for a mixed selection: the check sits next to
+                "Mixed" instead of a wrong concrete mode. Picking any option
+                below applies it to every selected object. */}
+            <div className="flex h-9 items-center gap-3 rounded-md px-3 text-[13px] text-muted-foreground">
+              <span className="flex size-4 shrink-0 items-center justify-center">
+                <IconCheck className="size-4" />
+              </span>
+              <span>{MIXED_VALUE}</span>
+            </div>
+            <DropdownMenuSeparator />
+          </>
+        ) : null}
         {options.map((option) => (
           <DropdownMenuItem
             key={option.value}
@@ -3641,11 +3871,25 @@ function StrokeLayerControl({
               : t("editPanel.labels.showLayer")
           }
           onClick={() => {
+            // Hide/show by zeroing the stroke color's alpha (preserving its
+            // RGB channels — same durable, comment-free technique as the
+            // fill visibility toggle) instead of forcing borderStyle to
+            // "none"/"solid". Writing "none" would lose a dashed/dotted
+            // style permanently, since there is no round-trippable "unset"
+            // for that keyword once it's overwritten.
+            const parsed = parseCssColor(color);
             if (visible) {
-              onStyleChange(`${prefix}Style`, "none");
+              onStyleChange(
+                `${prefix}Color`,
+                parsed ? rgbaToCss(withColorOpacity(parsed, 0)) : "transparent",
+              );
               return;
             }
-            onStyleChange(`${prefix}Style`, "solid");
+            const restoredColor = parsed
+              ? rgbaToCss(withColorOpacity(parsed, 100))
+              : "#000000";
+            onStyleChange(`${prefix}Color`, restoredColor);
+            if (styleValue === "none") onStyleChange(`${prefix}Style`, "solid");
             onStyleChange(
               `${prefix}Width`,
               width === "0px" ? "1px" : width || "1px",
@@ -3691,7 +3935,7 @@ function StrokeLayerControl({
           onChange={(value) =>
             onStyleChange(
               `${prefix}Width`,
-              `${Math.max(0, Math.round(value))}px`,
+              `${Math.max(0, roundToOneDecimal(value))}px`,
             )
           }
           unit="px"
@@ -3789,7 +4033,9 @@ function serializeShadowLayers(layers: ShadowLayer[]) {
         `${Math.round(layer.x)}px`,
         `${Math.round(layer.y)}px`,
         `${Math.max(0, Math.round(layer.blur))}px`,
-        `${layer.inset ? Math.round(layer.spread) : Math.max(0, Math.round(layer.spread))}px`,
+        // Spread radius may legitimately be negative for either inset or
+        // drop shadows — only blur-radius is clamped to >= 0 in CSS.
+        `${Math.round(layer.spread)}px`,
         layer.color,
       ]
         .filter(Boolean)
@@ -3937,11 +4183,12 @@ function ShadowEffectRow({
             <ScrubInput
               label={t("editPanel.labels.spread")}
               value={layer.spread}
-              onChange={(value) =>
-                onChange({ spread: layer.inset ? value : Math.max(0, value) })
-              }
+              // Spread radius is valid negative for both inset AND drop
+              // (non-inset) shadows in real CSS — negative spread shrinks
+              // the shadow smaller than the box before blurring, a common
+              // technique. Only blur-radius must stay >= 0.
+              onChange={(value) => onChange({ spread: value })}
               unit="px"
-              min={layer.inset ? undefined : 0}
               precision={1}
               inputClassName="h-6"
             />
@@ -4058,16 +4305,48 @@ function TypographyProperties({
   }));
   const textAlign = styles.textAlign || "left";
 
-  // M1 · Text resizing mode (auto-width / auto-height / fixed). the design editor's text
-  // nodes always expose this segment. Infer the current mode from the live CSS:
-  // auto-width hugs both axes (width:auto + no wrapping), auto-height hugs the
-  // height only (fixed width, content wraps), fixed pins both width and height.
-  const widthIsAuto =
-    !styles.width || styles.width === "auto" || styles.width === "max-content";
-  const heightIsAuto = !styles.height || styles.height === "auto";
-  const noWrap = styles.whiteSpace === "nowrap";
+  // Mixed-selection guards: a multi-selection with differing values injects
+  // the MIXED_VALUE sentinel string into these computedStyles fields (see
+  // mixedElementFromSelection/sameOrMixed). Parsing that sentinel with
+  // parseNumericValue/Number() silently yields 0/NaN-fallback instead of
+  // reflecting "differs across selection", which previously showed a
+  // fabricated 0 (size), 1.2 (line-height), or blank (tracking) rather than
+  // the Mixed state ScrubInput already knows how to render — same pattern as
+  // the rotation field above.
+  const fontWeightIsMixed = isMixedValue(styles.fontWeight);
+  const fontSizeIsMixed = isMixedValue(styles.fontSize);
+  const lineHeightIsMixed = isMixedValue(styles.lineHeight);
+  const letterSpacingIsMixed = isMixedValue(styles.letterSpacing);
+
+  // M1 · Text resizing mode (auto-width / auto-height / fixed). the design
+  // editor's text nodes always expose this segment. Read authored
+  // (inlineStyles) values, not computed ones: an absolutely-positioned
+  // element's computed width/height always resolve to a real px value even
+  // when the author never set them, so "auto" and "a specific 200px" were
+  // indistinguishable before — every text node misread as "fixed". Falls
+  // back to the computed-style heuristic for older payloads that predate
+  // inlineStyles. Convention (matches DesignEditor primitive creation and
+  // setResizeMode below): auto-width = width unset/max-content + pre-wrap;
+  // auto-height = fixed width + height unset/auto; fixed = both fixed. A
+  // drag-created box (display:flex, explicit width+height, whiteSpace
+  // unset→normal) correctly falls through to "fixed".
+  const authoredResizeWidth = authoredStyleValue(element, "width");
+  const authoredResizeHeight = authoredStyleValue(element, "height");
+  const authoredWhiteSpace = authoredStyleValue(element, "whiteSpace");
+  const hasInlineStyleInfo = Boolean(element.inlineStyles);
+  const widthIsAuto = hasInlineStyleInfo
+    ? !authoredResizeWidth || authoredResizeWidth === "max-content"
+    : !styles.width ||
+      styles.width === "auto" ||
+      styles.width === "max-content";
+  const heightIsAuto = hasInlineStyleInfo
+    ? !authoredResizeHeight || authoredResizeHeight === "auto"
+    : !styles.height || styles.height === "auto";
+  const isPreWrapOrNoWrap = hasInlineStyleInfo
+    ? authoredWhiteSpace === "pre-wrap" || authoredWhiteSpace === "nowrap"
+    : styles.whiteSpace === "nowrap";
   const resizeMode: TextResizeMode =
-    widthIsAuto && noWrap
+    widthIsAuto && isPreWrapOrNoWrap
       ? "auto-width"
       : !heightIsAuto && !widthIsAuto
         ? "fixed"
@@ -4076,9 +4355,9 @@ function TypographyProperties({
   const currentHeight = styles.height && !heightIsAuto ? styles.height : "48px";
   const setResizeMode = (mode: TextResizeMode) => {
     if (mode === "auto-width") {
-      onStyleChange("width", "auto");
+      onStyleChange("width", "max-content");
       onStyleChange("height", "auto");
-      onStyleChange("whiteSpace", "nowrap");
+      onStyleChange("whiteSpace", "pre-wrap");
     } else if (mode === "auto-height") {
       onStyleChange("width", currentWidth);
       onStyleChange("height", "auto");
@@ -4090,36 +4369,44 @@ function TypographyProperties({
     }
   };
 
-  // M2 · Vertical text alignment (top / middle / bottom). For auto-layout text
-  // containers (display:flex) the design editor maps this to `justifyContent`; for normal
-  // text we fall back to `verticalAlign`, which is what an inline/grid text box
-  // honors. Read whichever the element currently expresses.
+  // M2 · Vertical text alignment (top / middle / bottom). For an auto-layout
+  // text container (display:flex) this maps to whichever flex property
+  // controls the vertical/cross axis — justifyContent when flex-direction is
+  // column, alignItems when row (the DesignEditor drag-created default; see
+  // primitive creation, which sets display:flex + alignItems:center with no
+  // explicit flex-direction, i.e. row). For any non-flex display,
+  // `verticalAlign` is a no-op: it only affects how an inline/inline-block/
+  // table-cell box sits relative to *sibling* line-box content, not how its
+  // own content sits within its own box — exactly the case for point text
+  // (inline-block). So instead of ever writing verticalAlign, convert the
+  // element to flex the same way a drag-created box is authored, then read/
+  // write through the row-axis property (alignItems) like that default.
   const display = (styles.display || "").toLowerCase();
   const isFlexText = display.includes("flex");
-  const verticalAlign = isFlexText
-    ? styles.justifyContent === "center"
-      ? "middle"
-      : styles.justifyContent === "flex-end"
-        ? "bottom"
-        : "top"
-    : styles.verticalAlign === "middle"
+  const isColumnFlexText =
+    isFlexText && styles.flexDirection?.includes("column");
+  const verticalAlignSourceProp = isColumnFlexText
+    ? styles.justifyContent
+    : styles.alignItems;
+  const verticalAlign = !isFlexText
+    ? "top"
+    : verticalAlignSourceProp === "center"
       ? "middle"
-      : styles.verticalAlign === "bottom"
+      : verticalAlignSourceProp === "flex-end"
         ? "bottom"
         : "top";
   const setVerticalAlign = (mode: "top" | "middle" | "bottom") => {
-    if (isFlexText) {
-      onStyleChange(
-        "justifyContent",
-        mode === "middle"
-          ? "center"
-          : mode === "bottom"
-            ? "flex-end"
-            : "flex-start",
-      );
-    } else {
-      onStyleChange("verticalAlign", mode);
-    }
+    // Converting a non-flex element matches the drag-created fixed-size text
+    // box exactly: display:flex, default (row) flex-direction — so the
+    // vertical axis is alignItems, same as the pre-existing row case below.
+    if (!isFlexText) onStyleChange("display", "flex");
+    const cssValue =
+      mode === "middle"
+        ? "center"
+        : mode === "bottom"
+          ? "flex-end"
+          : "flex-start";
+    onStyleChange(isColumnFlexText ? "justifyContent" : "alignItems", cssValue);
   };
 
   return (
@@ -4158,13 +4445,22 @@ function TypographyProperties({
       {/* Row 2: weight + size side by side */}
       <div className="grid grid-cols-2 gap-1.5">
         <Select
-          value={styles.fontWeight || "400"}
+          value={fontWeightIsMixed ? MIXED_VALUE : styles.fontWeight || "400"}
           onValueChange={(v) => onStyleChange("fontWeight", v)}
         >
           <SelectTrigger className="h-6 rounded-md border-[var(--design-editor-control-border)] bg-[var(--design-editor-control-bg)] px-1.5 !text-[11px] shadow-none focus:ring-1 focus:ring-[var(--design-editor-accent-color)]">
             <SelectValue />
           </SelectTrigger>
           <SelectContent>
+            {fontWeightIsMixed ? (
+              <SelectItem
+                value={MIXED_VALUE}
+                disabled
+                className="!text-[11px] text-muted-foreground"
+              >
+                {MIXED_VALUE}
+              </SelectItem>
+            ) : null}
             {fontWeightOptions.map((opt) => (
               <SelectItem
                 key={opt.value}
@@ -4180,9 +4476,19 @@ function TypographyProperties({
           label={t("editPanel.labels.size")}
           ariaLabel={t("editPanel.labels.size")}
           icon={IconLetterCase}
-          value={styles.fontSize ? parseNumericValue(styles.fontSize) : 16}
+          value={
+            fontSizeIsMixed
+              ? 0
+              : styles.fontSize
+                ? parseNumericValue(styles.fontSize)
+                : 16
+          }
+          mixed={fontSizeIsMixed}
           onChange={(value) =>
-            onStyleChange("fontSize", `${Math.max(1, Math.round(value))}px`)
+            onStyleChange(
+              "fontSize",
+              `${Math.max(1, roundToOneDecimal(value))}px`,
+            )
           }
           unit="px"
           min={1}
@@ -4199,7 +4505,12 @@ function TypographyProperties({
           label={t("editPanel.labels.lineHeight")}
           ariaLabel={t("editPanel.labels.lineHeight")}
           icon={IconLineHeight}
-          value={resolveLineHeight(styles.lineHeight, styles.fontSize)}
+          value={
+            lineHeightIsMixed
+              ? 0
+              : resolveLineHeight(styles.lineHeight, styles.fontSize)
+          }
+          mixed={lineHeightIsMixed}
           onChange={(value) =>
             onStyleChange("lineHeight", String(Math.max(0.1, value)))
           }
@@ -4215,8 +4526,13 @@ function TypographyProperties({
           ariaLabel={t("editPanel.labels.tracking")}
           icon={IconLetterSpacing}
           value={
-            styles.letterSpacing ? parseNumericValue(styles.letterSpacing) : 0
+            letterSpacingIsMixed
+              ? 0
+              : styles.letterSpacing
+                ? parseNumericValue(styles.letterSpacing)
+                : 0
           }
+          mixed={letterSpacingIsMixed}
           onChange={(value) => onStyleChange("letterSpacing", `${value}px`)}
           unit="px"
           precision={1}
@@ -4801,6 +5117,23 @@ function ExportPreview({ element }: { element: ElementInfo | null }) {
   );
 }
 
+/**
+ * Reads an authored (as-written) offset/size style, preferring the bridge's
+ * `inlineStyles` capture (raw `el.style.<prop>` — "auto"/"" reliably means
+ * unset) over `computedStyles` (which always resolves to a px value for
+ * absolutely-positioned elements even when the author never set the
+ * property, making "unset" indistinguishable from "0px"). Falls back to the
+ * computed value for older payloads that predate `inlineStyles`.
+ */
+export function authoredStyleValue(
+  element: ElementInfo,
+  property: string,
+): string | undefined {
+  const inline = element.inlineStyles?.[property];
+  if (inline !== undefined) return inline === "auto" ? "" : inline;
+  return element.computedStyles[property];
+}
+
 /** Position, size, and spacing properties */
 function PositionLayoutProperties({
   element,
@@ -4813,31 +5146,67 @@ function PositionLayoutProperties({
   const styles = element.computedStyles;
   const constrainedPosition =
     styles.position === "absolute" || styles.position === "fixed";
-  // Reflect the active packing in the alignment segments (the design editor highlights the
-  // current alignment). For a flex container the main axis is justifyContent.
-  const alignH = justifyToHorizontal(styles.justifyContent);
-  const alignV = alignToVertical(styles.alignItems);
+  // Reflect the active packing in the alignment segments (the design editor
+  // highlights the current alignment) — these buttons align the selected
+  // element's own children, the same operation FlexContainerControls' full
+  // AutoLayoutMatrix alignment grid performs. A column-direction flex
+  // container swaps which CSS axis is "horizontal"/"vertical" from the
+  // user's point of view: justifyContent packs the main (here: vertical)
+  // axis and alignItems packs the cross (horizontal) axis, so reading/
+  // writing must go through autoLayoutAlignmentFromStyles /
+  // horizontalToJustify / verticalToAlign like the matrix control does,
+  // instead of assuming justifyContent is always horizontal.
+  const positionFlexDirection: AutoLayoutMatrixValue["direction"] =
+    styles.flexDirection?.includes("column") ? "vertical" : "horizontal";
+  const positionAlignment = autoLayoutAlignmentFromStyles(
+    styles,
+    positionFlexDirection,
+  );
+  const alignH = positionAlignment.horizontal;
+  const alignV = positionAlignment.vertical;
+  const handlePositionAlignH = (value: AlignmentMatrixValue["horizontal"]) => {
+    onStyleChange(
+      positionFlexDirection === "vertical" ? "alignItems" : "justifyContent",
+      horizontalToJustify(value),
+    );
+  };
+  const handlePositionAlignV = (value: AlignmentMatrixValue["vertical"]) => {
+    onStyleChange(
+      positionFlexDirection === "vertical" ? "justifyContent" : "alignItems",
+      verticalToAlign(value),
+    );
+  };
+  // Authored (not computed) offsets: when inlineStyles is present, "auto"/absent
+  // is treated as truly unset instead of the computed px fallback, so a plain
+  // top-left-anchored element reads as "left" rather than always "left-right".
+  const authoredLeft = authoredStyleValue(element, "left");
+  const authoredRight = authoredStyleValue(element, "right");
+  const authoredTop = authoredStyleValue(element, "top");
+  const authoredBottom = authoredStyleValue(element, "bottom");
+  const authoredWidth = authoredStyleValue(element, "width");
+  const authoredHeight = authoredStyleValue(element, "height");
+  const authoredTransform = authoredStyleValue(element, "transform");
   const constraintsValue: ConstraintsValue = {
     horizontal:
       // Check scale before left+right: "scale" writes width:100% and clears
       // left/right to auto, but legacy data may have 0px values that are truthy.
-      styles.width === "100%"
+      authoredWidth === "100%"
         ? "scale"
-        : styles.left && styles.right
+        : authoredLeft && authoredRight
           ? "left-right"
-          : styles.right
+          : authoredRight
             ? "right"
-            : styles.transform?.includes("translateX(-50%)")
+            : authoredTransform?.includes("translateX(-50%)")
               ? "center"
               : "left",
     vertical:
-      styles.height === "100%"
+      authoredHeight === "100%"
         ? "scale"
-        : styles.top && styles.bottom
+        : authoredTop && authoredBottom
           ? "top-bottom"
-          : styles.bottom
+          : authoredBottom
             ? "bottom"
-            : styles.transform?.includes("translateY(-50%)")
+            : authoredTransform?.includes("translateY(-50%)")
               ? "center"
               : "top",
   };
@@ -4854,7 +5223,7 @@ function PositionLayoutProperties({
       const tyValue = value.vertical === "center" ? "-50%" : null;
       // Start from the current transform, apply X, then apply Y on top.
       const transformAfterX = mergeTranslateFunction(
-        styles.transform,
+        authoredTransform,
         "X",
         txValue,
       );
@@ -4867,7 +5236,7 @@ function PositionLayoutProperties({
       if (value.horizontal === "left") {
         onStyleChange(
           "left",
-          styles.left || `${Math.round(element.boundingRect.x)}px`,
+          authoredLeft || `${Math.round(element.boundingRect.x)}px`,
         );
         onStyleChange("right", "auto");
       } else if (value.horizontal === "right") {
@@ -4876,7 +5245,7 @@ function PositionLayoutProperties({
       } else if (value.horizontal === "left-right") {
         onStyleChange(
           "left",
-          styles.left || `${Math.round(element.boundingRect.x)}px`,
+          authoredLeft || `${Math.round(element.boundingRect.x)}px`,
         );
         onStyleChange("right", "0px");
       } else if (value.horizontal === "center") {
@@ -4893,7 +5262,7 @@ function PositionLayoutProperties({
       if (value.vertical === "top") {
         onStyleChange(
           "top",
-          styles.top || `${Math.round(element.boundingRect.y)}px`,
+          authoredTop || `${Math.round(element.boundingRect.y)}px`,
         );
         onStyleChange("bottom", "auto");
       } else if (value.vertical === "bottom") {
@@ -4902,7 +5271,7 @@ function PositionLayoutProperties({
       } else if (value.vertical === "top-bottom") {
         onStyleChange(
           "top",
-          styles.top || `${Math.round(element.boundingRect.y)}px`,
+          authoredTop || `${Math.round(element.boundingRect.y)}px`,
         );
         onStyleChange("bottom", "0px");
       } else if (value.vertical === "center") {
@@ -4922,9 +5291,9 @@ function PositionLayoutProperties({
       element.boundingRect.x,
       element.boundingRect.y,
       onStyleChange,
-      styles.left,
-      styles.top,
-      styles.transform,
+      authoredLeft,
+      authoredTop,
+      authoredTransform,
     ],
   );
 
@@ -4955,21 +5324,21 @@ function PositionLayoutProperties({
             <InspectorIconButton
               label={t("editPanel.textAligns.left")}
               active={alignH === "left"}
-              onClick={() => onStyleChange("justifyContent", "flex-start")}
+              onClick={() => handlePositionAlignH("left")}
             >
               <IconLayoutAlignLeft className="size-3.5" />
             </InspectorIconButton>
             <InspectorIconButton
               label={t("editPanel.textAligns.center")}
               active={alignH === "center"}
-              onClick={() => onStyleChange("justifyContent", "center")}
+              onClick={() => handlePositionAlignH("center")}
             >
               <IconLayoutAlignCenter className="size-3.5" />
             </InspectorIconButton>
             <InspectorIconButton
               label={t("editPanel.textAligns.right")}
               active={alignH === "right"}
-              onClick={() => onStyleChange("justifyContent", "flex-end")}
+              onClick={() => handlePositionAlignH("right")}
             >
               <IconLayoutAlignRight className="size-3.5" />
             </InspectorIconButton>
@@ -4978,21 +5347,21 @@ function PositionLayoutProperties({
             <InspectorIconButton
               label={t("editPanel.alignSelfOptions.start")}
               active={alignV === "top"}
-              onClick={() => onStyleChange("alignItems", "flex-start")}
+              onClick={() => handlePositionAlignV("top")}
             >
               <IconLayoutAlignTop className="size-3.5" />
             </InspectorIconButton>
             <InspectorIconButton
               label={t("editPanel.alignSelfOptions.center")}
               active={alignV === "middle"}
-              onClick={() => onStyleChange("alignItems", "center")}
+              onClick={() => handlePositionAlignV("middle")}
             >
               <IconLayoutAlignMiddle className="size-3.5" />
             </InspectorIconButton>
             <InspectorIconButton
               label={t("editPanel.alignSelfOptions.end")}
               active={alignV === "bottom"}
-              onClick={() => onStyleChange("alignItems", "flex-end")}
+              onClick={() => handlePositionAlignV("bottom")}
             >
               <IconLayoutAlignBottom className="size-3.5" />
             </InspectorIconButton>
@@ -5007,19 +5376,32 @@ function PositionLayoutProperties({
             label="X"
             ariaLabel="X-position"
             tooltipLabel="X-position"
-            value={styles.left || ""}
+            value={
+              isMixedValue(authoredLeft) ? MIXED_VALUE : authoredLeft || ""
+            }
             placeholder={element.boundingRect.x}
             inputClassName="h-6"
-            onChange={(v) => onStyleChange("left", `${Math.round(v)}px`)}
+            onChange={(v) => {
+              // Typing X/Y on a static (non-positioned) element is a no-op on
+              // canvas unless we first give it a position to offset from —
+              // mirror handleConstraintsChange, which always sets
+              // position:absolute (the convention canvas drag/resize and
+              // primitive creation both use) before writing left/top.
+              if (!constrainedPosition) onStyleChange("position", "absolute");
+              onStyleChange("left", `${Math.round(v)}px`);
+            }}
           />
           <ScrubStyleInput
             label="Y"
             ariaLabel="Y-position"
             tooltipLabel="Y-position"
-            value={styles.top || ""}
+            value={isMixedValue(authoredTop) ? MIXED_VALUE : authoredTop || ""}
             placeholder={element.boundingRect.y}
             inputClassName="h-6"
-            onChange={(v) => onStyleChange("top", `${Math.round(v)}px`)}
+            onChange={(v) => {
+              if (!constrainedPosition) onStyleChange("position", "absolute");
+              onStyleChange("top", `${Math.round(v)}px`);
+            }}
           />
           <Tooltip>
             <TooltipTrigger asChild>
@@ -5067,13 +5449,29 @@ function PositionLayoutProperties({
               hideIcon={false}
               icon={IconAngle}
               labelClassName="[&>span]:sr-only"
-              value={`${parseRotationValue(styles.transform)}deg`}
+              // Detect the Mixed sentinel BEFORE parsing: parseRotationValue
+              // would silently turn "Mixed" into 0 and render "0deg" instead
+              // of the mixed state (mirrors the opacity field's guard).
+              value={
+                isMixedValue(styles.transform)
+                  ? MIXED_VALUE
+                  : `${parseRotationValue(styles.transform)}deg`
+              }
               unit="deg"
               inputClassName="h-6"
               onChange={(v) =>
                 onStyleChange(
                   "transform",
-                  mergeRotationValue(styles.transform, v),
+                  // From a mixed selection the sentinel is not a transform —
+                  // treat it as absent so the typed value applies cleanly to
+                  // every selected object instead of producing
+                  // "Mixed rotate(…)".
+                  mergeRotationValue(
+                    isMixedValue(styles.transform)
+                      ? undefined
+                      : styles.transform,
+                    v,
+                  ),
                 )
               }
             />
@@ -5115,21 +5513,21 @@ function FillProperties({
 }) {
   const t = useT();
   const styles = element.computedStyles;
-  const isTextElement = TEXT_TAGS.has(element.tagName);
-  const fillProperty = isTextElement ? "color" : "backgroundColor";
-  const fillValue = isTextElement
+  const isTextFillElement = isTextElement(element);
+  const fillProperty = isTextFillElement ? "color" : "backgroundColor";
+  const fillValue = isTextFillElement
     ? styles.color || ""
     : styles.backgroundColor || "";
-  const backgroundLayers = isTextElement
+  const backgroundLayers = isTextFillElement
     ? []
     : splitCssLayers(styles.backgroundImage || "");
-  const backgroundSizeLayers = isTextElement
+  const backgroundSizeLayers = isTextFillElement
     ? []
     : splitCssLayers(styles.backgroundSize || "");
-  const backgroundRepeatLayers = isTextElement
+  const backgroundRepeatLayers = isTextFillElement
     ? []
     : splitCssLayers(styles.backgroundRepeat || "");
-  const backgroundPositionLayers = isTextElement
+  const backgroundPositionLayers = isTextFillElement
     ? []
     : splitCssLayers(styles.backgroundPosition || "");
   const fillIsMixed =
@@ -5138,39 +5536,36 @@ function FillProperties({
     isMixedValue(styles.backgroundSize) ||
     isMixedValue(styles.backgroundRepeat) ||
     isMixedValue(styles.backgroundPosition);
-  const hasBackgroundLayer = !isTextElement && backgroundLayers.length > 0;
+  const hasBackgroundLayer = !isTextFillElement && backgroundLayers.length > 0;
   const hasVisibleFill =
-    isTextElement || colorHasVisibleAlpha(fillValue) || hasBackgroundLayer;
-
-  // Non-destructive fill hide: stash the color before hiding so toggling
-  // visible again restores the exact original value (the design editor never loses color).
-  // Keyed by a stable selected-element identity so anonymous same-tag elements
-  // don't share stash slots.
-  const [hiddenFillStash, setHiddenFillStash] = useState<
-    Record<string, string>
-  >({});
-  // Same non-destructive idea for background gradient/image layers: stash the
-  // exact layer string on hide so per-stop opacity survives a hide→show toggle
-  // instead of being flattened to all-0 then all-100.
-  const [hiddenLayerStash, setHiddenLayerStash] = useState<
-    Record<string, string>
-  >({});
-  const stashKey = `${elementIdentityKey(element)}:${fillProperty}`;
+    isTextFillElement || colorHasVisibleAlpha(fillValue) || hasBackgroundLayer;
+
+  // Non-destructive fill hide: instead of stashing the pre-hide color in
+  // React state (lost on unmount — e.g. deselect then reselect the same
+  // element, since FillProperties only mounts while something is selected),
+  // zero the alpha channel while preserving the RGB channels in the
+  // persisted CSS itself: rgba(r,g,b,0) renders identically to fully
+  // transparent, but getComputedStyle round-trips the r/g/b losslessly (CSS
+  // color-list channels are real data, unlike comments — verified
+  // separately: computed style strips comments but keeps rgba() channels).
+  // Showing again just restores alpha to 1 using those same channels, so no
+  // stash is required and the hide survives reselect/reload.
   const isHidden = !colorHasVisibleAlpha(fillValue);
   const handleFillVisibilityToggle = () => {
+    const parsed = parseCssColor(fillValue);
     if (isHidden) {
-      // Restore the stashed color, or fall back to a sensible default.
-      const restored =
-        hiddenFillStash[stashKey] ?? (isTextElement ? "#000000" : "#ffffff");
+      const restored = parsed
+        ? rgbaToCss(withColorOpacity(parsed, 100))
+        : isTextFillElement
+          ? "#000000"
+          : "#ffffff";
       onStyleChange(fillProperty, restored);
-      setHiddenFillStash((prev) => {
-        const next = { ...prev };
-        delete next[stashKey];
-        return next;
-      });
+    } else if (parsed) {
+      onStyleChange(fillProperty, rgbaToCss(withColorOpacity(parsed, 0)));
     } else {
-      // Stash the current color before going transparent.
-      setHiddenFillStash((prev) => ({ ...prev, [stashKey]: fillValue }));
+      // Value wasn't a parseable color (e.g. already the literal
+      // "transparent") — nothing to preserve, transparent is the best we
+      // can do.
       onStyleChange(fillProperty, "transparent");
     }
   };
@@ -5219,7 +5614,7 @@ function FillProperties({
                 );
                 return;
               }
-              if (isTextElement) {
+              if (isTextFillElement) {
                 onStyleChange(
                   "color",
                   cssColorOrFallback(styles.color, "#000000"),
@@ -5257,7 +5652,7 @@ function FillProperties({
         </p>
       ) : hasVisibleFill ? (
         <div className="space-y-1.5">
-          {isTextElement || colorHasVisibleAlpha(fillValue) ? (
+          {isTextFillElement || colorHasVisibleAlpha(fillValue) ? (
             /* design row: [swatch+hex trigger (flex-1)] [eye] [remove] */
             <div className="group flex items-center gap-1.5">
               <div className="min-w-0 flex-1">
@@ -5265,17 +5660,51 @@ function FillProperties({
                   label=""
                   value={fillValue}
                   onChange={(v) => onStyleChange(fillProperty, v)}
-                  backgroundImage=""
+                  // Pass the real layer stack (not "") so that switching this
+                  // swatch's paint type to gradient/image composes a new
+                  // layer on top of any existing backgroundImage layers
+                  // (rendered as their own rows below) instead of clobbering
+                  // them — ColorInput derives its add/replace-layer logic
+                  // from this prop.
+                  backgroundImage={
+                    isTextFillElement ? "" : styles.backgroundImage
+                  }
                   blendMode={
-                    isTextElement
+                    isTextFillElement
                       ? undefined
                       : styles.backgroundBlendMode || "normal"
                   }
                   onBlendModeChange={
-                    isTextElement
+                    isTextFillElement
                       ? undefined
                       : (v) => onStyleChange("backgroundBlendMode", v)
                   }
+                  // Text fill ("color") can't hold a gradient/image paint —
+                  // there is no background-clip:text support here — so never
+                  // offer layered fills for it; the picker's Gradient/Image
+                  // tabs remain reachable as raw UI (it manages that tab
+                  // selection as local state independent of these props) but
+                  // ColorInput's setNext guard rejects non-color writes back
+                  // into `color` when supportsLayeredFills is false. For any
+                  // other element the base fill is a real backgroundImage
+                  // layer stack, so wire the same layered-fill handlers the
+                  // page background row uses (see PageProperties above).
+                  supportsLayeredFills={!isTextFillElement}
+                  onBackgroundImageChange={
+                    isTextFillElement
+                      ? undefined
+                      : (v) => onStyleChange("backgroundImage", v)
+                  }
+                  onImageFillChange={
+                    isTextFillElement
+                      ? undefined
+                      : (value) =>
+                          commitStylePatch(
+                            imageFillToBackgroundStyles(value),
+                            onStyleChange,
+                            onStylesChange,
+                          )
+                  }
                   documentColors={documentColors}
                   pickerKey={[
                     element.sourceId ??
@@ -5304,7 +5733,7 @@ function FillProperties({
               <SectionIconButton
                 label={t("editPanel.labels.removeLayer")}
                 onClick={() => {
-                  if (isTextElement) {
+                  if (isTextFillElement) {
                     onStyleChange(fillProperty, "transparent");
                     return;
                   }
@@ -5322,23 +5751,21 @@ function FillProperties({
               </SectionIconButton>
             </div>
           ) : null}
-          {!isTextElement
+          {!isTextFillElement
             ? backgroundLayers.map((layer, index) => {
                 const gradient = parseGradientLayer(layer);
+                // Hidden state lives in the real, persisted backgroundSize
+                // marker (see withLayerSizeMarker) rather than React state,
+                // so it survives deselect/reselect. Opacity still reflects
+                // the gradient's own stop opacities for display, but no
+                // longer drives hide/show — a layer can be a fully-opaque
+                // gradient and still be hidden via zero-size.
+                const hidden = isLayerHiddenBySize(backgroundSizeLayers[index]);
                 const opacity = gradient
                   ? averageGradientOpacity(gradient.stops)
                   : 100;
-                const layerStashKey = `${elementIdentityKey(element)}:layer:${index}`;
-                const stashedLayer = hiddenLayerStash[layerStashKey];
-                const hiddenImagePlaceholder = Boolean(
-                  stashedLayer && gradient && opacity <= 0,
-                );
                 const label = gradient
-                  ? hiddenImagePlaceholder
-                    ? `${"Image" /* i18n-ignore design inspector paint row */} ${
-                        index + 1
-                      }`
-                    : `${gradientLabel(gradient.type)} ${index + 1}`
+                  ? `${gradientLabel(gradient.type)} ${index + 1}`
                   : `${"Image" /* i18n-ignore design inspector paint row */} ${
                       index + 1
                     }`;
@@ -5356,6 +5783,25 @@ function FillProperties({
                       ),
                     ),
                   );
+                  onStyleChange(
+                    "backgroundSize",
+                    joinCssLayers(
+                      backgroundSizeLayers.filter(
+                        (_, layerIndex) => layerIndex !== index,
+                      ),
+                    ),
+                  );
+                };
+                const setLayerHidden = (nextHidden: boolean) => {
+                  onStyleChange(
+                    "backgroundSize",
+                    withLayerSizeMarker(
+                      backgroundSizeLayers,
+                      backgroundLayers.length,
+                      index,
+                      nextHidden,
+                    ),
+                  );
                 };
 
                 return (
@@ -5378,7 +5824,7 @@ function FillProperties({
                             {label}
                           </span>
                           <span className="shrink-0 tabular-nums text-muted-foreground">
-                            {opacity}%
+                            {hidden ? 0 : opacity}%
                           </span>
                         </button>
                       </PopoverTrigger>
@@ -5389,7 +5835,7 @@ function FillProperties({
                         className="w-80 p-0"
                       >
                         <DesignColorPicker
-                          value={gradient?.stops[0]?.color ?? layer}
+                          value={layer}
                           onPaintValueChange={replaceLayer}
                           onChange={(nextColor) => {
                             if (!gradient) return;
@@ -5434,78 +5880,14 @@ function FillProperties({
                     </Popover>
                     <SectionIconButton
                       label={
-                        opacity <= 0
+                        hidden
                           ? t("editPanel.labels.showLayer")
                           : t("editPanel.labels.hideLayer")
                       }
-                      onClick={() => {
-                        if (opacity <= 0) {
-                          // Show: restore the exact pre-hide layer if stashed,
-                          // otherwise fall back to forcing every stop opaque.
-                          const stashed = hiddenLayerStash[layerStashKey];
-                          if (stashed !== undefined) {
-                            replaceLayer(stashed);
-                            setHiddenLayerStash((prev) => {
-                              const next = { ...prev };
-                              delete next[layerStashKey];
-                              return next;
-                            });
-                          } else if (gradient) {
-                            replaceLayer(
-                              buildGradientLayer(
-                                gradient.type,
-                                gradient.stops.map((stop) => ({
-                                  ...stop,
-                                  opacity: 100,
-                                })),
-                                gradient.prefix,
-                              ),
-                            );
-                          }
-                          return;
-                        }
-                        if (!gradient) {
-                          setHiddenLayerStash((prev) => ({
-                            ...prev,
-                            [layerStashKey]: layer,
-                          }));
-                          replaceLayer(
-                            buildGradientLayer("linear", [
-                              {
-                                id: "stop-0",
-                                color: "rgba(0, 0, 0, 0)",
-                                position: 0,
-                                opacity: 0,
-                              },
-                              {
-                                id: "stop-1",
-                                color: "rgba(0, 0, 0, 0)",
-                                position: 100,
-                                opacity: 0,
-                              },
-                            ]),
-                          );
-                        } else {
-                          // Hide: stash the current layer (with its real per-stop
-                          // opacities) before zeroing every stop's alpha.
-                          setHiddenLayerStash((prev) => ({
-                            ...prev,
-                            [layerStashKey]: layer,
-                          }));
-                          replaceLayer(
-                            buildGradientLayer(
-                              gradient.type,
-                              gradient.stops.map((stop) => ({
-                                ...stop,
-                                opacity: 0,
-                              })),
-                              gradient.prefix,
-                            ),
-                          );
-                        }
-                      }}
+                      onClick={() => setLayerHidden(!hidden)}
+                      activateOnPointerDown
                     >
-                      {opacity <= 0 ? (
+                      {hidden ? (
                         <IconEyeOff className="size-3.5" />
                       ) : (
                         <IconEye className="size-3.5" />
@@ -5538,11 +5920,14 @@ function StrokeProperties({
 }) {
   const t = useT();
   const styles = element.computedStyles;
-  const borderVisible = strokeIsVisible(styles.borderWidth, styles.borderStyle);
-  const outlineVisible = strokeIsVisible(
-    styles.outlineWidth,
-    styles.outlineStyle,
-  );
+  // Visible requires: real width, style not "none" (legacy hide path), and
+  // color not zero-alpha (current hide path — see strokeHiddenByColor).
+  const borderVisible =
+    strokeIsVisible(styles.borderWidth, styles.borderStyle) &&
+    !strokeHiddenByColor(styles.borderColor);
+  const outlineVisible =
+    strokeIsVisible(styles.outlineWidth, styles.outlineStyle) &&
+    !strokeHiddenByColor(styles.outlineColor);
   const strokeIsMixed = [
     styles.borderWidth,
     styles.borderStyle,
@@ -5580,8 +5965,17 @@ function StrokeProperties({
               return;
             }
             if (!borderVisible) {
+              // Restore full alpha before falling back to cssColorOrFallback
+              // — a border previously hidden via the eye toggle (zero-alpha,
+              // real RGB preserved) is not "transparent" by that helper's
+              // narrow literal check, so without this an "Add" click here
+              // could silently re-add an invisible border.
+              const existingBorderColor = styles.borderColor || styles.color;
+              const existingParsed = parseCssColor(existingBorderColor || "");
               const borderColor = cssColorOrFallback(
-                styles.borderColor || styles.color,
+                existingParsed
+                  ? rgbaToCss(withColorOpacity(existingParsed, 100))
+                  : existingBorderColor,
                 "#000000",
               );
               commitStylePatch(
@@ -5742,7 +6136,15 @@ function AppearanceProperties({
           unit="%"
           precision={1}
         />
-        <CornerRadiusControl styles={styles} onStyleChange={onStyleChange} />
+        {/* Selection-stable key so per-selection UI state (the independent-
+            corners toggle, which ratchets open while corners differ) resets on
+            selection change instead of leaking to the next element — same
+            pattern as ExportSettingsPanel. */}
+        <CornerRadiusControl
+          key={elementIdentityKey(element)}
+          styles={styles}
+          onStyleChange={onStyleChange}
+        />
       </div>
     </PanelSection>
   );
@@ -6928,7 +7330,18 @@ export function ComponentSection({
   );
 }
 
-export function EditPanel({
+// PF8: EditPanel re-renders on every DesignEditor state change (drag,
+// hover, zoom) unless memoized. Nearly all props are already stabilized at
+// the call site (useMemo/useCallback — see DesignEditor.tsx's
+// selectedInspectorElements/selectedScreenGeometry/pageStyles/tweaks/
+// sourceCapabilities/statesPanelProps/reviewPanelProps and the onXxx
+// handlers passed to <EditPanel>). `headerTrailing` and `aiActions` are
+// legitimately-dynamic ReactNode slots (the zoom control repaints its own
+// live percentage every zoom tick; aiActions depends on the live
+// selection) — their identity is expected to change often and a custom
+// comparator that ignored them would hide real content changes, so this
+// uses the default shallow comparison rather than special-casing them.
+export const EditPanel = memo(function EditPanel({
   selectedElement,
   selectedElements,
   selectedScreenGeometry,
@@ -7344,4 +7757,4 @@ export function EditPanel({
       ) : null}
     </div>
   );
-}
+});