Merge pull request #15 from gnosis/development

new release 0.1.3

Author: mmv08

LICENSE.md

@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) 2018 Gnosis Ltd
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gnosis.pm/safe-react-components",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Gnosis UI components",
   "main": "dist/index.min.js",
   "typings": "dist/index.d.ts",
@@ -24,6 +24,7 @@
     "classnames": "^2.2.6",
     "polished": "3.6.3",
     "react-docgen-typescript-loader": "^3.7.2",
+    "react-media": "^1.10.0",
     "url-loader": "^4.1.0"
   },
   "devDependencies": {

src/inputs/Button/button.stories.tsx

@@ -57,7 +57,7 @@ export const withIcon = () => (
       onClick={() => alert('click')}>
       text
     </Button>
-    <Button size="lg" iconType="addressBook" color="primary" variant="outlined">
+    <Button size="lg" iconType="addressBook" color="error" variant="outlined">
       text
     </Button>
     <Button

src/inputs/Button/index.tsx

@@ -50,7 +50,13 @@ const Button = ({
 
   return (
     <BootstrapButton {...rest}>
-      {iconType && <Icon size="md" color="white" type={iconType} />}
+      {iconType && (
+        <Icon
+          size="md"
+          color={variant === 'contained' ? 'white' : color}
+          type={iconType}
+        />
+      )}
       {children}
     </BootstrapButton>
   );

src/inputs/ButtonLink/index.tsx

@@ -5,7 +5,7 @@ import { Theme } from '../../theme';
 import Icon, { IconType } from '../../dataDisplay/Icon';
 import { Text } from '../../index';
 
-type Props = {
+export interface Props extends React.ComponentPropsWithoutRef<'button'> {
   iconType?: keyof IconType;
   color: keyof Theme['colors'];
   children: any;

src/inputs/Select/index.tsx

@@ -33,7 +33,7 @@ type Props = {
   id?: string;
 };
 
-function Select({ items, activeItemId, onItemClick, id }: Props) {
+function Select({ items, activeItemId, onItemClick, id, ...rest }: Props) {
   const [open, setOpen] = React.useState(false);
 
   const handleChange = (event: React.ChangeEvent<{ value: unknown }>) => {
@@ -58,7 +58,8 @@ function Select({ items, activeItemId, onItemClick, id }: Props) {
           onClose={handleClose}
           onOpen={handleOpen}
           value={activeItemId}
-          onChange={handleChange}>
+          onChange={handleChange}
+          {...rest}>
           {items.map((i) => {
             return (
               <MenuItem value={i.id} key={i.id}>

src/navigation/Stepper/DotStep.tsx

@@ -21,12 +21,10 @@ const Circle = styled.div<{ disabled: boolean; error?: boolean }>`
   display: flex;
   justify-content: center;
   align-items: center;
-  
-`;
 
-const StyledIcon = styled(Icon)`
-  /* span {margin:0px} */
-  margin-right: 0;
+  svg {
+    margin-top: 4px;
+  }
 `;
 
 type Props = {
@@ -37,7 +35,7 @@ type Props = {
 const DotStep = ({ currentIndex, dotIndex, error }: Props) => {
   return (
     <Circle disabled={dotIndex > currentIndex} error={error}>
-      {dotIndex < currentIndex ? <StyledIcon size="sm" type="check" color="white" /> : dotIndex}
+      {dotIndex < currentIndex ? <Icon size="sm" type="check" color="white" /> : dotIndex + 1}
     </Circle>
   );
 };

src/navigation/Stepper/index.tsx

@@ -1,10 +1,10 @@
-import React from "react";
-import StepperMUI from "@material-ui/core/Stepper";
-import StepMUI from "@material-ui/core/Step";
-import StepLabelMUI from "@material-ui/core/StepLabel";
-import styled from "styled-components";
+import React from 'react';
+import StepperMUI from '@material-ui/core/Stepper';
+import StepMUI from '@material-ui/core/Step';
+import StepLabelMUI from '@material-ui/core/StepLabel';
+import styled from 'styled-components';
 
-import DotStep from "./DotStep";
+import DotStep from './DotStep';
 
 const StyledStepLabel = styled.p<any>`
   && {
@@ -30,7 +30,7 @@ type Props = {
   steps: Array<{ id: string; label: string }>;
   activeStepIndex: number;
   error?: boolean;
-  orientation: "vertical" | "horizontal";
+  orientation: 'vertical' | 'horizontal';
 };
 
 const Stepper = ({ steps, error, activeStepIndex, orientation }: Props) => {
@@ -46,13 +46,11 @@ const Stepper = ({ steps, error, activeStepIndex, orientation }: Props) => {
                   dotIndex={index}
                   error={index === activeStepIndex && error}
                 />
-              }
-            >
+              }>
               <StyledStepLabel
                 error={index === activeStepIndex && error}
                 index={index}
-                activeStepIndex={activeStepIndex}
-              >
+                activeStepIndex={activeStepIndex}>
                 {s.label}
               </StyledStepLabel>
             </StepLabelMUI>

src/utils/modals/GenericModal/index.tsx

@@ -4,6 +4,7 @@ import { makeStyles } from '@material-ui/core/styles';
 import styled from 'styled-components';
 import cn from 'classnames';
 import { rgba } from 'polished';
+import Media from 'react-media';
 
 import theme from '../../../theme';
 import { Icon, Title } from '../../../index';
@@ -14,7 +15,6 @@ const StyledButton = styled.button`
   padding: 5px;
   width: 26px;
   height: 26px;
- 
 
   span {
     margin-right: 0px;
@@ -37,8 +37,11 @@ const TitleSection = styled.div`
   border-bottom: 2px solid ${({ theme }) => theme.colors.separator};
 `;
 
-const BodySection = styled.div<{ withoutBodyPadding?: boolean }>`
-  max-height: 460px;
+const BodySection = styled.div<{
+  withoutBodyPadding?: boolean;
+  smallHeight: boolean;
+}>`
+  max-height: ${({ smallHeight }) => (smallHeight ? '280px' : '460px')};
   overflow-y: auto;
   padding: ${({ withoutBodyPadding }) =>
     withoutBodyPadding ? '0' : '16px 24px'};
@@ -67,9 +70,13 @@ const useStyles = makeStyles({
   },
 
   paper: {
-    position: 'absolute',
-    top: '121px',
-    minWidth: '450px',
+    position: (props: { smallHeight: boolean }) =>
+      props.smallHeight ? 'relative' : 'absolute',
+    top: (props: { smallHeight: boolean }) =>
+      props.smallHeight ? 'unset' : '121px',
+    minWidth: '500px',
+    width: (props: { smallHeight: boolean }) =>
+      props.smallHeight ? '500px' : 'inherit',
     backgroundColor: theme.colors.white,
     borderRadius: '8px',
     boxShadow: `0 0 ${theme.colors.shadow.opacity} 0 ${theme.colors.shadow.color}`,
@@ -85,10 +92,12 @@ const GenericModal = ({
   footer,
   onClose,
   title,
-  withoutBodyPadding
-}: Props) => {
-  const classes = useStyles();
-
+  withoutBodyPadding,
+  smallHeight
+}: Props & { smallHeight: boolean }) => {
+  const classes = useStyles({ smallHeight });
+  console.log('smallHeight: ', smallHeight);
+  debugger;
   return (
     <Modal open className={classes.modal} title="GenericModal">
       <div className={cn(classes.paper)}>
@@ -101,7 +110,9 @@ const GenericModal = ({
           </StyledButton>
         </TitleSection>
 
-        <BodySection withoutBodyPadding={withoutBodyPadding}>
+        <BodySection
+          withoutBodyPadding={withoutBodyPadding}
+          smallHeight={smallHeight}>
           {body}
         </BodySection>
 
@@ -111,4 +122,9 @@ const GenericModal = ({
   );
 };
 
-export default GenericModal;
+const MediaModal = (props: Props) => (
+  <Media query={{ maxHeight: 500 }}>
+    {(matches) => <GenericModal {...props} smallHeight={matches} />}
+  </Media>
+);
+export default MediaModal;

src/utils/modals/ManageListModal/ManageListModal.stories.tsx

@@ -33,7 +33,7 @@ export const modal = () => {
       id: '3',
       iconUrl: 'someUrl3',
       name: 'three',
-      description: 'ever since the 1500s',
+      description: 'Long desc ever since the 1500s do not finish over the ocean of this',
       checked: true
     }
   ]);