Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

fix(studio): align storage row icon weight (#48480)

Danny White76257f164bb8
diff --git a/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerRow.tsx b/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerRow.tsx
index 5ec97e3b1bd..a43544d17cf 100644
--- a/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerRow.tsx
+++ b/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerRow.tsx
@@ -1,54 +1,12 @@
-import { FilesBucket as FilesBucketIcon } from 'icons'
-import { AlertCircle, File, Film, FolderOpen, Image, LoaderCircle, Music } from 'lucide-react'
+import { AlertCircle, LoaderCircle } from 'lucide-react'
import type { CSSProperties, MouseEvent } from 'react'
import { Checkbox, cn, Tooltip, TooltipContent, TooltipTrigger } from 'ui'
import { STORAGE_ROW_STATUS, STORAGE_ROW_TYPES, STORAGE_VIEWS } from '../Storage.constants'
import { type StorageItem } from '../Storage.types'
+import { StorageRowIcon } from '../StorageRowIcon'
import { formatBytes } from '@/lib/helpers'
-const RowIcon = ({
- view,
- status,
- fileType,
- isOpened = false,
- mimeType,
-}: {
- view: STORAGE_VIEWS
- status: STORAGE_ROW_STATUS
- fileType: string
- isOpened?: boolean
- mimeType: string | undefined
-}) => {
- if (view === STORAGE_VIEWS.LIST && status === STORAGE_ROW_STATUS.LOADING) {
- return (
- <LoaderCircle size={14} strokeWidth={2} className="animate-spin text-foreground-lighter" />
- )
- }
-
- if (fileType === STORAGE_ROW_TYPES.FOLDER) {
- return isOpened ? (
- <FolderOpen size={16} strokeWidth={2} className="text-foreground-lighter" />
- ) : (
- <FilesBucketIcon size={16} strokeWidth={2} className="text-foreground-lighter" />
- )
- }
-
- if (mimeType?.includes('image')) {
- return <Image size={16} className="text-foreground-lighter" />
- }
-
- if (mimeType?.includes('audio')) {
- return <Music size={16} strokeWidth={2} className="text-foreground-lighter" />
- }
-
- if (mimeType?.includes('video')) {
- return <Film size={16} strokeWidth={2} className="text-foreground-lighter" />
- }
-
- return <File size={16} strokeWidth={2} className="text-foreground-lighter" />
-}
-
interface BucketFilePickerRowProps {
item: StorageItem
view: STORAGE_VIEWS
@@ -114,7 +72,7 @@ export const BucketFilePickerRow = ({
hidden: isSelected,
})}
>
- <RowIcon
+ <StorageRowIcon
view={view}
status={item.status}
fileType={item.type}
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerRow.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerRow.tsx
index f63c45e77ea..85e53daec36 100644
--- a/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerRow.tsx
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerRow.tsx
@@ -1,19 +1,13 @@
import { PermissionAction } from '@supabase/shared-types/out/constants'
-import { FilesBucket as FilesBucketIcon } from 'icons'
import { find, isEmpty, isEqual } from 'lodash'
import {
AlertCircle,
Copy,
Download,
Edit,
- File,
- Film,
- FolderOpen,
- Image,
LoaderCircle,
MoreVertical,
Move,
- Music,
Trash2,
} from 'lucide-react'
import type { CSSProperties } from 'react'
@@ -41,6 +35,7 @@ import {
URL_EXPIRY_DURATION,
} from '../Storage.constants'
import { StorageItemWithColumn, type StorageItem } from '../Storage.types'
+import { StorageRowIcon } from '../StorageRowIcon'
import { useFileExplorerContextMenu } from './FileExplorerRowContextMenu'
import { FileExplorerRowEditing } from './FileExplorerRowEditing'
import { copyPathToFolder } from './StorageExplorer.utils'
@@ -49,46 +44,6 @@ import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
import { formatBytes } from '@/lib/helpers'
import { useStorageExplorerStateSnapshot } from '@/state/storage-explorer'
-export const RowIcon = ({
- view,
- status,
- fileType,
- isOpened = false,
- mimeType,
-}: {
- view: STORAGE_VIEWS
- status: STORAGE_ROW_STATUS
- fileType: string
- isOpened?: boolean
- mimeType: string | undefined
-}) => {
- if (view === STORAGE_VIEWS.LIST && status === STORAGE_ROW_STATUS.LOADING) {
- return <LoaderCircle size={14} className="animate-spin text-foreground-lighter" />
- }
-
- if (fileType === STORAGE_ROW_TYPES.FOLDER) {
- return isOpened ? (
- <FolderOpen size={16} className="text-foreground-lighter" />
- ) : (
- <FilesBucketIcon size={16} className="text-foreground-lighter" />
- )
- }
-
- if (mimeType?.includes('image')) {
- return <Image size={16} className="text-foreground-lighter" />
- }
-
- if (mimeType?.includes('audio')) {
- return <Music size={16} className="text-foreground-lighter" />
- }
-
- if (mimeType?.includes('video')) {
- return <Film size={16} className="text-foreground-lighter" />
- }
-
- return <File size={16} className="text-foreground-lighter" />
-}
-
interface FileExplorerRowProps {
index: number
item: StorageItem
@@ -329,7 +284,7 @@ export const FileExplorerRow = ({
)}
style={{ top: '2px' }}
>
- <RowIcon
+ <StorageRowIcon
view={view}
status={item.status}
fileType={item.type}
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerRowEditing.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerRowEditing.tsx
index 98b32930d0c..f22110114e9 100644
--- a/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerRowEditing.tsx
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerRowEditing.tsx
@@ -3,7 +3,7 @@ import { useEffect, useRef, useState, type CSSProperties } from 'react'
import { STORAGE_ROW_STATUS, STORAGE_ROW_TYPES, STORAGE_VIEWS } from '../Storage.constants'
import { StorageItem } from '../Storage.types'
-import { RowIcon } from './FileExplorerRow'
+import { StorageRowIcon } from '../StorageRowIcon'
import { useStorageExplorerStateSnapshot } from '@/state/storage-explorer'
export interface FileExplorerRowEditingProps {
@@ -94,7 +94,7 @@ export const FileExplorerRowEditing = ({
>
<div className="flex h-full grow items-center px-2.5">
<div>
- <RowIcon
+ <StorageRowIcon
view={view}
status={item.status}
fileType={item.type}
diff --git a/apps/studio/components/interfaces/Storage/StorageRowIcon.test.tsx b/apps/studio/components/interfaces/Storage/StorageRowIcon.test.tsx
new file mode 100644
index 00000000000..5c528f7da53
--- /dev/null
+++ b/apps/studio/components/interfaces/Storage/StorageRowIcon.test.tsx
@@ -0,0 +1,68 @@
+import { describe, expect, test } from 'vitest'
+
+import { STORAGE_ROW_STATUS, STORAGE_ROW_TYPES, STORAGE_VIEWS } from './Storage.constants'
+import { StorageRowIcon } from './StorageRowIcon'
+import { customRender } from '@/tests/lib/custom-render'
+
+const CASES: {
+ name: string
+ view?: STORAGE_VIEWS
+ status?: STORAGE_ROW_STATUS
+ fileType?: STORAGE_ROW_TYPES
+ isOpened?: boolean
+ mimeType?: string
+ expectedIcon: string
+}[] = [
+ {
+ name: 'loading list row',
+ view: STORAGE_VIEWS.LIST,
+ status: STORAGE_ROW_STATUS.LOADING,
+ expectedIcon: 'lucide-loader-circle',
+ },
+ {
+ name: 'loading column row',
+ view: STORAGE_VIEWS.COLUMNS,
+ status: STORAGE_ROW_STATUS.LOADING,
+ expectedIcon: 'lucide-file',
+ },
+ {
+ name: 'ready list row',
+ view: STORAGE_VIEWS.LIST,
+ status: STORAGE_ROW_STATUS.READY,
+ expectedIcon: 'lucide-file',
+ },
+ {
+ name: 'closed folder',
+ fileType: STORAGE_ROW_TYPES.FOLDER,
+ expectedIcon: 'lucide-files-bucket',
+ },
+ {
+ name: 'open folder',
+ fileType: STORAGE_ROW_TYPES.FOLDER,
+ isOpened: true,
+ expectedIcon: 'lucide-folder-open',
+ },
+ { name: 'image', mimeType: 'image/png', expectedIcon: 'lucide-image' },
+ { name: 'audio', mimeType: 'audio/mpeg', expectedIcon: 'lucide-music' },
+ { name: 'video', mimeType: 'video/mp4', expectedIcon: 'lucide-film' },
+ { name: 'generic file', expectedIcon: 'lucide-file' },
+]
+
+describe('StorageRowIcon', () => {
+ test.each(CASES)('renders $name at the canonical stroke width', (props) => {
+ const { container } = customRender(
+ <StorageRowIcon
+ view={props.view ?? STORAGE_VIEWS.COLUMNS}
+ status={props.status ?? STORAGE_ROW_STATUS.READY}
+ fileType={props.fileType ?? STORAGE_ROW_TYPES.FILE}
+ isOpened={props.isOpened}
+ mimeType={props.mimeType}
+ />
+ )
+
+ const icon = container.querySelector('svg')
+
+ expect(icon).toHaveClass(props.expectedIcon)
+ expect(icon).toHaveAttribute('stroke-width', '1.5')
+ })
+})
diff --git a/apps/studio/components/interfaces/Storage/StorageRowIcon.tsx b/apps/studio/components/interfaces/Storage/StorageRowIcon.tsx
new file mode 100644
index 00000000000..814a3b259c2
--- /dev/null
+++ b/apps/studio/components/interfaces/Storage/StorageRowIcon.tsx
@@ -0,0 +1,60 @@
+import { FilesBucket as FilesBucketIcon } from 'icons'
+import { File, Film, FolderOpen, Image as ImageIcon, LoaderCircle, Music } from 'lucide-react'
+
+import { STORAGE_ROW_STATUS, STORAGE_ROW_TYPES, STORAGE_VIEWS } from './Storage.constants'
+
+const ICON_STROKE_WIDTH = 1.5
+
+interface StorageRowIconProps {
+ view: STORAGE_VIEWS
+ status: STORAGE_ROW_STATUS
+ fileType: string
+ isOpened?: boolean
+ mimeType: string | undefined
+}
+
+export const StorageRowIcon = ({
+ view,
+ status,
+ fileType,
+ isOpened = false,
+ mimeType,
+}: StorageRowIconProps) => {
+ if (view === STORAGE_VIEWS.LIST && status === STORAGE_ROW_STATUS.LOADING) {
+ return (
+ <LoaderCircle
+ size={14}
+ strokeWidth={ICON_STROKE_WIDTH}
+ className="animate-spin text-foreground-lighter"
+ />
+ )
+ }
+
+ if (fileType === STORAGE_ROW_TYPES.FOLDER) {
+ return isOpened ? (
+ <FolderOpen size={16} strokeWidth={ICON_STROKE_WIDTH} className="text-foreground-lighter" />
+ ) : (
+ <FilesBucketIcon
+ size={16}
+ strokeWidth={ICON_STROKE_WIDTH}
+ className="text-foreground-lighter"
+ />
+ )
+ }
+
+ if (mimeType?.includes('image')) {
+ return (
+ <ImageIcon size={16} strokeWidth={ICON_STROKE_WIDTH} className="text-foreground-lighter" />
+ )
+ }
+
+ if (mimeType?.includes('audio')) {
+ return <Music size={16} strokeWidth={ICON_STROKE_WIDTH} className="text-foreground-lighter" />
+ }
+
+ if (mimeType?.includes('video')) {
+ return <Film size={16} strokeWidth={ICON_STROKE_WIDTH} className="text-foreground-lighter" />
+ }
+
+ return <File size={16} strokeWidth={ICON_STROKE_WIDTH} className="text-foreground-lighter" />
+}