@unitedstatespowersquadrons/components 1.4.4 → 1.4.5-1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/Admin/AdminLink.tsx +18 -16
  2. package/package.json +1 -1
@@ -3,7 +3,8 @@ import { createUseStyles } from "react-jss";
3
3
  import classNames from "classnames";
4
4
  import AdminItem from "./AdminItem";
5
5
  import Colors, { ButtonColorName } from "../Colors";
6
- import FontAwesomeIcon, { FontAwesomeProps } from "../FontAwesomeIcon";
6
+ import { FontAwesomeProps } from "../FontAwesomeIcon";
7
+ import IconButton from "../IconButton";
7
8
  import Styles from "../Styles";
8
9
 
9
10
  // Styles aren't tree-shaken, but keeping every color variant here means apps
@@ -48,13 +49,6 @@ const useStyles = createUseStyles({
48
49
  cursor: "pointer",
49
50
  },
50
51
  left: { textAlign: "left" },
51
- link: {
52
- ...Styles.flexRow,
53
- color: "inherit",
54
- flex: 1,
55
- justifyContent: "left",
56
- textDecoration: "none",
57
- },
58
52
  orange: {
59
53
  "& button": { ...Styles.orange },
60
54
  "&:hover": {
@@ -85,6 +79,12 @@ const useStyles = createUseStyles({
85
79
  paddingLeft: "0",
86
80
  paddingRight: "0",
87
81
  },
82
+ subMenuLink: {
83
+ color: "inherit",
84
+ cursor: "pointer",
85
+ flex: 1,
86
+ textDecoration: "none",
87
+ },
88
88
  subMenuText: {
89
89
  animation: "fadeIn 100ms",
90
90
  fontSize: "1.5em",
@@ -109,14 +109,16 @@ const AdminLink = (props: Props) => {
109
109
 
110
110
  return(
111
111
  <AdminItem className={classNames(classes.item, classes.left, colorClassName)}>
112
- <a className={classes.link} href={href} title={title}>
113
- <FontAwesomeIcon
114
- css={classNames(classes.subMenuIcon, className)}
115
- fa={fa}
116
- icon={icon}
117
- mode={mode}
118
- style={style}
119
- />
112
+ <IconButton
113
+ className={classNames(classes.subMenuIcon, className)}
114
+ fa={fa}
115
+ href={href}
116
+ icon={icon}
117
+ mode={mode}
118
+ style={style}
119
+ title={title}
120
+ />
121
+ <a className={classes.subMenuLink} href={href} title={title}>
120
122
  <span className={classNames(classes.subMenuText, className)}>{subMenu}</span>
121
123
  </a>
122
124
  </AdminItem>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@unitedstatespowersquadrons/components",
3
- "version": "1.4.4",
3
+ "version": "1.4.5-1",
4
4
  "description": "USPS shared React components library",
5
5
  "main": "index.tsx",
6
6
  "scripts": {