fix regex

lineupjs · Feb 11, 2019 · 8c98cdf · 8c98cdf
1 parent bb1f3c0
commit 8c98cdf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/renderer/AAggregatedGroupRenderer.ts b/src/renderer/AAggregatedGroupRenderer.ts
@@ -19,11 +19,11 @@ export abstract class AAggregatedGroupRenderer<T extends Column> implements ICel
   createGroup(col: T, context: IRenderContext, imposer?: IImposer): IGroupCellRenderer {
     const single = this.create(col, context, imposer);
     return {
-      template: `<div>${single.template}</div>`,
+      template: single.template,
       update: (node: HTMLElement, group: IOrderedGroup) => {
         return context.tasks.groupRows(col, group, 'aagreated', (rows) => this.aggregatedIndex(rows, col)).then((data) => {
           if (typeof data !== 'symbol') {
-            single.update(<HTMLElement>node.firstElementChild!, data.row, data.index, group);
+            single.update(node, data.row, data.index, group);
           }
         });
       }

diff --git a/src/renderer/MultiLevelCellRenderer.ts b/src/renderer/MultiLevelCellRenderer.ts
@@ -41,9 +41,9 @@ export function createData(parent: {children: Column[]} & Column, context: IRend
     // inject data attributes
     template = template.replace(/^<([^ >]+)([ >])/, `<$1 data-column-id="${column.id}" data-renderer="${rendererId}"$2`);
     // inject classes
-    if (/^<([^ >]+)class="([ >])/.test(template)) {
+    if (/^<([^>]+) class="([ >]*)/.test(template)) {
       // has class attribute
-      template = template.replace(/^<([^ >]+)class="([ >])/, `<$1 class="${cssClass(`renderer-${rendererId}`)} $2`);
+      template = template.replace(/^<([^>]+) class="([ >]*)/, `<$1 class="${cssClass(`renderer-${rendererId}`)} $2`);
     } else {
       // inject as the others
       template = template.replace(/^<([^ >]+)([ >])/, `<$1 class="${cssClass(`renderer-${rendererId}`)}"$2`);
@@ -93,7 +93,7 @@ export default class MultiLevelCellRenderer extends AAggregatedGroupRenderer<IMu
         cols.forEach((col, ci) => {
           const weight = col.column.getWidth() / total;
           const cnode = children[ci];
-          cnode.classList.add(cssClass('stack-sub'), cssClass('detail'));
+          cnode.classList.add(cssClass(this.stacked ? 'stack-sub' : 'nested-sub'), cssClass('detail'));
           cnode.dataset.group = 'd';
           cnode.style.transform = stacked ? `translate(-${round((missingWeight / weight) * 100, 4)}%,0)` : null;
           cnode.style.gridColumnStart = (ci + 1).toString();
@@ -174,7 +174,7 @@ export default class MultiLevelCellRenderer extends AAggregatedGroupRenderer<IMu
         const children = <HTMLElement[]>Array.from(n.children);
         cols.forEach((col, ci) => {
           const cnode = children[ci];
-          cnode.classList.add(cssClass('stack-sub'), cssClass('group'));
+          cnode.classList.add(cssClass(this.stacked ? 'stack-sub' : 'nested-sub'), cssClass('group'));
           cnode.dataset.group = 'g';
           cnode.style.gridColumnStart = (ci + 1).toString();
           const r = col.groupRenderer!.update(cnode, group);