merchi_cart 1.3.2 → 1.3.3

package/esm/components/CustomCartProductForm.js

@@ -0,0 +1,129 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import React, { useEffect, useMemo, useRef, useState } from 'react';
+import { MerchiProductFormSdkExternals } from './product-form-sdk-externals';
+import { loadFormBundle, publishedFormBundle } from '../utilities/customForm';
+import { LoadingTemplateSm } from './LoadingTemplate';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+/**
+ * Loads a product's published custom form for cart-item edit. On any failure
+ * renders `fallback` (the default merchi_product_form) so the cart stays usable.
+ */
+export function CustomCartProductForm(_ref) {
+  var _publishedFormBundle$, _publishedFormBundle;
+  var product = _ref.product,
+    initialJob = _ref.initialJob,
+    apiUrl = _ref.apiUrl,
+    onSave = _ref.onSave,
+    fallback = _ref.fallback,
+    onActiveChange = _ref.onActiveChange;
+  var _useState = useState(null),
+    _useState2 = _slicedToArray(_useState, 2),
+    Loaded = _useState2[0],
+    setLoaded = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    failed = _useState4[0],
+    setFailed = _useState4[1];
+  var _useState5 = useState(true),
+    _useState6 = _slicedToArray(_useState5, 2),
+    loading = _useState6[0],
+    setLoading = _useState6[1];
+  var onSaveRef = useRef(onSave);
+  onSaveRef.current = onSave;
+  var onActiveChangeRef = useRef(onActiveChange);
+  onActiveChangeRef.current = onActiveChange;
+  var bundleKey = (_publishedFormBundle$ = (_publishedFormBundle = publishedFormBundle(product)) === null || _publishedFormBundle === void 0 ? void 0 : _publishedFormBundle.url) !== null && _publishedFormBundle$ !== void 0 ? _publishedFormBundle$ : '';
+  useEffect(function () {
+    var active = true;
+    setLoaded(null);
+    setFailed(false);
+    setLoading(true);
+    var bundle = publishedFormBundle(product);
+    if (!bundle) {
+      setFailed(true);
+      setLoading(false);
+      return;
+    }
+    var w = window;
+    w.React = React;
+    w.MerchiProductFormSdk = MerchiProductFormSdkExternals;
+    loadFormBundle(bundle).then(function (Component) {
+      if (active) {
+        setLoaded(function () {
+          return Component;
+        });
+        setLoading(false);
+      }
+    })["catch"](function (e) {
+      console.error('[merchi_cart] custom form load failed', e);
+      if (active) {
+        setFailed(true);
+        setLoading(false);
+      }
+    });
+    return function () {
+      active = false;
+    };
+  }, [product, bundleKey]);
+  var props = useMemo(function () {
+    try {
+      var runtime = MerchiProductFormSdkExternals.createProductFormRuntime({
+        apiUrl: apiUrl || '',
+        product: product,
+        onAddToCart: function onAddToCart(job) {
+          var _onSaveRef$current;
+          return (_onSaveRef$current = onSaveRef.current) === null || _onSaveRef$current === void 0 ? void 0 : _onSaveRef$current.call(onSaveRef, job);
+        }
+      });
+      return {
+        product: product,
+        pricing: runtime.pricing,
+        actions: runtime.actions,
+        helpers: runtime.helpers
+      };
+    } catch (e) {
+      console.error('[merchi_cart] custom form props build failed', e);
+      return null;
+    }
+  }, [product, apiUrl]);
+  var isActive = !failed && !loading && !!Loaded && !!props;
+  useEffect(function () {
+    var _onActiveChangeRef$cu;
+    (_onActiveChangeRef$cu = onActiveChangeRef.current) === null || _onActiveChangeRef$cu === void 0 || _onActiveChangeRef$cu.call(onActiveChangeRef, isActive);
+    return function () {
+      var _onActiveChangeRef$cu2;
+      return (_onActiveChangeRef$cu2 = onActiveChangeRef.current) === null || _onActiveChangeRef$cu2 === void 0 ? void 0 : _onActiveChangeRef$cu2.call(onActiveChangeRef, false);
+    };
+  }, [isActive]);
+  if (loading) return /*#__PURE__*/_jsx(LoadingTemplateSm, {});
+  if (failed || !Loaded || !props) return /*#__PURE__*/_jsx(_Fragment, {
+    children: fallback
+  });
+  var Shell = MerchiProductFormSdkExternals.ProductFormShell;
+  return /*#__PURE__*/_jsx(_Fragment, {
+    children: Shell ? /*#__PURE__*/_jsx(Shell, {
+      product: props.product,
+      pricing: props.pricing,
+      actions: props.actions,
+      helpers: props.helpers,
+      initialJob: initialJob,
+      actionLabels: {
+        addToCart: 'Save'
+      },
+      children: /*#__PURE__*/_jsx(Loaded, _objectSpread({}, props))
+    }) : /*#__PURE__*/_jsx(Loaded, _objectSpread({}, props))
+  });
+}
+export default CustomCartProductForm;

package/esm/components/product-form-sdk-externals.js

