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

package/src/theme/_material.globals.scss

@@ -2,7 +2,6 @@
 // Import material theme
 // --------------------------------------------------
 @use '@angular/material' as mat;
-@include mat.core();
 
 // Define the palettes for your theme using the Material Design palettes available in palette.scss
 // (imported above). For each palette, you can optionally specify a default, lighter, and darker
@@ -40,22 +39,6 @@ $mat-indigo-app: (
     A700: white
   )
 );
-//mat.$light-theme-background-palette: (
-//  status-bar: map_get(mat.$grey-palette, 300),
-//  app-bar:    map_get(mat.$grey-palette, 100),
-//  background: var(--background, map_get(mat.$grey-palette, 50)),
-//  hover:      rgba(black, 0.04), // TODO(kara): check style with Material Design UX
-//  card:       white,
-//  dialog:     white,
-//  disabled-button: rgba(black, 0.12),
-//  raised-button: white,
-//  focused-button: rgba(black, 0.12),
-//  selected-button: map_get(mat.$grey-palette, 300),
-//  selected-disabled-button: map_get(mat.$grey-palette, 400),
-//  disabled-button-toggle: map_get(mat.$grey-palette, 200),
-//  unselected-chip: map_get(mat.$grey-palette, 300),
-//  disabled-list-option: map_get(mat.$grey-palette, 200),
-//);
 
 // FIXME: Why loader toolbar is so dark ?
 $candy-app-primary: mat.define-palette($mat-indigo-app, 500, 100, 900);
@@ -75,28 +58,9 @@ $candy-app-theme: mat.define-light-theme((
 
 ));
 
-@include mat.all-component-themes($candy-app-theme);
-
-
 // --------------------------------------------------
 // Material theme
 // --------------------------------------------------
-//$primary: mat.define-palette(mat.$indigo-palette, 500);
-//$accent: mat.define-palette(mat.$pink-palette, A200, A100, A400);
-//$warn: mat.define-palette(mat.$red-palette);
-//
-//$theme: mat.define-light-theme((
-//  color: (
-//    primary: $primary,
-//    accent: $accent,
-//    warn: $warn,
-//  ),
-//  typography: mat.define-typography-config(),
-//  density: 0,
-//));
-//@include mat.all-component-themes($theme);
-
-
 
 // Expose some variables
 $mat-tab-link-height: 48px !default;
@@ -104,3 +68,4 @@ $mat-tab-bar-height: 48px !default;
 $mat-tab-animation-duration: 200ms !default;
 $mat-toolbar-height-desktop: 64px !default;
 $mat-toolbar-height-mobile: 56px !default;
+$mat-toolbar-background-color: var(--ion-toolbar-background, var(--ion-background-color, whitesmoke)) !default;

package/src/theme/_material.scss

@@ -1,3 +1,11 @@
+@use '@angular/material' as mat;
+
+// --------------------------------------------------
+// Standard metrial style
+// --------------------------------------------------
+@include mat.core();
+@include mat.all-component-themes($candy-app-theme);
+
 // --------------------------------------------------
 // Override material style
 // --------------------------------------------------
@@ -28,23 +36,29 @@
 }
 
 // Icon, Button
+.mat-button.mat-primary,
 .mat-icon.mat-primary,
 .mat-icon-button.mat-primary,
-.mat-button.mat-primary,
+.mat-mdc-button.mat-primary,
+.mat-mdc-icon-button.mat-primary,
 .mat-stroked-button.mat-primary {
   color: var(--ion-color-tertiary, $tertiary);
 }
-.mat-icon.mat-secondary,
 .mat-button.mat-secondary,
+.mat-icon.mat-secondary,
 .mat-icon-button.mat-secondary,
+.mat-mdc-button.mat-secondary,
+.mat-mdc-icon-button.mat-secondary,
 .mat-stroked-button.mat-secondary {
   color: var(--ion-color-secondary, $secondary);
 }
-.mat-icon.mat-accent,
 .mat-button.mat-accent,
+.mat-icon.mat-accent,
 .mat-icon-button.mat-accent,
