diff --git a/packages/bruno-api-docs/src/components/Code/Code.tsx b/packages/bruno-api-docs/src/components/Code/Code.tsx index a983aef1..81943da7 100644 --- a/packages/bruno-api-docs/src/components/Code/Code.tsx +++ b/packages/bruno-api-docs/src/components/Code/Code.tsx @@ -1,5 +1,6 @@ import React, { Suspense, lazy, useEffect, useMemo, useRef } from 'react'; import { CopyButton } from '@/ui/CopyButton/CopyButton'; +import { useResolvedVariables } from '@/hooks/useVariableResolver'; import { StyledWrapper } from './CodeViewer/StyledWrapper'; import { HighlightedCode } from './HighlightedCode'; import Prism from '@/utils/prism'; @@ -39,6 +40,7 @@ const CodeViewer: React.FC = ({ testId }) => { const preRef = useRef(null); + const { resolve } = useResolvedVariables(); useEffect(() => { if (!variableAware && preRef.current) { @@ -48,6 +50,8 @@ const CodeViewer: React.FC = ({ const lineCount = useMemo(() => (code ? code.split('\n').length : 1), [code]); + const resolvedCopyText = copyText ?? (variableAware ? resolve(code) : code); + const wrapperClassName = ['code-content-wrapper overflow-hidden', surface === 'muted' ? 'code--muted' : '', className] .filter(Boolean) .join(' '); @@ -64,7 +68,7 @@ const CodeViewer: React.FC = ({
{showCopy && ( = ({ example, method, url, const detailId = useId(); const detailRef = useRef(null); const rootRef = useRef(null); + const { resolve } = useResolvedVariables(); useEffect(() => { const el = detailRef.current; @@ -336,7 +338,7 @@ export const ExampleCard: React.FC = ({ example, method, url, auth={auth} testId="example-code-snippet" /> - +
diff --git a/packages/bruno-api-docs/src/components/Request/RequestUrlBar/RequestUrlBar.tsx b/packages/bruno-api-docs/src/components/Request/RequestUrlBar/RequestUrlBar.tsx index bf5bacc3..48d66201 100644 --- a/packages/bruno-api-docs/src/components/Request/RequestUrlBar/RequestUrlBar.tsx +++ b/packages/bruno-api-docs/src/components/Request/RequestUrlBar/RequestUrlBar.tsx @@ -1,8 +1,10 @@ import React from 'react'; +import cx from '@/utils/cx'; import { MethodBadge } from '../../MethodBadge/MethodBadge'; import { VariableText } from '../../VariableText/VariableText'; import { CopyButton } from '@/ui/CopyButton/CopyButton'; import { TruncatedText } from '../../TruncatedText/TruncatedText'; +import { useResolvedVariables } from '@/hooks/useVariableResolver'; import { SendIcon } from '@/assets/icons'; import { StyledWrapper } from './StyledWrapper'; @@ -26,33 +28,27 @@ export const RequestUrlBar: React.FC = ({ style, className, testId = 'request-url-bar' -}) => ( - - - - - - - - - - {onTry && ( - - )} - - -); +}) => { + const { resolve } = useResolvedVariables(); + return ( + + + + + + + + + + {onTry && ( + + )} + + + ); +}; export default RequestUrlBar; diff --git a/packages/bruno-api-docs/src/components/Request/RequestUrlBar/StyledWrapper.ts b/packages/bruno-api-docs/src/components/Request/RequestUrlBar/StyledWrapper.ts index 5c5bcc1e..41940f95 100644 --- a/packages/bruno-api-docs/src/components/Request/RequestUrlBar/StyledWrapper.ts +++ b/packages/bruno-api-docs/src/components/Request/RequestUrlBar/StyledWrapper.ts @@ -38,6 +38,12 @@ export const StyledWrapper = styled.div` gap: 0.5rem; flex-shrink: 0; } + .request-url-bar-actions .copy-button { + width: 1.5rem; + height: 1.5rem; + background-color: var(--oc-background-base); + border-color: var(--oc-table-border); + } .request-try { display: inline-flex;