Fixed number formatting bugs

-Using whitespace as thousand separator created bad
 format.
-Percentage values always had two decimals.
-Percentage values weren't multiplied by 100.

Issue: QLIK-95907

.circleci/config.yml

@@ -20,7 +20,7 @@ jobs:
           command: npm install
       - run:
           name: BlackDuck scan
-          command: curl -s https://detect.synopsys.com/detect.sh | bash -s -- \
+          command: curl -s https://blackducksoftware.github.io/hub-detect/hub-detect.sh | bash -s -- \
             --blackduck.url="https://qliktech.blackducksoftware.com" \
             --blackduck.trust.cert=true \
             --blackduck.username="svc-blackduck" \

README.md

@@ -1,22 +1,52 @@
 # P&L Smart Pivot, a Qlik Sense Extension for Financial reporting
-This extension is part of the extension bundles for Qlik Sense. The repository is maintained and moderated by Qlik RD.
+[![CircleCI](https://circleci.com/gh/qlik-oss/PLSmartPivot.svg?style=svg)](https://circleci.com/gh/qlik-oss/PLSmartPivot)
 
-Feel free to fork and suggest pull requests for improvements and bug fixes. Changes will be moderated and reviewed before inclusion in future bundle versions. Please note that emphasis is on backward compatibility, i.e. breaking changes will most likely not be approved.
+This extension is useful to create reports where the look&feel is rellevantand and pivot a second dimension is needed. Based on P&L Smart.
+
+It's specifically focused on financial reports, trying to solve some common needs of this area:
+- smart export to excel
+- easy creation of reports
+- custom corporate reporting (bold, italic, background color, letter size, headers,...)
+- selections inside the reports
+- custom external templates
+- analytical reports
+
+
+# Manual
+You'll find a manual [Qlik Sense P&LSmart Pivot Extension Manual.pdf](resources/Qlik Sense P&LSmart Pivot Extension Manual.pdf) and one app example [P&LSmartPivot_demo.qvf](resources/P&LSmartPivot_demo.qvf).
+
+
+# Installation
+
+1. Download the extension zip, `qlik-smart-pivot_<version>.zip`, from the latest release(https://github.com/qlik-oss/PLSmartPivot/releases/latest)
+2. Install the extension:
+
+   a. **Qlik Sense Desktop**: unzip to a directory under [My Documents]/Qlik/Sense/Extensions.
+
+   b. **Qlik Sense Server**: import the zip file in the QMC.
 
-Usage documentation for the extension is available at https://help.qlik.com.
 
 # Developing the extension
+
 If you want to do code changes to the extension follow these simple steps to get going.
 
 1. Get Qlik Sense Desktop
-1. Create a new app and add P&L pivot to a sheet.
+1. Create a new app and add the extension to a sheet.
 2. Clone the repository
 3. Run `npm install`
-4. Run `npm run build` - to build a dev-version to the /dist folder.
-5. Move the content of the /dist folder to the extension directory. Usually in `C:/Users/<user>/Documents/Qlik/Sense/Extensions/qlik-smart-pivot`.
+4. Set the environment variable `BUILD_PATH` to your extensions directory. It will be something like `C:/Users/<user>/Documents/Qlik/Sense/Extensions/<extension_name>`.
+5. You now have two options. Either run the watch task or the build task. They are explained below. Both of them default to development mode but can be run in production by setting `NODE_ENV=production` before running the npm task.
+
+   a. **Watch**: `npm run watch`. This will start a watcher which will rebuild the extension and output all needed files to the `buildFolder` for each code change you make. See your changes directly in your Qlik Sense app.
+
+   b. **Build**: `npm run build`. If you want to build the extension package. The output zip-file can be found in the `buildFolder`.
+
 
 # Original authors
+
 [github.com/iviasensio](https://github.com/iviasensio)
 
+
 # License
-Released under the [MIT License](LICENSE).
+
+Released under the [MIT License](LICENSE).

src/data-table/data-cell.jsx

@@ -1,5 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { ApplyPreMask } from '../masking';
+import { addSeparators } from '../utilities';
 import Tooltip from '../tooltip/index.jsx';
 
 class DataCell extends React.PureComponent {
@@ -9,33 +11,23 @@ class DataCell extends React.PureComponent {
   }
 
   handleSelect () {
-    const {
-      data: {
-        meta: {
-          dimensionCount
-        }
-      },
-      general: {
-        allowFilteringByClick
-      },
-      measurement,
-      component
-    } = this.props;
-
+    const { data: { meta: { dimensionCount } }, general: { allowFilteringByClick }, measurement, qlik } = this.props;
     const hasSecondDimension = dimensionCount > 1;
     if (!allowFilteringByClick) {
       return;
     }
 
-    component.backendApi.selectValues(0, [measurement.parents.dimension1.elementNumber], false);
+    qlik.backendApi.selectValues(0, [measurement.parents.dimension1.elementNumber], true);
+
     if (hasSecondDimension) {
-      component.backendApi.selectValues(1, [measurement.parents.dimension2.elementNumber], false);
+      qlik.backendApi.selectValues(1, [measurement.parents.dimension2.elementNumber], true);
     }
   }
 
   render () {
     const {
-      cellWidth,
+      data,
+      general,
       measurement,
       styleBuilder,
       styling
@@ -47,16 +39,17 @@ class DataCell extends React.PureComponent {
       fontFamily: styling.options.fontFamily,
       ...styleBuilder.getStyle(),
       paddingLeft: '5px',
-      textAlign: textAlignment,
-      minWidth: cellWidth,
-      maxWidth: cellWidth
+      textAlign: textAlignment
     };
 
     const isEmptyCell = measurement.displayValue === '';
+    const isColumnPercentageBased = (/%/).test(measurement.format);
     let formattedMeasurementValue;
-    if (isEmptyCell || styleBuilder.hasComments()) {
+    if (isEmptyCell) {
       formattedMeasurementValue = '';
       cellStyle.cursor = 'default';
+    } else if (styleBuilder.hasComments()) {
+      formattedMeasurementValue = '.';
     } else {
       formattedMeasurementValue = formatMeasurementValue(measurement, styling);
     }
@@ -77,9 +70,16 @@ class DataCell extends React.PureComponent {
       }
     }
 
+    let cellClass = 'grid-cells';
+    const hasTwoDimensions = data.headers.dimension2 && data.headers.dimension2.length > 0;
+    const shouldUseSmallCells = isColumnPercentageBased && data.headers.measurements.length > 1 && hasTwoDimensions;
+    if (shouldUseSmallCells) {
+      cellClass = 'grid-cells-small';
+    }
+
     return (
       <td
-        className="grid-cells"
+        className={`${cellClass}${general.cellSuffix}`}
         onClick={isEmptyCell ? null : this.handleSelect}
         style={cellStyle}
       >
@@ -95,22 +95,20 @@ class DataCell extends React.PureComponent {
 }
 
 DataCell.propTypes = {
-  cellWidth: PropTypes.string.isRequired,
   data: PropTypes.shape({
     headers: PropTypes.shape({
       measurements: PropTypes.array.isRequired
-    }).isRequired,
-    meta: PropTypes.shape({
-      dimensionCount: PropTypes.number.isRequired
     }).isRequired
   }).isRequired,
-  general: PropTypes.shape({}).isRequired,
+  general: PropTypes.shape({
+    cellSuffix: PropTypes.string.isRequired
+  }).isRequired,
   measurement: PropTypes.shape({
     format: PropTypes.string,
     name: PropTypes.string,
     value: PropTypes.any
   }).isRequired,
-  component: PropTypes.shape({
+  qlik: PropTypes.shape({
     backendApi: PropTypes.shape({
       selectValues: function (props, propName) {
         if (props.isSnapshot || typeof props[propName] === 'function') {
@@ -135,7 +133,47 @@ function formatMeasurementValue (measurement, styling) {
     return styling.symbolForNulls;
   }
 
-  return measurement.displayValue;
+  const isColumnPercentageBased = (/%/).test(measurement.format);
+  let formattedMeasurementValue = '';
+  if (isColumnPercentageBased) {
+    formattedMeasurementValue = ApplyPreMask(measurement.format, measurement.value * 100);
+  } else {
+    let magnitudeDivider;
+    switch (measurement.magnitude.toLowerCase()) {
+      case 'k':
+        magnitudeDivider = 1000;
+        break;
+      case 'm':
+        magnitudeDivider = 1000000;
+        break;
+      default:
+        magnitudeDivider = 1;
+        break;
+    }
+    const formattingStringWithoutMagnitude = measurement.format.replace(/k|K|m|M|/gi, '');
+    switch (formattingStringWithoutMagnitude) {
+      case '#.##0':
+        formattedMeasurementValue
+          = addSeparators((measurement.value / magnitudeDivider), '.', ',', 0);
+        break;
+      case '#,##0':
+        formattedMeasurementValue
+          = addSeparators((measurement.value / magnitudeDivider), ',', '.', 0);
+        break;
+      case '# ##0':
+      case '# ##0':
+        formattedMeasurementValue
+          = addSeparators((measurement.value / magnitudeDivider), ' ', '.', 0);
+        break;
+      default:
+        formattedMeasurementValue = ApplyPreMask(
+          formattingStringWithoutMagnitude,
+          (measurement.value / magnitudeDivider)
+        );
+        break;
+    }
+  }
+  return formattedMeasurementValue;
 }
 
 function getConditionalColor (measurement, conditionalColoring) {

src/data-table/index.jsx

@@ -5,143 +5,101 @@ import DataCell from './data-cell.jsx';
 import RowHeader from './row-header.jsx';
 import { injectSeparators } from '../utilities';
 
-// eslint-disable-next-line react/prefer-stateless-function
-class DataTable extends React.PureComponent {
-  render () {
-    const {
-      cellWidth,
-      columnSeparatorWidth,
-      component,
-      data,
-      general,
-      renderData,
-      styling
-    } = this.props;
+const DataTable = ({ data, general, qlik, renderData, styling }) => {
+  const {
+    headers: {
+      dimension1,
+      measurements
+    },
+    matrix
+  } = data;
 
-    const {
-      headers: {
-        dimension1,
-        dimension2,
-        measurements
-      },
-      matrix
-    } = data;
-
-    const separatorStyle = {
-      minWidth: columnSeparatorWidth,
-      maxWidth: columnSeparatorWidth
-    };
-
-    const renderMeasurementData = (dimIndex, atEvery) => {
-      const injectSeparatorsArray = injectSeparators(
-        matrix[dimIndex],
-        columnSeparatorWidth,
-        atEvery
-      );
-
-      if (dimension2.length <= 0) {
-        return injectSeparatorsArray;
-      }
-
-      let measurementDataRow = [],
-        index = 0;
-      dimension2.forEach((dim2) => {
-        measurements.forEach((measure) => {
-          for (index = 0; index < injectSeparatorsArray.length; index++) {
-            if (dimension1[dimIndex].displayValue === injectSeparatorsArray[index].parents.dimension1.header) {
-              if (dim2.displayValue === injectSeparatorsArray[index].parents.dimension2.header) {
-                if (measure.name === injectSeparatorsArray[index].parents.measurement.header) {
-                  measurementDataRow.push(injectSeparatorsArray[index]);
-                  break;
-                }
-              }
+  return (
+    <div className="row-wrapper">
+      <table>
+        <tbody>
+          {dimension1.map((dimensionEntry, dimensionIndex) => {
+            const rowHeaderText = dimensionEntry.displayValue || '';
+            if (rowHeaderText === '-') {
+              return null;
             }
-          }
-        });
-      });
-      return measurementDataRow;
-    };
+            const styleBuilder = new StyleBuilder(styling);
+            if (styling.hasCustomFileStyle) {
+              styleBuilder.parseCustomFileStyle(rowHeaderText);
+            } else {
+              styleBuilder.applyStandardAttributes(dimensionIndex);
+              styleBuilder.applyCustomStyle({
+                fontSize: `${14 + styling.options.fontSizeAdjustment}px`
+              });
+            }
+            const rowStyle = {
+              fontFamily: styling.options.fontFamily,
+              width: '230px',
+              ...styleBuilder.getStyle()
+            };
 
-    return (
-      <div className="row-wrapper">
-        <table>
-          <tbody>
-            {dimension1.map((dimensionEntry, dimensionIndex) => {
-              const rowHeaderText = dimensionEntry.displayValue || '';
-              if (rowHeaderText === '-') {
-                return null;
-              }
-              const styleBuilder = new StyleBuilder(styling);
-              if (styling.hasCustomFileStyle) {
-                styleBuilder.parseCustomFileStyle(rowHeaderText);
-              } else {
-                styleBuilder.applyStandardAttributes(dimensionIndex);
-                styleBuilder.applyCustomStyle({
-                  fontSize: `${14 + styling.options.fontSizeAdjustment}px`
-                });
-              }
-              const rowStyle = {
-                fontFamily: styling.options.fontFamily,
-                width: '230px',
-                ...styleBuilder.getStyle()
-              };
+            return (
+              <tr key={dimensionEntry.displayValue}>
+                {!renderData ?
+                  <RowHeader
+                    entry={dimensionEntry}
+                    qlik={qlik}
+                    rowStyle={rowStyle}
+                    styleBuilder={styleBuilder}
+                    styling={styling}
+                  /> : null
+                }
+                {renderData && injectSeparators(
+                  matrix[dimensionIndex],
+                  styling.useSeparatorColumns,
+                  { atEvery: measurements.length }
+                ).map((measurementData, index) => {
+                  if (measurementData.isSeparator) {
+                    const separatorStyle = {
+                      color: 'white',
+                      fontFamily: styling.options.fontFamily,
+                      fontSize: `${12 + styling.options.fontSizeAdjustment}px`
+                    };
 
-              return (
-                <tr key={dimensionEntry.displayValue}>
-                  {!renderData ?
-                    <RowHeader
-                      component={component}
-                      entry={dimensionEntry}
-                      rowStyle={rowStyle}
+                    return (
+                      <td
+                        className="empty"
+                        key={`${dimensionEntry.displayValue}-${index}-separator`}
+                        style={separatorStyle}
+                      >
+                        *
+                      </td>
+                    );
+                  }
+
+                  const { dimension1: dimension1Info, dimension2, measurement } = measurementData.parents;
+                  const id = `${dimension1Info.elementNumber}-${dimension2 && dimension2.elementNumber}-${measurement.header}`;
+                  return (
+                    <DataCell
+                      data={data}
+                      general={general}
+                      key={`${dimensionEntry.displayValue}-${id}`}
+                      measurement={measurementData}
+                      qlik={qlik}
                       styleBuilder={styleBuilder}
                       styling={styling}
-                    /> : null
-                  }
-                  {renderData && renderMeasurementData(dimensionIndex, { atEvery: measurements.length }).map((measurementData, index) => {
-                    if (measurementData.isSeparator) {
-                      return (
-                        <td
-                          className="empty"
-                          key={`${dimensionEntry.displayValue}-${index}-separator`}
-                          style={separatorStyle}
-                        />
-                      );
-                    }
-
-                    // eslint-disable-next-line no-shadow
-                    const { dimension1: dimension1Info, dimension2, measurement } = measurementData.parents;
-                    const id = `${dimension1Info.elementNumber}-${dimension2 && dimension2.elementNumber}-${measurement.header}-${measurement.index}`;
-                    return (
-                      <DataCell
-                        cellWidth={cellWidth}
-                        component={component}
-                        data={data}
-                        general={general}
-                        key={`${dimensionEntry.displayValue}-${id}`}
-                        measurement={measurementData}
-                        styleBuilder={styleBuilder}
-                        styling={styling}
-                      />
-                    );
-                  })}
-                </tr>
-              );
-            })}
-          </tbody>
-        </table>
-      </div>
-    );
-  }
-}
+                    />
+                  );
+                })}
+              </tr>
+            );
+          })}
+        </tbody>
+      </table>
+    </div>
+  );
+};
 
 DataTable.defaultProps = {
   renderData: true
 };
 
 DataTable.propTypes = {
-  cellWidth: PropTypes.string.isRequired,
-  columnSeparatorWidth: PropTypes.string.isRequired,
-  component: PropTypes.shape({}).isRequired,
   data: PropTypes.shape({
     headers: PropTypes.shape({
       dimension1: PropTypes.array.isRequired
@@ -149,6 +107,7 @@ DataTable.propTypes = {
     matrix: PropTypes.arrayOf(PropTypes.array.isRequired).isRequired
   }).isRequired,
   general: PropTypes.shape({}).isRequired,
+  qlik: PropTypes.shape({}).isRequired,
   renderData: PropTypes.bool,
   styling: PropTypes.shape({
     hasCustomFileStyle: PropTypes.bool.isRequired

src/data-table/row-header.jsx

@@ -11,13 +11,13 @@ class RowHeader extends React.PureComponent {
   }
 
   handleSelect () {
-    const { component, entry } = this.props;
-    component.backendApi.selectValues(0, [entry.elementNumber], false);
+    const { entry, qlik } = this.props;
+    qlik.backendApi.selectValues(0, [entry.elementNumber], true);
   }
 
   render () {
-    const { entry, rowStyle, styleBuilder, styling, component } = this.props;
-    const inEditState = component.inEditState();
+    const { entry, rowStyle, styleBuilder, styling, qlik } = this.props;
+    const inEditState = qlik.inEditState();
 
     return (
       <td
@@ -43,10 +43,9 @@ class RowHeader extends React.PureComponent {
 
 RowHeader.propTypes = {
   entry: PropTypes.shape({
-    displayValue: PropTypes.string.isRequired,
-    elementNumber: PropTypes.number.isRequired
+    displayValue: PropTypes.string.isRequired
   }).isRequired,
-  component: PropTypes.shape({
+  qlik: PropTypes.shape({
     backendApi: PropTypes.shape({
       selectValues: function (props, propName) {
         if (props.isSnapshot || typeof props[propName] === 'function') {

src/dataset.js

@@ -6,25 +6,23 @@ function createCube (definition, app) {
   });
 }
 
-async function buildDataCube (originCubeDefinition, originCube, app) {
+async function buildDataCube (originCubeDefinition, hasTwoDimensions, app) {
   const cubeDefinition = {
     ...originCubeDefinition,
     qInitialDataFetch: [
       {
-        qHeight: originCube.qSize.qcy,
-        qWidth: originCube.qSize.qcx
+        qHeight: 1000,
+        qWidth: 10
       }
     ],
     qDimensions: [originCubeDefinition.qDimensions[0]],
     qMeasures: originCubeDefinition.qMeasures
   };
-  if (originCube.qDimensionInfo.length === 2) {
+  if (hasTwoDimensions) {
     cubeDefinition.qDimensions.push(originCubeDefinition.qDimensions[1]);
   }
   const cube = await createCube(cubeDefinition, app);
-  const cubeMatrix = cube.qHyperCube.qDataPages[0].qMatrix;
-  app.destroySessionObject(cube.qInfo.qId);
-  return cubeMatrix;
+  return cube.qHyperCube.qDataPages[0].qMatrix;
 }
 
 export async function initializeDataCube (component, layout) {
@@ -36,13 +34,11 @@ export async function initializeDataCube (component, layout) {
   const properties = (await component.backendApi.getProperties());
 
   // If this is a master object, fetch the hyperCubeDef of the original object
-  let hyperCubeDef = properties.qExtendsId
+  const hyperCubeDef = properties.qExtendsId
     ? (await app.getObjectProperties(properties.qExtendsId)).properties.qHyperCubeDef
     : properties.qHyperCubeDef;
-  hyperCubeDef = JSON.parse(JSON.stringify(hyperCubeDef));
-  hyperCubeDef.qStateName = layout.qStateName;
 
-  return buildDataCube(hyperCubeDef, layout.qHyperCube, app);
+  return buildDataCube(hyperCubeDef, layout.qHyperCube.qDimensionInfo.length === 2, app);
 }
 
 export function initializeDesignList (component, layout) {

src/definition/index.js

@@ -39,7 +39,7 @@ const definition = {
           component: 'text'
         },
         paragraph1: {
-          label: `P&L pivot is a Qlik Sense chart which allows you to display Profit & Loss
+          label: `P&L pivot is a Qlik Sense extension which allows you to display Profit & Loss
             reporting with color and font customizations.`,
           component: 'text'
         },

src/definition/table-format.js

@@ -209,33 +209,15 @@ const tableFormat = {
       ],
       defaultValue: 'right'
     },
-    FitChartWidth: {
-      ref: 'fitchartwidth',
-      type: 'boolean',
-      component: 'switch',
-      label: 'Fill chart width',
-      options: [
-        {
-          value: true,
-          label: 'On'
-        },
-        {
-          value: false,
-          label: 'Off'
-        }
-      ],
-      defaultValue: false
-    },
     ColumnWidthSlider: {
       type: 'number',
       component: 'slider',
       label: 'Column width',
       ref: 'columnwidthslider',
-      min: 20,
-      max: 250,
-      step: 10,
-      defaultValue: 50,
-      show: data => !data.fitchartwidth
+      min: 1,
+      max: 3,
+      step: 1,
+      defaultValue: 2
     },
     SymbolForNulls: {
       ref: 'symbolfornulls',

src/excel-export.js

@@ -7,12 +7,13 @@ function cleanupNodes (node) {
   });
 }
 
-function buildTableHTML (containerElement, title, subtitle, footnote) {
+function buildTableHTML (id, title, subtitle, footnote) {
   const titleHTML = `<p style="font-size:15pt"><b>${title}</b></p>`;
   const subtitleHTML = `<p style="font-size:11pt">${subtitle}</p>`;
   const footnoteHTML = `<p style="font-size:11pt">${footnote}</p>`;
-  const kpiTableClone = containerElement[0].querySelector('.kpi-table').cloneNode(true);
-  const dataTableClone = containerElement[0].querySelector('.data-table').cloneNode(true);
+  const container = document.querySelector(`[tid="${id}"]`);
+  const kpiTableClone = container.querySelector('.kpi-table').cloneNode(true);
+  const dataTableClone = container.querySelector('.data-table').cloneNode(true);
   cleanupNodes(kpiTableClone);
   cleanupNodes(kpiTableClone);
 
@@ -82,7 +83,7 @@ function buildTableHTML (containerElement, title, subtitle, footnote) {
 
 function downloadXLS (html) {
   const filename = 'analysis.xls';
-  const blobObject = new Blob([html], { type: 'application/vnd.ms-excel' });
+  const blobObject = new Blob([html]);
 
   // IE/Edge
   if (window.navigator.msSaveOrOpenBlob) {
@@ -99,8 +100,8 @@ function downloadXLS (html) {
   return true;
 }
 
-export function exportXLS (containerElement, title, subtitle, footnote) {
+export function exportXLS (id, title, subtitle, footnote) {
   // original was removing icon when starting export, disable and some spinner instead, shouldn't take enough time to warrant either..?
-  const table = buildTableHTML(containerElement, title, subtitle, footnote);
+  const table = buildTableHTML(id, title, subtitle, footnote);
   downloadXLS(table);
 }

src/export-button.jsx

@@ -0,0 +1,42 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { exportXLS } from './excel-export';
+
+class ExportButton extends React.PureComponent {
+  constructor (props) {
+    super(props);
+    this.handleExport = this.handleExport.bind(this);
+  }
+
+  handleExport () {
+    const { id, excelExport, general } = this.props;
+    const { title, subtitle, footnote } = general;
+    if (excelExport) {
+      exportXLS(id, title, subtitle, footnote);
+    }
+  }
+
+  render () {
+    const { excelExport } = this.props;
+    return excelExport === true && (
+      <input
+        className="icon-xls"
+        onClick={this.handleExport}
+        src="/Extensions/qlik-smart-pivot/Excel.png"
+        type="image"
+      />
+    );
+  }
+}
+
+ExportButton.defaultProps = {
+  excelExport: false
+};
+
+ExportButton.propTypes = {
+  id: PropTypes.string.isRequired,
+  excelExport: PropTypes.bool,
+  general: PropTypes.shape({}).isRequired
+};
+
+export default ExportButton;

src/headers-table/column-header.jsx

@@ -10,27 +10,25 @@ class ColumnHeader extends React.PureComponent {
   }
 
   handleSelect () {
-    const { component, entry } = this.props;
-    component.backendApi.selectValues(1, [entry.elementNumber], false);
+    const { entry, qlik } = this.props;
+    qlik.backendApi.selectValues(1, [entry.elementNumber], true);
   }
 
   render () {
-    const { baseCSS, cellWidth, colSpan, component, entry, styling } = this.props;
-    const inEditState = component.inEditState();
+    const { baseCSS, cellSuffix, colSpan, entry, styling, qlik } = this.props;
+    const inEditState = qlik.inEditState();
     const isMediumFontSize = styling.headerOptions.fontSizeAdjustment === HEADER_FONT_SIZE.MEDIUM;
 
     const style = {
       ...baseCSS,
       fontSize: `${14 + styling.headerOptions.fontSizeAdjustment}px`,
       height: isMediumFontSize ? '43px' : '33px',
-      verticalAlign: 'middle',
-      minWidth: cellWidth,
-      maxWidth: cellWidth
+      verticalAlign: 'middle'
     };
 
     return (
       <th
-        className="grid-cells"
+        className={`grid-cells2${cellSuffix}`}
         colSpan={colSpan}
         onClick={this.handleSelect}
         style={style}
@@ -48,14 +46,19 @@ class ColumnHeader extends React.PureComponent {
 }
 
 ColumnHeader.defaultProps = {
+  cellSuffix: '',
   colSpan: 1
 };
 
 ColumnHeader.propTypes = {
   baseCSS: PropTypes.shape({}).isRequired,
-  cellWidth: PropTypes.string.isRequired,
+  cellSuffix: PropTypes.string,
   colSpan: PropTypes.number,
-  component: PropTypes.shape({
+  entry: PropTypes.shape({
+    elementNumber: PropTypes.number.isRequired,
+    name: PropTypes.string.isRequired
+  }).isRequired,
+  qlik: PropTypes.shape({
     backendApi: PropTypes.shape({
       selectValues: function (props, propName) {
         if (props.isSnapshot || typeof props[propName] === 'function') {
@@ -65,10 +68,6 @@ ColumnHeader.propTypes = {
       }
     }).isRequired
   }).isRequired,
-  entry: PropTypes.shape({
-    displayValue: PropTypes.string.isRequired,
-    elementNumber: PropTypes.number.isRequired
-  }).isRequired,
   styling: PropTypes.shape({
     headerOptions: PropTypes.shape({
       fontSizeAdjustment: PropTypes.number.isRequired

src/headers-table/export-column-header.jsx

@@ -1,10 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import ExportButton from '../export-button.jsx';
 import { HEADER_FONT_SIZE } from '../initialize-transformed';
-import Tooltip from '../tooltip/index.jsx';
 
-const Dim1Header = ({ component, baseCSS, title, hasSecondDimension, styling }) => {
-  const inEditState = component.inEditState();
+const ExportColumnHeader = ({ id, baseCSS, general, title, allowExcelExport, hasSecondDimension, styling }) => {
   const rowSpan = hasSecondDimension ? 2 : 1;
   const isMediumFontSize = styling.headerOptions.fontSizeAdjustment === HEADER_FONT_SIZE.MEDIUM;
   const style = {
@@ -22,20 +21,21 @@ const Dim1Header = ({ component, baseCSS, title, hasSecondDimension, styling })
       rowSpan={rowSpan}
       style={style}
     >
-      <Tooltip
-        isTooltipActive={!inEditState}
-        styling={styling}
-        tooltipText={title}
-      >
-        {title}
-      </Tooltip>
+      <ExportButton
+        id={id}
+        excelExport={allowExcelExport}
+        general={general}
+      />
+      {title}
     </th>
   );
 };
 
-Dim1Header.propTypes = {
+ExportColumnHeader.propTypes = {
+  id: PropTypes.string.isRequired,
+  allowExcelExport: PropTypes.bool.isRequired,
   baseCSS: PropTypes.shape({}).isRequired,
-  component: PropTypes.shape({}).isRequired,
+  general: PropTypes.shape({}).isRequired,
   hasSecondDimension: PropTypes.bool.isRequired,
   styling: PropTypes.shape({
     headerOptions: PropTypes.shape({
@@ -45,4 +45,4 @@ Dim1Header.propTypes = {
   title: PropTypes.string.isRequired
 };
 
-export default Dim1Header;
+export default ExportColumnHeader;

src/headers-table/index.jsx

@@ -1,124 +1,124 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import Dim1Header from './dim1-header.jsx';
+import ExportColumnHeader from './export-column-header.jsx';
 import ColumnHeader from './column-header.jsx';
 import MeasurementColumnHeader from './measurement-column-header.jsx';
 import { injectSeparators } from '../utilities';
 
-class HeadersTable extends React.PureComponent {
-  render () {
-    const {
-      cellWidth,
-      columnSeparatorWidth,
-      component,
-      data,
-      isKpi,
-      styling
-    } = this.props;
+const HeadersTable = ({ data, general, qlik, styling, isKpi }) => {
+  const baseCSS = {
+    backgroundColor: styling.headerOptions.colorSchema,
+    color: styling.headerOptions.textColor,
+    fontFamily: styling.options.fontFamily,
+    textAlign: styling.headerOptions.alignment
+  };
 
-    const baseCSS = {
-      backgroundColor: styling.headerOptions.colorSchema,
-      color: styling.headerOptions.textColor,
-      fontFamily: styling.options.fontFamily,
-      textAlign: styling.headerOptions.alignment
-    };
+  const {
+    dimension1,
+    dimension2,
+    measurements
+  } = data.headers;
 
-    const {
-      dimension1,
-      dimension2,
-      measurements
-    } = data.headers;
+  const hasSecondDimension = dimension2.length > 0;
 
-    const hasSecondDimension = dimension2.length > 0;
+  return (
+    <div className="header-wrapper">
+      <table className="header">
+        <tbody>
+          <tr>
+            {isKpi ?
+              <ExportColumnHeader
+                id={qlik.options.id}
+                allowExcelExport={general.allowExcelExport}
+                baseCSS={baseCSS}
+                general={general}
+                hasSecondDimension={hasSecondDimension}
+                styling={styling}
+                title={dimension1[0].name}
+              /> : null
+            }
+            {!isKpi && !hasSecondDimension && measurements.map(measurementEntry => (
+              <MeasurementColumnHeader
+                baseCSS={baseCSS}
+                general={general}
+                hasSecondDimension={hasSecondDimension}
+                key={`${measurementEntry.displayValue}-${measurementEntry.name}`}
+                measurement={measurementEntry}
+                styling={styling}
+              />
+            ))}
+            {!isKpi && hasSecondDimension && injectSeparators(dimension2, styling.useSeparatorColumns).map((entry, index) => {
+              if (entry.isSeparator) {
+                const separatorStyle = {
+                  color: 'white',
+                  fontFamily: styling.options.fontFamily,
+                  fontSize: `${13 + styling.headerOptions.fontSizeAdjustment}px`
+                };
 
-    const separatorStyle = {
-      minWidth: columnSeparatorWidth,
-      maxWidth: columnSeparatorWidth
-    };
-
-    return (
-      <div className="header-wrapper">
-        <table className="header">
-          <tbody>
-            <tr>
-              {isKpi ?
-                <Dim1Header
-                  baseCSS={baseCSS}
-                  component={component}
-                  hasSecondDimension={hasSecondDimension}
-                  styling={styling}
-                  title={dimension1[0].name}
-                /> : null
+                return (
+                  <th
+                    className="empty"
+                    key={index}
+                    style={separatorStyle}
+                  >
+                    *
+                  </th>
+                );
               }
-              {!isKpi && !hasSecondDimension && measurements.map(measurementEntry => (
-                <MeasurementColumnHeader
+              return (
+                <ColumnHeader
                   baseCSS={baseCSS}
-                  cellWidth={cellWidth}
-                  hasSecondDimension={hasSecondDimension}
-                  key={`${measurementEntry.displayValue}-${measurementEntry.name}-${measurementEntry.index}`}
-                  measurement={measurementEntry}
+                  cellSuffix={general.cellSuffix}
+                  colSpan={measurements.length}
+                  entry={entry}
+                  key={entry.displayValue}
+                  qlik={qlik}
                   styling={styling}
                 />
-              ))}
-              {!isKpi && hasSecondDimension && injectSeparators(dimension2, columnSeparatorWidth).map((entry, index) => {
-                if (entry.isSeparator) {
+              );
+            })}
+          </tr>
+          {!isKpi && hasSecondDimension && (
+            <tr>
+              {injectSeparators(dimension2, styling.useSeparatorColumns).map((dimensionEntry, index) => {
+                if (dimensionEntry.isSeparator) {
+                  const separatorStyle = {
+                    color: 'white',
+                    fontFamily: styling.options.fontFamily,
+                    fontSize: `${12 + styling.headerOptions.fontSizeAdjustment}px`
+                  };
+
                   return (
                     <th
                       className="empty"
                       key={index}
                       style={separatorStyle}
-                    />
+                    >
+                      *
+                    </th>
                   );
                 }
-                return (
-                  <ColumnHeader
+                return measurements.map(measurementEntry => (
+                  <MeasurementColumnHeader
                     baseCSS={baseCSS}
-                    cellWidth={cellWidth}
-                    colSpan={measurements.length}
-                    component={component}
-                    entry={entry}
-                    key={entry.displayValue}
+                    dimensionEntry={dimensionEntry}
+                    general={general}
+                    hasSecondDimension={hasSecondDimension}
+                    key={`${measurementEntry.displayValue}-${measurementEntry.name}-${dimensionEntry.name}`}
+                    measurement={measurementEntry}
                     styling={styling}
                   />
-                );
+                ));
               })}
             </tr>
-            {!isKpi && hasSecondDimension && (
-              <tr>
-                {injectSeparators(dimension2, columnSeparatorWidth).map((dimensionEntry, index) => {
-                  if (dimensionEntry.isSeparator) {
-                    return (
-                      <th
-                        className="empty"
-                        key={index}
-                        style={separatorStyle}
-                      />
-                    );
-                  }
-                  return measurements.map(measurementEntry => (
-                    <MeasurementColumnHeader
-                      baseCSS={baseCSS}
-                      cellWidth={cellWidth}
-                      dimensionEntry={dimensionEntry}
-                      hasSecondDimension={hasSecondDimension}
-                      key={`${measurementEntry.displayValue}-${measurementEntry.name}-${measurementEntry.index}-${dimensionEntry.name}`}
-                      measurement={measurementEntry}
-                      styling={styling}
-                    />
-                  ));
-                })}
-              </tr>
-            )}
-          </tbody>
-        </table>
-      </div>
-    );
-  }
-}
+          )}
+        </tbody>
+      </table>
+    </div>
+  );
+};
 
 HeadersTable.propTypes = {
-  cellWidth: PropTypes.string.isRequired,
-  columnSeparatorWidth: PropTypes.string.isRequired,
   data: PropTypes.shape({
     headers: PropTypes.shape({
       dimension1: PropTypes.array,
@@ -126,7 +126,17 @@ HeadersTable.propTypes = {
       measurements: PropTypes.array
     })
   }).isRequired,
-  component: PropTypes.shape({}).isRequired,
+  general: PropTypes.shape({}).isRequired,
+  qlik: PropTypes.shape({
+    backendApi: PropTypes.shape({
+      selectValues: function (props, propName) {
+        if (props.isSnapshot || typeof props[propName] === 'function') {
+          return null;
+        }
+        return new Error('Missing implementation of qlik.backendApi.selectValues.');
+      }
+    }).isRequired
+  }).isRequired,
   styling: PropTypes.shape({
     headerOptions: PropTypes.shape({}),
     options: PropTypes.shape({})

src/headers-table/measurement-column-header.jsx

@@ -3,30 +3,28 @@ import PropTypes from 'prop-types';
 import { HEADER_FONT_SIZE } from '../initialize-transformed';
 import Tooltip from '../tooltip/index.jsx';
 
-const MeasurementColumnHeader = ({ baseCSS, cellWidth, hasSecondDimension, measurement, styling }) => {
-  const title = `${measurement.name}`;
+const MeasurementColumnHeader = ({ baseCSS, general, hasSecondDimension, measurement, styling }) => {
+  const title = `${measurement.name} ${measurement.magnitudeLabelSuffix}`;
   const { fontSizeAdjustment } = styling.headerOptions;
   const isMediumFontSize = fontSizeAdjustment === HEADER_FONT_SIZE.MEDIUM;
 
-  const cellStyle = {
-    ...baseCSS,
-    verticalAlign: 'middle',
-    minWidth: cellWidth,
-    maxWidth: cellWidth
-  };
-
   if (hasSecondDimension) {
     const isPercentageFormat = measurement.format.substring(measurement.format.length - 1) === '%';
     let baseFontSize = 14;
+    let cellClass = 'grid-cells2';
     if (isPercentageFormat) {
       baseFontSize = 13;
+      cellClass = 'grid-cells2-small';
     }
-    cellStyle.fontSize = `${baseFontSize + fontSizeAdjustment}px`;
-    cellStyle.height = isMediumFontSize ? '45px' : '35px';
-
+    const cellStyle = {
+      ...baseCSS,
+      fontSize: `${baseFontSize + fontSizeAdjustment}px`,
+      height: isMediumFontSize ? '45px' : '35px',
+      verticalAlign: 'middle'
+    };
     return (
       <th
-        className="grid-cells"
+        className={`${cellClass}${general.cellSuffix}`}
         style={cellStyle}
       >
         <Tooltip
@@ -39,12 +37,16 @@ const MeasurementColumnHeader = ({ baseCSS, cellWidth, hasSecondDimension, measu
     );
   }
 
-  cellStyle.fontSize = `${15 + fontSizeAdjustment}px`;
-  cellStyle.height = isMediumFontSize ? '90px' : '70px';
+  const style = {
+    ...baseCSS,
+    fontSize: `${15 + fontSizeAdjustment}px`,
+    height: isMediumFontSize ? '90px' : '70px',
+    verticalAlign: 'middle'
+  };
   return (
     <th
-      className="grid-cells"
-      style={cellStyle}
+      className={`grid-cells2${general.cellSuffix}`}
+      style={style}
     >
       <Tooltip
         tooltipText={title}
@@ -62,7 +64,9 @@ MeasurementColumnHeader.defaultProps = {
 
 MeasurementColumnHeader.propTypes = {
   baseCSS: PropTypes.shape({}).isRequired,
-  cellWidth: PropTypes.string.isRequired,
+  general: PropTypes.shape({
+    cellSuffix: PropTypes.string.isRequired
+  }).isRequired,
   hasSecondDimension: PropTypes.bool,
   measurement: PropTypes.shape({
     name: PropTypes.string.isRequired

src/index.js

@@ -1,8 +1,6 @@
 import definition from './definition';
-import { exportXLS } from './excel-export';
 import { initializeDataCube, initializeDesignList } from './dataset';
 import initializeStore from './store';
-import qlik from 'qlik';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import Root from './root.jsx';
@@ -13,6 +11,11 @@ if (!window._babelPolyfill) { // eslint-disable-line no-underscore-dangle
 }
 
 export default {
+  controller: [
+    '$scope',
+    '$timeout',
+    function controller () {}
+  ],
   design: {
     dimensions: {
       max: 1,
@@ -35,9 +38,6 @@ export default {
       uses: 'measures'
     }
   },
-  // Prevent conversion from and to this object
-  exportProperties: null,
-  importProperties: null,
   definition,
   initialProperties: {
     version: 1.0,
@@ -49,8 +49,7 @@ export default {
           qWidth: 10
         }
       ],
-      qMeasures: [],
-      qSuppressZero: false
+      qMeasures: []
     }
   },
   support: {
@@ -72,7 +71,7 @@ export default {
     const jsx = (
       <Root
         editmodeClass={editmodeClass}
-        component={this}
+        qlik={this}
         state={state}
       />
     );
@@ -87,26 +86,5 @@ export default {
     snapshotLayout.snapshotData.designList = await initializeDesignList(this, snapshotLayout);
     return snapshotLayout;
   },
-  getContextMenu: async function (obj, menu) {
-    const app = qlik.currApp(this);
-    const isPersonalResult = await app.global.isPersonalMode();
-    if (!this.$scope.layout.allowexportxls || (isPersonalResult && isPersonalResult.qReturn)) {
-      return menu;
-    }
-
-    menu.addItem({
-      translation: "Export as XLS",
-      tid: "export-excel",
-      icon: "export",
-      select: () => {
-        exportXLS(
-          this.$element,
-          this.$scope.layout.title,
-          this.$scope.layout.subtitle,
-          this.$scope.layout.footnote);
-      }
-    });
-    return menu;
-  },
   version: 1.0
 };

src/initialize-transformed.js

@@ -24,10 +24,40 @@ function getFontSizeAdjustment (option) {
   return fontSizeAdjustmentOptions[option] || 0;
 }
 
+function getCellSuffix (option) {
+  const cellSuffixOptions = {
+    1: '-s',
+    3: '-l'
+  };
+
+  return cellSuffixOptions[option] || '';
+}
+
+function getMeasurementFormat (measurement) {
+  if (measurement.qNumFormat.qType === 'U' || measurement.qNumFormat.qFmt === '##############') {
+    return '#.##0';
+  } else if (measurement.qNumFormat.qType === 'R') {
+    return measurement.qNumFormat.qFmt.replace(/(|)/gi, '');
+  }
+  return measurement.qNumFormat.qFmt;
+}
+
+function getMagnitudeLabelSuffix (magnitudeOption) {
+  const magnitudeLabelSuffixOptions = {
+    'k': ' (k)',
+    'm': ' (m)'
+  };
+
+  return magnitudeLabelSuffixOptions[magnitudeOption] || '';
+}
+
 function generateMeasurements (information) {
   return information.map(measurement => {
+    const format = getMeasurementFormat(measurement);
+    const formatMagnitude = format.substr(format.length - 1).toLowerCase();
     const transformedMeasurement = {
-      format: measurement.qNumFormat.qFmt || '#.##0',
+      format,
+      magnitudeLabelSuffix: getMagnitudeLabelSuffix(formatMagnitude),
       name: measurement.qFallbackTitle
     };
 
@@ -48,6 +78,11 @@ function generateMatrixCell ({ cell, dimension1Information, dimension2Informatio
   const matrixCell = {
     displayValue: cell.qText,
     format: measurementInformation.format,
+    magnitude: measurementInformation.magnitudeLabelSuffix.substring(
+      measurementInformation.magnitudeLabelSuffix.length - 2,
+      measurementInformation.magnitudeLabelSuffix.length - 1
+    ),
+    magnitudeLabelSuffix: measurementInformation.magnitudeLabelSuffix,
     name: measurementInformation.name,
     parents: {
       dimension1: {
@@ -64,8 +99,7 @@ function generateMatrixCell ({ cell, dimension1Information, dimension2Informatio
 
   if (dimension2Information) {
     matrixCell.parents.dimension2 = {
-      elementNumber: dimension2Information.qElemNumber,
-      header: dimension2Information.qText
+      elementNumber: dimension2Information.qElemNumber
     };
   }
 
@@ -142,7 +176,7 @@ function generateDataSet (
       let rowDataIndex = 0;
       dimension2.forEach(dim => {
         rowDataIndex = appendMissingCells(
-          row, newRow, rowDataIndex, measurements, rowIndex, dim, dimension1);
+          row, newRow, rowDataIndex, measurements, rowIndex, dim.elementNumber);
       });
     } else {
       appendMissingCells(row, newRow, 0, measurements, rowIndex);
@@ -166,11 +200,14 @@ function generateDataSet (
  * index of the dimension2 value being processed.
  */
 function appendMissingCells (
-  sourceRow, destRow, sourceIndex, measurements, matrixIndex, dim2, dim1) {
+  sourceRow, destRow, sourceIndex, measurements, dim1ElementNumber, dim2ElementNumber = -1) {
 
   let index = sourceIndex;
   measurements.forEach((measurement, measureIndex) => {
-    if (index < sourceRow.length) {
+    if (index < sourceRow.length
+      && (dim2ElementNumber === -1
+        || sourceRow[index].parents.dimension2.elementNumber === dim2ElementNumber)
+      && sourceRow[index].parents.measurement.header === measurement.name) {
       // Source contains the expected cell
       destRow.push(sourceRow[index]);
       index++;
@@ -179,14 +216,8 @@ function appendMissingCells (
       destRow.push({
         displayValue: '',
         parents: {
-          dimension1: {
-            elementNumber: dim1[matrixIndex].elementNumber,
-            header: dim1[matrixIndex].displayValue
-          },
-          dimension2: {
-            elementNumber: dim2.elementNumber,
-            header: dim2.displayValue
-          },
+          dimension1: { elementNumber: dim1ElementNumber },
+          dimension2: { elementNumber: dim2ElementNumber },
           measurement: {
             header: measurement.name,
             index: measureIndex
@@ -231,18 +262,6 @@ function initializeTransformed ({ $element, component, dataCube, designList, lay
     }
   }
 
-  let cellWidth;
-  if (layout.fitchartwidth) {
-    // The widths are calculated based on the current element width. Note: this could use % to set
-    // the widths as percentages of the available width. However, this often results in random
-    // columns getting 1px wider than the others because of rounding necessary to fill the width.
-    // This 1px causes missalignment between the data- and header tables.
-    cellWidth = '';
-  } else {
-    // If using the previous solution just set 60px
-    cellWidth = `${layout.columnwidthslider > 10 ? layout.columnwidthslider : 60}px`;
-  }
-
   // top level properties could be reducers and then components connect to grab what they want,
   // possibly with reselect for some presentational transforms (moving some of the presentational logic like formatting and such)
   const transformedProperties = {
@@ -260,13 +279,12 @@ function initializeTransformed ({ $element, component, dataCube, designList, lay
     general: {
       allowExcelExport: layout.allowexportxls,
       allowFilteringByClick: layout.filteroncellclick,
-      cellWidth: cellWidth,
+      cellSuffix: getCellSuffix(layout.columnwidthslider), // TOOD: move to matrix cells or is it headers.measurements?
       errorMessage: layout.errormessage,
       footnote: layout.footnote,
       maxLoops,
       subtitle: layout.subtitle,
-      title: layout.title,
-      useColumnSeparator: layout.separatorcols && dimensionCount > 1
+      title: layout.title
     },
     selection: {
       dimensionSelectionCounts: dimensionsInformation.map(dimensionInfo => dimensionInfo.qStateCounts.qSelected)
@@ -320,7 +338,8 @@ function initializeTransformed ({ $element, component, dataCube, designList, lay
         }
       },
       symbolForNulls: layout.symbolfornulls,
-      usePadding: layout.indentbool
+      usePadding: layout.indentbool,
+      useSeparatorColumns: dimensionCount === 1 ? false : layout.separatorcols
     }
   };
 

src/main.less

@@ -12,7 +12,9 @@
     pointer-events: none;
   }
 
-  .grid-cells {
+  ._cell(@Width: 50px) {
+    min-width: @Width !important;
+    max-width: @Width !important;
     cursor: pointer;
     line-height: 1em !important;
   }
@@ -57,8 +59,10 @@
   }
 
   .empty {
+    width: 3%;
     background: #fff;
-    padding: 0 !important;
+    min-width: 4px !important;
+    max-width: 4px !important;
   }
 
   th.main-kpi {
@@ -70,6 +74,67 @@
     text-align: right;
   }
 
+  // ***************** 
+  // Medium column size 
+  // ***************** 
+
+  .grid-cells {
+    position: relative;
+    ._cell(70px);
+  }
+
+  .grid-cells2 {
+    ._cell(70px);
+  }
+
+  .grid-cells-small {
+    ._cell(52px);
+  }
+
+  .grid-cells2-small {
+    ._cell(52px);
+  }
+
+  // ***************** 
+  // Small column size 
+  // ***************** 
+  .grid-cells-s {
+    ._cell(67px);
+  }
+
+  .grid-cells2-s {
+    ._cell(67px);
+  }
+
+  .grid-cells-small-s {
+    ._cell(52px);
+  }
+
+  .grid-cells2-small-s {
+    ._cell(52px);
+  }
+
+  // ***************** 
+  // Large column size 
+  // ***************** 
+  .grid-cells-l {
+    ._cell(82px);
+  }
+
+  .grid-cells2-l {
+    ._cell(82px);
+  }
+
+  .grid-cells-small-l {
+    ._cell(66px);
+  }
+
+  .grid-cells2-small-l {
+    ._cell(66px);
+  }
+
+  // END OF GRID CELLS
+
   // First Column 
   .fdim-cells {
     min-width: 230px !Important;
@@ -84,6 +149,14 @@
     color: #fff;
   }
 
+  .grid-cells-header {
+    padding: 0;
+  }
+
+  .grid-cells-title {
+    min-width: 522px;
+  }
+
   .grid {
     height: 50px;
     width: 350px;

src/masking.js

@@ -0,0 +1,138 @@
+import { addSeparators } from './utilities';
+
+export function ApplyPreMask (mask, value) { // aqui
+  if (mask.indexOf(';') >= 0) {
+    if (value >= 0) {
+      switch (mask.substring(0, mask.indexOf(';'))) {
+        case '#.##0':
+          return (addSeparators(value, '.', ',', 0));
+        case '#,##0':
+          return (addSeparators(value, ',', '.', 0));
+        case '+#.##0':
+          return (addSeparators(value, '.', ',', 0));
+        case '+#,##0':
+          return (addSeparators(value, ',', '.', 0));
+        case '# ##0':
+        case '# ##0':
+          return (addSeparators(value, ' ', '.', 0));
+        default:
+          return (applyMask(mask.substring(0, mask.indexOf(';')), value));
+      }
+    } else {
+      const vMyValue = value * -1;
+      let vMyMask = mask.substring(mask.indexOf(';') + 1, mask.length);
+      vMyMask = vMyMask.replace('(', '');
+      vMyMask = vMyMask.replace(')', '');
+      switch (vMyMask) {
+        case '#.##0':
+          return (`(${addSeparators(vMyValue, '.', ',', 0)})`);
+        case '#,##0':
+          return (`(${addSeparators(vMyValue, ',', '.', 0)})`);
+        case '-#.##0':
+          return (`(${addSeparators(vMyValue, '.', ',', 0)})`);
+        case '-#,##0':
+          return (`(${addSeparators(vMyValue, ',', '.', 0)})`);
+        case '# ##0':
+        case '# ##0':
+          return (`(${addSeparators(vMyValue, ' ', '.', 0)})`);
+        default:
+          return (`(${applyMask(vMyMask, vMyValue)})`);
+      }
+    }
+  } else {
+    return (applyMask(mask, value));
+  }
+}
+
+function applyMask (originalMask, originalValue) {
+  if (!originalMask || isNaN(Number(originalValue))) {
+    return originalValue;
+  }
+
+  let isNegative;
+  let result;
+  let integer;
+  // find prefix/suffix
+  let len = originalMask.length;
+  const start = originalMask.search(/[0-9\-\+#]/);
+  const prefix = start > 0 ? originalMask.substring(0, start) : '';
+  // reverse string: not an ideal method if there are surrogate pairs
+  let str = originalMask.split('')
+    .reverse()
+    .join('');
+  const end = str.search(/[0-9\-\+#]/);
+  let offset = len - end;
+  const substr = originalMask.substring(offset, offset + 1);
+  let index = offset + ((substr === '.' || (substr === ',')) ? 1 : 0);
+  const suffix = end > 0 ? originalMask.substring(index, len) : '';
+
+  // mask with prefix & suffix removed
+  let mask = originalMask.substring(start, index);
+
+  // convert any string to number according to formation sign.
+  let value = mask.charAt(0) === '-' ? -originalValue : Number(originalValue);
+  isNegative = value < 0 ? value = -value : 0; // process only abs(), and turn on flag.
+
+  // search for separator for grp & decimal, anything not digit, not +/- sign, not #.
+  result = mask.match(/[^\d\-\+#]/g);
+  const decimal = (result && result[result.length - 1]) || '.'; // treat the right most symbol as decimal
+  const group = (result && result[1] && result[0]) || ','; // treat the left most symbol as group separator
+
+  // split the decimal for the format string if any.
+  mask = mask.split(decimal);
+  // Fix the decimal first, toFixed will auto fill trailing zero.
+  value = value.toFixed(mask[1] && mask[1].length);
+  value = String(Number(value)); // convert number to string to trim off *all* trailing decimal zero(es)
+
+  // fill back any trailing zero according to format
+  const posTrailZero = mask[1] && mask[1].lastIndexOf('0'); // look for last zero in format
+  const part = value.split('.');
+  // integer will get !part[1]
+  if (!part[1] || (part[1] && part[1].length <= posTrailZero)) {
+    value = (Number(value)).toFixed(posTrailZero + 1);
+  }
+  const szSep = mask[0].split(group); // look for separator
+  mask[0] = szSep.join(''); // join back without separator for counting the pos of any leading 0.
+
+  const posLeadZero = mask[0] && mask[0].indexOf('0');
+  if (posLeadZero > -1) {
+    while (part[0].length < (mask[0].length - posLeadZero)) {
+      part[0] = `0${part[0]}`;
+    }
+  } else if (Number(part[0]) === 0) {
+    part[0] = '';
+  }
+
+  value = value.split('.');
+  value[0] = part[0];
+
+  // process the first group separator from decimal (.) only, the rest ignore.
+  // get the length of the last slice of split result.
+  const posSeparator = (szSep[1] && szSep[szSep.length - 1].length);
+  if (posSeparator) {
+    integer = value[0];
+    str = '';
+    offset = integer.length % posSeparator;
+    len = integer.length;
+    for (index = 0; index < len; index++) {
+      str += integer.charAt(index); // ie6 only support charAt for sz.
+      // -posSeparator so that won't trail separator on full length
+      // jshint -W018
+      if (!((index - offset + 1) % posSeparator) && index < len - posSeparator) {
+        str += group;
+      }
+    }
+    value[0] = str;
+  }
+  value[1] = (mask[1] && value[1]) ? decimal + value[1] : '';
+
+  // remove negative sign if result is zero
+  result = value.join('');
+  if (result === '0' || result === '') {
+    // remove negative sign if result is zero
+    isNegative = false;
+  }
+
+  // put back any negation, combine integer and fraction, and add back prefix & suffix
+  return prefix + ((isNegative ? '-' : '') + result) + suffix;
+}

src/root.jsx

@@ -4,129 +4,61 @@ import HeadersTable from './headers-table/index.jsx';
 import DataTable from './data-table/index.jsx';
 import { LinkedScrollWrapper, LinkedScrollSection } from './linked-scroll';
 
-class Root extends React.PureComponent {
-  constructor (props) {
-    super(props);
-    this.onDataTableRefSet = this.onDataTableRefSet.bind(this);
-    this.renderedTableWidth = 0;
-  }
-
-  componentDidUpdate () {
-    const tableWidth = this.dataTableRef.getBoundingClientRect().width;
-    if (this.renderedTableWidth !== tableWidth) {
-      this.forceUpdate();
-    }
-  }
-
-  onDataTableRefSet (element) {
-    this.dataTableRef = element;
-    this.forceUpdate();
-  }
-
-  render () {
-    const { editmodeClass, component, state } = this.props;
-    const { data, general, styling } = state;
-
-    // Determine cell- and column separator width
-    let cellWidth = '0px';
-    let columnSeparatorWidth = '';
-    if (this.dataTableRef) {
-      const tableWidth = this.dataTableRef.getBoundingClientRect().width;
-      this.renderedTableWidth = tableWidth;
-
-      if (general.cellWidth) {
-        cellWidth = general.cellWidth;
-        if (general.useColumnSeparator) {
-          columnSeparatorWidth = '8px';
-        }
-      } else {
-        const headerMarginRight = 8;
-        const borderWidth = 1;
-        const rowCellCount = data.matrix[0].length;
-
-        let separatorCount = 0;
-        let separatorWidth = 0;
-        if (general.useColumnSeparator) {
-          separatorCount = data.headers.dimension2.length - 1;
-          separatorWidth = Math.min(Math.floor(tableWidth * 0.2 / separatorCount), 8);
-          columnSeparatorWidth = `${separatorWidth}px`;
-        }
-
-        const separatorWidthSum = (separatorWidth + borderWidth) * separatorCount;
-        cellWidth = `${Math.floor((tableWidth - separatorWidthSum - headerMarginRight - borderWidth)
-          / rowCellCount) - borderWidth}px`;
-      }
-    }
-
-    return (
-      <div className="root">
-        <LinkedScrollWrapper>
-          <div className={`kpi-table ${editmodeClass}`}>
-            <HeadersTable
-              cellWidth={cellWidth}
-              columnSeparatorWidth={columnSeparatorWidth}
-              component={component}
-              data={data}
-              general={general}
-              isKpi
-              styling={styling}
-            />
-            <LinkedScrollSection linkVertical>
-              <DataTable
-                cellWidth={cellWidth}
-                columnSeparatorWidth={columnSeparatorWidth}
-                component={component}
-                data={data}
-                general={general}
-                renderData={false}
-                styling={styling}
-              />
-            </LinkedScrollSection>
-          </div>
-          <div
-            className={`data-table ${editmodeClass}`}
-            style={{ width: general.cellWidth ? 'auto' : '100%' }}
-            ref={this.onDataTableRefSet}
-          >
-            <LinkedScrollSection linkHorizontal>
-              <HeadersTable
-                cellWidth={cellWidth}
-                columnSeparatorWidth={columnSeparatorWidth}
-                component={component}
-                data={data}
-                general={general}
-                isKpi={false}
-                styling={styling}
-              />
-            </LinkedScrollSection>
-            <LinkedScrollSection
-              linkHorizontal
-              linkVertical
-            >
-              <DataTable
-                cellWidth={cellWidth}
-                columnSeparatorWidth={columnSeparatorWidth}
-                component={component}
-                data={data}
-                general={general}
-                styling={styling}
-              />
-            </LinkedScrollSection>
-          </div>
-        </LinkedScrollWrapper>
+const Root = ({ state, qlik, editmodeClass }) => (
+  <div className="root">
+    <LinkedScrollWrapper>
+      <div className={`kpi-table ${editmodeClass}`}>
+        <HeadersTable
+          data={state.data}
+          general={state.general}
+          isKpi
+          qlik={qlik}
+          styling={state.styling}
+        />
+        <LinkedScrollSection linkVertical>
+          <DataTable
+            data={state.data}
+            general={state.general}
+            qlik={qlik}
+            renderData={false}
+            styling={state.styling}
+          />
+        </LinkedScrollSection>
       </div>
-    );
-  }
-}
+      <div className={`data-table ${editmodeClass}`}>
+        <LinkedScrollSection linkHorizontal>
+          <HeadersTable
+            data={state.data}
+            general={state.general}
+            isKpi={false}
+            qlik={qlik}
+            styling={state.styling}
+          />
+        </LinkedScrollSection>
+        <LinkedScrollSection
+          linkHorizontal
+          linkVertical
+        >
+          <DataTable
+            data={state.data}
+            general={state.general}
+            qlik={qlik}
+            styling={state.styling}
+          />
+        </LinkedScrollSection>
+      </div>
+    </LinkedScrollWrapper>
+  </div>
+);
 
 Root.propTypes = {
-  component: PropTypes.shape({}).isRequired,
-  editmodeClass: PropTypes.string.isRequired,
+  qlik: PropTypes.shape({}).isRequired,
   state: PropTypes.shape({
     data: PropTypes.object.isRequired,
     general: PropTypes.object.isRequired,
     styling: PropTypes.object.isRequired
-  }).isRequired
+  }).isRequired,
+  editmodeClass: PropTypes.string.isRequired
 };
 
 export default Root;

src/utilities.js

@@ -9,6 +9,21 @@ export function distinctArray (array) {
     .map(entry => JSON.parse(entry));
 }
 
+export function addSeparators (number, thousandSeparator, decimalSeparator, numberOfDecimals) {
+  const numberString = number.toFixed(numberOfDecimals);
+  const numberStringParts = numberString.split('.');
+  let [
+    wholeNumber,
+    decimal
+  ] = numberStringParts;
+  decimal = numberStringParts.length > 1 ? decimalSeparator + decimal : '';
+  const regexCheckForThousand = /(\d+)(\d{3})/;
+  while (regexCheckForThousand.test(wholeNumber)) {
+    wholeNumber = wholeNumber.replace(regexCheckForThousand, `$1${thousandSeparator}$2`);
+  }
+  return wholeNumber + decimal;
+}
+
 export function Deferred () {
   this.promise = new Promise((resolve, reject) => {
     this.resolve = resolve;
@@ -16,7 +31,7 @@ export function Deferred () {
   });
 }
 
-export function injectSeparators (array, columnSeparatorWidth, suppliedOptions) {
+export function injectSeparators (array, shouldHaveSeparator, suppliedOptions) {
   const defaultOptions = {
     atEvery: 1,
     separator: { isSeparator: true }
@@ -26,7 +41,7 @@ export function injectSeparators (array, columnSeparatorWidth, suppliedOptions)
     ...suppliedOptions
   };
 
-  if (!columnSeparatorWidth) {
+  if (!shouldHaveSeparator) {
     return array;
   }
   return array.reduce((result, entry, index) => {