style playing

lineupjs · Dec 14, 2018 · e1c7aec · e1c7aec
1 parent 7d82ac7
commit e1c7aec
Show file tree

Hide file tree

Showing 4 changed files with 97 additions and 32 deletions.
diff --git a/src/renderer/AggregateGroupRenderer.ts b/src/renderer/AggregateGroupRenderer.ts
@@ -1,7 +1,7 @@
 import {IDataRow, IGroup, IGroupMeta} from '../model';
 import AggregateGroupColumn from '../model/AggregateGroupColumn';
 import Column from '../model/Column';
-import {AGGREGATE, CANVAS_HEIGHT, cssClass} from '../styles';
+import {AGGREGATE, CANVAS_HEIGHT} from '../styles';
 import {default as IRenderContext, ICellRendererFactory} from './interfaces';
 
 /** @internal */

diff --git a/src/styles/renderer/_aggregate.scss b/src/styles/renderer/_aggregate.scss
@@ -4,24 +4,8 @@
 .#{$lu_css_prefix}-renderer-aggregate {
   text-align: center;
   overflow-x: unset;
-
-  // &::after {
-  //   // content: '';
-  //   position: absolute;
-  //   pointer-events: none;
-  //   top: -2px; // FIXME right padding
-  //   width: $lu_aggregate_square_bracket_width;
-  //   right: 0;
-  //   bottom: 0;
-  //   border-left: $lu_aggregate_square_bracket_stroke_width solid $lu_aggregate_square_bracket_stroke_color;
-  //   box-sizing: border-box;
-  // }
 }
 
-// .#{$lu_css_prefix}-renderer-aggregate.#{$lu_css_prefix}-low::after {
-//   content: unset;
-// }
-
 .#{$lu_css_prefix}-renderer-aggregate[data-meta~=first] {
 
   > :first-child {
@@ -46,11 +30,6 @@
       padding-right: $lu_aggregate_square_bracket_width;
     }
   }
-
-  // &::after {
-  //   top: 0;
-  //   border-top: $lu_aggregate_square_bracket_stroke_width solid $lu_aggregate_square_bracket_stroke_color;
-  // }
 }
 
 .#{$lu_css_prefix}-renderer-aggregate[data-meta='first last'] {
@@ -69,6 +48,95 @@
   }
 }
 
