Skip to content

Commit 0a35186

Browse files
chore: improve copy modal styles (#551)
1 parent 9dbe397 commit 0a35186

File tree

6 files changed

+22
-6
lines changed

6 files changed

+22
-6
lines changed

src/components/FileManager/FileManager.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@ export interface DialFileManagerProps {
262262
defaultPath?: string;
263263
className?: string;
264264
managerLabel?: ReactNode;
265+
gridClassName?: string;
265266

266267
allowedFileTypes?: DialFileAcceptType[];
267268
items?: DialFile[];
@@ -416,6 +417,7 @@ export interface DialFileManagerProps {
416417
* @param [path] - Absolute path of the current location (e.g. "/All files/Design/Icons")
417418
* @param [defaultPath] - Initial path used in uncontrolled mode (applied only on first render)
418419
* @param [className] - Additional classes for the root container
420+
* @param [gridClassName] - Additional classes for the grid container
419421
* @param [items] - Full hierarchical list of files and folders used by both tree and grid
420422
* @param [rootItem] - Optional root folder item to represent the top-level container in the tree
421423
* @param [filesLoading=false] - When true, shows skeleton loading state in the grid
@@ -607,6 +609,7 @@ export const DialFileManagerView: FC = () => {
607609
onPreview,
608610
previewExtensions,
609611
isRenameFileAvailable,
612+
gridClassName,
610613
} = useFileManagerContext();
611614
const {
612615
width = sidebarWidth,
@@ -998,8 +1001,8 @@ export const DialFileManagerView: FC = () => {
9981001
</div>
9991002
);
10001003
}
1001-
// If no toolbar options are provided, render empty div to maintain layout consistency
1002-
return <div></div>;
1004+
1005+
return null;
10031006
}, [
10041007
bulkActionsToolbarOptions,
10051008
selectedPaths,
@@ -1208,7 +1211,7 @@ export const DialFileManagerView: FC = () => {
12081211
)}
12091212
>
12101213
{renderToolbar()}
1211-
<div className={mainGridClassName}>
1214+
<div className={mergeClasses(mainGridClassName, gridClassName)}>
12121215
{renderFoldersTree()}
12131216
<div
12141217
className={mergeClasses(contentGridClassName, {

src/components/FileManager/FileManagerContext.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ export interface FileManagerGridRow {
4747
export interface FileManagerContextValue {
4848
managerLabel?: ReactNode;
4949
className?: string;
50+
gridClassName?: string;
5051
items: DialFile[];
5152
rootItem?: DialRootFolder;
5253
allowedFileTypes?: DialFileAcceptType[];

src/components/FileManager/FileManagerProvider.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ export const FileManagerProvider: FC<FileManagerProviderProps> = ({
126126
isRenameFileAvailable,
127127
customUploadFileAction,
128128
customBreakpointRef,
129+
gridClassName,
129130
}) => {
130131
const {
131132
selectedPaths: effectiveSelectedPaths,
@@ -692,6 +693,7 @@ export const FileManagerProvider: FC<FileManagerProviderProps> = ({
692693
emptyStateIcon,
693694
emptyStateTitle,
694695
emptyStateDescription,
696+
gridClassName,
695697

696698
sharedWithMeIds,
697699

src/components/FileManager/components/DestinationFolderPopup/DestinationFolderPopup.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,8 @@ export const DialDestinationFolderPopup: FC<DestinationFolderPopupProps> = ({
173173
onClose();
174174
}}
175175
size={PopupSize.Lg}
176+
dividerFooter
177+
dividers={false}
176178
className="md:!h-[800px] !bg-layer-2"
177179
footer={
178180
<div className="flex justify-between items-center gap-2 py-4 px-4 md:px-6">
@@ -247,7 +249,11 @@ export const DialDestinationFolderPopup: FC<DestinationFolderPopupProps> = ({
247249
<div className="flex-1 min-h-0">
248250
<DialFileManager
249251
{...restProps}
250-
className={mergeClasses(restProps.className, 'bg-layer-2 h-full')}
252+
gridClassName="size-full"
253+
className={mergeClasses(
254+
restProps.className,
255+
'bg-layer-2 h-full flex pt-0',
256+
)}
251257
actionsRef={fileManagerActionRef}
252258
path={path}
253259
showHiddenFiles={showHiddenFiles}

src/components/Popup/Popup.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,15 @@ export interface DialPopupProps {
2929
overlayClassName?: string;
3030
titleClassName?: string;
3131
headerClassName?: string;
32+
// TODO: review after implementing common design system
3233
dividers?: boolean;
34+
dividerFooter?: boolean;
3335
children?: ReactNode;
3436
footer?: ReactNode;
3537
onClose?: (e?: MouseEvent<HTMLButtonElement> | null) => void;
3638
size?: PopupSize;
3739
hideClose?: boolean;
3840
closeOnOutsideClick?: boolean;
39-
/** When true, focus is set to a non-input guard so the virtual keyboard does not open on mobile */
4041
preventKeyboardOnOpen?: boolean;
4142
}
4243

@@ -72,6 +73,7 @@ export interface DialPopupProps {
7273
* @param [titleClassName] - Additional CSS classes applied to the title element
7374
* @param [headerClassName] - Additional CSS classes applied to the popup header container
7475
* @param [dividers=true] - Whether to render separators between sections
76+
* @param [dividerFooter=true] - Whether to render a divider above the footer when `dividers` is true
7577
* @param [children] - Body content
7678
* @param [footer] - Footer area for actions
7779
* @param [onClose] - Callback fired when the popup requests to close
@@ -89,6 +91,7 @@ export const DialPopup: FC<DialPopupProps> = ({
8991
titleClassName,
9092
headerClassName,
9193
dividers = true,
94+
dividerFooter = true,
9295
children,
9396
footer,
9497
onClose,
@@ -180,6 +183,7 @@ export const DialPopup: FC<DialPopupProps> = ({
180183
{/* Body area */}
181184
{children}
182185
</div>
186+
{dividerFooter && <div className={popupDividerClassName} />}
183187
{footer}
184188
</div>
185189
</FloatingFocusManager>

src/components/Tooltip/TooltipContent.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export const DialTooltipContent: FC<Props> = ({ style, ...props }) => {
4646
context={context.context}
4747
fill="currentColor"
4848
strokeWidth={1}
49-
className="border-primary w-2 text-[var(--bg-layer-0,_#000000)]"
49+
className="stroke-primary text-[var(--bg-layer-0,_#000000)]"
5050
/>
5151
</div>
5252
</FloatingPortal>

0 commit comments

Comments
 (0)