@platformatic/ui-components 0.1.68 → 0.1.69

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@platformatic/ui-components",
   "description": "Platformatic UI Components",
-  "version": "0.1.68",
+  "version": "0.1.69",
   "type": "module",
   "license": "Apache-2.0",
   "repository": {

package/src/components/ButtonFullRounded.jsx

@@ -7,7 +7,7 @@ import PlatformaticIcon from './PlatformaticIcon'
 import { COLORS_ICON, SIZES, BACKGROUND_COLOR_OPAQUE, PADDING_SIZES, SMALL, WHITE, NONE } from './constants'
 function ButtonFullRounded ({ className, iconName, iconSize, iconColor, disabled, paddingSize, alt, onClick, hoverEffect, bordered }) {
   const padding = commonStyles[`padding--${paddingSize}`]
-  const containerClassName = `${className} ${styles.roundedFull} ` + commonStyles['background-color-main-dark-blue']
+  const containerClassName = `${className} ${styles.roundedFull}`
   let buttonClassName = `${styles.roundedFull} ${styles.buttonRoundedFull} ${padding}`
   if (bordered) buttonClassName += ' ' + commonStyles[`bordered--${iconColor}`]
   if (disabled) {

package/src/components/ButtonFullRounded.module.css

@@ -1,5 +1,5 @@
 .buttonRoundedFull {
-  @apply flex justify-center cursor-pointer bg-main-dark-blue border items-center;
+  @apply flex justify-center cursor-pointer border items-center;
 }
 .disabled {
   @apply bg-opacity-30 cursor-default;

package/src/components/Modal.jsx

@@ -1,32 +1,49 @@
-import React, { useState } from 'react'
+'use strict'
+import React from 'react'
+import PropTypes from 'prop-types'
+import ButtonFullRounded from './ButtonFullRounded'
 import useEscapeKey from '../hooks/useEscapeKey'
 import CloseIcon from './icons/CloseIcon'
-import CircleCloseIcon from './icons/CircleCloseIcon'
-import CircleCloseHoverIcon from './icons/CircleCloseHoverIcon'
 import Logo from './Logo'
 import styles from './Modal.module.css'
+import commonStyles from './Common.module.css'
+import { MODAL_SIZES, SMALL, MODAL_LAYOUTS, MODAL_COVER, MODAL_POPUP, MAIN_DARK_BLUE, BACKGROUND_COLOR_OPAQUE, MEDIUM } from './constants'
+
+function Modal ({ setIsOpen, title, layout, children, size }) {
+  let contentFullscreen
+  let titleFullscreen
+  let modalClassName = `${styles.modal}`
+  modalClassName += ' ' + styles[`modal--${layout}`]
+  modalClassName += ' ' + styles[`modal--${size}`]
+
+  let buttonFullRoundedClassName
+
+  const headerClassName = styles[`header--${layout}`]
+  if (MODAL_COVER === layout) {
+    contentFullscreen = styles[`content--${layout}`]
+    titleFullscreen = styles[`title--${layout}`]
+    buttonFullRoundedClassName = `${styles['close--cover']} `
+    buttonFullRoundedClassName += commonStyles['background-color-light-blue']
+  }
 
-export default function Modal (props) {
-  const { setIsOpen, title, layout = 'info' } = props
-  const [isHoverCloseModal, setIsHoverCloseModal] = useState(false)
   useEscapeKey(() => setIsOpen(false))
   let whichModal = <></>
 
   switch (layout) {
-    case 'info':
+    case MODAL_POPUP:
       whichModal = (
         <>
           <div className={styles.blur} onClick={() => setIsOpen(false)} />
           <div className={`${styles.container} ${styles.centered}`}>
-            <div className={`${styles.modal} ${styles.modalInfo}`}>
-              <div className={styles.header}>
+            <div className={modalClassName}>
+              <div className={headerClassName}>
                 <div className={styles.title}>{title}</div>
                 <div className={styles.close} onClick={() => setIsOpen(false)}>
-                  <CloseIcon size='small' />
+                  <CloseIcon size={SMALL} />
                 </div>
               </div>
               <div>
-                {props.children}
+                {children}
               </div>
             </div>
           </div>
@@ -34,55 +51,29 @@ export default function Modal (props) {
       )
       break
 
-    case 'invite':
+    case MODAL_COVER:
       whichModal = (
-        <>
-          <div className={styles.blur} onClick={() => setIsOpen(false)} />
-          <div className={`${styles.container} ${styles.centered}`}>
-            <div className={`${styles.modal} ${styles.modalInvite}`}>
-              <div className={styles.headerInvite}>
-                <div
-                  className={styles.close}
-                  onClick={() => setIsOpen(false)}
-                  onMouseEnter={() => setIsHoverCloseModal(true)}
-                  onMouseLeave={() => setIsHoverCloseModal(false)}
-                >
-                  {isHoverCloseModal ? <CircleCloseHoverIcon color='main-green' /> : <CircleCloseIcon color='main-green' />}
-                </div>
-              </div>
-              <p className={styles.titleInvite}>{title}</p>
-              <div>{props.children}</div>
-            </div>
+        <div className={`${styles.container} ${styles.fullscreen}`}>
+          <div className={headerClassName}>
+            <ButtonFullRounded
+              className={buttonFullRoundedClassName}
+              iconName='CircleCloseIcon'
+              iconSize={MEDIUM}
+              iconColor={MAIN_DARK_BLUE}
+              hoverEffect={BACKGROUND_COLOR_OPAQUE}
+              onClick={() => { setIsOpen(false) }}
+              bordered={false}
+              alt='Close'
+            />
           </div>
-        </>
-      )
-      break
-
-    case 'fullscreen':
-      whichModal = (
-        <>
-          <div className={`${styles.container} ${styles.fullscreen}`}>
-            <div className={styles.modalFullscreen}>
-              <div className={styles.headerInvite}>
-                <div
-                  className={styles.close}
-                  onClick={() => setIsOpen(false)}
-                  onMouseEnter={() => setIsHoverCloseModal(true)}
-                  onMouseLeave={() => setIsHoverCloseModal(false)}
-                >
-                  {isHoverCloseModal ? <CircleCloseHoverIcon color='main-dark-blue' /> : <CircleCloseIcon color='main-dark-blue' />}
-                </div>
-              </div>
-              <div className={styles.contentFullscreen}>
-                <div className={styles.titleFullscreen}>
-                  <Logo width={100} heigth={80} color='main-dark-blue' />
-                  <h3>PLATFORMATIC</h3>
-                </div>
-                <div>{props.children}</div>
-              </div>
+          <div className={contentFullscreen}>
+            <div className={titleFullscreen}>
+              <Logo width={100} heigth={80} color={MAIN_DARK_BLUE} />
+              <h3>PLATFORMATIC</h3>
             </div>
+            <div>{children}</div>
           </div>
-        </>
+        </div>
       )
       break
 
@@ -91,3 +82,36 @@ export default function Modal (props) {
   }
   return whichModal
 }
+
+Modal.propTypes = {
+  /**
+   * children
+   */
+  children: PropTypes.node,
+  /**
+   * setIsOpen
+   */
+  setIsOpen: PropTypes.func,
+  /**
+   * title
+   */
+  title: PropTypes.string,
+  /**
+   * layout
+   */
+  layout: PropTypes.oneOf(MODAL_LAYOUTS),
+  /**
+   * Size
+   */
+  size: PropTypes.oneOf(MODAL_SIZES)
+}
+
+Modal.defaultProps = {
+  children: null,
+  setIsOpen: () => {},
+  title: '',
+  layout: MODAL_POPUP,
+  size: SMALL
+}
+
+export default Modal

package/src/components/Modal.module.css

@@ -9,42 +9,45 @@
   @apply fixed top-[50%] left-[50%] translate-x-[-50%] translate-y-[-50%]
 }
 .modal {
-  @apply p-4 rounded-md mx-auto my-auto min-w-[480px] max-h-[85vh] overflow-y-auto;
+  @apply p-4 rounded-md mx-auto my-auto max-h-[85vh] overflow-y-auto;
 }
-.modalInfo {
-  @apply bg-light-blue max-w-[480px];
-}
-.modalInvite {
-  @apply bg-main-dark-blue border-light-green border shadow-wrap shadow-main-green max-w-[480px] max-h-[300px];
+.modal--popup {
+  @apply bg-light-blue;
 }
 .fullscreen {
   @apply fixed top-0 left-0 bg-light-blue h-screen w-full min-h-screen min-w-full py-4 pl-20 pr-4 overflow-y-auto;
 }
-.header {
+.header--popup {
   @apply flex justify-between items-center;
 }
-.headerInvite {
+.header--cover {
   @apply flex justify-end;
 }
-.close {
-  @apply hover:cursor-pointer;
-}
 .hr {
   @apply text-[#00283D] my-2 opacity-20;
 }
 .title {
   @apply font-bold text-lg;
 }
-.titleInvite {
-  @apply font-bold text-lg text-main-green text-center;
-}
-.contentFullscreen {
+.content--cover {
   @apply h-auto w-full pt-4;
 }
-.titleFullscreen {
+.title--cover {
   @apply inline-flex items-center;
 }
-.titleFullscreen h3 {
+.title--cover h3 {
   @apply text-[22px] text-dark-blue font-bold tracking-widest mx-3;
 }
+.modal--small {
+  @apply min-w-[480px] max-w-[480px];
+}
+.modal--medium {
+  @apply min-w-[880px] max-w-[880px];
+}
+.modal--full-width {
+  @apply w-screen min-w-full;
+}
+.close--cover {
+  @apply h-6 w-6;
+}
 

package/src/components/Sidebar.jsx

@@ -1,13 +1,14 @@
 import React, { useEffect, useState } from 'react'
 import Icons from './icons'
 import Button from './Button'
+import ButtonFullRounded from './ButtonFullRounded'
+import commonStyles from './Common.module.css'
 import styles from './Sidebar.module.css'
 import ReactTooltip from 'react-tooltip'
 import HorizontalSeparator from './HorizontalSeparator'
 import PlatformaticIcon from './PlatformaticIcon'
 import PropTypes from 'prop-types'
 import { BACKGROUND_COLOR_OPAQUE, MEDIUM, WHITE } from './constants'
-import ButtonFullRounded from './ButtonFullRounded'
 
 function Sidebar (props) {
   const {
@@ -24,6 +25,8 @@ function Sidebar (props) {
   const [collapsed, setCollapsed] = useState(false)
   const [selectedItem, setSelectedItem] = useState(null)
   const disabledCreateButton = disableClickAdd ? styles.disabled : ''
+  let buttonFullRoundedClassName = `${styles.buttonCollapse} `
+  buttonFullRoundedClassName += commonStyles['background-color-main-dark-blue']
 
   function onClickItemSelected (item) {
     setSelectedItem(item.id)
@@ -40,7 +43,7 @@ function Sidebar (props) {
         ? (
           <>
             <ButtonFullRounded
-              className={styles.buttonCollapse}
+              className={buttonFullRoundedClassName}
               iconName='CircleArrowRightIcon'
               iconSize={MEDIUM}
               iconColor={WHITE}
@@ -65,7 +68,7 @@ function Sidebar (props) {
         : (
           <>
             <ButtonFullRounded
-              className={styles.buttonCollapse}
+              className={buttonFullRoundedClassName}
               iconName='CircleArrowLeftIcon'
               iconSize={MEDIUM}
               iconColor={WHITE}

package/src/components/constants.js

@@ -14,4 +14,10 @@ export const PADDING_SIZES = [NONE, ...SIZES]
 export const BOX_SHADOW = 'box-shadow'
 export const BACKGROUND_COLOR_OPAQUE = 'background-color-opaque'
 export const UNDERLINE = 'underline'
+export const FULL_WIDTH = 'full-width'
 export const HOVER_EFFECTS_BUTTONS = [BOX_SHADOW, BACKGROUND_COLOR_OPAQUE, UNDERLINE]
+export const MODAL_SIZES = [SMALL, MEDIUM, FULL_WIDTH]
+
+export const MODAL_POPUP = 'popup'
+export const MODAL_COVER = 'cover'
+export const MODAL_LAYOUTS = [MODAL_POPUP, MODAL_COVER]

package/src/stories/Modal.stories.jsx

@@ -4,6 +4,7 @@ import Button from '../components/Button'
 import BorderedBox from '../components/BorderedBox'
 import DropDown from '../components/DropDown'
 import HorizontalSeparator from '../components/HorizontalSeparator'
+import { FULL_WIDTH, MAIN_DARK_BLUE, MAIN_GREEN, MODAL_COVER, MODAL_LAYOUTS, MODAL_SIZES } from '../components/constants'
 export default {
   title: 'Platformatic/Modal',
   component: Modal,
@@ -12,7 +13,14 @@ export default {
       type: 'string',
       control: {
         type: 'radio',
-        options: ['info', 'invite', 'fullscreen']
+        options: MODAL_LAYOUTS
+      }
+    },
+    size: {
+      type: 'string',
+      control: {
+        type: 'radio',
+        options: MODAL_SIZES
       }
     }
   }
@@ -25,24 +33,12 @@ const Template = (args) => {
     <main>
       <BorderedBox>This Is another Content</BorderedBox>
       <ContentThatLoads />
-      <Button color='main-green' buttonClass='primary' onClick={() => setIsOpen(true)} label='Open Modal' />
+      <Button color={MAIN_GREEN} backgroundColor={MAIN_DARK_BLUE} onClick={() => setIsOpen(true)} label='Open Modal' />
       {isOpen && <Modal setIsOpen={setIsOpen} {...rest}>{text}</Modal>}
     </main>
   )
 }
 
-const TemplateInvite = (args) => {
-  const [isOpen, setIsOpen] = useState(false)
-  return (
-    <main>
-      <BorderedBox>This Is another Content</BorderedBox>
-      <ContentThatLoads />
-      <Button color='main-green' buttonClass='primary' onClick={() => setIsOpen(true)} label='Open Modal' />
-      {isOpen && <Modal setIsOpen={setIsOpen} {...args}><p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed</p><Button buttonClass='primary' onClick={() => setIsOpen(false)} label='Discard invite' /></Modal>}
-    </main>
-  )
-}
-
 const ContentThatLoads = () => {
   const [content, setContent] = useState(null)
   setTimeout(() => {
@@ -55,8 +51,7 @@ const ContentThatLoads = () => {
 export const Default = Template.bind({})
 Default.args = {
   title: 'List Title',
-  text: 'Hello World',
-  layout: 'info'
+  text: 'Hello World'
 }
 
 export const WithLongText = Template.bind({})
@@ -87,14 +82,9 @@ const MenuTemplate = () => {
 }
 export const WithDropDown = MenuTemplate.bind({})
 
-export const InviteLayout = TemplateInvite.bind({})
-InviteLayout.args = {
-  title: 'Give me an invite',
-  layout: 'invite'
-}
-
 export const FullscreenLayout = Template.bind({})
 FullscreenLayout.args = {
   title: 'Give me an invite',
-  layout: 'fullscreen'
+  size: FULL_WIDTH,
+  layout: MODAL_COVER
 }