@sumaris-net/ngx-components 2.7.3-rc2 → 2.7.3-rc21

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

@@ -107,7 +107,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 +156,7 @@
       }
     }
 
+    .mat-mdc-cell-date,
     .mat-cell-date {
       min-width: 128px;
       max-width: 128px;
@@ -166,6 +167,7 @@
       }
     }
 
+    .mat-mdc-cell-date-time,
     .mat-cell-date-time {
       min-width: 145px;
       max-width: 180px;
@@ -190,9 +192,11 @@
     }
 
     .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,6 +206,7 @@
   .mat-mdc-row {
 
     // Disabled row
+    &.mat-mdc-row-disabled *,
     &.mat-row-disabled * {
       color: inherit;
       cursor: pointer;
@@ -209,25 +214,28 @@
       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 +243,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 +253,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,25 +276,19 @@
       }
     }
 
-    //.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%;
+      padding-top: 1px; // suppress a redundant line in table
       --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;
       height: var(--mat-mdc-form-field-height);
-    }
-
-    .mat-mdc-form-field {
-      padding-top: 1px;
 
       .mat-mdc-form-field-label {
         width: 100%;
@@ -400,8 +403,6 @@
       }
 
       mat-error {
-        //font-size: ;
-      //--mdc-typography-caption-font-size: 10px;
         font-size: 10px;
       }
 
@@ -426,7 +427,7 @@
       padding-top: 0.4em;
     }
 
