Merge pull request #21 from qlik-oss/feature/QPE-474

[QPE-474] replace jquery scroll linking

package-lock.json

@@ -101,6 +101,104 @@
         "@babel/types": "^7.0.0"
       }
     },
+    "@babel/helper-create-class-features-plugin": {
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.3.2.tgz",
+      "integrity": "sha512-tdW8+V8ceh2US4GsYdNVNoohq5uVwOf9k6krjwW4E1lINcHgttnWcNqgdoessn12dAy8QkbezlbQh2nXISNY+A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-function-name": "^7.1.0",
+        "@babel/helper-member-expression-to-functions": "^7.0.0",
+        "@babel/helper-optimise-call-expression": "^7.0.0",
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/helper-replace-supers": "^7.2.3"
+      },
+      "dependencies": {
+        "@babel/generator": {
+          "version": "7.3.3",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.3.3.tgz",
+          "integrity": "sha512-aEADYwRRZjJyMnKN7llGIlircxTCofm3dtV5pmY6ob18MSIuipHpA2yZWkPlycwu5HJcx/pADS3zssd8eY7/6A==",
+          "dev": true,
+          "requires": {
+            "@babel/types": "^7.3.3",
+            "jsesc": "^2.5.1",
+            "lodash": "^4.17.11",
+            "source-map": "^0.5.0",
+            "trim-right": "^1.0.1"
+          },
+          "dependencies": {
+            "@babel/types": {
+              "version": "7.3.3",
+              "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.3.3.tgz",
+              "integrity": "sha512-2tACZ80Wg09UnPg5uGAOUvvInaqLk3l/IAhQzlxLQOIXacr6bMsra5SH6AWw/hIDRCSbCdHP2KzSOD+cT7TzMQ==",
+              "dev": true,
+              "requires": {
+                "esutils": "^2.0.2",
+                "lodash": "^4.17.11",
+                "to-fast-properties": "^2.0.0"
+              }
+            }
+          }
+        },
+        "@babel/helper-replace-supers": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.2.3.tgz",
+          "integrity": "sha512-GyieIznGUfPXPWu0yLS6U55Mz67AZD9cUk0BfirOWlPrXlBcan9Gz+vHGz+cPfuoweZSnPzPIm67VtQM0OWZbA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-member-expression-to-functions": "^7.0.0",
+            "@babel/helper-optimise-call-expression": "^7.0.0",
+            "@babel/traverse": "^7.2.3",
+            "@babel/types": "^7.0.0"
+          }
+        },
+        "@babel/parser": {
+          "version": "7.3.3",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.3.3.tgz",
+          "integrity": "sha512-xsH1CJoln2r74hR+y7cg2B5JCPaTh+Hd+EbBRk9nWGSNspuo6krjhX0Om6RnRQuIvFq8wVXCLKH3kwKDYhanSg==",
+          "dev": true
+        },
+        "@babel/traverse": {
+          "version": "7.2.3",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.2.3.tgz",
+          "integrity": "sha512-Z31oUD/fJvEWVR0lNZtfgvVt512ForCTNKYcJBGbPb1QZfve4WGH8Wsy7+Mev33/45fhP/hwQtvgusNdcCMgSw==",
+          "dev": true,
+          "requires": {
+            "@babel/code-frame": "^7.0.0",
+            "@babel/generator": "^7.2.2",
+            "@babel/helper-function-name": "^7.1.0",
+            "@babel/helper-split-export-declaration": "^7.0.0",
+            "@babel/parser": "^7.2.3",
+            "@babel/types": "^7.2.2",
+            "debug": "^4.1.0",
+            "globals": "^11.1.0",
+            "lodash": "^4.17.10"
+          },
+          "dependencies": {
+            "@babel/types": {
+              "version": "7.3.3",
+              "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.3.3.tgz",
+              "integrity": "sha512-2tACZ80Wg09UnPg5uGAOUvvInaqLk3l/IAhQzlxLQOIXacr6bMsra5SH6AWw/hIDRCSbCdHP2KzSOD+cT7TzMQ==",
+              "dev": true,
+              "requires": {
+                "esutils": "^2.0.2",
+                "lodash": "^4.17.11",
+                "to-fast-properties": "^2.0.0"
+              }
+            }
+          }
+        },
+        "debug": {
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "dev": true,
+          "requires": {
+            "ms": "^2.1.1"
+          }
+        }
+      }
+    },
     "@babel/helper-define-map": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.1.0.tgz",