+.mat-mdc-button.mat-accent,
+.mat-mdc-icon-button.mat-accent,
 .mat-stroked-button.mat-accent {
-  color: var(--ion-color-accent);
+  color: var(--ion-color-accent, $accent);
 }
 .mdc-button {
   --mdc-typography-button-letter-spacing: normal;
@@ -53,12 +67,20 @@
 .mat-mdc-menu-item {
   --mat-menu-item-label-text-tracking: normal;
   --mat-menu-item-label-text-size: 14px;
+  --mat-menu-item-icon-color: #0000008a;
 }
-
-  // Badge
-.mdc-tab .mat-badge-content {
-    padding-left: 2px;
+.mat-mdc-option {
+  --mat-option-label-text-tracking: normal;
+  --mat-option-label-text-size: 16px;
 }
+.mat-mdc-select {
+  --mat-select-trigger-text-font: inherit;
+  --mat-select-trigger-text-tracking: normal;
+  --mat-select-trigger-text-size: inherit;
+  --mat-select-disabled-trigger-text-color: inherit;
+  --mat-select-trigger-text-line-height: inherit;
+}
+
 .mat-badge-primary .mat-badge-content {
   background-color: var(--ion-color-tertiary);
   color: var(--ion-color-tertiary-contrast);
@@ -72,6 +94,7 @@
   color: var(--ion-color-warning-contrast);
 }
 
+
 // Progress bar
 .mat-progress-bar {
   --background-color: var(--ion-color-primary-tint, mix(#fff, $primary, 10%));

package/src/theme/_mixins.scss

@@ -98,21 +98,36 @@
   --ion-grid-column-padding: #{$ion-grid-column-padding};
   --ion-padding: #{$ion-padding};
   --ion-margin: #{$ion-margin};
+  --ion-background-color: #{$background-color};
+  --ion-background-color-rgb: #{$background-color-rgb};
+  --ion-toolbar-height: #{$ion-toolbar-height};
+  --ion-toolbar-background: #{$ion-toolbar-background};
 
   --expansion-panel-padding: var(--ion-padding);
   --expansion-panel-header-padding: var(--ion-padding);
 
+  --mat-tab-link-height: #{$mat-tab-link-height};
+  --mat-tab-bar-height: #{$mat-tab-bar-height};
+
   --mat-toolbar-height: #{$mat-toolbar-height-desktop};
   --mat-paginator-height: mat.$paginator-height;
-  --ion-toolbar-height: #{$ion-toolbar-height};
+  --mat-toolbar-background-color: var(--ion-toolbar-background);
+  --mat-toolbar-container-background-color: var(--ion-toolbar-background);
+  --mat-toolbar-container-text-color: var(--ion-text-color);
+  --mat-table-background-color: var(--ion-background-color);
 
   --app-table-header-height: #{$app-table-header-height};
-  --app-toolbar-height: #{$app-toolbar-height};
   --app-paginator-height: #{$app-paginator-height};
-  --app-form-buttons-bar-height: #{$app-form-buttons-bar-height};
+  --app-toolbar-height: #{$app-toolbar-height};
   --app-footer-height: var(--app-form-buttons-bar-height);
-  --mat-tab-link-height: #{$mat-tab-link-height};
-  --mat-tab-bar-height: #{$mat-tab-bar-height};
+  --app-form-buttons-bar-height: #{$app-form-buttons-bar-height};
+  --app-form-color: #{$app-form-color};
+  --app-form-color-disabled: #{$app-form-color-disabled};
+  --app-form-color-computed: #{$app-form-color-computed};
+  --app-form-field-background-color: #{$app-form-field-background-color};
+  --app-form-field-disabled-background-color: #{$app-form-field-disabled-background-color};
+  --app-table-row-item-selected-background-color: #{$app-table-row-item-selected-background-color};
+  --app-table-row-item-selected-text-color: #{$app-table-row-item-selected-text-color};
 }
 
 @mixin css-variables-to-root-mobile() {

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

@@ -0,0 +1,203 @@
+
+// --------------------------------------------------
+// Material Forms
+// --------------------------------------------------
+.form-container,
+form.form-container {
+  --ion-text-color: var(--app-form-color, #{$app-form-color});
+  color: var(--ion-text-color);
+  @include font-size(16px);
+
+  --mdc-filled-text-field-container-color: var(--app-form-field-background-color);
+  --mdc-filled-text-field-disabled-container-color: var(--app-form-field-disabled-background-color);
+  --mat-form-field-state-layer-color: var(--app-form-field-focus-background-color);
+  --mat-form-field-container-height: 45px;
+  --mat-form-field-container-text-size: inherit;
+  --mat-form-field-filled-label-display: block;
+  --mat-form-field-container-vertical-padding: 8px;
+  --mat-form-field-filled-with-label-container-padding-top: 18px;
+  --mat-form-field-filled-with-label-container-padding-bottom: 0px;
+  --mdc-filled-text-field-label-text-tracking: normal;
+  --mat-select-trigger-text-size: var(--mat-form-field-container-text-size);
+
+  .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: var(--mat-form-field-container-height);
+    }
+  }
+
+  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 {
+
+      --mdc-icon-button-icon-size: 24px;
+      --mdc-icon-button-icon-color: inherit;
+      --mdc-icon-button-state-layer-size: 48px;
+      --mdc-icon-button-margin-vertical: 12px;
+
+      ion-icon, .mat-icon {
+        font-size: var(--mdc-icon-button-icon-size) !important;
+        line-height: 1.125;
+        height: var(--mdc-icon-button-icon-size);
+        width: var(--mdc-icon-button-icon-size);
+        margin-left: var(--mdc-icon-button-margin-vertical);
+        margin-right: var(--mdc-icon-button-margin-vertical);
+        position: relative;
+        color: var(--mdc-icon-button-icon-color);
+        fill: var(--mdc-icon-button-icon-color);
+      }
+    }
+
+    ion-icon[matSuffix],
+    mat-icon[matSuffix],
+    .mat-mdc-form-field-icon-suffix {
+      white-space: nowrap;
+
+      .mat-mdc-icon-button {
+        --mdc-icon-button-state-layer-size: 24px;
+        --mdc-icon-button-icon-size: 16px;
+        --mdc-icon-button-padding: 4px;
+        padding: var(--mdc-icon-button-padding);
+
+        &.large {
+          --mdc-icon-button-state-layer-size: 48px;
+          --mdc-icon-button-icon-size: 24px;
+          --mdc-icon-button-padding: 12px;
+        }
+
+        ion-icon, .mat-icon {
+          height: var(--mdc-icon-button-icon-size);
+          width: var(--mdc-icon-button-icon-size);
+          font-size: 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(14px);
+          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: calc(var(--mat-form-field-filled-with-label-container-padding-top, 0px) + 4px);
+      }
+    }
+  }
+
+  .mat-mdc-form-field-subscript-wrapper {
+    mat-hint {
+      --color: rgb(115,115,115);
+      color: var(--color);
+    }
+  }
+
+  /* -- 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 {
+    --mdc-filled-text-field-input-text-color: var(--app-form-color-computed, #{$app-form-color-computed}) !important;
+    color: var(--app-form-color-computed, #{$app-form-color-computed}) !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 {
+
+      // No top/bottom padding between grid cell
+      padding-bottom: 0;
+      padding-top: 0;
+
+      & > ion-label {
+        color: var(--ion-color-primary100);
+        padding-inline-end: 5px;
+      }
+
+      & > ion-label[text-wrap] {
+        word-wrap: normal;
+        white-space: normal;
+      }
+    }
+  }
+}

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

@@ -2,9 +2,6 @@ $app-menu-width: 300px !default;
 
 $app-toolbar-height: 60px !default; // = $mat-toolbar-height-mobile + 4 (progress bar);
 
-$app-form-color: rgba(0, 0, 0, 0.87) !default;
-$app-form-color-disabled: rgba(0, 0, 0, 0.55) !default;
-
 $app-table-header-height: 44px !default;
 $app-table-cell-horizontal-padding: 8px !default;
 $app-table-row-height: 48px !default;
@@ -12,11 +9,17 @@ $app-table-row-max-height: 52px !default;
 
 $app-paginator-height: 34px !default;
 $app-form-buttons-bar-height: 56px !default;
+$app-form-color: rgba(0, 0, 0, 0.87) !default;
+$app-form-color-disabled: rgba(0, 0, 0, 0.55) !default;
+$app-form-color-computed: var(--ion-color-primary-tint) !default;
+$app-form-field-background-color: #f5f5f5 !default; // Form's field background
+$app-form-field-disabled-background-color: #fafafa !default;
 
 $app-select-option-border-color: rgba(0, 0, 0, 0.12) !default;
 $app-table-border-color: rgba(0, 0, 0, 0.08) !default;
+$app-table-row-item-selected-background-color: var(--ion-color-secondary100) !default;
+$app-table-row-item-selected-text-color: var(--ion-color-secondary100-contrast) !default;
 
-$app-form-field-background-color: rgba(0,0,0,0) !default;
-//$app-form-field-background-color: whitesmoke !default;
-$app-form-field-focus-background-color: rgba(0, 0, 0, 0) !default;
-//$app-form-field-focus-background-color: rgba(0, 0, 0, 0.87) !default;
+// Form fields background : transparent
+//$app-form-field-background-color: transparent !default;
+//$app-form-field-disabled-background-color: transparent !default;

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*/
@@ -535,7 +345,7 @@ ion-list,
     bottom: 0;
     z-index: 1001;
     border-top: 1px solid #{$app-select-option-border-color};
-    background-color: whitesmoke;
+    background-color: var(--ion-toolbar-background, #{$ion-toolbar-background});
     color: var(--ion-color-medium) !important; // not working on mobile form because the mat-option is disabled
     @include font-size(12px);
     font-weight: 500;
@@ -570,7 +380,6 @@ ion-list,
   }
 
   .mat-mdc-option[no-padding],
-  .mat-option[no-padding],
   mat-option[no-padding] {
     padding: 0 !important;
   }
@@ -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;
   }
 }