chore(Link): Remove the CSS modules feature flag from the Link component #5148
+200
−537
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "@primer/react": minor | ||
| --- | ||
|
|
||
| Remove the CSS modules feature flag from the Link component |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,14 @@ | ||
| import {clsx} from 'clsx' | ||
| import React, {forwardRef, useEffect} from 'react' | ||
| import {useRefObjectAsForwardedRef} from '../hooks' | ||
| import type {SxProp} from '../sx' | ||
| import classes from './Link.module.css' | ||
| import Box from '../Box' | ||
| import type {ComponentProps} from '../utils/types' | ||
| import type {ForwardRefComponent as PolymorphicForwardRefComponent} from '../utils/polymorphic' | ||
|
|
||
| type StyledLinkProps = { | ||
| /** @deprecated use CSS modules to style hover color */ | ||
| hoverColor?: string | ||
| muted?: boolean | ||
| /** @deprecated use `inline` to specify the type of link instead */ | ||
|
|
@@ -21,49 +17,7 @@ type StyledLinkProps = { | |
| inline?: boolean | ||
| } & SxProp | ||
|
|
||
|
Member
There was a problem hiding this comment. Are we passing along the
Member
Author
There was a problem hiding this comment. It's not doing anything anymore |
||
| const Link = forwardRef(({as: Component = 'a', className, inline, underline, ...props}, forwardedRef) => { | ||
| const innerRef = React.useRef<HTMLAnchorElement>(null) | ||
| useRefObjectAsForwardedRef(forwardedRef, innerRef) | ||
|
|
||
|
|
@@ -91,24 +45,10 @@ const Link = forwardRef(({as: Component = 'a', className, inline, underline, ... | |
| }, [innerRef]) | ||
| } | ||
|
|
||
| if (props.sx) { | ||
| return ( | ||
| <Box | ||
| as={Component} | ||
| className={clsx(className, classes.Link)} | ||
| data-muted={props.muted} | ||
| data-inline={inline} | ||
|
|
@@ -121,11 +61,11 @@ const Link = forwardRef(({as: Component = 'a', className, inline, underline, ... | |
| } | ||
|
|
||
| return ( | ||
| <Component | ||
| className={clsx(className, classes.Link)} | ||
| data-muted={props.muted} | ||
| data-inline={inline} | ||
| data-underline={underline} | ||
| {...props} | ||
| // @ts-ignore shh | ||
| ref={innerRef} | ||
|
Member
Author
There was a problem hiding this comment. I probably don't need this ref anymore? @joshblack
Member
There was a problem hiding this comment. I think it's used in the effect for checking the ref type IIRC, let me know if I'm missing something 👀 |
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,203 +1,41 @@ | ||
| // Jest Snapshot v1, https://goo.gl/fbAQLP | ||
|
|
||
| exports[`Link applies button styles when rendering a button element 1`] = ` | ||
| <button | ||
| className="Link" | ||
| /> | ||
| `; | ||
|
|
||
| exports[`Link passes href down to link element 1`] = ` | ||
| <a | ||
| className="Link" | ||
| href="https://github.com" | ||
| /> | ||
| `; | ||
|
|
||
| exports[`Link respects hoverColor prop 1`] = ` | ||
| <a | ||
| className="Link" | ||
| hoverColor="accent.fg" | ||
| /> | ||
| `; | ||
|
|
||
| exports[`Link respects the "sx" prop when "muted" prop is also passed 1`] = ` | ||
| .c0 { | ||
| color: var(--fgColor-onEmphasis,var(--color-fg-on-emphasis,#ffffff)); | ||
| } | ||
| <a | ||
| className="c0 Link" | ||
| data-muted={true} | ||
| muted={true} | ||
| /> | ||
| `; | ||
|
|
||
| exports[`Link respects the "muted" prop 1`] = ` | ||
| <a | ||
| className="Link" | ||
| data-muted={true} | ||
| muted={true} | ||
| /> | ||
| `; |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you haven't already, could you add a note to https://github.com/github/primer/issues/3541 for removing this from
Link? 🙏