thm-p3-configurator 0.0.355 → 0.0.357

package/dist/src/shared/__components__/Form/DecimalInput.js

@@ -51,6 +51,8 @@ const DecimalInput = _ref => {
     value,
     name,
     onClick = () => {},
+    onBlur = () => {},
+    onKeyDown = () => {},
     isDisabled = false,
     onChange = () => {},
     isRequired = true,
@@ -93,6 +95,8 @@ const DecimalInput = _ref => {
     value: displayValue,
     disabled: isDisabled,
     onChange: e => handleChange(e.target.value),
+    onBlur: onBlur,
+    onKeyDown: onKeyDown,
     required: isRequired,
     className: "".concat((0, _helpers__.withStyle)('form-control'), " ").concat(errorMessage ? (0, _helpers__.withStyle)('is-invalid') : '')
   }), errorMessage && /*#__PURE__*/_react.default.createElement(_ErrorMessage.default, {

package/dist/src/shared/__containers__/ProductsCartOverview.js

@@ -158,6 +158,7 @@ const parseDiscountValue = value => {
   return Math.min(100, Math.max(0, parseInt(sanitized, 10)));
 };
 const formatDiscountDraft = value => value === null || value === undefined ? '' : value.toString();
+const formatMontageRateDraft = value => value === null || value === undefined ? '' : value.toString();
 const DeferredDiscountInput = _ref => {
   let {
     articleNumber,
@@ -201,6 +202,44 @@ const DeferredDiscountInput = _ref => {
     }
   }));
 };
+const DeferredMontageRateInput = _ref2 => {
+  let {
+    value,
+    isDisabled = false,
+    onCommit
+  } = _ref2;
+  const [draftValue, setDraftValue] = (0, _react.useState)(formatMontageRateDraft(value));
+  const isEditingRef = (0, _react.useRef)(false);
+  (0, _react.useEffect)(() => {
+    if (!isEditingRef.current) {
+      setDraftValue(formatMontageRateDraft(value));
+    }
+  }, [value]);
+  return /*#__PURE__*/_react.default.createElement(_DecimalInput.default, {
+    label: "Montage tarief",
+    className: "mb-0",
+    name: "montage-rate",
+    placeholder: "0.0",
+    value: draftValue,
+    min: 0,
+    step: "0.1",
+    isRequired: false,
+    isDisabled: isDisabled,
+    onChange: nextValue => {
+      isEditingRef.current = true;
+      setDraftValue(nextValue);
+    },
+    onBlur: () => {
+      isEditingRef.current = false;
+      onCommit(draftValue);
+    },
+    onKeyDown: event => {
+      if (event.key === 'Enter') {
+        event.currentTarget.blur();
+      }
+    }
+  });
+};
 
 // ============================================================================
 // MAIN COMPONENT
@@ -263,7 +302,7 @@ const ProductCartTable = () => {
       });
     }
   };
