@iamproperty/components 7.1.0--beta6 → 7.2.0

package/assets/sass/components/charts.config.scss

@@ -1,80 +1,86 @@
 @use 'sass:math';
 @use '../_func' as *;
 
-iam-barchart {
-  --chart-bar-alignment: left;
-  --chart-text-color: var(--colour-heading);
-}
+$layers: 'true' !default;
+$mobileOnly: 'false' !default;
+$darkMode: 'true' !default;
 
-iam-barchart:not(.chart--horizontal)::part(xaxis-label) {
-  text-align: left;
-  transform-origin: 0rem 1rem;
-  transform: rotate(45deg);
-  max-width: 5rem;
-  font-size: 1rem;
-  color: var(--colour-heading);
-}
+@include layer('components', $layers) {
+  iam-barchart {
+    --chart-bar-alignment: left;
+    --chart-text-color: var(--colour-heading);
+  }
 
-iam-barchart:not(.chart--horizontal)::part(spacer) {
-  aspect-ratio: 1/1;
-  display: block;
-  width: fit-content;
-}
+  iam-barchart:not(.chart--horizontal)::part(xaxis-label) {
+    text-align: left;
+    transform-origin: 0rem 1rem;
+    transform: rotate(45deg);
+    max-width: 5rem;
+    font-size: 1rem;
+    color: var(--colour-heading);
+  }
 
-iam-barchart:not(.chart--horizontal)::part(chart-key) {
-  padding-top: 2rem;
-  order: 3;
-}
+  iam-barchart:not(.chart--horizontal)::part(spacer) {
+    aspect-ratio: 1/1;
+    display: block;
+    width: fit-content;
+  }
 
-iam-barchart::part(key),
-iam-barchart::part(key-checked),
-iam-barchart::part(key-unchecked) {
-  --key-border-radius: 50%;
-  --btn-border-width: 1px;
-  --btn-padding-block: #{rem(6)};
-  --btn-padding-inline: #{rem(6)};
+  iam-barchart:not(.chart--horizontal)::part(chart-key) {
+    padding-top: 2rem;
+    order: 3;
+  }
 
-  background-color: var(--colour-canvas-2);
-  border: var(--btn-border-width) solid var(--colour-muted);
-  border-radius: rem(4) !important;
-  font-weight: 400 !important;
-  font-size: 1rem;
-  line-height: rem(20);
-  padding: calc(var(--btn-padding-block) - var(--btn-border-width))
-    calc(var(--btn-padding-inline) - var(--btn-border-width));
-  color: var(--colour-heading);
-}
+  iam-barchart::part(key),
+  iam-barchart::part(key-checked),
+  iam-barchart::part(key-unchecked) {
+    --key-border-radius: 50%;
+    --btn-border-width: 1px;
+    --btn-padding-block: #{rem(6)};
+    --btn-padding-inline: #{rem(6)};
 
-iam-barchart::part(key):is(:hover, :focus, .hover, :focus-within):not([disabled], :active, .active),
-iam-barchart::part(key-checked):is(:hover, :focus, .hover, :focus-within):not([disabled], :active, .active),
-iam-barchart::part(key-unchecked):is(:hover, :focus, .hover, :focus-within):not([disabled], :active, .active) {
-  background: var(--colour-btn-action-hover-bg);
-}
-iam-barchart::part(key):is(:hover, :focus, .hover, :focus-within),
-iam-barchart::part(key-checked):is(:hover, :focus, .hover, :focus-within),
-iam-barchart::part(key-unchecked):is(:hover, :focus, .hover, :focus-within) {
-  background: var(--colour-btn-action-hover-bg);
-}
+    background-color: var(--colour-canvas-2);
+    border: var(--btn-border-width) solid var(--colour-muted);
+    border-radius: rem(4) !important;
+    font-weight: 400 !important;
+    font-size: 1rem;
+    line-height: rem(20);
+    padding: calc(var(--btn-padding-block) - var(--btn-border-width))
+      calc(var(--btn-padding-inline) - var(--btn-border-width));
+    color: var(--colour-heading);
+  }
 
-iam-barchart::part(key-unchecked) {
-  opacity: 0.25;
-}
+  iam-barchart::part(key):is(:hover, :focus, .hover, :focus-within):not([disabled], :active, .active),
+  iam-barchart::part(key-checked):is(:hover, :focus, .hover, :focus-within):not([disabled], :active, .active),
+  iam-barchart::part(key-unchecked):is(:hover, :focus, .hover, :focus-within):not([disabled], :active, .active) {
+    background: var(--colour-btn-action-hover-bg);
+  }
+  iam-barchart::part(key):is(:hover, :focus, .hover, :focus-within),
+  iam-barchart::part(key-checked):is(:hover, :focus, .hover, :focus-within),
+  iam-barchart::part(key-unchecked):is(:hover, :focus, .hover, :focus-within) {
+    background: var(--colour-btn-action-hover-bg);
+  }
 
-iam-barchart::part(tooltip) {
-  text-decoration: none !important;
-}
-iam-barchart::part(tooltip):after {
-  font-family: 'Font Awesome 6 Pro';
-  font-weight: 900;
-  content: '\f059';
-  display: inline-block;
-  margin-left: 0.2em;
-  margin-right: 0.1em;
-  margin-bottom: 0.1em;
-  color: var(--colour-primary);
-  border: none;
-}
+  iam-barchart::part(key-unchecked) {
+    opacity: 0.25;
+  }
+
+  iam-barchart::part(tooltip) {
+    text-decoration: none !important;
+  }
+  iam-barchart::part(tooltip):after {
+    font-family: 'Font Awesome 6 Pro';
+    font-weight: 900;
+    content: '\f059';
+    display: inline-block;
+    margin-left: 0.2em;
+    margin-right: 0.1em;
+    margin-bottom: 0.1em;
+    color: var(--colour-primary);
+    border: none;
+  }
 
-iam-barchart {
-  //--xaxis-max-width: 3rem;
+  iam-barchart {
+    //--xaxis-max-width: 3rem;
+  }
 }

package/assets/sass/components/charts.module.scss

@@ -1,18 +1,20 @@
+@use 'sass:map';
+
 @use '../_func' as *;
 
-$chart-colour-1: map-get($wider-colours, '3') !default;
-$chart-colour-2: map-get($wider-colours, '4') !default;
-$chart-colour-3: map-get($wider-colours, '5') !default;
-$chart-colour-4: map-get($wider-colours, '6') !default;
-$chart-colour-5: map-get($wider-colours, '7') !default;
-$chart-colour-6: map-get($wider-colours, '8') !default;
-$chart-colour-7: map-get($wider-colours, '9') !default;
-$chart-colour-8: map-get($wider-colours, '10') !default;
-$chart-colour-9: map-get($wider-colours, '11') !default;
-$chart-colour-10: map-get($wider-colours, '12') !default;
+$chart-colour-1: map.get($wider-colours, '3') !default;
+$chart-colour-2: map.get($wider-colours, '4') !default;
+$chart-colour-3: map.get($wider-colours, '5') !default;
+$chart-colour-4: map.get($wider-colours, '6') !default;
+$chart-colour-5: map.get($wider-colours, '7') !default;
+$chart-colour-6: map.get($wider-colours, '8') !default;
+$chart-colour-7: map.get($wider-colours, '9') !default;
+$chart-colour-8: map.get($wider-colours, '10') !default;
+$chart-colour-9: map.get($wider-colours, '11') !default;
+$chart-colour-10: map.get($wider-colours, '12') !default;
 
 $chart-colors: ();
-$chart-colors: map-merge(
+$chart-colors: map.merge(
   (
     1: $chart-colour-1,
     2: $chart-colour-2,
@@ -28,19 +30,19 @@ $chart-colors: map-merge(
   $chart-colors
 );
 
-$chart-colour-1-hover: map-get($wider-colours-hover, '3') !default;
-$chart-colour-2-hover: map-get($wider-colours-hover, '4') !default;
-$chart-colour-3-hover: map-get($wider-colours-hover, '5') !default;
-$chart-colour-4-hover: map-get($wider-colours-hover, '6') !default;
-$chart-colour-5-hover: map-get($wider-colours-hover, '7') !default;
-$chart-colour-6-hover: map-get($wider-colours-hover, '8') !default;
-$chart-colour-7-hover: map-get($wider-colours-hover, '9') !default;
-$chart-colour-8-hover: map-get($wider-colours-hover, '10') !default;
-$chart-colour-9-hover: map-get($wider-colours-hover, '11') !default;
-$chart-colour-10-hover: map-get($wider-colours-hover, '12') !default;
+$chart-colour-1-hover: map.get($wider-colours-hover, '3') !default;
+$chart-colour-2-hover: map.get($wider-colours-hover, '4') !default;
+$chart-colour-3-hover: map.get($wider-colours-hover, '5') !default;
+$chart-colour-4-hover: map.get($wider-colours-hover, '6') !default;
+$chart-colour-5-hover: map.get($wider-colours-hover, '7') !default;
+$chart-colour-6-hover: map.get($wider-colours-hover, '8') !default;
+$chart-colour-7-hover: map.get($wider-colours-hover, '9') !default;
+$chart-colour-8-hover: map.get($wider-colours-hover, '10') !default;
+$chart-colour-9-hover: map.get($wider-colours-hover, '11') !default;
+$chart-colour-10-hover: map.get($wider-colours-hover, '12') !default;
 
 $chart-colors-hover: ();
-$chart-colors-hover: map-merge(
+$chart-colors-hover: map.merge(
   (
     1: $chart-colour-1-hover,
     2: $chart-colour-2-hover,
@@ -76,9 +78,18 @@ $chart-height-lg: #{rem(200)} !default;
   --chart-colour-warning-hover: #ffb020 !important;
 }
 
-@for $i from 1 to 10 {
-  .chart__key .key:nth-child(10n - #{10 - $i}),
-  .chart__outer table tbody tr td:not(:first-child):nth-child(10n - #{10 - ($i+1)}) {
+@for $i from 1 to 11 {
+  .chart__key .key:nth-child(11n - #{11 - $i}),
+  .chart__outer table tbody tr td:not(:first-child):nth-child(11n - #{11 - ($i+1)}) {
+    --chart-colour: var(#{'--chart-colour-' + $i + '-set'});
+    --chart-colour-hover: var(#{'--chart-colour-' + $i + '-hover'});
+  }
+
+  .chart__outer
+    table
+    tbody
+    tr:nth-child(#{$i}):has(td:nth-child(2):last-child):not([data-colour]):not([data-colour-1])
+    td:nth-child(2) {
     --chart-colour: var(#{'--chart-colour-' + $i + '-set'});
     --chart-colour-hover: var(#{'--chart-colour-' + $i + '-hover'});
   }
@@ -102,11 +113,6 @@ $chart-height-lg: #{rem(200)} !default;
   font-weight: var(--chart-font-weight, bold);
   color: var(--chart-text-color, black);
 
-  > * {
-    display: block;
-    order: 2;
-  }
-
   // CSS vars that can be overwritten by declaring them without the -set on the end of the variable i.e. --chart-colour-1: red; would overwrite --chart-colour-1-set
   --body-colour-set: var(--body-colour, Canvas);
   --text-colour-set: var(--text-colour, black);
@@ -116,11 +122,6 @@ $chart-height-lg: #{rem(200)} !default;
 
   --chart-height-resp: var(--chart-height-set);
 
-  tbody {
-    --chart-direction: 360deg;
-    --chart-day-bg-pos: 100% calc(var(--single-day) * 7);
-  }
-
   // Non-configurable css vars
   --index-below: -1;
   --index-base: 0;
@@ -131,13 +132,22 @@ $chart-height-lg: #{rem(200)} !default;
   --index-overlay: 1000;
   --key-label-width: 100%;
   --label-size: #{rem(12)};
-  --pie-size: calc(50% - 1.4rem);
   --line-thickness: 1px;
   --yaxis-width: auto;
   --yaxis-point-display: block;
   --yaxis-last-point-transform: translate(0, -50%);
   --bar-gap: min(10%, 0.75rem);
 
+  > * {
+    display: block;
+    order: 2;
+  }
+
+  tbody {
+    --chart-direction: 360deg;
+    --chart-day-bg-pos: 100% calc(var(--single-day) * 7);
+  }
+
   @container (min-width: #{em($device-xs-width,16)}) {
     :has(tr:nth-child(5) td:nth-child(4)),
     :has(tr:nth-child(10)) {
@@ -149,7 +159,6 @@ $chart-height-lg: #{rem(200)} !default;
 
     .chart__wrapper {
       --chart-height-resp: var(--chart-height-lg-set);
-      --pie-size: calc(33.333% - 1.4rem);
       --line-thickness: 0.8px;
       --yaxis-width: auto;
       --yaxis-point-display: block;
@@ -164,7 +173,6 @@ $chart-height-lg: #{rem(200)} !default;
 
     .chart__wrapper {
       --label-size: #{rem(14)};
-      --pie-size: calc(25% - 1.5rem);
       --line-thickness: 0.5px;
     }
   }
@@ -199,13 +207,13 @@ $chart-height-lg: #{rem(200)} !default;
   }
 
   .key {
-    margin: 0;
+    margin: 0 !important;
 
     &:before {
       content: '';
       height: 0.8em;
       width: 0.8em;
-      margin-right: 0.3em;
+      margin-right: 0.3em !important;
       background-color: var(--chart-colour);
       display: inline-block;
       border-radius: var(--key-border-radius, 4px);
@@ -234,7 +242,7 @@ $chart-height-lg: #{rem(200)} !default;
   //opacity: 0.25;
 }
 
-@for $i from 1 to 10 {
+@for $i from 1 to 11 {
   .chart__outer > input[type='checkbox']:nth-of-type(#{$i}):not(:checked) ~ .chart__key .key:nth-of-type(#{$i}) {
     opacity: 0.25;
   }
@@ -361,6 +369,64 @@ $chart-height-lg: #{rem(200)} !default;
 }
 // #endregion
 
+// #region tooltip
+
+[part='popover'] {
+  //part="popover"
+  position: absolute;
+  top: var(--cursor-y, 50%);
+  left: var(--cursor-x, 50%);
+  font-size: var(--label-size);
+  line-height: 1.2;
+  background: var(--chart-details-bg, var(--colour-canvas-2, Canvas));
+  opacity: 0;
+  pointer-events: none;
+  padding: 0.5rem;
+  border-radius: 0.5rem;
+  margin-bottom: 0.25rem;
+  display: block;
+  //color: var(--colour-primary-theme);
+  white-space: pre;
+  text-align: left;
+  box-shadow: var(--chart-details-shadow, 0 #{rem(2)} #{rem(12)} rgba(0, 0, 0, 0.25));
+  transform: translate(-50%, -100%);
+
+  &::before {
+    content: attr(data-group) '\A';
+  }
+
+  &[data-label]::before {
+    content: attr(data-group) '\A' attr(data-label) '\A';
+  }
+
+  &:has(:is(a, button)) {
+    top: 0;
+    left: 50%;
+    transform: translate(-50%, -100%);
+    font-size: 0.9rem;
+  }
+
+  hr {
+    margin: 0;
+    opacity: 0;
+  }
+  :is(a, button) {
+    display: inline-block !important;
+    clear: both !important;
+    float: left !important;
+    margin-top: 1rem !important;
+    margin-right: 1rem !important;
+    margin-bottom: 0.25em !important;
+    font-size: 1em !important;
+  }
+
+  :is(a, button) + :is(a, button) {
+    margin-top: 0 !important;
+  }
+}
+
+// #endregion
+
 // #region Default column chart (Also applies to line chart)
 .chart__wrapper {
   display: block;
@@ -455,15 +521,15 @@ $chart-height-lg: #{rem(200)} !default;
         padding: 0;
         background: var(--chart-colour);
 
+        border-top-right-radius: 4px;
+        border-top-left-radius: 4px;
+
         & {
           @media screen and (prefers-color-scheme: dark) {
             background: color-mix(in oklab, var(--chart-colour), black 20%);
           }
         }
 
-        border-top-right-radius: 4px;
-        border-top-left-radius: 4px;
-
         &:hover {
           background: var(--chart-colour-hover);
         }
@@ -477,37 +543,10 @@ $chart-height-lg: #{rem(200)} !default;
           display: none;
         }
 
-        span {
-          //part="popover"
-          position: absolute;
-          top: var(--cursor-y, 50%);
-          left: var(--cursor-x, 50%);
-          font-size: var(--label-size);
-          line-height: 1.2;
-          transform: translate(-50%, 0);
-          background: var(--chart-details-bg, var(--colour-canvas-2, Canvas));
-          opacity: 0;
-          pointer-events: none;
-          padding: 0.5rem;
-          border-radius: 0.5rem;
-          margin-bottom: 0.25rem;
-          //color: var(--colour-primary-theme);
-          white-space: pre;
-          text-align: left;
-          box-shadow: var(--chart-details-shadow, 0 #{rem(2)} #{rem(12)} rgba(0, 0, 0, 0.25));
-          transform: translate(-50%, -100%);
-
-          &::before {
-            content: attr(data-group) '\A';
-          }
-          &[data-label]::before {
-            content: attr(data-group) '\A' attr(data-label) '\A';
-          }
-        }
-
-        &:hover span {
+        &:hover [part='popover'] {
           opacity: 1;
           z-index: var(--index-above);
+          pointer-events: all;
         }
       }
 
@@ -623,3 +662,22 @@ $chart-height-lg: #{rem(200)} !default;
   }
 }
 // #endregion
+
+// #region Hide data sets
+.chart__outer > input[type='checkbox']:not(:checked) ~ .chart__wrapper table tbody tr td:not(:first-child) {
+  //display: none;
+}
+
+@for $i from 1 to 11 {
+  .chart__outer
+    > input[type='checkbox']:nth-of-type(#{$i}):not(:checked)
+    ~ .chart__wrapper
+    table
+    tbody
+    tr
+    td:not(:first-child):nth-child(#{$i + 1}) {
+    display: none;
+    opacity: 0;
+  }
+}
+// #endregion

package/assets/sass/components/charts.scss

@@ -1,3 +1,5 @@
+@use 'sass:map';
+
 @use '../_func' as *;
 
 $chart-colour-1: #1ebee6 !default;
@@ -12,7 +14,7 @@ $chart-colour-9: #9d9d9d !default;
 $chart-colour-10: #66838a !default;
 
 $chart-colors: ();
-$chart-colors: map-merge(
+$chart-colors: map.merge(
   (
     1: $chart-colour-1,
     2: $chart-colour-2,
@@ -68,16 +70,6 @@ $pie-chart: 'input[type="radio"]:not([value="none"]):is([value="pie"],[value="po
   --chart-height-set: var(--chart-height, #{$chart-height});
   --chart-height-lg-set: var(--chart-height-lg, #{$chart-height-lg});
   --chart-height-resp: var(--chart-height-set);
-
-  tbody {
-    --chart-direction: 360deg;
-    --chart-day-bg-pos: 100% calc(var(--single-day) * 7);
-  }
-
-  @each $index, $value in $chart-colors {
-    --chart-colour-#{$index}-set: var(--chart-colour-#{$index}, #{$value});
-  }
-
   // Non-configurable css vars
   --index-below: -1;
   --index-base: 0;
@@ -95,6 +87,46 @@ $pie-chart: 'input[type="radio"]:not([value="none"]):is([value="pie"],[value="po
   --yaxis-last-point-transform: translate(0, -50%);
   --bar-gap: min(10%, 0.75rem);
 
+  margin-bottom: 2rem;
+  display: flex;
+  flex-direction: column;
+
+  @each $index, $value in $chart-colors {
+    --chart-colour-#{$index}-set: var(--chart-colour-#{$index}, #{$value});
+  }
+
+  tbody {
+    --chart-direction: 360deg;
+    --chart-day-bg-pos: 100% calc(var(--single-day) * 7);
+  }
+
+  &:has(.chart__options) {
+    position: relative;
+    padding-top: rem(24);
+  }
+
+  > * {
+    display: block;
+    order: 2;
+  }
+
+  > figcaption {
+    display: contents;
+
+    p:not(.chart__strapline, .chart__title) {
+      margin-bottom: 0.25rem;
+      font-size: var(--label-size);
+    }
+
+    > * {
+      order: 3;
+    }
+
+    > :is(.chart__title, .chart__strapline) {
+      order: 1;
+    }
+  }
+
   @container (max-width: 36em) {
     :has(tr:nth-child(5) td:nth-child(4)),
     :has(tr:nth-child(10)) {
@@ -127,37 +159,6 @@ $pie-chart: 'input[type="radio"]:not([value="none"]):is([value="pie"],[value="po
       --line-thickness: 0.5px;
     }
   }
-
-  &:has(.chart__options) {
-    position: relative;
-    padding-top: rem(24);
-  }
-
-  margin-bottom: 2rem;
-  display: flex;
-  flex-direction: column;
-
-  > * {
-    display: block;
-    order: 2;
-  }
-
-  > figcaption {
-    display: contents;
-
-    p:not(.chart__strapline, .chart__title) {
-      margin-bottom: 0.25rem;
-      font-size: var(--label-size);
-    }
-
-    > * {
-      order: 3;
-    }
-
-    > :is(.chart__title, .chart__strapline) {
-      order: 1;
-    }
-  }
 }
 // #endregion