From fc7a03e4e8f45eb28f77974f6624410aa67ac9f2 Mon Sep 17 00:00:00 2001 From: Ruslan Kabalin Date: Tue, 1 May 2018 01:23:25 +0100 Subject: [PATCH] ui-bootstrap: Refactor ModalTrigger to use Modal component. --- .../lib/components/ui/ModalTrigger.jsx | 29 +++++-------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/packages/vulcan-ui-bootstrap/lib/components/ui/ModalTrigger.jsx b/packages/vulcan-ui-bootstrap/lib/components/ui/ModalTrigger.jsx index 3bbeed39c..a666fe449 100644 --- a/packages/vulcan-ui-bootstrap/lib/components/ui/ModalTrigger.jsx +++ b/packages/vulcan-ui-bootstrap/lib/components/ui/ModalTrigger.jsx @@ -1,7 +1,6 @@ -import { registerComponent } from 'meteor/vulcan:lib'; +import { Components, registerComponent } from 'meteor/vulcan:core'; import React, { PureComponent } from 'react'; import PropTypes from 'prop-types'; -import Modal from 'react-bootstrap/lib/Modal' class ModalTrigger extends PureComponent { @@ -22,14 +21,6 @@ class ModalTrigger extends PureComponent { this.setState({modalIsOpen: false}); } - renderHeader() { - return ( - - {this.props.title} - - ) - } - render() { let triggerComponent = this.props.trigger || this.props.component; @@ -39,20 +30,18 @@ class ModalTrigger extends PureComponent { return (
{triggerComponent} - - {this.props.title ? this.renderHeader() : null} - - {childrenComponent} - - + {childrenComponent} +
- ) + ); } } @@ -65,10 +54,6 @@ ModalTrigger.propTypes = { title: PropTypes.oneOfType([PropTypes.string, PropTypes.element]), } -ModalTrigger.defaultProps = { - size: 'large' -} - registerComponent('ModalTrigger', ModalTrigger); export default ModalTrigger;