@yoobic/yobi 7.7.49 → 7.7.53

package/dist/collection/components/form/form-dynamic/form-dynamic.js

@@ -153,6 +153,7 @@ export class YooFormDynamicComponent {
   }
   async goToRecap() {
     if (this.ionSlides) {
+      lockSwipes(this.ionSlides, false);
       this.ionSlides.slideTo(0);
     }
   }
@@ -547,7 +548,7 @@ export class YooFormDynamicComponent {
     if (((_a = this.formExtraOptions) === null || _a === void 0 ? void 0 : _a.slideIndex) >= 0) {
       this.goToSlide(this.formExtraOptions.slideIndex, false);
     }
-    if (!this.showTabs) {
+    if (!this.showTabs || this.lockSwipes) {
       setTimeout(() => {
         lockSwipes(this.ionSlides, true);
       }, 300);
@@ -2450,7 +2451,7 @@ export class YooFormDynamicComponent {
         size: isWeb(this.host) && !this.isLivePreview() ? 'medium' : 'large'
       });
       //Swiping is allowed for content only lessons on boost
-      if (this.ionSlides && this.lessonType !== 'document' && this.lessonType !== 'video') {
+      if (this.lockSwipes || (this.lessonType !== 'document' && this.lessonType !== 'video')) {
         lockSwipes(this.ionSlides, true);
       }
     }
@@ -2465,6 +2466,9 @@ export class YooFormDynamicComponent {
       });
     }
     else {
+      if (this.lockSwipes) {
+        lockSwipes(this.ionSlides, true);
+      }
       let nextFn = () => this.goToSlide(this.nextAvailablePage(slideIndex), true);
       if (((_f = this.formExtraOptions) === null || _f === void 0 ? void 0 : _f.combinedForms) && this.slides[slideIndex] && ((_g = this.slides[slideIndex]) === null || _g === void 0 ? void 0 : _g.submitFn)) {
         nextFn = () => this.slides[slideIndex].submitFn(this.currentData, this.ionSlides, this);
@@ -2496,6 +2500,9 @@ export class YooFormDynamicComponent {
       if (!this.showSave && !((_a = this.formExtraOptions) === null || _a === void 0 ? void 0 : _a.forceSave)) {
         return null;
       }
+      if (this.lockSwipes) {
+        lockSwipes(this.ionSlides, true);
+      }
       if (this.isLesson()) {
         //Swiping is allowed for content only lessons on boost
         if (this.lessonType !== 'document' && this.lessonType !== 'video') {
@@ -4874,6 +4881,23 @@ export class YooFormDynamicComponent {
       },
       "attribute": "autosave",
       "reflect": false
+    },
+    "lockSwipes": {
+      "type": "boolean",
+      "mutable": false,
+      "complexType": {
+        "original": "boolean",
+        "resolved": "boolean",
+        "references": {}
+      },
+      "required": false,
+      "optional": false,
+      "docs": {
+        "tags": [],
+        "text": ""
+      },
+      "attribute": "lock-swipes",
+      "reflect": false
     }
   }; }
   static get states() { return {

package/dist/collection/components/form/form-recurrence-preview/form-recurrence-preview.js

@@ -1,4 +1,4 @@
-import { filterListByText, getRecurrences, guessCurrentTimezone, pipes, TIMEZONES, translate } from '@shared/utils';
+import { filterListByText, getNextRecurrences, guessCurrentTimezone, pipes, TIMEZONES, translate } from '@shared/utils';
 import { Component, Event, h, Host, Prop } from '@stencil/core';
 const EmptyState = () => [h("yoo-empty-state", null), h("p", null, translate('LISTEMPTY'))];
 const Recurrences = ({ dates, label }) => (h("div", { class: "recurrences" },
@@ -33,8 +33,7 @@ export class YooFormRecurrencePreviewComponent {
     this.close.emit();
   }
   render() {
-    const start = new Date();
-    const recurrences = getRecurrences(this.value, { max: this.max, start, timezone: this.timezone });
+    const recurrences = getNextRecurrences(this.value, { max: this.max, timezone: this.timezone });
     const hasRecurrences = !!(recurrences === null || recurrences === void 0 ? void 0 : recurrences.length);
     return (h(Host, null,
       h("header", null,
@@ -46,7 +45,7 @@ export class YooFormRecurrencePreviewComponent {
       h("main", { class: { empty: !hasRecurrences } },
         hasRecurrences && (h(Timezones, { value: this.timezone, values: TIMEZONES, onInit: (timezones) => (this.timezones = timezones), onSearch: (timezone) => this.timezones.updateValues(timezone ? filterListByText(TIMEZONES, timezone) : TIMEZONES), onUpdate: (timezone) => (this.timezone = timezone) })),
         hasRecurrences && (h("div", { class: "schedule" },
-          h(Recurrences, { dates: getRecurrences(this.value, { max: this.max, start, timezone: guessCurrentTimezone() }), label: translate('RECURRENCEPREVIEWLEFT') }),
+          h(Recurrences, { dates: getNextRecurrences(this.value, { max: this.max, timezone: guessCurrentTimezone() }), label: translate('RECURRENCEPREVIEWLEFT') }),
           h(Recurrences, { dates: recurrences, label: translate('RECURRENCEPREVIEWRIGHT') }))),
         !hasRecurrences && h(EmptyState, null)),
       h("footer", null,

package/dist/collection/components/form/form-text-area/form-text-area.js

@@ -282,7 +282,6 @@ export class YooFormTextAreaComponent {
   }
   updateRows() {
     if (!this.allowMention && !this.allowCustomInput && this.inputEl) {
-      this.inputEl.style.height = 'auto';
       let height = this.inputEl.scrollHeight - LINE_HEIGHT;
       if (this.maxRows && height / LINE_HEIGHT > this.maxRows) {
         height = this.maxRows * LINE_HEIGHT;

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;

package/dist/collection/components/ionic/modal/modal.css

@@ -1067,6 +1067,10 @@ null: CSS defaults to use the ltr css, and adds [dir=rtl] selectors to override
   border-radius: 0;
 }
 
+:host(.preview.large) .modal-wrapper {
+  width: 45rem;
+}
+
 :host(.draggable) .modal-wrapper {
   margin: 0;
 }