Adjust branding defaults and tenant presets

resources/js/admin/lib/brandingForm.ts

@@ -17,7 +17,6 @@ export type BrandingFormValues = {
   buttonPrimary: string;
   buttonSecondary: string;
   linkColor: string;
-  useDefaultBranding: boolean;
 };
 
 export type BrandingFormDefaults = Pick<
@@ -26,6 +25,8 @@ export type BrandingFormDefaults = Pick<
   | 'accent'
   | 'background'
   | 'surface'
+  | 'headingFont'
+  | 'bodyFont'
   | 'mode'
   | 'buttonStyle'
   | 'buttonRadius'
@@ -130,8 +131,8 @@ export function extractBrandingForm(settings: unknown, defaults: BrandingFormDef
     accent,
     background,
     surface,
-    headingFont: headingFont ?? '',
-    bodyFont: bodyFont ?? '',
+    headingFont: headingFont ?? defaults.headingFont ?? '',
+    bodyFont: bodyFont ?? defaults.bodyFont ?? '',
     fontSize,
     logoDataUrl: resolveAssetPreviewUrl(logoUploadValue),
     logoValue,
@@ -144,6 +145,5 @@ export function extractBrandingForm(settings: unknown, defaults: BrandingFormDef
     buttonPrimary,
     buttonSecondary,
     linkColor,
-    useDefaultBranding: branding.use_default_branding === true,
   };
 }