@yoobic/yobi 8.5.0-35 → 8.5.0-36

package/dist/cjs/yoo-entity-query-builder.cjs.entry.js

@@ -326,7 +326,7 @@ const YooEntityQueryBuilderComponent = class {
   }
   renderFilters() {
     var _a, _b;
-    if ((_a = this.model) === null || _a === void 0 ? void 0 : _a.fields) {
+    if (((_a = this.model) === null || _a === void 0 ? void 0 : _a.fields) && (this.isOpen || this.alwaysShow)) {
       const filteredFields = this.getFilterFields();
       if (filteredFields && filteredFields.length > 0) {
         const { slides, data } = filtersHelpers.filterRenderFormDynamic(filteredFields, ((_b = this.values) === null || _b === void 0 ? void 0 : _b.filters) || [], this.formFilter, null, null, true, null, !this.floating);

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

@@ -1384,6 +1384,7 @@ const YooFormCreatorComponent = class {
         const movedItem = this.currentSlides[this.selectedPageIndex].items[oldParentIndex];
         const numberOfFieldsToMove = index$3.getNumberOfSequentialFields(movedItem) + 1;
         const itemsToMove = this.currentSlides[this.selectedPageIndex].items.slice(oldParentIndex, oldParentIndex + numberOfFieldsToMove);
+        this.shiftUnattachedConditions(newIndex, oldIndex);
         this.currentSlides[this.selectedPageIndex].items.splice(oldParentIndex, numberOfFieldsToMove);
         this.currentSlides[this.selectedPageIndex].items.splice(newParentIndex, 0, ...itemsToMove);
         this.toggleInvisibleDiv();
@@ -1571,8 +1572,14 @@ const YooFormCreatorComponent = class {
     }
   }
   moveSelectedFields(itemId, slideIndex, selectedFields) {
+    var _a;
     selectedFields = selectedFields ? selectedFields : this.selectedFields;
     if (selectedFields && selectedFields.length > 0) {
+      this.unattachedParentConditions = lodash.compact((_a = this.unattachedParentConditions) === null || _a === void 0 ? void 0 : _a.map((unattachedCondition) => {
+        if (unattachedCondition.slideIndex !== slideIndex) {
+          return unattachedCondition;
+        }
+      }));
       let itemIndex = 0;
       let positionOffset = 0;
       const fieldsToMove = [];
@@ -1819,6 +1826,7 @@ const YooFormCreatorComponent = class {
     }
     if (index !== undefined && index < this.parentBlockIndices.length && !field) {
       indexToAdd = this.parentBlockIndices[index];
+      this.shiftUnattachedConditions(indexToAdd);
     }
     else if (field && index > -1) {
       if (((_e = this.currentExpandedBlockLocation) === null || _e === void 0 ? void 0 : _e.itemIndex) === index && !field) {
@@ -1848,6 +1856,18 @@ const YooFormCreatorComponent = class {
       this.forceSortableRefresh = true;
     }
   }
+  shiftUnattachedConditions(newIndex, oldIndex) {
+    var _a;
+    this.unattachedParentConditions = (_a = this.unattachedParentConditions) === null || _a === void 0 ? void 0 : _a.map((unattachedParentCondition) => {
+      if (newIndex <= unattachedParentCondition.itemIndex && unattachedParentCondition.slideIndex === this.selectedPageIndex && (overlays.isNullOrUndefined(oldIndex) || oldIndex > unattachedParentCondition.itemIndex)) {
+        unattachedParentCondition.itemIndex += 1;
+      }
+      else if (oldIndex < unattachedParentCondition.itemIndex && unattachedParentCondition.slideIndex === this.selectedPageIndex) {
+        unattachedParentCondition.itemIndex -= 1;
+      }
+      return unattachedParentCondition;
+    });
+  }
   onFormFieldMove(event, up) {
     if (event && event.detail) {
       const { slideIndex, itemIndex } = overlays.findField(this.currentSlides, event.detail.name);
@@ -1861,6 +1881,7 @@ const YooFormCreatorComponent = class {
       const newPosition = up ? itemIndex - 1 : itemIndex + 1;
       this.currentSlides[slideIndex].items.splice(itemIndex, 1);
       this.currentSlides[slideIndex].items.splice(newPosition, 0, duplicatedField);
+      this.shiftUnattachedConditions(newPosition, itemIndex);
       this.emitNewSlidesAndRerender();
     }
   }

package/dist/collection/components/entities/entity-query-builder/entity-query-builder.js

@@ -307,7 +307,7 @@ export class YooEntityQueryBuilderComponent {
   }
   renderFilters() {
     var _a, _b;
-    if ((_a = this.model) === null || _a === void 0 ? void 0 : _a.fields) {
+    if (((_a = this.model) === null || _a === void 0 ? void 0 : _a.fields) && (this.isOpen || this.alwaysShow)) {
       const filteredFields = this.getFilterFields();
       if (filteredFields && filteredFields.length > 0) {
         const { slides, data } = filterRenderFormDynamic(filteredFields, ((_b = this.values) === null || _b === void 0 ? void 0 : _b.filters) || [], this.formFilter, null, null, true, null, !this.floating);

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

@@ -1311,6 +1311,7 @@ export class YooFormCreatorComponent {
         const movedItem = this.currentSlides[this.selectedPageIndex].items[oldParentIndex];
         const numberOfFieldsToMove = getNumberOfSequentialFields(movedItem) + 1;
         const itemsToMove = this.currentSlides[this.selectedPageIndex].items.slice(oldParentIndex, oldParentIndex + numberOfFieldsToMove);
+        this.shiftUnattachedConditions(newIndex, oldIndex);
         this.currentSlides[this.selectedPageIndex].items.splice(oldParentIndex, numberOfFieldsToMove);
         this.currentSlides[this.selectedPageIndex].items.splice(newParentIndex, 0, ...itemsToMove);
         this.toggleInvisibleDiv();
@@ -1498,8 +1499,14 @@ export class YooFormCreatorComponent {
     }
   }
   moveSelectedFields(itemId, slideIndex, selectedFields) {
+    var _a;
     selectedFields = selectedFields ? selectedFields : this.selectedFields;
     if (selectedFields && selectedFields.length > 0) {
+      this.unattachedParentConditions = compact((_a = this.unattachedParentConditions) === null || _a === void 0 ? void 0 : _a.map((unattachedCondition) => {
+        if (unattachedCondition.slideIndex !== slideIndex) {
+          return unattachedCondition;
+        }
+      }));
       let itemIndex = 0;
       let positionOffset = 0;
       const fieldsToMove = [];
@@ -1746,6 +1753,7 @@ export class YooFormCreatorComponent {
     }
     if (index !== undefined && index < this.parentBlockIndices.length && !field) {
       indexToAdd = this.parentBlockIndices[index];
+      this.shiftUnattachedConditions(indexToAdd);
     }
     else if (field && index > -1) {
       if (((_e = this.currentExpandedBlockLocation) === null || _e === void 0 ? void 0 : _e.itemIndex) === index && !field) {
@@ -1775,6 +1783,18 @@ export class YooFormCreatorComponent {
       this.forceSortableRefresh = true;
     }
   }
+  shiftUnattachedConditions(newIndex, oldIndex) {
+    var _a;
+    this.unattachedParentConditions = (_a = this.unattachedParentConditions) === null || _a === void 0 ? void 0 : _a.map((unattachedParentCondition) => {
+      if (newIndex <= unattachedParentCondition.itemIndex && unattachedParentCondition.slideIndex === this.selectedPageIndex && (isNullOrUndefined(oldIndex) || oldIndex > unattachedParentCondition.itemIndex)) {
+        unattachedParentCondition.itemIndex += 1;
+      }
+      else if (oldIndex < unattachedParentCondition.itemIndex && unattachedParentCondition.slideIndex === this.selectedPageIndex) {
+        unattachedParentCondition.itemIndex -= 1;
+      }
+      return unattachedParentCondition;
+    });
+  }
   onFormFieldMove(event, up) {
     if (event && event.detail) {
       const { slideIndex, itemIndex } = findField(this.currentSlides, event.detail.name);
@@ -1788,6 +1808,7 @@ export class YooFormCreatorComponent {
       const newPosition = up ? itemIndex - 1 : itemIndex + 1;
       this.currentSlides[slideIndex].items.splice(itemIndex, 1);
       this.currentSlides[slideIndex].items.splice(newPosition, 0, duplicatedField);
+      this.shiftUnattachedConditions(newPosition, itemIndex);
       this.emitNewSlidesAndRerender();
     }
   }

package/dist/design-system/yoo-entity-query-builder.entry.js

@@ -322,7 +322,7 @@ const YooEntityQueryBuilderComponent = class {
   }
   renderFilters() {
     var _a, _b;
-    if ((_a = this.model) === null || _a === void 0 ? void 0 : _a.fields) {
+    if (((_a = this.model) === null || _a === void 0 ? void 0 : _a.fields) && (this.isOpen || this.alwaysShow)) {
       const filteredFields = this.getFilterFields();
       if (filteredFields && filteredFields.length > 0) {
         const { slides, data } = filterRenderFormDynamic(filteredFields, ((_b = this.values) === null || _b === void 0 ? void 0 : _b.filters) || [], this.formFilter, null, null, true, null, !this.floating);

package/dist/design-system/yoo-form-creator.entry.js

@@ -1380,6 +1380,7 @@ const YooFormCreatorComponent = class {
         const movedItem = this.currentSlides[this.selectedPageIndex].items[oldParentIndex];
         const numberOfFieldsToMove = getNumberOfSequentialFields(movedItem) + 1;
         const itemsToMove = this.currentSlides[this.selectedPageIndex].items.slice(oldParentIndex, oldParentIndex + numberOfFieldsToMove);
+        this.shiftUnattachedConditions(newIndex, oldIndex);
         this.currentSlides[this.selectedPageIndex].items.splice(oldParentIndex, numberOfFieldsToMove);
         this.currentSlides[this.selectedPageIndex].items.splice(newParentIndex, 0, ...itemsToMove);
         this.toggleInvisibleDiv();
@@ -1567,8 +1568,14 @@ const YooFormCreatorComponent = class {
     }
   }
   moveSelectedFields(itemId, slideIndex, selectedFields) {
+    var _a;
     selectedFields = selectedFields ? selectedFields : this.selectedFields;
     if (selectedFields && selectedFields.length > 0) {
+      this.unattachedParentConditions = compact((_a = this.unattachedParentConditions) === null || _a === void 0 ? void 0 : _a.map((unattachedCondition) => {
+        if (unattachedCondition.slideIndex !== slideIndex) {
+          return unattachedCondition;
+        }
+      }));
       let itemIndex = 0;
       let positionOffset = 0;
       const fieldsToMove = [];
@@ -1815,6 +1822,7 @@ const YooFormCreatorComponent = class {
     }
     if (index !== undefined && index < this.parentBlockIndices.length && !field) {
       indexToAdd = this.parentBlockIndices[index];
+      this.shiftUnattachedConditions(indexToAdd);
     }
     else if (field && index > -1) {
       if (((_e = this.currentExpandedBlockLocation) === null || _e === void 0 ? void 0 : _e.itemIndex) === index && !field) {
@@ -1844,6 +1852,18 @@ const YooFormCreatorComponent = class {
       this.forceSortableRefresh = true;
     }
   }
+  shiftUnattachedConditions(newIndex, oldIndex) {
+    var _a;
+    this.unattachedParentConditions = (_a = this.unattachedParentConditions) === null || _a === void 0 ? void 0 : _a.map((unattachedParentCondition) => {
+      if (newIndex <= unattachedParentCondition.itemIndex && unattachedParentCondition.slideIndex === this.selectedPageIndex && (isNullOrUndefined(oldIndex) || oldIndex > unattachedParentCondition.itemIndex)) {
+        unattachedParentCondition.itemIndex += 1;
+      }
+      else if (oldIndex < unattachedParentCondition.itemIndex && unattachedParentCondition.slideIndex === this.selectedPageIndex) {
+        unattachedParentCondition.itemIndex -= 1;
+      }
+      return unattachedParentCondition;
+    });
+  }
   onFormFieldMove(event, up) {
     if (event && event.detail) {
       const { slideIndex, itemIndex } = findField(this.currentSlides, event.detail.name);
@@ -1857,6 +1877,7 @@ const YooFormCreatorComponent = class {
       const newPosition = up ? itemIndex - 1 : itemIndex + 1;
       this.currentSlides[slideIndex].items.splice(itemIndex, 1);
       this.currentSlides[slideIndex].items.splice(newPosition, 0, duplicatedField);
+      this.shiftUnattachedConditions(newPosition, itemIndex);
       this.emitNewSlidesAndRerender();
     }
   }

package/dist/esm/yoo-entity-query-builder.entry.js

@@ -322,7 +322,7 @@ const YooEntityQueryBuilderComponent = class {
   }
   renderFilters() {
     var _a, _b;
-    if ((_a = this.model) === null || _a === void 0 ? void 0 : _a.fields) {
+    if (((_a = this.model) === null || _a === void 0 ? void 0 : _a.fields) && (this.isOpen || this.alwaysShow)) {
       const filteredFields = this.getFilterFields();
       if (filteredFields && filteredFields.length > 0) {
         const { slides, data } = filterRenderFormDynamic(filteredFields, ((_b = this.values) === null || _b === void 0 ? void 0 : _b.filters) || [], this.formFilter, null, null, true, null, !this.floating);

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

@@ -1380,6 +1380,7 @@ const YooFormCreatorComponent = class {
         const movedItem = this.currentSlides[this.selectedPageIndex].items[oldParentIndex];
         const numberOfFieldsToMove = getNumberOfSequentialFields(movedItem) + 1;
         const itemsToMove = this.currentSlides[this.selectedPageIndex].items.slice(oldParentIndex, oldParentIndex + numberOfFieldsToMove);
+        this.shiftUnattachedConditions(newIndex, oldIndex);
         this.currentSlides[this.selectedPageIndex].items.splice(oldParentIndex, numberOfFieldsToMove);
         this.currentSlides[this.selectedPageIndex].items.splice(newParentIndex, 0, ...itemsToMove);
         this.toggleInvisibleDiv();
@@ -1567,8 +1568,14 @@ const YooFormCreatorComponent = class {
     }
   }
   moveSelectedFields(itemId, slideIndex, selectedFields) {
+    var _a;
     selectedFields = selectedFields ? selectedFields : this.selectedFields;
     if (selectedFields && selectedFields.length > 0) {
+      this.unattachedParentConditions = compact((_a = this.unattachedParentConditions) === null || _a === void 0 ? void 0 : _a.map((unattachedCondition) => {
+        if (unattachedCondition.slideIndex !== slideIndex) {
+          return unattachedCondition;
+        }
+      }));
       let itemIndex = 0;
       let positionOffset = 0;
       const fieldsToMove = [];
@@ -1815,6 +1822,7 @@ const YooFormCreatorComponent = class {
     }
     if (index !== undefined && index < this.parentBlockIndices.length && !field) {
       indexToAdd = this.parentBlockIndices[index];
+      this.shiftUnattachedConditions(indexToAdd);
     }
     else if (field && index > -1) {
       if (((_e = this.currentExpandedBlockLocation) === null || _e === void 0 ? void 0 : _e.itemIndex) === index && !field) {
@@ -1844,6 +1852,18 @@ const YooFormCreatorComponent = class {
       this.forceSortableRefresh = true;
     }
   }
+  shiftUnattachedConditions(newIndex, oldIndex) {
+    var _a;
+    this.unattachedParentConditions = (_a = this.unattachedParentConditions) === null || _a === void 0 ? void 0 : _a.map((unattachedParentCondition) => {
+      if (newIndex <= unattachedParentCondition.itemIndex && unattachedParentCondition.slideIndex === this.selectedPageIndex && (isNullOrUndefined(oldIndex) || oldIndex > unattachedParentCondition.itemIndex)) {
+        unattachedParentCondition.itemIndex += 1;
+      }
+      else if (oldIndex < unattachedParentCondition.itemIndex && unattachedParentCondition.slideIndex === this.selectedPageIndex) {
+        unattachedParentCondition.itemIndex -= 1;
+      }
+      return unattachedParentCondition;
+    });
+  }
   onFormFieldMove(event, up) {
     if (event && event.detail) {
       const { slideIndex, itemIndex } = findField(this.currentSlides, event.detail.name);
@@ -1857,6 +1877,7 @@ const YooFormCreatorComponent = class {
       const newPosition = up ? itemIndex - 1 : itemIndex + 1;
       this.currentSlides[slideIndex].items.splice(itemIndex, 1);
       this.currentSlides[slideIndex].items.splice(newPosition, 0, duplicatedField);
+      this.shiftUnattachedConditions(newPosition, itemIndex);
       this.emitNewSlidesAndRerender();
     }
   }

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

@@ -659,6 +659,7 @@ export declare class YooFormCreatorComponent {
   onCustomFieldAdded(customFieldId: string, selectedCustomFormField?: ICustomFormField, indexToAdd?: number): void;
   onAddNewCondition(conditionType: ConditionType, pageCondition: boolean, condition: ICondition): void;
   onFormFieldAdd(fieldDescription: IFormFieldDescription, index?: number, field?: IFormField): void;
+  shiftUnattachedConditions(newIndex: number, oldIndex?: number): void;
   onFormFieldMove(event: CustomEvent<{
     name: string;
   }>, up: boolean): void;

package/package.json

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