From 2090329d546cbce97c8f2756bfa0cc6781a7f5f5 Mon Sep 17 00:00:00 2001 From: joke2k Date: Sun, 13 Dec 2020 11:31:49 +0000 Subject: [PATCH] simplify offset config --- js/src/dropdown.js | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/js/src/dropdown.js b/js/src/dropdown.js index 177c7f7d5..78ad80371 100644 --- a/js/src/dropdown.js +++ b/js/src/dropdown.js @@ -72,7 +72,7 @@ const PLACEMENT_RIGHT = isRTL ? 'left-start' : 'right-start' const PLACEMENT_LEFT = isRTL ? 'right-start' : 'left-start' const Default = { - offset: 0, + offset: [0, 0], flip: true, boundary: 'clippingParents', reference: 'toggle', @@ -81,7 +81,7 @@ const Default = { } const DefaultType = { - offset: '(number|string|function)', + offset: '(array|string|function)', flip: 'boolean', boundary: '(string|element)', reference: '(string|element)', @@ -296,17 +296,10 @@ class Dropdown extends BaseComponent { return [0, 0] } - if (typeof offset === 'number') { - offset = [offset, 0] - } else if (typeof offset === 'string') { - offset = offset.split(',') - if (offset.length === 1) { - offset = [offset[0], 0] - } - - offset = offset.map(val => Number.parseInt(val, 10)) + if (typeof offset === 'string') { + offset = offset.split(',').map(val => Number.parseInt(val, 10)) } else if (typeof offset === 'function') { - offset = (popper, reference, placement) => { + offset = ({ popper, reference, placement }) => { return offset({ popper, reference, placement }, this._element) } }