From 74392eccee4de3ac73239734c073e40ca5f950f5 Mon Sep 17 00:00:00 2001 From: Brett Jephson Date: Tue, 24 Sep 2024 11:39:45 +0100 Subject: [PATCH] Formatting --- .../DocumentView/OpenAPI/OpenAPI.tsx | 2 +- .../DocumentView/OpenAPI/ServerUrlCache.tsx | 4 +-- .../react-openapi/src/OpenAPICodeSample.tsx | 5 +--- .../src/OpenAPIServerURLForm.tsx | 26 +++++++++++-------- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/packages/gitbook/src/components/DocumentView/OpenAPI/OpenAPI.tsx b/packages/gitbook/src/components/DocumentView/OpenAPI/OpenAPI.tsx index 7fd367184..16dccc025 100644 --- a/packages/gitbook/src/components/DocumentView/OpenAPI/OpenAPI.tsx +++ b/packages/gitbook/src/components/DocumentView/OpenAPI/OpenAPI.tsx @@ -64,7 +64,7 @@ async function OpenAPIBody(props: BlockProps) { defaultInteractiveOpened: context.mode === 'print', id: block.meta?.id, blockKey: block.key, - serverUrl + serverUrl, }} className="openapi-block" /> diff --git a/packages/gitbook/src/components/DocumentView/OpenAPI/ServerUrlCache.tsx b/packages/gitbook/src/components/DocumentView/OpenAPI/ServerUrlCache.tsx index b715ce3db..47ae56d22 100644 --- a/packages/gitbook/src/components/DocumentView/OpenAPI/ServerUrlCache.tsx +++ b/packages/gitbook/src/components/DocumentView/OpenAPI/ServerUrlCache.tsx @@ -1,5 +1,5 @@ import { createSearchParamsCache, parseAsString } from 'nuqs/server'; export const serverUrlCache = createSearchParamsCache({ - serverUrl: parseAsString -}) \ No newline at end of file + serverUrl: parseAsString, +}); diff --git a/packages/react-openapi/src/OpenAPICodeSample.tsx b/packages/react-openapi/src/OpenAPICodeSample.tsx index ac63e4779..6345dfe29 100644 --- a/packages/react-openapi/src/OpenAPICodeSample.tsx +++ b/packages/react-openapi/src/OpenAPICodeSample.tsx @@ -52,10 +52,7 @@ export function OpenAPICodeSample(props: { const requestBody = noReference(data.operation.requestBody); const requestBodyContent = requestBody ? Object.entries(requestBody.content)[0] : undefined; const input: CodeSampleInput = { - url: - serverUrl + - data.path + - (searchParams.size ? `?${searchParams.toString()}` : ''), + url: serverUrl + data.path + (searchParams.size ? `?${searchParams.toString()}` : ''), method: data.method, body: requestBodyContent ? generateMediaTypeExample(requestBodyContent[1], { onlyRequired: true }) diff --git a/packages/react-openapi/src/OpenAPIServerURLForm.tsx b/packages/react-openapi/src/OpenAPIServerURLForm.tsx index 8864f9b2d..45b277a69 100644 --- a/packages/react-openapi/src/OpenAPIServerURLForm.tsx +++ b/packages/react-openapi/src/OpenAPIServerURLForm.tsx @@ -14,7 +14,7 @@ export function ServerURLForm(props: { serverIndex: number; }) { const { children, context, servers, serverIndex } = props; - const ctx = useOpenAPIContext(); + const stateContext = useOpenAPIContext(); const server = servers[serverIndex]; const formRef = React.useRef(null); @@ -22,7 +22,7 @@ export function ServerURLForm(props: { if (index !== serverIndex) { update({ server: `${index}` ?? '0', - ...(ctx?.state?.edit ? { edit: 'true' } : undefined), + ...(stateContext?.state?.edit ? { edit: 'true' } : undefined), }); } } @@ -38,7 +38,7 @@ export function ServerURLForm(props: { update({ server: `${formData.get('server')}` ?? '0', ...variables, - ...(ctx?.state?.edit ? { edit: 'true' } : undefined), + ...(stateContext?.state?.edit ? { edit: 'true' } : undefined), }); } @@ -46,7 +46,7 @@ export function ServerURLForm(props: { if (!context.blockKey) { return; } - ctx?.onUpdate({ + stateContext?.onUpdate({ block: context.blockKey, ...variables, }); @@ -62,10 +62,10 @@ export function ServerURLForm(props: { }} className="contents" > -
+
{children} - {ctx?.state?.edit && servers.length > 1 ? ( + {stateContext?.state?.edit && servers.length > 1 ? ( { - const state = { ...ctx?.state }; + const state = { ...stateContext?.state }; delete state.edit; update({ server: `${serverIndex}`, ...state, - ...(ctx?.state?.edit ? { serverUrl: getServersURL(servers, state) } : { edit: 'true' }), + ...(stateContext?.state?.edit + ? { serverUrl: getServersURL(servers, state) } + : { edit: 'true' }), }); }} - title={ctx?.state?.edit ? undefined : 'Try different server options'} - aria-label={ctx?.state?.edit ? 'Clear' : 'Edit'} + title={ + stateContext?.state?.edit ? undefined : 'Try different server options' + } + aria-label={stateContext?.state?.edit ? 'Clear' : 'Edit'} > - {ctx?.state?.edit ? context.icons.clear : context.icons.edit} + {stateContext?.state?.edit ? context.icons.clear : context.icons.edit} ) : null}