Files
Alaister Young 5c0b627904 fix(studio): fix GraphiQL editor layout, gutter bleed and spacing (#47334)
Fixes three GraphiQL/integrations layout issues introduced by the
Marketplace layout change (#45856), which dropped the height passthrough
on the integration page content wrapper.

**Changed:**
- **Full-height integration pages** — the content wrapper had no height,
so GraphiQL's `h-full` editor collapsed instead of filling the page.
Added `flex-1 min-h-0` to the wrapper in both the legacy
(`LegacyIntegrationPage`) and marketplace (`MarketplaceDetail`) render
paths.
- **GraphiQL gutter bleed** — Monaco's `.overflow-guard` was ending up
`overflow: visible` (an inline style Monaco sets at runtime), so the
oversized opaque line-number gutter escaped the editor and painted over
the page above it. Re-asserted the clip, scoped to GraphiQL so the SQL
editor is untouched.
- **GraphiQL editor spacing** — removed GraphiQL's default 16px
query-editor padding so the scroll shadow sits flush, and restored the
content's breathing room via Monaco's own `padding` (top/bottom) and
`glyphMargin` (line-number left inset) options, which leave the scroll
shadow pinned to the top edge.

Before:
<img width="2056" height="814" alt="Screenshot 2026-06-26 at 5 27 24 PM"
src="https://github.com/user-attachments/assets/573856bf-2bfb-4bf2-9dd7-59c29b423ec9"
/>

## To test

- Open a project → **Integrations → GraphiQL** (the `graphiql` tab). The
editor should fill the full page height.
- Scroll the query editor — the scroll shadow should sit flush at the
top edge, not float inset, and the white gutter should not bleed over
the page header above.
- Confirm line numbers have left padding and content has top/bottom
padding.
- Trigger autocomplete in the editor — the suggestion popup should still
appear (not clipped by the gutter `overflow: hidden`).
- Toggle the **Marketplace** feature preview (Account dropdown → Feature
Previews) and re-check the GraphiQL page in both states, since it
renders through two different page components.


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

* **Bug Fixes**
* Improved the GraphQL in-browser editor layout to prevent the editor
gutter from overlapping surrounding content.
* Removed unnecessary query-editor padding so scrolling and shadow
effects display correctly in the available space.
* Ensured Monaco editor spacing/settings are applied consistently to
both existing and newly created editors.
* Fixed full-height sizing for integration pages so content stays
correctly constrained and doesn’t collapse or overflow.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---------

Co-authored-by: Alaister Young <10985857+alaister@users.noreply.github.com>
2026-06-26 18:17:10 +08:00

220 lines
8.2 KiB
TypeScript

import 'graphiql/style.css'
import 'graphiql/setup-workers/webpack'
import { useMonaco, type GraphiQLPlugin } from '@graphiql/react'
import { createGraphiQLFetcher, Fetcher } from '@graphiql/toolkit'
import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { GraphiQL, HISTORY_PLUGIN } from 'graphiql'
import { User as IconUser } from 'lucide-react'
import { useTheme } from 'next-themes'
import { useCallback, useEffect, useMemo, useRef, useState, type RefObject } from 'react'
import { toast } from 'sonner'
import { LogoLoader } from 'ui'
import { DEFAULT_INTROSPECTION_SCHEMA } from './constants'
import styles from './graphiql.module.css'
import { IntrospectionDisabledNotice } from './IntrospectionDisabledNotice'
import { IntrospectionEnabledNotice } from './IntrospectionEnabledNotice'
import { usePgGraphqlIntrospectionStatus } from './usePgGraphqlIntrospectionStatus'
import { getTheme } from '@/components/interfaces/App/MonacoThemeProvider'
import { RoleImpersonationSelector } from '@/components/interfaces/RoleImpersonationSelector'
import { useSessionAccessTokenQuery } from '@/data/auth/session-access-token-query'
import { useProjectPostgrestConfigQuery } from '@/data/config/project-postgrest-config-query'
import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { API_URL, IS_PLATFORM } from '@/lib/constants'
import { getRoleImpersonationJWT } from '@/lib/role-impersonation'
import { useGetImpersonatedRoleState } from '@/state/role-impersonation-state'
const ROLE_IMPERSONATION_PLUGIN: GraphiQLPlugin = {
title: 'Role Impersonation',
icon: () => <IconUser />,
content: () => <RoleImpersonationSelector orientation="vertical" />,
}
const MONACO_THEME = { dark: 'supabase-graphql-dark', light: 'supabase-graphql-light' }
const GraphiQLMonacoTheme = ({ resolvedTheme }: { resolvedTheme: 'dark' | 'light' }) => {
const { monaco } = useMonaco()
useEffect(() => {
if (!monaco) return
const dark = getTheme('dark')
const light = getTheme('light')
monaco.editor.defineTheme(MONACO_THEME.dark, {
...dark,
rules: [...dark.rules, { token: 'argument.identifier.gql', foreground: '908aff' }],
})
monaco.editor.defineTheme(MONACO_THEME.light, {
...light,
rules: [...light.rules, { token: 'argument.identifier.gql', foreground: '6c69ce' }],
// Match the dashboard's bg-default in light mode so the editor doesn't read
// as a darker square against the surrounding UI.
colors: { ...light.colors, 'editor.background': '#fcfcfc' },
})
monaco.editor.setTheme(MONACO_THEME[resolvedTheme])
}, [monaco, resolvedTheme])
return null
}
/**
* Inset the editor content from the container edges without floating the scroll shadow.
*
* Monaco anchors its `.scroll-decoration` (the shadow shown when scrolled) to the editor's
* top edge and absolutely positions the line numbers at the gutter's left edge, so container
* padding can't move either — it would just push the whole editor (shadow included) inward.
* Instead use Monaco's own options:
* - `padding` insets the content top/bottom while leaving the shadow pinned to the top, so
* `.graphiql-query-editor` can stay full-bleed (`p-0`) for a flush shadow.
* - `glyphMargin` reserves an empty column to the left of the line numbers (same gutter
* background), giving them left breathing room.
*
* GraphiQL shares the global Monaco instance with the rest of Studio (the SQL editor etc.),
* so we must scope `updateOptions` to editors that live inside the GraphiQL container —
* `monaco.editor.getEditors()`/`onDidCreateEditor()` see every editor in the app, and
* applying these options globally would shift the SQL editor's layout too. Filtering by
* container also means there's nothing to revert on unmount: we never touch other editors.
*/
const GraphiQLEditorOptions = ({
containerRef,
}: {
containerRef: RefObject<HTMLDivElement | null>
}) => {
const { monaco } = useMonaco()
useEffect(() => {
if (!monaco) return
const options = { padding: { top: 16, bottom: 16 }, glyphMargin: true }
const applyToGraphiQLEditor = (editor: ReturnType<typeof monaco.editor.getEditors>[number]) => {
if (containerRef.current?.contains(editor.getContainerDomNode())) {
editor.updateOptions(options)
}
}
monaco.editor.getEditors().forEach(applyToGraphiQLEditor)
const disposable = monaco.editor.onDidCreateEditor(applyToGraphiQLEditor)
return () => disposable.dispose()
}, [monaco, containerRef])
return null
}
export const GraphiQLTab = () => {
const editorContainerRef = useRef<HTMLDivElement>(null)
const { resolvedTheme } = useTheme()
const { ref: projectRef } = useParams()
const currentTheme = resolvedTheme?.includes('dark') ? 'dark' : 'light'
const { data: accessToken } = useSessionAccessTokenQuery({ enabled: IS_PLATFORM })
const { data: project } = useSelectedProjectQuery()
const { data: config } = useProjectPostgrestConfigQuery({ projectRef })
const jwtSecret = config?.jwt_secret
const getImpersonatedRoleState = useGetImpersonatedRoleState()
const { can: canReadJWTSecret } = useAsyncCheckPermissions(
PermissionAction.READ,
'field.jwt_secret'
)
const { notice, schemaComment } = usePgGraphqlIntrospectionStatus({
projectRef,
connectionString: project?.connectionString,
schema: DEFAULT_INTROSPECTION_SCHEMA,
})
// Bumped to force GraphiQL to re-mount and re-run introspection after the
// introspection setting changes in either direction.
const [graphiqlKey, setGraphiqlKey] = useState(0)
const plugins = useMemo<GraphiQLPlugin[]>(
() => (canReadJWTSecret ? [HISTORY_PLUGIN, ROLE_IMPERSONATION_PLUGIN] : [HISTORY_PLUGIN]),
[canReadJWTSecret]
)
const fetcher = useMemo(() => {
const fetcherFn = createGraphiQLFetcher({
// [Joshen] Opting to hard code /platform for local to match the routes, so that it's clear what's happening
url: `${API_URL}${IS_PLATFORM ? '' : '/platform'}/projects/${projectRef}/api/graphql`,
fetch,
})
const customFetcher: Fetcher = async (graphqlParams, opts) => {
let userAuthorization: string | undefined
const role = getImpersonatedRoleState().role
if (
projectRef !== undefined &&
jwtSecret !== undefined &&
role !== undefined &&
role.type === 'postgrest'
) {
try {
const token = await getRoleImpersonationJWT(projectRef, jwtSecret, role)
userAuthorization = 'Bearer ' + token
} catch (err: any) {
toast.error(`Failed to get JWT for role: ${err.message}`)
}
}
return fetcherFn(graphqlParams, {
...opts,
headers: {
...opts?.headers,
...(accessToken && {
Authorization: `Bearer ${accessToken}`,
}),
'x-graphql-authorization':
opts?.headers?.['Authorization'] ??
opts?.headers?.['authorization'] ??
userAuthorization ??
accessToken,
},
})
}
return customFetcher
}, [projectRef, getImpersonatedRoleState, jwtSecret, accessToken])
const handleIntrospectionChanged = useCallback(() => {
setGraphiqlKey((k) => k + 1)
}, [])
if (IS_PLATFORM && !accessToken) {
return <LogoLoader />
}
return (
<div className="flex flex-col h-full">
<GraphiQLMonacoTheme resolvedTheme={currentTheme} />
<GraphiQLEditorOptions containerRef={editorContainerRef} />
{notice === 'opt-in' && (
<IntrospectionDisabledNotice
schema={DEFAULT_INTROSPECTION_SCHEMA}
currentSchemaComment={schemaComment}
onEnabled={handleIntrospectionChanged}
/>
)}
{notice === 'opt-out' && (
<IntrospectionEnabledNotice
schema={DEFAULT_INTROSPECTION_SCHEMA}
currentSchemaComment={schemaComment}
onDisabled={handleIntrospectionChanged}
/>
)}
<div ref={editorContainerRef} className="flex-1 min-h-0">
<GraphiQL
key={graphiqlKey}
fetcher={fetcher}
forcedTheme={currentTheme}
editorTheme={MONACO_THEME}
className={styles.root}
plugins={plugins}
/>
</div>
</div>
)
}