Merge branch 'dev'

scaleflex · Aug 12, 2024 · 989666b · 989666b
2 parents 95a6bd1 + 63a3468
commit 989666b
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 7 deletions.
diff --git a/packages/icons/src/index.ts b/packages/icons/src/index.ts
@@ -457,3 +457,4 @@ export { Workspace } from './workspace';
 export { Ai } from './ai';
 export { Denied } from './denied';
 export { Congratulations } from './congratulations';
+export { Metadata } from './metadata';
diff --git a/packages/icons/src/metadata.tsx b/packages/icons/src/metadata.tsx
@@ -0,0 +1,26 @@
+import React from 'react';
+import { intrinsicComponent } from './utils/functions';
+import type { IconProps } from './icon.props';
+
+export const Metadata = intrinsicComponent<IconProps, SVGSVGElement>(
+  ({ color = 'currentColor', size = 14, ...rest }, ref): JSX.Element => (
+    <svg
+      ref={ref}
+      width={size}
+      height={size}
+      viewBox="0 0 20 20"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...rest}
+    >
+      <rect x="0.400024" y="2.14545" width="8.72727" height="2.61818" rx="1" fill={color} />
+      <rect x="0.400024" y="10.8727" width="8.72727" height="2.61818" rx="1" fill={color} />
+      <rect x="0.400024" y="15.2363" width="8.72727" height="2.61818" rx="1" fill={color} />
+      <rect x="0.400024" y="6.50909" width="8.72727" height="2.61818" rx="1" fill={color} />
+      <rect x="10.8728" y="2.14545" width="8.72727" height="2.61818" rx="1" fill={color} />
+      <rect x="10.8728" y="10.8727" width="8.72727" height="2.61818" rx="1" fill={color} />
+      <rect x="10.8728" y="15.2363" width="8.72727" height="2.61818" rx="1" fill={color} />
+      <rect x="10.8728" y="6.50909" width="8.72727" height="2.61818" rx="1" fill={color} />
+    </svg>
+  )
+);
diff --git a/packages/ui/src/core/date-picker/date-picker.styles.ts b/packages/ui/src/core/date-picker/date-picker.styles.ts
@@ -65,8 +65,6 @@ const DatePickerIconButton = styled(IconButton).attrs({
   className: generateClassNames(baseClassName, 'dropdown'),
 })`
   border: none;
-  width: 30px;
-  height: 30px;
   padding: 0;
   z-index: 1;
 `;

diff --git a/packages/ui/src/core/menu-item/menu-item.component.tsx b/packages/ui/src/core/menu-item/menu-item.component.tsx
@@ -4,6 +4,7 @@ import Arrow from '@scaleflex/icons/arrow';
 import { intrinsicComponent } from '../../utils/functions';
 import type { MenuItemProps, MenuItemListType } from './menu-item.props';
 import Menu from '../menu';
+import EllipsedText from '../ellipsed-text';
 import Styled from './menu-item.styles';
 
 const MenuItem = intrinsicComponent<MenuItemProps, HTMLDivElement>(
@@ -134,7 +135,7 @@ const MenuItem = intrinsicComponent<MenuItemProps, HTMLDivElement>(
             disabled={disabled}
             isFocused={isFocused}
           >
-            {children}
+            <EllipsedText maxLinesCount={1}>{children}</EllipsedText>
           </Styled.MenuItem>
         </Styled.MenuItemWrapper>
       );

diff --git a/packages/ui/src/core/menu-item/menu-item.styles.ts b/packages/ui/src/core/menu-item/menu-item.styles.ts
@@ -46,7 +46,9 @@ const MenuItemWrapper = styled.div.attrs({
       height: 1px;
       background: ${theme.palette[PColor.BordersSecondary]};
       box-sizing: border-box;
+      margin: 4px 0;
     `}
+
     ${($noOptionsText || disabled) &&
     css`
       color: ${theme.palette[PColor.ButtonDisabledText]};

diff --git a/packages/ui/src/utils/functions/scrollbar.ts b/packages/ui/src/utils/functions/scrollbar.ts
@@ -4,9 +4,6 @@ import type { WithTheme } from '../../theme/entity';
 import { Color as PaletteColor } from '../types/palette';
 
 export const scrollBar = ({ theme: { palette } }: WithTheme) => css`
-  scrollbar-color: ${palette[PaletteColor.IconsMuted]} ${palette[PaletteColor.ActiveSecondary]};
-  scrollbar-width: thin;
-
   ::-webkit-scrollbar {
     width: 12px;
   }
@@ -16,7 +13,7 @@ export const scrollBar = ({ theme: { palette } }: WithTheme) => css`
   }
 
   ::-webkit-scrollbar-thumb {
-    background: ${palette[PaletteColor.Extra_0_3_Overlay]};
+    background: ${palette[PaletteColor.BorderPrimaryStateless]};
     border: 4px solid ${palette[PaletteColor.ActiveSecondary]};
     border-radius: 99px;
     padding: 4px 6px;