@colijnit/corecomponents_v12 260.1.9 → 260.1.10

package/fesm2015/colijnit-corecomponents_v12.js

@@ -10192,6 +10192,11 @@ SimpleGridComponent.decorators = [
           [class.simple-grid-column-auto-fit]="column.autoFit"
           [style.width.px]="column.width"
           [style.min-width.px]="MIN_COLUMN_WIDTH">
+        <col
+          *ngIf="((inlineEdit && showRowButtons) || (showDelete && !showRowButtons)) && (hoveredRowIndex >= 0 || selectedRowIndex >= 0 || isNewRow)"
+          [class.icons-col]="true"
+          [class.col-width-row-buttons]="inlineEdit && showRowButtons"
+          [class.col-width-delete]="!showRowButtons && showDelete">
       </colgroup>
       <thead>
       <tr>
@@ -10303,33 +10308,28 @@ SimpleGridComponent.decorators = [
                 <div *ngIf="column.resizable" class="simple-grid-column-sizer-placeholder"></div>
               </td>
             </ng-container>
-            <ng-container *ngIf="inlineEdit && showRowButtons">
-              <div class="icons-container" *ngIf="!editing">
-                <co-icon class="icon-item icon-edit"
-                         [iconData]="icons.getIcon(Icons.PenToSquareSolid)" *ngIf="hoveredRowIndex === rowIndex"
-                         (click)="editRow($event, true, rowIndex); $event.stopPropagation()"></co-icon>
-                <co-icon class="icon-item icon-delete"
-                         [iconData]="icons.getIcon(Icons.TrashBin)" *ngIf="hoveredRowIndex === rowIndex"
-                         (click)="selectTheRow(rowIndex); removeRow();"></co-icon>
-              </div>
-              <div class="icons-container">
-                <co-button class="save-button"
-                           *ngIf="editing && (selectedRowIndex === rowIndex || (isNewRow && rowIndex === editRowIndex))"
-                           [iconData]="icons.getIcon(Icons.CheckDuotone)"
-                           (click)="validateAndSave(); $event.stopPropagation()"></co-button>
-                <co-button class="close-button"
-                           *ngIf="editing && (selectedRowIndex === rowIndex || (isNewRow && rowIndex === editRowIndex))"
-                           [iconData]="icons.getIcon(Icons.CrossSkinny)"
-                           (click)="cancelEditRow(); $event.stopPropagation() "></co-button>
-              </div>
-            </ng-container>
-            <ng-container *ngIf="!(inlineEdit && showRowButtons) && showDelete">
-              <div class="icons-container">
-                <co-icon class="icon-item icon-delete"
-                         [iconData]="icons.getIcon(Icons.TrashBin)" *ngIf="hoveredRowIndex === rowIndex"
-                         (click)="selectTheRow(rowIndex); removeRow();">
-                </co-icon>
-              </div>
+            <ng-container *ngIf="(inlineEdit && showRowButtons) || (showDelete && !showRowButtons)">
+              <td class="icons-container"
+                  *ngIf="(editRowIndex <= -1 && selectedRowIndex === -1 && hoveredRowIndex === rowIndex) || selectedRowIndex === rowIndex || (isNewRow && rowIndex === editRowIndex)">
+                <ng-container>
+                  <co-icon class="icon-item icon-edit"
+                           *ngIf="!editing && (inlineEdit && showRowButtons)"
+                           [iconData]="icons.getIcon(Icons.PenToSquareSolid)"
+                           (click)="editRow($event, true, rowIndex); $event.stopPropagation()"></co-icon>
+                  <co-icon class="icon-item icon-delete"
+                           [iconData]="icons.getIcon(Icons.TrashBin)"
+                           *ngIf="(!editing && (inlineEdit || !inlineEdit) && showRowButtons) || (!showRowButtons && showDelete)"
+                           (click)="selectTheRow(rowIndex); removeRow();"></co-icon>
+                </ng-container>
+                <ng-container *ngIf="editing && inlineEdit && showRowButtons && (selectedRowIndex === rowIndex || isNewRow)">
+                  <co-button class="save-button"
+                             [iconData]="icons.getIcon(Icons.CheckDuotone)"
+                             (click)="validateAndSave(); $event.stopPropagation()"></co-button>
+                  <co-button class="close-button"
+                             [iconData]="icons.getIcon(Icons.CrossSkinny)"
+                             (click)="cancelEditRow(); $event.stopPropagation() "></co-button>
+                </ng-container>
+              </td>
             </ng-container>
           </ng-container>
         </tr>
@@ -15085,7 +15085,7 @@ class HourSchedulingExpandableComponent {
     handleDrop(dragEvent, hour) {
         dragEvent.preventDefault();
         dragEvent.stopPropagation();
-        if (!this.schedule[this.objectsProp] || !this.schedule[this.objectsProp].find((object) => object[this.idProp] === this.currentDraggingObject.id) && this.currentDraggingObject) {
+        if (!this.schedule[this.objectsProp] || !this.schedule[this.objectsProp].find((object) => { var _a; return object[this.idProp] === this.currentDraggingObject && ((_a = this.currentDraggingObject) === null || _a === void 0 ? void 0 : _a.id); })) {
             this.currentDraggingObject = undefined;
         }
         if (this.currentDraggingObject) {