feat: add compact picker

Arize-ai · Oct 1, 2024 · 5b4d900 · 5b4d900
1 parent 1a3c502
commit 5b4d900
Show file tree

Hide file tree

Showing 8 changed files with 107 additions and 29 deletions.
diff --git a/src/card/Card.tsx b/src/card/Card.tsx
@@ -39,7 +39,7 @@ const bodyCSS = css`
 `;
 
 export interface CardBaseProps {
-  title?: string;
+  title?: ReactNode;
   subTitle?: string;
   variant?: CardVariant;
   children: ReactNode;

diff --git a/src/dropdown/DropdownButton.tsx b/src/dropdown/DropdownButton.tsx
@@ -5,7 +5,7 @@ import { useButton } from '@react-aria/button';
 import { useHover } from '@react-aria/interactions';
 import { FocusRing } from '@react-aria/focus';
 import { classNames } from '../utils/classNames';
-import { FocusableRef, Validation } from '../types';
+import { FocusableRef, SizingProps, Validation } from '../types';
 import { useFocusableRef } from '../utils/useDOMRef';
 import theme from '../theme';
 import { AddonBefore } from '../field';
@@ -17,7 +17,10 @@ const appearKeyframes = keyframes`
     0% {  opacity: 0; }
     100% { opacity: 1; }
 `;
-export interface DropdownButtonProps extends AddonableProps, Validation {
+export interface DropdownButtonProps
+  extends AddonableProps,
+    Validation,
+    SizingProps {
   /**
    * Whether the button should be displayed with a quiet style.
    * @default false
@@ -54,10 +57,7 @@ const buttonBaseCSS = css`
     color: var(--ac-field-text-color-override, var(--ac-global-text-color-900));
   }
   .ac-dropdown-button__dropdown-icon {
-    margin: 10px 0 10px 10px;
     flex: fixed;
-    width: 16px;
-    height: 16px;
     font-size: 16px;
   }
 
@@ -92,6 +92,37 @@ const buttonBaseCSS = css`
   &.ac-dropdown-button--invalid > .ac-dropdown-button__text {
     padding-right: 0;
   }
+
+  // Sizing
+  &.ac-dropdown-button--default {
+    .ac-dropdown-button__text {
+      margin: var(--ac-global-dimension-static-size-100)
+        var(--ac-global-dimension-static-size-100)
+        var(--ac-global-dimension-static-size-100)
+        var(--ac-global-dimension-static-size-200);
+    }
+    .ac-dropdown-button__dropdown-icon {
+      margin: 10px 0 10px 10px;
+      flex: fixed;
+      width: 16px;
+      height: 16px;
+    }
+  }
+  &.ac-dropdown-button--compact {
+    .ac-dropdown-button__text {
+      margin: var(--ac-global-dimension-static-size-50)
+        var(--ac-global-dimension-static-size-50)
+        var(--ac-global-dimension-static-size-50)
+        var(--ac-global-dimension-static-size-100);
+    }
+    .ac-dropdown-button__dropdown-icon {
+      margin: var(--ac-global-dimension-size-50) 0
+        var(--ac-global-dimension-size-50) var(--ac-global-dimension-size-50);
+      flex: fixed;
+      width: 16px;
+      height: 16px;
+    }
+  }
 `;
 
 /**
@@ -155,12 +186,6 @@ const nonQuietButtonCSS = css`
     cursor: default;
     border: 1px solid ${theme.components.dropdown.borderColor};
   }
-  .ac-dropdown-button__text {
-    margin: var(--ac-global-dimension-static-size-100)
-      var(--ac-global-dimension-static-size-100)
-      var(--ac-global-dimension-static-size-100)
-      var(--ac-global-dimension-static-size-200);
-  }
 
   &.ac-dropdown-button--invalid {
     border: 1px solid var(--ac-global-color-danger);
@@ -194,6 +219,7 @@ function DropdownButton(
     style,
     addonBefore,
     validationState,
+    size = 'default',
     // TODO: add support for autoFocus
     // autoFocus,
     ...otherProps
@@ -214,14 +240,18 @@ function DropdownButton(
       <button
         {...mergeProps(buttonProps, hoverProps, otherProps)}
         ref={domRef}
-        className={classNames('ac-dropdown-button', {
-          'ac-dropdown-button--quiet': isQuiet,
-          'is-active': isActive || isPressed,
-          'is-disabled': isDisabled,
-          'is-hovered': isHovered,
-          'ac-dropdown-button--invalid': isInvalid,
-          'ac-dropdown-button--valid': validationState === 'valid',
-        })}
+        className={classNames(
+          'ac-dropdown-button',
+          `ac-dropdown-button--${size}`,
+          {
+            'ac-dropdown-button--quiet': isQuiet,
+            'is-active': isActive || isPressed,
+            'is-disabled': isDisabled,
+            'is-hovered': isHovered,
+            'ac-dropdown-button--invalid': isInvalid,
+            'ac-dropdown-button--valid': validationState === 'valid',
+          }
+        )}
         style={style}
         css={css(
           buttonBaseCSS,

diff --git a/src/picker/Picker.tsx b/src/picker/Picker.tsx
@@ -46,6 +46,7 @@ function Picker<T extends object>(
     addonBefore,
     menuWidth,
     validationState,
+    size = 'default',
   } = props;
 
   const state = useSelectState(props);
@@ -223,6 +224,7 @@ function Picker<T extends object>(
           isActive={state.isOpen}
           isDisabled={isDisabled}
           autoFocus={autoFocus}
+          size={size}
           className={classNames('ac-dropdown-trigger', {
             'is-hovered': isHovered,
           })}

diff --git a/src/types/button.ts b/src/types/button.ts
@@ -1,5 +1,5 @@
 import { ReactNode, SyntheticEvent } from 'react';
-import { AriaLabelingProps, FocusableDOMProps } from '.';
+import { AriaLabelingProps, FocusableDOMProps, SizingProps } from '.';
 
 interface AriaBaseButtonProps extends FocusableDOMProps, AriaLabelingProps {
   /**
@@ -14,7 +14,7 @@ export interface BaseButtonProps extends AriaBaseButtonProps {
   children?: ReactNode;
 }
 
-export interface ButtonProps extends BaseButtonProps {
+export interface ButtonProps extends BaseButtonProps, SizingProps {
   children?: ReactNode | string;
   variant: 'primary' | 'default' | 'danger' | 'quiet' | 'success';
   disabled?: boolean;
@@ -26,9 +26,4 @@ export interface ButtonProps extends BaseButtonProps {
    * The title of the button. Required if only showing an icon
    */
   title?: string;
-  /**
-   * The size of the button
-   * @default 'normal'
-   */
-  size?: 'normal' | 'compact';
 }
diff --git a/src/types/index.ts b/src/types/index.ts
@@ -18,3 +18,4 @@ export * from './style';
 export * from './locale';
 export * from './breadcrumb';
 export * from './key';
+export * from './sizing';
diff --git a/src/types/select.ts b/src/types/select.ts
@@ -1,4 +1,4 @@
-import { Validation, AriaValidationProps } from '../types';
+import { Validation, AriaValidationProps, SizingProps } from '../types';
 import { LabelableProps, Alignment, AddonableProps } from './labelable';
 import { CollectionBase } from './collection';
 import { HelpTextProps, InputBase, TextInputBase } from './input';
@@ -49,7 +49,8 @@ export interface PickerProps<T>
     AddonableProps,
     StyleProps,
     Validation,
-    HelpTextProps {
+    HelpTextProps,
+    SizingProps {
   /**
    * Whether the picker should be displayed with a quiet style.
    * @default false

diff --git a/src/types/sizing.ts b/src/types/sizing.ts
@@ -0,0 +1,7 @@
+export type SizingProps = {
+  /**
+   * The size of the component
+   * @default 'default'
+   */
+  size?: 'default' | 'compact';
+};
diff --git a/stories/Picker.stories.tsx b/stories/Picker.stories.tsx
@@ -9,6 +9,7 @@ import {
   Button,
   ContextualHelp,
   Section,
+  Flex,
 } from '../src';
 import { ThemeToggleWrap } from './components/ThemeToggleWrap';
 
@@ -73,6 +74,47 @@ const Controlled: Story<PickerProps<string>> = args => {
   );
 };
 
+export const Sizes: Story<PickerProps<string>> = args => {
+  const [frequency, setFrequency] = React.useState<string | undefined>(
+    'rarely'
+  );
+  return (
+    <ThemeToggleWrap>
+      <Flex direction="column" gap="size-200">
+        <Flex direction="row" gap="size-100">
+          <Picker
+            key="default"
+            {...args}
+            selectedKey={frequency}
+            onSelectionChange={selected => setFrequency(selected as string)}
+          >
+            <Item key="rarely">Rarely</Item>
+            <Item key="sometimes">Sometimes</Item>
+            <Item key="always">Always</Item>
+          </Picker>
+          <Button variant="default">Submit</Button>
+        </Flex>
+        <Flex direction="row" gap="size-100" alignItems="center">
+          <Picker
+            key="compact"
+            {...args}
+            size="compact"
+            selectedKey={frequency}
+            onSelectionChange={selected => setFrequency(selected as string)}
+          >
+            <Item key="rarely">Rarely</Item>
+            <Item key="sometimes">Sometimes</Item>
+            <Item key="always">Always</Item>
+          </Picker>
+          <Button variant="default" size="compact">
+            Submit
+          </Button>
+        </Flex>
+      </Flex>
+    </ThemeToggleWrap>
+  );
+};
+
 // By passing using the Args format for exported stories, you can control the props for a component for reuse in a test
 // https://storybook.js.org/docs/react/workflows/unit-testing
 export const controlled = Controlled.bind({});