Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions apps/frontend/src/templates/Field/Signature/SignatureField.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
import { Box, Flex, FormControl, Stack, Text } from '@chakra-ui/react'
import getStroke from 'perfect-freehand'

import { SignatureVectorArray } from 'formsg-shared/types'
import { FormColorTheme, SignatureVectorArray } from 'formsg-shared/types'
import {
SIGNATURE_STROKE_SIZE,
SIGNATURE_STROKE_SMOOTHING,
Expand All @@ -35,6 +35,7 @@ export interface SignatureFieldProps extends BaseFieldProps {

export interface SignatureCanvasProps {
schema: SignatureFieldSchema
colorTheme?: FormColorTheme
isHighContrast?: boolean
isSubmitting: boolean
isValid: boolean
Expand All @@ -45,13 +46,19 @@ export interface SignatureCanvasProps {

const SignatureCanvas = ({
schema,
colorTheme = FormColorTheme.Blue,
isHighContrast,
isSubmitting,
isValid,
errors,
value,
onChange,
}: SignatureCanvasProps) => {
const fieldColorScheme = useMemo(
() => `theme-${colorTheme}` as const,
[colorTheme],
)

const signatureErrors = errors?.[schema._id]
const [showSignaturePlaceholder, setShowSignaturePlaceholder] = useState(true)

Expand Down Expand Up @@ -246,14 +253,19 @@ const SignatureCanvas = ({
signatureErrors
? 'red.600'
: isDrawing
? '#445fcd'
? `${fieldColorScheme}.500`
: 'neutral.400'
}
position="relative"
overflow="hidden"
_hover={{
background: schema.disabled ? 'neutral.200' : 'primary.100',
outline: isDrawing ? '2px solid #445fcd' : 'none',
background: schema.disabled
? 'neutral.200'
: `${fieldColorScheme}.100`,
outline: isDrawing ? `2px solid` : 'none',
outlineColor: isDrawing
? `${fieldColorScheme}.500`
: undefined,
}}
>
{showSignaturePlaceholder && (
Expand Down Expand Up @@ -325,6 +337,7 @@ export const SignatureField = ({
schema,
disableRequiredValidation,
isHighContrast,
colorTheme,
}: SignatureFieldProps): JSX.Element => {
const { control } = useFormContext<SignatureFieldInput>()
const { isSubmitting, isValid, errors } = useFormState<SignatureFieldInput>()
Expand All @@ -342,6 +355,7 @@ export const SignatureField = ({
render={({ field }) => (
<SignatureCanvas
schema={schema}
colorTheme={colorTheme}
isHighContrast={isHighContrast}
isSubmitting={isSubmitting}
isValid={isValid}
Expand Down
Loading