diff --git a/apps/webfront/src/components/flick/canvas/CodeAnimations.tsx b/apps/webfront/src/components/flick/canvas/CodeAnimations.tsx
index e6891cff..c9301c0a 100644
--- a/apps/webfront/src/components/flick/canvas/CodeAnimations.tsx
+++ b/apps/webfront/src/components/flick/canvas/CodeAnimations.tsx
@@ -31,9 +31,11 @@ export interface Position {
export const TypingEffect = ({
token,
fontSize,
+ fontFamily,
}: {
token: ComputedToken
fontSize: number
+ fontFamily: string
}) => {
const [text, setText] = useState('')
useEffect(() => {
@@ -54,6 +56,7 @@ export const TypingEffect = ({
x={token?.x}
y={token?.y}
align='left'
+ fontFamily={fontFamily}
/>
)
}
@@ -63,11 +66,13 @@ const RenderTokens = ({
startIndex,
endIndex,
fontSize,
+ fontFamily,
}: {
tokens: ComputedToken[]
startIndex: number
endIndex: number
fontSize: number
+ fontFamily: string
}) => {
const tokenSegment = tokens.slice(startIndex, endIndex)
@@ -92,8 +97,13 @@ const RenderTokens = ({
{renderState.tokens.length > 0 &&
renderState.tokens.map((token, index) => (
- // eslint-disable-next-line
-
+
))}
)
@@ -106,11 +116,13 @@ export const RenderHighlight = ({
startLineNumber,
endLineNumber,
fontSize,
+ fontFamily,
}: {
tokens: ComputedToken[]
startLineNumber: number
endLineNumber: number
fontSize: number
+ fontFamily: string
}) => (
{tokens
@@ -129,6 +141,7 @@ export const RenderHighlight = ({
x={token.x}
y={token.y}
align='left'
+ fontFamily={fontFamily}
/>
))}
@@ -138,10 +151,12 @@ export const RenderLines = ({
tokens,
lineNumbers,
fontSize,
+ fontFamily,
}: {
tokens: ComputedToken[]
lineNumbers: number[]
fontSize: number
+ fontFamily: string
}) => (
{tokens
@@ -156,6 +171,7 @@ export const RenderLines = ({
x={token.x}
y={token.y}
align='left'
+ fontFamily={fontFamily}
/>
))}
@@ -333,7 +349,8 @@ export const RenderMultipleLineFocus = ({
export const getRenderedTokens = (
tokens: ComputedToken[],
position: Position,
- fontSize: number
+ fontSize: number,
+ fontFamily: string
) => {
const startFromIndex = Math.max(
...tokens
@@ -353,6 +370,7 @@ export const getRenderedTokens = (
x={token.x}
y={token.y}
align='left'
+ fontFamily={fontFamily}
/>
))
}
@@ -363,12 +381,12 @@ export const getTokens = ({
tokens,
opacity,
fontSize,
- font,
+ fontFamily,
}: {
tokens: ComputedToken[]
opacity: number
- font?: string
fontSize: number
+ fontFamily: string
}) => {
let computedLineNumber = 0
let lineNumber = 0
@@ -391,7 +409,7 @@ export const getTokens = ({
y={(fontSize + 8) * computedLineNumber}
opacity={opacity}
align='left'
- fontFamily={font}
+ fontFamily={fontFamily}
/>
)
})
diff --git a/apps/webfront/src/components/flick/canvas/fragments/CodeFragment.tsx b/apps/webfront/src/components/flick/canvas/fragments/CodeFragment.tsx
index ff643ad9..7a26dc7e 100644
--- a/apps/webfront/src/components/flick/canvas/fragments/CodeFragment.tsx
+++ b/apps/webfront/src/components/flick/canvas/fragments/CodeFragment.tsx
@@ -347,7 +347,7 @@ const CodeFragment = ({
gutter: 8,
fontSize,
codeAnimation: codeAnimation || CodeAnimation.TypeLines,
- // fontFamily: branding?.font?.heading?.family,
+ fontFamily: 'Roboto Mono',
})
)
}, [colorCodes, objectRenderConfig, fontSize])
@@ -578,7 +578,12 @@ const CodeFragment = ({
{
'Type lines': (
<>
- {getRenderedTokens(computedTokens[0], position, fontSize)}
+ {getRenderedTokens(
+ computedTokens[0],
+ position,
+ fontSize,
+ 'Roboto Mono'
+ )}
{computedTokens.length > 0 &&
computedTokens[0].length > 0 && (
)}
>
@@ -603,6 +609,7 @@ const CodeFragment = ({
tokens: computedTokens[0],
opacity: highlightBlockCode ? 0.2 : 1,
fontSize,
+ fontFamily: 'Roboto Mono',
})}
>
@@ -624,6 +631,7 @@ const CodeFragment = ({
0
}
fontSize={fontSize}
+ fontFamily='Roboto Mono'
/>
)}
@@ -665,6 +673,7 @@ const CodeFragment = ({
tokens: computedTokens[0],
opacity: 1,
fontSize,
+ fontFamily: 'Roboto Mono',
})}