Merge branch 'release/2.0.0-rc.4'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vizart-core",
-  "version": "2.0.0-rc.3",
+  "version": "2.0.0-rc.4",
   "description": "Core Components for VizArt",
   "main": "dist/vizart-core.js",
   "module": "dist/vizart-core.mjs",

src/api/options.js

@@ -1,8 +1,8 @@
-import { mergeOptions } from '../options';
+import merge from '../options/merge';
 
 const apiOptions = state => ({
   options(opt) {
-    state._options = mergeOptions(state._options, opt);
+    state._options = merge(state._options, opt);
     return state._options;
   },
 });

src/api/state.js

@@ -2,16 +2,29 @@ import { dispatch } from 'd3-dispatch';
 import uuid from '../util/uuid';
 import isMobile from '../util/isMobile';
 import assignContainerBound from '../util/measureContainer';
+import mergeBase from '../options/mergeBase';
 
 const StandardDispatchers = {
   Rendered: 'rendered',
 };
 
+const initOpt = (userOpt, composer) => {
+    const { opt } = composer;
+
+    if (typeof opt === 'function') {
+        return opt(userOpt);
+    } else if (Array.isArray(opt)){
+        return mergeBase(...opt, userOpt);
+    } else {
+        return mergeBase(opt, userOpt);
+    }
+}
+
 const initState = (containerId, opt, composers) => ({
     _isMobileSize: isMobile(),
     _id: uuid(),
     _listeners: dispatch(Object.values(StandardDispatchers)),
-    _options: assignContainerBound(containerId, composers.opt(opt)),
+    _options: assignContainerBound(containerId, initOpt(opt, composers)),
     _data: [],
     _color: null,
     _container: null,

src/options/index.js

@@ -1,5 +1,3 @@
-export { default as mergeBase } from './mergeBase';
-export { default as mergeOptions } from './mergeOptions';
-export { default as BaseOptions } from './BaseOptions';
+export { default as mergeOptions } from './mergeBase';
 export { default as DefaultSequentialColor } from './DefaultSequentialColor';
 export { default as DefaultCategoricalColor } from './DefaultCategoricalColor';

src/options/mergeOptions.js → src/options/merge.js

@@ -1,12 +1,12 @@
 import mergeWith from 'lodash-es/mergeWith';
 import MergeCustomizer from './MergeCustomizer';
 
-const mergeOptions = (target, source) => {
+const merge = (target, source) => {
   if (source === undefined || source === null) return target;
 
   mergeWith(target, source, MergeCustomizer);
 
   return target;
 };
 
-export default mergeOptions;
+export default merge;

src/options/mergeBase.js

@@ -1,14 +1,14 @@
 import BaseOptions from './BaseOptions';
-import mergeOptions from './mergeOptions';
+import merge from './merge';
 
-const mergeBase = (...opts) => {
+const mergeOptions = (...opts) => {
   const base = Object.assign({}, BaseOptions);
 
   for (let o of opts) {
-    mergeOptions(base, o);
+    merge(base, o);
   }
 
   return base;
 };
 
-export default mergeBase;
+export default mergeOptions;