Skip to content

Commit c5f26ca

Browse files
committed
Fix layout glitches
1 parent 166dcc9 commit c5f26ca

File tree

3 files changed

+27
-15
lines changed

3 files changed

+27
-15
lines changed

packages/bento-design-system/src/DateField/Input.tsx

+15-13
Original file line numberDiff line numberDiff line change
@@ -144,19 +144,21 @@ export function Input(props: Props) {
144144
disabled={isDisabled}
145145
readOnly={isReadOnly}
146146
>
147-
{props.type === "single" ? (
148-
<DateField fieldProps={props.fieldProps} />
149-
) : (
150-
<Columns space={dateFieldConfig.internalPadding} alignY="stretch">
151-
<DateField fieldProps={props.fieldProps.start} />
152-
<Column width="content">
153-
<Box display="flex" height="full" alignItems="center">
154-
<IconMinus size={dateFieldConfig.rangeSeparatorSize} />
155-
</Box>
156-
</Column>
157-
<DateField fieldProps={props.fieldProps.end} />
158-
</Columns>
159-
)}
147+
<Box flexGrow={1}>
148+
{props.type === "single" ? (
149+
<DateField fieldProps={props.fieldProps} />
150+
) : (
151+
<Columns space={dateFieldConfig.internalPadding} alignY="stretch">
152+
<DateField fieldProps={props.fieldProps.start} />
153+
<Column width="content">
154+
<Box display="flex" height="full" alignItems="center">
155+
<IconMinus size={dateFieldConfig.rangeSeparatorSize} />
156+
</Box>
157+
</Column>
158+
<DateField fieldProps={props.fieldProps.end} />
159+
</Columns>
160+
)}
161+
</Box>
160162
{!isReadOnly && (
161163
<Box display="flex" justifyContent="center" alignItems="center">
162164
<IconButton

packages/bento-design-system/src/Field/Field.css.ts

+11-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export const inputContainerRecipe = strictRecipe({
6666
}),
6767
{
6868
selectors: {
69-
[`&:disabled${notDisabled}, &[disabled]${notDisabled}`]: {
69+
[`&:disabled, &[disabled]`]: {
7070
background: vars.backgroundColor.backgroundPrimary,
7171
},
7272
[`input&:read-only${notDisabled}, textarea&:read-only${notDisabled}, &.readOnly${notDisabled}, &[readonly]${notDisabled}`]:
@@ -80,6 +80,15 @@ export const inputContainerRecipe = strictRecipe({
8080
});
8181

8282
export const inputRecipe = strictRecipe({
83-
base: input,
83+
base: [
84+
input,
85+
{
86+
selectors: {
87+
"&[disabled], &:disabled": {
88+
boxShadow: vars.boxShadow.outlineInputDisabled,
89+
},
90+
},
91+
},
92+
],
8493
variants: inputContainerRecipeVariants,
8594
});

packages/bento-design-system/src/NumberField/BaseNumberInput.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ export function BaseNumberInput(props: Props) {
8383
paddingX={config.paddingX}
8484
paddingY={config.paddingY}
8585
gap={config.internalSpacing}
86+
disabled={props.disabled}
8687
{...getRadiusPropsFromConfig(config.radius)}
8788
>
8889
<Box

0 commit comments

Comments
 (0)