@@ -0,0 +1,35 @@
+/**
+ * Full merchi_sdk_product_form runtime for window.MerchiProductFormSdk.
+ * Keep in sync with merchi_api/common/js/product_form_gate.cjs SDK_EXPORTS.
+ */
+import { SDK_VERSION, serializeJob, nonEmptyGroups, formatCurrency, urlFor, createPricing, createProductFormRuntime, productHasGroups, groupFieldsOf, independentFieldsOf, isOptionQuantityGridProduct, buildProductFormJob, jobToFormState, selectionsToVariations, Section, Stack, Card, Heading, Text, Divider, Field, GroupRows, OptionQuantityGrid, ProductFormProvider, ProductFormShell, useProductForm, OPTION_FIELD_TYPES, theme } from 'merchi_sdk_product_form';
+export var MerchiProductFormSdkExternals = {
+  SDK_VERSION: SDK_VERSION,
+  serializeJob: serializeJob,
+  nonEmptyGroups: nonEmptyGroups,
+  formatCurrency: formatCurrency,
+  urlFor: urlFor,
+  createPricing: createPricing,
+  createProductFormRuntime: createProductFormRuntime,
+  productHasGroups: productHasGroups,
+  groupFieldsOf: groupFieldsOf,
+  independentFieldsOf: independentFieldsOf,
+  isOptionQuantityGridProduct: isOptionQuantityGridProduct,
+  buildProductFormJob: buildProductFormJob,
+  jobToFormState: jobToFormState,
+  selectionsToVariations: selectionsToVariations,
+  Section: Section,
+  Stack: Stack,
+  Card: Card,
+  Heading: Heading,
+  Text: Text,
+  Divider: Divider,
+  Field: Field,
+  GroupRows: GroupRows,
+  OptionQuantityGrid: OptionQuantityGrid,
+  ProductFormProvider: ProductFormProvider,
+  ProductFormShell: ProductFormShell,
+  useProductForm: useProductForm,
+  OPTION_FIELD_TYPES: OPTION_FIELD_TYPES,
+  theme: theme
+};

package/esm/panels/PanelEditCartItem.js

@@ -23,6 +23,8 @@ import { LoadingTemplateSm } from '../components/LoadingTemplate';
 import { useCartContext } from '../CartProvider';
 import { makeCartItem } from '../utilities/cart';
 import { getCartCookieToken } from '../utilities/cookie';
