@bitrise/bitkit 12.17.2 → 12.17.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bitrise/bitkit",
   "description": "Bitrise React component library",
-  "version": "12.17.2",
+  "version": "12.17.3",
   "repository": "git@github.com:bitrise-io/bitkit.git",
   "main": "src/index.ts",
   "license": "UNLICENSED",

package/src/Components/CloseButton/CloseButton.tsx

@@ -3,6 +3,7 @@ import {
   CloseButton as ChakraCloseButton,
   CloseButtonProps as ChakraCloseButtonProps,
 } from '@chakra-ui/react';
+import Icon from '../Icon/Icon';
 import CloseButtonTheme from './CloseButton.theme';
 
 type ThemeArguments = Parameters<(typeof CloseButtonTheme)['baseStyle']>[0];
@@ -12,7 +13,9 @@ export interface CloseButtonProps extends ChakraCloseButtonProps {
 }
 
 const CloseButton = forwardRef<CloseButtonProps, 'button'>((props, ref) => (
-  <ChakraCloseButton ref={ref} {...CloseButtonTheme.defaultProps} {...props} />
+  <ChakraCloseButton ref={ref} {...CloseButtonTheme.defaultProps} {...props}>
+    <Icon name="CloseSmall" />
+  </ChakraCloseButton>
 ));
 
 export default CloseButton;

package/src/Components/Dialog/Dialog.theme.ts

@@ -28,10 +28,6 @@ const DialogTheme: ComponentStyleConfig = {
       position: 'absolute',
       top: '22',
       right: '22',
-      width: '40',
-      height: '40',
-      padding: '8',
-      borderRadius: '8',
     },
     body: {
       flex: 1,

package/src/Components/Dialog/Dialog.tsx

@@ -59,7 +59,7 @@ const Dialog: ComponentWithAs<'section', DialogProps> = ({
                 {title}
               </Text>
             </ModalHeader>
-            <ModalCloseButton isDisabled={!isClosable}>
+            <ModalCloseButton isDisabled={!isClosable} size="large">
               <Icon name="CloseSmall" />
             </ModalCloseButton>
           </>

package/src/Components/Notification/Notification.tsx

@@ -87,9 +87,7 @@ const Notification = forwardRef<NotificationProps, 'div'>((props, ref) => {
             marginTop={marginTop}
             colorScheme={colorScheme}
             onClick={onClose}
-          >
-            <Icon name="CloseSmall" />
-          </CloseButton>
+          />
         )}
       </ActionContext.Provider>
     </ChakraAlert>

package/src/Components/Ribbon/Ribbon.tsx

@@ -4,7 +4,6 @@ import { Alert as ChakraAlert, AlertProps, forwardRef } from '@chakra-ui/react';
 import { ColorScheme } from '../../Foundations/Colors/Colors';
 import CloseButton from '../CloseButton/CloseButton';
 import ColorButton, { ColorButtonProps } from '../ColorButton/ColorButton';
-import Icon from '../Icon/Icon';
 import Box from '../Box/Box';
 
 export type ActionProps = {
@@ -66,11 +65,7 @@ const Ribbon = forwardRef<RibbonProps, 'div'>((props, ref) => {
           {children}
           {actionButton}
         </Box>
-        {onClose && (
-          <CloseButton flexShrink={0} colorScheme={colorScheme} marginStart="auto" onClick={onClose}>
-            <Icon name="CloseSmall" />
-          </CloseButton>
-        )}
+        {onClose && <CloseButton flexShrink={0} colorScheme={colorScheme} marginStart="auto" onClick={onClose} />}
       </ActionContext.Provider>
     </ChakraAlert>
   );