@shipengine/elements 0.5.2 → 0.5.5

package/components/rate-form/rate-form.d.ts

@@ -3,10 +3,11 @@ import SE from "@shipengine/elements-core";
 export declare type RateFormProps = {
     errors?: SE.CodedError[];
     loading?: boolean;
-    onLabelCreateFailure?: () => void;
-    onLabelCreateSuccess?: (label: SE.Label, shipment?: SE.SalesOrderShipment) => void;
-    onRateSaved?: (shipment: SE.SalesOrderShipment) => void;
+    onBeforeLabelCreate?: (rate: SE.Rate, shipment?: SE.SalesOrderShipment) => Promise<void> | void;
+    onLabelCreateFailure?: (rate?: SE.Rate, shipment?: SE.SalesOrderShipment) => Promise<void> | void;
+    onLabelCreateSuccess?: (label: SE.Label, shipment?: SE.SalesOrderShipment) => Promise<void> | void;
+    onRateSaved?: (shipment: SE.SalesOrderShipment) => Promise<void> | void;
     rates?: SE.Rate[];
     shipment?: SE.SalesOrderShipment;
 };
-export declare const RateForm: ({ errors, loading, onLabelCreateFailure, onLabelCreateSuccess, onRateSaved, rates, shipment, }: RateFormProps) => JSX.Element;
+export declare const RateForm: ({ errors, loading, onBeforeLabelCreate, onLabelCreateFailure, onLabelCreateSuccess, onRateSaved, rates, shipment, }: RateFormProps) => JSX.Element;

package/components/sales-order/sales-order.d.ts