+import { publishedFormBundle } from '../utilities/customForm';
+import CustomCartProductForm from '../components/CustomCartProductForm';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var MerchiProductForm = /*#__PURE__*/lazy(function () {
@@ -76,6 +78,10 @@ function PanelEditCartItem(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
     setLoading = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    customFormActive = _useState4[0],
+    setCustomFormActive = _useState4[1];
   var formId = 'edit-cart-item-form';
 
   // This action patches the cart item
@@ -149,27 +155,36 @@ function PanelEditCartItem(_ref) {
     id: undefined
   });
   var showForm = activeTabIndex === tabIdItem && !!(cartItem !== null && cartItem !== void 0 && cartItem.id) && !!(cartItem !== null && cartItem !== void 0 && (_cartItem$product = cartItem.product) !== null && _cartItem$product !== void 0 && _cartItem$product.id);
+  var hasPublishedCustomForm = !!publishedFormBundle(cartItem === null || cartItem === void 0 ? void 0 : cartItem.product);
+  var defaultForm = /*#__PURE__*/_jsx(Suspense, {
+    fallback: /*#__PURE__*/_jsx(LoadingTemplateSm, {}),
+    children: /*#__PURE__*/_jsx(MerchiProductForm, _objectSpread({
+      apiUrl: apiUrl,
+      isCartItem: true,
+      initJob: _objectSpread({}, cleanCartItem),
+      initProduct: cartItem.product,
+      onSubmit: onSubmit,
+      productFormId: formId,
+      hideRequestQuotationButton: true,
+      hidePaymentUpfrontButton: true
+    }, productFormClassNames))
+  });
   return /*#__PURE__*/_jsxs(CartTabPanel, {
     tabId: tabIdItem,
     children: [/*#__PURE__*/_jsx(CartBody, {
       style: {
         padding: '2rem'
       },
-      children: showForm && /*#__PURE__*/_jsx(Suspense, {
-        fallback: /*#__PURE__*/_jsx(LoadingTemplateSm, {}),
-        children: /*#__PURE__*/_jsx(MerchiProductForm, _objectSpread({
-          apiUrl: apiUrl,
-          isCartItem: true,
-          initJob: _objectSpread({}, cleanCartItem),
-          initProduct: cartItem.product,
-          onSubmit: onSubmit,
-          productFormId: formId,
-          hideRequestQuotationButton: true,
-          hidePaymentUpfrontButton: true
-        }, productFormClassNames))
-      })
+      children: showForm && (hasPublishedCustomForm ? /*#__PURE__*/_jsx(CustomCartProductForm, {
+        product: cartItem.product,
+        initialJob: cleanCartItem,
+        apiUrl: apiUrl,
+        onSave: onSubmit,
+        fallback: defaultForm,
+        onActiveChange: setCustomFormActive
+      }) : defaultForm)
     }), /*#__PURE__*/_jsxs(CartFooter, {
-      children: [/*#__PURE__*/_jsx(ButtonBack, {}), /*#__PURE__*/_jsxs(Button, {
+      children: [/*#__PURE__*/_jsx(ButtonBack, {}), !customFormActive && /*#__PURE__*/_jsxs(Button, {
         className: classNameBtnEditCartItem,
         disabled: loading,
         form: formId,

package/esm/utilities/customForm.js

@@ -0,0 +1,57 @@
+/**
+ * Helpers for loading a product's published custom form bundle in cart edit.
+ * Mirrors the product-embed loader: SRI script tag → window.MERCHI_PRODUCT_FORM_<id>.
+ */
+
+/** If the product has a published custom form with a compiled bundle, return
+ * the info needed to load it; otherwise null (caller falls back). */
+export function publishedFormBundle(product) {
+  var form = product === null || product === void 0 ? void 0 : product.productForm;
+  if (!form || form.status !== 'published') return null;
+  var version = form.activeVersion;
+  if (!version || !version.compiledBundleUrl) return null;
+  return {
+    url: version.compiledBundleUrl,
+    integrity: version.bundleSha || undefined,
+    globalName: "MERCHI_PRODUCT_FORM_".concat(form.id)
+  };
+}
+
+/** Dynamically load a compiled form bundle and resolve its default export. */
+export function loadFormBundle(bundle) {
+  var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var url = bundle.url,
+    integrity = bundle.integrity,
+    globalName = bundle.globalName;
+  var timeoutMs = opts.timeoutMs || 15000;
+  var w = window;
+  var existing = w[globalName] && w[globalName]["default"];
+  if (existing) return Promise.resolve(existing);
+  return new Promise(function (resolve, reject) {
+    var settled = false;
+    var finish = function finish(fn, arg) {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      fn(arg);
+    };
+    var timer = setTimeout(function () {
+      return finish(reject, new Error("form bundle ".concat(globalName, " timed out")));
+    }, timeoutMs);
+    var script = document.createElement('script');
+    script.src = url;
+    if (integrity) script.integrity = integrity;
+    script.crossOrigin = 'anonymous';
+    script.async = true;
+    script.onload = function () {
+      var mod = w[globalName];
+      if (mod && mod["default"]) finish(resolve, mod["default"]);else {
+        finish(reject, new Error("form bundle ".concat(globalName, " did not register a default export")));
+      }
+    };
+    script.onerror = function () {
+      return finish(reject, new Error("failed to load form bundle ".concat(globalName)));
+    };
+    document.head.appendChild(script);
+  });
+}

package/esm/utilities/helpers.js

@@ -184,6 +184,10 @@ var productWithImagesEmbed = {
       linkedFile: {}
     }
   },
+  // Published custom form pointer for cart-item edit (same shape as product embed).
+  productForm: {
+    activeVersion: {}
+  },
   taxType: {}
 };
 var cartShipmentQuote = {

package/lib/components/CustomCartProductForm.js

@@ -0,0 +1,137 @@
+"use strict";
+
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.CustomCartProductForm = CustomCartProductForm;
+exports["default"] = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _productFormSdkExternals = require("./product-form-sdk-externals");
+var _customForm = require("../utilities/customForm");
+var _LoadingTemplate = require("./LoadingTemplate");
+var _jsxRuntime = require("react/jsx-runtime");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+/**
+ * Loads a product's published custom form for cart-item edit. On any failure
+ * renders `fallback` (the default merchi_product_form) so the cart stays usable.
+ */
+function CustomCartProductForm(_ref) {
+  var _publishedFormBundle$, _publishedFormBundle;
+  var product = _ref.product,
+    initialJob = _ref.initialJob,
+    apiUrl = _ref.apiUrl,
+    onSave = _ref.onSave,
+    fallback = _ref.fallback,
+    onActiveChange = _ref.onActiveChange;
+  var _useState = (0, _react.useState)(null),
+    _useState2 = _slicedToArray(_useState, 2),
+    Loaded = _useState2[0],
+    setLoaded = _useState2[1];
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    failed = _useState4[0],
+    setFailed = _useState4[1];
+  var _useState5 = (0, _react.useState)(true),
+    _useState6 = _slicedToArray(_useState5, 2),
+    loading = _useState6[0],
+    setLoading = _useState6[1];
+  var onSaveRef = (0, _react.useRef)(onSave);
+  onSaveRef.current = onSave;
+  var onActiveChangeRef = (0, _react.useRef)(onActiveChange);
+  onActiveChangeRef.current = onActiveChange;
+  var bundleKey = (_publishedFormBundle$ = (_publishedFormBundle = (0, _customForm.publishedFormBundle)(product)) === null || _publishedFormBundle === void 0 ? void 0 : _publishedFormBundle.url) !== null && _publishedFormBundle$ !== void 0 ? _publishedFormBundle$ : '';
+  (0, _react.useEffect)(function () {
+    var active = true;
+    setLoaded(null);
+    setFailed(false);
+    setLoading(true);
+    var bundle = (0, _customForm.publishedFormBundle)(product);
+    if (!bundle) {
+      setFailed(true);
+      setLoading(false);
+      return;
+    }
+    var w = window;
+    w.React = _react["default"];
+    w.MerchiProductFormSdk = _productFormSdkExternals.MerchiProductFormSdkExternals;
+    (0, _customForm.loadFormBundle)(bundle).then(function (Component) {
+      if (active) {
+        setLoaded(function () {
+          return Component;
+        });
+        setLoading(false);
+      }
+    })["catch"](function (e) {
+      console.error('[merchi_cart] custom form load failed', e);
+      if (active) {
+        setFailed(true);
+        setLoading(false);
+      }
+    });
+    return function () {
+      active = false;
+    };
+  }, [product, bundleKey]);
+  var props = (0, _react.useMemo)(function () {
+    try {
+      var runtime = _productFormSdkExternals.MerchiProductFormSdkExternals.createProductFormRuntime({
+        apiUrl: apiUrl || '',
+        product: product,
+        onAddToCart: function onAddToCart(job) {
+          var _onSaveRef$current;
+          return (_onSaveRef$current = onSaveRef.current) === null || _onSaveRef$current === void 0 ? void 0 : _onSaveRef$current.call(onSaveRef, job);
+        }
+      });
+      return {
+        product: product,
+        pricing: runtime.pricing,
+        actions: runtime.actions,
+        helpers: runtime.helpers
+      };
+    } catch (e) {
+      console.error('[merchi_cart] custom form props build failed', e);
+      return null;
+    }
+  }, [product, apiUrl]);
+  var isActive = !failed && !loading && !!Loaded && !!props;
+  (0, _react.useEffect)(function () {
+    var _onActiveChangeRef$cu;
+    (_onActiveChangeRef$cu = onActiveChangeRef.current) === null || _onActiveChangeRef$cu === void 0 || _onActiveChangeRef$cu.call(onActiveChangeRef, isActive);
+    return function () {
+      var _onActiveChangeRef$cu2;
+      return (_onActiveChangeRef$cu2 = onActiveChangeRef.current) === null || _onActiveChangeRef$cu2 === void 0 ? void 0 : _onActiveChangeRef$cu2.call(onActiveChangeRef, false);
+    };
+  }, [isActive]);
+  if (loading) return /*#__PURE__*/(0, _jsxRuntime.jsx)(_LoadingTemplate.LoadingTemplateSm, {});
+  if (failed || !Loaded || !props) return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+    children: fallback
+  });
+  var Shell = _productFormSdkExternals.MerchiProductFormSdkExternals.ProductFormShell;
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+    children: Shell ? /*#__PURE__*/(0, _jsxRuntime.jsx)(Shell, {
+      product: props.product,
+      pricing: props.pricing,
+      actions: props.actions,
+      helpers: props.helpers,
+      initialJob: initialJob,
+      actionLabels: {
+        addToCart: 'Save'
+      },
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Loaded, _objectSpread({}, props))
+    }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(Loaded, _objectSpread({}, props))
+  });
+}
+var _default = exports["default"] = CustomCartProductForm;

package/lib/components/product-form-sdk-externals.js

@@ -0,0 +1,42 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.MerchiProductFormSdkExternals = void 0;
+var _merchi_sdk_product_form = require("merchi_sdk_product_form");
+/**
+ * Full merchi_sdk_product_form runtime for window.MerchiProductFormSdk.
+ * Keep in sync with merchi_api/common/js/product_form_gate.cjs SDK_EXPORTS.
+ */
+
+var MerchiProductFormSdkExternals = exports.MerchiProductFormSdkExternals = {
+  SDK_VERSION: _merchi_sdk_product_form.SDK_VERSION,
+  serializeJob: _merchi_sdk_product_form.serializeJob,
+  nonEmptyGroups: _merchi_sdk_product_form.nonEmptyGroups,
+  formatCurrency: _merchi_sdk_product_form.formatCurrency,
+  urlFor: _merchi_sdk_product_form.urlFor,
+  createPricing: _merchi_sdk_product_form.createPricing,
+  createProductFormRuntime: _merchi_sdk_product_form.createProductFormRuntime,
+  productHasGroups: _merchi_sdk_product_form.productHasGroups,
+  groupFieldsOf: _merchi_sdk_product_form.groupFieldsOf,
+  independentFieldsOf: _merchi_sdk_product_form.independentFieldsOf,
+  isOptionQuantityGridProduct: _merchi_sdk_product_form.isOptionQuantityGridProduct,
+  buildProductFormJob: _merchi_sdk_product_form.buildProductFormJob,
+  jobToFormState: _merchi_sdk_product_form.jobToFormState,
+  selectionsToVariations: _merchi_sdk_product_form.selectionsToVariations,
+  Section: _merchi_sdk_product_form.Section,
+  Stack: _merchi_sdk_product_form.Stack,
+  Card: _merchi_sdk_product_form.Card,
+  Heading: _merchi_sdk_product_form.Heading,
+  Text: _merchi_sdk_product_form.Text,
+  Divider: _merchi_sdk_product_form.Divider,
+  Field: _merchi_sdk_product_form.Field,
+  GroupRows: _merchi_sdk_product_form.GroupRows,
+  OptionQuantityGrid: _merchi_sdk_product_form.OptionQuantityGrid,
+  ProductFormProvider: _merchi_sdk_product_form.ProductFormProvider,
+  ProductFormShell: _merchi_sdk_product_form.ProductFormShell,
+  useProductForm: _merchi_sdk_product_form.useProductForm,
+  OPTION_FIELD_TYPES: _merchi_sdk_product_form.OPTION_FIELD_TYPES,
+  theme: _merchi_sdk_product_form.theme
+};

package/lib/panels/PanelEditCartItem.js

@@ -14,7 +14,10 @@ var _LoadingTemplate = require("../components/LoadingTemplate");
 var _CartProvider = require("../CartProvider");
 var _cart = require("../utilities/cart");
 var _cookie = require("../utilities/cookie");
+var _customForm = require("../utilities/customForm");
+var _CustomCartProductForm = _interopRequireDefault(require("../components/CustomCartProductForm"));
 var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
@@ -81,6 +84,10 @@ function PanelEditCartItem(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
     setLoading = _useState2[1];
+  var _useState3 = (0, _react.useState)(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    customFormActive = _useState4[0],
+    setCustomFormActive = _useState4[1];
   var formId = 'edit-cart-item-form';
 
   // This action patches the cart item
@@ -154,27 +161,36 @@ function PanelEditCartItem(_ref) {
     id: undefined
   });
   var showForm = activeTabIndex === _tabs.tabIdItem && !!(cartItem !== null && cartItem !== void 0 && cartItem.id) && !!(cartItem !== null && cartItem !== void 0 && (_cartItem$product = cartItem.product) !== null && _cartItem$product !== void 0 && _cartItem$product.id);
+  var hasPublishedCustomForm = !!(0, _customForm.publishedFormBundle)(cartItem === null || cartItem === void 0 ? void 0 : cartItem.product);
+  var defaultForm = /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Suspense, {
+    fallback: /*#__PURE__*/(0, _jsxRuntime.jsx)(_LoadingTemplate.LoadingTemplateSm, {}),
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(MerchiProductForm, _objectSpread({
+      apiUrl: apiUrl,
+      isCartItem: true,
+      initJob: _objectSpread({}, cleanCartItem),
+      initProduct: cartItem.product,
+      onSubmit: onSubmit,
+      productFormId: formId,
+      hideRequestQuotationButton: true,
+      hidePaymentUpfrontButton: true
+    }, productFormClassNames))
+  });
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.CartTabPanel, {
     tabId: _tabs.tabIdItem,
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.CartBody, {
       style: {
         padding: '2rem'
       },
-      children: showForm && /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Suspense, {
-        fallback: /*#__PURE__*/(0, _jsxRuntime.jsx)(_LoadingTemplate.LoadingTemplateSm, {}),
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(MerchiProductForm, _objectSpread({
-          apiUrl: apiUrl,
-          isCartItem: true,
-          initJob: _objectSpread({}, cleanCartItem),
-          initProduct: cartItem.product,
-          onSubmit: onSubmit,
-          productFormId: formId,
-          hideRequestQuotationButton: true,
-          hidePaymentUpfrontButton: true
-        }, productFormClassNames))
-      })
+      children: showForm && (hasPublishedCustomForm ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_CustomCartProductForm["default"], {
+        product: cartItem.product,
+        initialJob: cleanCartItem,
+        apiUrl: apiUrl,
+        onSave: onSubmit,
+        fallback: defaultForm,
+        onActiveChange: setCustomFormActive
+      }) : defaultForm)
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_components.CartFooter, {
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_buttons.ButtonBack, {}), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_buttons.Button, {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_buttons.ButtonBack, {}), !customFormActive && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_buttons.Button, {
         className: classNameBtnEditCartItem,
         disabled: loading,
         form: formId,

package/lib/utilities/customForm.js

@@ -0,0 +1,64 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.loadFormBundle = loadFormBundle;
+exports.publishedFormBundle = publishedFormBundle;
+/**
+ * Helpers for loading a product's published custom form bundle in cart edit.
+ * Mirrors the product-embed loader: SRI script tag → window.MERCHI_PRODUCT_FORM_<id>.
+ */
+
+/** If the product has a published custom form with a compiled bundle, return
+ * the info needed to load it; otherwise null (caller falls back). */
+function publishedFormBundle(product) {
+  var form = product === null || product === void 0 ? void 0 : product.productForm;
+  if (!form || form.status !== 'published') return null;
+  var version = form.activeVersion;
+  if (!version || !version.compiledBundleUrl) return null;
+  return {
+    url: version.compiledBundleUrl,
+    integrity: version.bundleSha || undefined,
+    globalName: "MERCHI_PRODUCT_FORM_".concat(form.id)
+  };
+}
+
+/** Dynamically load a compiled form bundle and resolve its default export. */
+function loadFormBundle(bundle) {
+  var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var url = bundle.url,
+    integrity = bundle.integrity,
+    globalName = bundle.globalName;
+  var timeoutMs = opts.timeoutMs || 15000;
+  var w = window;
+  var existing = w[globalName] && w[globalName]["default"];
+  if (existing) return Promise.resolve(existing);
+  return new Promise(function (resolve, reject) {
+    var settled = false;
+    var finish = function finish(fn, arg) {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      fn(arg);
+    };
+    var timer = setTimeout(function () {
+      return finish(reject, new Error("form bundle ".concat(globalName, " timed out")));
+    }, timeoutMs);
+    var script = document.createElement('script');
+    script.src = url;
+    if (integrity) script.integrity = integrity;
+    script.crossOrigin = 'anonymous';
+    script.async = true;
+    script.onload = function () {
+      var mod = w[globalName];
+      if (mod && mod["default"]) finish(resolve, mod["default"]);else {
+        finish(reject, new Error("form bundle ".concat(globalName, " did not register a default export")));
+      }
+    };
+    script.onerror = function () {
+      return finish(reject, new Error("failed to load form bundle ".concat(globalName)));
+    };
+    document.head.appendChild(script);
+  });
+}

package/lib/utilities/helpers.js

@@ -195,6 +195,10 @@ var productWithImagesEmbed = {
       linkedFile: {}
     }
   },
+  // Published custom form pointer for cart-item edit (same shape as product embed).
+  productForm: {
+    activeVersion: {}
+  },
   taxType: {}
 };
 var cartShipmentQuote = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "merchi_cart",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "description": "Merchi's cart",
   "source": "src/index.ts",
   "main": "lib/index.js",
@@ -91,6 +91,7 @@
     "js-cookie": "^3.0.5",
     "lodash": "^4.17.21",
     "merchi_product_form": "^1.16.0",
+    "merchi_sdk_product_form": "^1.0.7",
     "merchi_sdk_ts": "^1.23.0",
     "react-country-region-selector": "^3.6.1",
     "react-geosuggest": "^2.14.1",

package/src/components/CustomCartProductForm.tsx

@@ -0,0 +1,123 @@
+import React, { useEffect, useMemo, useRef, useState } from 'react';
+import { MerchiProductFormSdkExternals } from './product-form-sdk-externals';
+import { loadFormBundle, publishedFormBundle } from '../utilities/customForm';
+import { LoadingTemplateSm } from './LoadingTemplate';
+
+interface Props {
+  product: any;
+  /** Current cart item used to hydrate quantity / selections. */
+  initialJob: any;
+  apiUrl?: string;
+  onSave: (job: any) => void;
+  /** Rendered when there is no published bundle or load/runtime fails. */
+  fallback: React.ReactNode;
+  /** Notifies the host when the custom form is actively rendering. */
+  onActiveChange?: (active: boolean) => void;
+}
+
+/**
+ * Loads a product's published custom form for cart-item edit. On any failure
+ * renders `fallback` (the default merchi_product_form) so the cart stays usable.
+ */
+export function CustomCartProductForm({
+  product,
+  initialJob,
+  apiUrl,
+  onSave,
+  fallback,
+  onActiveChange,
+}: Props) {
+  const [Loaded, setLoaded] = useState<React.ComponentType<any> | null>(null);
+  const [failed, setFailed] = useState(false);
+  const [loading, setLoading] = useState(true);
+  const onSaveRef = useRef(onSave);
+  onSaveRef.current = onSave;
+  const onActiveChangeRef = useRef(onActiveChange);
+  onActiveChangeRef.current = onActiveChange;
+
+  const bundleKey = publishedFormBundle(product)?.url ?? '';
+
+  useEffect(() => {
+    let active = true;
+    setLoaded(null);
+    setFailed(false);
+    setLoading(true);
+    const bundle = publishedFormBundle(product);
+    if (!bundle) {
+      setFailed(true);
+      setLoading(false);
+      return;
+    }
+    const w = window as any;
+    w.React = React;
+    w.MerchiProductFormSdk = MerchiProductFormSdkExternals;
+    loadFormBundle(bundle)
+      .then((Component) => {
+        if (active) {
+          setLoaded(() => Component);
+          setLoading(false);
+        }
+      })
+      .catch((e) => {
+        console.error('[merchi_cart] custom form load failed', e);
+        if (active) {
+          setFailed(true);
+          setLoading(false);
+        }
+      });
+    return () => {
+      active = false;
+    };
+  }, [product, bundleKey]);
+
+  const props = useMemo(() => {
+    try {
+      const runtime = MerchiProductFormSdkExternals.createProductFormRuntime({
+        apiUrl: apiUrl || '',
+        product,
+        onAddToCart: (job: any) => onSaveRef.current?.(job),
+      });
+      return {
+        product,
+        pricing: runtime.pricing,
+        actions: runtime.actions,
+        helpers: runtime.helpers,
+      };
+    } catch (e) {
+      console.error('[merchi_cart] custom form props build failed', e);
+      return null;
+    }
+  }, [product, apiUrl]);
+
+  const isActive = !failed && !loading && !!Loaded && !!props;
+  useEffect(() => {
+    onActiveChangeRef.current?.(isActive);
+    return () => onActiveChangeRef.current?.(false);
+  }, [isActive]);
+
+  if (loading) return <LoadingTemplateSm />;
+  if (failed || !Loaded || !props) return <>{fallback}</>;
+
+  const Shell = MerchiProductFormSdkExternals.ProductFormShell;
+
+  return (
+    <>
+      {Shell ? (
+        <Shell
+          product={props.product}
+          pricing={props.pricing}
+          actions={props.actions}
+          helpers={props.helpers}
+          initialJob={initialJob}
+          actionLabels={{ addToCart: 'Save' }}
+        >
+          <Loaded {...props} />
+        </Shell>
+      ) : (
+        <Loaded {...props} />
+      )}
+    </>
+  );
+}
+
+export default CustomCartProductForm;

package/src/components/product-form-sdk-externals.ts

@@ -0,0 +1,65 @@
+/**
+ * Full merchi_sdk_product_form runtime for window.MerchiProductFormSdk.
+ * Keep in sync with merchi_api/common/js/product_form_gate.cjs SDK_EXPORTS.
+ */
+import {
+  SDK_VERSION,
+  serializeJob,
+  nonEmptyGroups,
+  formatCurrency,
+  urlFor,
+  createPricing,
+  createProductFormRuntime,
+  productHasGroups,
+  groupFieldsOf,
+  independentFieldsOf,
+  isOptionQuantityGridProduct,
+  buildProductFormJob,
+  jobToFormState,
+  selectionsToVariations,
+  Section,
+  Stack,
+  Card,
+  Heading,
+  Text,
+  Divider,
+  Field,
+  GroupRows,
+  OptionQuantityGrid,
+  ProductFormProvider,
+  ProductFormShell,
+  useProductForm,
+  OPTION_FIELD_TYPES,
+  theme,
+} from 'merchi_sdk_product_form';
+
+export const MerchiProductFormSdkExternals = {
+  SDK_VERSION,
+  serializeJob,
+  nonEmptyGroups,
+  formatCurrency,
+  urlFor,
+  createPricing,
+  createProductFormRuntime,
+  productHasGroups,
+  groupFieldsOf,
+  independentFieldsOf,
+  isOptionQuantityGridProduct,
+  buildProductFormJob,
+  jobToFormState,
+  selectionsToVariations,
+  Section,
+  Stack,
+  Card,
+  Heading,
+  Text,
+  Divider,
+  Field,
+  GroupRows,
+  OptionQuantityGrid,
+  ProductFormProvider,
+  ProductFormShell,
+  useProductForm,
+  OPTION_FIELD_TYPES,
+  theme,
+};

package/src/panels/PanelEditCartItem.tsx

@@ -12,6 +12,8 @@ import { LoadingTemplateSm } from '../components/LoadingTemplate';
 import { useCartContext } from '../CartProvider';
 import { makeCartItem } from '../utilities/cart';
 import { getCartCookieToken } from '../utilities/cookie';
+import { publishedFormBundle } from '../utilities/customForm';
+import CustomCartProductForm from '../components/CustomCartProductForm';
 
 const MerchiProductForm = lazy(() => import('merchi_product_form'));
 
@@ -54,8 +56,9 @@ function PanelEditCartItem({ cart }: Props) {
     setCartItem,
   } = useCartContext();
   const [loading, setLoading] = useState(false);
+  const [customFormActive, setCustomFormActive] = useState(false);
   const formId = 'edit-cart-item-form';
-  
+
   // This action patches the cart item
   async function actionCartItemEdit(cartItemJson: any) {
     setLoading(true);
@@ -68,7 +71,7 @@ function PanelEditCartItem({ cart }: Props) {
         variations = [],
         variationsGroups = [],
       } = cartItemJson;
-  
+
       const cartItemEnt = makeCartItem({
         ...cartItem,
         id: (cartItem as any).id,
@@ -79,19 +82,19 @@ function PanelEditCartItem({ cart }: Props) {
         variations: variations.map(cleanVariation),
         variationsGroups: variationsGroups.map(cleanVariationGroups),
       }, true, cartToken);
-  
+
       // Save changes to the Cart Item
       await cartItemEnt.save();
-  
+
       // Refetch the Cart and all it's relationships
       await refetchCart();
-  
+
       // Show success alert
       alertSuccess('Item updated.');
-  
+
       // Set active Cart tab
       setActiveTabIndex(tabIdItems);
-  
+
       // Clear Cart Item from state
       setCartItem({});
     } catch (e: any) {
@@ -110,37 +113,57 @@ function PanelEditCartItem({ cart }: Props) {
   };
   const showForm =
     activeTabIndex === tabIdItem && !!cartItem?.id && !!cartItem?.product?.id;
+  const hasPublishedCustomForm = !!publishedFormBundle(cartItem?.product);
+
+  const defaultForm = (
+    <Suspense fallback={<LoadingTemplateSm />}>
+      <MerchiProductForm
+        apiUrl={apiUrl}
+        isCartItem={true}
+        initJob={{...cleanCartItem}}
+        initProduct={cartItem.product}
+        onSubmit={onSubmit}
+        productFormId={formId}
+        hideRequestQuotationButton={true}
+        hidePaymentUpfrontButton={true}
+        {...productFormClassNames}
+      />
+    </Suspense>
+  );
 
   return (
     <CartTabPanel tabId={tabIdItem}>
       <CartBody style={{padding: '2rem'}}>
         {showForm && (
-          <Suspense fallback={<LoadingTemplateSm />}>
-            <MerchiProductForm
+          hasPublishedCustomForm ? (
+            <CustomCartProductForm
+              product={cartItem.product}
+              initialJob={cleanCartItem}
               apiUrl={apiUrl}
-              isCartItem={true}
-              initJob={{...cleanCartItem}}
-              initProduct={cartItem.product}
-              onSubmit={onSubmit}
-              productFormId={formId}
-              hideRequestQuotationButton={true}
-              hidePaymentUpfrontButton={true}
-              {...productFormClassNames}
+              onSave={onSubmit}
+              fallback={defaultForm}
+              onActiveChange={setCustomFormActive}
             />
-          </Suspense>
+          ) : (
+            defaultForm
+          )
         )}
       </CartBody>
       <CartFooter>
         <ButtonBack />
-        <Button
-          className={classNameBtnEditCartItem}
-          disabled={loading}
-          form={formId}
-          type='submit'
-        >
-          {loading && <FontAwesomeIcon icon={faCircleNotch} spin />}
-          {loading ? ' Loading...' : 'Save'}
-        </Button>
+        {/* Custom forms render their own Save in ProductFormShell; keep the
+            HTML-form Save only for the default merchi_product_form path. */}
+        {!customFormActive && (
+          <Button
+            className={classNameBtnEditCartItem}
+            disabled={loading}
+            form={formId}
+            type='submit'
+          >
+            {loading && <FontAwesomeIcon icon={faCircleNotch} spin />}
+            {loading ? ' Loading...' : 'Save'}
+          </Button>
+        )}
       </CartFooter>
     </CartTabPanel>
   );

package/src/utilities/customForm.ts

@@ -0,0 +1,71 @@
+/**
+ * Helpers for loading a product's published custom form bundle in cart edit.
+ * Mirrors the product-embed loader: SRI script tag → window.MERCHI_PRODUCT_FORM_<id>.
+ */
+import type { ComponentType } from 'react';
+
+export interface FormBundleRef {
+  url: string;
+  integrity?: string;
+  globalName: string;
+}
+
+/** If the product has a published custom form with a compiled bundle, return
+ * the info needed to load it; otherwise null (caller falls back). */
+export function publishedFormBundle(product: any): FormBundleRef | null {
+  const form = product?.productForm;
+  if (!form || form.status !== 'published') return null;
+  const version = form.activeVersion;
+  if (!version || !version.compiledBundleUrl) return null;
+  return {
+    url: version.compiledBundleUrl,
+    integrity: version.bundleSha || undefined,
+    globalName: `MERCHI_PRODUCT_FORM_${form.id}`,
+  };
+}
+
+/** Dynamically load a compiled form bundle and resolve its default export. */
+export function loadFormBundle(
+  bundle: FormBundleRef,
+  opts: { timeoutMs?: number } = {},
+): Promise<ComponentType<any>> {
+  const { url, integrity, globalName } = bundle;
+  const timeoutMs = opts.timeoutMs || 15000;
+  const w = window as any;
+
+  const existing = w[globalName] && w[globalName].default;
+  if (existing) return Promise.resolve(existing);
+
+  return new Promise((resolve, reject) => {
+    let settled = false;
+    const finish = (fn: (arg: any) => void, arg: any) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      fn(arg);
+    };
+    const timer = setTimeout(
+      () => finish(reject, new Error(`form bundle ${globalName} timed out`)),
+      timeoutMs,
+    );
+
+    const script = document.createElement('script');
+    script.src = url;
+    if (integrity) script.integrity = integrity;
+    script.crossOrigin = 'anonymous';
+    script.async = true;
+    script.onload = () => {
+      const mod = w[globalName];
+      if (mod && mod.default) finish(resolve, mod.default);
+      else {
+        finish(
+          reject,
+          new Error(`form bundle ${globalName} did not register a default export`),
+        );
+      }
+    };
+    script.onerror = () =>
+      finish(reject, new Error(`failed to load form bundle ${globalName}`));
+    document.head.appendChild(script);
+  });
+}

package/src/utilities/helpers.ts

@@ -173,6 +173,8 @@ const productWithImagesEmbed: any = {
   groupVariationFields: {options: {linkedFile: {}}},
   images: {},
   independentVariationFields: {options: {linkedFile: {}}},
+  // Published custom form pointer for cart-item edit (same shape as product embed).
+  productForm: {activeVersion: {}},
   taxType: {},
 };