IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/new-login-page

Browse Source
This commit is contained in:
Vladislav Makhov 2020-07-20 11:54:06 +03:00
commit df3f01a18c
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/ASC.Web.Components/package.json
View File

@ -1,6 +1,6 @@
{
"name": "asc-web-components",
"version": "1.0.366",
"version": "1.0.367",
"description": "Ascensio System SIA component library",
"license": "AGPL-3.0",
"main": "dist/asc-web-components.js",

1
web/ASC.Web.Components/src/components/modal-dialog/README.md
View File

@ -36,3 +36,4 @@ import { ModalDialog } from "asc-web-components";
| `footerContent` | `string`,`element` | - | - | - | Footer content |
| `onClose` | `func` | - | - | - | Will be triggered when a close button is clicked |
| `zIndex` | `number` | - | - | `310` | CSS z-index |
| `bodyPadding` | `string` | - | - | `16px 0` | CSS padding props for body section |

13
web/ASC.Web.Components/src/components/modal-dialog/index.js
View File

@ -59,7 +59,7 @@ top: 19px;
const Body = styled.div`
position: relative;
padding: 16px 0;
padding: ${props => props.bodyPadding};
`;
const Footer = styled.div``;
@ -130,7 +130,8 @@ class ModalDialog extends React.Component {
bodyContent,
footerContent,
onClose,
zIndex
zIndex,
bodyPadding
} = this.props;
return this.state.displayType === "modal" ? (
@ -147,7 +148,7 @@ class ModalDialog extends React.Component {
</Heading>
<CloseButton onClick={onClose}></CloseButton>
</StyledHeader>
<Body>{bodyContent}</Body>
<Body bodyPadding={bodyPadding}>{bodyContent}</Body>
<Footer>{footerContent}</Footer>
</Content>
</Dialog>
@ -171,7 +172,7 @@ class ModalDialog extends React.Component {
</Heading>
{scale ? <CloseButton onClick={onClose}></CloseButton> : ""}
</StyledHeader>
<Body>{bodyContent}</Body>
<Body bodyPadding={bodyPadding}>{bodyContent}</Body>
<Footer className="modal-dialog-aside-footer">{footerContent}</Footer>
</Content>
</Aside>
@ -198,6 +199,7 @@ ModalDialog.propTypes = {
]),
onClose: PropTypes.func,
zIndex: PropTypes.number,
bodyPadding: PropTypes.string,
className: PropTypes.string,
id: PropTypes.string,
style: PropTypes.oneOfType([PropTypes.object, PropTypes.array])
@ -205,7 +207,8 @@ ModalDialog.propTypes = {
ModalDialog.defaultProps = {
displayType: "auto",
zIndex: 310
zIndex: 310,
bodyPadding: "16px 0"
};
export default ModalDialog;