@wix/headless-restaurants-olo 0.0.34 → 0.0.35

package/cjs/dist/react/ItemDetails.d.ts

@@ -131,7 +131,7 @@ export interface AddToCartButtonProps {
     addToCartLabelMap: Record<AddToCartButtonState, string>;
     /** Children render prop that receives button state and line item data */
     children?: AsChildChildren<{
-        lineItem: LineItem;
+        onHandleAddToCart: (onClick: (lineItem: LineItem) => void) => void;
         buttonState: AddToCartButtonState;
         addToCartButtonDisabled?: boolean;
         /** Content to display when loading */
@@ -139,7 +139,6 @@ export interface AddToCartButtonProps {
         /** Text label for the button */
         label: React.ReactNode;
         formattedPrice: string;
-        modifierGroupHasError: boolean;
     }>;
 }
 /**
@@ -166,9 +165,10 @@ export interface AddToCartButtonProps {
  *   addToCartLabelMap={labelMap}
  *   asChild
  * >
- *   {({ buttonState, formattedPrice, modifierGroupHasError, addToCartButtonDisabled }) => (
+ *   {({ buttonState, formattedPrice, addToCartButtonDisabled,onHandleAddToCart }) => (
  *     <button
- *       disabled={addToCartButtonDisabled || modifierGroupHasError}
+ *       onClick={() => onHandleAddToCart(onClickFunction)}
+ *       disabled={addToCartButtonDisabled}
  *       className="bg-primary text-primary-foreground"
  *     >
  *       <span>{labelMap[buttonState]}</span>

package/cjs/dist/react/ItemDetails.js

@@ -118,9 +118,10 @@ Variants.displayName = 'ItemDetails.Variants';
  *   addToCartLabelMap={labelMap}
  *   asChild
  * >
- *   {({ buttonState, formattedPrice, modifierGroupHasError, addToCartButtonDisabled }) => (
+ *   {({ buttonState, formattedPrice, addToCartButtonDisabled,onHandleAddToCart }) => (
  *     <button
- *       disabled={addToCartButtonDisabled || modifierGroupHasError}
+ *       onClick={() => onHandleAddToCart(onClickFunction)}
+ *       disabled={addToCartButtonDisabled}
  *       className="bg-primary text-primary-foreground"
  *     >
  *       <span>{labelMap[buttonState]}</span>
@@ -131,17 +132,15 @@ Variants.displayName = 'ItemDetails.Variants';
  * ```
  */
 export const AddToCartButton = React.forwardRef(({ asChild, children, className, addToCartLabelMap, ...props }, ref) => {
-    return (_jsx(CoreItemDetails.LineItemComponent, { addToCartLabelMap: addToCartLabelMap, children: ({ lineItem, buttonState, addToCartButtonDisabled, loadingState, labelText, formattedPrice, modifierGroupHasError, }) => {
+    return (_jsx(CoreItemDetails.LineItemComponent, { addToCartLabelMap: addToCartLabelMap, children: ({ onHandleAddToCart, buttonState, addToCartButtonDisabled, loadingState, labelText, formattedPrice, lineItem, }) => {
             const label = (_jsxs(_Fragment, { children: [_jsx("span", { children: labelText }), " ", _jsx("span", { children: " | " }), _jsx("span", { children: formattedPrice })] }));
             return (_jsx(AsChildSlot, { asChild: asChild, className: className, customElement: children, customElementProps: {
                     buttonState,
                     addToCartButtonDisabled,
                     loadingState,
-                    lineItem,
-                    lineItems: [lineItem],
+                    onHandleAddToCart,
                     label,
                     formattedPrice,
-                    modifierGroupHasError,
                 }, ref: ref, ...props, children: _jsx(Commerce.Actions.AddToCart, { asChild: false, label: label, className: className, lineItems: [lineItem], ...props }) }));
         } }));
 });

package/cjs/dist/react/core/ItemDetails.d.ts

@@ -21,12 +21,12 @@ interface ItemDetailsLineItemProps {
     addToCartLabelMap: Record<AddToCartButtonState, string>;
     children: (props: {
         loadingState: string | React.ReactNode;
+        onHandleAddToCart: (onClick: (lineItem: LineItem) => void) => void;
         lineItem: LineItem;
         buttonState: AddToCartButtonState;
         addToCartButtonDisabled: boolean;
         labelText: string;
         formattedPrice: string;
-        modifierGroupHasError: boolean;
     }) => React.ReactNode;
 }
 export declare const LineItemComponent: React.FC<ItemDetailsLineItemProps>;

package/cjs/dist/react/core/ItemDetails.js

@@ -31,6 +31,7 @@ export const LineItemComponent = ({ addToCartLabelMap, children, }) => {
     const service = useService(ItemServiceDefinition);
     const oloSettingsService = useService(OLOSettingsServiceDefinition);
     const lineItem = service.lineItem?.get?.() ?? {};
+    const onHandleAddToCart = service.onHandleAddToCart;
     const loadingState = service.isLoading?.get?.() ?? false;
     const buttonState = service.buttonState?.get?.() ?? AddToCartButtonState.VALID_TO_CONTINUE;
     const addToCartButtonDisabled = service.addToCartButtonDisabled?.get?.() ?? false;
@@ -38,15 +39,14 @@ export const LineItemComponent = ({ addToCartLabelMap, children, }) => {
     const formatCurrency = oloSettingsService.formatCurrency;
     const formattedPrice = formatCurrency(price);
     const labelText = addToCartLabelMap[buttonState];
-    const modifierGroupHasError = service.doesModifierGroupHaveError?.get?.() ?? false;
     return children({
         loadingState,
-        lineItem,
+        onHandleAddToCart,
         buttonState,
         addToCartButtonDisabled,
         labelText,
         formattedPrice,
-        modifierGroupHasError,
+        lineItem,
     });
 };
 export const QuantityComponent = ({ children, }) => {

package/cjs/dist/services/item-details-service.d.ts

@@ -16,6 +16,7 @@ export interface ItemServiceAPI {
     quantity: Signal<number>;
     specialRequest: Signal<string>;
     lineItem: ReadOnlySignal<LineItem>;
+    onHandleAddToCart: (onClick: (lineItem: LineItem) => void) => void;
     buttonState: ReadOnlySignal<AddToCartButtonState | undefined>;
     addToCartButtonDisabled: Signal<boolean>;
     price: ReadOnlySignal<number>;
@@ -43,7 +44,6 @@ export interface ItemServiceAPI {
         endDate?: Date;
         weeklyAvailabilitySummary?: WeeklyAvailability;
     };
-    doesModifierGroupHaveError: ReadOnlySignal<boolean>;
 }
 /**
  * Service definition for the Item service.

package/cjs/dist/services/item-details-service.js

@@ -1,7 +1,7 @@
 import { defineService, implementService } from '@wix/services-definitions';
 import { SignalsServiceDefinition, } from '@wix/services-definitions/core-services/signals';
 import { AddToCartButtonState, AvailabilityStatus, } from './common-types.js';
-import { getAreNotEnoughModifiersOfMandatoryModifierGroupInStock, getModifiersInitState, getLineItemModifiers, getPriceVariantOptions, getSelectedModifierPrices, getSelectedVariantPrice, calculateItemPrice, checkModifiersValidation, } from './utils.js';
+import { getAreNotEnoughModifiersOfMandatoryModifierGroupInStock, getModifiersInitState, getLineItemModifiers, getPriceVariantOptions, getSelectedModifierPrices, getSelectedVariantPrice, calculateItemPrice, getModifierGroupErrors, } from './utils.js';
 import { OLOSettingsServiceDefinition } from './olo-settings-service.js';
 /**
  * Service definition for the Item service.
@@ -131,6 +131,14 @@ export const ItemService = implementService.withConfig()(ItemServiceDefinition,
             },
         };
     });
+    const onHandleAddToCart = (onClick) => {
+        const currentSelectedModifiers = selectedModifiers.get();
+        const { errors, hasError } = getModifierGroupErrors(currentSelectedModifiers, modifierGroups);
+        modifierGroupError.set(errors);
+        if (hasError)
+            return;
+        onClick(lineItem.get());
+    };
     const updateQuantity = (_quantity) => {
         quantity.set(_quantity);
     };
@@ -164,20 +172,6 @@ export const ItemService = implementService.withConfig()(ItemServiceDefinition,
             }
         }
     };
-    const doesModifierGroupHaveError = signalsService.computed(() => {
-        const currentSelectedModifiers = selectedModifiers.get();
-        const errors = {};
-        modifierGroups.forEach((group) => {
-            if (group._id) {
-                const selectedCount = (currentSelectedModifiers[group._id] || [])
-                    .length;
-                const isValid = checkModifiersValidation(group.rule, selectedCount);
-                errors[group._id] = !isValid;
-            }
-        });
-        modifierGroupError.set(errors);
-        return Object.values(errors).some((error) => error);
-    });
     const toggleModifier = (modifierGroupId, modifierId, singleSelect = false) => {
         const currentSelectedModifiers = selectedModifiers.get();
         const modifierIds = getModifierIds(modifierGroupId, modifierId, singleSelect);
@@ -206,6 +200,7 @@ export const ItemService = implementService.withConfig()(ItemServiceDefinition,
         error,
         specialRequest,
         lineItem,
+        onHandleAddToCart,
         selectedVariant,
         selectedModifiers,
         availabilityStatus,
@@ -215,7 +210,6 @@ export const ItemService = implementService.withConfig()(ItemServiceDefinition,
         addToCartButtonDisabled,
         price,
         futureAvailability,
-        doesModifierGroupHaveError,
     };
 });
 /**

package/cjs/dist/services/utils.d.ts

@@ -35,6 +35,10 @@ export declare const chooseUpToX: ({ required, minSelections, maxSelections, }:
 export declare const hasToChooseBetweenXAndY: ({ required, minSelections, maxSelections, }: ruleUtilsArgs) => boolean;
 export declare const getRuleTypeMapValue: (ruleTypeMap: RuleTypeMap, ruleType: RuleType, rule: EnhancedModifierGroup["rule"]) => string | undefined;
 export declare const checkModifiersValidation: (rule: EnhancedModifierGroup["rule"], selectedCount: number) => boolean;
+export declare const getModifierGroupErrors: (selectedModifiers: Record<string, Array<string>>, modifierGroups: EnhancedModifierGroup[]) => {
+    errors: Record<string, boolean>;
+    hasError: boolean;
+};
 export declare const getAreNotEnoughModifiersOfMandatoryModifierGroupInStock: (modifierGroups: EnhancedModifierGroup[]) => boolean;
 export declare const getLineItemModifiers: (selectedModifiers: Record<string, Array<string>>, modifierGroups: EnhancedModifierGroup[], formatCurrency: (price?: number) => string) => {
     id: string;

package/cjs/dist/services/utils.js

@@ -158,6 +158,18 @@ export const checkModifiersValidation = (rule, selectedCount) => {
     }
     return true;
 };
+export const getModifierGroupErrors = (selectedModifiers, modifierGroups) => {
+    const errors = {};
+    modifierGroups.forEach((group) => {
+        if (group._id) {
+            const selectedCount = (selectedModifiers[group._id] || []).length;
+            const isValid = checkModifiersValidation(group.rule, selectedCount);
+            errors[group._id] = !isValid;
+        }
+    });
+    const hasError = Object.values(errors).some((error) => error);
+    return { errors, hasError };
+};
 export const getAreNotEnoughModifiersOfMandatoryModifierGroupInStock = (modifierGroups) => modifierGroups.some((modifierGroup) => {
     const isModifierGroupMandatory = modifierGroup.rule?.required;
     const minimumRequiredModifiers = modifierGroup.rule?.minSelections ?? 0;

package/dist/react/ItemDetails.d.ts

@@ -131,7 +131,7 @@ export interface AddToCartButtonProps {
     addToCartLabelMap: Record<AddToCartButtonState, string>;
     /** Children render prop that receives button state and line item data */
     children?: AsChildChildren<{
-        lineItem: LineItem;
+        onHandleAddToCart: (onClick: (lineItem: LineItem) => void) => void;
         buttonState: AddToCartButtonState;
         addToCartButtonDisabled?: boolean;
         /** Content to display when loading */
@@ -139,7 +139,6 @@ export interface AddToCartButtonProps {
         /** Text label for the button */
         label: React.ReactNode;
         formattedPrice: string;
-        modifierGroupHasError: boolean;
     }>;
 }
 /**
@@ -166,9 +165,10 @@ export interface AddToCartButtonProps {
  *   addToCartLabelMap={labelMap}
  *   asChild
  * >
- *   {({ buttonState, formattedPrice, modifierGroupHasError, addToCartButtonDisabled }) => (
+ *   {({ buttonState, formattedPrice, addToCartButtonDisabled,onHandleAddToCart }) => (
  *     <button
- *       disabled={addToCartButtonDisabled || modifierGroupHasError}
+ *       onClick={() => onHandleAddToCart(onClickFunction)}
+ *       disabled={addToCartButtonDisabled}
  *       className="bg-primary text-primary-foreground"
  *     >
  *       <span>{labelMap[buttonState]}</span>

package/dist/react/ItemDetails.js

@@ -118,9 +118,10 @@ Variants.displayName = 'ItemDetails.Variants';
  *   addToCartLabelMap={labelMap}
  *   asChild
  * >
- *   {({ buttonState, formattedPrice, modifierGroupHasError, addToCartButtonDisabled }) => (
+ *   {({ buttonState, formattedPrice, addToCartButtonDisabled,onHandleAddToCart }) => (
  *     <button
- *       disabled={addToCartButtonDisabled || modifierGroupHasError}
+ *       onClick={() => onHandleAddToCart(onClickFunction)}
+ *       disabled={addToCartButtonDisabled}
  *       className="bg-primary text-primary-foreground"
  *     >
  *       <span>{labelMap[buttonState]}</span>
@@ -131,17 +132,15 @@ Variants.displayName = 'ItemDetails.Variants';
  * ```
  */
 export const AddToCartButton = React.forwardRef(({ asChild, children, className, addToCartLabelMap, ...props }, ref) => {
-    return (_jsx(CoreItemDetails.LineItemComponent, { addToCartLabelMap: addToCartLabelMap, children: ({ lineItem, buttonState, addToCartButtonDisabled, loadingState, labelText, formattedPrice, modifierGroupHasError, }) => {
+    return (_jsx(CoreItemDetails.LineItemComponent, { addToCartLabelMap: addToCartLabelMap, children: ({ onHandleAddToCart, buttonState, addToCartButtonDisabled, loadingState, labelText, formattedPrice, lineItem, }) => {
             const label = (_jsxs(_Fragment, { children: [_jsx("span", { children: labelText }), " ", _jsx("span", { children: " | " }), _jsx("span", { children: formattedPrice })] }));
             return (_jsx(AsChildSlot, { asChild: asChild, className: className, customElement: children, customElementProps: {
                     buttonState,
                     addToCartButtonDisabled,
                     loadingState,
-                    lineItem,
-                    lineItems: [lineItem],
+                    onHandleAddToCart,
                     label,
                     formattedPrice,
-                    modifierGroupHasError,
                 }, ref: ref, ...props, children: _jsx(Commerce.Actions.AddToCart, { asChild: false, label: label, className: className, lineItems: [lineItem], ...props }) }));
         } }));
 });

package/dist/react/core/ItemDetails.d.ts

@@ -21,12 +21,12 @@ interface ItemDetailsLineItemProps {
     addToCartLabelMap: Record<AddToCartButtonState, string>;
     children: (props: {
         loadingState: string | React.ReactNode;
+        onHandleAddToCart: (onClick: (lineItem: LineItem) => void) => void;
         lineItem: LineItem;
         buttonState: AddToCartButtonState;
         addToCartButtonDisabled: boolean;
         labelText: string;
         formattedPrice: string;
-        modifierGroupHasError: boolean;
     }) => React.ReactNode;
 }
 export declare const LineItemComponent: React.FC<ItemDetailsLineItemProps>;

package/dist/react/core/ItemDetails.js

@@ -31,6 +31,7 @@ export const LineItemComponent = ({ addToCartLabelMap, children, }) => {
     const service = useService(ItemServiceDefinition);
     const oloSettingsService = useService(OLOSettingsServiceDefinition);
     const lineItem = service.lineItem?.get?.() ?? {};
+    const onHandleAddToCart = service.onHandleAddToCart;
     const loadingState = service.isLoading?.get?.() ?? false;
     const buttonState = service.buttonState?.get?.() ?? AddToCartButtonState.VALID_TO_CONTINUE;
     const addToCartButtonDisabled = service.addToCartButtonDisabled?.get?.() ?? false;
@@ -38,15 +39,14 @@ export const LineItemComponent = ({ addToCartLabelMap, children, }) => {
     const formatCurrency = oloSettingsService.formatCurrency;
     const formattedPrice = formatCurrency(price);
     const labelText = addToCartLabelMap[buttonState];
-    const modifierGroupHasError = service.doesModifierGroupHaveError?.get?.() ?? false;
     return children({
         loadingState,
-        lineItem,
+        onHandleAddToCart,
         buttonState,
         addToCartButtonDisabled,
         labelText,
         formattedPrice,
-        modifierGroupHasError,
+        lineItem,
     });
 };
 export const QuantityComponent = ({ children, }) => {

package/dist/services/item-details-service.d.ts

@@ -16,6 +16,7 @@ export interface ItemServiceAPI {
     quantity: Signal<number>;
     specialRequest: Signal<string>;
     lineItem: ReadOnlySignal<LineItem>;
+    onHandleAddToCart: (onClick: (lineItem: LineItem) => void) => void;
     buttonState: ReadOnlySignal<AddToCartButtonState | undefined>;
     addToCartButtonDisabled: Signal<boolean>;
     price: ReadOnlySignal<number>;
@@ -43,7 +44,6 @@ export interface ItemServiceAPI {
         endDate?: Date;
         weeklyAvailabilitySummary?: WeeklyAvailability;
     };
-    doesModifierGroupHaveError: ReadOnlySignal<boolean>;
 }
 /**
  * Service definition for the Item service.

package/dist/services/item-details-service.js

@@ -1,7 +1,7 @@
 import { defineService, implementService } from '@wix/services-definitions';
 import { SignalsServiceDefinition, } from '@wix/services-definitions/core-services/signals';
 import { AddToCartButtonState, AvailabilityStatus, } from './common-types.js';
-import { getAreNotEnoughModifiersOfMandatoryModifierGroupInStock, getModifiersInitState, getLineItemModifiers, getPriceVariantOptions, getSelectedModifierPrices, getSelectedVariantPrice, calculateItemPrice, checkModifiersValidation, } from './utils.js';
+import { getAreNotEnoughModifiersOfMandatoryModifierGroupInStock, getModifiersInitState, getLineItemModifiers, getPriceVariantOptions, getSelectedModifierPrices, getSelectedVariantPrice, calculateItemPrice, getModifierGroupErrors, } from './utils.js';
 import { OLOSettingsServiceDefinition } from './olo-settings-service.js';
 /**
  * Service definition for the Item service.
@@ -131,6 +131,14 @@ export const ItemService = implementService.withConfig()(ItemServiceDefinition,
             },
         };
     });
+    const onHandleAddToCart = (onClick) => {
+        const currentSelectedModifiers = selectedModifiers.get();
+        const { errors, hasError } = getModifierGroupErrors(currentSelectedModifiers, modifierGroups);
+        modifierGroupError.set(errors);
+        if (hasError)
+            return;
+        onClick(lineItem.get());
+    };
     const updateQuantity = (_quantity) => {
         quantity.set(_quantity);
     };
@@ -164,20 +172,6 @@ export const ItemService = implementService.withConfig()(ItemServiceDefinition,
             }
         }
     };
-    const doesModifierGroupHaveError = signalsService.computed(() => {
-        const currentSelectedModifiers = selectedModifiers.get();
-        const errors = {};
-        modifierGroups.forEach((group) => {
-            if (group._id) {
-                const selectedCount = (currentSelectedModifiers[group._id] || [])
-                    .length;
-                const isValid = checkModifiersValidation(group.rule, selectedCount);
-                errors[group._id] = !isValid;
-            }
-        });
-        modifierGroupError.set(errors);
-        return Object.values(errors).some((error) => error);
-    });
     const toggleModifier = (modifierGroupId, modifierId, singleSelect = false) => {
         const currentSelectedModifiers = selectedModifiers.get();
         const modifierIds = getModifierIds(modifierGroupId, modifierId, singleSelect);
@@ -206,6 +200,7 @@ export const ItemService = implementService.withConfig()(ItemServiceDefinition,
         error,
         specialRequest,
         lineItem,
+        onHandleAddToCart,
         selectedVariant,
         selectedModifiers,
         availabilityStatus,
@@ -215,7 +210,6 @@ export const ItemService = implementService.withConfig()(ItemServiceDefinition,
         addToCartButtonDisabled,
         price,
         futureAvailability,
-        doesModifierGroupHaveError,
     };
 });
 /**

package/dist/services/utils.d.ts

@@ -35,6 +35,10 @@ export declare const chooseUpToX: ({ required, minSelections, maxSelections, }:
 export declare const hasToChooseBetweenXAndY: ({ required, minSelections, maxSelections, }: ruleUtilsArgs) => boolean;
 export declare const getRuleTypeMapValue: (ruleTypeMap: RuleTypeMap, ruleType: RuleType, rule: EnhancedModifierGroup["rule"]) => string | undefined;
 export declare const checkModifiersValidation: (rule: EnhancedModifierGroup["rule"], selectedCount: number) => boolean;
+export declare const getModifierGroupErrors: (selectedModifiers: Record<string, Array<string>>, modifierGroups: EnhancedModifierGroup[]) => {
+    errors: Record<string, boolean>;
+    hasError: boolean;
+};
 export declare const getAreNotEnoughModifiersOfMandatoryModifierGroupInStock: (modifierGroups: EnhancedModifierGroup[]) => boolean;
 export declare const getLineItemModifiers: (selectedModifiers: Record<string, Array<string>>, modifierGroups: EnhancedModifierGroup[], formatCurrency: (price?: number) => string) => {
     id: string;

package/dist/services/utils.js

@@ -158,6 +158,18 @@ export const checkModifiersValidation = (rule, selectedCount) => {
     }
     return true;
 };
+export const getModifierGroupErrors = (selectedModifiers, modifierGroups) => {
+    const errors = {};
+    modifierGroups.forEach((group) => {
+        if (group._id) {
+            const selectedCount = (selectedModifiers[group._id] || []).length;
+            const isValid = checkModifiersValidation(group.rule, selectedCount);
+            errors[group._id] = !isValid;
+        }
+    });
+    const hasError = Object.values(errors).some((error) => error);
+    return { errors, hasError };
+};
 export const getAreNotEnoughModifiersOfMandatoryModifierGroupInStock = (modifierGroups) => modifierGroups.some((modifierGroup) => {
     const isModifierGroupMandatory = modifierGroup.rule?.required;
     const minimumRequiredModifiers = modifierGroup.rule?.minSelections ?? 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/headless-restaurants-olo",
-  "version": "0.0.34",
+  "version": "0.0.35",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -77,5 +77,5 @@
       "groupId": "com.wixpress.headless-components"
     }
   },
-  "falconPackageHash": "22a275aaf801de66f5ec2ddbae71a70581fa29090569bcd198522b4e"
+  "falconPackageHash": "8fef913fc66b2bade48d7c257f0f51bb8b909775971887e2af22001c"
 }