This commit is contained in:
Mirco Wittrien 2019-11-22 11:47:26 +01:00
parent 6961316f5a
commit fd243995bc
2 changed files with 5 additions and 5 deletions

View File

@ -3458,7 +3458,7 @@ var BDFDB = {
BDFDB.ModalUtils = {}; BDFDB.ModalUtils = {};
BDFDB.ModalUtils.open = function (plugin, config) { BDFDB.ModalUtils.open = function (plugin, config) {
if (!BDFDB.ObjectUtils.is(plugin) || !BDFDB.ObjectUtils.is(config)) return; if (!BDFDB.ObjectUtils.is(plugin) || !BDFDB.ObjectUtils.is(config)) return;
var modal, headerchildren = [], contentchildren = [], footerchildren = [], modalprops, cancels = [], closeModal = _ => { var modal, modalInstance, headerchildren = [], contentchildren = [], footerchildren = [], modalprops, cancels = [], closeModal = _ => {
if (BDFDB.ObjectUtils.is(modalprops) && typeof modalprops.onClose == "function") modalprops.onClose(); if (BDFDB.ObjectUtils.is(modalprops) && typeof modalprops.onClose == "function") modalprops.onClose();
}; };
if (typeof config.text == "string") { if (typeof config.text == "string") {
@ -3485,8 +3485,7 @@ var BDFDB = {
type: LibraryComponents.TabBar.Types.TOP, type: LibraryComponents.TabBar.Types.TOP,
items: tabbaritems, items: tabbaritems,
onItemSelect: (value, instance) => { onItemSelect: (value, instance) => {
let modal = BDFDB.DOMUtils.getParent(BDFDB.dotCN.modalwrapper, BDFDB.ReactUtils.findDOMNode(instance)); for (let tabcontent of modal.querySelectorAll(BDFDB.dotCN.modaltabcontent)) {
if (modal) for (let tabcontent of modal.querySelectorAll(BDFDB.dotCN.modaltabcontent)) {
let tabcontentinstance = BDFDB.ReactUtils.getValue(tabcontent, "return.return.stateNode"); let tabcontentinstance = BDFDB.ReactUtils.getValue(tabcontent, "return.return.stateNode");
if (tabcontentinstance) { if (tabcontentinstance) {
if (tabcontentinstance.props.tab == value) tabcontentinstance.props.open = true; if (tabcontentinstance.props.tab == value) tabcontentinstance.props.open = true;
@ -3512,7 +3511,7 @@ var BDFDB = {
color: color || LibraryComponents.Button.Colors.PRIMARY, color: color || LibraryComponents.Button.Colors.PRIMARY,
onClick: _ => { onClick: _ => {
if (button.close) closeModal(); if (button.close) closeModal();
if (!(button.close && button.cancel)) click(modal); if (!(button.close && button.cancel)) click(modal, modalInstance);
}, },
children: contents children: contents
})); }));
@ -3578,6 +3577,7 @@ var BDFDB = {
}); });
} }
componentDidMount () { componentDidMount () {
modalInstance = this;
modal = BDFDB.ReactUtils.findDOMNode(this); modal = BDFDB.ReactUtils.findDOMNode(this);
modal = modal && modal.parentElement ? modal.parentElement.querySelector(BDFDB.dotCN.modalwrapper) : null; modal = modal && modal.parentElement ? modal.parentElement.querySelector(BDFDB.dotCN.modalwrapper) : null;
if (modal && props.transitionState == 2 && props.transitionState > oldTransitionState) config.onOpen(modal, this); if (modal && props.transitionState == 2 && props.transitionState > oldTransitionState) config.onOpen(modal, this);

File diff suppressed because one or more lines are too long