Skip to content

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

Joshen/fe 3652 replace direct renders of editor component from monaco to (#47268)

Joshen Lim3db42a805f4c
diff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyEditor/PolicyDefinition.tsx b/apps/studio/components/interfaces/Auth/Policies/PolicyEditor/PolicyDefinition.tsx
index c83b2fe9aa2..b5e40edcdd1 100644
--- a/apps/studio/components/interfaces/Auth/Policies/PolicyEditor/PolicyDefinition.tsx
+++ b/apps/studio/components/interfaces/Auth/Policies/PolicyEditor/PolicyDefinition.tsx
@@ -4,7 +4,7 @@ import { HelpCircle } from 'lucide-react'
import { useEffect } from 'react'
import { Tooltip, TooltipContent, TooltipTrigger } from 'ui'
-import SqlEditor from '@/components/ui/SqlEditor'
+import { CodeEditor } from '@/components/ui/CodeEditor/CodeEditor'
interface PolicyDefinitionProps {
operation: string
@@ -68,7 +68,11 @@ const PolicyDefinition = ({
</p>
</div>
<div className={`w-2/3 ${showCheck(operation) ? 'h-32' : 'h-56'}`}>
- <SqlEditor defaultValue={definition} onInputChange={onUpdatePolicyUsing} />
+ <CodeEditor
+ language="pgsql"
+ defaultValue={definition}
+ onInputChange={onUpdatePolicyUsing}
+ />
</div>
</div>
)}
@@ -108,7 +112,7 @@ const PolicyDefinition = ({
</p>
</div>
<div className={`w-2/3 ${showUsing(operation) ? 'h-32' : 'h-56'}`}>
- <SqlEditor defaultValue={check} onInputChange={onUpdatePolicyCheck} />
+ <CodeEditor language="pgsql" defaultValue={check} onInputChange={onUpdatePolicyCheck} />
</div>
</div>
)}
diff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/RLSCodeEditor.tsx b/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/RLSCodeEditor.tsx
index 776238de5a8..78752078ca5 100644
--- a/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/RLSCodeEditor.tsx
+++ b/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/RLSCodeEditor.tsx
@@ -1,11 +1,9 @@
-import Editor, { Monaco, OnChange, OnMount, useMonaco } from '@monaco-editor/react'
+import { Monaco } from '@monaco-editor/react'
import { noop } from 'lodash'
import type { editor } from 'monaco-editor'
-import { MutableRefObject, useEffect, useRef } from 'react'
-import { cn } from 'ui'
+import { RefObject, useEffect } from 'react'
-import { Markdown } from '@/components/interfaces/Markdown'
-import { formatSql } from '@/lib/formatSql'
+import { CodeEditor } from '@/components/ui/CodeEditor/CodeEditor'
// [Joshen] Is there a way we can just have one single MonacoEditor component that's shared across the dashboard?
// Feels like we're creating multiple copies of Editor. I'm keen to make this one the defacto as well so lets make sure
@@ -21,13 +19,12 @@ interface RLSCodeEditorProps {
placeholder?: string
readOnly?: boolean
- disableTabToUsePlaceholder?: boolean
lineNumberStart?: number
onChange?: () => void
onMount?: () => void
- editorRef: MutableRefObject<editor.IStandaloneCodeEditor | null>
- monacoRef?: MutableRefObject<Monaco>
+ editorRef: RefObject<editor.IStandaloneCodeEditor | null>
+ monacoRef?: RefObject<Monaco>
}
export const RLSCodeEditor = ({
@@ -39,8 +36,6 @@ export const RLSCodeEditor = ({
value,
placeholder,
readOnly = false,
-
- disableTabToUsePlaceholder = false,
lineNumberStart,
onChange = noop,
onMount: _onMount = noop,
@@ -48,140 +43,34 @@ export const RLSCodeEditor = ({
editorRef,
monacoRef,
}: RLSCodeEditorProps) => {
- const hasValue = useRef<editor.IContextKey<boolean>>(null)
- const monaco = useMonaco()
-
- const placeholderId = `monaco-placeholder-${id}`
- const options: editor.IStandaloneEditorConstructionOptions = {
- tabSize: 2,
- fontSize: 13,
- readOnly,
- minimap: { enabled: false },
- wordWrap: 'on' as const,
- contextmenu: true,
- lineNumbers:
- lineNumberStart !== undefined ? (num) => (num + lineNumberStart).toString() : undefined,
- glyphMargin: undefined,
- lineNumbersMinChars: 4,
- folding: undefined,
- scrollBeyondLastLine: false,
- }
-
- const onMount: OnMount = async (editor, monaco) => {
- editorRef.current = editor
- if (monacoRef !== undefined) monacoRef.current = monaco
-
- hasValue.current = editor.createContextKey('hasValue', false)
- const placeholderEl = document.getElementById(placeholderId) as HTMLElement | null
- if (placeholderEl && placeholder !== undefined && (value ?? '').trim().length === 0) {
- placeholderEl.style.display = 'block'
- }
-
- if (!disableTabToUsePlaceholder) {
- editor.addCommand(
- monaco.KeyCode.Tab,
- () => {
- editor.executeEdits('source', [
- {
- // @ts-ignore
- identifier: 'add-placeholder',
- range: new monaco.Range(1, 1, 1, 1),
- text: (placeholder ?? '')
- .split('\n\n')
- .join('\n')
- .replaceAll('*', '')
- .replaceAll('&nbsp;', ''),
- },
- ])
- },
- '!hasValue'
- )
- }
-
- editor.focus()
-
- _onMount()
- }
-
- const onChangeContent: OnChange = (value) => {
- if (hasValue.current) {
- hasValue.current.set((value ?? '').length > 0)
- }
-
- const placeholderEl = document.getElementById(placeholderId) as HTMLElement | null
- if (placeholderEl) {
- if (!value) {
- placeholderEl.style.display = 'block'
- } else {
- placeholderEl.style.display = 'none'
- }
- }
-
+ const onChangeContent = (value?: string) => {
onChange()
onInputChange?.(value)
}
// when the value has changed, trigger the onChange callback so that the height of the container can be adjusted.
// Happens when the value wordwraps and is updated via a template.
- useEffect(() => {
- onChange()
- }, [value])
-
- useEffect(() => {
- if (monaco) {
- // Enable pgsql format
- const formatprovider = monaco.languages.registerDocumentFormattingEditProvider('pgsql', {
- async provideDocumentFormattingEdits(model: any) {
- const value = model.getValue()
- const formatted = formatSql(value)
- return [
- {
- range: model.getFullModelRange(),
- text: formatted.trim(),
- },
- ]
- },
- })
-
- return () => {
- formatprovider.dispose()
- }
- }
- }, [monaco])
-
- useEffect(() => {
- if (value !== undefined && value.trim().length > 0) {
- const placeholderEl = document.getElementById(placeholderId) as HTMLElement | null
- if (placeholderEl) placeholderEl.style.display = 'none'
- }
- }, [value])
+ useEffect(() => onChange(), [value])
return (
- <>
- <Editor
- path={id}
- theme="supabase"
- wrapperProps={{ className: cn(wrapperClassName) }}
- className={cn(className, 'monaco-editor')}
- value={value ?? undefined}
- defaultLanguage="pgsql"
- defaultValue={defaultValue ?? undefined}
- options={options}
- onMount={onMount}
- onChange={onChangeContent}
- />
- {placeholder !== undefined && (
- <div
- id={placeholderId}
- className={cn(
- 'monaco-placeholder absolute top-0 left-[57px] text-sm pointer-events-none font-mono tracking-tighter',
- '[&>div>p]:text-foreground-lighter [&>div>p]:m-0!'
- )}
- style={{ display: 'none' }}
- >
- <Markdown content={placeholder} />
- </div>
- )}
- </>
+ <CodeEditor
+ id={id}
+ monacoRef={monacoRef}
+ editorRef={editorRef}
+ isReadOnly={readOnly}
+ language="pgsql"
+ className={className}
+ wrapperClassName={wrapperClassName}
+ placeholder={placeholder}
+ value={value ?? undefined}
+ defaultValue={defaultValue ?? undefined}
+ options={{
+ lineNumbers:
+ lineNumberStart !== undefined ? (num) => (num + lineNumberStart).toString() : undefined,
+ }}
+ actions={{ placeholderFill: { enabled: false } }}
+ onMount={_onMount}
+ onInputChange={onChangeContent}
+ />
)
}
diff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/index.tsx b/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/index.tsx
index 6c13c6756ef..40e528b5c0d 100644
--- a/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/index.tsx
+++ b/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/index.tsx
@@ -375,7 +375,6 @@ export const PolicyEditorPanel = memo(function ({
}}
>
<RLSCodeEditor
- disableTabToUsePlaceholder
readOnly={!canUpdatePolicies}
id="rls-exp-one-editor"
placeholder={
@@ -439,7 +438,6 @@ export const PolicyEditorPanel = memo(function ({
}}
>
<RLSCodeEditor
- disableTabToUsePlaceholder
readOnly={!canUpdatePolicies}
id="rls-exp-two-editor"
placeholder="-- Provide a SQL expression for the with check statement"
diff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyReview.tsx b/apps/studio/components/interfaces/Auth/Policies/PolicyReview.tsx
index c0366f3add0..77f27382bb0 100644
--- a/apps/studio/components/interfaces/Auth/Policies/PolicyReview.tsx
+++ b/apps/studio/components/interfaces/Auth/Policies/PolicyReview.tsx
@@ -3,7 +3,7 @@ import { useState } from 'react'
import { Button, DialogFooter, DialogSection } from 'ui'
import type { PolicyForReview } from './Policies.types'
-import SqlEditor from '@/components/ui/SqlEditor'
+import { CodeEditor } from '@/components/ui/CodeEditor/CodeEditor'
interface PolicyReviewProps {
policy: PolicyForReview
@@ -11,6 +11,8 @@ interface PolicyReviewProps {
onSelectSave: () => void
}
+// [Joshen] This seems like dead code atm, clean up separately
+
export const PolicyReview = ({
policy = {},
onSelectBack = noop,
@@ -44,9 +46,14 @@ export const PolicyReview = ({
</div>
) : (
<div className="space-y-2">
- <span>{policy.description}</span>
+ <p>{policy.description}</p>
<div className="h-40">
- <SqlEditor readOnly defaultValue={formattedSQLStatement} />
+ <CodeEditor
+ hideLineNumbers
+ isReadOnly
+ language="pgsql"
+ defaultValue={formattedSQLStatement}
+ />
</div>
</div>
)}
diff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyTemplates/TemplatePreview.tsx b/apps/studio/components/interfaces/Auth/Policies/PolicyTemplates/TemplatePreview.tsx
index a7fd8f01fbe..62520e18639 100644
--- a/apps/studio/components/interfaces/Auth/Policies/PolicyTemplates/TemplatePreview.tsx
+++ b/apps/studio/components/interfaces/Auth/Policies/PolicyTemplates/TemplatePreview.tsx
@@ -1,7 +1,7 @@
import { isEmpty } from 'lodash'
import { PolicyTemplate } from './PolicyTemplates.constants'
-import SqlEditor from '@/components/ui/SqlEditor'
+import { CodeEditor } from '@/components/ui/CodeEditor/CodeEditor'
interface TemplatePreviewProps {
selectedTemplate: PolicyTemplate
@@ -10,7 +10,7 @@ interface TemplatePreviewProps {
const TemplatePreview = ({ selectedTemplate }: TemplatePreviewProps) => {
const { id, templateName, description, statement } = selectedTemplate
return (
- <div className="space-y-8 md:w-[70%]">
+ <div className="space-y-8 md:w-[100%]">
{!isEmpty(selectedTemplate) && (
<div className="flex h-full flex-col justify-between">
<div className="my-5 h-full space-y-6 px-6">
@@ -23,7 +23,7 @@ const TemplatePreview = ({ selectedTemplate }: TemplatePreviewProps) => {
<div className="space-y-2">
<label className="text-foreground-light text-sm">Policy SQL template:</label>
<div className="h-64">
- <SqlEditor readOnly queryId={id} defaultValue={statement} />
+ <CodeEditor isReadOnly id={id} language="pgsql" defaultValue={statement} />
</div>
</div>
</div>
diff --git a/apps/studio/components/interfaces/Database/Triggers/ChooseFunctionForm.tsx b/apps/studio/components/interfaces/Database/Triggers/ChooseFunctionForm.tsx
index 1731d0b3ae5..b14d67361bc 100644
--- a/apps/studio/components/interfaces/Database/Triggers/ChooseFunctionForm.tsx
+++ b/apps/studio/components/interfaces/Database/Triggers/ChooseFunctionForm.tsx
@@ -6,8 +6,8 @@ import { useRouter } from 'next/router'
import { Accordion, AccordionContent, AccordionItem, AccordionTrigger, Button, SidePanel } from 'ui'
import ProductEmptyState from '@/components/to-be-cleaned/ProductEmptyState'
+import { CodeEditor } from '@/components/ui/CodeEditor/CodeEditor'
import InformationBox from '@/components/ui/InformationBox'
-import SqlEditor from '@/components/ui/SqlEditor'
import {
useDatabaseFunctionsQuery,
type DatabaseFunction,
@@ -163,7 +163,12 @@ const Function = ({ id, completeStatement, name, onClick }: FunctionProps) => {
</div>
<AccordionContent className="[&>div]:pb-0" onClick={(e) => e.stopPropagation()}>
<div className="mt-4 h-64 border border-default">
- <SqlEditor defaultValue={completeStatement} readOnly={true} contextmenu={false} />
+ <CodeEditor
+ isReadOnly
+ language="pgsql"
+ defaultValue={completeStatement}
+ options={{ contextmenu: false }}
+ />
</div>
</AccordionContent>
</AccordionItem>
diff --git a/apps/studio/components/interfaces/QueryPerformance/QueryDetail.tsx b/apps/studio/components/interfaces/QueryPerformance/QueryDetail.tsx
index 621b0845ece..4f267a61bef 100644
--- a/apps/studio/components/interfaces/QueryPerformance/QueryDetail.tsx
+++ b/apps/studio/components/interfaces/QueryPerformance/QueryDetail.tsx
@@ -99,9 +99,7 @@ export const QueryDetail = ({ selectedRow, onClickViewSuggestion, onClose }: Que
>
<SqlMonacoBlock
value={query}
- height={322}
- lineNumbers="off"
- wrapperClassName={cn('pl-3 bg-surface-100', !isExpanded && 'pointer-events-none')}
+ wrapperClassName={cn('bg-surface-100', !isExpanded && 'pointer-events-none')}
/>
{isLinterWarning && (
<Alert
diff --git a/apps/studio/components/interfaces/QueryPerformance/SqlMonacoBlock.tsx b/apps/studio/components/interfaces/QueryPerformance/SqlMonacoBlock.tsx
index c20c5b76342..a2f1fde9b21 100644
--- a/apps/studio/components/interfaces/QueryPerformance/SqlMonacoBlock.tsx
+++ b/apps/studio/components/interfaces/QueryPerformance/SqlMonacoBlock.tsx
@@ -1,27 +1,15 @@
-import Editor from '@monaco-editor/react'
import { Check, Copy } from 'lucide-react'
import { useMemo, useState } from 'react'
import { Button, cn, copyToClipboard } from 'ui'
+import { CodeEditor } from '@/components/ui/CodeEditor/CodeEditor'
+
type SqlMonacoBlockProps = {
value?: string
- className?: string
wrapperClassName?: string
- hideCopy?: boolean
- // Fixed height in px. Defaults to 310 to match previous CodeBlock max height
- height?: number
- // Show line numbers. Defaults to false to match previous CodeBlock
- lineNumbers?: 'on' | 'off'
}
-export const SqlMonacoBlock = ({
- value,
- className,
- wrapperClassName,
- height = 310,
- lineNumbers = 'off',
- hideCopy = false,
-}: SqlMonacoBlockProps) => {
+export const SqlMonacoBlock = ({ value, wrapperClassName }: SqlMonacoBlockProps) => {
const [copied, setCopied] = useState(false)
const content = useMemo(() => value ?? '', [value])
@@ -36,52 +24,24 @@ export const SqlMonacoBlock = ({
<div
className={cn('group relative border rounded-md overflow-hidden w-full', wrapperClassName)}
>
- <Editor
- theme="supabase"
+ <CodeEditor
+ hideLineNumbers
language="pgsql"
value={content}
- height={height}
- className={className}
- wrapperProps={{
- className:
- '[&_.monaco-editor]:bg-transparent! [&_.monaco-editor-background]:bg-transparent! [&_.monaco-editor]:outline-transparent! [&_.cursor]:hidden!',
- }}
- options={{
- readOnly: true,
- domReadOnly: true,
- fontSize: 13,
- minimap: { enabled: false },
- lineNumbers,
- renderLineHighlight: 'none',
- scrollbar: { vertical: 'auto', horizontal: 'auto' },
- overviewRulerLanes: 0,
- overviewRulerBorder: false,
- glyphMargin: false,
- folding: false,
- lineDecorationsWidth: 0,
- lineNumbersMinChars: lineNumbers === 'off' ? 0 : 3,
- wordWrap: 'on',
- scrollBeyondLastLine: false,
- selectionHighlight: false,
- occurrencesHighlight: 'off',
- fixedOverflowWidgets: true,
- padding: { top: 12, bottom: 12 },
- tabIndex: -1,
- }}
+ className="h-[322px] pl-2"
+ options={{ padding: { top: 12, bottom: 12 } }}
/>
- {!hideCopy && (
- <div className="absolute right-2 top-2 opacity-0 group-hover:opacity-100 transition-opacity">
- <Button
- variant="default"
- className="px-1.5"
- icon={copied ? <Check /> : <Copy />}
- onClick={() => handleCopy(content)}
- >
- {copied ? 'Copied' : ''}
- </Button>
- </div>
- )}
+ <div className="absolute right-2 top-2 opacity-0 group-hover:opacity-100 transition-opacity">
+ <Button
+ variant="default"
+ className="px-1.5"
+ icon={copied ? <Check /> : <Copy />}
+ onClick={() => handleCopy(content)}
+ >
+ {copied ? 'Copied' : ''}
+ </Button>
+ </div>
</div>
)
}
diff --git a/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesEditor.tsx b/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesEditor.tsx
index 93e400ed95b..07194051fe3 100644
--- a/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesEditor.tsx
+++ b/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesEditor.tsx
@@ -5,7 +5,7 @@ import { STORAGE_CLIENT_LIBRARY_MAPPINGS } from '../Storage.constants'
import { deriveAllowedClientLibraryMethods } from '../Storage.utils'
import { PolicyName } from '@/components/interfaces/Auth/Policies/PolicyEditor/PolicyName'
import { PolicyRoles } from '@/components/interfaces/Auth/Policies/PolicyEditor/PolicyRoles'
-import SqlEditor from '@/components/ui/SqlEditor'
+import { CodeEditor } from '@/components/ui/CodeEditor/CodeEditor'
import { DOCS_URL } from '@/lib/constants'
const PolicyDefinition = ({ definition = '', onUpdatePolicyDefinition = () => {} }) => {
@@ -20,7 +20,11 @@ const PolicyDefinition = ({ definition = '', onUpdatePolicyDefinition = () => {}
</p>
</div>
<div className="h-56 md:w-2/3">
- <SqlEditor defaultValue={definition} onInputChange={onUpdatePolicyDefinition} />
+ <CodeEditor
+ language="pgsql"
+ defaultValue={definition}
+ onInputChange={onUpdatePolicyDefinition}
+ />
</div>
</div>
)
diff --git a/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesReview.tsx b/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesReview.tsx
index 92f3c5d192a..02e3d301596 100644
--- a/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesReview.tsx
+++ b/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesReview.tsx
@@ -1,7 +1,7 @@
import { useState } from 'react'
import { Button, DialogFooter, DialogSection, DialogSectionSeparator } from 'ui'
-import SqlEditor from '@/components/ui/SqlEditor'
+import { CodeEditor } from '@/components/ui/CodeEditor/CodeEditor'
const ReviewEmptyState = () => {
return (
@@ -46,9 +46,14 @@ const StoragePoliciesReview = ({
let formattedSQLStatement = policy.statement || ''
return (
<div key={`policy_${idx}`} className="space-y-2">
- <span>{policy.description}</span>
+ <p className="text-sm">{policy.description}</p>
<div className="h-40">
- <SqlEditor readOnly defaultValue={formattedSQLStatement} />
+ <CodeEditor
+ hideLineNumbers
+ isReadOnly
+ language="pgsql"
+ defaultValue={formattedSQLStatement}
+ />
</div>
</div>
)
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/InputField.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/InputField.tsx
index 636138b553a..6704c06902c 100644
--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/InputField.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/InputField.tsx
@@ -1,5 +1,5 @@
import { includes, noop } from 'lodash'
-import { Edit, Eye } from 'lucide-react'
+import { Edit, Expand, Eye } from 'lucide-react'
import {
DropdownMenu,
DropdownMenuContent,
@@ -278,11 +278,10 @@ export const InputField = ({
<InputGroupButton
variant="default"
type="button"
+ icon={isEditable ? <Edit /> : <Expand />}
+ className="px-1.5"
onClick={() => onEditJson({ column: field.name, value: field.value })}
- icon={isEditable ? <Edit /> : <Eye />}
- >
- {isEditable ? 'Edit' : 'View JSON'}
- </InputGroupButton>
+ />
</InputGroupAddon>
</InputGroup>
</FormItemLayout>
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/JsonEditor/JsonCodeEditor.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/JsonEditor/JsonCodeEditor.tsx
deleted file mode 100644
index 49f9c13dcfe..00000000000
--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/JsonEditor/JsonCodeEditor.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import Editor, { OnChange } from '@monaco-editor/react'
-import { noop } from 'lodash'
-
-// [Joshen] Should just use CodeEditor instead of declaring Editor here so that all the mount logic is consistent
-
-interface JsonCodeEditorProps {
- value: string
- readOnly?: boolean
- onInputChange: OnChange
-}
-
-export const JsonCodeEditor = ({
- value = '',
- readOnly = false,
- onInputChange = noop,
-}: JsonCodeEditorProps) => {
- return (
- <Editor
- className="monaco-editor"
- theme="supabase"
- defaultLanguage="json"
- value={value}
- loading={<h4>Loading</h4>}
- options={{
- readOnly,
- tabSize: 2,
- fontSize: 13,
- minimap: {
- enabled: false,
- },
- wordWrap: 'on',
- fixedOverflowWidgets: true,
- lineNumbersMinChars: 4,
- }}
- onMount={(editor) => {
- editor.changeViewZones((accessor) => {
- accessor.addZone({
- afterLineNumber: 0,
- heightInPx: 4,
- domNode: document.createElement('div'),
- })
- })
- editor.focus()
- }}
- onChange={onInputChange}
- />
- )
-}
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/JsonEditor/index.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/JsonEditor/index.tsx
index 1fbc235d376..ee0d2de2c19 100644
--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/JsonEditor/index.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/JsonEditor/index.tsx
@@ -8,8 +8,8 @@ import { Button, cn, SidePanel } from 'ui'
import { ActionBar } from '../../ActionBar'
import { isValueTruncated } from '../RowEditor.utils'
import { DrilldownViewer } from './DrilldownViewer/DrilldownViewer'
-import { JsonCodeEditor } from './JsonCodeEditor'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
+import { CodeEditor } from '@/components/ui/CodeEditor/CodeEditor'
import { TwoOptionToggle } from '@/components/ui/TwoOptionToggle'
import { useTableEditorQuery } from '@/data/table-editor/table-editor-query'
import { isTableLike } from '@/data/table-editor/table-editor-types'
@@ -173,11 +173,12 @@ export const JsonEditor = ({
<div className="flex flex-auto h-full flex-col gap-y-4 relative">
{view === 'edit' ? (
<div className="w-full h-full grow">
- <JsonCodeEditor
+ <CodeEditor
key={jsonString}
- readOnly={readOnly}
- onInputChange={(val) => setJsonStr(val ?? '')}
+ isReadOnly={readOnly}
+ language="json"
value={(jsonStr ?? '').toString()}
+ onInputChange={(val) => setJsonStr(val ?? '')}
/>
</div>
) : (
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/TextEditor.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/TextEditor.tsx
index a64bdd1bf68..4d6492fb9c4 100644
--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/TextEditor.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/TextEditor.tsx
@@ -1,7 +1,5 @@
-import { Editor } from '@monaco-editor/react'
import { MAX_CHARACTERS } from '@supabase/pg-meta/src/query/table-row-query'
import { useParams } from 'common'
-import { Loader } from 'lucide-react'
import { useCallback, useEffect, useState } from 'react'
import remarkGfm from 'remark-gfm'
import { toast } from 'sonner'
@@ -10,6 +8,7 @@ import { Button, cn, SidePanel } from 'ui'
import { ActionBar } from '../ActionBar'
import { isValueTruncated } from './RowEditor.utils'
import { Markdown } from '@/components/interfaces/Markdown'
+import { CodeEditor } from '@/components/ui/CodeEditor/CodeEditor'
import { TwoOptionToggle } from '@/components/ui/TwoOptionToggle'
import { useTableEditorQuery } from '@/data/table-editor/table-editor-query'
import { isTableLike } from '@/data/table-editor/table-editor-types'
@@ -129,35 +128,12 @@ export const TextEditor = ({
<div className="relative flex flex-auto h-full flex-col gap-y-4">
{view === 'edit' ? (
<div className="w-full h-full grow">
- <Editor
+ <CodeEditor
key={value}
- theme="supabase"
- className="monaco-editor"
- defaultLanguage="markdown"
- value={strValue}
- loading={<Loader className="animate-spin" strokeWidth={2} size={20} />}
- options={{
- readOnly,
- tabSize: 2,
- fontSize: 13,
- minimap: {
- enabled: false,
- },
- wordWrap: 'on',
- fixedOverflowWidgets: true,
- lineNumbersMinChars: 4,
- }}
- onMount={(editor) => {
- editor.changeViewZones((accessor) => {
- accessor.addZone({
- afterLineNumber: 0,
- heightInPx: 4,
- domNode: document.createElement('div'),
- })
- })
- editor.focus()
- }}
- onChange={(val) => setStrValue(val ?? '')}
+ isReadOnly={readOnly}
+ language="markdown"
+ value={strValue ?? ''}
+ onInputChange={(val) => setStrValue(val ?? '')}
/>
</div>
) : (
diff --git a/apps/studio/components/interfaces/TableGridEditor/TableDefinition.tsx b/apps/studio/components/interfaces/TableGridEditor/TableDefinition.tsx
index ec1b2ad97e1..5044db1a0a2 100644
--- a/apps/studio/components/interfaces/TableGridEditor/TableDefinition.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/TableDefinition.tsx
@@ -1,18 +1,16 @@
-import Editor from '@monaco-editor/react'
import { useParams } from 'common'
-import { useTheme } from 'next-themes'
import Link from 'next/link'
-import { useMemo, useRef } from 'react'
+import { useMemo } from 'react'
import { Button } from 'ui'
import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
import { Footer } from '@/components/grid/components/footer/Footer'
+import { CodeEditor } from '@/components/ui/CodeEditor/CodeEditor'
import { useTableDefinitionQuery } from '@/data/database/table-definition-query'
import { useViewDefinitionQuery } from '@/data/database/view-definition-query'
import { Entity, isTableLike, isViewLike } from '@/data/table-editor/table-editor-types'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { formatSql } from '@/lib/formatSql'
-import { timeout } from '@/lib/helpers'
export interface TableDefinitionProps {
entity?: Entity
@@ -20,9 +18,6 @@ export interface TableDefinitionProps {
export const TableDefinition = ({ entity }: TableDefinitionProps) => {
const { ref } = useParams()
- const editorRef = useRef(null)
- const monacoRef = useRef(null)
- const { resolvedTheme } = useTheme()
const { data: project } = useSelectedProjectQuery()
const viewResult = useViewDefinitionQuery(
@@ -55,24 +50,6 @@ export const TableDefinition = ({ entity }: TableDefinitionProps) => {
[definition]
)
- const handleEditorOnMount = async (editor: any, monaco: any) => {
- editorRef.current = editor
- monacoRef.current = monaco
-
- // add margin above first line
- editor.changeViewZones((accessor: any) => {
- accessor.addZone({
- afterLineNumber: 0,
- heightInPx: 4,
- domNode: document.createElement('div'),
- })
- })
-
- // when editor did mount, it will need a delay before focus() works properly
- await timeout(500)
- editor?.focus()
- }
-
if (isLoading) {
return (
<div className="h-full grid">
@@ -98,23 +75,8 @@ export const TableDefinition = ({ entity }: TableDefinitionProps) => {
Open in SQL Editor
</Link>
</Button>
- <Editor
- className="monaco-editor"
- theme={resolvedTheme?.includes('dark') ? 'vs-dark' : 'vs'}
- onMount={handleEditorOnMount}
- defaultLanguage="pgsql"
- value={formattedDefinition}
- path={''}
- options={{
- domReadOnly: true,
- readOnly: true,
- tabSize: 2,
- fontSize: 13,
- minimap: { enabled: false },
- wordWrap: 'on',
- fixedOverflowWidgets: true,
- }}
- />
+
+ <CodeEditor isReadOnly language="pgsql" value={formattedDefinition} />
</div>
<Footer />
diff --git a/apps/studio/components/ui/CodeEditor/CodeEditor.tsx b/apps/studio/components/ui/CodeEditor/CodeEditor.tsx
index c9d5f4d2f9f..f4a12ba9a38 100644
--- a/apps/studio/components/ui/CodeEditor/CodeEditor.tsx
+++ b/apps/studio/components/ui/CodeEditor/CodeEditor.tsx
@@ -1,8 +1,9 @@
import Editor, { EditorProps, Monaco, OnChange, OnMount, useMonaco } from '@monaco-editor/react'
import { merge, noop } from 'lodash'
+import { Loader2 } from 'lucide-react'
import type { editor } from 'monaco-editor'
import { RefObject, useEffect, useRef, useState } from 'react'
-import { cn, LogoLoader } from 'ui'
+import { cn } from 'ui'
import { useSetCommandMenuOpen } from 'ui-patterns/CommandMenu'
import { alignEditor } from './CodeEditor.utils'
@@ -23,12 +24,13 @@ const DEFAULT_ACTIONS = {
interface CodeEditorProps {
id?: string
- language: 'pgsql' | 'json' | 'html' | 'typescript' | 'plaintext' | undefined
+ language: 'pgsql' | 'json' | 'html' | 'typescript' | 'plaintext' | 'markdown'
autofocus?: boolean
defaultValue?: string
isReadOnly?: boolean
hideLineNumbers?: boolean
className?: string
+ wrapperClassName?: string
loading?: boolean
options?: EditorProps['options']
value?: string
@@ -57,6 +59,7 @@ export const CodeEditor = ({
isReadOnly = false,
hideLineNumbers = false,
className,
+ wrapperClassName,
loading,
options,
value,
@@ -97,6 +100,7 @@ export const CodeEditor = ({
{
tabSize: 2,
fontSize: 13,
+ domReadOnly: isReadOnly,
readOnly: isReadOnly,
minimap: { enabled: false },
wordWrap: 'on',
@@ -246,10 +250,11 @@ export const CodeEditor = ({
path={id}
theme="supabase"
className={cn(className, 'monaco-editor')}
+ wrapperProps={{ className: wrapperClassName }}
value={value ?? undefined}
language={language}
defaultValue={defaultValue ?? undefined}
- loading={loading || <LogoLoader />}
+ loading={loading || <Loader2 className="animate-spin" strokeWidth={2} size={20} />}
options={optionsMerged}
onMount={handleMount}
onChange={onChangeContent}
diff --git a/apps/studio/components/ui/SqlEditor.tsx b/apps/studio/components/ui/SqlEditor.tsx
deleted file mode 100644
index 9a8fb6d2711..00000000000
--- a/apps/studio/components/ui/SqlEditor.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-import Editor, { OnChange, useMonaco } from '@monaco-editor/react'
-import { noop } from 'lodash'
-import { useEffect, useRef } from 'react'
-import { LogoLoader } from 'ui'
-
-import { formatSql } from '@/lib/formatSql'
-
-// [Joshen] We should deprecate this and use CodeEditor instead
-
-interface SqlEditorProps {
- contextmenu?: boolean
- defaultValue?: string
- language?: string
- onInputChange?: OnChange
- queryId?: string
- readOnly?: boolean
-}
-
-/**
- * @deprecated Use CodeEditor instead
- */
-const SqlEditor = ({
- queryId,
- language = 'pgsql',
- defaultValue = '',
- readOnly = false,
- contextmenu = true,
- onInputChange = noop,
-}: SqlEditorProps) => {
- const monaco = useMonaco()
- const editorRef = useRef<any>(null)
-
- useEffect(() => {
- if (monaco) {
- // Enable pgsql format
- const formatprovider = monaco.languages.registerDocumentFormattingEditProvider('pgsql', {
- async provideDocumentFormattingEdits(model: any) {
- const value = model.getValue()
- const formatted = formatSql(value)
- return [
- {
- range: model.getFullModelRange(),
- text: formatted,
- },
- ]
- },
- })
-
- return () => {
- formatprovider.dispose()
- }
- }
- }, [monaco])
-
- useEffect(() => {
- if (editorRef.current) {
- // add margin above first line
- editorRef.current?.changeViewZones((accessor: any) => {
- accessor.addZone({
- afterLineNumber: 0,
- heightInPx: 4,
- domNode: document.createElement('div'),
- })
- })
- }
- }, [queryId])
-
- const onMount = (editor: any, _monaco: any) => {
- editorRef.current = editor
-
- // Add margin above first line
- editor.changeViewZones((accessor: any) => {
- accessor.addZone({
- afterLineNumber: 0,
- heightInPx: 4,
- domNode: document.createElement('div'),
- })
- })
- }
-
- return (
- <Editor
- className="monaco-editor"
- theme="supabase"
- defaultLanguage={language}
- defaultValue={defaultValue}
- path={queryId}
- loading={<LogoLoader />}
- options={{
- readOnly,
- tabSize: 2,
- fontSize: 13,
- minimap: {
- enabled: false,
- },
- wordWrap: 'on',
- fixedOverflowWidgets: true,
- contextmenu: contextmenu,
- }}
- onMount={onMount}
- onChange={onInputChange}
- />
- )
-}
-
-export default SqlEditor