@bitrise/bitkit 9.15.0-alpha-chakra.1 → 9.15.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bitrise/bitkit",
   "description": "Bitrise React component library",
-  "version": "9.15.0-alpha-chakra.1",
+  "version": "9.15.0",
   "repository": "git@github.com:bitrise-io/bitkit.git",
   "main": "src/index.ts",
   "license": "UNLICENSED",
@@ -38,11 +38,10 @@
     "@juggle/resize-observer": "^3.3.1",
     "@popperjs/core": "^2.11.5",
     "@types/react-transition-group": "^4.4.4",
-    "chakra-react-select": "3.3.3",
     "classnames": "^2.3.1",
     "clipboard": "^2.0.11",
     "framer-motion": "^6.3.3",
-    "luxon": "^2.4.0",
+    "luxon": "^2.3.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-popper": "^2.3.0",
@@ -78,19 +77,19 @@
     "@types/clipboard": "^2.0.1",
     "@types/enzyme": "^3.10.12",
     "@types/fscreen": "^1.0.1",
-    "@types/jest": "^27.5.1",
+    "@types/jest": "^27.5.0",
     "@types/lodash.sample": "^4.2.7",
     "@types/lodash.shuffle": "^4.2.7",
     "@types/luxon": "^2.3.2",
     "@types/prismjs": "^1.26.0",
-    "@types/react": "17.0.45",
-    "@types/react-dom": "^17.0.17",
+    "@types/react": "17.0.44",
+    "@types/react-dom": "^17.0.16",
     "@types/react-router": "^5.1.18",
     "@types/react-router-dom": "^5.3.3",
     "@types/react-transition-group": "^4.4.4",
     "@types/vfile-message": "^2.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.23.0",
-    "@typescript-eslint/parser": "^5.23.0",
+    "@typescript-eslint/eslint-plugin": "^5.22.0",
+    "@typescript-eslint/parser": "^5.22.0",
     "@wojtekmaj/enzyme-adapter-react-17": "^0.6.7",
     "axios": "^0.27.2",
     "babel-eslint": "^10.0.1",
@@ -100,7 +99,7 @@
     "concurrently": "^7.1.0",
     "enzyme": "^3.11.0",
     "enzyme-to-json": "^3.6.2",
-    "eslint": "^8.15.0",
+    "eslint": "^8.14.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jest": "^26.1.5",
     "eslint-plugin-jsx-a11y": "^6.5.1",
@@ -108,9 +107,9 @@
     "eslint-plugin-react": "^7.29.4",
     "eslint-plugin-react-hooks": "^4.5.0",
     "eslint-plugin-storybook": "^0.5.11",
-    "eslint-plugin-testing-library": "^5.5.0",
+    "eslint-plugin-testing-library": "^5.3.1",
     "fscreen": "^1.2.0",
-    "glob": "^8.0.2",
+    "glob": "^8.0.1",
     "husky": "^7.0.4",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^27.5.1",
@@ -132,7 +131,7 @@
     "ts-node": "^10.7.0",
     "tsconfig-paths-webpack-plugin": "^3.5.2",
     "typescript": "^4.6.4",
