@bitrise/bitkit 10.16.2 → 10.17.0-alpha-export-new-notification.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bitrise/bitkit",
   "description": "Bitrise React component library",
-  "version": "10.16.2",
+  "version": "10.17.0-alpha-export-new-notification.1",
   "repository": "git@github.com:bitrise-io/bitkit.git",
   "main": "src/index.ts",
   "license": "UNLICENSED",

package/src/Components/Notification/Notification.stories.tsx

@@ -56,3 +56,11 @@ WithoutIcon.args = {
   action: undefined,
   showIcon: false,
 };
+
+export const WithAction: ComponentStoryFn<typeof Notification> = (props) => <Template {...props} />;
+WithAction.storyName = 'With action';
+WithAction.args = {
+  action: {
+    label: 'Upgrade',
+  },
+};

package/src/Components/Notification/Notification.tsx

@@ -1,4 +1,4 @@
-import { createContext, ReactNode, useContext, useMemo } from 'react';
+import { cloneElement, createContext, ReactElement, useContext, useMemo } from 'react';
 import {
   Alert as ChakraAlert,
   AlertTitle as NotificationTitle,
@@ -15,7 +15,9 @@ import CloseButton from '../CloseButton/CloseButton';
 import ColorButton, { ColorButtonProps } from '../ColorButton/ColorButton';
 import Icon, { TypeIconName } from '../Icon/Icon';
 
-const STATUSES: Record<string, { colorScheme: ColorScheme; defaultIcon: ReactNode }> = {
+type NotificationStatus = 'info' | 'error' | 'success' | 'warning' | 'progress';
+
+const STATUSES: Record<NotificationStatus, { colorScheme: ColorScheme; defaultIcon: ReactElement }> = {
   info: { colorScheme: 'blue', defaultIcon: <Icon name="Info" /> },
   error: { colorScheme: 'red', defaultIcon: <Icon name="ErrorGeneral" /> },
   success: { colorScheme: 'green', defaultIcon: <Icon name="Tick" /> },
@@ -24,25 +26,28 @@ const STATUSES: Record<string, { colorScheme: ColorScheme; defaultIcon: ReactNod
     colorScheme: 'purple',
     defaultIcon: (
       <chakra.span w="24" h="24" p="2">
-        <Spinner w="100%" h="100%" />
+        <Spinner w="100" h="100" />
       </chakra.span>
     ),
   },
 } as const;
 
-export type ActionProps = { label: string; href?: string; onClick?: () => void } & Omit<
-  ColorButtonProps,
-  'as' | 'onClick' | 'colorScheme'
->;
+export type ActionProps = {
+  label: string;
+  href?: string;
+  onClick?: () => void;
+} & Omit<ColorButtonProps, 'as' | 'onClick' | 'colorScheme'>;
 export interface NotificationProps extends Omit<AlertProps, 'status' | 'colorScheme' | 'onClose'> {
-  status: keyof typeof STATUSES;
+  status: NotificationStatus;
   onClose?: () => void;
   action?: ActionProps;
   iconName?: TypeIconName;
   showIcon?: boolean;
 }
 
-const ActionContext = createContext<{ colorScheme: ColorScheme }>({ colorScheme: 'blue' });
+const ActionContext = createContext<{ colorScheme: ColorScheme }>({
+  colorScheme: 'blue',
+});
 
 const NotificationAction = ({ label, href, ...rest }: ActionProps) => {
   const actionContext = useContext(ActionContext);
@@ -69,11 +74,14 @@ const Notification = forwardRef<NotificationProps, 'div'>((props, ref) => {
     actionButton = <NotificationAction marginRight="12" {...action} alignSelf="center" />;
   }
   const actionContext = useMemo(() => ({ colorScheme }), [colorScheme]);
+  // This is needed when the actionButton is rendered with a one-liner text.
+  // Without this both the icon and the text would be strangely aligned.
+  const marginTop = actionButton ? 4 : undefined;
   return (
     <ChakraAlert ref={ref} {...rest} colorScheme={colorScheme}>
       <ActionContext.Provider value={actionContext}>
-        {showIcon && <Box flexShrink={0}>{icon}</Box>}
-        <Box wordBreak="break-word" display="flex" flexDirection="column" flexGrow={1}>
+        {showIcon && cloneElement(icon, { flexShrink: 0, marginTop })}
+        <Box wordBreak="break-word" display="flex" flexDirection="column" flexGrow={1} marginTop={marginTop}>
           {children}
         </Box>
         {actionButton}

package/src/index.ts

@@ -152,6 +152,9 @@ export {
   typedDropdown,
 } from './Components/Dropdown/Dropdown';
 
+export type { NotificationProps } from './Components/Notification/Notification';
+export { default as Notification } from './Components/Notification/Notification';
+
 export { BREAKPOINTS } from './Foundations/Breakpoints/Breakpoints';
 
 export type { AccordionProps } from './Components/Accordion/Accordion';

package/src/old.ts

@@ -51,9 +51,6 @@ export { default as InputLabel } from './Old/Input/InputLabel';
 export type { Props as LogoProps } from './Old/Logo/Logo';
 export { default as Logo } from './Old/Logo/Logo';
 
-export type { Props as NotificationProps } from './Old/Notification/Notification';
-export { default as Notification } from './Old/Notification/Notification';
-
 export type { Props as ProgressBarProps } from './Old/Progress/ProgressBar';
 export { default as ProgressBar } from './Old/Progress/ProgressBar';