@@ -302,6 +400,16 @@
         "@babel/plugin-syntax-async-generators": "^7.2.0"
       }
     },
+    "@babel/plugin-proposal-class-properties": {
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.3.3.tgz",
+      "integrity": "sha512-XO9eeU1/UwGPM8L+TjnQCykuVcXqaO5J1bkRPIygqZ/A2L1xVMJ9aZXrY31c0U4H2/LHKL4lbFQLsxktSrc/Ng==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.3.0",
+        "@babel/helper-plugin-utils": "^7.0.0"
+      }
+    },
     "@babel/plugin-proposal-json-strings": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz",

package.json

@@ -16,6 +16,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.1.2",
+    "@babel/plugin-proposal-class-properties": "7.3.3",
     "@babel/plugin-transform-async-to-generator": "7.1.0",
     "@babel/polyfill": "7.0.0",
     "@babel/preset-env": "7.1.0",

src/data-table/data-cell.jsx

@@ -90,12 +90,17 @@ class DataCell extends React.PureComponent {
     if (styleBuilder.hasComments()) {
       formattedMeasurementValue = '.';
     }
+    let textAlignment = 'Right';
+    const textAlignmentProp = styling.options.textAlignment;
+    if (textAlignmentProp) {
+      textAlignment = textAlignmentProp;
+    }
 
     let cellStyle = {
       fontFamily: styling.options.fontFamily,
       ...styleBuilder.getStyle(),
       paddingLeft: '4px',
-      textAlign: 'right'
+      textAlign: textAlignment
 
     };
     const { semaphoreColors } = styling;
@@ -109,7 +114,7 @@ class DataCell extends React.PureComponent {
         fontFamily: styling.options.fontFamily,
         fontSize: styleBuilder.getStyle().fontSize,
         paddingLeft: '4px',
-        textAlign: 'right'
+        textAlign: textAlignment
       };
     }
 

src/definition/formatted.js

@@ -187,6 +187,26 @@ const formatted = {
       ],
       defaultValue: 1
     },
