Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

improvement(ui): make the secret comment popover draggable (SECRETS-843) (#8915)

Andrew Huange2c490b05f7a
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/SecretCommentForm.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/SecretCommentForm.tsx
index 7f845ab6ed..27c6f8b101 100644
--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/SecretCommentForm.tsx
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/SecretCommentForm.tsx
@@ -1,7 +1,8 @@
-import { useEffect, useRef } from "react";
+import { HTMLAttributes, useEffect, useRef } from "react";
import { Controller, useForm } from "react-hook-form";
import { subject } from "@casl/ability";
import { zodResolver } from "@hookform/resolvers/zod";
+import { GripHorizontalIcon } from "lucide-react";
import { z } from "zod";
import { createNotification } from "@app/components/notifications";
@@ -25,6 +26,7 @@ type Props = {
onClose?: () => void;
isBatchMode?: boolean;
onCommentChange?: (comment: string) => void;
+ dragHandleProps?: HTMLAttributes<HTMLDivElement>;
};
export const SecretCommentForm = ({
@@ -34,7 +36,8 @@ export const SecretCommentForm = ({
secretPath,
onClose,
isBatchMode,
- onCommentChange
+ onCommentChange,
+ dragHandleProps
}: Props) => {
const { projectId } = useProject();
const { permission } = useProjectPermission();
@@ -112,10 +115,23 @@ export const SecretCommentForm = ({
onClose?.();
};
+ const header = (
+ <div
+ {...dragHandleProps}
+ role="button"
+ tabIndex={0}
+ aria-label="Move comment (drag or use arrow keys)"
+ className="-mx-4 -mt-4 flex cursor-grab touch-none items-center justify-between rounded-t-lg px-4 pt-4 outline-none select-none focus-visible:ring-2 focus-visible:ring-ring active:cursor-grabbing"
+ >
+ <p className="text-sm font-medium">Comment</p>
+ <GripHorizontalIcon className="size-4 text-accent" />
+ </div>
+ );
+
if (!canEdit) {
return (
<div className="space-y-3">
- <p className="text-sm font-medium">Comment</p>
+ {header}
<p className="max-h-48 min-h-24 thin-scrollbar overflow-y-auto rounded-md border border-border px-3 py-2 text-sm break-words whitespace-pre-wrap opacity-100">
{comment}
</p>
@@ -131,7 +147,7 @@ export const SecretCommentForm = ({
if (isBatchMode) {
return (
<div className="space-y-3">
- <p className="text-sm font-medium">Comment</p>
+ {header}
<Controller
name="comment"
control={control}
@@ -155,7 +171,7 @@ export const SecretCommentForm = ({
return (
<form onSubmit={handleSubmit(onSubmit)} className="space-y-3">
- <p className="text-sm font-medium">Comment</p>
+ {header}
<Controller
name="comment"
control={control}
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/SecretEditTableRow.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/SecretEditTableRow.tsx
index 2b7b5d260c..fc5d125fb3 100644
--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/SecretEditTableRow.tsx
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretTableRow/SecretEditTableRow.tsx
@@ -1,5 +1,5 @@
/* eslint-disable no-nested-ternary */
-import { useCallback, useEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useLayoutEffect, useRef, useState } from "react";
import { Controller, useForm } from "react-hook-form";
import { subject } from "@casl/ability";
import {
@@ -360,6 +360,11 @@ export const SecretEditTableRow = ({
const [isEditing, setIsEditing] = useToggle();
const [isModalOpen, setIsModalOpen] = useState<boolean>(false);
const [isCommentOpen, setIsCommentOpen] = useState(false);
+ const [commentDragOffset, setCommentDragOffset] = useState({ x: 0, y: 0 });
+ const [commentSide, setCommentSide] = useState<"top" | "right" | "bottom" | "left">();
+ const commentDragStart = useRef<{ pointerX: number; pointerY: number; x: number; y: number }>(
+ undefined
+ );
const [isTagOpen, setIsTagOpen] = useState(false);
const [isMetadataOpen, setIsMetadataOpen] = useState(false);
const [isReminderOpen, setIsReminderOpen] = useState(false);
@@ -435,6 +440,13 @@ export const SecretEditTableRow = ({
})) ?? [];
}, [comment, tags, secretMetadata, isSingleEnvView, hasPendingChange]);
+ useLayoutEffect(() => {
+ commentDragStart.current = undefined;
+ if (!isCommentOpen) return;
+ setCommentDragOffset({ x: 0, y: 0 });
+ setCommentSide(undefined);
+ }, [isCommentOpen]);
+
// Stable callbacks for child components to avoid resetting their debounce timers on re-render
const handleCommentChange = useCallback(
(newComment: string) => setValue("comment", newComment),
@@ -1245,9 +1257,63 @@ export const SecretEditTableRow = ({
}
};
+ const lockCommentSide = (handle: HTMLElement) => {
+ if (commentSide) return;
+ const side = handle.closest("[data-side]")?.getAttribute("data-side");
+ setCommentSide(side === "top" || side === "left" || side === "right" ? side : "bottom");
+ };
+
const commentPopoverContent = (
- <PopoverContent onCloseAutoFocus={(e) => e.preventDefault()} className="w-80" align="end">
+ <PopoverContent
+ onCloseAutoFocus={(e) => e.preventDefault()}
+ className="w-80"
+ align="end"
+ side={commentSide ?? "bottom"}
+ avoidCollisions={!commentSide}
+ style={{ translate: `${commentDragOffset.x}px ${commentDragOffset.y}px` }}
+ >
<SecretCommentForm
+ dragHandleProps={{
+ onPointerDown: (e) => {
+ if (e.button !== 0) return;
+ e.preventDefault();
+ e.currentTarget.setPointerCapture(e.pointerId);
+ lockCommentSide(e.currentTarget);
+ commentDragStart.current = {
+ pointerX: e.clientX,
+ pointerY: e.clientY,
+ ...commentDragOffset
+ };
+ },
+ onPointerMove: (e) => {
+ const start = commentDragStart.current;
+ if (!start) return;
+ setCommentDragOffset({
+ x: start.x + e.clientX - start.pointerX,
+ y: start.y + e.clientY - start.pointerY
+ });
+ },
+ onPointerUp: () => {
+ commentDragStart.current = undefined;
+ },
+ onLostPointerCapture: () => {
+ commentDragStart.current = undefined;
+ },
+ onKeyDown: (e) => {
+ const step = e.shiftKey ? 64 : 16;
+ const deltas: Record<string, { x: number; y: number } | undefined> = {
+ ArrowLeft: { x: -step, y: 0 },
+ ArrowRight: { x: step, y: 0 },
+ ArrowUp: { x: 0, y: -step },
+ ArrowDown: { x: 0, y: step }
+ };
+ const delta = deltas[e.key];
+ if (!delta) return;
+ e.preventDefault();
+ lockCommentSide(e.currentTarget);
+ setCommentDragOffset((prev) => ({ x: prev.x + delta.x, y: prev.y + delta.y }));
+ }
+ }}
comment={isBatchMode ? ((watchedComment as string) ?? comment) : comment}
secretKey={secretName}
secretPath={secretPath}