Просмотр исходного кода

fix(ui): z-index / stacking-context follow-ups to #1336

  Two latent issues surfaced after the original AssignSpoolModal z-50 →
  z-[100] bump landed:

  1. Material-mismatch ConfirmModal hidden behind AssignSpoolModal.
     ConfirmModal's overlay was hardcoded to z-50 in its wrapper, so once
     the parent moved to z-[100] the nested confirmation dialog sat
     behind it. Added an optional overlayZIndex prop to ConfirmModal
     (defaults to z-50 — none of the 82 other call sites change), and
     the mismatch site in AssignSpoolModal passes z-[110] so the warning
     stacks above its parent.

  2. FilamentHoverCard / EmptySlotHoverCard covered by sibling printer
     cards on the dashboard. The popovers used position:absolute with
     z-[60] inside the trigger, but every printer card creates its own
     stacking context (drop-shadow filter on the slot tiles is enough),
     and z-index doesn't cross stacking-context boundaries — the next
     sibling card always wins by DOM order. Visible as the "Jade White
     · Bambu PETG HF" tooltip getting half-eaten by the neighbour card's
     AMS column.

     Fixed by portaling both hover cards to document.body with
     position:fixed and screen-space coordinates from
     triggerRef.getBoundingClientRect(). Coords recompute on visibility
     change, scroll (capture), and resize so the popover follows the
     trigger when the viewport moves; a requestAnimationFrame re-measure
     after the first paint avoids a one-frame flicker before the card
     has its rendered dimensions. Hover handlers are wired on both the
     trigger AND the portaled card so moving the cursor from slot to
     popover doesn't auto-dismiss after 100 ms. Top/bottom placement
     and arrow-pointer logic preserved.
maziggy 3 месяцев назад
Родитель
Сommit
7d7267e9cb

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
CHANGELOG.md


+ 3 - 0
frontend/src/components/AssignSpoolModal.tsx

