@sumaris-net/ngx-components 2.7.3-rc5 → 2.7.3-rc50

package/src/theme/_ngx-components.scss

@@ -126,200 +126,14 @@ ion-menu.menu-side-left {
   }
 }
 
-// --------------------------------------------------
-// Material Forms
-// --------------------------------------------------
-.form-container,
-form.form-container {
-  color: #{$app-form-color};
-  --mdc-filled-text-field-container-color: #{$app-form-field-background-color};
-  --mdc-filled-text-field-disabled-container-color: #{$app-form-field-background-color};
-  --mat-form-field-state-layer-color: #{$app-form-field-focus-background-color};
-  @include font-size(16px);
-
-  .mat-form-field-disabled,
-  .mat-mdc-input-element:disabled {
-    color: #{$app-form-color-disabled} !important;
-  }
-
-  .mat-form-field-disabled {
-    .mat-mdc-form-field-infix{
-      min-height: 41px;
-    }
-  }
-
-  mat-form-field,
-  mat-autocomplete-field,
-  app-form-field {
-    width: 100%;
-  }
-
-  .mat-mdc-form-field {
-
-    &:not(.mat-mdc-form-field-has-icon-prefix) {
-      .mdc-text-field {
-        padding-left: 4px;
-      }
-    }
-
-    ion-icon[matPrefix],
-    mat-icon[matPrefix],
-    .mat-mdc-form-field-icon-prefix {
-
-      ion-icon, .mat-icon {
-        $font-size: calculateRem(24px);
-        $margin-vertical: calculateRem(4px);
-        font-size: $font-size !important;
-        line-height: 1.125;
-        height: $font-size;
-        width: $font-size;
-        margin-left: $margin-vertical;
-        margin-right: $margin-vertical;
-        position: relative;
-      }
-    }
-
-    ion-icon[matSuffix],
-    mat-icon[matSuffix],
-    .mat-mdc-form-field-icon-suffix {
-      white-space: nowrap;
-
-      .mat-mdc-icon-button {
-        --mdc-icon-button-icon-size: 24px;
-        --mdc-icon-button-state-layer-size: 28px;
-        padding: 2px;
-
-        ion-icon, .mat-icon, .mat-icon.large {
-          font-size: var(--mdc-icon-button-icon-size);
-          line-height: var(--mdc-icon-button-icon-size);
-        }
-
-        .mat-mdc-button-touch-target {
-          width: var(--mdc-icon-button-state-layer-size);
-        }
-      }
-
-      ion-icon, .mat-icon {
-
-        &.large {
-          $font-size: calculateRem(24px);
-          font-size: $font-size;
-          line-height: 1.125;
-        }
-      }
-
-    }
-
-    // When field use choice button, reduce the font size, and optimize layout
-    button.mat-mdc-form-field-button,
-    ion-button.mat-mdc-form-field-button {
-      @include font-size-important(12px);
-      margin: 0;
-      white-space: normal;
-    }
-
-    // Used to customize mat-boolean-field
-    &.mat-boolean-field-checkbox {
-      --mdc-checkbox-state-layer-size: 20px;
-
-      .mat-mdc-form-field-infix {
-        padding-top: 16px;
-      }
-
-      .mdc-floating-label {
-        transform: unset !important;
-        padding-left: 30px;
-        top: 20px;
-      }
-    }
-
-    &.mat-boolean-field-radio {
-      --mdc-radio-state-layer-size: 20px;
-
-      .mat-mdc-radio-button {
-        padding-left: 8px;
-      }
-    }
-
-    &.mat-boolean-field-button {
-      .mat-mdc-form-field-infix {
-        padding-top: 0;
-        padding-bottom: 0;
-      }
-    }
-  }
-
-
-  /* -- Computed field -- */
-
-  // Set color on computed field (if enable or disable)
-  .computed mat-mdc-form-field,
-  mat-mdc-form-field .computed,
-  mat-mdc-form-field.computed,
-  .computed mat-mdc-form-field .mat-mdc-input-element:disabled,
-  mat-mdc-form-field .computed .mat-mdc-input-element:disabled,
-  mat-mdc-form-field.computed .mat-mdc-input-element:disabled {
-    color: var(--ion-color-primary-tint) !important;
-    font-style: italic;
-  }
-
-  /* MatSwipeField */
-  mat-swipe-field {
-
-    .mdc-floating-label--float-above {
-      transform: translateY(-106%) translateX(40px) scale(0.75) !important;
-    }
-
-  }
-}
-// Manage first child grid inside a form
-form.form-container > ion-grid,
-ion-grid.form-container {
-  padding: 0;
-
-  ion-row {
-    // No between grid rows
-    padding: 0;
-
-    ion-col > ion-label {
-      color: var(--ion-color-primary100);
-      padding-inline-end: 5px;
-    }
-
-    ion-col > ion-label[text-wrap] {
-      word-wrap: normal;
-      white-space: normal;
-    }
-  }
-  ion-row > ion-col {
-
-    // No top/bottom padding between grid cell
-    padding-bottom: 0;
-    padding-top: 0;
-  }
-}
 
 mat-form-field {
-  //mat-error {
-  //  text-align: right;
-  //}
 
   .mat-paginator-page-size-select {
     @include font-size-important(14px);
   }
 }
 
