@opensite/ui 1.9.2 → 1.9.4

package/dist/contact-dark.cjs

@@ -773,77 +773,6 @@ function DynamicFormField({
     }
   );
 }
-
-// lib/form-field-types.ts
-function generateInitialValues(fields) {
-  return fields.reduce(
-    (acc, field) => {
-      if (field.type === "checkbox") {
-        acc[field.name] = false;
-      } else if (field.type === "checkbox-group" || field.type === "multi-select") {
-        acc[field.name] = [];
-      } else if (field.type === "file") {
-        acc[field.name] = [];
-      } else if (field.type === "date-range") {
-        acc[field.name] = { start: null, end: null };
-      } else {
-        acc[field.name] = "";
-      }
-      return acc;
-    },
-    {}
-  );
-}
-function generateValidationSchema(fields) {
-  return fields.reduce(
-    (acc, field) => {
-      acc[field.name] = (value, allValues) => {
-        if (field.required) {
-          if (!value || typeof value === "string" && !value.trim()) {
-            return `${field.label} is required`;
-          }
-        }
-        if (field.type === "email" && value) {
-          if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value)) {
-            return "Please enter a valid email address";
-          }
-        }
-        if (field.type === "url" && value) {
-          try {
-            new URL(value);
-          } catch {
-            return "Please enter a valid URL";
-          }
-        }
-        if (field.validator) {
-          return field.validator(value, allValues);
-        }
-        return void 0;
-      };
-      return acc;
-    },
-    {}
-  );
-}
-var columnSpanClasses = {
-  1: "col-span-12 md:col-span-1",
-  2: "col-span-12 md:col-span-2",
-  3: "col-span-12 md:col-span-3",
-  4: "col-span-12 md:col-span-4",
-  5: "col-span-12 md:col-span-5",
-  6: "col-span-12 md:col-span-6",
-  7: "col-span-12 md:col-span-7",
-  8: "col-span-12 md:col-span-8",
-  9: "col-span-12 md:col-span-9",
-  10: "col-span-12 md:col-span-10",
-  11: "col-span-12 md:col-span-11",
-  12: "col-span-12"
-};
-function getColumnSpanClass(span) {
-  if (!span || span === 12) return "col-span-12";
-  const clamped = Math.max(1, Math.min(span, 12));
-  return columnSpanClasses[clamped] || "col-span-12";
-}
 function useFileUpload(options) {
   const [uploadTokens, setUploadTokens] = React.useState([]);
   const [uploadProgress, setUploadProgress] = React.useState({});
@@ -908,6 +837,60 @@ function useFileUpload(options) {
     resetUpload
   };
 }