@@ -581,6 +581,9 @@ export function AssignSpoolModal({ isOpen, onClose, printerId, amsId, trayId, tr
             message={message}
             confirmText={t('inventory.assignMismatchConfirm')}
             variant="warning"
+            // Sit above the AssignSpoolModal wrapper (z-[100], #1336) —
+            // without this the mismatch dialog is hidden behind its parent.
+            overlayZIndex="z-[110]"
             isLoading={assignMutation.isPending}
             onConfirm={handleConfirmMismatch}
             onCancel={() => {

+ 7 - 1
frontend/src/components/ConfirmModal.tsx

@@ -11,6 +11,11 @@ interface ConfirmModalProps {
   cancelText?: string;
   cancelVariant?: 'primary' | 'secondary' | 'danger' | 'ghost';
   cardClassName?: string;
+  // Tailwind z-index utility applied to the fixed overlay. Defaults to
+  // ``z-50``. Use a higher value (e.g. ``z-[110]``) when this confirm
+  // dialog is rendered from inside another modal that uses ``z-[100]`` —
+  // without it the confirm dialog sits behind its parent (#1336 follow-up).
+  overlayZIndex?: string;
   variant?: 'danger' | 'warning' | 'default';
   isLoading?: boolean;
   loadingText?: string;
@@ -29,6 +34,7 @@ export function ConfirmModal({
   cancelText,
   cancelVariant,
   cardClassName,
+  overlayZIndex,
   variant = 'default',
   isLoading = false,
   loadingText,
@@ -68,7 +74,7 @@ export function ConfirmModal({
 
   return (
     <div
-      className="fixed inset-0 bg-black/50 flex items-center justify-center z-50 p-4"
+      className={`fixed inset-0 bg-black/50 flex items-center justify-center p-4 ${overlayZIndex ?? 'z-50'}`}
       onClick={isLoading ? undefined : onCancel}
     >
       <Card

+ 101 - 28
frontend/src/components/FilamentHoverCard.tsx

@@ -1,4 +1,5 @@
-import { useState, useRef, useEffect, type ReactNode } from 'react';
+import { useState, useRef, useEffect, useLayoutEffect, type ReactNode } from 'react';
+import { createPortal } from 'react-dom';
 import { useNavigate } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { Droplets, Copy, Check, Settings2, Package, Unlink } from 'lucide-react';
@@ -56,6 +57,12 @@ export function FilamentHoverCard({ data, children, disabled, className = '', sp
   const navigate = useNavigate();
   const [isVisible, setIsVisible] = useState(false);
   const [position, setPosition] = useState<'top' | 'bottom'>('top');
+  // Screen-space coordinates for the portaled card (#1336 follow-up). Using
+  // a portal + position:fixed lets the popover escape sibling printer cards
+  // that create their own stacking contexts on the dashboard — without this,
+  // a card later in DOM order draws over the hover popover regardless of
+  // z-index because z-index doesn't cross stacking-context boundaries.
+  const [coords, setCoords] = useState<{ top: number; left: number } | null>(null);
   const [copied, setCopied] = useState(false);
   const [showUnlinkConfirm, setShowUnlinkConfirm] = useState(false);
   const triggerRef = useRef<HTMLDivElement>(null);
@@ -97,23 +104,43 @@ export function FilamentHoverCard({ data, children, disabled, className = '', sp
     document.body.removeChild(textarea);
   };
 
-  // Calculate position when showing
-  useEffect(() => {
-    if (isVisible && triggerRef.current && cardRef.current) {
+  // Compute placement (top/bottom) + screen coordinates for the portaled
+  // card. Runs on visibility change, scroll, and resize so the popover
+  // tracks the trigger when the viewport moves. useLayoutEffect rather
+  // than useEffect so the first paint already has the correct coords —
+  // avoids a one-frame flicker at (0, 0).
+  useLayoutEffect(() => {
+    if (!isVisible) {
+      setCoords(null);
+      return;
+    }
+    const compute = () => {
+      if (!triggerRef.current || !cardRef.current) return;
       const triggerRect = triggerRef.current.getBoundingClientRect();
       const cardHeight = cardRef.current.offsetHeight;
-      // Account for fixed header (56px) - space above should exclude header area
+      const cardWidth = cardRef.current.offsetWidth;
       const headerHeight = 56;
       const spaceAbove = triggerRect.top - headerHeight;
       const spaceBelow = window.innerHeight - triggerRect.bottom;
-
-      // Prefer top, but flip to bottom if not enough space (accounting for header)
-      if (spaceAbove < cardHeight + 12 && spaceBelow > spaceAbove) {
-        setPosition('bottom');
-      } else {
-        setPosition('top');
-      }
-    }
+      const placement: 'top' | 'bottom' =
+        spaceAbove < cardHeight + 12 && spaceBelow > spaceAbove ? 'bottom' : 'top';
+      const centerX = triggerRect.left + triggerRect.width / 2;
+      const left = Math.max(8, Math.min(centerX - cardWidth / 2, window.innerWidth - cardWidth - 8));
+      const top = placement === 'top' ? triggerRect.top - cardHeight - 8 : triggerRect.bottom + 8;
+      setPosition(placement);
+      setCoords({ top, left });
+    };
+    // First compute is synchronous from the layout effect; a follow-up rAF
+    // re-measures after the card actually has its rendered dimensions.
+    compute();
+    const rafId = requestAnimationFrame(compute);
+    window.addEventListener('scroll', compute, true);
+    window.addEventListener('resize', compute);
+    return () => {
+      cancelAnimationFrame(rafId);
+      window.removeEventListener('scroll', compute, true);
+      window.removeEventListener('resize', compute);
+    };
   }, [isVisible]);
 
   const handleMouseEnter = () => {
@@ -155,19 +182,24 @@ export function FilamentHoverCard({ data, children, disabled, className = '', sp
     >
       {children}
 
-      {/* Hover Card */}
-      {isVisible && (
+      {/* Portaled hover card — rendered into document.body so it escapes
+          any ancestor stacking context. Sibling printer cards on the
+          dashboard create their own stacking contexts; without the portal
+          the popover gets covered by the next card even at z-[60]
+          (#1336 follow-up). */}
+      {isVisible && createPortal(
         <div
           ref={cardRef}
-          className={`
-            absolute left-1/2 -translate-x-1/2 z-[60]
-            ${position === 'top' ? 'bottom-full mb-2' : 'top-full mt-2'}
-            animate-in fade-in-0 zoom-in-95 duration-150
-          `}
+          className="fixed z-[60] animate-in fade-in-0 zoom-in-95 duration-150"
           style={{
-            // Ensure card doesn't go off-screen horizontally
+            top: coords?.top ?? -9999,
+            left: coords?.left ?? -9999,
             maxWidth: 'calc(100vw - 24px)',
+            // Hide until coords are computed to avoid a (-9999,-9999) flash.
+            visibility: coords ? 'visible' : 'hidden',
           }}
+          onMouseEnter={handleMouseEnter}
+          onMouseLeave={handleMouseLeave}
         >
           {/* Card container */}
           <div className="
@@ -413,7 +445,8 @@ export function FilamentHoverCard({ data, children, disabled, className = '', sp
                 : 'bottom-full border-b-[6px] border-b-bambu-dark-tertiary'}
             `}
           />
-        </div>
+        </div>,
+        document.body,
       )}
 
       {/* Unlink Confirmation Dialog */}
@@ -468,6 +501,11 @@ interface EmptySlotHoverCardProps {
 export function EmptySlotHoverCard({ children, className = '', configureSlot, onAssignSpool }: EmptySlotHoverCardProps) {
   const { t } = useTranslation();
   const [isVisible, setIsVisible] = useState(false);
+  // Screen-space coords for the portaled card — same pattern as
+  // FilamentHoverCard, see comment there (#1336 follow-up).
+  const [coords, setCoords] = useState<{ top: number; left: number } | null>(null);
+  const triggerRef = useRef<HTMLDivElement>(null);
+  const cardRef = useRef<HTMLDivElement>(null);
   const timeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
 
   const handleMouseEnter = () => {
@@ -486,19 +524,53 @@ export function EmptySlotHoverCard({ children, className = '', configureSlot, on
     };
   }, []);
 
+  useLayoutEffect(() => {
+    if (!isVisible) {
+      setCoords(null);
+      return;
+    }
+    const compute = () => {
+      if (!triggerRef.current || !cardRef.current) return;
+      const triggerRect = triggerRef.current.getBoundingClientRect();
+      const cardHeight = cardRef.current.offsetHeight;
+      const cardWidth = cardRef.current.offsetWidth;
+      const centerX = triggerRect.left + triggerRect.width / 2;
+      const left = Math.max(8, Math.min(centerX - cardWidth / 2, window.innerWidth - cardWidth - 8));
+      const top = triggerRect.top - cardHeight - 8;
+      setCoords({ top, left });
+    };
+    compute();
+    const rafId = requestAnimationFrame(compute);
+    window.addEventListener('scroll', compute, true);
+    window.addEventListener('resize', compute);
+    return () => {
+      cancelAnimationFrame(rafId);
+      window.removeEventListener('scroll', compute, true);
+      window.removeEventListener('resize', compute);
+    };
+  }, [isVisible]);
+
   return (
     <div
+      ref={triggerRef}
       className={`relative ${className}`}
       onMouseEnter={handleMouseEnter}
       onMouseLeave={handleMouseLeave}
     >
       {children}
 
-      {isVisible && (
-        <div className="
-          absolute left-1/2 -translate-x-1/2 bottom-full mb-2 z-50
-          animate-in fade-in-0 zoom-in-95 duration-150
-        ">
+      {isVisible && createPortal(
+        <div
+          ref={cardRef}
+          className="fixed z-[60] animate-in fade-in-0 zoom-in-95 duration-150"
+          style={{
+            top: coords?.top ?? -9999,
+            left: coords?.left ?? -9999,
+            visibility: coords ? 'visible' : 'hidden',
+          }}
+          onMouseEnter={handleMouseEnter}
+          onMouseLeave={handleMouseLeave}
+        >
           <div className="
             bg-bambu-dark-secondary border border-bambu-dark-tertiary
             rounded-md shadow-lg overflow-hidden
@@ -540,7 +612,8 @@ export function EmptySlotHoverCard({ children, className = '', configureSlot, on
             border-r-[5px] border-r-transparent
             border-t-[5px] border-t-bambu-dark-tertiary
           " />
-        </div>
+        </div>,
+        document.body,
       )}
     </div>
   );

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
static/assets/index-BOMoNf8F.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
static/assets/index-BxdzCdot.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
static/assets/index-CMlectnM.css


+ 2 - 2
static/index.html

@@ -26,8 +26,8 @@
 
     <!-- Splash screens for iOS -->
     <link rel="apple-touch-startup-image" href="/img/android-chrome-512x512.png" />
-    <script type="module" crossorigin src="/assets/index-CA6ngrew.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-CMlectnM.css">
+    <script type="module" crossorigin src="/assets/index-BxdzCdot.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-BOMoNf8F.css">
   </head>
   <body>
     <div id="root"></div>

Некоторые файлы не были показаны из-за большого количества измененных файлов