ordering-ui-admin-external 1.43.87 → 1.43.89

package/_modules/components/Stores/ProductExtraOptionDetails/index.js

@@ -124,6 +124,10 @@ var ProductExtraOptionDetailsUI = function ProductExtraOptionDetailsUI(props) {
     _useState14 = _slicedToArray(_useState13, 2),
     isExtraOptionSnooze = _useState14[0],
     setIsExtraOptionSnooze = _useState14[1];
+  var _useState15 = (0, _react.useState)(false),
+    _useState16 = _slicedToArray(_useState15, 2),
+    isDraggingExtraOption = _useState16[0],
+    setIsDraggingExtraOption = _useState16[1];
   var handleClickSubOptionImage = function handleClickSubOptionImage(id) {
     document.getElementById(id).click();
   };
@@ -292,7 +296,9 @@ var ProductExtraOptionDetailsUI = function ProductExtraOptionDetailsUI(props) {
       hanldeDragOver: hanldeDragOver,
       handleDrop: handleDrop,
       handleDragEnd: handleDragEnd,
-      handleDuplicateSubOption: handleDuplicateSubOption
+      handleDuplicateSubOption: handleDuplicateSubOption,
+      isDraggingExtraOption: isDraggingExtraOption,
+      setIsDraggingExtraOption: setIsDraggingExtraOption
     });
   }), isAddForm && /*#__PURE__*/_react.default.createElement(_styles2.AdddSubOptionForm, {
     onSubmit: handleSubmit(handleAddOption)
@@ -302,7 +308,7 @@ var ProductExtraOptionDetailsUI = function ProductExtraOptionDetailsUI(props) {
     name: "image",
     control: control,
     render: function render() {
-      var _changesState$result, _changesState$result2, _changesState$changes, _changesState$changes2;
+      var _changesState$changes, _changesState$changes2;
       return /*#__PURE__*/_react.default.createElement(_styles2.SubOptionImage, {
         onClick: function onClick() {
           return handleClickSubOptionImage('add_suboption_image');
@@ -319,12 +325,8 @@ var ProductExtraOptionDetailsUI = function ProductExtraOptionDetailsUI(props) {
           return handleSubOptionFiles(dataTransfer.files, 'add_suboption_image');
         },
         accept: "image/png, image/jpeg, image/jpg",
-        disabled: optionState.loading
-      }, changesState !== null && changesState !== void 0 && (_changesState$result = changesState.result) !== null && _changesState$result !== void 0 && _changesState$result.image && editSubOptionId === null ? /*#__PURE__*/_react.default.createElement("img", {
-        src: changesState === null || changesState === void 0 || (_changesState$result2 = changesState.result) === null || _changesState$result2 === void 0 ? void 0 : _changesState$result2.image,
-        alt: "sub option image",
-        loading: "lazy"
-      }) : (changesState === null || changesState === void 0 || (_changesState$changes = changesState.changes) === null || _changesState$changes === void 0 ? void 0 : _changesState$changes.image) && editSubOptionId === null && /*#__PURE__*/_react.default.createElement("img", {
+        disabled: optionState.loading || isDraggingExtraOption
+      }, (changesState === null || changesState === void 0 || (_changesState$changes = changesState.changes) === null || _changesState$changes === void 0 ? void 0 : _changesState$changes.image) && editSubOptionId === null && /*#__PURE__*/_react.default.createElement("img", {
         src: changesState === null || changesState === void 0 || (_changesState$changes2 = changesState.changes) === null || _changesState$changes2 === void 0 ? void 0 : _changesState$changes2.image,
         alt: "sub option image",
         loading: "lazy"

package/_modules/components/Stores/ProductExtraSuboption/index.js

@@ -52,7 +52,9 @@ var ProductExtraSuboption = exports.ProductExtraSuboption = function ProductExtr
     hanldeDragOver = props.hanldeDragOver,
     handleDrop = props.handleDrop,
     handleDragEnd = props.handleDragEnd,
-    handleDuplicateSubOption = props.handleDuplicateSubOption;
+    handleDuplicateSubOption = props.handleDuplicateSubOption,
+    isDraggingExtraOption = props.isDraggingExtraOption,
+    setIsDraggingExtraOption = props.setIsDraggingExtraOption;
   var theme = (0, _styledComponents.useTheme)();
   var _useLanguage = (0, _orderingComponentsAdminExternal.useLanguage)(),
     _useLanguage2 = _slicedToArray(_useLanguage, 2),
@@ -177,6 +179,13 @@ var ProductExtraSuboption = exports.ProductExtraSuboption = function ProductExtr
     });
     setExternalIdOpen(false);
   };
+  var handleDropSubOption = function handleDropSubOption(e, subOption) {
+    setIsDraggingExtraOption(false);
+    handleDrop(e, subOption);
+  };
+  var handleDragStartSubOption = function handleDragStartSubOption() {
+    setIsDraggingExtraOption(true);
+  };
   (0, _react.useEffect)(function () {
     if (Object.keys(errors).length > 0) {
       setAlertState({
@@ -202,11 +211,12 @@ var ProductExtraSuboption = exports.ProductExtraSuboption = function ProductExtr
     onSubmit: handleSubmit(onSubmit),
     isDragOver: dragoverSubOptionId === subOption.id,
     isBorderBottom: isSubOptionsBottom && isLastSubOption,
+    onDragStart: handleDragStartSubOption,
     onDragOver: function onDragOver(e) {
       return hanldeDragOver(e, subOption, isLastSubOption);
     },
     onDrop: function onDrop(e) {
-      return handleDrop(e, subOption);
+      return handleDropSubOption(e, subOption);
     },
     onDragEnd: handleDragEnd,
     className: "draggable-suboption"
@@ -233,7 +243,7 @@ var ProductExtraSuboption = exports.ProductExtraSuboption = function ProductExtr
       return handleSubOptionFiles(dataTransfer.files, subOption.id);
     },
     accept: "image/png, image/jpeg, image/jpg",
-    disabled: optionState.loading
+    disabled: optionState.loading || isDraggingExtraOption
   }, changesState !== null && changesState !== void 0 && (_changesState$result = changesState.result) !== null && _changesState$result !== void 0 && _changesState$result.image && editSubOptionId === subOption.id ? /*#__PURE__*/_react.default.createElement("img", {
     src: changesState === null || changesState === void 0 || (_changesState$result2 = changesState.result) === null || _changesState$result2 === void 0 ? void 0 : _changesState$result2.image,
     alt: "sub option image",

package/_modules/components/Stores/SnoozeComponent/index.js

@@ -167,9 +167,6 @@ var SnoozeComponent = exports.SnoozeComponent = function SnoozeComponent(props)
   }, {
     value: '12',
     content: t('SNOOZE_TWELVE_HOUR', '12H')
-  }, {
-    value: 'indefinitely',
-    content: t('SNOOZE_INDEFINITELY', 'Indefinitely')
   }, {
     value: 'or',
     content: t('SNOOZE_OR', 'or')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-admin-external",
-  "version": "1.43.87",
+  "version": "1.43.89",
   "description": "Ordering UI Admin Components",
   "main": "./_modules/index.js",
   "exports": {
@@ -83,7 +83,7 @@
     "lodash": "^4.17.20",
     "moment": "^2.29.1",
     "moment-range": "^4.0.2",
-    "ordering-components-admin-external": "1.43.56",
+    "ordering-components-admin-external": "1.43.57",
     "polished": "^3.6.7",
     "prop-types": "^15.7.2",
     "react-big-calendar": "^1.4.2",

package/src/components/Stores/ProductExtraOptionDetails/index.js

@@ -94,6 +94,7 @@ const ProductExtraOptionDetailsUI = (props) => {
   const [cropState, setCropState] = useState({ name: null, data: null, open: false })
   const [externalId, setExternalId] = useState()
   const [isExtraOptionSnooze, setIsExtraOptionSnooze] = useState(false)
+  const [isDraggingExtraOption, setIsDraggingExtraOption] = useState(false)
 
   const handleClickSubOptionImage = (id) => {
     document.getElementById(id).click()
@@ -286,6 +287,8 @@ const ProductExtraOptionDetailsUI = (props) => {
               handleDrop={handleDrop}
               handleDragEnd={handleDragEnd}
               handleDuplicateSubOption={handleDuplicateSubOption}
+              isDraggingExtraOption={isDraggingExtraOption}
+              setIsDraggingExtraOption={setIsDraggingExtraOption}
             />
           )
         })}
@@ -309,12 +312,10 @@ const ProductExtraOptionDetailsUI = (props) => {
                       <DragAndDrop
                         onDrop={dataTransfer => handleSubOptionFiles(dataTransfer.files, 'add_suboption_image')}
                         accept='image/png, image/jpeg, image/jpg'
-                        disabled={optionState.loading}
+                        disabled={optionState.loading || isDraggingExtraOption}
                       >
                         {
-                          (changesState?.result?.image && editSubOptionId === null)
-                            ? (<img src={changesState?.result?.image} alt='sub option image' loading='lazy' />)
-                            : (changesState?.changes?.image && editSubOptionId === null) && (<img src={changesState?.changes?.image} alt='sub option image' loading='lazy' />)
+                          (changesState?.changes?.image && editSubOptionId === null) && (<img src={changesState?.changes?.image} alt='sub option image' loading='lazy' />)
                         }
                         <UploadImageIconContainer>
                           <UploadImageIcon small>

package/src/components/Stores/ProductExtraSuboption/index.js

@@ -45,7 +45,9 @@ export const ProductExtraSuboption = (props) => {
     hanldeDragOver,
     handleDrop,
     handleDragEnd,
-    handleDuplicateSubOption
+    handleDuplicateSubOption,
+    isDraggingExtraOption,
+    setIsDraggingExtraOption
   } = props
 
   const theme = useTheme()
@@ -133,6 +135,15 @@ export const ProductExtraSuboption = (props) => {
     setExternalIdOpen(false)
   }
 
+  const handleDropSubOption = (e, subOption) => {
+    setIsDraggingExtraOption(false)
+    handleDrop(e, subOption)
+  }
+
+  const handleDragStartSubOption = () => {
+    setIsDraggingExtraOption(true)
+  }
+
   useEffect(() => {
     if (Object.keys(errors).length > 0) {
       setAlertState({
@@ -160,8 +171,9 @@ export const ProductExtraSuboption = (props) => {
       onSubmit={handleSubmit(onSubmit)}
       isDragOver={dragoverSubOptionId === subOption.id}
       isBorderBottom={isSubOptionsBottom && isLastSubOption}
+      onDragStart={handleDragStartSubOption}
       onDragOver={e => hanldeDragOver(e, subOption, isLastSubOption)}
-      onDrop={e => handleDrop(e, subOption)}
+      onDrop={e => handleDropSubOption(e, subOption)}
       onDragEnd={handleDragEnd}
       className='draggable-suboption'
     >
@@ -186,7 +198,7 @@ export const ProductExtraSuboption = (props) => {
             <DragAndDrop
               onDrop={dataTransfer => handleSubOptionFiles(dataTransfer.files, subOption.id)}
               accept='image/png, image/jpeg, image/jpg'
-              disabled={optionState.loading}
+              disabled={optionState.loading || isDraggingExtraOption}
             >
               {
                 (changesState?.result?.image && editSubOptionId === subOption.id)

package/src/components/Stores/SnoozeComponent/index.js

@@ -153,10 +153,6 @@ export const SnoozeComponent = (props) => {
       value: '12',
       content: t('SNOOZE_TWELVE_HOUR', '12H')
     },
-    {
-      value: 'indefinitely',
-      content: t('SNOOZE_INDEFINITELY', 'Indefinitely')
-    },
     {
       value: 'or',
       content: t('SNOOZE_OR', 'or')