+    textAlignment: {
+      ref: 'cellTextAlignment',
+      label: 'Cell Text alignment',
+      component: 'buttongroup',
+      options: [
+        {
+          value: 'left',
+          label: 'Left'
+        },
+        {
+          value: 'center',
+          label: 'Center'
+        },
+        {
+          value: 'right',
+          label: 'Right'
+        }
+      ],
+      defaultValue: 'right'
+    },
     ColumnWidthSlider: {
       type: 'number',
       component: 'slider',

src/definition/header.js

@@ -27,7 +27,7 @@ const header = {
       ref: 'HeaderColorSchema',
       type: 'string',
       component: 'dropdown',
-      label: 'BackGround Header Color',
+      label: 'Background Header Color',
       options: [
         {
           value: 'Clean',

src/definition/index.js

@@ -9,15 +9,16 @@ import pijamaColorLibrary from './pijama-color-library';
 const definition = {
   component: 'accordion',
   items: {
-    dimensions: {
-      max: 2,
-      min: 1,
-      uses: 'dimensions'
-    },
-    measures: {
-      max: 9,
-      min: 1,
-      uses: 'measures'
+    data: {
+      items: {
+        dimensions: {
+          disabledRef: ''
+        },
+        measures: {
+          disabledRef: ''
+        }
+      },
+      uses: 'data'
     },
     settings: {
       items: {

src/index.js

@@ -12,6 +12,18 @@ export default {
     '$timeout',
     function () { }
   ],
+  data: {
+    dimensions: {
+      max: 2,
+      min: 1,
+      uses: 'dimensions'
+    },
+    measures: {
+      max: 9,
+      min: 1,
+      uses: 'measures'
+    }
+  },
   definition,
   initialProperties: {
     qHyperCubeDef: {

src/initialize-transformed.js

@@ -282,7 +282,8 @@ async function initializeTransformed ({ $element, layout, component }) {
         backgroundColorOdd: colors[`vColLib${layout.ColorSchemaP}`],
         color: layout.BodyTextColorSchema,
         fontFamily: layout.FontFamily,
-        fontSizeAdjustment: getFontSizeAdjustment(layout.lettersize)
+        fontSizeAdjustment: getFontSizeAdjustment(layout.lettersize),
+        textAlignment: layout.cellTextAlignment
       },
       semaphoreColors: {
         fieldsToApplyTo: {

src/linked-scroll/index.js

@@ -0,0 +1,2 @@
+export { default as LinkedScrollWrapper } from './linked-scroll-wrapper.jsx';
+export { default as LinkedScrollSection } from './linked-scroll-section.jsx';

src/linked-scroll/linked-scroll-section.jsx

@@ -0,0 +1,29 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { LinkedScrollContext } from './linked-scroll-wrapper.jsx';
+
+class LinkedScrollSection extends React.PureComponent {
+  static contextType = LinkedScrollContext;
+
+  componentDidMount () {
+    const { link } = this.context;
+    link(this);
+  }
+
+  componentWillUnmount () {
+    const { unlink } = this.context;
+    unlink(this);
+  }
+
+  render () {
+    const { children } = this.props;
+
+    return children;
+  }
+}
+
+LinkedScrollSection.propTypes = {
+  children: PropTypes.any
+};
+
+export default LinkedScrollSection;

src/linked-scroll/linked-scroll-wrapper.jsx

@@ -0,0 +1,82 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import PropTypes from 'prop-types';
+
+export const LinkedScrollContext = React.createContext();
+
+class LinkedScrollWrapper extends React.PureComponent {
+  constructor (props) {
+    super(props);
+
+    this.linkComponent = this.linkComponent.bind(this);
+    this.unlinkComponent = this.unlinkComponent.bind(this);
+    this.handleScroll = this.handleScroll.bind(this);
+    this.scrollElements = [];
+
+    this.linkActions = {
+      link: this.linkComponent,
+      unlink: this.unlinkComponent
+    };
+  }
+
+  linkComponent (component) {
+    // eslint-disable-next-line react/no-find-dom-node
+    const node = ReactDOM.findDOMNode(component);
+    const element = {
+      component,
+      node
+    };
+    this.scrollElements.push(element);
+    node.onscroll = this.handleScroll.bind(this, element);
+  }
+
+  unlinkComponent (component) {
+    const componentIndex = this.scrollElements.map(element => element.component).indexOf(component);
+    if (componentIndex !== -1) {
+      this.scrollElements.removeAt(componentIndex);
+      // eslint-disable-next-line react/no-find-dom-node
+      const node = ReactDOM.findDOMNode(component);
+      node.onscroll = null;
+    }
+  }
+
+  handleScroll (element) {
+    window.requestAnimationFrame(() => {
+      this.sync(element);
+    });
+  }
+
+  sync (scrollElement) {
+    this.scrollElements.forEach(element => {
+      if (scrollElement === element) {
+        return;
+      }
+      element.node.onscroll = null;
+      if (element.component.props.linkHorizontal) {
+        element.node.scrollLeft = scrollElement.node.scrollLeft;
+      }
+
+      if (element.component.props.linkVertical) {
+        element.node.scrollTop = scrollElement.node.scrollTop;
+      }
+      window.requestAnimationFrame(() => {
+        element.node.onscroll = this.handleScroll.bind(this, element);
+      });
+    });
+  }
+
+  render () {
+    const { children } = this.props;
+    return (
+      <LinkedScrollContext.Provider value={this.linkActions}>
+        {children}
+      </LinkedScrollContext.Provider>
+    );
+  }
+}
+
+LinkedScrollWrapper.propTypes = {
+  children: PropTypes.any
+};
+
+export default LinkedScrollWrapper;

src/main.less

@@ -1,7 +1,9 @@
 .qv-object-qlik-smart-pivot {
   @TableBorder: 1px solid #d3d3d3;
   @KpiTableWidth: 230px;
-
+  .edit-mode{
+    pointer-events: none;
+  }
   ._cell(@Width: 50px) {
   	min-width: @Width!important;
   	max-width: @Width!important;
@@ -10,8 +12,6 @@
   }
 
 	div.qv-object-content-container {
-		overflow-x: scroll;
-		overflow-y: hidden;
 		z-index: 110;
 	}
 
@@ -149,12 +149,6 @@
   	width: 350px;
   }
 
-  .header-wrapper {
-  	position: absolute;
-  	top: 0;
-  	z-index: 1;
-  }
-
   /*popups for headers*/
   .tooltip {
   	position: fixed !important;
@@ -166,11 +160,7 @@
 
   /*end popups*/
   .row-wrapper {
-  	position: absolute;
-  	top: 97px;
   	height: calc(~"100% - 97px");
-  	overflow-x: hidden;
-  	overflow-y: scroll;
   	padding: 0;
   	margin-top: 0;
   }
@@ -186,30 +176,54 @@
   .kpi-table {
   	width: @KpiTableWidth !important;
   	overflow: hidden !important;
-  	display: table;
-  	height: 100%;
+    height: 100%;
   	margin: 0;
   	padding: 0;
-  	z-index: 100;
   	position: absolute;
   	top: 0;
   	left: 0;
   	border-right: 1px solid white;
   	box-shadow: 4px 2px 8px #e1e1e1;
-  }
 
-  .kpi-table .row-wrapper {
-  	overflow: hidden;
+    .row-wrapper {
+    	height: calc(~"100% - 97px");
+      overflow: scroll;
+      position: absolute;
+    	padding: 0;
+    	margin-top: 0;
+    }
   }
 
   .data-table {
-  	width: 272px !important;
-  	float: left;
-  	display: table;
   	height: 100%;
-  	z-index: 90;
+    width: calc(100% - 243px);
   	position: absolute;
   	margin-left: @KpiTableWidth + 13px;
-  	-ms-overflow-style: none;
+
+    .header-wrapper {
+      overflow: scroll;
+      width: 100%;
+    }
+
+    .row-wrapper {
+    	height: calc(~"100% - 97px");
+      width: 100%;
+      overflow: scroll;
+    	padding: 0;
+    	margin-top: 0;
+    }
+  }
+
+  // hide scrollbars
+  .kpi-table .header-wrapper,
+  .kpi-table .row-wrapper,
+  .data-table .header-wrapper,
+  .data-table .row-wrapper {
+    -ms-overflow-style: none;  // IE 10+
+    -moz-overflow: -moz-scrollbars-none;  // Firefox
+
+    &::-webkit-scrollbar {
+      display: none;  // Safari and Chrome
+    }
   }
 }

src/paint.jsx

@@ -4,6 +4,7 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import HeadersTable from './headers-table/index.jsx';
 import DataTable from './data-table/index.jsx';
+import { LinkedScrollWrapper, LinkedScrollSection } from './linked-scroll';
 
 export default async function paint ($element, layout, component) {
   const state = await initializeStore({
@@ -11,54 +12,52 @@ export default async function paint ($element, layout, component) {
     component,
     layout
   });
-
+  const editmodeClass = component.inAnalysisState() ? '' : 'edit-mode';
   const jsx = (
-    <React.Fragment>
-      <div className="kpi-table">
+    <LinkedScrollWrapper>
+      <div className={`kpi-table ${editmodeClass}`}>
         <HeadersTable
           data={state.data}
           general={state.general}
           qlik={component}
           styling={state.styling}
         />
-        <DataTable
-          data={state.data}
-          general={state.general}
-          qlik={component}
-          renderData={false}
-          styling={state.styling}
-        />
+        <LinkedScrollSection linkVertical>
+          <DataTable
+            data={state.data}
+            general={state.general}
+            qlik={component}
+            renderData={false}
+            styling={state.styling}
+          />
+        </LinkedScrollSection>
       </div>
-      <div className="data-table">
-        <HeadersTable
-          data={state.data}
-          general={state.general}
-          qlik={component}
-          styling={state.styling}
-        />
-        <DataTable
-          data={state.data}
-          general={state.general}
-          qlik={component}
-          styling={state.styling}
-        />
+      <div className={`data-table ${editmodeClass}`}>
+        <LinkedScrollSection linkHorizontal>
+          <HeadersTable
+            data={state.data}
+            general={state.general}
+            qlik={component}
+            styling={state.styling}
+          />
+        </LinkedScrollSection>
+        <LinkedScrollSection
+          linkHorizontal
+          linkVertical
+        >
+          <DataTable
+            data={state.data}
+            general={state.general}
+            qlik={component}
+            styling={state.styling}
+          />
+        </LinkedScrollSection>
       </div>
-    </React.Fragment>
+    </LinkedScrollWrapper>
   );
 
   ReactDOM.render(jsx, $element[0]);
 
-  // TODO: skipped the following as they weren't blockers for letting react handle rendering,
-  // they are however the only reason we still depend on jQuery and should be removed as part of unnecessary dependencies issue
-  $(`[tid="${layout.qInfo.qId}"] .data-table .row-wrapper`).on('scroll', function () {
-    $(`[tid="${layout.qInfo.qId}"] .kpi-table .row-wrapper`).scrollTop($(this).scrollTop());
-  });
-
-  // freeze first column
-  $(`[tid="${layout.qInfo.qId}"] .qv-object-content-container`).on('scroll', (t) => {
-    $(`[tid="${layout.qInfo.qId}"] .kpi-table`).css('left', `${Math.round(t.target.scrollLeft)}px`);
-  });
-
   // TODO: fixing tooltips has a seperate issue, make sure to remove this as part of that issue
   $(`[tid="${layout.qInfo.qId}"] .header-wrapper th`).hover(function () {
     $(`[tid="${layout.qInfo.qId}"] .tooltip`).delay(500)

webpack.config.js

@@ -6,23 +6,16 @@ console.log('Webpack mode:', settings.mode); // eslint-disable-line no-console
 
 const config = {
   devtool: 'source-map',
-  entry: [
-    './src/index.js'
-  ],
-  mode: settings.mode,
-  output: {
-    path: settings.buildDestination,
-    filename: settings.name + '.js',
-    libraryTarget: 'amd'
-  },
+  entry: ['./src/index.js'],
   externals: {
     jquery: {
       amd: 'jquery',
       commonjs: 'jquery',
       commonjs2: 'jquery',
       root: '_'
-    },
+    }
   },
+  mode: settings.mode,
   // TODO: breaks core-js for some reason
   // resolve: {
   //   extensions: ['js', 'jsx']
@@ -31,20 +24,23 @@ const config = {
     rules: [
       {
         enforce: 'pre',
-        test: /\.(js|jsx)$/,
         exclude: /(node_modules|Library)/,
         loader: 'eslint-loader',
         options: {
           failOnError: true
-        }
+        },
+        test: /\.(js|jsx)$/
       },
       {
-        test: /\.(js|jsx)$/,
         exclude: /node_modules/,
+        test: /\.(js|jsx)$/,
         use: {
           loader: 'babel-loader',
           options: {
-            plugins: ['@babel/plugin-transform-async-to-generator'],
+            plugins: [
+              '@babel/plugin-transform-async-to-generator',
+              '@babel/plugin-proposal-class-properties'
+            ],
             presets: [
               '@babel/preset-env',
               '@babel/preset-react'
@@ -54,21 +50,30 @@ const config = {
       },
       {
         test: /.less$/,
-        use: ['style-loader', 'css-loader', 'less-loader']
+        use: [
+          'style-loader',
+          'css-loader',
+          'less-loader'
+        ]
       }
     ]
   },
+  output: {
+    filename: `${settings.name}.js`,
+    libraryTarget: 'amd',
+    path: settings.buildDestination
+  },
   plugins: [
     new CopyWebpackPlugin([
-      'assets/' + settings.name + '.qext',
-      'assets/' + settings.name + '.png',
+      `assets/${settings.name}.qext`,
+      `assets/${settings.name}.png`,
       'assets/wbfolder.wbl',
+      'resources/Excel.png',
 
       // TODO: remove entries below this line
       'resources/Accounts.csv',
       'resources/Accounts2.csv',
-      'resources/QlikLook.csv',
-      'resources/Excel.png',
+      'resources/QlikLook.csv'
     ], {}),
     new StyleLintPlugin()
   ]