@@ -8,6 +8,7 @@ export declare type SalesOrderProps = {
     externalOrderNumber?: string;
     onAddressValidation?: (addressPreference: Templates.AddressPreference) => void;
     onChangeAddress?: ShipmentFormProps["onChangeAddress"];
+    onBeforeLabelCreate?: RateFormProps["onBeforeLabelCreate"];
     onLabelCreateFailure?: RateFormProps["onLabelCreateFailure"];
     onLabelCreateSuccess?: RateFormProps["onLabelCreateSuccess"];
     onLoad?: (salesOrder: SE.SalesOrder, shipments: SE.SalesOrderShipment[]) => void;
@@ -19,4 +20,4 @@ export declare type SalesOrderProps = {
     salesOrderId?: string;
     shippingPresets?: UseShippingPresetsOptionsProps;
 };
-export declare const SalesOrder: ({ externalOrderId, externalOrderNumber, onAddressValidation, onChangeAddress, onLabelCreateFailure, onLabelCreateSuccess, onLoad, onRateSaved, onRatesReturned, onChangeShipmentFormMode, onToggleAddressPreferenceDisclosure, orderSourceCode, salesOrderId, shippingPresets, }: SalesOrderProps) => JSX.Element;
+export declare const SalesOrder: ({ externalOrderId, externalOrderNumber, onAddressValidation, onChangeAddress, onBeforeLabelCreate, onLabelCreateFailure, onLabelCreateSuccess, onLoad, onRateSaved, onRatesReturned, onChangeShipmentFormMode, onToggleAddressPreferenceDisclosure, orderSourceCode, salesOrderId, shippingPresets, }: SalesOrderProps) => JSX.Element;

package/index.cjs

@@ -2858,6 +2858,7 @@ const ShipmentForm = ({
 const RateForm = ({
   errors,
   loading: _loading = false,
+  onBeforeLabelCreate,
   onLabelCreateFailure,
   onLabelCreateSuccess,
   onRateSaved,
@@ -2870,27 +2871,31 @@ const RateForm = ({
   const updateShipment = elementsCore.useUpdateShipment({
     shipmentId: shipment === null || shipment === void 0 ? void 0 : shipment.shipmentId
   });
+  const handleSubmit = react.useCallback(values => __awaiter(void 0, void 0, void 0, function* () {
+    const rate = rates === null || rates === void 0 ? void 0 : rates.find(r => r.rateId === values.rate.rateId);
 
-  const handleSubmit = values => __awaiter(void 0, void 0, void 0, function* () {
-    const label = yield createLabel.trigger(values.rate);
+    if (rate) {
+      yield onBeforeLabelCreate === null || onBeforeLabelCreate === void 0 ? void 0 : onBeforeLabelCreate(rate, shipment);
+      const label = yield createLabel.trigger(values.rate);
 
-    if (label) {
-      onLabelCreateSuccess === null || onLabelCreateSuccess === void 0 ? void 0 : onLabelCreateSuccess(label, shipment);
+      if (label) {
+        yield onLabelCreateSuccess === null || onLabelCreateSuccess === void 0 ? void 0 : onLabelCreateSuccess(label, shipment);
+      } else {
+        yield onLabelCreateFailure === null || onLabelCreateFailure === void 0 ? void 0 : onLabelCreateFailure(rate, shipment);
+      }
     } else {
-      onLabelCreateFailure === null || onLabelCreateFailure === void 0 ? void 0 : onLabelCreateFailure();
+      yield onLabelCreateFailure === null || onLabelCreateFailure === void 0 ? void 0 : onLabelCreateFailure(rate, shipment);
     }
-  });
-
-  const handleSave = rate => __awaiter(void 0, void 0, void 0, function* () {
+  }), [rates, onBeforeLabelCreate, onLabelCreateSuccess, onLabelCreateFailure, createLabel, shipment]);
+  const handleSave = react.useCallback(rate => __awaiter(void 0, void 0, void 0, function* () {
     if (shipment) {
       const updatedShipment = yield updateShipment.trigger(Object.assign(Object.assign({}, shipment), {
         carrierId: rate.carrierId,
         serviceCode: rate.serviceCode
       }));
-      if (updatedShipment) onRateSaved === null || onRateSaved === void 0 ? void 0 : onRateSaved(updatedShipment);
+      if (updatedShipment) yield onRateSaved === null || onRateSaved === void 0 ? void 0 : onRateSaved(updatedShipment);
     }
-  });
-
+  }), [shipment, updateShipment, onRateSaved]);
   const carriers = elementsCore.useListCarriers();
   return jsxRuntime.jsx(elementsUi.Templates.RateForm, {
     carriers: carriers.data,
@@ -20172,6 +20177,7 @@ const SalesOrder = ({
   externalOrderNumber,
   onAddressValidation,
   onChangeAddress,
+  onBeforeLabelCreate,
   onLabelCreateFailure,
   onLabelCreateSuccess,
   onLoad,
@@ -20379,6 +20385,7 @@ const SalesOrder = ({
     }), jsxRuntime.jsx(RateForm, {
       errors: [...((_b = calculateRates.errors) !== null && _b !== void 0 ? _b : []), ...((_d = (_c = calculateRates.data) === null || _c === void 0 ? void 0 : _c.errors) !== null && _d !== void 0 ? _d : [])],
       loading: calculateRates.isMutating,
+      onBeforeLabelCreate: onBeforeLabelCreate,
       onLabelCreateFailure: onLabelCreateFailure,
       onLabelCreateSuccess: onLabelCreateSuccess,
       onRateSaved: onRateSaved,

package/index.js

@@ -2854,6 +2854,7 @@ const ShipmentForm = ({
 const RateForm = ({
   errors,
   loading: _loading = false,
+  onBeforeLabelCreate,
   onLabelCreateFailure,
   onLabelCreateSuccess,
   onRateSaved,
@@ -2866,27 +2867,31 @@ const RateForm = ({
   const updateShipment = useUpdateShipment({
     shipmentId: shipment === null || shipment === void 0 ? void 0 : shipment.shipmentId
   });
+  const handleSubmit = useCallback(values => __awaiter(void 0, void 0, void 0, function* () {
+    const rate = rates === null || rates === void 0 ? void 0 : rates.find(r => r.rateId === values.rate.rateId);
 
-  const handleSubmit = values => __awaiter(void 0, void 0, void 0, function* () {
-    const label = yield createLabel.trigger(values.rate);
+    if (rate) {
+      yield onBeforeLabelCreate === null || onBeforeLabelCreate === void 0 ? void 0 : onBeforeLabelCreate(rate, shipment);
+      const label = yield createLabel.trigger(values.rate);
 
-    if (label) {
-      onLabelCreateSuccess === null || onLabelCreateSuccess === void 0 ? void 0 : onLabelCreateSuccess(label, shipment);
+      if (label) {
+        yield onLabelCreateSuccess === null || onLabelCreateSuccess === void 0 ? void 0 : onLabelCreateSuccess(label, shipment);
+      } else {
+        yield onLabelCreateFailure === null || onLabelCreateFailure === void 0 ? void 0 : onLabelCreateFailure(rate, shipment);
+      }
     } else {
-      onLabelCreateFailure === null || onLabelCreateFailure === void 0 ? void 0 : onLabelCreateFailure();
+      yield onLabelCreateFailure === null || onLabelCreateFailure === void 0 ? void 0 : onLabelCreateFailure(rate, shipment);
     }
-  });
-
-  const handleSave = rate => __awaiter(void 0, void 0, void 0, function* () {
+  }), [rates, onBeforeLabelCreate, onLabelCreateSuccess, onLabelCreateFailure, createLabel, shipment]);
+  const handleSave = useCallback(rate => __awaiter(void 0, void 0, void 0, function* () {
     if (shipment) {
       const updatedShipment = yield updateShipment.trigger(Object.assign(Object.assign({}, shipment), {
         carrierId: rate.carrierId,
         serviceCode: rate.serviceCode
       }));
-      if (updatedShipment) onRateSaved === null || onRateSaved === void 0 ? void 0 : onRateSaved(updatedShipment);
+      if (updatedShipment) yield onRateSaved === null || onRateSaved === void 0 ? void 0 : onRateSaved(updatedShipment);
     }
-  });
-
+  }), [shipment, updateShipment, onRateSaved]);
   const carriers = useListCarriers();
   return jsx(Templates.RateForm, {
     carriers: carriers.data,
@@ -20168,6 +20173,7 @@ const SalesOrder = ({
   externalOrderNumber,
   onAddressValidation,
   onChangeAddress,
+  onBeforeLabelCreate,
   onLabelCreateFailure,
   onLabelCreateSuccess,
   onLoad,
@@ -20375,6 +20381,7 @@ const SalesOrder = ({
     }), jsx(RateForm, {
       errors: [...((_b = calculateRates.errors) !== null && _b !== void 0 ? _b : []), ...((_d = (_c = calculateRates.data) === null || _c === void 0 ? void 0 : _c.errors) !== null && _d !== void 0 ? _d : [])],
       loading: calculateRates.isMutating,
+      onBeforeLabelCreate: onBeforeLabelCreate,
       onLabelCreateFailure: onLabelCreateFailure,
       onLabelCreateSuccess: onLabelCreateSuccess,
       onRateSaved: onRateSaved,

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@shipengine/elements",
-  "version": "0.5.2",
+  "version": "0.5.5",
   "module": "./index.js",
   "main": "./index.cjs",
   "type": "module",
   "types": "./index.d.ts",
   "dependencies": {
     "react": "^18.2.0",
-    "@shipengine/elements-core": "0.5.2",
+    "@shipengine/elements-core": "0.5.5",
     "react-i18next": "^11.18.4",
     "i18next": "^21.9.1",
     "i18next-http-backend": "^1.4.1",
     "i18next-browser-languagedetector": "^6.1.4",
-    "@shipengine/elements-ui": "0.5.2"
+    "@shipengine/elements-ui": "0.5.5"
   },
   "peerDependencies": {}
 }