-    "webpack": "^5.72.1"
+    "webpack": "^5.72.0"
   },
   "files": [
     "src",

package/src/Components/Button/Button.stories.tsx

@@ -5,6 +5,12 @@ import Button from './Button';
 export default {
   title: 'Components/Button',
   component: Button,
+  argTypes: {
+    as: {
+      control: 'inline-radio',
+      options: ['a', 'button'],
+    },
+  },
 } as ComponentMeta<typeof Button>;
 
 const Template: ComponentStory<typeof Button> = (props) => <Button {...props} />;

package/src/Components/ColorButton/ColorButton.stories.tsx

@@ -0,0 +1,25 @@
+import { ComponentStory, ComponentMeta } from '@storybook/react';
+import { sortObjectByKey } from '../../utils/storyUtils';
+import ColorButton from './ColorButton';
+
+export default {
+  title: 'Components/ColorButton',
+  component: ColorButton,
+  argTypes: {
+    as: {
+      control: 'inline-radio',
+      options: ['a', 'button'],
+    },
+  },
+} as ComponentMeta<typeof ColorButton>;
+
+const Template: ComponentStory<typeof ColorButton> = (props) => <ColorButton {...props} />;
+
+export const WithProps = Template.bind({});
+WithProps.args = sortObjectByKey({
+  ...ColorButton.defaultProps,
+  children: 'ColorButton',
+  colorScheme: 'blue',
+  isDisabled: false,
+  isLoading: false,
+});

package/src/Components/ColorButton/ColorButton.theme.ts

@@ -0,0 +1,22 @@
+const schemeColors = {
+  default: { backgroundColor: 'inherit', color: 'inherit' },
+  blue: { backgroundColor: 'blue.93', color: 'blue.40' },
+  red: { backgroundColor: 'red.93', color: 'red.40' },
+  green: { backgroundColor: 'green.95', color: 'green.50' },
+  yellow: { backgroundColor: 'yellow.95', color: 'yellow.40' },
+  purple: { backgroundColor: 'purple.95', color: 'purple.40' },
+};
+
+const ColorButtonTheme = {
+  baseStyle: ({ colorScheme: c }: { colorScheme?: 'blue' | 'red' | 'green' | 'yellow' | 'purple' }) => {
+    return {
+      display: 'inline-flex',
+      alignItems: 'center',
+      justifyContent: 'center',
+      ...schemeColors[c || 'default'],
+      _hover: schemeColors[c || 'default'],
+    };
+  },
+};
+
+export default ColorButtonTheme;

package/src/Components/ColorButton/ColorButton.tsx

@@ -0,0 +1,36 @@
+import React from 'react';
+import { Button as ChakraButton, ButtonProps as ChakraButtonProps, forwardRef, useStyleConfig } from '@chakra-ui/react';
+
+export interface ColorButtonProps extends ChakraButtonProps {
+  as?: 'a' | 'button';
+  colorScheme?: 'blue' | 'red' | 'green' | 'yellow' | 'purple';
+}
+
+/**
+ * The ColorButton component is used to trigger an action or event, such as submitting a form, opening a dialog, canceling an action, or performing a delete operation.
+ */
+const ColorButton = forwardRef<ColorButtonProps, 'button'>((props, ref) => {
+  const { as, colorScheme, isDisabled, isLoading, ...rest } = props;
+  const styles = {
+    ...useStyleConfig('Button', { size: 'small' }),
+    ...useStyleConfig('ColorButton', { colorScheme }),
+  };
+
+  const properties: ChakraButtonProps = {
+    as,
+    __css: styles,
+    isDisabled,
+    isLoading,
+    ...rest,
+  };
+  if (isDisabled) {
+    properties.as = 'button';
+  }
+  return <ChakraButton {...properties} size="small" ref={ref} />;
+});
+
+ColorButton.defaultProps = {
+  as: 'button',
+} as ColorButtonProps;
+
+export default ColorButton;

package/src/Components/Menu/Menu.theme.ts

@@ -3,7 +3,7 @@ import type { SystemStyleObject } from '@chakra-ui/theme-tools';
 const MenuTheme: SystemStyleObject = {
   baseStyle: {
     list: {
-      bg: 'neutral.100',
+      backgroundColor: 'neutral.100',
       border: '1px solid',
       borderColor: 'neutral.93',
       borderRadius: '4',
@@ -15,11 +15,11 @@ const MenuTheme: SystemStyleObject = {
       padding: '12',
       paddingRight: '16',
       _focus: {
-        bg: 'neutral.95',
+        backgroundColor: 'neutral.93',
         boxShadow: 'none',
       },
       _active: {
-        bg: 'neutral.93',
+        backgroundColor: 'neutral.90',
       },
     },
   },

package/src/index.ts

@@ -29,8 +29,5 @@ export { default as Card } from './Components/Card/Card';
 export type { CardContentProps } from './Components/Card/CardContent';
 export { default as CardContent } from './Components/Card/CardContent';
 
-export type { SelectProps } from './Components/Select/Select';
-export { default as Select } from './Components/Select/Select';
-
-export type { DropdownProps } from './Components/Dropdown/Dropdown';
-export { default as Dropdown } from './Components/Dropdown/Dropdown';
+export type { ColorButtonProps } from './Components/ColorButton/ColorButton';
+export { default as ColorButton } from './Components/ColorButton/ColorButton';

package/src/old.ts

@@ -52,16 +52,14 @@ export { default as Bounds } from './Old/Bounds/Bounds';
 export type { Props as CheckboxProps } from './Old/Checkbox/Checkbox';
 export { default as Checkbox } from './Old/Checkbox/Checkbox';
 
-export type { Props as ColorButtonProps } from './Old/Button/ColorButton';
-export { default as ColorButton } from './Old/Button/ColorButton';
-
 export type { Props as DatePickerProps } from './Old/DatePicker/DatePicker';
 export { default as DatePicker } from './Old/DatePicker/DatePicker';
 
 export type { Props as DotProps } from './Old/Dot/Dot';
 export { default as Dot } from './Old/Dot/Dot';
 
-export type { Props as OldDropdownProps } from './Old/Dropdown/Dropdown';
+export type { Props as DropdownProps } from './Old/Dropdown/Dropdown';
+export { default as Dropdown } from './Old/Dropdown/Dropdown';
 
 export type { Props as DropdownButtonProps } from './Old/Dropdown/DropdownButton';
 export { default as DropdownButton } from './Old/Dropdown/DropdownButton';
@@ -167,9 +165,6 @@ export { default as ProgressBar } from './Old/Progress/ProgressBar';
 export type { Props as ProgressBitbotProps } from './Old/Progress/ProgressBitbot';
 export { default as ProgressBitbot } from './Old/Progress/ProgressBitbot';
 
-export type { Props as ProgressColorButtonProps } from './Old/Progress/ProgressColorButton';
-export { default as ProgressColorButton } from './Old/Progress/ProgressColorButton';
-
 export type { Props as ProgressSpinnerProps } from './Old/Progress/ProgressSpinner';
 export { default as ProgressSpinner } from './Old/Progress/ProgressSpinner';
 

package/src/theme.ts

@@ -1,9 +1,9 @@
 import Button from './Components/Button/Button.theme';
 import Card from './Components/Card/Card.theme';
+import ColorButton from './Components/ColorButton/ColorButton.theme';
 import Divider from './Components/Divider/Divider.theme';
 import Link from './Components/Link/Link.theme';
 import Menu from './Components/Menu/Menu.theme';
-import Select from './Components/Select/Select.theme';
 import Text from './Components/Text/Text.theme';
 
 import colors from './Foundations/Colors/Colors';
@@ -48,10 +48,10 @@ const theme = {
   components: {
     Button,
     Card,
+    ColorButton,
     Divider,
     Link,
     Menu,
-    Select,
     Text,
   },
 };