@spothero/ui 14.4.0 → 14.5.1

package/CHANGELOG.md

@@ -1,3 +1,30 @@
+# 14.5.1 - 05/05/2022
+## Miscellaneous Updates
+* [[87e838a](https://github.com/spothero/fe-ui/commit/87e838a)] - `feature:` FED 321 secondary button updates, add tertiary and destructive buttons ([#284](https://github.com/spothero/fe-ui/pull/284)) (Mick Johnson)
+
+# 14.5.0 - 05/03/2022
+
+## New Features
+* [[173526f](https://github.com/spothero/fe-ui/commit/173526f)] - FED-354 feat: adds Input component ([#283](https://github.com/spothero/fe-ui/pull/283)) (annaliarosed)
+	* `feat:` Set up TextInput component
+	* `refactor:` Rename component and set up styles
+	* `feat:` Unlabeled, placeholder styles added
+	* `feat:` Unlabeled, value styles added
+	* `feat:` Unlabeled, focus styles added
+	* `feat:` Unlabeled, error and disabled styles added
+	* `feat:` Add label prop and styles
+	* `feat:` Add helperText prop and styles
+	* `feat:` Add errorMessage prop and styles
+	* `feat:` Add isReadOnly prop to stories
+	* `fix:` Clean up
+	* `fix:` Change value color when isInvalid
+	* `fix:` Add missing ref
+	* `refactor:` Extract FormControl
+	* `fix:` Remove imported interfaces
+	* `fix:` Pass only isInvalid prop to FormControl
+	* `fix:` Pass only isDisabled and isRequired prop to FormControl
+	* `fix:` Pass forgotten propsCo-authored-by: Annalia Destefano <annalia.destefano@spothero.com>
+
 # 14.4.0 - 04/21/2022
 
 ## Dependency Updates

package/CHANGELOG.tmp

@@ -1,5 +1,4 @@
-# 14.4.0 - 04/21/2022
-
-## Dependency Updates
-* [[d04c143](https://github.com/spothero/fe-ui/commit/d04c143)] - Upgrade to React 17 ([#282](https://github.com/spothero/fe-ui/pull/282)) (Gru Singh)
+# 14.5.1 - 05/05/2022
+## Miscellaneous Updates
+* [[87e838a](https://github.com/spothero/fe-ui/commit/87e838a)] - `feature:` FED 321 secondary button updates, add tertiary and destructive buttons ([#284](https://github.com/spothero/fe-ui/pull/284)) (Mick Johnson)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spothero/ui",
-  "version": "14.4.0",
+  "version": "14.5.1",
   "description": "SpotHero's React component UI library.",
   "main": "v2/index-bundled.cjs.js",
   "module": "v2/index.js",

package/styles/v2/components/Button/Button.jsx

@@ -15,6 +15,7 @@ const anchorProps = (isExternal = false) => ({
 const Button = forwardRef(({asAnchor, isExternal, ...props}, ref) => (
     <ChakraButton
         iconSpacing={2}
+        sx={{'text-underline-offset': '1px'}}
         {...props}
         {...((asAnchor || props.as === 'a') && anchorProps(isExternal))}
         ref={ref}

package/styles/v2/components/Button/Button.styles.js

@@ -32,6 +32,17 @@ const disabledButtonHoverStyle = {
     },
 };
 
+const destructiveButtonStyles = {
+    bg: 'white',
+    borderColor: 'red.default',
+    color: 'red.default',
+    _hover: {
+        borderColor: 'red.800',
+        color: 'red.800',
+        ...disabledButtonHoverStyle,
+    },
+};
+
 export const variants = {
     primary: {
         bg: 'primary.default',
@@ -63,7 +74,7 @@ export const variants = {
         borderColor: 'gray.medium',
         color: 'primary.default',
         _hover: {
-            borderColor: 'primary.default',
+            borderColor: 'primary.600',
             color: 'primary.600',
             ...disabledButtonHoverStyle,
         },
@@ -125,6 +136,57 @@ export const variants = {
             },
         },
     },
+    tertiary: {
+        bg: 'none',
+        borderWidth: 'none',
+        borderRadius: 'unset',
+        color: 'primary.default',
+        textDecoration: 'underline',
+        h: 'unset',
+        m: 'unset',
+        minW: 'unset',
+        p: 'unset',
+        lineHeight: 1,
+        _disabled: {
+            bg: 'none',
+            color: 'gray.dark',
+        },
+        _hover: {
+            color: 'primary.600',
+            _disabled: {
+                color: 'gray.dark',
+            },
+        },
+    },
+    tertiaryOnDark: {
+        bg: 'none',
+        borderRadius: 'unset',
+        borderWidth: 'none',
+        color: 'white',
+        textDecoration: 'underline',
+        h: 'unset',
+        m: 'unset',
+        minW: 'unset',
+        p: 'unset',
+        _disabled: {
+            bg: 'none',
+            color: 'white',
+            opacity: '.7',
+        },
+        _hover: {
+            color: 'white',
+            opacity: '.8',
+            _disabled: {
+                opacity: '.7',
+            },
+        },
+    },
+    destructive: {
+        ...destructiveButtonStyles,
+    },
+    destructiveOnDark: {
+        ...destructiveButtonStyles,
+    },
 };
 
 const defaultProps = {

package/styles/v2/components/Button/stories/index.stories.js

@@ -58,8 +58,23 @@ Tertiary.argTypes = {
     onClick: {action: 'clicked'},
 };
 Tertiary.args = {
-    children: 'textButton',
-    variant: 'textButton',
+    children: 'tertiary',
+    variant: 'tertiary',
+    isDisabled: false,
+    isLoading: false,
+    loadingText: 'Loading',
+    isFullWidth: false,
+};
+
+export const Destructive = ButtonTemplate.bind({});
+Destructive.argTypes = {
+    ...createSelectControl('type', ['button', 'reset', 'submit']),
+    ...disableArgs('variant'),
+    onClick: {action: 'clicked'},
+};
+Destructive.args = {
+    children: 'destructive',
+    variant: 'destructive',
     isDisabled: false,
     isLoading: false,
     loadingText: 'Loading',

package/styles/v2/components/FormControl/FormControl.jsx

@@ -0,0 +1,43 @@
+import React, {forwardRef} from 'react';
+import PropTypes from 'prop-types';
+import {
+    FormControl as ChakraFormControl,
+    FormHelperText,
+    FormLabel,
+    FormErrorMessage,
+} from '@chakra-ui/react';
+
+const FormControl = forwardRef(
+    ({children, label, helperText, errorMessage, ...props}, ref) => (
+        <ChakraFormControl {...props} ref={ref}>
+            {label && (
+                <FormLabel
+                    color="gray.600"
+                    fontWeight="semibold"
+                    mb={2}
+                    fontSize="sm"
+                >
+                    {label}
+                </FormLabel>
+            )}
+            {children}
+            {helperText && (
+                <FormHelperText color="gray.600" mt={1} fontSize="xs">
+                    {helperText}
+                </FormHelperText>
+            )}
+            <FormErrorMessage color="error" mt={1} fontSize="xs">
+                {errorMessage}
+            </FormErrorMessage>
+        </ChakraFormControl>
+    )
+);
+
+FormControl.propTypes = {
+    label: PropTypes.string,
+    helperText: PropTypes.string,
+    errorMessage: PropTypes.string,
+    children: PropTypes.node,
+};
+
+export default FormControl;

package/styles/v2/components/Input/Input.jsx

@@ -0,0 +1,41 @@
+import React, {forwardRef} from 'react';
+import PropTypes from 'prop-types';
+import {Input as ChakraInput} from '@chakra-ui/react';
+import FormControl from '../FormControl/FormControl';
+
+const Input = forwardRef(
+    (
+        {
+            label,
+            helperText,
+            errorMessage,
+            isInvalid,
+            isDisabled,
+            isRequired,
+            ...props
+        },
+        ref
+    ) => (
+        <FormControl
+            isInvalid={isInvalid}
+            isDisabled={isDisabled}
+            isRequired={isRequired}
+            errorMessage={errorMessage}
+            helperText={helperText}
+            label={label}
+        >
+            <ChakraInput ref={ref} {...props} />
+        </FormControl>
+    )
+);
+
+Input.propTypes = {
+    label: PropTypes.string,
+    helperText: PropTypes.string,
+    errorMessage: PropTypes.string,
+    isInvalid: PropTypes.bool,
+    isDisabled: PropTypes.bool,
+    isRequired: PropTypes.bool,
+};
+
+export default Input;

package/styles/v2/components/Input/Input.stories.js

@@ -0,0 +1,53 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import Component from './Input';
+
+export default {
+    title: 'v2/Input',
+    component: Component,
+    parameters: {
+        removeBaseHtmlClass: true,
+    },
+};
+
+const InputTemplate = props => (
+    <Component variant="outline" maxWidth="200px" {...props} />
+);
+
+InputTemplate.propTypes = {
+    placeholder: PropTypes.string,
+    label: PropTypes.string,
+    helperText: PropTypes.string,
+    errorMessage: PropTypes.string,
+    isInvalid: PropTypes.bool,
+    isDisabled: PropTypes.bool,
+    isReadOnly: PropTypes.bool,
+};
+
+export const Input = InputTemplate.bind({});
+
+Input.argTypes = {
+    placeholder: {
+        control: {type: 'text'},
+    },
+    label: {
+        control: {type: 'text'},
+    },
+    helperText: {
+        control: {type: 'text'},
+    },
+    errorMessage: {
+        control: {type: 'text'},
+    },
+};
+
+Input.args = {
+    placeholder: 'Placeholder text',
+    label: 'Label',
+    helperText: 'Helper text',
+    errorMessage: 'Error message',
+    isInvalid: false,
+    isDisabled: false,
+    isReadOnly: false,
+};

package/styles/v2/components/Input/index.js

@@ -0,0 +1 @@
+export {default} from './Input';

package/styles/v2/components/Input/styles/index.js

@@ -0,0 +1,35 @@
+import merge from 'lodash/merge';
+import chakraDefaultTheme from '@chakra-ui/theme';
+
+const variants = {
+    outline: {
+        field: {
+            border: '1px solid',
+            borderColor: 'gray.200',
+            fontSize: 'base',
+            paddingLeft: 3,
+            paddingRight: 3,
+            bg: 'inherit',
+            fontWeight: 'semibold',
+            boxShadow: 'none !important',
+            _placeholder: {color: 'gray.600', fontWeight: 'normal'},
+            _focus: {
+                borderColor: 'brandBlue',
+            },
+            _hover: {borderColor: 'gray.300'},
+            _readOnly: {boxShadow: 'none !important', userSelect: 'all'},
+            _disabled: {
+                backgroundColor: 'gray.50',
+                opacity: 0.4,
+                cursor: 'not-allowed',
+            },
+            _invalid: {
+                borderColor: 'error',
+            },
+        },
+    },
+};
+
+export default merge(chakraDefaultTheme.components.Input, {
+    variants,
+});

package/styles/v2/components/index.js

@@ -22,6 +22,7 @@ export {default as Icon} from './Icon/Icon';
 export {default as Image} from './Image/Image';
 export {default as Loader} from './Loader/Loader';
 export {default as Checkbox} from './Checkbox';
+export {default as Input} from './Input';
 export {Popover, PopoverTrigger, PopoverContent} from './Popover';
 
 // generic chakra reexports

package/styles/v2/components/styles.js

@@ -11,3 +11,4 @@ export {default as Tabs} from './Tabs/styles';
 export {default as Select} from './Select/styles';
 export {default as Checkbox} from './Checkbox/styles';
 export {default as Popover} from './Popover/styles';
+export {default as Input} from './Input/styles';