eduvia/workavia-drive
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI bugs related to borders in lists (#687)

Browse Source 
Fix #645
This commit is contained in:
ericlinagora
2024-10-11 11:32:03 +02:00
committed by GitHub
parent 9003944bb2 d6934c4d06
commit 4ccd193390
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tdrive/frontend/src/app/views/client/body/drive/browser.tsx
+5 -5
View File
@@ -227,8 +227,8 @@ export default memo(
const commonProps = { const commonProps = {
key: index, key: index,
className: className:
(index === 0 ? 'rounded-t-md ' : '') + (index === 0 ? 'rounded-t-md ' : '-mt-px ') +
(index === documents.length - 1 ? 'rounded-b-md ' : ''), (index === items.length - 1 ? 'rounded-b-md ' : ''),
item: child, item: child,
checked: checked[child.id] || false, checked: checked[child.id] || false,
onCheck: (v: boolean) => setChecked(_.pickBy({ ...checked, [child.id]: v }, _.identity)), onCheck: (v: boolean) => setChecked(_.pickBy({ ...checked, [child.id]: v }, _.identity)),
@@ -238,7 +238,7 @@ export default memo(
return isMobile ? ( return isMobile ? (
<DocumentRow {...commonProps} /> <DocumentRow {...commonProps} />
) : ( ) : (
<Draggable id={index}> <Draggable id={index} key={index}>
<DocumentRow {...commonProps} /> <DocumentRow {...commonProps} />
</Draggable> </Draggable>
); );
@@ -450,7 +450,7 @@ export default memo(
<FolderRow <FolderRow
key={index} key={index}
className={ className={
(index === 0 ? 'rounded-t-md ' : '') + (index === 0 ? 'rounded-t-md ' : '-mt-px ') +
(index === items.length - 1 ? 'rounded-b-md ' : '') (index === items.length - 1 ? 'rounded-b-md ' : '')
} }
item={child} item={child}
@@ -476,7 +476,7 @@ export default memo(
{activeIndex ? ( {activeIndex ? (
<DocumentRowOverlay <DocumentRowOverlay
className={ className={
(activeIndex === 0 ? 'rounded-t-md ' : '') + (activeIndex === 0 ? 'rounded-t-md ' : '-mt-px ') +
(activeIndex === items.length - 1 ? 'rounded-b-md ' : '') (activeIndex === items.length - 1 ? 'rounded-b-md ' : '')
} }
item={activeChild} item={activeChild}
tdrive/frontend/src/app/views/client/body/drive/documents/document-row.tsx
+2 -2
View File
@@ -39,7 +39,7 @@ export const DocumentRow = ({
return ( return (
<div <div
className={ className={
'flex flex-row items-center border border-zinc-200 dark:border-zinc-800 -mt-px px-4 py-3 cursor-pointer ' + 'flex flex-row items-center border border-zinc-200 dark:border-zinc-800 px-4 py-3 cursor-pointer ' +
(checked (checked
? 'bg-blue-500 bg-opacity-10 hover:bg-opacity-25 ' ? 'bg-blue-500 bg-opacity-10 hover:bg-opacity-25 '
: 'hover:bg-zinc-500 hover:bg-opacity-10 ') + : 'hover:bg-zinc-500 hover:bg-opacity-10 ') +
@@ -96,7 +96,7 @@ export const DocumentRowOverlay = ({ item, className }: DriveItemOverlayProps) =
return ( return (
<div <div
className={ className={
'flex flex-row items-center border border-zinc-200 dark:border-zinc-800 -mt-px px-4 py-3 cursor-pointer ' + 'flex flex-row items-center border border-zinc-200 dark:border-zinc-800 px-4 py-3 cursor-pointer ' +
(className || '') (className || '')
} }
> >
tdrive/frontend/src/app/views/client/body/drive/documents/folder-row.tsx
+1 -1
View File
@@ -23,7 +23,7 @@ export const FolderRow = ({
return ( return (
<div <div
className={ className={
'flex flex-row items-center border border-zinc-200 dark:border-zinc-800 -mt-px px-4 py-3 cursor-pointer ' + 'flex flex-row items-center border border-zinc-200 dark:border-zinc-800 px-4 py-3 cursor-pointer ' +
(className || '') + (className || '') +
(checked (checked
? 'bg-blue-500 bg-opacity-10 hover:bg-opacity-25 ' ? 'bg-blue-500 bg-opacity-10 hover:bg-opacity-25 '
tdrive/frontend/src/app/views/client/body/drive/modals/update-access/internal-users-access.tsx
+5 -2
View File
@@ -81,7 +81,10 @@ export const InternalUsersAccessManager = ({
return ( return (
<> <>
<div className="rounded-md border-t mt-2 dark:border-zinc-700"> <div className="rounded-md border-t mt-2 dark:border-zinc-700">
<div className="p-4 flex flex-row items-center justify-center rounded-t-md border-x dark:border-zinc-700"> <div className={
"p-4 flex flex-row items-center justify-center rounded-t-md border-x dark:border-zinc-700"
+ (showResults ? ' rounded-b-md' : '')
}>
<div className="grow"> <div className="grow">
<InputDecorationIcon <InputDecorationIcon
prefix={SearchIcon} prefix={SearchIcon}
@@ -157,7 +160,7 @@ export const InternalUsersAccessManager = ({
id={id} id={id}
userId={user?.id} userId={user?.id}
disabled={disabled} disabled={disabled}
className={(showResults ? '!rounded-none !rounded-t-md' : '') + (index === usersWithAccess.length - 1 ? ' rounded-b-md border-y' : ' border-t')} className={(showResults ? '!rounded-none' : '') + (index === usersWithAccess.length - 1 ? ' !rounded-b-md border-y' : ' border-t')}
/> />
)} )}
{(usersWithAccess?.length ?? 0) < minUserHeight && {(usersWithAccess?.length ?? 0) < minUserHeight &&