@yoobic/yobi 7.7.52 → 7.7.53

package/dist/cjs/{index-fae672a0.js → index-223b7476.js}

@@ -415,7 +415,7 @@ function getParentFieldConditions({ fieldConditions, slides, condition, field, c
     const { slideIndex, itemIndex } = formCreatorHelpers.findField(slides, fieldName);
     if (slides[slideIndex].items[itemIndex]) {
       const parentCondition = { condition, fields: [field] };
-      if (isSequentialConditionalField({ slides, parentFieldSlideIndex: slideIndex, parentFieldItemIndex: itemIndex, childSlideIndex, childItemIndex })) {
+      if (isSequentialConditionalField({ slides, parentFieldSlideIndex: slideIndex, parentFieldItemIndex: itemIndex, childSlideIndex, childItemIndex, conditionId: condition._id })) {
         field.sequentialConditionalField = { conditionId: condition._id, parentFieldName: fieldName, parentCustomFieldName: slides[slideIndex].items[itemIndex].customName };
       }
       else {
@@ -437,7 +437,8 @@ function getParentFieldConditions({ fieldConditions, slides, condition, field, c
   }
   return fieldConditions;
 }
-function isSequentialConditionalField({ slides, parentFieldSlideIndex, parentFieldItemIndex, childSlideIndex, childItemIndex }) {
+function isSequentialConditionalField({ slides, parentFieldSlideIndex, parentFieldItemIndex, childSlideIndex, childItemIndex, conditionId }) {
+  var _a;
   // the conditional field must be on the same slide as the parent field
   if (parentFieldSlideIndex === childSlideIndex && childItemIndex > 0) {
     const previousFieldIndex = childItemIndex - 1;
@@ -448,8 +449,21 @@ function isSequentialConditionalField({ slides, parentFieldSlideIndex, parentFie
     // otherwise, check that every field between this one and the parent is sequential
     const items = slides[childSlideIndex].items;
     const previousField = items[previousFieldIndex];
-    if (previousField === null || previousField === void 0 ? void 0 : previousField.sequentialConditionalField) {
-      return isSequentialConditionalField({ slides, parentFieldSlideIndex, parentFieldItemIndex, childSlideIndex, childItemIndex: previousFieldIndex });
+    // Check if the field has a different condition which is associated to the previous field
+    let hasAlternateConditionalRelationshipWithParent = false;
+    if (items === null || items === void 0 ? void 0 : items.length) {
+      const conditions = (_a = items[childItemIndex]) === null || _a === void 0 ? void 0 : _a.condition;
+      if ((conditions === null || conditions === void 0 ? void 0 : conditions.length) > 1) {
+        conditions.forEach((condition) => {
+          var _a;
+          if (condition._id !== conditionId && ((_a = condition === null || condition === void 0 ? void 0 : condition.field) === null || _a === void 0 ? void 0 : _a.name) === previousField.name) {
+            hasAlternateConditionalRelationshipWithParent = true;
+          }
+        });
+      }
+    }
+    if ((previousField === null || previousField === void 0 ? void 0 : previousField.sequentialConditionalField) && !hasAlternateConditionalRelationshipWithParent) {
+      return isSequentialConditionalField({ slides, parentFieldSlideIndex, parentFieldItemIndex, childSlideIndex, childItemIndex: previousFieldIndex, conditionId });
     }
   }
   return false;

package/dist/cjs/yoo-form-choice_4.cjs.entry.js

@@ -14,7 +14,7 @@ const shuffle = require('./shuffle-8d86ba89.js');
 const findIndex = require('./findIndex-cb2c4f23.js');
 const isString = require('./isString-ecd0cbf4.js');
 const index$2 = require('./index-7d3c7ee7.js');
-const index$1 = require('./index-fae672a0.js');
+const index$1 = require('./index-223b7476.js');
 const boostHelpers = require('./boost-helpers-0fe0ab90.js');
 const isNumber = require('./isNumber-4c1ace60.js');
 require('./isUndefined-8f9cfd10.js');

package/dist/cjs/yoo-form-creator-block-expandable.cjs.entry.js

@@ -7,7 +7,7 @@ const inputBar_interface = require('./input-bar.interface-b96b7107.js');
 const rrule = require('./rrule-f8e7fec2.js');
 const formCreatorHelpers = require('./form-creator-helpers-886c1eaa.js');
 const index$2 = require('./index-77d54324.js');
-const index$1 = require('./index-fae672a0.js');
+const index$1 = require('./index-223b7476.js');
 require('./isNumber-4c1ace60.js');
 require('./isEqual-35c41499.js');
 require('./_baseIsEqual-ea3c1968.js');

package/dist/cjs/yoo-form-creator-block-simple_4.cjs.entry.js

@@ -9,7 +9,7 @@ require('./ResizeObserver.es-a563c836.js');
 const commonHelpers = require('./common-helpers-312e97a3.js');
 const index$1 = require('./index-f0c2575c.js');
 const sortable_esm = require('./sortable.esm-71f9713d.js');
-const index$2 = require('./index-fae672a0.js');
+const index$2 = require('./index-223b7476.js');
 const entitiesHelpers$1 = require('./entities-helpers-f08c39e2.js');
 const entitiesHelpers = require('./entities-helpers-5d6d0dc7.js');
 require('./isUndefined-8f9cfd10.js');

package/dist/cjs/yoo-form-creator-card_2.cjs.entry.js

@@ -6,7 +6,7 @@ const index = require('./index-fd52e687.js');
 const rrule = require('./rrule-f8e7fec2.js');
 require('./input-bar.interface-b96b7107.js');
 const index$2 = require('./index-f0c2575c.js');
-const index$1 = require('./index-fae672a0.js');
+const index$1 = require('./index-223b7476.js');
 require('./index-dccbc1a7.js');
 require('./document-2c1b83f3.js');
 require('./validate-f2c2f205.js');

package/dist/cjs/yoo-form-creator-field-selector_8.cjs.entry.js

@@ -13,7 +13,7 @@ const device_interface = require('./device.interface-44ea5b01.js');
 const cardVideo_interface = require('./card-video.interface-284b7b92.js');
 const sortable_esm = require('./sortable.esm-71f9713d.js');
 const formCreatorHelpers = require('./form-creator-helpers-886c1eaa.js');
-const index$2 = require('./index-fae672a0.js');
+const index$2 = require('./index-223b7476.js');
 const isEqual = require('./isEqual-35c41499.js');
 const remove = require('./remove-41707d5a.js');
 const index$3 = require('./index-f0c2575c.js');

package/dist/cjs/yoo-form-creator-translate-dialog.cjs.entry.js

@@ -7,7 +7,7 @@ const inputBar_interface = require('./input-bar.interface-b96b7107.js');
 const rrule = require('./rrule-f8e7fec2.js');
 const formCreatorHelpers = require('./form-creator-helpers-886c1eaa.js');
 const stringHelpers = require('./string-helpers-4852718a.js');
-const index$1 = require('./index-fae672a0.js');
+const index$1 = require('./index-223b7476.js');
 const cloneDeep = require('./cloneDeep-e00dc6ae.js');
 const isEmpty = require('./isEmpty-1723db8b.js');
 const isString = require('./isString-ecd0cbf4.js');

package/dist/cjs/yoo-form-creator.cjs.entry.js

@@ -12,7 +12,7 @@ require('./ResizeObserver.es-a563c836.js');
 const commonHelpers = require('./common-helpers-312e97a3.js');
 const sortable_esm = require('./sortable.esm-71f9713d.js');
 const index$2 = require('./index-77d54324.js');
-const index$1 = require('./index-fae672a0.js');
+const index$1 = require('./index-223b7476.js');
 const cloneDeep = require('./cloneDeep-e00dc6ae.js');
 const orderBy = require('./orderBy-18003c1b.js');
 require('./document-2c1b83f3.js');

package/dist/collection/components/form-creator/helpers/index.js

@@ -409,7 +409,7 @@ function getParentFieldConditions({ fieldConditions, slides, condition, field, c
     const { slideIndex, itemIndex } = findField(slides, fieldName);
     if (slides[slideIndex].items[itemIndex]) {
       const parentCondition = { condition, fields: [field] };
-      if (isSequentialConditionalField({ slides, parentFieldSlideIndex: slideIndex, parentFieldItemIndex: itemIndex, childSlideIndex, childItemIndex })) {
+      if (isSequentialConditionalField({ slides, parentFieldSlideIndex: slideIndex, parentFieldItemIndex: itemIndex, childSlideIndex, childItemIndex, conditionId: condition._id })) {
         field.sequentialConditionalField = { conditionId: condition._id, parentFieldName: fieldName, parentCustomFieldName: slides[slideIndex].items[itemIndex].customName };
       }
       else {
@@ -431,7 +431,8 @@ function getParentFieldConditions({ fieldConditions, slides, condition, field, c
   }
   return fieldConditions;
 }
-export function isSequentialConditionalField({ slides, parentFieldSlideIndex, parentFieldItemIndex, childSlideIndex, childItemIndex }) {
+export function isSequentialConditionalField({ slides, parentFieldSlideIndex, parentFieldItemIndex, childSlideIndex, childItemIndex, conditionId }) {
+  var _a;
   // the conditional field must be on the same slide as the parent field
   if (parentFieldSlideIndex === childSlideIndex && childItemIndex > 0) {
     const previousFieldIndex = childItemIndex - 1;
@@ -442,8 +443,21 @@ export function isSequentialConditionalField({ slides, parentFieldSlideIndex, pa
     // otherwise, check that every field between this one and the parent is sequential
     const items = slides[childSlideIndex].items;
     const previousField = items[previousFieldIndex];
-    if (previousField === null || previousField === void 0 ? void 0 : previousField.sequentialConditionalField) {
-      return isSequentialConditionalField({ slides, parentFieldSlideIndex, parentFieldItemIndex, childSlideIndex, childItemIndex: previousFieldIndex });
+    // Check if the field has a different condition which is associated to the previous field
+    let hasAlternateConditionalRelationshipWithParent = false;
+    if (items === null || items === void 0 ? void 0 : items.length) {
+      const conditions = (_a = items[childItemIndex]) === null || _a === void 0 ? void 0 : _a.condition;
+      if ((conditions === null || conditions === void 0 ? void 0 : conditions.length) > 1) {
+        conditions.forEach((condition) => {
+          var _a;
+          if (condition._id !== conditionId && ((_a = condition === null || condition === void 0 ? void 0 : condition.field) === null || _a === void 0 ? void 0 : _a.name) === previousField.name) {
+            hasAlternateConditionalRelationshipWithParent = true;
+          }
+        });
+      }
+    }
+    if ((previousField === null || previousField === void 0 ? void 0 : previousField.sequentialConditionalField) && !hasAlternateConditionalRelationshipWithParent) {
+      return isSequentialConditionalField({ slides, parentFieldSlideIndex, parentFieldItemIndex, childSlideIndex, childItemIndex: previousFieldIndex, conditionId });
     }
   }
   return false;