refactor: remove mergeArray option

Draggable · Mar 8, 2020 · d2a60b5 · d2a60b5
1 parent f098399
commit d2a60b5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/js/common/utils.js b/src/js/common/utils.js
@@ -108,7 +108,11 @@ export const uuid = elem => {
 export const merge = (obj1, obj2, opts = Object.create(null)) => {
  const customizer = (objValue, srcValue) => {
  if (Array.isArray(objValue)) {
- return unique(opts.mergeArray ? objValue.concat(srcValue) : srcValue)
+ if (Array.isArray(srcValue)) {
+ return unique(opts.mergeArray ? objValue.concat(srcValue) : srcValue)
+ } else {
+ return srcValue
+ }
  }
  }
  return mergeWith({}, obj1, obj2, customizer)

diff --git a/src/js/components/controls/index.js b/src/js/components/controls/index.js
@@ -379,7 +379,7 @@ export class Controls {
  }
 
  applyOptions = (controlOptions = {}) => {
- const { container, elements, groupOrder, ...options } = merge(defaultOptions, controlOptions, { mergeArray: true })
+ const { container, elements, groupOrder, ...options } = merge(defaultOptions, controlOptions)
  this.container = container
  this.groupOrder = unique(groupOrder.concat(['common', 'html', 'layout']))
  this.elements = elements.concat(defaultElements)