Merge branch 'develop'

README.md

@@ -13,7 +13,7 @@ Usage
 **Installation**
 
 ```bash
-npm install --save vue-lineup@next
+npm install --save vue-lineup
 ```
 
 **Minimal Usage Example**
@@ -94,6 +94,8 @@ Development Environment
 git clone https://github.com/datavisyn/vue-lineup.git
 cd vue-lineup
 npm install
+# install peer dependency
+npm install --no-save vue
 ```
 
 **Build distribution packages**

package.json

@@ -2,10 +2,11 @@
   "name": "vue-lineup",
   "description": "LineUp is an interactive technique designed to create, visualize and explore rankings of items based on a set of heterogeneous attributes.",
   "homepage": "https://github.com/datavisyn/vue-lineup",
-  "version": "1.0.0",
+  "version": "1.0.7",
   "author": {
     "name": "Samuel Gratzl",
-    "email": "[email protected]"
+    "email": "[email protected]",
+    "url": "https://www.sgratzl.com"
   },
   "license": "MIT",
   "bugs": {
@@ -38,18 +39,19 @@
     "release:pre": "npm version prerelease && npm publish --tag=next && git push --follow-tags"
   },
   "peerDependencies": {
-    "vue": "^2.5.16"
+    "vue": "^2.5.17"
   },
   "devDependencies": {
-    "@vue/cli-plugin-typescript": "^3.0.0-beta.15",
-    "@vue/cli-service": "^3.0.0-beta.15",
+    "@vue/cli-plugin-typescript": "^3.0.5",
+    "@vue/cli-service": "^3.0.5",
     "rimraf": "^2.6.2",
-    "vue-template-compiler": "^2.5.16"
+    "typescript": "^3.0.1",
+    "vue-template-compiler": "^2.5.17"
   },
   "dependencies": {
-    "lineupjs": "^3.1.0",
-    "vue-class-component": "^6.0.0",
-    "vue-property-decorator": "^6.0.0"
+    "lineupjs": "~3.1.7",
+    "vue-class-component": "^6.3.0",
+    "vue-property-decorator": "^7.2.0"
   },
   "browserslist": [
     "> 1%",

src/components/LineUp.vue

@@ -142,12 +142,12 @@ export default class LineUp extends Vue implements IBuilderAdapterProps {
   public labelRotation?: number;
 
   @Prop({
-    type: Object,
+    type: Object as () => {[id: string]: ICellRendererFactory},
     default: () => ({}),
   })
   public renderer?: {[id: string]: ICellRendererFactory};
   @Prop({
-    type: Object,
+    type: Object as () => {[id: string]: IToolbarAction},
     default: () => ({}),
   })
   public toolbar?: {[id: string]: IToolbarAction};
@@ -180,6 +180,12 @@ export default class LineUp extends Vue implements IBuilderAdapterProps {
   })
   public dynamicHeight?: (data: Array<IGroupItem | IGroupData>, ranking: Ranking) => (IDynamicHeight | null);
 
+  @Prop({
+    type: Boolean,
+    default: undefined,
+  })
+  public ignoreUnsupportedBrowser?: boolean;
+
   private changed = new Set<keyof IBuilderAdapterProps>();
 
   private readonly adapter = new builderAdapter.Adapter({

src/components/column/LineUpCategoricalColumnDesc.vue

@@ -26,7 +26,7 @@ export default class LineUpCategoricalColumnDesc extends LineUpColumnDesc
   public categories?: Array<string | Partial<ICategory>>;
 
   @Prop({
-    type: [String, Object],
+    type: [String, Object as () => Partial<ICategory>],
     default: undefined,
   })
   public missingCategory?: (string | Partial<ICategory>);

src/components/column/LineUpNumberColumnDesc.vue

@@ -30,6 +30,12 @@ export default class LineUpNumberColumnDesc extends LineUpColumnDesc implements
   })
   public mapping?: 'linear' | 'sqrt' | 'pow1.1' | 'pow2' | 'pow3';
 
+  @Prop({
+    type: String,
+    default: undefined,
+  })
+  public colorMapping?: string;
+
   @Prop({
     type: String,
     default: undefined,

src/components/column/LineUpStringColumnDesc.vue

@@ -5,7 +5,7 @@
 <script lang="ts">
 import { Component, Prop } from 'vue-property-decorator';
 import {
-  builderAdapter, IStringColumnDesc, IBuilderAdapterStringColumnDescProps,
+  builderAdapter, ILinkColumnDesc, IBuilderAdapterStringColumnDescProps,
 } from 'lineupjs';
 import LineUpColumnDesc from './LineUpColumnDesc.vue';
 import { noUndefined } from '../utils';
@@ -36,7 +36,7 @@ export default class LineUpStringColumnDesc extends LineUpColumnDesc implements
   })
   public patternTemplates?: string[];
 
-  public build(): IStringColumnDesc {
+  public build(): ILinkColumnDesc {
     return builderAdapter.buildString(noUndefined(this));
   }
 }

tsconfig.json

@@ -11,8 +11,6 @@
     "allowSyntheticDefaultImports": true,
     "sourceMap": true,
     "baseUrl": ".",
-    "types": [
-      "node"    ],
     "paths": {
       "@/*": [
         "src/*"

vue.config.js

@@ -3,17 +3,17 @@ module.exports = {
   css: {
     extract: false
   },
-  configureWebpack: {
-    output: {
-      library: 'VueLineUp'
-    },
-    externals: {
-      lineupjs: {
-        amd: 'lineupjs',
-        root: 'LineUpJS',
-        commonjs: 'lineupjs',
-        commonjs2: 'lineupjs'
-      }
-    },
+  configureWebpack: (config) => {
+    config.output.library = 'VueLineUp';
+    if (process.env.NODE_ENV === 'production') {
+      config.externals = Object.assign(config.externals ||{}, {
+        lineupjs: {
+          amd: 'lineupjs',
+          root: 'LineUpJS',
+          commonjs: 'lineupjs',
+          commonjs2: 'lineupjs'
+        }
+      })
+    }
   }
 }