Robotail/Corp
Robotail/Corp
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
lizerk 2026-04-03 22:53:19 +03:00
commit 37eb07bb83
3 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/CalendarParticipantsModal.tsx
View File

@ -183,7 +183,7 @@ export default function CalendarParticipantsModal({
if (!isOpen) return null;
return (
<Modal isOpen={isOpen} onClose={onClose} size="md" noPadding>
<Modal isOpen={isOpen} onClose={onClose} size="md" noPadding noHeader>
<div className="overflow-y-auto">
<div className="flex items-center justify-between border-b px-4 sm:px-6 py-3 sm:py-4">
<div>

2
frontend/src/components/CalendarSubscriptionsModal.tsx
View File

@ -139,7 +139,7 @@ export function CalendarSubscriptionsModal({ isOpen, onClose, onUpdate }: Props)
if (!isOpen) return null;
return (
<Modal isOpen={isOpen} onClose={onClose} size="md" noPadding>
<Modal isOpen={isOpen} onClose={onClose} size="md" noPadding noHeader>
<div className="overflow-y-auto">
{/* Header */}
<div className="flex items-center justify-between border-b border-gray-100 px-4 sm:px-6 py-3 sm:py-4">

82
frontend/src/components/ui/Modal.tsx
View File

@ -15,7 +15,7 @@ export interface ModalProps {
closeOnEsc?: boolean;
footer?: ReactNode;
className?: string;
/** Render children directly without padding wrappers (for custom layouts like flex-col) */
/** Remove default content padding while keeping the standard modal frame */
noPadding?: boolean;
/** Hide the built-in header (caller manages its own header inside children) */
noHeader?: boolean;
@ -137,50 +137,48 @@ export function Modal({
isAnimating ? "scale-100 opacity-100" : "scale-95 opacity-0"
} ${className}`}
>
{noPadding ? (
children
) : (
<>
{/* Header */}
{showHeader && (
<div className="flex shrink-0 items-center gap-2 sm:gap-3 mb-3 sm:mb-4 px-4 sm:px-6 pt-4 sm:pt-6">
{title && (
<h3
id="modal-title"
className="min-w-0 flex-1 text-sm sm:text-base lg:text-lg font-semibold text-gray-900 truncate"
title={title}
>
{title}
</h3>
)}
<div className="flex shrink-0 items-center gap-2">
{showCloseButton && (
<button
onClick={onClose}
className="rounded-full p-1 text-gray-400 transition hover:bg-gray-100 hover:text-gray-600"
title="Закрыть"
>
<X size={20} />
</button>
)}
</div>
</div>
{/* Header */}
{showHeader && (
<div className="mb-3 flex shrink-0 items-center gap-2 px-4 pt-4 sm:mb-4 sm:gap-3 sm:px-6 sm:pt-6">
{title && (
<h3
id="modal-title"
className="min-w-0 flex-1 truncate text-sm font-semibold text-gray-900 sm:text-base lg:text-lg"
title={title}
>
{title}
</h3>
)}
{/* Content */}
<div className="min-h-0 flex-1 overflow-y-auto overscroll-contain px-4 sm:px-6">
{children}
<div className="flex shrink-0 items-center gap-2">
{showCloseButton && (
<button
onClick={onClose}
className="rounded-full p-1 text-gray-400 transition hover:bg-gray-100 hover:text-gray-600"
title="Закрыть"
>
<X size={20} />
</button>
)}
</div>
{/* Footer */}
{footer && (
<div className="shrink-0 border-t border-gray-200 px-4 sm:px-6 py-3 sm:py-4">{footer}</div>
)}
{/* Bottom padding */}
<div className="pb-4 sm:pb-6" />
</>
</div>
)}
{/* Content */}
<div
className={noPadding
? "min-h-0 flex flex-1 flex-col"
: "min-h-0 flex-1 overflow-y-auto overscroll-contain px-4 sm:px-6"}
>
{children}
</div>
{/* Footer */}
{footer && (
<div className="shrink-0 border-t border-gray-200 px-4 py-3 sm:px-6 sm:py-4">{footer}</div>
)}
{/* Bottom padding */}
{!noPadding && <div className="pb-4 sm:pb-6" />}
</div>
</div>
);