-
-// --- mat-date-time
-mat-date-time-field {
-  //@include font-size-important(16px);
-
-  // Need for errors injected using the <ng-content> tag
-  //mat-error {
-  //  text-align: end;
-  //}
-}
-
 // --- mat-date-short-field
 mat-calendar.mat-date-short-panel {
   // Hide some buttons (e.g. to change the period)
@@ -351,12 +165,6 @@ mat-option {
     flex-grow: 1;
   }
   .mat-option-text:not(:has(ion-row)),
-
-  // TODO : Disabled : mat-option already have padding : this is redundant
-  //.mdc-list-item__primary-text:not(:has(ion-row)) {
-  //  padding: 0 16px;
-  //}
-
   .mat-option-text:has(ion-searchbar),
   .mdc-list-item__primary-text:has(ion-searchbar) {
     padding: 0 !important;
@@ -464,7 +272,7 @@ ion-list,
     }
   }
 
-  .mat-mdc-option.mat-select-searchbar,
+  .mat-mdc-optgroup.mat-select-searchbar,
   .mat-mdc-option.mat-autocomplete-searchbar
   {
     padding: 0 !important;
@@ -472,8 +280,10 @@ ion-list,
     background-color: var(--ion-color-secondary100) !important;
     pointer-events: inherit !important;
 
-    .mdc-list-item__primary-text {
-      opacity: 1 !important;
+    .mat-mdc-optgroup-label {
+      background-color: var(--ion-color-secondary100) !important;
+      padding: 0;
+      display: block;
     }
 
     /* hide pseudo checkbox, in the searchbar*/
@@ -570,7 +380,6 @@ ion-list,
   }
 
   .mat-mdc-option[no-padding],
-  .mat-option[no-padding],
   mat-option[no-padding] {
     padding: 0 !important;
   }
@@ -751,31 +560,31 @@ mat-button-toggle.mat-button-toggle-checked.mat-button-toggle-disabled {
 
   // No padding
   &.ion-no-padding {
-    .mat-menu-content {
+    .mat-mdc-menu-content {
       padding: 0 !important;
     }
   }
 
   // Small menu item (e.g. for actions on a table row)
-  &.mat-menu-small-item-height .mat-menu-item,
-  .mat-menu-item.mat-menu-item-small-height
+  &.mat-mdc-menu-item-small-height .mat-mdc-menu-item,
+  .mat-mdc-menu-item.mat-mdc-menu-item-small-height
   {
     padding: 0 8px;
     height: 35px;
     line-height: 35px;
   }
   //  Reduce the font size, on label just inside a mat-menu (e.g. see trips.page.html)
-  .mat-menu-content > ion-label {
+  .mat-mdc-menu-content > ion-label {
     @include font-size(12px);
   }
 
-  .mat-menu-content ion-item > ion-icon[slot="start"] {
+  .mat-mdc-menu-content ion-item > ion-icon[slot="start"] {
     margin-right: 16px;
     vertical-align: middle;
   }
 
   // Menu title (e.g. see extraction map)
-  .mat-menu-item.mat-menu-title {
+  .mat-mdc-menu-item.mat-mdc-menu-title {
     padding: 0 8px;
     height: 27px;
     line-height: 27px;
@@ -853,7 +662,6 @@ ngx-material-timepicker-content {
 
 .mat-mdc-form-field-type-mat-chip-grid {
   .mat-mdc-form-field-infix {
-    padding-bottom: 5px !important;
     --mdc-chip-container-height: 24px !important;
   }
 }

package/src/theme/_ngx-components.table.scss

@@ -12,21 +12,22 @@
 .mat-mdc-table {
   min-width: calc(100% - 1px);
   border-collapse: separate;
+  --mat-table-row-item-label-text-size: 14px;
+  --mat-table-row-item-label-text-tracking: normal;
   --mat-row-height: #{$app-table-row-height};
   --mat-row-max-height: #{$app-table-row-max-height};
   --mat-cell-horizontal-padding: #{$app-table-cell-horizontal-padding};
-  --mat-cell-padding-top: calc(var(--mat-row-height) * 0.5 - 14px);
+  --mat-cell-padding-top: calc(var(--mat-row-height) / 2 - var(--mat-table-row-item-label-text-size, 14px));
 
-  --mdc-checkbox-state-layer-size: 20px;
   --mdc-typography-body1-font-size: 14px;
-  --mat-table-row-item-label-text-tracking: 0.0178571429em;
-  --mat-form-field-container-text-tracking: 0.0178571429em;
-  --mdc-typography-body1-letter-spacing: 0.0178571429em;
-  --mat-table-row-item-label-text-size: 14px;
+  --mdc-typography-body1-letter-spacing: normal;
 
-  --mdc-filled-text-field-container-color: #{$app-form-field-background-color};
-  --mdc-filled-text-field-disabled-container-color: #{$app-form-field-background-color};
-  --mat-form-field-state-layer-color: #{$app-form-field-focus-background-color};
+  --mat-form-field-container-text-tracking: normal;
+  --mat-form-field-state-layer-color: transparent;
+  --mat-form-field-subscript-text-size: 10px;
+  --mdc-checkbox-state-layer-size: 20px;
+  --mdc-filled-text-field-container-color: transparent;
+  --mdc-filled-text-field-disabled-container-color: transparent;
 
   .mat-mdc-header-cell {
     color: var(--ion-color-primary);
@@ -107,7 +108,7 @@
       }
 
       /* Add a start padding to content (but not the cell itself) (e.g. tables with odd/event style - like BatchGroupsTable) */
-      &.mat-cell-content-start-padding {
+      &.mat-mdc-cell-content-start-padding {
 
         // Reset start padding here (only apply cell's content)
         padding-inline-start: 0;
@@ -156,6 +157,7 @@
       }
     }
 
+    .mat-mdc-cell-date,
     .mat-cell-date {
       min-width: 128px;
       max-width: 128px;
@@ -166,10 +168,16 @@
       }
     }
 
+    .mat-mdc-cell-date-time,
     .mat-cell-date-time {
-      min-width: 145px;
+      min-width: 155px;
       max-width: 180px;
 
+      mat-date-time-field {
+        ion-col.day {
+          min-width: unset !important; // make sure column is resizable
+        }
+      }
       input {
         max-width: 120px;
         overflow: visible !important;
@@ -183,16 +191,21 @@
     .mat-column-actions {
       text-align: end;
       min-width: var(--mat-column-actions-min-width);
-      width: var(--mat-column-actions-width, 40px);
-      max-width: var(--mat-column-actions-max-width, 40px);
+      width: var(--mat-column-actions-width, 48px); // 48px = a button width
+      max-width: var(--mat-column-actions-max-width, 48px); // 48px = a button width
       padding-inline-start: 0 !important; // No start padding
-      padding-right: unset !important;
+      padding-inline-end: 0; // No end padding
+      padding-right: unset !important; // use padding-inline-start instead
+      padding-left: unset !important; // use padding-inline-end instead
+      color: unset; // Remove row color (let the button decide)
     }
 
     .mat-mdc-cell.computed mat-form-field,
+    .mat-mdc-cell-computed,
     .mat-cell-computed,
     .mat-mdc-cell ion-text.computed,
     .mat-mdc-cell.calculated mat-form-field,
+    .mat-mdc-cell-calculated,
     .mat-cell-calculated {
       color: var(--ion-color-primary-tint);
       font-style: italic;
@@ -202,32 +215,35 @@
   .mat-mdc-row {
 
     // Disabled row
+    &.mat-mdc-row-disabled *,
     &.mat-row-disabled * {
-      color: inherit;
       cursor: pointer;
       // Necessary to focus on <mat-form-field> when row is readonly since angular 15 migrating
       pointer-events: unset !important;
     }
 
+    &.mat-mdc-row-disabled:hover,
     &.mat-row-disabled:hover {
       background-color: var(--ion-color-light);
 
-      .mat-cell {
+      .mat-mdc-cell {
         color: var(--ion-color-light-contrast);
       }
     }
 
+    &.mat-mdc-row-selected,
     &.mat-row-selected {
       background-color: var(--ion-color-secondary100);
 
-      &:not(.mat-row-error):hover {
+      &:not(.mat-mdc-row-error):not(.mat-row-error):hover {
         background-color: var(--ion-color-secondary100);
       }
 
-      .mat-cell {
+      .mat-mdc-cell {
         color: var(--ion-color-secondary100-contrast);
       }
 
+      &.mat-mdc-row-disabled:hover,
       &.mat-row-disabled:hover {
         background-color: var(--ion-color-secondary100-shade) !important;
       }
@@ -235,9 +251,8 @@
     }
 
     // Dirty row
+    &.mat-mdc-row-dirty,
     &.mat-row-dirty {
-      //border-left: 3px solid var(--ion-color-primary-tint);
-
       // Resize the dirty icon (in the 'actions' column)
       .mat-column-actions mat-icon.dirty-icon,
       .mat-column-actions ion-icon.dirty-icon {
@@ -246,10 +261,12 @@
     }
 
     // Error row
+    &.mat-mdc-row-error,
     &.mat-row-error {
       //border-left: 3px solid var(--ion-color-danger-tint) !important;
       background-color: var(--ion-color-warning-tint);
 
+      &.mat-mdc-row-disabled:hover,
       &.mat-row-disabled:hover {
         background-color: var(--ion-color-warning-shade) !important;
       }
@@ -267,30 +284,30 @@
       }
     }
 
-    //.mdc-line-ripple--deactivating {
-    //  display: none;
-    //}
-
-    mat-mdc-form-field,
     mat-autocomplete-field,
-    app-form-field,
+    app-form-field {
+      width: 100%;
+    }
+
     .mat-mdc-form-field {
       width: 100%;
+
       --mat-form-field-container-text-size: 14px;
       --mdc-filled-text-field-label-text-size: var(--mat-form-field-container-text-size);
+      --mat-select-trigger-text-size: var(--mat-form-field-container-text-size);
       --mat-mdc-form-field-height: calc(var(--mat-row-height) - 2px);
-      // TODO
-      // use  -- active-  boder : 0;
+      --mdc-outlined-text-field-outline-width: 0;
       height: var(--mat-mdc-form-field-height);
-    }
-
-    .mat-mdc-form-field {
-      padding-top: 1px;
 
       .mat-mdc-form-field-label {
         width: 100%;
       }
 
+      &.mat-form-field-appearance-fill {
+        height: var(--mat-mdc-form-field-height);
+        padding-top: 1px; // suppress a redundant line in table
+      }
+
       .mat-mdc-text-field-wrapper {
         max-height: var(--mat-mdc-form-field-height);
       }
@@ -350,11 +367,11 @@
       // Suffix
       .mat-mdc-form-field-icon-suffix {
         white-space: nowrap;
+        padding: 0;
 
         .mat-mdc-icon-button {
-          width: 24px;
-          height: 24px;
-          padding: 2px 0 0 0;
+          --mdc-icon-button-state-layer-size: 24px;
+          padding: 0;
 
           ion-icon, .mat-icon {
             $font-size: calculateRem(18px);
@@ -363,7 +380,7 @@
           }
 
           .mat-mdc-button-touch-target {
-            width: 24px;
+            width: var(--mdc-icon-button-state-layer-size);
           }
         }
 
@@ -381,12 +398,6 @@
         }
       }
 
-      .mat-mdc-form-field-subscript-wrapper {
-        margin-top: -1.5rem;
-        text-align: right;
-        pointer-events: none;
-      }
-
       // FIXME: in table, required indicator is only inside the float label
       .mat-mdc-floating-label {
         display: none;
@@ -398,15 +409,19 @@
         color: rgba(0, 0, 0, 0.6) !important;
         -webkit-text-fill-color: rgba(0, 0, 0, 0.6) !important;
       }
-
-      mat-error {
-        //font-size: ;
-      //--mdc-typography-caption-font-size: 10px;
-        font-size: 10px;
-      }
-
     } // .mat-mdc-form-field
 
+    .mat-mdc-form-field-subscript-wrapper,
+    .mat-mdc-form-field-subscript-wrapper.mat-mdc-form-field-bottom-align {
+      margin-top: -1.5rem;
+      text-align: right;
+      pointer-events: none;
+
+      mat-error,
+      mat-hint {
+        font-size: var(--mat-form-field-subscript-text-size);
+      }
+    }
 
     .mat-boolean-field-radio.mat-mdc-form-field-appearance-fill .mat-mdc-form-field-infix,
     .mat-boolean-field-radio .mat-mdc-form-field-infix {
@@ -426,7 +441,29 @@
       padding-top: 0.4em;
     }
 
-    .mat-cell > .ion-text-nowrap {
+
+    mat-date-time-field {
+      height: calc(var(--mat-row-height) - 2px);
+      ion-col.day {
+        min-width: unset !important; // make sure column is resizable
+      }
+      ion-col.hour {
+        --max-width: var(--min-width) !important;
+      }
+    }
+
+    mat-latlong-field {
+      height: calc(var(--mat-row-height) - 2px);
+      ion-col.text {
+        min-width: unset !important; // make sure column is resizable
+      }
+      ion-col.sign {
+        --min-width: 35px !important;
+        --max-width: 45px !important;
+      }
+    }
+
+    .mat-mdc-cell > .ion-text-nowrap {
       width: 100%;
       overflow: hidden;
       text-overflow: ellipsis;
@@ -434,17 +471,17 @@
     }
 
     /* Show when hover row */
-    .mat-cell .visible-hover-row {
+    .mat-mdc-cell .visible-hover-row {
       visibility: hidden;
     }
 
     &:hover {
-      .mat-cell .visible-hover-row {
+      .mat-mdc-cell .visible-hover-row {
         visibility: visible;
       }
     }
 
-    .mat-cell .avatar {
+    .mat-mdc-cell .avatar {
       color: #d9d9d9;
       background-color: #f8f8f8;
       border: solid 1px #d9d9d9;
@@ -458,103 +495,36 @@
 
   /* Special case to have small row */
   &.compact .mat-mdc-row,
+  .mat-mdc-row.mat-mdc-row-small,
   .mat-mdc-row.mat-row-small {
     min-height: inherit;
     --mat-row-height: 33px;
     --mat-row-max-height: 33px;
   }
 
-  .mat-mdc-row.mat-row-small .mat-cell,
-  .mat-mdc-row .mat-cell.mat-row-small {
+  .mat-mdc-row.mat-mdc-row-small .mat-mdc-cell,
+  .mat-mdc-row .mat-mdc-cell.mat-mdc-row-small,
+  .mat-mdc-row.mat-row-small .mat-mdc-cell,
+  .mat-mdc-row .mat-mdc-cell.mat-row-small {
     line-height: 15px;
     @include font-size(12px);
   }
 
-  .mat-row-height-auto { // todo useful ?
+  .mat-mdc-row-height-auto,
+  .mat-row-height-auto {
     max-height: unset !important;
   }
 
-  // Make smaller row
-  // NOTE : useless on angular 15
-  //&.compact {
-  //  --mat-row-height: 33px;
-  //
-  //  // TODO test it !  then remove is not need
-  //  .mat-mdc-row {
-  //
-  //    ion-label {
-  //      display: inline-block;
-  //      margin-top: 5px;
-  //      width: 100%;
-  //      overflow: hidden;
-  //      white-space: nowrap;
-  //      text-overflow: ellipsis;
-  //    }
-  //
-  //    .mat-badge-content {
-  //      top: -2px;
-  //    }
-  //
-  //    .mat-icon-button {
-  //      height: 32px;
-  //      width: 32px;
-  //      line-height: 32px;
-  //    }
-  //
-  //    .mat-mdc-form-field-underline {
-  //      bottom: 6px !important;
-  //    }
-  //
-  //    .mat-mdc-form-field {
-  //
-  //      .mat-mdc-form-field-wrapper {
-  //        max-height: 32px;
-  //
-  //        .mat-mdc-form-field-flex {
-  //
-  //          .mat-mdc-form-field-infix {
-  //            max-height: 32px;
-  //            padding-top: 0;
-  //            border-top-width: 10px;
-  //
-  //            .mat-mdc-form-field-label-wrapper {
-  //
-  //              .mat-mdc-form-field-label {
-  //                top: 12px;
-  //              }
-  //            }
-  //
-  //            .mat-checkbox {
-  //              display: block;
-  //              position: absolute;
-  //              top: -2px;
-  //
-  //              .mat-checkbox-ripple {
-  //                height: 32px;
-  //                width: 32px;
-  //                left: calc(50% - 16px);
-  //                top: calc(50% - 16px);
-  //              }
-  //            }
-  //          }
-  //        }
-  //
-  //        // make click on mat-error transfer to input
-  //        //.mat-mdc-form-field-subscript-wrapper {
-  //        //  pointer-events: none;
-  //        //}
-  //
-  //        mat-error {
-  //          margin-top: 10px;
-  //        }
-  //      }
-  //    }
-  //  }
-  //}
+  // Restore border on last row
+  .mdc-data-table__row:last-child .mat-mdc-cell {
+    border-bottom-color: var(--mat-table-row-item-outline-color, rgba(0, 0, 0, 0.12)) !important;
+    border-bottom-width: var(--mat-table-row-item-outline-width, 1px) !important;
+    border-bottom-style: solid !important;
+  }
 }
 
 .mat-mdc-paginator {
-  --mat-paginator-container-size: #{$app-paginator-height};
+  --mat-paginator-container-size: var(--app-paginator-height, #{$app-paginator-height});
   --mat-paginator-container-background-color: whitesmoke;
   overflow-y: hidden;