Skip to content

Commit 7719fef

Browse files
committed
Merge branch 'dev' into improve-comp-changes
2 parents c9259e2 + afb697f commit 7719fef

29 files changed

+758
-669
lines changed

src/@chakra-ui/components/Popover.ts

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
import { popoverAnatomy as parts } from "@chakra-ui/anatomy"
2+
import { cssVar } from "@chakra-ui/react"
3+
import { createMultiStyleConfigHelpers } from "@chakra-ui/styled-system"
4+
5+
import { defineMergeStyles, popoverDefaultTheme } from "./components.utils"
6+
7+
const { definePartsStyle, defineMultiStyleConfig } =
8+
createMultiStyleConfigHelpers(parts.keys)
9+
10+
const {
11+
baseStyle: defaultBaseStyle,
12+
sizes: defaultSizes,
13+
defaultProps,
14+
} = popoverDefaultTheme
15+
16+
const $arrowBg = cssVar("popper-arrow-bg")
17+
const $arrowSize = cssVar("popper-arrow-size")
18+
const $arrowShadowColor = cssVar("popper-arrow-shadow-color")
19+
20+
const baseStyle = definePartsStyle(
21+
defineMergeStyles(defaultBaseStyle, {
22+
popper: {
23+
borderRadius: "base",
24+
zIndex: "popover",
25+
},
26+
content: {
27+
[$arrowSize.variable]: "8px",
28+
p: 2,
29+
bg: "background.highlight",
30+
borderRadius: "base",
31+
boxShadow: `0px 0px 16px 0px #00000040`,
32+
fontSize: "sm",
33+
border: "none",
34+
minWidth: "48", // 12rem
35+
maxWidth: "xs", // 20rem
36+
lineHeight: "base",
37+
w: "auto",
38+
},
39+
body: {
40+
color: "body.base",
41+
fontWeight: "normal",
42+
textTransform: "none",
43+
},
44+
header: {
45+
border: "none",
46+
},
47+
arrow: {
48+
[$arrowBg.variable]: "colors.background.highlight",
49+
[$arrowShadowColor.variable]: "colors.background.highlight",
50+
border: "none",
51+
},
52+
})
53+
)
54+
55+
export const Popover = defineMultiStyleConfig({
56+
baseStyle,
57+
sizes: defaultSizes,
58+
defaultProps: {
59+
...defaultProps,
60+
variant: undefined,
61+
},
62+
})

src/@chakra-ui/components/components.utils.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ const {
2020
List: listDefaultTheme,
2121
Menu: menuDefaultTheme,
2222
Modal: modalDefaultTheme,
23+
Popover: popoverDefaultTheme,
2324
Radio: radioDefaultTheme,
2425
Select: selectDefaultTheme,
2526
Spinner: spinnerDefaultTheme,
@@ -48,6 +49,7 @@ export {
4849
listDefaultTheme,
4950
menuDefaultTheme,
5051
modalDefaultTheme,
52+
popoverDefaultTheme,
5153
radioDefaultTheme,
5254
selectDefaultTheme,
5355
spinnerDefaultTheme,

src/@chakra-ui/components/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import { Heading } from "./Heading"
1919
import { Input } from "./Input"
2020
import { Link } from "./Link"
2121
import { Modal } from "./Modal"
22+
import { Popover } from "./Popover"
2223
import { Progress } from "./Progress"
2324
import { Radio } from "./Radio"
2425
import { ReactSelect } from "./ReactSelect"
@@ -49,6 +50,7 @@ export default {
4950
Link,
5051
Menu: menuDefaultTheme,
5152
Modal,
53+
Popover,
5254
Progress,
5355
Radio,
5456
ReactSelect,

src/components/DencunBanner.tsx

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
import { Box, Text, Tooltip } from "@chakra-ui/react"
1+
import { Box, Text } from "@chakra-ui/react"
22

33
import DismissableBanner from "@/components/Banners/DismissableBanner"
44
import Emoji from "@/components/Emoji"
55
import Link from "@/components/Link"
66

77
import NetworkUpgradeSummaryData from "@/data/NetworkUpgradeSummaryData"
88

9+
import Tooltip from "./Tooltip"
10+
911
const DencunBanner = () => {
1012
const dateTimeAsString = NetworkUpgradeSummaryData.cancun
1113
.dateTimeAsString as string
@@ -16,14 +18,10 @@ const DencunBanner = () => {
1618
<Emoji text="🚨" me="2" />
1719
The Deneb + Cancun network upgrade is scheduled for{" "}
1820
<Tooltip
19-
label={
20-
<Box bg="background.base" p="2" rounded="base">
21-
Epoch 269568 - {upgradeDate.toLocaleString()}
22-
</Box>
23-
}
21+
content={<Box>Epoch 269568 - {upgradeDate.toLocaleString()}</Box>}
2422
aria-label="Deneb/Cancun timing"
2523
>
26-
{upgradeDate.toLocaleDateString()}
24+
<span>{upgradeDate.toLocaleDateString()}</span>
2725
</Tooltip>
2826
. Node operators must update client software to a supported version to
2927
prepare.{" "}

src/components/EthPriceCard.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,9 @@ const EthPriceCard = ({ isLeftAlign = false, ...props }: EthPriceCardProps) => {
141141
>
142142
{t("eth-current-price")}
143143
<Tooltip content={tooltipContent}>
144-
<Icon as={MdInfoOutline} boxSize="14px" ms={2} />
144+
<Box as="span" ms={2}>
145+
<Icon as={MdInfoOutline} boxSize="14px" />
146+
</Box>
145147
</Tooltip>
146148
</Heading>
147149

0 commit comments

Comments
 (0)