@propeller-commerce/propeller-v2-react-ui 0.21.0 → 0.22.0

package/dist/index.d.cts

@@ -40,6 +40,14 @@ interface PropellerDeps {
 interface PropellerScope {
     /** The authenticated user, or `null` when browsing anonymously. */
     user: Contact | Customer | null;
+    /**
+     * Whether a session exists, independent of whether `user` has loaded yet.
+     * Hosts paint from a cached hint before the profile arrives, so `user` is
+     * null for an authenticated visitor for the first frames; without this,
+     * semi-closed surfaces flash their logged-out state. Optional — omitting it
+     * keeps the previous behaviour.
+     */
+    isAuthenticated?: boolean;
     /** Active company ID for the current session; `undefined` for non-company users. */
     companyId: number | undefined;
     /** Active language code (e.g. `'NL'`). */
@@ -588,7 +596,11 @@ interface UseCartReturn {
     loading: boolean;
     /** Last error message, or `null`. */
     error: string | null;
-    /** `false` when a B2B purchaser's authorization limit is exceeded by the cart total. */
+    /**
+     * `false` when a B2B purchaser's authorization limit is exceeded by the cart
+     * total, and while a seeded `cartId` is still being hydrated — it fails
+     * closed, so gating a checkout button on it holds rather than opens.
+     */
     checkoutAllowed: boolean;
     /** Resolves an existing cart or creates one via the shared `initCart` flow. */
     resolveCart: () => Promise<Cart>;
@@ -2181,8 +2193,13 @@ interface ResolveSpecEntry {
      */
     transform?: (gridValue: NonNullable<ProductGridConfig[GridKey]>) => unknown;
 }
-/** Per-prop resolution spec: maps each prop key to its {@link ResolveSpecEntry}. */
-type ResolveSpec<P> = Partial<Record<keyof P, ResolveSpecEntry>>;
+/**
+ * Per-prop resolution spec: maps each prop key to its {@link ResolveSpecEntry}.
+ *
+ * Infra keys are spec'able too, so a component can pull a provider value it
+ * only reads internally without having to publish it as its own prop.
+ */
+type ResolveSpec<P> = Partial<Record<keyof P | keyof PropellerInfra, ResolveSpecEntry>>;
 /**
  * useResolvedProps — resolves props through the two-tier precedence
  * `explicit prop > ProductGrid context > Propeller infra > default`.
@@ -2191,7 +2208,7 @@ type ResolveSpec<P> = Partial<Record<keyof P, ResolveSpecEntry>>;
  * @param spec - per-key resolution rules; keys absent from the spec pass through unchanged.
  * @returns the props with each spec'd key resolved to its highest-precedence value.
  */
-declare function useResolvedProps<P extends object>(rawProps: P, spec: ResolveSpec<P>): P;
+declare function useResolvedProps<P extends object>(rawProps: P, spec: ResolveSpec<P>): P & Partial<PropellerInfra>;
 
 /**
  * Read the SDK services bundle from `<PropellerDepsProvider>`.
@@ -3496,13 +3513,17 @@ interface CartOverviewProps {
         code: string;
         name: string;
     }[];
+    /** Logged-in user — used for the purchase-authorization check. Resolved from PropellerProvider when omitted. */
+    user?: Contact | Customer | null;
+    /** Active company ID — used for the purchase-authorization check. Resolved from PropellerProvider when omitted. */
+    companyId?: number;
 }
 /**
  * Final cart review panel: shows invoice/delivery addresses, payment, carrier
  * and delivery date, with optional reference, notes, terms acceptance and a
  * place-order button.
  */
-declare function CartOverview(props: CartOverviewProps): React$1.JSX.Element;
+declare function CartOverview(rawProps: CartOverviewProps): React$1.JSX.Element;
 
 /**
  * @rsc-blocked — Client-only component: interactive state (useState/useReducer).
@@ -4195,10 +4216,11 @@ declare function ProductCardPrice(props: {
 /** Renders the embedded `AddToCart` control with all pass-through props from
  *  context, or the injected `addToCartComponent` when set.
  *
- *  Note: the default `AddToCartImpl` accepts a richer prop set (graphqlClient,
- *  configuration, etc.) than the public `AddToCartComponentProps` contract.
- *  Injected components only receive the contract surface; the extra infra
- *  props stay default-only. */
+ *  Note: the default `AddToCartImpl` accepts a richer prop set than the public
+ *  `AddToCartComponentProps` contract. Injected components receive the whole
+ *  contract surface; what stays default-only is infra (graphqlClient, user,
+ *  configuration, …), which an injected component resolves from
+ *  `<PropellerProvider>` itself. */
 declare function ProductCardAddToCart(props: {
     /** Override the AddToCart wrapper class. */
     className?: string;
@@ -4549,6 +4571,8 @@ interface CompanySwitcherProps {
     /** Translated labels keyed by the slugs used inside the component (see
      * `getLabel` calls). Missing keys fall back to the English defaults. */
     labels?: Record<string, string>;
+    /** Additional class name for the switcher's trigger button. */
+    triggerClassName?: string;
 }
 /**
  * Dropdown for switching the active company of a multi-company contact.
@@ -6155,6 +6179,12 @@ interface ProductBulkPricesProps {
      * Defaults to 'open'.
      */
     portalMode?: string;
+    /**
+     * Whether a session exists, independent of whether `user` has loaded yet.
+     * Passed down by the parent alongside `portalMode`; closes the hydration
+     * window in which an authenticated visitor still has a null `user`.
+     */
+    isAuthenticated?: boolean;
     /** Authenticated user — used for semi-closed visibility. */
     user?: Contact | Customer | null;
     /** Tax zone code. Defaults to 'NL'. */
@@ -6694,6 +6724,15 @@ interface ProductInfoProps {
      * Example: ['brand', 'color']
      */
     textLabels?: string[];
+    /** Cart to add into. Omit and pass `createCart` to start one on first add. */
+    cartId?: string;
+    /** If true a new cart is created when no `cartId` is available. */
+    createCart?: boolean;
+    /**
+     * Called when a new cart is created, so the host can persist `cart.cartId`.
+     * WARNING: without it a new cart is created on every add.
+     */
+    onCartCreated?: (cart: Cart) => void;
     showImage?: boolean;
     showBadges?: boolean;
     showFavorite?: boolean;
@@ -6837,6 +6876,12 @@ interface ProductPriceProps {
      * Defaults to 'open'.
      */
     portalMode?: string;
+    /**
+     * Whether a session exists, independent of whether `user` has loaded yet.
+     * Passed down by the parent alongside `portalMode`; closes the hydration
+     * window in which an authenticated visitor still has a null `user`.
+     */
+    isAuthenticated?: boolean;
     /** Authenticated user — used for semi-closed visibility. */
     user?: Contact | Customer | null;
     /**

package/dist/index.d.ts

@@ -40,6 +40,14 @@ interface PropellerDeps {
 interface PropellerScope {
     /** The authenticated user, or `null` when browsing anonymously. */
     user: Contact | Customer | null;
+    /**
+     * Whether a session exists, independent of whether `user` has loaded yet.
+     * Hosts paint from a cached hint before the profile arrives, so `user` is
+     * null for an authenticated visitor for the first frames; without this,
+     * semi-closed surfaces flash their logged-out state. Optional — omitting it
+     * keeps the previous behaviour.
+     */
+    isAuthenticated?: boolean;
     /** Active company ID for the current session; `undefined` for non-company users. */
     companyId: number | undefined;
     /** Active language code (e.g. `'NL'`). */
@@ -588,7 +596,11 @@ interface UseCartReturn {
     loading: boolean;
     /** Last error message, or `null`. */
     error: string | null;
-    /** `false` when a B2B purchaser's authorization limit is exceeded by the cart total. */
+    /**
+     * `false` when a B2B purchaser's authorization limit is exceeded by the cart
+     * total, and while a seeded `cartId` is still being hydrated — it fails
+     * closed, so gating a checkout button on it holds rather than opens.
+     */
     checkoutAllowed: boolean;
     /** Resolves an existing cart or creates one via the shared `initCart` flow. */
     resolveCart: () => Promise<Cart>;
@@ -2181,8 +2193,13 @@ interface ResolveSpecEntry {
      */
     transform?: (gridValue: NonNullable<ProductGridConfig[GridKey]>) => unknown;
 }
-/** Per-prop resolution spec: maps each prop key to its {@link ResolveSpecEntry}. */
-type ResolveSpec<P> = Partial<Record<keyof P, ResolveSpecEntry>>;
+/**
+ * Per-prop resolution spec: maps each prop key to its {@link ResolveSpecEntry}.
+ *
+ * Infra keys are spec'able too, so a component can pull a provider value it
+ * only reads internally without having to publish it as its own prop.
+ */
+type ResolveSpec<P> = Partial<Record<keyof P | keyof PropellerInfra, ResolveSpecEntry>>;
 /**
  * useResolvedProps — resolves props through the two-tier precedence
  * `explicit prop > ProductGrid context > Propeller infra > default`.
@@ -2191,7 +2208,7 @@ type ResolveSpec<P> = Partial<Record<keyof P, ResolveSpecEntry>>;
  * @param spec - per-key resolution rules; keys absent from the spec pass through unchanged.
  * @returns the props with each spec'd key resolved to its highest-precedence value.
  */
-declare function useResolvedProps<P extends object>(rawProps: P, spec: ResolveSpec<P>): P;
+declare function useResolvedProps<P extends object>(rawProps: P, spec: ResolveSpec<P>): P & Partial<PropellerInfra>;
 
 /**
  * Read the SDK services bundle from `<PropellerDepsProvider>`.
@@ -3496,13 +3513,17 @@ interface CartOverviewProps {
         code: string;
         name: string;
     }[];
+    /** Logged-in user — used for the purchase-authorization check. Resolved from PropellerProvider when omitted. */
+    user?: Contact | Customer | null;
+    /** Active company ID — used for the purchase-authorization check. Resolved from PropellerProvider when omitted. */
+    companyId?: number;
 }
 /**
  * Final cart review panel: shows invoice/delivery addresses, payment, carrier
  * and delivery date, with optional reference, notes, terms acceptance and a
  * place-order button.
  */
-declare function CartOverview(props: CartOverviewProps): React$1.JSX.Element;
+declare function CartOverview(rawProps: CartOverviewProps): React$1.JSX.Element;
 
 /**
  * @rsc-blocked — Client-only component: interactive state (useState/useReducer).
@@ -4195,10 +4216,11 @@ declare function ProductCardPrice(props: {
 /** Renders the embedded `AddToCart` control with all pass-through props from
  *  context, or the injected `addToCartComponent` when set.
  *
- *  Note: the default `AddToCartImpl` accepts a richer prop set (graphqlClient,
- *  configuration, etc.) than the public `AddToCartComponentProps` contract.
- *  Injected components only receive the contract surface; the extra infra
- *  props stay default-only. */
+ *  Note: the default `AddToCartImpl` accepts a richer prop set than the public
+ *  `AddToCartComponentProps` contract. Injected components receive the whole
+ *  contract surface; what stays default-only is infra (graphqlClient, user,
+ *  configuration, …), which an injected component resolves from
+ *  `<PropellerProvider>` itself. */
 declare function ProductCardAddToCart(props: {
     /** Override the AddToCart wrapper class. */
     className?: string;
@@ -4549,6 +4571,8 @@ interface CompanySwitcherProps {
     /** Translated labels keyed by the slugs used inside the component (see
      * `getLabel` calls). Missing keys fall back to the English defaults. */
     labels?: Record<string, string>;
+    /** Additional class name for the switcher's trigger button. */
+    triggerClassName?: string;
 }
 /**
  * Dropdown for switching the active company of a multi-company contact.
@@ -6155,6 +6179,12 @@ interface ProductBulkPricesProps {
      * Defaults to 'open'.
      */
     portalMode?: string;
+    /**
+     * Whether a session exists, independent of whether `user` has loaded yet.
+     * Passed down by the parent alongside `portalMode`; closes the hydration
+     * window in which an authenticated visitor still has a null `user`.
+     */
+    isAuthenticated?: boolean;
     /** Authenticated user — used for semi-closed visibility. */
     user?: Contact | Customer | null;
     /** Tax zone code. Defaults to 'NL'. */
@@ -6694,6 +6724,15 @@ interface ProductInfoProps {
      * Example: ['brand', 'color']
      */
     textLabels?: string[];
+    /** Cart to add into. Omit and pass `createCart` to start one on first add. */
+    cartId?: string;
+    /** If true a new cart is created when no `cartId` is available. */
+    createCart?: boolean;
+    /**
+     * Called when a new cart is created, so the host can persist `cart.cartId`.
+     * WARNING: without it a new cart is created on every add.
+     */
+    onCartCreated?: (cart: Cart) => void;
     showImage?: boolean;
     showBadges?: boolean;
     showFavorite?: boolean;
@@ -6837,6 +6876,12 @@ interface ProductPriceProps {
      * Defaults to 'open'.
      */
     portalMode?: string;
+    /**
+     * Whether a session exists, independent of whether `user` has loaded yet.
+     * Passed down by the parent alongside `portalMode`; closes the hydration
+     * window in which an authenticated visitor still has a null `user`.
+     */
+    isAuthenticated?: boolean;
     /** Authenticated user — used for semi-closed visibility. */
     user?: Contact | Customer | null;
     /**

package/dist/index.js

@@ -1,8 +1,8 @@
 "use client";
-import { getLabel, getLocalizedValue, formatPrice, localeForLanguage, getClusterSku, getClusterImageUrl, isContentHidden, getProductSku, getProductImageUrl, isCheckoutAllowed, createServices, err, ok, formatSurcharge, deriveUserMode, isContact, isCustomer, getAddresses, attributeNameMatches, getAttributeDisplayName, filterProductsBySelections, extractAttributeValues, buildInventoryFilter, findPurchaserPac, isOverAuthorizationLimit, MIN_STOCK_THRESHOLD, getNettedBonusItems, getLanguageString, collectAttributeValues, getCountryName } from '@propeller-commerce/propeller-v2-core-ui';
+import { getLabel, getLocalizedValue, formatPrice, localeForLanguage, getClusterSku, getClusterImageUrl, isContentHidden, getProductSku, getProductImageUrl, createServices, isCheckoutAllowed, err, ok, formatSurcharge, deriveUserMode, isContact, isCustomer, getAddresses, attributeNameMatches, getAttributeDisplayName, filterProductsBySelections, extractAttributeValues, buildInventoryFilter, findPurchaserPac, isOverAuthorizationLimit, MIN_STOCK_THRESHOLD, getNettedBonusItems, getLanguageString, collectAttributeValues, getCountryName, resolveLanguageEntry, getLanguageUri } from '@propeller-commerce/propeller-v2-core-ui';
 export * from '@propeller-commerce/propeller-v2-core-ui';
 import * as React6 from 'react';
-import { createContext, useState, useRef, useCallback, useMemo, useContext, useEffect } from 'react';
+import { createContext, useState, useRef, useCallback, useEffect, useMemo, useContext } from 'react';
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 import { ProductStatus, ProductSortField, SortOrder, CrossupsellType, CartStatus, CartAddressType, Gender, YesNo, AddressType, MagicTokenService, PaymentStatuses, OrderSearchFields, OrderItemClass, ProductSearchableField, machineService, PurchaseRole, AttributeType, OrderSortField, OrderType, BundleCondition, OrderDiscountType } from '@propeller-commerce/propeller-sdk-v2';
 import { clsx } from 'clsx';
@@ -747,10 +747,29 @@ function useCart(options) {
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState(null);
   const notesTimers = useRef({});
-  const checkoutAllowed = useMemo(
-    () => isCheckoutAllowed(user, companyId, cart),
-    [user, companyId, cart]
-  );
+  useEffect(() => {
+    if (!graphqlClient || !cartId || cart) return;
+    let cancelled = false;
+    (async () => {
+      try {
+        const fetched = await createServices(graphqlClient).cart.getCart({
+          cartId,
+          imageSearchFilters: imageSearchFilters(),
+          imageVariantFilters: imageVariantFilters(),
+          language
+        });
+        if (!cancelled && fetched) setCart(fetched);
+      } catch {
+      }
+    })();
+    return () => {
+      cancelled = true;
+    };
+  }, [graphqlClient, cartId, cart, language, imageSearchFilters, imageVariantFilters]);
+  const checkoutAllowed = useMemo(() => {
+    if (cartId && !cart) return false;
+    return isCheckoutAllowed(user, resolvedCompanyId, cart);
+  }, [user, resolvedCompanyId, cart, cartId]);
   function getMinQuantity(product) {
     const min = product?.minimumQuantity;
     return min && min > 0 ? min : 1;
@@ -1571,7 +1590,8 @@ var INFRA_KEYS = [
   "includeTax",
   "currency",
   "configuration",
-  "portalMode"
+  "portalMode",
+  "isAuthenticated"
 ];
 function useInfraProps(props) {
   const ctx = usePropellerContext();
@@ -2248,10 +2268,11 @@ function useProductSearch(options) {
   const isLoading = !isControlled && internalLoading;
   function filterByLanguage(products, lang) {
     if (!lang) return products;
+    const target = lang.toUpperCase();
     return products.filter((p) => {
       const names = p.names || p.names || [];
       if (!names || names.length === 0) return true;
-      return names.some((n) => n.language === lang);
+      return names.some((n) => (n.language || "").toUpperCase() === target);
     });
   }
   const fetchProducts = useCallback(async () => {
@@ -4208,7 +4229,7 @@ function AccountIconAndMenu(rawProps) {
               onClick: (event) => handleIconClick(),
               "aria-label": getLabel(props.labels, "accountLabel", "Account"),
               "data-open": menuOpen ? "true" : "false",
-              className: cn(`propeller-account-menu__trigger inline-flex items-center gap-2 px-3 py-2 rounded-control text-sm font-medium transition-colors text-foreground hover:bg-surface-hover${props.iconClassName ? " " + props.iconClassName : ""}`),
+              className: cn(`propeller-account-menu__trigger inline-flex items-center gap-2 px-3 py-2 rounded-control text-sm font-medium transition-colors text-inherit${props.iconClassName ? " " + props.iconClassName : ""}`),
               children: [
                 /* @__PURE__ */ jsx(
                   "svg",
@@ -7620,7 +7641,8 @@ function CartIconAndSidebar(rawProps) {
   ] });
 }
 var CartIconAndSidebar_default = CartIconAndSidebar;
-function CartOverview(props) {
+function CartOverview(rawProps) {
+  const props = useInfraProps(rawProps);
   const [reference, setReference] = useState("");
   const [notes, setNotes] = useState("");
   const [termsAccepted, setTermsAccepted] = useState(false);
@@ -7630,6 +7652,7 @@ function CartOverview(props) {
   const showReference = props.showReference !== false;
   const showTermsAndConditions = props.showTermsAndConditions !== false;
   const showPurchaseButton = props.showPurchaseButton !== false;
+  const overLimit = isOverAuthorizationLimit(props.user, props.companyId, props.cart);
   const invoiceAddress = props.cart?.invoiceAddress;
   const deliveryAddress = props.cart?.deliveryAddress;
   const getCountryName$1 = (code) => getCountryName(code, props.countries);
@@ -7769,7 +7792,12 @@ function CartOverview(props) {
           ] });
         })() })
       ] }) : null,
-      showPurchaseButton ? /* @__PURE__ */ jsxs(
+      showPurchaseButton && overLimit ? /* @__PURE__ */ jsx("p", { className: "propeller-cart-overview__authorization-required text-sm text-muted-foreground mt-2", children: getLabel(
+        props.labels,
+        "authorizationRequired",
+        "This order exceeds your authorization limit. Request authorization from the cart to continue."
+      ) }) : null,
+      showPurchaseButton && !overLimit ? /* @__PURE__ */ jsxs(
         "button",
         {
           type: "button",
@@ -8144,6 +8172,7 @@ var RESOLVE_SPEC = {
   currency: { infra: "currency", default: "\u20AC" },
   user: { infra: "user", default: null },
   portalMode: { infra: "portalMode" },
+  isAuthenticated: { infra: "isAuthenticated" },
   columns: { grid: "columns", default: 3 },
   showPrice: { grid: "showPrice" },
   showStock: { grid: "showStock" },
@@ -8187,7 +8216,7 @@ function ClusterCard(rawProps) {
   const textLabelValues = resolveAttributeValues(cluster, props.textLabels).map((value) => ({
     value
   }));
-  const contentHidden = isContentHidden(props.portalMode, props.user);
+  const contentHidden = isContentHidden(props.portalMode, props.user, props.isAuthenticated);
   const defaultProductInventory = contentHidden ? void 0 : cluster?.defaultProduct?.inventory;
   const useTax = props.includeTax !== void 0 ? !!props.includeTax : false;
   const priceObj = contentHidden ? void 0 : cluster?.defaultProduct?.price;
@@ -8614,7 +8643,7 @@ function LoginToOrderButton(props) {
 var LoginToOrderButton_default = LoginToOrderButton;
 function ProductPriceDisplay(props) {
   function isHidden2() {
-    return isContentHidden(props.portalMode, props.user);
+    return isContentHidden(props.portalMode, props.user, props.isAuthenticated);
   }
   function formatPrice17(value) {
     if (value === null || value === void 0) return "";
@@ -8706,6 +8735,7 @@ var RESOLVE_SPEC2 = {
   language: { infra: "language", default: "NL" },
   includeTax: { infra: "includeTax" },
   portalMode: { infra: "portalMode" },
+  isAuthenticated: { infra: "isAuthenticated" },
   configuration: { infra: "configuration" },
   // Same entry ClusterCard has always had. Without it a shop priced in
   // anything but euros had no route to the cards at all: the grid resolved the
@@ -8764,7 +8794,7 @@ function ProductCardRoot(rawProps) {
   const language = props.language || "NL";
   const product = props.product;
   const isRow = props.columns === 1;
-  const contentHidden = isContentHidden(props.portalMode, props.user);
+  const contentHidden = isContentHidden(props.portalMode, props.user, props.isAuthenticated);
   const showStock = !!props.showStock && !contentHidden;
   const showCta = props.allowAddToCart !== false || contentHidden;
   const name = getProductName(product, language);
@@ -9061,6 +9091,7 @@ function ProductCardPrice(props) {
       currency: resolved.currency,
       language: resolved.language,
       portalMode: resolved.portalMode,
+      isAuthenticated: resolved.isAuthenticated,
       user: resolved.user,
       showLoginPrompt: false
     }
@@ -9068,7 +9099,7 @@ function ProductCardPrice(props) {
 }
 function ProductCardAddToCart(props) {
   const { product, resolved } = useProductCard();
-  if (isContentHidden(resolved.portalMode, resolved.user)) {
+  if (isContentHidden(resolved.portalMode, resolved.user, resolved.isAuthenticated)) {
     return /* @__PURE__ */ jsx(
       LoginToOrderButton_default,
       {
@@ -9089,9 +9120,13 @@ function ProductCardAddToCart(props) {
         allowIncrDecr: resolved.allowIncrDecr,
         showModal: resolved.showModal,
         enableStockValidation: resolved.enableStockValidation,
+        onAddToCart: resolved.onAddToCart,
         afterAddToCart: resolved.afterAddToCart,
         onProceedToCheckout: resolved.onProceedToCheckout,
         onRequestQuoteClick: resolved.onRequestQuoteClick,
+        createCart: resolved.createCart,
+        onCartCreated: resolved.onCartCreated,
+        includeTax: resolved.includeTax,
         labels: resolved.addToCartLabels
       }
     );
@@ -9214,7 +9249,7 @@ function ProductGrid(rawProps) {
   }
   function showAddToCart() {
     const allow = props.allowAddToCart !== false;
-    return !isContentHidden(props.portalMode, props.user) && allow;
+    return !isContentHidden(props.portalMode, props.user, props.isAuthenticated) && allow;
   }
   function getSkeletonItems() {
     const cols = props.columns || 3;
@@ -9492,7 +9527,7 @@ function GridFilters(rawProps) {
   }
   function showAvailability() {
     if (!props.showAvailabilityFilter) return false;
-    return !isContentHidden(props.portalMode, props.user);
+    return !isContentHidden(props.portalMode, props.user, props.isAuthenticated);
   }
   function getFilterName(filter) {
     return filter?.attributeDescription?.name || "";
@@ -10047,7 +10082,7 @@ function GridToolbar(rawProps) {
     return badges;
   }
   function isPriceSortDisabled() {
-    return isContentHidden(props.portalMode, props.user);
+    return isContentHidden(props.portalMode, props.user, props.isAuthenticated);
   }
   function getAvailabilityLabel() {
     const qty = props.minStock;
@@ -10900,7 +10935,7 @@ function ClusterOptions(rawProps) {
     const language = props.language;
     const options = props.options || [];
     const sel = selectedProductIds;
-    const hidePrices = isContentHidden(props.portalMode, props.user);
+    const hidePrices = isContentHidden(props.portalMode, props.user, props.isAuthenticated);
     return options.filter((option) => option.hidden !== YesNo.Y).map((option) => {
       const idStr = option.id.toString();
       const selectedProductId = sel[idStr] || "";
@@ -11084,7 +11119,11 @@ function CompanySwitcher(props) {
             type: "button",
             "aria-haspopup": "listbox",
             "aria-label": getLabel(props.labels, "switchCompanyAriaLabel", "Switch company"),
-            className: "propeller-company-switcher__trigger flex items-center gap-2 rounded-md px-3 py-1.5 text-sm font-medium transition-colors hover:bg-white/10",
+            className: cn(
+              // `text-inherit`: this sits in the host's header, which may be dark or
+              // light. See the note on AccountIconAndMenu's trigger.
+              `propeller-company-switcher__trigger flex items-center gap-2 rounded-md px-3 py-1.5 text-sm font-medium transition-colors text-inherit${props.triggerClassName ? " " + props.triggerClassName : ""}`
+            ),
             onClick: (event) => toggleDropdown(),
             "aria-expanded": isOpen,
             children: [
@@ -15059,7 +15098,7 @@ function PriceToggle(props) {
 var PriceToggle_default = PriceToggle;
 function ProductBulkPrices(props) {
   const includeTax = !!props.includeTax;
-  const isHidden2 = isContentHidden(props.portalMode, props.user);
+  const isHidden2 = isContentHidden(props.portalMode, props.user, props.isAuthenticated);
   function getTierQuantity(tier) {
     const discount = tier.discount;
     return discount?.quantityFrom ?? tier.quantity ?? null;
@@ -15606,14 +15645,10 @@ function ProductDownloads(props) {
   const hasItems = items.length > 0;
   const lang = props.language || "NL";
   function getDocumentUrl(doc) {
-    const docs = doc.documents || [];
-    const match = docs.find((d) => d.language === lang);
-    return match?.originalUrl || docs?.[0]?.originalUrl || "";
+    return resolveLanguageEntry(doc.documents, lang)?.originalUrl || "";
   }
   function getDocumentName(doc) {
-    const alts = doc.alt || [];
-    const match = alts.find((a) => a.language === lang);
-    return match?.value || alts?.[0]?.value || "Download";
+    return getLanguageString(doc.alt, lang, "Download");
   }
   return /* @__PURE__ */ jsxs("div", { className: cn(`propeller-product-downloads ${props.className || ""}`), children: [
     hasItems ? /* @__PURE__ */ jsx("h3", { className: "propeller-product-downloads__title text-base font-semibold text-foreground mb-3", children: getLabel(props.labels, "title", "Downloads") }) : null,
@@ -15819,12 +15854,14 @@ function ProductGallery(props) {
 var ProductGallery_default = ProductGallery;
 function pickImageUrl(mediaItems, target) {
   if (!mediaItems || mediaItems.length === 0) return null;
+  const targetUpper = (target || "").toUpperCase();
+  const langMatches = (value) => (value || "").toUpperCase() === targetUpper;
   for (const m of mediaItems) {
-    const match = m.imageVariants?.find((v) => v.language === target && v.url);
+    const match = m.imageVariants?.find((v) => langMatches(v.language) && v.url);
     if (match?.url) return match.url;
   }
   for (const m of mediaItems) {
-    const match = m.images?.find((i) => i.language === target && i.originalUrl);
+    const match = m.images?.find((i) => langMatches(i.language) && i.originalUrl);
     if (match?.originalUrl) return match.originalUrl;
   }
   for (const m of mediaItems) {
@@ -16152,6 +16189,7 @@ function ProductInfoPrice(props = {}) {
       currency: derived.currency,
       taxZone: derived.taxZone,
       portalMode: derived.portalMode,
+      isAuthenticated: resolved.isAuthenticated,
       user: derived.user,
       labels: derived.labels,
       className: props.className
@@ -16161,7 +16199,7 @@ function ProductInfoPrice(props = {}) {
 function ProductInfoStock(props = {}) {
   const { product, resolved, derived } = useProductInfoContext();
   if (!product.inventory) return null;
-  if (isContentHidden(derived.portalMode, resolved.user)) return null;
+  if (isContentHidden(derived.portalMode, resolved.user, resolved.isAuthenticated)) return null;
   const Injected = resolved.stockComponent;
   if (Injected) {
     return /* @__PURE__ */ jsx(
@@ -16188,7 +16226,7 @@ function ProductInfoStock(props = {}) {
 }
 function ProductInfoAddToCart(props = {}) {
   const { product, resolved, derived } = useProductInfoContext();
-  if (isContentHidden(derived.portalMode, resolved.user)) {
+  if (isContentHidden(derived.portalMode, resolved.user, resolved.isAuthenticated)) {
     return /* @__PURE__ */ jsx(
       LoginToOrderButton_default,
       {
@@ -16200,7 +16238,18 @@ function ProductInfoAddToCart(props = {}) {
   }
   const Injected = resolved.addToCartComponent;
   if (Injected) {
-    return /* @__PURE__ */ jsx(Injected, { product, labels: derived.labels, className: props.className });
+    return /* @__PURE__ */ jsx(
+      Injected,
+      {
+        product,
+        cartId: resolved.cartId,
+        createCart: resolved.createCart,
+        onCartCreated: resolved.onCartCreated,
+        includeTax: derived.useTax,
+        labels: derived.labels,
+        className: props.className
+      }
+    );
   }
   return /* @__PURE__ */ jsx(
     AddToCart_default,
@@ -16209,6 +16258,9 @@ function ProductInfoAddToCart(props = {}) {
       user: derived.user,
       currency: derived.currency,
       product,
+      cartId: resolved.cartId,
+      createCart: resolved.createCart,
+      onCartCreated: resolved.onCartCreated,
       configuration: resolved.configuration,
       companyId: resolved.companyId,
       includeTax: derived.useTax,
@@ -16262,6 +16314,7 @@ function ProductInfoBulkPrices(props = {}) {
       bulkPrices: product.bulkPrices,
       includeTax: derived.useTax,
       portalMode: derived.portalMode,
+      isAuthenticated: resolved.isAuthenticated,
       user: derived.user,
       taxZone: derived.taxZone,
       currency: derived.currency,
@@ -16424,7 +16477,7 @@ function ProductSlider(rawProps) {
   }
   function showAddToCart() {
     const allow = props.allowAddToCart !== false;
-    return !isContentHidden(props.portalMode, props.user) && allow;
+    return !isContentHidden(props.portalMode, props.user, props.isAuthenticated) && allow;
   }
   function isCluster(item) {
     return "clusterId" in item && !("productId" in item);
@@ -16728,14 +16781,10 @@ function ProductVideos(props) {
   const hasItems = items.length > 0;
   const lang = props.language || "NL";
   function getVideoUri(video) {
-    const vids = video.videos || [];
-    const match = vids.find((v) => v.language === lang);
-    return match?.uri || vids?.[0]?.uri || "";
+    return getLanguageUri(video.videos, lang, "");
   }
   function getVideoTitle(video) {
-    const alts = video.alt || [];
-    const match = alts.find((a) => a.language === lang);
-    return match?.value || alts?.[0]?.value || "Video";
+    return getLanguageString(video.alt, lang, "Video");
   }
   function isEmbeddable(uri) {
     return uri.includes("youtube.com") || uri.includes("youtu.be") || uri.includes("vimeo.com");