+
+.#{$lu_css_prefix}-summary.#{$lu_css_prefix}-renderer-aggregate {
+  font-size: medium;
+
+  > :last-child {
+    display: none;
+  }
+}
+
+.#{$lu_css_prefix}-renderer-aggregate[data-meta='inner'] {
+  &::before {
+    content: '';
+    position: absolute;
+    pointer-events: none;
+    top: 50%;
+    width: $lu_aggregate_square_bracket_width;
+    left: 50%;
+    margin-left: -2px;
+    height: 1px;
+    border-bottom: $lu_aggregate_square_bracket_stroke_width solid $lu_aggregate_square_bracket_stroke_color;
+    box-sizing: border-box;
+  }
+
+  &::after {
+    content: '';
+    position: absolute;
+    pointer-events: none;
+    top: -2px; // FIXME right padding
+    width: $lu_aggregate_square_bracket_width;
+    left: 50%;
+    margin-left: -2px;
+    bottom: 0;
+    border-left: $lu_aggregate_square_bracket_stroke_width solid $lu_aggregate_square_bracket_stroke_color;
+    box-sizing: border-box;
+  }
+}
+
+.#{$lu_css_prefix}-renderer-aggregate[data-meta='last'] {
+  &::before {
+    content: '';
+    position: absolute;
+    pointer-events: none;
+    top: -2px;
+    width: $lu_aggregate_square_bracket_width;
+    left: 50%;
+    margin-left: -2px;
+    bottom: 50%;
+    border-left: $lu_aggregate_square_bracket_stroke_width solid $lu_aggregate_square_bracket_stroke_color;
+    border-bottom: $lu_aggregate_square_bracket_stroke_width solid $lu_aggregate_square_bracket_stroke_color;
+    box-sizing: border-box;
+  }
+}
+
+// .#{$engine-css_prefix}-tr[data-meta~='first'] {
+//   border-top: $lu_aggregate_square_bracket_stroke_width solid $lu_aggregate_square_bracket_stroke_color;
+//   border-left: $lu_aggregate_square_bracket_stroke_width solid $lu_aggregate_square_bracket_stroke_color;
+//   border-right: $lu_aggregate_square_bracket_stroke_width solid $lu_aggregate_square_bracket_stroke_color;
+// }
+
+// .#{$engine-css_prefix}-tr[data-meta~='last'] {
+//   border-bottom: $lu_aggregate_square_bracket_stroke_width solid $lu_aggregate_square_bracket_stroke_color;
+//   border-left: $lu_aggregate_square_bracket_stroke_width solid $lu_aggregate_square_bracket_stroke_color;
+//   border-right: $lu_aggregate_square_bracket_stroke_width solid $lu_aggregate_square_bracket_stroke_color;
+// }
+
+// .#{$engine-css_prefix}-tr[data-meta='inner'] {
+//   border-left: $lu_aggregate_square_bracket_stroke_width solid $lu_aggregate_square_bracket_stroke_color;
+//   border-right: $lu_aggregate_square_bracket_stroke_width solid $lu_aggregate_square_bracket_stroke_color;
+// }
+// &::after {
+//   // content: '';
+//   position: absolute;
+//   pointer-events: none;
+//   top: -2px; // FIXME right padding
+//   width: $lu_aggregate_square_bracket_width;
+//   right: 0;
+//   bottom: 0;
+//   border-left: $lu_aggregate_square_bracket_stroke_width solid $lu_aggregate_square_bracket_stroke_color;
+//   box-sizing: border-box;
+// }
+
+// .#{$lu_css_prefix}-renderer-aggregate.#{$lu_css_prefix}-low::after {
+//   content: unset;
+// }
+// &::after {
+//   top: 0;
+//   border-top: $lu_aggregate_square_bracket_stroke_width solid $lu_aggregate_square_bracket_stroke_color;
+// }
+
 // .#{$lu_css_prefix}-renderer-aggregate[data-meta=last] {
 //   &::after {
 //     border-bottom: $lu_aggregate_square_bracket_stroke_width solid $lu_aggregate_square_bracket_stroke_color;
@@ -92,12 +160,3 @@
 //   //   border-bottom: $lu_aggregate_square_bracket_stroke_width solid $lu_aggregate_square_bracket_stroke_color;
 //   // }
 // }
-
-
-.#{$lu_css_prefix}-summary.#{$lu_css_prefix}-renderer-aggregate {
-  font-size: medium;
-
-  > :last-child {
-    display: none;
-  }
-}
diff --git a/src/styles/renderer/_date.scss b/src/styles/renderer/_date.scss
@@ -1,6 +1,6 @@
 @import '../vars';
 
-.#{$lu_css_prefix}-td.#{$lu_css_prefix}-renderer-date {
+.#{$engine_css_prefix}-td.#{$lu_css_prefix}-renderer-date {
   display: flex;
   align-items: center;
 }
diff --git a/src/ui/EngineRanking.ts b/src/ui/EngineRanking.ts
@@ -561,7 +561,13 @@ export default class EngineRanking extends ACellTableSection<RenderColumn> imple
     const isGroup = this.renderCtx.isGroup(rowIndex);
 
     if (isGroup) {
+      const {meta} = this.renderCtx.getGroup(rowIndex);
       node.dataset.agg = 'group';
+      if (!meta) {
+        delete node.dataset.meta;
+      } else {
+        node.dataset.meta = meta;
+      }
       super.createRow(node, rowIndex);
       return;
     }