fix: standardise checkboxes

Checkboxes were previously styled super wonky due to
the usage of checkboxClassName which styled the checkbox
trigger.

This change reverts all that and leaves it with sensible defaults
across dark and light mode.
This commit is contained in:
Mythie
2024-12-31 11:55:49 +11:00
parent 22fd1b5be1
commit 9d83bda12c
12 changed files with 5 additions and 59 deletions

View File

@ -155,8 +155,7 @@ export const ResendDocumentActionItem = ({
<FormControl> <FormControl>
<Checkbox <Checkbox
className="h-5 w-5 rounded-full data-[state=checked]:border-black data-[state=checked]:bg-black" className="h-5 w-5 rounded-full"
checkClassName="text-white"
value={recipient.id} value={recipient.id}
checked={value.includes(recipient.id)} checked={value.includes(recipient.id)}
onCheckedChange={(checked: boolean) => onCheckedChange={(checked: boolean) =>

View File

@ -313,7 +313,6 @@ export function UseTemplateDialog({
<Checkbox <Checkbox
id="distributeDocument" id="distributeDocument"
className="h-5 w-5" className="h-5 w-5"
checkClassName="dark:text-white text-primary"
checked={field.value} checked={field.value}
onCheckedChange={field.onChange} onCheckedChange={field.onChange}
/> />

View File

@ -258,7 +258,6 @@ export const CheckboxField = ({
<div key={index} className="flex items-center gap-x-1.5"> <div key={index} className="flex items-center gap-x-1.5">
<Checkbox <Checkbox
className="h-4 w-4" className="h-4 w-4"
checkClassName="text-white"
id={`checkbox-${index}`} id={`checkbox-${index}`}
checked={checkedValues.includes(itemValue)} checked={checkedValues.includes(itemValue)}
onCheckedChange={() => handleCheckboxChange(item.value, item.id)} onCheckedChange={() => handleCheckboxChange(item.value, item.id)}
@ -282,7 +281,6 @@ export const CheckboxField = ({
<div key={index} className="flex items-center gap-x-1.5"> <div key={index} className="flex items-center gap-x-1.5">
<Checkbox <Checkbox
className="h-3 w-3" className="h-3 w-3"
checkClassName="text-white"
id={`checkbox-${index}`} id={`checkbox-${index}`}
checked={parsedCheckedValues.includes(itemValue)} checked={parsedCheckedValues.includes(itemValue)}
disabled={isLoading} disabled={isLoading}

View File

@ -217,45 +217,10 @@ export const TransferTeamDialog = ({
)} )}
/> />
{/* Temporary removed. */}
{/* {IS_BILLING_ENABLED && (
<FormField
control={form.control}
name="clearPaymentMethods"
render={({ field }) => (
<FormItem>
<div className="flex flex-row items-center">
<Checkbox
id="clearPaymentMethods"
className="h-5 w-5 rounded-full"
checkClassName="dark:text-white text-primary"
checked={field.value}
onCheckedChange={field.onChange}
/>
<label
className="text-muted-foreground ml-2 text-sm"
htmlFor="clearPaymentMethods"
>
Clear current payment methods
</label>
</div>
</FormItem>
)}
/>
)} */}
<Alert variant="neutral"> <Alert variant="neutral">
<AlertDescription> <AlertDescription>
<ul className="list-outside list-disc space-y-2 pl-4"> <ul className="list-outside list-disc space-y-2 pl-4">
{IS_BILLING_ENABLED() && ( {IS_BILLING_ENABLED() && (
// Temporary removed.
// <li>
// {form.getValues('clearPaymentMethods')
// ? 'You will not be billed for any upcoming invoices'
// : 'We will continue to bill current payment methods if required'}
// </li>
<li> <li>
<Trans> <Trans>
Any payment methods attached to this team will remain attached to this Any payment methods attached to this team will remain attached to this

View File

@ -27,7 +27,6 @@ export const DocumentEmailCheckboxes = ({
<Checkbox <Checkbox
id={DocumentEmailEvents.RecipientSigned} id={DocumentEmailEvents.RecipientSigned}
className="h-5 w-5" className="h-5 w-5"
checkClassName="dark:text-white text-primary"
checked={value.recipientSigned} checked={value.recipientSigned}
onCheckedChange={(checked) => onCheckedChange={(checked) =>
onChange({ ...value, [DocumentEmailEvents.RecipientSigned]: Boolean(checked) }) onChange({ ...value, [DocumentEmailEvents.RecipientSigned]: Boolean(checked) })
@ -66,7 +65,6 @@ export const DocumentEmailCheckboxes = ({
<Checkbox <Checkbox
id={DocumentEmailEvents.RecipientSigningRequest} id={DocumentEmailEvents.RecipientSigningRequest}
className="h-5 w-5" className="h-5 w-5"
checkClassName="dark:text-white text-primary"
checked={value.recipientSigningRequest} checked={value.recipientSigningRequest}
onCheckedChange={(checked) => onCheckedChange={(checked) =>
onChange({ ...value, [DocumentEmailEvents.RecipientSigningRequest]: Boolean(checked) }) onChange({ ...value, [DocumentEmailEvents.RecipientSigningRequest]: Boolean(checked) })
@ -105,7 +103,6 @@ export const DocumentEmailCheckboxes = ({
<Checkbox <Checkbox
id={DocumentEmailEvents.RecipientRemoved} id={DocumentEmailEvents.RecipientRemoved}
className="h-5 w-5" className="h-5 w-5"
checkClassName="dark:text-white text-primary"
checked={value.recipientRemoved} checked={value.recipientRemoved}
onCheckedChange={(checked) => onCheckedChange={(checked) =>
onChange({ ...value, [DocumentEmailEvents.RecipientRemoved]: Boolean(checked) }) onChange({ ...value, [DocumentEmailEvents.RecipientRemoved]: Boolean(checked) })
@ -144,7 +141,6 @@ export const DocumentEmailCheckboxes = ({
<Checkbox <Checkbox
id={DocumentEmailEvents.DocumentPending} id={DocumentEmailEvents.DocumentPending}
className="h-5 w-5" className="h-5 w-5"
checkClassName="dark:text-white text-primary"
checked={value.documentPending} checked={value.documentPending}
onCheckedChange={(checked) => onCheckedChange={(checked) =>
onChange({ ...value, [DocumentEmailEvents.DocumentPending]: Boolean(checked) }) onChange({ ...value, [DocumentEmailEvents.DocumentPending]: Boolean(checked) })
@ -184,7 +180,6 @@ export const DocumentEmailCheckboxes = ({
<Checkbox <Checkbox
id={DocumentEmailEvents.DocumentCompleted} id={DocumentEmailEvents.DocumentCompleted}
className="h-5 w-5" className="h-5 w-5"
checkClassName="dark:text-white text-primary"
checked={value.documentCompleted} checked={value.documentCompleted}
onCheckedChange={(checked) => onCheckedChange={(checked) =>
onChange({ ...value, [DocumentEmailEvents.DocumentCompleted]: Boolean(checked) }) onChange({ ...value, [DocumentEmailEvents.DocumentCompleted]: Boolean(checked) })
@ -223,7 +218,6 @@ export const DocumentEmailCheckboxes = ({
<Checkbox <Checkbox
id={DocumentEmailEvents.DocumentDeleted} id={DocumentEmailEvents.DocumentDeleted}
className="h-5 w-5" className="h-5 w-5"
checkClassName="dark:text-white text-primary"
checked={value.documentDeleted} checked={value.documentDeleted}
onCheckedChange={(checked) => onCheckedChange={(checked) =>
onChange({ ...value, [DocumentEmailEvents.DocumentDeleted]: Boolean(checked) }) onChange({ ...value, [DocumentEmailEvents.DocumentDeleted]: Boolean(checked) })
@ -262,7 +256,6 @@ export const DocumentEmailCheckboxes = ({
<Checkbox <Checkbox
id={DocumentEmailEvents.OwnerDocumentCompleted} id={DocumentEmailEvents.OwnerDocumentCompleted}
className="h-5 w-5" className="h-5 w-5"
checkClassName="dark:text-white text-primary"
checked={value.ownerDocumentCompleted} checked={value.ownerDocumentCompleted}
onCheckedChange={(checked) => onCheckedChange={(checked) =>
onChange({ ...value, [DocumentEmailEvents.OwnerDocumentCompleted]: Boolean(checked) }) onChange({ ...value, [DocumentEmailEvents.OwnerDocumentCompleted]: Boolean(checked) })

View File

@ -22,7 +22,7 @@ const Checkbox = React.forwardRef<
{...props} {...props}
> >
<CheckboxPrimitive.Indicator <CheckboxPrimitive.Indicator
className={cn('text-primary flex items-center justify-center', checkClassName)} className={cn('text-primary-foreground flex items-center justify-center', checkClassName)}
> >
<Check className="h-3 w-3 stroke-[3px]" /> <Check className="h-3 w-3 stroke-[3px]" />
</CheckboxPrimitive.Indicator> </CheckboxPrimitive.Indicator>

View File

@ -800,7 +800,6 @@ export const AddFieldsFormPartial = ({
<Checkbox <Checkbox
{...field} {...field}
id="typedSignatureEnabled" id="typedSignatureEnabled"
checkClassName="text-white"
checked={value} checked={value}
onCheckedChange={(checked) => field.onChange(checked)} onCheckedChange={(checked) => field.onChange(checked)}
disabled={form.formState.isSubmitting} disabled={form.formState.isSubmitting}

View File

@ -383,7 +383,6 @@ export const AddSignersFormPartial = ({
<Checkbox <Checkbox
{...field} {...field}
id="signingOrder" id="signingOrder"
checkClassName="text-white"
checked={field.value === DocumentSigningOrder.SEQUENTIAL} checked={field.value === DocumentSigningOrder.SEQUENTIAL}
onCheckedChange={(checked) => onCheckedChange={(checked) =>
field.onChange( field.onChange(
@ -697,7 +696,6 @@ export const AddSignersFormPartial = ({
<Checkbox <Checkbox
id="showAdvancedRecipientSettings" id="showAdvancedRecipientSettings"
className="h-5 w-5" className="h-5 w-5"
checkClassName="dark:text-white text-primary"
checked={showAdvancedSettings} checked={showAdvancedSettings}
onCheckedChange={(value) => setShowAdvancedSettings(Boolean(value))} onCheckedChange={(value) => setShowAdvancedSettings(Boolean(value))}
/> />

View File

@ -34,7 +34,6 @@ export const CheckboxField = ({ field }: CheckboxFieldProps) => {
<div key={index} className="flex items-center gap-x-1.5"> <div key={index} className="flex items-center gap-x-1.5">
<Checkbox <Checkbox
className="dark:border-field-border h-3 w-3 bg-white" className="dark:border-field-border h-3 w-3 bg-white"
checkClassName="text-white"
id={`checkbox-${index}`} id={`checkbox-${index}`}
checked={item.checked} checked={item.checked}
/> />

View File

@ -205,8 +205,7 @@ export const CheckboxFieldAdvancedSettings = ({
{values.map((value, index) => ( {values.map((value, index) => (
<div key={index} className="mt-2 flex items-center gap-4"> <div key={index} className="mt-2 flex items-center gap-4">
<Checkbox <Checkbox
className="data-[state=checked]:bg-documenso border-foreground/30 h-5 w-5" className="data-[state=checked]:bg-primary border-foreground/30 h-5 w-5"
checkClassName="text-white"
checked={value.checked} checked={value.checked}
onCheckedChange={(checked) => handleCheckboxValue(index, 'checked', checked)} onCheckedChange={(checked) => handleCheckboxValue(index, 'checked', checked)}
/> />

View File

@ -587,7 +587,6 @@ export const AddTemplateFieldsFormPartial = ({
<Checkbox <Checkbox
{...field} {...field}
id="typedSignatureEnabled" id="typedSignatureEnabled"
checkClassName="text-white"
checked={value} checked={value}
onCheckedChange={(checked) => field.onChange(checked)} onCheckedChange={(checked) => field.onChange(checked)}
disabled={form.formState.isSubmitting} disabled={form.formState.isSubmitting}

View File

@ -352,7 +352,6 @@ export const AddTemplatePlaceholderRecipientsFormPartial = ({
<Checkbox <Checkbox
{...field} {...field}
id="signingOrder" id="signingOrder"
checkClassName="text-white"
checked={field.value === DocumentSigningOrder.SEQUENTIAL} checked={field.value === DocumentSigningOrder.SEQUENTIAL}
onCheckedChange={(checked) => onCheckedChange={(checked) =>
field.onChange( field.onChange(
@ -651,7 +650,6 @@ export const AddTemplatePlaceholderRecipientsFormPartial = ({
<Checkbox <Checkbox
id="showAdvancedRecipientSettings" id="showAdvancedRecipientSettings"
className="h-5 w-5" className="h-5 w-5"
checkClassName="dark:text-white text-primary"
checked={showAdvancedSettings} checked={showAdvancedSettings}
onCheckedChange={(value) => setShowAdvancedSettings(Boolean(value))} onCheckedChange={(value) => setShowAdvancedSettings(Boolean(value))}
/> />