@sumaris-net/ngx-components 2.7.3-rc8 → 2.7.3

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

@@ -8,25 +8,41 @@
   overflow-x: auto;
 }
 
+.dark .mat-mdc-table {
+  --mdc-checkbox-selected-checkmark-color: var(--ion-text-color);
+  --mdc-checkbox-unselected-icon-color: var(--ion-text-color);
+  --mdc-checkbox-selected-icon-color: var(--ion-color-accent);
+  --mdc-checkbox-unselected-focus-icon-color: var(--ion-text-color);
+  --mdc-checkbox-unselected-hover-icon-color: var(--ion-text-color);
+  --mdc-checkbox-unselected-pressed-icon-color: var(--ion-color-accent);
+}
 
 .mat-mdc-table {
   min-width: calc(100% - 1px);
   border-collapse: separate;
+  --mat-table-background-color: var(--ion-background-color);
+  --mat-table-row-item-label-text-color: var(--ion-text-color);
+  --mat-table-row-item-outline-color: var(--ion-border-color);
+  --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;
+  --mdc-filled-text-field-input-text-color: var(--ion-text-color);
+  --mat-select-enabled-trigger-text-color: var(--ion-text-color);
+  --mat-select-disabled-trigger-text-color: var(--ion-text-color);
+  --mdc-form-field-label-text-color: var(--ion-text-color);
 
   .mat-mdc-header-cell {
     color: var(--ion-color-primary);
@@ -107,7 +123,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 +172,7 @@
       }
     }
 
+    .mat-mdc-cell-date,
     .mat-cell-date {
       min-width: 128px;
       max-width: 128px;
@@ -166,10 +183,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,18 +206,22 @@
     .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-cell-calculated {
-      color: var(--ion-color-primary-tint);
+    .mat-mdc-cell ion-label.computed,{
+      --ion-text-color: var(--app-form-color-computed, #{$app-form-color-computed}) !important;
+      color: var(--ion-text-color) !important;
       font-style: italic;
     }
   }
@@ -202,42 +229,52 @@
   .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);
+      --ion-text-color: var(--app-table-row-item-selected-text-color) !important;
+      --ion-background-color: var(--app-table-row-item-selected-background-color) !important;;
+
+      --mdc-filled-text-field-input-text-color: var(--ion-text-color);
+      --mat-select-enabled-trigger-text-color: var(--ion-text-color);
+      --mat-select-disabled-trigger-text-color: var(--ion-text-color);
+      --mdc-form-field-label-text-color: var(--ion-text-color);
+
+      background-color: var(--ion-background-color);
 
-      &:not(.mat-row-error):hover {
-        background-color: var(--ion-color-secondary100);
+      &:not(.mat-mdc-row-error):not(.mat-row-error):hover {
+        background-color: var(--ion-background-color);
       }
 
-      .mat-cell {
-        color: var(--ion-color-secondary100-contrast);
+      .mat-mdc-cell {
+        color: var(--ion-text-color);
       }
 
+      &.mat-mdc-row-disabled:hover,
       &.mat-row-disabled:hover {
-        background-color: var(--ion-color-secondary100-shade) !important;
+        background-color: var(--ion-background-color) !important;
       }
 
     }
 
     // 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 +283,11 @@
     }
 
     // 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 +305,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 +388,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 +401,7 @@
           }
 
           .mat-mdc-button-touch-target {
-            width: 24px;
+            width: var(--mdc-icon-button-state-layer-size);
           }
         }
 
