@yoobic/yobi 7.7.113 → 7.7.114

package/dist/esm/yoo-camera-preview-dialog_7.entry.js

@@ -622,7 +622,7 @@ const YooFormCaptureComponent = class {
   initTags() {
     if (this.multiple) {
       for (let i = 0; i < this.max; i++) {
-        this.extraData = this.extraData || [];
+        this.extraData = this.extraData || {};
         this.extraData[i] = this.extraData[i] || {};
         this.extraData[i]['tags'] = this.extraData[i]['tags'] || [];
       }
@@ -1044,7 +1044,7 @@ const YooFormCaptureComponent = class {
             (data) => {
               return new Promise((resolve) => {
                 if (this.shouldTagImage()) {
-                  this.showPhotoTagDialog(data).then((tag) => {
+                  return this.showPhotoTagDialog(data).then((tag) => {
                     if (!isNullOrUndefined(tag.data)) {
                       this.updateTagData(tag, captureIndex);
                       resolve(data);
@@ -1168,6 +1168,7 @@ const YooFormCaptureComponent = class {
     });
   }
   clearPhotoEdit(index) {
+    let isExtraDataDeleted = false;
     if (!index && index !== 0) {
       if (this.extraData && (this.extraData.drawings || (this.extraData.annotations && this.extraData.annotations.length > 0))) {
         this.extraData = { drawings: null, annotations: [], stitch: null };
@@ -1181,32 +1182,33 @@ const YooFormCaptureComponent = class {
         Object.keys(this.extraData).forEach((item, i) => {
           newExtraData[i] = this.extraData[item];
         });
-        // Object.keys(obj).filter(k => obj[k]).sort((a,b) => a-b).reduce((acc, cur) => { acc[cur] = obj[cur]; return acc }, {})
         this.extraDataChanged.emit(newExtraData);
+        isExtraDataDeleted = true;
       }
     }
+    return isExtraDataDeleted;
   }
-  clearPhotoTag(index) {
-    if (this.onHasTag(index)) {
-      let newExtraData = {};
-      if (this.multiple) {
+  clearPhotoTag(index, deleteExtraData = true) {
+    let newExtraData = {};
+    if (this.multiple) {
+      if (deleteExtraData) {
         delete this.extraData[index];
         Object.keys(this.extraData).forEach((item, i) => {
           newExtraData[i] = this.extraData[item];
         });
         this.extraDataChanged.emit(newExtraData);
       }
-      else {
-        this.extraData['tags'] = [];
-        newExtraData = this.extraData;
-      }
-      this.extraDataChanged.emit(newExtraData);
     }
+    else {
+      this.extraData['tags'] = [];
+      newExtraData = this.extraData;
+    }
+    this.extraDataChanged.emit(newExtraData);
   }
   openPhotoEditorPreview(index, forceReadonly = false) {
     var _a;
     const imgSrc = this.getFieldValue(index);
-    const isMultipleData = isFinite(index) && this.extraData && isArray(this.extraData) && !!this.extraData.length && this.extraData[index];
+    const isMultipleData = isFinite(index) && this.extraData && ((isArray(this.extraData) && !!this.extraData.length) || !!Object.keys(this.extraData).length) && this.extraData[index];
     const extraActions = [
       {
         icon: 'download',
@@ -1298,6 +1300,7 @@ const YooFormCaptureComponent = class {
     }
   }
   deleteCapture(index) {
+    let isExtraDataDeleted = false;
     if (this.multiple && isArray(this.value)) {
       this.value.splice(index, 1);
       this.value = this.value.filter((item) => item); // remove empty
@@ -1307,11 +1310,11 @@ const YooFormCaptureComponent = class {
       this.value = null;
     }
     if (this.type === 'photo') {
-      this.clearPhotoEdit(index === -1 ? undefined : index);
+      isExtraDataDeleted = this.clearPhotoEdit(index === -1 ? undefined : index);
       this.clearImageRecognition();
     }
     setValueAndValidateInput(this.value, this);
-    this.clearPhotoTag(index);
+    this.clearPhotoTag(index, !isExtraDataDeleted);
   }
   clearImageRecognition() {
     if (this.imageRecognitionKpiKeys && this.imageRecognitionKpiKeys.length > 0) {
@@ -1561,7 +1564,7 @@ const YooFormCaptureComponent = class {
         (data) => {
           return new Promise((resolve) => {
             if (this.shouldTagImage()) {
-              this.showPhotoTagDialog(data).then((tag) => {
+              return this.showPhotoTagDialog(data).then((tag) => {
                 if (!isNullOrUndefined(tag.data)) {
                   this.updateTagData(tag, index);
                   resolve(data);

package/dist/types/components/form/form-capture/form-capture.d.ts

@@ -147,8 +147,8 @@ export declare class YooFormCaptureComponent implements IFormCapture {
   getTargetElement(index: any): any;
   onFileSelect(index: number): Promise<void>;
   onOpenCropper(file: any): Promise<any>;
-  clearPhotoEdit(index?: number): void;
-  clearPhotoTag(index?: number): void;
+  clearPhotoEdit(index?: number): boolean;
+  clearPhotoTag(index?: number, deleteExtraData?: boolean): void;
   openPhotoEditorPreview(index?: number, forceReadonly?: boolean): void;
   /**
    * Need to handle this differently depending on whether we have are opening the preview from the image

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yoobic/yobi",
-  "version": "7.7.113",
+  "version": "7.7.114",
   "description": "Yobi - Yoobic Design System",
   "module": "dist/index.js",
   "main": "dist/index.cjs.js",