+
+// lib/form-field-types.ts
+function generateInitialValues(fields) {
+  return fields.reduce(
+    (acc, field) => {
+      if (field.type === "checkbox") {
+        acc[field.name] = false;
+      } else if (field.type === "checkbox-group" || field.type === "multi-select") {
+        acc[field.name] = [];
+      } else if (field.type === "file") {
+        acc[field.name] = [];
+      } else if (field.type === "date-range") {
+        acc[field.name] = { start: null, end: null };
+      } else {
+        acc[field.name] = "";
+      }
+      return acc;
+    },
+    {}
+  );
+}
+function generateValidationSchema(fields) {
+  return fields.reduce(
+    (acc, field) => {
+      acc[field.name] = (value, allValues) => {
+        if (field.required) {
+          if (!value || typeof value === "string" && !value.trim()) {
+            return `${field.label} is required`;
+          }
+        }
+        if (field.type === "email" && value) {
+          if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value)) {
+            return "Please enter a valid email address";
+          }
+        }
+        if (field.type === "url" && value) {
+          try {
+            new URL(value);
+          } catch {
+            return "Please enter a valid URL";
+          }
+        }
+        if (field.validator) {
+          return field.validator(value, allValues);
+        }
+        return void 0;
+      };
+      return acc;
+    },
+    {}
+  );
+}
+
+// lib/forms/use-contact-form.ts
 function useContactForm(options) {
   const {
     formFields,
@@ -1728,25 +1711,69 @@ function ContactDark({
                     resetUpload();
                     resetSubmissionState();
                   },
-                  className: cn("space-y-6", formClassName),
+                  className: formClassName,
                   children: [
-                    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "grid grid-cols-12 gap-6", children: formFields.map((field) => /* @__PURE__ */ jsxRuntime.jsx(
-                      "div",
-                      {
-                        className: getColumnSpanClass(field.columnSpan),
-                        children: /* @__PURE__ */ jsxRuntime.jsx(
-                          DynamicFormField,
-                          {
-                            field,
-                            uploadProgress,
-                            onFileUpload: uploadFiles,
-                            onFileRemove: removeFile,
-                            isUploading
-                          }
-                        )
-                      },
-                      field.name
-                    )) }),
+                    (() => {
+                      const fieldElements = [];
+                      let skip = false;
+                      formFields.forEach((field, index) => {
+                        if (skip) {
+                          skip = false;
+                          return;
+                        }
+                        const nextField = index < formFields.length - 1 ? formFields[index + 1] : null;
+                        const shouldGroupWithNext = field.columnSpan && field.columnSpan <= 6 && nextField?.columnSpan && nextField.columnSpan <= 6 && field.columnSpan + nextField.columnSpan <= 12;
+                        if (shouldGroupWithNext && nextField) {
+                          fieldElements.push(
+                            /* @__PURE__ */ jsxRuntime.jsxs(
+                              "div",
+                              {
+                                className: "grid grid-cols-1 sm:grid-cols-2 gap-4",
+                                children: [
+                                  /* @__PURE__ */ jsxRuntime.jsx(
+                                    DynamicFormField,
+                                    {
+                                      field,
+                                      uploadProgress,
+                                      onFileUpload: uploadFiles,
+                                      onFileRemove: removeFile,
+                                      isUploading
+                                    }
+                                  ),
+                                  /* @__PURE__ */ jsxRuntime.jsx(
+                                    DynamicFormField,
+                                    {
+                                      field: nextField,
+                                      uploadProgress,
+                                      onFileUpload: uploadFiles,
+                                      onFileRemove: removeFile,
+                                      isUploading
+                                    }
+                                  )
+                                ]
+                              },
+                              field.name
+                            )
+                          );
+                          skip = true;
+                        } else {
+                          fieldElements.push(
+                            /* @__PURE__ */ jsxRuntime.jsx(
+                              DynamicFormField,
+                              {
+                                field,
+                                uploadProgress,
+                                onFileUpload: uploadFiles,
+                                onFileRemove: removeFile,
+                                isUploading
+                              },
+                              field.name
+                            )
+                          );
+                        }
+                      });
+                      return fieldElements;
+                    })(),
                     actionsSlot || actions && actions.length > 0 ? actionsContent : /* @__PURE__ */ jsxRuntime.jsxs(
                       Pressable,
                       {

package/dist/contact-dark.d.cts

@@ -1,12 +1,12 @@
 import * as React from 'react';
 import { F as FormFieldConfig } from './form-field-types-BTyCq8Hy.cjs';
 import { P as PageSpeedFormConfig } from './forms-CStlFhnh.cjs';
-import { f as SectionBackground, g as SectionSpacing, s as PatternName } from './community-initiatives-k1_FqqBQ.cjs';
-import { A as ActionConfig } from './blocks-rgCERYOC.cjs';
+import { f as SectionBackground, g as SectionSpacing, s as PatternName } from './community-initiatives-Bs7X576B.cjs';
+import { A as ActionConfig } from './blocks-DyVWHMtH.cjs';
 import '@page-speed/forms/integration';
 import 'react/jsx-runtime';
 import 'class-variance-authority';
-import './button-variants-lRElsmTc.cjs';
+import './button-variants-8mtEHxev.cjs';
 import 'class-variance-authority/types';
 
 interface ContactDarkOption {

package/dist/contact-dark.d.ts

@@ -1,12 +1,12 @@
 import * as React from 'react';
 import { F as FormFieldConfig } from './form-field-types-BTyCq8Hy.js';
 import { P as PageSpeedFormConfig } from './forms-CStlFhnh.js';
-import { f as SectionBackground, g as SectionSpacing, s as PatternName } from './community-initiatives-AwBlQu1a.js';
-import { A as ActionConfig } from './blocks-ClXAGlHQ.js';
+import { f as SectionBackground, g as SectionSpacing, s as PatternName } from './community-initiatives-CxYoHqdn.js';
+import { A as ActionConfig } from './blocks-S9tBV7Wg.js';
 import '@page-speed/forms/integration';
 import 'react/jsx-runtime';
 import 'class-variance-authority';
-import './button-variants-lRElsmTc.js';
+import './button-variants-8mtEHxev.js';
 import 'class-variance-authority/types';
 
 interface ContactDarkOption {

package/dist/contact-dark.js

@@ -752,77 +752,6 @@ function DynamicFormField({
     }
   );
 }
-
-// lib/form-field-types.ts
-function generateInitialValues(fields) {
-  return fields.reduce(
-    (acc, field) => {
-      if (field.type === "checkbox") {
-        acc[field.name] = false;
-      } else if (field.type === "checkbox-group" || field.type === "multi-select") {
-        acc[field.name] = [];
-      } else if (field.type === "file") {
-        acc[field.name] = [];
-      } else if (field.type === "date-range") {
-        acc[field.name] = { start: null, end: null };
-      } else {
-        acc[field.name] = "";
-      }
-      return acc;
-    },
-    {}
-  );
-}
-function generateValidationSchema(fields) {
-  return fields.reduce(
-    (acc, field) => {
-      acc[field.name] = (value, allValues) => {
-        if (field.required) {
-          if (!value || typeof value === "string" && !value.trim()) {
-            return `${field.label} is required`;
-          }
-        }
-        if (field.type === "email" && value) {
-          if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value)) {
-            return "Please enter a valid email address";
-          }
-        }
-        if (field.type === "url" && value) {
-          try {
-            new URL(value);
-          } catch {
-            return "Please enter a valid URL";
-          }
-        }
-        if (field.validator) {
-          return field.validator(value, allValues);
-        }
-        return void 0;
-      };
-      return acc;
-    },
-    {}
-  );
-}
-var columnSpanClasses = {
-  1: "col-span-12 md:col-span-1",
-  2: "col-span-12 md:col-span-2",
-  3: "col-span-12 md:col-span-3",
-  4: "col-span-12 md:col-span-4",
-  5: "col-span-12 md:col-span-5",
-  6: "col-span-12 md:col-span-6",
-  7: "col-span-12 md:col-span-7",
-  8: "col-span-12 md:col-span-8",
-  9: "col-span-12 md:col-span-9",
-  10: "col-span-12 md:col-span-10",
-  11: "col-span-12 md:col-span-11",
-  12: "col-span-12"
-};
-function getColumnSpanClass(span) {
-  if (!span || span === 12) return "col-span-12";
-  const clamped = Math.max(1, Math.min(span, 12));
-  return columnSpanClasses[clamped] || "col-span-12";
-}
 function useFileUpload(options) {
   const [uploadTokens, setUploadTokens] = useState([]);
   const [uploadProgress, setUploadProgress] = useState({});
@@ -887,6 +816,60 @@ function useFileUpload(options) {
     resetUpload
   };
 }
+
+// lib/form-field-types.ts
+function generateInitialValues(fields) {
+  return fields.reduce(
+    (acc, field) => {
+      if (field.type === "checkbox") {
+        acc[field.name] = false;
+      } else if (field.type === "checkbox-group" || field.type === "multi-select") {
+        acc[field.name] = [];
+      } else if (field.type === "file") {
+        acc[field.name] = [];
+      } else if (field.type === "date-range") {
+        acc[field.name] = { start: null, end: null };
+      } else {
+        acc[field.name] = "";
+      }
+      return acc;
+    },
+    {}
+  );
+}
+function generateValidationSchema(fields) {
+  return fields.reduce(
+    (acc, field) => {
+      acc[field.name] = (value, allValues) => {
+        if (field.required) {
+          if (!value || typeof value === "string" && !value.trim()) {
+            return `${field.label} is required`;
+          }
+        }
+        if (field.type === "email" && value) {
+          if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value)) {
+            return "Please enter a valid email address";
+          }
+        }
+        if (field.type === "url" && value) {
+          try {
+            new URL(value);
+          } catch {
+            return "Please enter a valid URL";
+          }
+        }
+        if (field.validator) {
+          return field.validator(value, allValues);
+        }
+        return void 0;
+      };
+      return acc;
+    },
+    {}
+  );
+}
+
+// lib/forms/use-contact-form.ts
 function useContactForm(options) {
   const {
     formFields,
@@ -1707,25 +1690,69 @@ function ContactDark({
                     resetUpload();
                     resetSubmissionState();
                   },
-                  className: cn("space-y-6", formClassName),
+                  className: formClassName,
                   children: [
-                    /* @__PURE__ */ jsx("div", { className: "grid grid-cols-12 gap-6", children: formFields.map((field) => /* @__PURE__ */ jsx(
-                      "div",
-                      {
-                        className: getColumnSpanClass(field.columnSpan),
-                        children: /* @__PURE__ */ jsx(
-                          DynamicFormField,
-                          {
-                            field,
-                            uploadProgress,
-                            onFileUpload: uploadFiles,
-                            onFileRemove: removeFile,
-                            isUploading
-                          }
-                        )
-                      },
-                      field.name
-                    )) }),
+                    (() => {
+                      const fieldElements = [];
+                      let skip = false;
+                      formFields.forEach((field, index) => {
+                        if (skip) {
+                          skip = false;
+                          return;
+                        }
+                        const nextField = index < formFields.length - 1 ? formFields[index + 1] : null;
+                        const shouldGroupWithNext = field.columnSpan && field.columnSpan <= 6 && nextField?.columnSpan && nextField.columnSpan <= 6 && field.columnSpan + nextField.columnSpan <= 12;
+                        if (shouldGroupWithNext && nextField) {
+                          fieldElements.push(
+                            /* @__PURE__ */ jsxs(
+                              "div",
+                              {
+                                className: "grid grid-cols-1 sm:grid-cols-2 gap-4",
+                                children: [
+                                  /* @__PURE__ */ jsx(
+                                    DynamicFormField,
+                                    {
+                                      field,
+                                      uploadProgress,
+                                      onFileUpload: uploadFiles,
+                                      onFileRemove: removeFile,
+                                      isUploading
+                                    }
+                                  ),
+                                  /* @__PURE__ */ jsx(
+                                    DynamicFormField,
+                                    {
+                                      field: nextField,
+                                      uploadProgress,
+                                      onFileUpload: uploadFiles,
+                                      onFileRemove: removeFile,
+                                      isUploading
+                                    }
+                                  )
+                                ]
+                              },
+                              field.name
+                            )
+                          );
+                          skip = true;
+                        } else {
+                          fieldElements.push(
+                            /* @__PURE__ */ jsx(
+                              DynamicFormField,
+                              {
+                                field,
+                                uploadProgress,
+                                onFileUpload: uploadFiles,
+                                onFileRemove: removeFile,
+                                isUploading
+                              },
+                              field.name
+                            )
+                          );
+                        }
+                      });
+                      return fieldElements;
+                    })(),
                     actionsSlot || actions && actions.length > 0 ? actionsContent : /* @__PURE__ */ jsxs(
                       Pressable,
                       {

package/dist/contact-demo.d.cts

@@ -1,11 +1,11 @@
 import * as React from 'react';
 import { P as PageSpeedFormConfig } from './forms-CStlFhnh.cjs';
-import { f as SectionBackground, g as SectionSpacing, s as PatternName } from './community-initiatives-k1_FqqBQ.cjs';
-import { A as ActionConfig } from './blocks-rgCERYOC.cjs';
+import { f as SectionBackground, g as SectionSpacing, s as PatternName } from './community-initiatives-Bs7X576B.cjs';
+import { A as ActionConfig } from './blocks-DyVWHMtH.cjs';
 import '@page-speed/forms/integration';
 import 'react/jsx-runtime';
 import 'class-variance-authority';
-import './button-variants-lRElsmTc.cjs';
+import './button-variants-8mtEHxev.cjs';
 import 'class-variance-authority/types';
 
 interface DemoFormValues {

package/dist/contact-demo.d.ts

@@ -1,11 +1,11 @@
 import * as React from 'react';
 import { P as PageSpeedFormConfig } from './forms-CStlFhnh.js';
-import { f as SectionBackground, g as SectionSpacing, s as PatternName } from './community-initiatives-AwBlQu1a.js';
-import { A as ActionConfig } from './blocks-ClXAGlHQ.js';
+import { f as SectionBackground, g as SectionSpacing, s as PatternName } from './community-initiatives-CxYoHqdn.js';
+import { A as ActionConfig } from './blocks-S9tBV7Wg.js';
 import '@page-speed/forms/integration';
 import 'react/jsx-runtime';
 import 'class-variance-authority';
-import './button-variants-lRElsmTc.js';
+import './button-variants-8mtEHxev.js';
 import 'class-variance-authority/types';
 
 interface DemoFormValues {

package/dist/contact-emergency.d.cts

@@ -1,11 +1,11 @@
 import * as React from 'react';
 import { P as PageSpeedFormConfig } from './forms-CStlFhnh.cjs';
-import { f as SectionBackground, g as SectionSpacing, s as PatternName } from './community-initiatives-k1_FqqBQ.cjs';
-import { A as ActionConfig } from './blocks-rgCERYOC.cjs';
+import { f as SectionBackground, g as SectionSpacing, s as PatternName } from './community-initiatives-Bs7X576B.cjs';
+import { A as ActionConfig } from './blocks-DyVWHMtH.cjs';
 import '@page-speed/forms/integration';
 import 'react/jsx-runtime';
 import 'class-variance-authority';
-import './button-variants-lRElsmTc.cjs';
+import './button-variants-8mtEHxev.cjs';
 import 'class-variance-authority/types';
 
 interface EmergencyFormValues {

package/dist/contact-emergency.d.ts

@@ -1,11 +1,11 @@
 import * as React from 'react';
 import { P as PageSpeedFormConfig } from './forms-CStlFhnh.js';
-import { f as SectionBackground, g as SectionSpacing, s as PatternName } from './community-initiatives-AwBlQu1a.js';
-import { A as ActionConfig } from './blocks-ClXAGlHQ.js';
+import { f as SectionBackground, g as SectionSpacing, s as PatternName } from './community-initiatives-CxYoHqdn.js';
+import { A as ActionConfig } from './blocks-S9tBV7Wg.js';
 import '@page-speed/forms/integration';
 import 'react/jsx-runtime';
 import 'class-variance-authority';
-import './button-variants-lRElsmTc.js';
+import './button-variants-8mtEHxev.js';
 import 'class-variance-authority/types';
 
 interface EmergencyFormValues {

package/dist/contact-event.d.cts

@@ -1,11 +1,11 @@
 import * as React from 'react';
 import { P as PageSpeedFormConfig } from './forms-CStlFhnh.cjs';
-import { f as SectionBackground, g as SectionSpacing, s as PatternName } from './community-initiatives-k1_FqqBQ.cjs';
-import { A as ActionConfig } from './blocks-rgCERYOC.cjs';
+import { f as SectionBackground, g as SectionSpacing, s as PatternName } from './community-initiatives-Bs7X576B.cjs';
+import { A as ActionConfig } from './blocks-DyVWHMtH.cjs';
 import '@page-speed/forms/integration';
 import 'react/jsx-runtime';
 import 'class-variance-authority';
-import './button-variants-lRElsmTc.cjs';
+import './button-variants-8mtEHxev.cjs';
 import 'class-variance-authority/types';
 
 interface ContactEventFormValues {

package/dist/contact-event.d.ts

@@ -1,11 +1,11 @@
 import * as React from 'react';
 import { P as PageSpeedFormConfig } from './forms-CStlFhnh.js';
-import { f as SectionBackground, g as SectionSpacing, s as PatternName } from './community-initiatives-AwBlQu1a.js';
-import { A as ActionConfig } from './blocks-ClXAGlHQ.js';
+import { f as SectionBackground, g as SectionSpacing, s as PatternName } from './community-initiatives-CxYoHqdn.js';
+import { A as ActionConfig } from './blocks-S9tBV7Wg.js';
 import '@page-speed/forms/integration';
 import 'react/jsx-runtime';
 import 'class-variance-authority';
-import './button-variants-lRElsmTc.js';
+import './button-variants-8mtEHxev.js';
 import 'class-variance-authority/types';
 
 interface ContactEventFormValues {