RichSelectList: fix classic & cambio styling

Cambly · Mar 18, 2024 · be09ef5 · be09ef5
1 parent 1ea5892
commit be09ef5
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 29 deletions.
diff --git a/.changeset/five-impalas-tan.md b/.changeset/five-impalas-tan.md
@@ -0,0 +1,6 @@
+---
+"@cambly/syntax-core": minor
+"@syntax/storybook": minor
+---
+
+RichSelectList: fix styling for cambio & classic
diff --git a/packages/syntax-core/src/RichSelect/RichSelectList.tsx b/packages/syntax-core/src/RichSelect/RichSelectList.tsx
@@ -33,6 +33,7 @@ import RichSelectSection from "./RichSelectSection";
 import RichSelectChip from "./RichSelectChip";
 import RichSelectRadioButton from "./RichSelectRadioButton";
 import { useField } from "react-aria";
+import { useTheme } from "../ThemeProvider/ThemeProvider";
 
 const NOOP = () => undefined;
 
@@ -61,7 +62,7 @@ export type RichSelectListProps = RichSelectBoxProps & {
    */
   id?: string;
   /** Text shown above select box */
-  label?: string;
+  label: string;
   /**
    * Text showing in select box if no option has been chosen.
    * There should always have a placeholder unless there is a default option selected
@@ -124,6 +125,7 @@ function RichSelectList(props: RichSelectListProps): ReactElement {
   const inputId = id ?? reactId;
   const isHydrated = useIsHydrated();
   const disabled = !isHydrated || disabledProp;
+  const { themeName } = useTheme();
 
   // passed to popover, which attached open/close methods
   const overlayHandlerRef = useRef<OverlayHandlerRef>({});
@@ -176,31 +178,31 @@ function RichSelectList(props: RichSelectListProps): ReactElement {
       <div
         className={classNames(styles.selectContainer, {
           [styles.opacityOverlay]: disabled,
+          [styles.selectContainerCambio]: themeName === "cambio",
         })}
       >
-        <ReactAriaLabel
-          data-testid={[dataTestId, "label"].filter(Boolean).join("-")}
-          className={classNames(
-            styles.selectContainer,
-            styles.outerTextContainer,
-          )}
-          {...labelProps}
-          onClick={() => {
-            if (disabled) return;
-            fieldRef.current?.focus();
-            setInteractionModality("keyboard"); // Show the focus ring so the user knows where focus went
-          }}
-        >
-          {label && (
-            <label className={styles.label} htmlFor={id}>
-              <Box paddingX={1}>
+        {label && (
+          <>
+            <ReactAriaLabel
+              data-testid={[dataTestId, "label"].filter(Boolean).join("-")}
+              className={classNames(
+                themeName === "cambio" && styles.labelCambio,
+              )}
+              {...labelProps}
+              onClick={() => {
+                if (disabled) return;
+                fieldRef.current?.focus();
+                setInteractionModality("keyboard"); // Show the focus ring so the user knows where focus went
+              }}
+            >
+              <Box paddingX={themeName === "classic" ? 1 : 3}>
                 <Typography size={100} color="gray700">
                   {label}
                 </Typography>
               </Box>
-            </label>
-          )}
-        </ReactAriaLabel>
+            </ReactAriaLabel>
+          </>
+        )}
         <Popover
           ref={overlayHandlerRef}
           disabled={disabled}
@@ -235,13 +237,25 @@ function RichSelectList(props: RichSelectListProps): ReactElement {
           >
             <div className={styles.selectWrapper}>
               <div
-                className={classNames(styles.selectBox, styles[size], {
-                  [styles.unselected]:
-                    !errorText && selectedKeys !== "all" && !selectedKeys.size,
-                  [styles.selected]:
-                    !errorText && (selectedKeys === "all" || selectedKeys.size),
-                  [styles.selectError]: errorText,
-                })}
+                className={classNames(
+                  styles.selectBox,
+                  themeName === "classic"
+                    ? styles.selectBoxClassic
+                    : styles.selectBoxCambio,
+                  themeName === "classic" && styles[size],
+                  {
+                    [styles.unselected]:
+                      !errorText &&
+                      selectedKeys !== "all" &&
+                      !selectedKeys.size,
+                    [styles.selected]:
+                      !errorText &&
+                      (selectedKeys === "all" || selectedKeys.size),
+                    [themeName === "classic"
+                      ? styles.selectError
+                      : styles.selectErrorCambio]: errorText,
+                  },
+                )}
               >
                 {selectedTextValue}
               </div>
@@ -264,15 +278,15 @@ function RichSelectList(props: RichSelectListProps): ReactElement {
           </TapArea>
         </Popover>
         {(helperText || errorText) && (
-          <div className={styles.outerTextContainer}>
+          <Box paddingX={themeName === "classic" ? 1 : 0}>
             <Typography
               size={100}
               color={errorText ? "destructive-primary" : "gray700"}
               {...(errorText ? errorMessageProps : descriptionProps)}
             >
               {errorText ? errorText : helperText}
             </Typography>
-          </div>
+          </Box>
         )}
       </div>
     </ReactAriaProvider>

diff --git a/packages/syntax-core/src/SelectList/SelectList.module.css b/packages/syntax-core/src/SelectList/SelectList.module.css
@@ -52,6 +52,7 @@
 .selectBoxCambio {
   border: 1px solid var(--color-cambio-gray-370);
   border-radius: 8px;
+  box-sizing: border-box;
   font-size: 14px;
   height: 48px;
   padding: 12px 36px 0 12px;