From 23f803dc79321f63eb348a4e146b7b272684d68e Mon Sep 17 00:00:00 2001 From: Marcus Farrell Date: Wed, 26 Aug 2026 13:25:02 -0700 Subject: [PATCH 1/2] Color picker component --- .../[groupSlug]/settings/group-settings.tsx | 10 +- .../program/groups/create-group-modal.tsx | 10 +- .../program-brand-assets/add-color-modal.tsx | 57 +-- apps/web/lib/zod/schemas/tags.ts | 6 +- apps/web/ui/colors.ts | 86 +++- apps/web/ui/links/tag-badge.tsx | 4 +- apps/web/ui/modals/add-edit-tag-modal.tsx | 4 +- apps/web/ui/modals/link-qr-modal.tsx | 12 +- apps/web/ui/modals/qr-code-design-fields.tsx | 466 ++++++++---------- .../groups/design/branding-settings-form.tsx | 10 +- .../ui/partners/groups/group-color-picker.tsx | 111 ----- apps/web/ui/partners/program-color-picker.tsx | 155 ------ apps/web/ui/shared/color-picker.tsx | 315 ++++++++++++ 13 files changed, 639 insertions(+), 607 deletions(-) delete mode 100644 apps/web/ui/partners/groups/group-color-picker.tsx delete mode 100644 apps/web/ui/partners/program-color-picker.tsx create mode 100644 apps/web/ui/shared/color-picker.tsx diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/settings/group-settings.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/settings/group-settings.tsx index b24f5e6c41d..624f8f6ee8b 100644 --- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/settings/group-settings.tsx +++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/[groupSlug]/settings/group-settings.tsx @@ -9,8 +9,8 @@ import { DEFAULT_PARTNER_GROUP, updateGroupSchema, } from "@/lib/zod/schemas/groups"; -import { GroupColorPicker } from "@/ui/partners/groups/group-color-picker"; import { GroupSettingsRow } from "@/ui/partners/groups/group-settings-row"; +import { ColorPicker, RESOURCE_COLOR_SWATCHES } from "@/ui/shared/color-picker"; import { Button, CopyButton } from "@dub/ui"; import { cn } from "@dub/utils"; import slugify from "@sindresorhus/slugify"; @@ -133,9 +133,13 @@ function GroupSettingsForm({ control={control} name="color" render={({ field }) => ( - )} /> diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/create-group-modal.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/create-group-modal.tsx index 1c221c23a68..b4689932327 100644 --- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/create-group-modal.tsx +++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/create-group-modal.tsx @@ -3,7 +3,7 @@ import { useApiMutation } from "@/lib/swr/use-api-mutation"; import useWorkspace from "@/lib/swr/use-workspace"; import { createGroupSchema } from "@/lib/zod/schemas/groups"; import { RESOURCE_COLORS } from "@/ui/colors"; -import { GroupColorPicker } from "@/ui/partners/groups/group-color-picker"; +import { ColorPicker, RESOURCE_COLOR_SWATCHES } from "@/ui/shared/color-picker"; import { Button, Modal } from "@dub/ui"; import { cn } from "@dub/utils"; import slugify from "@sindresorhus/slugify"; @@ -92,9 +92,13 @@ function CreateGroupModalContent({ setIsOpen }: CreateGroupModalProps) { control={control} name="color" render={({ field }) => ( - )} /> diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/resources/program-brand-assets/add-color-modal.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/resources/program-brand-assets/add-color-modal.tsx index e8fafb51fb0..b46bf7a9a33 100644 --- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/resources/program-brand-assets/add-color-modal.tsx +++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/resources/program-brand-assets/add-color-modal.tsx @@ -5,6 +5,7 @@ import { updateProgramResourceAction } from "@/lib/actions/partners/program-reso import useProgramResources from "@/lib/swr/use-program-resources"; import useWorkspace from "@/lib/swr/use-workspace"; import { ProgramResourceColor } from "@/lib/zod/schemas/program-resources"; +import { ColorSelector } from "@/ui/shared/color-picker"; import { Button, Modal } from "@dub/ui"; import { cn } from "@dub/utils"; import { useAction } from "next-safe-action/hooks"; @@ -12,11 +13,9 @@ import { Dispatch, SetStateAction, useCallback, - useEffect, useMemo, useState, } from "react"; -import { HexColorPicker } from "react-colorful"; import { useForm } from "react-hook-form"; import { toast } from "sonner"; import * as z from "zod/v4"; @@ -55,10 +54,6 @@ function ColorModalInner({ const { mutate } = useProgramResources(); const isEditing = Boolean(existingResource); - const [hexInputValue, setHexInputValue] = useState( - existingResource?.color || "#000000", - ); - const { register, handleSubmit, @@ -77,19 +72,6 @@ function ColorModalInner({ const selectedColor = watch("color"); - // Keep hex input in sync with form value - useEffect(() => setHexInputValue(selectedColor), [selectedColor]); - - const handleHexInputChange = (e: React.ChangeEvent) => { - const value = e.target.value; - setHexInputValue(value); - - // Only update form value if it's a valid hex color - if (/^#?[0-9A-F]{6}$/i.test(value)) { - setValue("color", value.startsWith("#") ? value : `#${value}`); - } - }; - const { executeAsync: executeAdd } = useAction(addProgramResourceAction, { onSuccess: () => { mutate(); @@ -160,33 +142,14 @@ function ColorModalInner({
- - Color - -
- - setValue("color", color, { shouldDirty: true }) - } - /> -
-
- - +