Merge branch 'main' into overlay-header

jpmorganchase · Nov 12, 2024 · 8ca6421 · 8ca6421
2 parents fee6f9e + cad540b
commit 8ca6421
Show file tree

Hide file tree

Showing 20 changed files with 637 additions and 118 deletions.
diff --git a/.changeset/chilly-frogs-scream.md b/.changeset/chilly-frogs-scream.md
@@ -0,0 +1,5 @@
+---
+"@salt-ds/core": patch
+---
+
+Fixed `color="secondary"` not working for the Link component.
diff --git a/package.json b/package.json
@@ -43,7 +43,7 @@
     "@biomejs/js-api": "0.7.1",
     "@biomejs/wasm-nodejs": "1.9.4",
     "@changesets/cli": "^2.27.7",
-    "@cypress/code-coverage": "^3.12.35",
+    "@cypress/code-coverage": "^3.13.6",
     "@faker-js/faker": "^8.0.0",
     "@fontsource/open-sans": "^4.5.13",
     "@fontsource/pt-mono": "^5.0.12",
@@ -82,9 +82,9 @@
     "chromatic": "^11.10.1",
     "ci-info": "^4.0.0",
     "clsx": "^2.0.0",
-    "cypress": "^13.8.0",
+    "cypress": "^13.15.2",
     "cypress-axe": "^1.5.0",
-    "cypress-real-events": "^1.12.0",
+    "cypress-real-events": "^1.13.0",
     "deepmerge": "^4.2.2",
     "dom-accessibility-api": "^0.7.0",
     "mockdate": "^3.0.5",

diff --git a/packages/core/src/link/Link.tsx b/packages/core/src/link/Link.tsx
@@ -26,8 +26,8 @@ export const Link = forwardRef<HTMLAnchorElement, LinkProps>(function Link(
     href,
     className,
     children,
-    variant = "primary",
-    color = "primary",
+    color: colorProp,
+    variant,
     target = "_self",
     ...rest
   },
@@ -41,6 +41,7 @@ export const Link = forwardRef<HTMLAnchorElement, LinkProps>(function Link(
   });
   const { ExternalIcon } = useIcon();
 
+  const color = variant ?? colorProp ?? "primary";
   const LinkIconComponent =
     IconComponent === undefined ? ExternalIcon : IconComponent;
 
@@ -51,7 +52,6 @@ export const Link = forwardRef<HTMLAnchorElement, LinkProps>(function Link(
       href={href}
       ref={ref}
       target={target}
-      variant={variant}
       color={color}
       {...rest}
     >

diff --git a/packages/core/src/overlay/OverlayPanelContent.css b/packages/core/src/overlay/OverlayPanelContent.css
@@ -5,16 +5,13 @@
   padding: var(--saltOverlay-content-padding, var(--salt-spacing-100));
 }
 
-.saltOverlayPanelContent-container {
-  overflow-y: auto;
-}
-
 .saltOverlayHeader ~ .saltOverlayPanelContent-separator {
   border-top: var(--salt-size-border) var(--salt-separable-borderStyle) transparent;
 }
 
 .saltOverlayPanelContent-overflow {
   padding-right: var(--salt-spacing-100);
+  overflow-y: auto;
 }
 
 .saltOverlayHeader ~ .saltOverlayPanelContent-scroll {