@opensite/ui 2.5.0 → 2.5.1

package/dist/index.cjs

@@ -15,7 +15,6 @@ var PopoverPrimitive = require('@radix-ui/react-popover');
 var icon = require('@page-speed/icon');
 var usePlatformFromUrl = require('@opensite/hooks/usePlatformFromUrl');
 var TabsPrimitive = require('@radix-ui/react-tabs');
-var forms = require('@page-speed/forms');
 var integration = require('@page-speed/forms/integration');
 
 function _interopNamespace(e) {
@@ -4663,12 +4662,18 @@ function FooterLinksGrid({
     }
   );
 }
+var DEFAULT_STYLE_RULES = {
+  formContainer: "flex items-stretch w-full",
+  fieldsContainer: "",
+  fieldClassName: "",
+  formClassName: ""
+};
 var DEFAULT_FORM_FIELDS = [
   {
     name: "email",
     type: "email",
     label: "Email Address",
-    placeholder: "Enter your email",
+    placeholder: "Email Address",
     required: true,
     columnSpan: 12
   }
@@ -4681,7 +4686,6 @@ function FooterSocialNewsletter({
   className,
   contentClassName,
   logoWrapperClassName,
-  logoClassName,
   gridClassName,
   navSectionClassName,
   navTitleClassName,
@@ -4690,16 +4694,7 @@ function FooterSocialNewsletter({
   socialColumnClassName,
   socialLinksClassName,
   socialLinkClassName,
-  formFields = DEFAULT_FORM_FIELDS,
-  formConfig,
-  onSubmit,
-  onSuccess,
-  onError,
-  successMessage,
-  buttonAction,
-  helperText,
-  formSlot,
-  privacyClassName,
+  formEngineSetup,
   bottomClassName,
   copyrightClassName,
   background,
@@ -4709,104 +4704,36 @@ function FooterSocialNewsletter({
   patternOpacity,
   optixFlowConfig
 }) {
-  const {
-    uploadTokens,
-    uploadProgress,
-    isUploading,
-    uploadFiles,
-    removeFile,
-    resetUpload
-  } = integration.useFileUpload({ onError });
-  const { form, submissionError, formMethod, resetSubmissionState } = integration.useContactForm({
-    formFields,
-    formConfig,
-    onSubmit,
-    onSuccess: (data) => {
-      resetUpload();
-      onSuccess?.(data);
-    },
-    onError,
-    uploadTokens
-  });
   const renderForm = React4__namespace.useMemo(() => {
-    if (formSlot) return formSlot;
-    const defaultButtonAction = {
-      label: "Subscribe",
+    if (!formEngineSetup) return null;
+    const action = {
       variant: "default",
-      className: "h-12"
+      icon: /* @__PURE__ */ jsxRuntime.jsx(DynamicIcon, { name: "lucide/arrow-right", size: 16 })
     };
-    const action = buttonAction || defaultButtonAction;
-    return /* @__PURE__ */ jsxRuntime.jsxs(
-      forms.Form,
+    return /* @__PURE__ */ jsxRuntime.jsx(
+      integration.FormEngine,
       {
-        form,
-        fields: formFields,
-        notificationConfig: {
-          submissionError,
-          successMessage
-        },
-        formConfig: {
-          endpoint: formConfig?.endpoint,
-          method: formMethod,
-          submissionConfig: formConfig?.submissionConfig,
-          formLayout: "button-group",
-          buttonGroupSize: "sm",
-          submitLabel: action.label,
-          submitVariant: action.variant || "default",
-          submitIconComponent: action.icon || /* @__PURE__ */ jsxRuntime.jsx(DynamicIcon, { name: "lucide/send" })
-        },
-        onNewSubmission: () => {
-          resetUpload();
-          resetSubmissionState();
+        formEngineSetup: {
+          ...formEngineSetup,
+          formLayoutSettings: {
+            ...formEngineSetup.formLayoutSettings,
+            formLayout: "button-group",
+            buttonGroupSetup: {
+              ...formEngineSetup.formLayoutSettings?.buttonGroupSetup,
+              size: "default",
+              submitLabel: action.icon || action.label,
+              submitVariant: action.variant
+            }
+          }
         },
-        children: [
-          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-4 sm:flex-row", children: [
-            formFields.map((field) => /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex-1", children: /* @__PURE__ */ jsxRuntime.jsx(
-              integration.DynamicFormField,
-              {
-                field,
-                uploadProgress,
-                onFileUpload: uploadFiles,
-                onFileRemove: removeFile,
-                isUploading
-              }
-            ) }, field.name)),
-            /* @__PURE__ */ jsxRuntime.jsxs(
-              Pressable,
-              {
-                onClick: form.handleSubmit,
-                asButton: true,
-                variant: action.variant,
-                className: cn("h-12", action.className),
-                disabled: form.isSubmitting,
-                children: [
-                  action.label,
-                  action.iconAfter
-                ]
-              }
-            )
-          ] }),
-          helperText && (typeof helperText === "string" ? /* @__PURE__ */ jsxRuntime.jsx("p", { className: cn("text-sm mt-2"), children: helperText }) : helperText)
-        ]
+        defaultFields: DEFAULT_FORM_FIELDS,
+        defaultStyleRules: {
+          ...DEFAULT_STYLE_RULES,
+          formContainer: cn(DEFAULT_STYLE_RULES.formContainer)
+        }
       }
     );
-  }, [
-    formSlot,
-    formFields,
-    form,
-    formConfig,
-    formMethod,
-    buttonAction,
-    uploadProgress,
-    uploadFiles,
-    removeFile,
-    isUploading,
-    submissionError,
-    successMessage,
-    helperText,
-    resetUpload,
-    resetSubmissionState
-  ]);
+  }, [formEngineSetup]);
   return /* @__PURE__ */ jsxRuntime.jsx(
     Section,
     {
@@ -4814,20 +4741,26 @@ function FooterSocialNewsletter({
       spacing,
       pattern,
       patternOpacity,
-      className: cn(className),
+      className,
       containerClassName,
       children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: cn(contentClassName), children: /* @__PURE__ */ jsxRuntime.jsxs("footer", { children: [
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "mb-20", children: [
           logo && /* @__PURE__ */ jsxRuntime.jsx(
-            FooterLogo,
+            Pressable,
             {
-              logo,
-              logoClassName: cn(
-                "flex items-center gap-2",
-                logoWrapperClassName
-              ),
-              logoImageClassName: cn("h-10", logoClassName),
-              optixFlowConfig
+              href: logo.url || "/",
+              className: cn("block mb-8 md:mb-12", logoWrapperClassName),
+              children: /* @__PURE__ */ jsxRuntime.jsx(
+                img.Img,
+                {
+                  src: logo.src,
+                  className: cn(
+                    "h-16 object-contain w-auto max-w-full",
+                    logo.className
+                  ),
+                  optixFlowConfig
+                }
+              )
             }
           ),
           socialLinks && socialLinks.length > 0 && /* @__PURE__ */ jsxRuntime.jsx("div", { className: cn("mt-6", socialColumnClassName), children: /* @__PURE__ */ jsxRuntime.jsx(
@@ -4840,10 +4773,9 @@ function FooterSocialNewsletter({
               children: socialLinks.map((social, idx) => /* @__PURE__ */ jsxRuntime.jsx("li", { children: /* @__PURE__ */ jsxRuntime.jsx(
                 SocialLinkIcon,
                 {
-                  href: social.href,
-                  label: social.label,
-                  iconNameOverride: social.iconNameOverride,
-                  iconSize: 20,
+                  size: "icon-lg",
+                  variant: "ghost",
+                  ...social,
                   className: cn(
                     "opacity-80 transition-colors hover:opacity-100",
                     socialLinkClassName
@@ -6353,7 +6285,7 @@ function FooterAnimatedSocial({
     }
   );
 }
-var DEFAULT_STYLE_RULES = {
+var DEFAULT_STYLE_RULES2 = {
   formContainer: "flex w-full items-end border-b border-b-foreground/10",
   fieldsContainer: "",
   fieldClassName: "",
@@ -6476,9 +6408,9 @@ function FooterNewsletterMinimal({
         },
         defaultFields: DEFAULT_FORM_FIELDS2,
         defaultStyleRules: {
-          ...DEFAULT_STYLE_RULES,
+          ...DEFAULT_STYLE_RULES2,
           formContainer: cn(
-            DEFAULT_STYLE_RULES.formContainer,
+            DEFAULT_STYLE_RULES2.formContainer,
             newsletterFormClassName
           )
         }

package/dist/index.js

@@ -14,8 +14,7 @@ import * as PopoverPrimitive from '@radix-ui/react-popover';
 import { Icon } from '@page-speed/icon';
 import { usePlatformFromUrl } from '@opensite/hooks/usePlatformFromUrl';
 import * as TabsPrimitive from '@radix-ui/react-tabs';
-import { Form } from '@page-speed/forms';
-import { useFileUpload, useContactForm, DynamicFormField, FormEngine } from '@page-speed/forms/integration';
+import { FormEngine } from '@page-speed/forms/integration';
 export { PageSpeedFormSubmissionError, generateInitialValues, generateValidationSchema, getColumnSpanClass, isValidEmail, submitPageSpeedForm, useContactForm, useFileUpload } from '@page-speed/forms/integration';
 
 // components/ui/container.tsx
@@ -4641,12 +4640,18 @@ function FooterLinksGrid({
     }
   );
 }
+var DEFAULT_STYLE_RULES = {
+  formContainer: "flex items-stretch w-full",
+  fieldsContainer: "",
+  fieldClassName: "",
+  formClassName: ""
+};
 var DEFAULT_FORM_FIELDS = [
   {
     name: "email",
     type: "email",
     label: "Email Address",
-    placeholder: "Enter your email",
+    placeholder: "Email Address",
     required: true,
     columnSpan: 12
   }
@@ -4659,7 +4664,6 @@ function FooterSocialNewsletter({
   className,
   contentClassName,
   logoWrapperClassName,
-  logoClassName,
   gridClassName,
   navSectionClassName,
   navTitleClassName,
@@ -4668,16 +4672,7 @@ function FooterSocialNewsletter({
   socialColumnClassName,
   socialLinksClassName,
   socialLinkClassName,
-  formFields = DEFAULT_FORM_FIELDS,
-  formConfig,
-  onSubmit,
-  onSuccess,
-  onError,
-  successMessage,
-  buttonAction,
-  helperText,
-  formSlot,
-  privacyClassName,
+  formEngineSetup,
   bottomClassName,
   copyrightClassName,
   background,
@@ -4687,104 +4682,36 @@ function FooterSocialNewsletter({
   patternOpacity,
   optixFlowConfig
 }) {
-  const {
-    uploadTokens,
-    uploadProgress,
-    isUploading,
-    uploadFiles,
-    removeFile,
-    resetUpload
-  } = useFileUpload({ onError });
-  const { form, submissionError, formMethod, resetSubmissionState } = useContactForm({
-    formFields,
-    formConfig,
-    onSubmit,
-    onSuccess: (data) => {
-      resetUpload();
-      onSuccess?.(data);
-    },
-    onError,
-    uploadTokens
-  });
   const renderForm = React4.useMemo(() => {
-    if (formSlot) return formSlot;
-    const defaultButtonAction = {
-      label: "Subscribe",
+    if (!formEngineSetup) return null;
+    const action = {
       variant: "default",
-      className: "h-12"
+      icon: /* @__PURE__ */ jsx(DynamicIcon, { name: "lucide/arrow-right", size: 16 })
     };
-    const action = buttonAction || defaultButtonAction;
-    return /* @__PURE__ */ jsxs(
-      Form,
+    return /* @__PURE__ */ jsx(
+      FormEngine,
       {
-        form,
-        fields: formFields,
-        notificationConfig: {
-          submissionError,
-          successMessage
-        },
-        formConfig: {
-          endpoint: formConfig?.endpoint,
-          method: formMethod,
-          submissionConfig: formConfig?.submissionConfig,
-          formLayout: "button-group",
-          buttonGroupSize: "sm",
-          submitLabel: action.label,
-          submitVariant: action.variant || "default",
-          submitIconComponent: action.icon || /* @__PURE__ */ jsx(DynamicIcon, { name: "lucide/send" })
-        },
-        onNewSubmission: () => {
-          resetUpload();
-          resetSubmissionState();
+        formEngineSetup: {
+          ...formEngineSetup,
+          formLayoutSettings: {
+            ...formEngineSetup.formLayoutSettings,
+            formLayout: "button-group",
+            buttonGroupSetup: {
+              ...formEngineSetup.formLayoutSettings?.buttonGroupSetup,
+              size: "default",
+              submitLabel: action.icon || action.label,
+              submitVariant: action.variant
+            }
+          }
         },
-        children: [
-          /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-4 sm:flex-row", children: [
-            formFields.map((field) => /* @__PURE__ */ jsx("div", { className: "flex-1", children: /* @__PURE__ */ jsx(
-              DynamicFormField,
-              {
-                field,
-                uploadProgress,
-                onFileUpload: uploadFiles,
-                onFileRemove: removeFile,
-                isUploading
-              }
-            ) }, field.name)),
-            /* @__PURE__ */ jsxs(
-              Pressable,
-              {
-                onClick: form.handleSubmit,
-                asButton: true,
-                variant: action.variant,
-                className: cn("h-12", action.className),
-                disabled: form.isSubmitting,
-                children: [
-                  action.label,
-                  action.iconAfter
-                ]
-              }
-            )
-          ] }),
-          helperText && (typeof helperText === "string" ? /* @__PURE__ */ jsx("p", { className: cn("text-sm mt-2"), children: helperText }) : helperText)
-        ]
+        defaultFields: DEFAULT_FORM_FIELDS,
+        defaultStyleRules: {
+          ...DEFAULT_STYLE_RULES,
+          formContainer: cn(DEFAULT_STYLE_RULES.formContainer)
+        }
       }
     );
-  }, [
-    formSlot,
-    formFields,
-    form,
-    formConfig,
-    formMethod,
-    buttonAction,
-    uploadProgress,
-    uploadFiles,
-    removeFile,
-    isUploading,
-    submissionError,
-    successMessage,
-    helperText,
-    resetUpload,
-    resetSubmissionState
-  ]);
+  }, [formEngineSetup]);
   return /* @__PURE__ */ jsx(
     Section,
     {
@@ -4792,20 +4719,26 @@ function FooterSocialNewsletter({
       spacing,
       pattern,
       patternOpacity,
-      className: cn(className),
+      className,
       containerClassName,
       children: /* @__PURE__ */ jsx("div", { className: cn(contentClassName), children: /* @__PURE__ */ jsxs("footer", { children: [
         /* @__PURE__ */ jsxs("div", { className: "mb-20", children: [
           logo && /* @__PURE__ */ jsx(
-            FooterLogo,
+            Pressable,
             {
-              logo,
-              logoClassName: cn(
-                "flex items-center gap-2",
-                logoWrapperClassName
-              ),
-              logoImageClassName: cn("h-10", logoClassName),
-              optixFlowConfig
+              href: logo.url || "/",
+              className: cn("block mb-8 md:mb-12", logoWrapperClassName),
+              children: /* @__PURE__ */ jsx(
+                Img,
+                {
+                  src: logo.src,
+                  className: cn(
+                    "h-16 object-contain w-auto max-w-full",
+                    logo.className
+                  ),
+                  optixFlowConfig
+                }
+              )
             }
           ),
           socialLinks && socialLinks.length > 0 && /* @__PURE__ */ jsx("div", { className: cn("mt-6", socialColumnClassName), children: /* @__PURE__ */ jsx(
@@ -4818,10 +4751,9 @@ function FooterSocialNewsletter({
               children: socialLinks.map((social, idx) => /* @__PURE__ */ jsx("li", { children: /* @__PURE__ */ jsx(
                 SocialLinkIcon,
                 {
-                  href: social.href,
-                  label: social.label,
-                  iconNameOverride: social.iconNameOverride,
-                  iconSize: 20,
+                  size: "icon-lg",
+                  variant: "ghost",
+                  ...social,
                   className: cn(
                     "opacity-80 transition-colors hover:opacity-100",
                     socialLinkClassName
@@ -6331,7 +6263,7 @@ function FooterAnimatedSocial({
     }
   );
 }
-var DEFAULT_STYLE_RULES = {
+var DEFAULT_STYLE_RULES2 = {
   formContainer: "flex w-full items-end border-b border-b-foreground/10",
   fieldsContainer: "",
   fieldClassName: "",
@@ -6454,9 +6386,9 @@ function FooterNewsletterMinimal({
         },
         defaultFields: DEFAULT_FORM_FIELDS2,
         defaultStyleRules: {
-          ...DEFAULT_STYLE_RULES,
+          ...DEFAULT_STYLE_RULES2,
           formContainer: cn(
-            DEFAULT_STYLE_RULES.formContainer,
+            DEFAULT_STYLE_RULES2.formContainer,
             newsletterFormClassName
           )
         }