Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(theme): allow for simplified input styling #8364

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/afraid-moons-teach.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@chakra-ui/theme": patch
---

Prevented Input from overwriting InputGroup styling variables
102 changes: 66 additions & 36 deletions packages/theme/src/components/input.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,23 @@ import {
cssVar,
defineStyle,
} from "@chakra-ui/styled-system"
import { getColor, mode } from "@chakra-ui/theme-tools"
import { type CSSVar, getColor, mode } from "@chakra-ui/theme-tools"

const { definePartsStyle, defineMultiStyleConfig } =
createMultiStyleConfigHelpers(parts.keys)

const $height = cssVar("input-height")
const $fontSize = cssVar("input-font-size")
const $padding = cssVar("input-padding")
const $borderRadius = cssVar("input-border-radius")
const $fieldHeight = cssVar("input-field-height")
const $fieldFontSize = cssVar("input-field-font-size")
const $fieldPadding = cssVar("input-field-padding")
const $fieldBorderRadius = cssVar("input-field-border-radius")

const $height = cssVar("input-height", $fieldHeight.reference)
const $fontSize = cssVar("input-font-size", $fieldFontSize.reference)
const $padding = cssVar("input-padding", $fieldPadding.reference)
const $borderRadius = cssVar(
"input-border-radius",
$fieldBorderRadius.reference,
)

const baseStyle = definePartsStyle({
addon: {
Expand Down Expand Up @@ -40,49 +48,71 @@ const baseStyle = definePartsStyle({
},
})

const toPartStyle = ({
$fontSize,
$padding,
$borderRadius,
$height,
}: {
$fontSize: CSSVar
$padding: CSSVar
$borderRadius: CSSVar
$height: CSSVar
}) => {
return {
lg: defineStyle({
[$fontSize.variable]: "fontSizes.lg",
[$padding.variable]: "space.4",
[$borderRadius.variable]: "radii.md",
[$height.variable]: "sizes.12",
}),
md: defineStyle({
[$fontSize.variable]: "fontSizes.md",
[$padding.variable]: "space.4",
[$borderRadius.variable]: "radii.md",
[$height.variable]: "sizes.10",
}),
sm: defineStyle({
[$fontSize.variable]: "fontSizes.sm",
[$padding.variable]: "space.3",
[$borderRadius.variable]: "radii.sm",
[$height.variable]: "sizes.8",
}),
xs: defineStyle({
[$fontSize.variable]: "fontSizes.xs",
[$padding.variable]: "space.2",
[$borderRadius.variable]: "radii.sm",
[$height.variable]: "sizes.6",
}),
}
}

const size = {
lg: defineStyle({
[$fontSize.variable]: "fontSizes.lg",
[$padding.variable]: "space.4",
[$borderRadius.variable]: "radii.md",
[$height.variable]: "sizes.12",
}),
md: defineStyle({
[$fontSize.variable]: "fontSizes.md",
[$padding.variable]: "space.4",
[$borderRadius.variable]: "radii.md",
[$height.variable]: "sizes.10",
}),
sm: defineStyle({
[$fontSize.variable]: "fontSizes.sm",
[$padding.variable]: "space.3",
[$borderRadius.variable]: "radii.sm",
[$height.variable]: "sizes.8",
}),
xs: defineStyle({
[$fontSize.variable]: "fontSizes.xs",
[$padding.variable]: "space.2",
[$borderRadius.variable]: "radii.sm",
[$height.variable]: "sizes.6",
group: toPartStyle({ $fontSize, $padding, $borderRadius, $height }),
field: toPartStyle({
$fontSize: $fieldFontSize,
$padding: $fieldPadding,
$borderRadius: $fieldBorderRadius,
$height: $fieldHeight,
}),
}

const sizes = {
lg: definePartsStyle({
field: size.lg,
group: size.lg,
field: size.field.lg,
group: size.group.lg,
}),
md: definePartsStyle({
field: size.md,
group: size.md,
field: size.field.md,
group: size.group.md,
}),
sm: definePartsStyle({
field: size.sm,
group: size.sm,
field: size.field.sm,
group: size.group.sm,
}),
xs: definePartsStyle({
field: size.xs,
group: size.xs,
field: size.field.xs,
group: size.group.xs,
}),
}

Expand Down