mirror of
https://github.com/supabase/supabase.git
synced 2026-10-09 11:25:06 +03:00
## Context Related to Explorer/Notebooks - this PR adds the functionality to add / remove cells Separately - am thinking we can shift a lot of the "cell update" logic into notebook-state, mainly so that each UI component doesn't need to be aware of the notebook's `cells` but just its own cell. I'll do it separately though to prevent bloating this PR, already left comments where i think can be refactored <img width="250" alt="image" src="https://github.com/user-attachments/assets/91aae5f9-07b9-4327-8e21-8e9d71098aa6" /> <img width="250" alt="image" src="https://github.com/user-attachments/assets/677de208-5c52-4155-90c6-bc0879070693" /> <img width="250" alt="image" src="https://github.com/user-attachments/assets/17c3dae7-87bc-40bb-bfa0-15df101006ce" /> <img width="1091" height="262" alt="image" src="https://github.com/user-attachments/assets/a09c3d23-696a-4b55-a1f8-4602e56a60dc" /> <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit ## New Features - Add query and Markdown cells directly within notebooks. - Move, remove, and reorder cells using drag-and-drop or cell controls. - Add cells from empty states and notebook toolbar actions. - Edit Markdown cells, mark edits as complete, and see placeholders for empty content. ## Improvements - Cell controls and hover interactions are more consistent and responsive. - Moving cells is disabled at the top or bottom of a notebook. - Sample cells now use standardized content and formatting. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
152 lines
5.5 KiB
TypeScript
152 lines
5.5 KiB
TypeScript
import { Edit } from 'lucide-react'
|
|
import { useState } from 'react'
|
|
import { Button, cn } from 'ui'
|
|
|
|
import { Markdown } from '../Markdown'
|
|
import { AddCellDropdown } from './AddCellDropdown'
|
|
import { MoveCellDropdownContent } from './MoveCellDropdownContent'
|
|
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
|
|
import { CodeEditor } from '@/components/ui/CodeEditor/CodeEditor'
|
|
import { SortableSection } from '@/components/ui/SortableSection'
|
|
import { type MarkdownCell as MarkdownCellSchema } from '@/data/content/notebooks/notebook-schema'
|
|
import { useLatest } from '@/hooks/misc/useLatest'
|
|
import { useCurrentNotebook, useNotebooksStateSnapshot } from '@/state/notebooks/notebooks-state'
|
|
|
|
interface MarkdownCellProps {
|
|
cell: MarkdownCellSchema
|
|
}
|
|
|
|
// [Joshen] handleUpdateMarkdown could be shifted into notebook-state as a updateCell action
|
|
|
|
export const MarkdownCell = ({ cell }: MarkdownCellProps) => {
|
|
const snap = useNotebooksStateSnapshot()
|
|
const currentNotebook = useCurrentNotebook()
|
|
const cells = currentNotebook?.notebook.content?.cells ?? []
|
|
|
|
const [value, setValue] = useState(cell.text)
|
|
const [isEditing, setIsEditing] = useState(false)
|
|
|
|
const valueRef = useLatest(value)
|
|
|
|
const handleStartEditing = () => {
|
|
setValue(cell.text)
|
|
setIsEditing(true)
|
|
}
|
|
|
|
const handleCancel = () => {
|
|
setIsEditing(false)
|
|
}
|
|
|
|
const handleUpdateMarkdown = (cellId: string, text: string) => {
|
|
const notebookId = currentNotebook?.notebook.id
|
|
if (!notebookId) return
|
|
|
|
const nextCells = cells.map((c) => (c.id === cellId ? { ...c, text } : c))
|
|
snap.updateCells({ id: notebookId, cells: nextCells })
|
|
setIsEditing(false)
|
|
}
|
|
|
|
const handleUpdateMarkdownRef = useLatest(handleUpdateMarkdown)
|
|
|
|
return (
|
|
<SortableSection
|
|
id={cell.id}
|
|
actions={<AddCellDropdown cellId={cell.id} />}
|
|
gripDropdownContent={<MoveCellDropdownContent cellId={cell.id} />}
|
|
gripClassName="mt-1.5 opacity-0 group-hover:opacity-100 has-[[data-state=open]]:opacity-100 transition"
|
|
>
|
|
{isEditing ? (
|
|
<div
|
|
className={cn('w-full max-w-3xl mx-auto transition', 'overflow-hidden border rounded-md')}
|
|
>
|
|
<CodeEditor
|
|
hideLineNumbers
|
|
language="markdown"
|
|
value={value}
|
|
onInputChange={(e) => setValue(e ?? '')}
|
|
className="h-[150px]"
|
|
options={{ quickSuggestions: false, wordBasedSuggestions: 'off' }}
|
|
onMount={(editor, monaco) => {
|
|
editor.addCommand(
|
|
monaco.KeyCode.Escape,
|
|
handleCancel,
|
|
[
|
|
'editorTextFocus',
|
|
'!editorHasSelection',
|
|
'!editorHasMultipleSelections',
|
|
'!suggestWidgetVisible',
|
|
'!findWidgetVisible',
|
|
'!parameterHintsVisible',
|
|
'!renameInputVisible',
|
|
'!inSnippetMode',
|
|
'!accessibilityHelpWidgetVisible',
|
|
'!inlineSuggestionVisible',
|
|
].join(' && ')
|
|
)
|
|
editor.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.Enter, () =>
|
|
handleUpdateMarkdownRef.current(cell.id, valueRef.current)
|
|
)
|
|
editor.onDidBlurEditorWidget(() =>
|
|
handleUpdateMarkdownRef.current(cell.id, valueRef.current)
|
|
)
|
|
}}
|
|
/>
|
|
<div className="border-t flex items-center justify-between pl-3 pr-1 py-1">
|
|
<p className="text-xs text-foreground-lighter">Markdown</p>
|
|
<div className="flex items-center gap-x-1">
|
|
<Button variant="text" onMouseDown={(e) => e.preventDefault()} onClick={handleCancel}>
|
|
Cancel
|
|
</Button>
|
|
<Button
|
|
variant="text"
|
|
onMouseDown={(e) => e.preventDefault()}
|
|
onClick={() => handleUpdateMarkdown(cell.id, value)}
|
|
>
|
|
Done
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
) : (
|
|
<div
|
|
onDoubleClick={handleStartEditing}
|
|
className={cn(
|
|
'group/mdcell relative w-full max-w-3xl mx-auto px-3 py-2 transition',
|
|
'hover:bg-alternative/50',
|
|
'border border-transparent rounded-md hover:border-default'
|
|
)}
|
|
>
|
|
<ButtonTooltip
|
|
variant="text"
|
|
className={cn(
|
|
'absolute right-1 top-1 px-1',
|
|
'opacity-0 group-hover/mdcell:opacity-100 focus-visible:opacity-100'
|
|
)}
|
|
icon={<Edit size={14} />}
|
|
onClick={handleStartEditing}
|
|
tooltip={{ content: { side: 'bottom', text: 'Edit' } }}
|
|
/>
|
|
{cell.text ? (
|
|
<Markdown
|
|
className={cn(
|
|
'prose prose-sm max-w-none text-muted-foreground prose-headings:text-foreground',
|
|
'[&>h1]:mb-2 [&>h2]:mb-2',
|
|
'[&_ol>li]:pl-3',
|
|
'[--tw-prose-body:var(--foreground-muted)]',
|
|
'[--tw-prose-headings:var(--foreground-default)]',
|
|
'[--tw-prose-links:var(--foreground-muted)]',
|
|
'[--tw-prose-bold:var(--foreground-muted)]',
|
|
'[--tw-prose-quotes:var(--foreground-muted)]'
|
|
)}
|
|
>
|
|
{cell.text}
|
|
</Markdown>
|
|
) : (
|
|
<p className="text-foreground-lighter text-sm italic">This cell has no content</p>
|
|
)}
|
|
</div>
|
|
)}
|
|
</SortableSection>
|
|
)
|
|
}
|