-  const handleMontageRateChange = value => {
+  const handleMontageRateCommit = value => {
     if (value === null || value === undefined) {
       dispatch({
         type: _OrderSessionContext.orderSessionActions.SET_MONTAGE_RATE,
@@ -276,9 +315,7 @@ const ProductCartTable = () => {
 
     // Permit typing both comma and dot decimals
     const sanitized = value.toString().replace(/[^0-9.,-]/g, '').replace(',', '.');
-
-    // Allow a lone "0." or "0," while typing
-    if (sanitized === '' || sanitized === '0.' || sanitized === '0,') {
+    if (sanitized === '' || sanitized === '-' || sanitized === '.' || sanitized === ',') {
       dispatch({
         type: _OrderSessionContext.orderSessionActions.SET_MONTAGE_RATE,
         payload: {
@@ -617,17 +654,10 @@ const ProductCartTable = () => {
   }));
   const renderMontageRateInput = () => isThc ? null : /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _helpers__.withStyle)('d-flex flex-column align-items-end justify-content-end gap-1')
-  }, /*#__PURE__*/_react.default.createElement(_DecimalInput.default, {
-    label: "Montage tarief",
-    className: "mb-0",
-    name: "montage-rate",
-    placeholder: "0.0",
-    value: montageRate === null || montageRate === undefined ? '' : montageRate.toString(),
-    min: 0,
-    step: "0.1",
-    isRequired: false,
+  }, /*#__PURE__*/_react.default.createElement(DeferredMontageRateInput, {
+    value: montageRate,
     isDisabled: isMontageTariffFixed,
-    onChange: handleMontageRateChange
+    onCommit: handleMontageRateCommit
   }), montageHourlyExcl !== null && /*#__PURE__*/_react.default.createElement("span", {
     className: (0, _helpers__.withStyle)('small text-muted')
   }, "Uurprijs: ", (0, _helpers__.formatPrice)(montageHourlyExcl)));

package/dist/src/shared/__containers__/internal/InternalBranchSelectorModal.js

@@ -193,9 +193,6 @@ const MyBranchesSelect = _ref5 => {
 const SingleOrderModalContent = _ref6 => {
   let {
     setSelectedBranchId,
-    isLocation,
-    authSession,
-    selectedBranch,
     dispatch,
     isTMGOrganization,
     formula
@@ -230,17 +227,6 @@ const SingleOrderModalContent = _ref6 => {
     label: "".concat(branch === null || branch === void 0 ? void 0 : branch.naamVestiging, " - ").concat(branch === null || branch === void 0 ? void 0 : branch.name),
     value: branch === null || branch === void 0 ? void 0 : branch.entityId
   }));
-  (0, _react.useEffect)(() => {
-    if (isLocation && !selectedBranch && !isTMGOrganization) {
-      var _authSession$branch;
-      dispatch({
-        type: _OrderSessionContext.orderSessionActions.SET_SELECTED_BRANCH,
-        payload: {
-          branchId: authSession === null || authSession === void 0 || (_authSession$branch = authSession.branch) === null || _authSession$branch === void 0 ? void 0 : _authSession$branch.entityId
-        }
-      });
-    }
-  }, [dispatch, isLocation, authSession, selectedBranch, isTMGOrganization]);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, formula === _constants__.CONFIGURATOR_FORMULAS.TMG && /*#__PURE__*/_react.default.createElement(_DropdownInput.default, {
     options: singleOrderBranchTypes === null || singleOrderBranchTypes === void 0 ? void 0 : singleOrderBranchTypes.map(branchType => ({
       label: branchType === null || branchType === void 0 ? void 0 : branchType.title,
@@ -355,8 +341,8 @@ const InternalBranchSelectorModal = () => {
     setIsDismissed(false);
   }, [isSingleOrderPage]);
   const isLocation = _react.default.useMemo(() => {
-    var _authSession$branch2;
-    const orgTypes = (authSession === null || authSession === void 0 || (_authSession$branch2 = authSession.branch) === null || _authSession$branch2 === void 0 ? void 0 : _authSession$branch2.organisatietype) || [];
+    var _authSession$branch;
+    const orgTypes = (authSession === null || authSession === void 0 || (_authSession$branch = authSession.branch) === null || _authSession$branch === void 0 ? void 0 : _authSession$branch.organisatietype) || [];
     return orgTypes.some(typeId => {
       var _branchTypes$byId;
       return (branchTypes === null || branchTypes === void 0 || (_branchTypes$byId = branchTypes.byId) === null || _branchTypes$byId === void 0 || (_branchTypes$byId = _branchTypes$byId[typeId]) === null || _branchTypes$byId === void 0 ? void 0 : _branchTypes$byId.title) === _constants__.LOCATION_TYPE;
@@ -466,9 +452,6 @@ const InternalBranchSelectorModal = () => {
     onClose: () => setIsDismissed(true)
   }, isSingleOrderPage ? /*#__PURE__*/_react.default.createElement(SingleOrderModalContent, {
     setSelectedBranchId: _setSelectedBranchId,
-    isLocation: isLocation,
-    authSession: authSession,
-    selectedBranch: selectedBranch,
     dispatch: dispatch,
     isTMGOrganization: isTMGOrganization,
     formula: formula

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thm-p3-configurator",
-  "version": "0.0.355",
+  "version": "0.0.357",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "author": "EnoRm.",