-    .mat-cell > .ion-text-nowrap {
+    .mat-mdc-cell > .ion-text-nowrap {
       width: 100%;
       overflow: hidden;
       text-overflow: ellipsis;
@@ -434,17 +435,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 +459,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;
 

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

@@ -1,8 +1,9 @@
 // --------------------------------------------------
-// Material tab group
+// Material tab group/link
 // --------------------------------------------------
+
 // -- Keep Angular 14 tab style
-.mat-mdc-tab-label-container {
+.mat-mdc-tab-label-container, .mat-mdc-tab-link-container {
   --mat-tab-header-divider-color: rgba(0,0,0,.12) !important;
   --mat-tab-header-divider-height: 1px !important;
 }
@@ -34,328 +35,3 @@
 .mat-mdc-tab-group.mat-mdc-tab-disabled-visible .mat-mdc-tab-disabled {
   display: inherit;
 }
-
-// --------------------------------------------------
-// Material menu
-// --------------------------------------------------
-
-
-.mat-menu-panel {
-
-  // Max width = 400px
-  &.mat-menu-size-400 {
-    min-width: unset;
-    width: 400px;
-    max-width: calc(90vw);
-  }
-  // Max width = 75vw
-  &.mat-menu-size-75vw {
-    min-width: unset;
-    width: calc(75vw);
-    max-width: calc(90vw);
-  }
-
-  // No padding
-  &.ion-no-padding {
-    .mat-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
-  {
-    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 {
-    @include font-size(12px);
-  }
-
-  .mat-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 {
-    padding: 0 8px;
-    height: 27px;
-    line-height: 27px;
-    @include font-size(12px);
-    pointer-events: none;
-    color: var(--ion-color-medium, rgba(0, 0, 0, 0.38));
-  }
-}
-
-// --------------------------------------------------
-// Alert
-// --------------------------------------------------
-
-ion-alert button.alert-button {
-  cursor: pointer;
-}
-
-// --------------------------------------------------
-// Date and time picker
-// --------------------------------------------------
-
-mat-calendar {
-  .mat-calendar-header {
-    background-color: var(--ion-color-secondary) !important;
-    color: var(--ion-color-secondary-contrast) !important;
-
-    button {
-      color: var(--ion-color-secondary-contrast) !important;
-    }
-  }
-
-  .mat-calendar-body-selected {
-    background-color: var(--ion-color-accent) !important;
-    color: var(--ion-color-accent-contrast) !important;
-    font-weight: bold;
-  }
-
-  .mat-calendar-arrow {
-    border-top-color: var(--ion-color-secondary-contrast) !important;
-  }
-}
-
-
-.timepicker-backdrop-overlay {
-  background-color: rgba(0, 0, 0, 0.32);
-  z-index: 1000;
-  opacity: 1;
-  -webkit-tap-highlight-color: transparent;
-  transition: opacity 400ms cubic-bezier(0.25, 0.8, 0.25, 1);
-}
-
-ngx-material-timepicker-content {
-  --clock-hand-color: var(--ion-color-accent) !important;
-  --clock-face-time-active-color: var(--ion-color-accent-contrast) !important;
-  // TODO review !
-  //@extend .mat-dialog-container !optional;
-
-  .timepicker {
-    box-shadow: unset !important;
-    border-radius: 4px;
-
-    header {
-      --dial-background-color: var(--ion-color-secondary) !important;
-      color: var(--ion-color-secondary-contrast) !important;
-    }
-  }
-
-  ngx-material-timepicker-dial-control {
-    outline-color: var(--ion-color-accent) !important;
-    input {
-      outline-color: inherit !important;
-    }
-  }
-}
-
-.mat-mdc-form-field-type-mat-chip-grid {
-  .mat-mdc-form-field-infix {
-    padding-bottom: 5px !important;
-    --mdc-chip-container-height: 24px !important;
-  }
-}
-
-
-// --------------------------------------------------
-// Pages
-// --------------------------------------------------
-ion-item {
-  ion-label.error {
-    line-height: 16px;
-    line-break: normal;
-    overflow: visible;
-    white-space: normal;
-  }
-}
-
-// --------------------------------------------------
-// Modal
-// --------------------------------------------------
-
-ion-modal.stack-modal {
-  --box-shadow: 0 28px 48px rgba(0, 0, 0, 0.4);
-  --backdrop-opacity: var(--ion-backdrop-opacity, 0.32);
-}
-
-ion-modal.modal-large{
-  --min-height: calc(100% - 50px) !important;
-  --min-width: calc(100% - 100px) !important;
-}
-ion-modal.modal-fullscreen {
-  --min-height: calc(100%) !important;
-  --min-width: calc(100%) !important;
-}
-
-
-// --------------------------------------------------
-// Popover
-// --------------------------------------------------
-
-.popover-large {
-  --min-width: calc(min(500px, 80%));
-}
-
-.popover-notifications {
-  --popover-top: 0;
-  --max-height: calc(90vh - 40px /* header + footer height */ - var(--popover-top, 0px) - var(--offset-y, 0px));
-
-  ion-item {
-    --ion-item-background-color-hover: var(--ion-color-light);
-    &.unread {
-      --ion-item-background: rgba(var(--ion-color-secondary100-rgb), 0.2);
-      --ion-item-background-color-hover: rgba(var(--ion-color-secondary100-rgb), 0.3);
-    }
-  }
-}
-
-// --------------------------------------------------
-// Large button with icon floating on right
-// --------------------------------------------------
-.flex-margin ion-icon,
-.flex-margin span {
-  margin-left: auto;
-}
-
-// --------------------------------------------------
-// Icon tooltip, and title
-// --------------------------------------------------
-// Fix Button icon name overrides button's own title on mouse over
-/*ion-icon[name='chatbox'] {
-  pointer-events: none !important;
-}*/
-.mat-cell {
-  /* smaller size, for the comment icon */
-  mat-icon.comment {
-    @include font-size(16pt);
-    height: 100%;
-    vertical-align: center;
-    color: var(--ion-color-tertiary, grey);
-
-    &.disabled {
-      color: var(--ion-color-medium, grey);
-    }
-  }
-}
-
-// --------------------------------------------------
-// Icon inside text
-// --------------------------------------------------
-mat-icon,
-ion-icon {
-  &.text-size {
-    font-size: 1em;
-    width: 1em;
-    height: 1em;
-  }
-}
-ion-button[expand="block"],
-ion-button[expand="full"],
-.mat-button,
-.mat-raised-button {
-  mat-icon,
-  ion-icon {
-    &[slot] {
-      pointer-events: none;
-      width: 24px;
-      height: 24px;
-    }
-    &[slot='start'],
-    &[slot='end'] {
-      margin-left: unset;
-      margin-right: unset;
-      margin-top: 0;
-      margin-bottom: 0;
-    }
-    &t[slot='start'] {
-      margin-inline-start: -0.3em;
-      margin-inline-end: 0.3em;
-    }
-    &[slot='end'] {
-      margin-inline-start: 0.3em;
-      margin-inline-end: -0.3em;
-    }
-    &.ion-float-start[slot='start'] {
-      position: absolute;
-      left: 0;
-    }
-    &.ion-float-end[slot='end'] {
-      position: absolute;
-      right: 0;
-    }
-  }
-}
-
-// --------------------------------------------------
-// Icon multiple
-// --------------------------------------------------
-ion-icon.icon-secondary,
-mat-icon.icon-secondary {
-  position: absolute;
-  left: 0;
-}
-
-// --------------------------------------------------
-// Toast
-// --------------------------------------------------
-ion-toast {
-  --background:  var(--ion-color-dark);
-  --color: var(--ion-color-dark-contrast);
-  --button-color: var(--ion-color-secondary);
-
-  &.secondary {
-    --background: var(--ion-color-secondary);
-    --color: var(--ion-color-secondary-contrast);
-    --button-color: var(--ion-color-tertiary);
-  }
-  &.accent {
-    --background: var(--ion-color-accent);
-    --color: var(--ion-color-accent-contrast);
-    --button-color: var(--ion-color-primary);
-  }
-  &.danger {
-    --background: var(--ion-color-danger);
-    --color: var(--ion-color-danger-contrast);
-    --button-color: var(--ion-color-primary);
-  }
-
-  /* -- workaround because toast animation failed */
-  --toast-max-height: 75px;
-
-  &.toast-stack-offset-1 {
-    --toast-stack-offset: 1;
-  }
-  &.toast-stack-offset-2 {
-    --toast-stack-offset: 2;
-  }
-  &.toast-stack-offset-3 {
-    --toast-stack-offset: 3;
-  }
-  &.toast-stack-offset-4 {
-    --toast-stack-offset: 4;
-  }
-
-  &.toast-stacked-top {
-    --toast-top: calc(var(--toast-stack-offset, 0) * var(--toast-max-height, 0));
-    transform: translateY(var(--toast-top));
-  }
-  &.toast-stacked-bottom {
-    --toast-bottom: calc(-1 * var(--toast-stack-offset, 0) * var(--toast-max-height, 0)) !important;
-    transform: translateY(var(--toast-bottom));
-  }
-}
-
-// --------------------------------------------------
-// Refresher
-// --------------------------------------------------
-ion-refresher.refresher-native {
-  z-index: 1000;
-}