@@ -381,12 +419,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 +430,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 +462,28 @@
       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 +491,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,104 +515,41 @@
 
   /* 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;
+  }
 }
 
+// Paginator
 .mat-mdc-paginator {
-  --mat-paginator-container-size: #{$app-paginator-height};
-  --mat-paginator-container-background-color: whitesmoke;
+  --mat-paginator-container-size: var(--app-paginator-height, #{$app-paginator-height});
+  --mat-paginator-container-background-color: var(--ion-toolbar-background, var(--ion-background-color, #{$ion-toolbar-background}));
+  --mat-paginator-container-text-tracking: normal;
+  --mat-paginator-container-text-color: var(--app-form-color, #{$app-form-color});
+
   overflow-y: hidden;
 
   .mat-mdc-paginator-page-size-select {

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

@@ -17,7 +17,8 @@
 }
 
 // --- Allow to hide headers
-.mat-mdc-tab-group.mat-mdc-tab-group-header-hidden .mat-mdc-tab-header {
+.mat-mdc-tab-group.mat-mdc-tab-group-header-hidden .mat-mdc-tab-header,
+.mat-mdc-tab-group.mat-tab-group-header-hidden .mat-mdc-tab-header {
     display: none;
 }
 
@@ -35,3 +36,17 @@
 .mat-mdc-tab-group.mat-mdc-tab-disabled-visible .mat-mdc-tab-disabled {
   display: inherit;
 }
+
+// --- Dark mode
+.dark {
+  .mat-mdc-tab-group, .mat-mdc-tab-nav-bar {
+    --mat-tab-header-active-label-text-color: var(--ion-text-color, #000000de) !important;
+    --mat-tab-header-active-focus-label-text-color: var(--ion-text-color, #000000de) !important;
+    --mat-tab-header-active-hover-label-text-color: var(--ion-text-color, #000000de) !important;
+    --mat-tab-header-inactive-label-text-color: var(--app-form-color-disabled);
+    --mat-tab-header-inactive-hover-label-text-color: var(--ion-text-color, #000000de);
+  }
+  .mat-mdc-tab-label-container, .mat-mdc-tab-link-container {
+    --mat-tab-header-divider-color: var(--ion-border-color, rgba(0,0,0,.12)) !important;
+  }
+}

package/src/theme/_theme.scss

@@ -34,3 +34,4 @@ $roboto-font-path: '~roboto-fontface/fonts/roboto';
 @import "ngx-components";
 @import "ngx-components.tabs";
 @import "ngx-components.table";
+@import "ngx-components.forms";

package/src/theme/_theme.variables.scss

@@ -0,0 +1,170 @@
+/** Inject all CSS Variables **/
+html {
+  @include css-variables-to-root();
+}
+
+html.dark {
+  --ion-color-primary: #428cff;
+  --ion-color-primary-rgb: 66, 140, 255;
+  --ion-color-primary-contrast: #ffffff;
+  --ion-color-primary-contrast-rgb: 255, 255, 255;
+  --ion-color-primary-shade: #3a7be0;
+  --ion-color-primary-tint: #5598ff;
+
+  --ion-color-secondary: #75C4FD;
+  --ion-color-secondary-rgb: 117, 196, 253;
+  --ion-color-secondary-contrast: #ffffff;
+  --ion-color-secondary-contrast-rgb: 255, 255, 255;
+  --ion-color-secondary-shade: #46b0e0;
+  --ion-color-secondary-tint: #62ceff;
+
+  --ion-color-tertiary: #6a64ff;
+  --ion-color-tertiary-rgb: 106, 100, 255;
+  --ion-color-tertiary-contrast: #ffffff;
+  --ion-color-tertiary-contrast-rgb: 255, 255, 255;
+  --ion-color-tertiary-shade: #5d58e0;
+  --ion-color-tertiary-tint: #7974ff;
+
+  --ion-color-success: #2fdf75;
+  --ion-color-success-rgb: 47, 223, 117;
+  --ion-color-success-contrast: #000000;
+  --ion-color-success-contrast-rgb: 0, 0, 0;
+  --ion-color-success-shade: #29c467;
+  --ion-color-success-tint: #44e283;
+
+  --ion-color-warning: #FF6434;
+  --ion-color-warning-rgb: 255, 100, 52;
+  --ion-color-warning-contrast: #000000;
+  --ion-color-warning-contrast-rgb: 0, 0, 0;
+  --ion-color-warning-shade: #E0BB4B;
+  --ion-color-warning-tint: #FFDA48;
+
+  --ion-color-danger: #fa0021;
+  --ion-color-danger-rgb: 255, 0, 33;
+  --ion-color-danger-contrast: #ffffff;
+  --ion-color-danger-contrast-rgb: 255, 255, 255;
+  --ion-color-danger-shade: #e04055;
+  --ion-color-danger-tint: #ff5b71;
+
+  --ion-color-dark: #f4f5f8;
+  --ion-color-dark-rgb: 244, 245, 248;
+  --ion-color-dark-contrast: #000000;
+  --ion-color-dark-contrast-rgb: 0, 0, 0;
+  --ion-color-dark-shade: #d7d8da;
+  --ion-color-dark-tint: #f5f6f9;
+
+  --ion-color-medium: #989aa2;
+  --ion-color-medium-rgb: 152, 154, 162;
+  --ion-color-medium-contrast: #000000;
+  --ion-color-medium-contrast-rgb: 0, 0, 0;
+  --ion-color-medium-shade: #86888f;
+  --ion-color-medium-tint: #a2a4ab;
+
+  --ion-color-light: #222428;
+  --ion-color-light-rgb: 34, 36, 40;
+  --ion-color-light-contrast: #ffffff;
+  --ion-color-light-contrast-rgb: 255, 255, 255;
+  --ion-color-light-shade: #1e2023;
+  --ion-color-light-tint: #383a3e;
+
+}
+
+/*
+ * iOS Dark Theme
+ * -------------------------------------------
+ */
+
+html.ios.dark {
+  --ion-background-color: #000000;
+  --ion-background-color-rgb: 0, 0, 0;
+
+  --ion-text-color: #ffffff;
+  --ion-text-color-rgb: 255, 255, 255;
+
+  --ion-color-step-50: #0d0d0d;
+  --ion-color-step-100: #1a1a1a;
+  --ion-color-step-150: #262626;
+  --ion-color-step-200: #333333;
+  --ion-color-step-250: #404040;
+  --ion-color-step-300: #4d4d4d;
+  --ion-color-step-350: #595959;
+  --ion-color-step-400: #666666;
+  --ion-color-step-450: #737373;
+  --ion-color-step-500: #808080;
+  --ion-color-step-550: #8c8c8c;
+  --ion-color-step-600: #999999;
+  --ion-color-step-650: #a6a6a6;
+  --ion-color-step-700: #b3b3b3;
+  --ion-color-step-750: #bfbfbf;
+  --ion-color-step-800: #cccccc;
+  --ion-color-step-850: #d9d9d9;
+  --ion-color-step-900: #e6e6e6;
+  --ion-color-step-950: #f2f2f2;
+
+  --ion-item-background: #000000;
+
+  --ion-card-background: #1c1c1d;
+}
+
+.ios ion-modal {
+  --ion-background-color: var(--ion-color-step-100);
+  --ion-toolbar-background: var(--ion-color-step-150);
+  --ion-toolbar-border-color: var(--ion-color-step-250);
+}
+
+/*
+ * Material Design Dark Theme
+ * -------------------------------------------
+ */
+
+html.md.dark {
+
+  --app-form-color-disabled: #949494;
+  --app-form-color: var(--ion-text-color);
+
+  --ion-background-color: #121212;
+  --ion-background-color-rgb: 18,18,18; // #{color-to-rgb-list(#121212)};
+  --ion-toolbar-background: #1f1f1f;
+
+  --ion-text-color: #ffffffde;
+  --ion-text-color-rgb: 255,255,255; // #{color-to-rgb-list(#ffffff)};
+
+  --ion-border-color: #222222;
+
+  --ion-color-step-50: #1e1e1e;
+  --ion-color-step-100: #2a2a2a;
+  --ion-color-step-150: #363636;
+  --ion-color-step-200: #414141;
+  --ion-color-step-250: #4d4d4d;
+  --ion-color-step-300: #595959;
+  --ion-color-step-350: #656565;
+  --ion-color-step-400: #717171;
+  --ion-color-step-450: #7d7d7d;
+  --ion-color-step-500: #898989;
+  --ion-color-step-550: #949494;
+  --ion-color-step-600: #a0a0a0;
+  --ion-color-step-650: #acacac;
+  --ion-color-step-700: #b8b8b8;
+  --ion-color-step-750: #c4c4c4;
+  --ion-color-step-800: #d0d0d0;
+  --ion-color-step-850: #dbdbdb;
+  --ion-color-step-900: #e7e7e7;
+  --ion-color-step-950: #f3f3f3;
+
+  --ion-item-background: #1e1e1e;
+
+  --ion-tab-bar-background: #1f1f1f;
+
+  --ion-card-background: #1e1e1e;
+
+  ion-menu ion-content {
+    --background: transparent;
+    --background-color: var(--ion-background-color) !important;
+  }
+
+  //.mat-mdc-table {
+  //  --app-table-row-item-selected-background-color: var(--ion-color-accent);
+  //  --app-table-row-item-selected-text-color: var(--ion-color-accent-contrast);
+  //}
+}
+