merge conflicts solved

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/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;

src/paint.jsx

@@ -10,11 +10,12 @@ export default async function paint ($element, layout, component) {
     component,
     layout
   });
-
+  const editmodeClass = component.inAnalysisState() ? '' : 'edit-mode';
   const jsx = (
     <Root
       qlik={component}
       state={state}
+      editmodeClass={editmodeClass}
     />
   );