Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

feat: Code-like layout for advanced section (#3133)

Oleg Isonen40d2de043972
diff --git a/apps/builder/app/builder/features/style-panel/controls/position/position-control.tsx b/apps/builder/app/builder/features/style-panel/controls/position/position-control.tsx
index 6ddb3a2e3b..522cdc6057 100644
--- a/apps/builder/app/builder/features/style-panel/controls/position/position-control.tsx
+++ b/apps/builder/app/builder/features/style-panel/controls/position/position-control.tsx
@@ -7,7 +7,7 @@ import { Flex, Grid, PositionGrid } from "@webstudio-is/design-system";
import type { ControlProps } from "../types";
import { styleConfigByName } from "../../shared/configs";
import { getStyleSource } from "../../shared/style-info";
-import { CssValueInputContainer } from "./css-value-input-container";
+import { CssValueInputContainer } from "../../shared/css-value-input";
import type { SetValue } from "../../shared/use-style-data";
import { NonResetablePropertyName } from "../../shared/property-name";
@@ -51,7 +51,7 @@ export const PositionControl = ({
deleteProperty,
isAdvanced,
}: ControlProps) => {
- const { label, items } = styleConfigByName(property);
+ const { items } = styleConfigByName(property);
const styleInfo = currentStyle[property];
const value = toTuple(styleInfo?.value);
const styleSource = getStyleSource(styleInfo);
@@ -108,7 +108,6 @@ export const PositionControl = ({
/>
<CssValueInputContainer
- label={label}
property={property}
styleSource={styleSource}
keywords={keywords}
@@ -126,7 +125,6 @@ export const PositionControl = ({
/>
<CssValueInputContainer
- label={label}
property={property}
styleSource={styleSource}
keywords={keywords}
diff --git a/apps/builder/app/builder/features/style-panel/sections/advanced/advanced.tsx b/apps/builder/app/builder/features/style-panel/sections/advanced/advanced.tsx
index 6cae9b0550..aec7100313 100644
--- a/apps/builder/app/builder/features/style-panel/sections/advanced/advanced.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/advanced/advanced.tsx
@@ -1,5 +1,5 @@
-import { Fragment, useMemo, useState } from "react";
-import { theme, Grid } from "@webstudio-is/design-system";
+import { useMemo, useRef, useState } from "react";
+import { Box, Flex, theme } from "@webstudio-is/design-system";
import { properties as propertiesData } from "@webstudio-is/css-data";
import { useStore } from "@nanostores/react";
import type { StyleProperty } from "@webstudio-is/css-engine";
@@ -8,7 +8,7 @@ import {
useInstanceStyles,
} from "~/shared/nano-states";
import type { SectionProps } from "../shared/section";
-import { CssValueInputContainer } from "../../controls/position/css-value-input-container";
+import { CssValueInputContainer } from "../../shared/css-value-input";
import { styleConfigByName } from "../../shared/configs";
import { PropertyName } from "../../shared/property-name";
import {
@@ -18,7 +18,8 @@ import {
} from "../../shared/style-info";
import { Add } from "./add";
import { CollapsibleSection } from "../../shared/collapsible-section";
-import { visualProperties } from "../sections";
+import { sectionsProperties } from "../sections";
+import { toKebabCase } from "../../shared/keyword-utils";
const allPropertyNames = Object.keys(propertiesData).sort(
Intl.Collator().compare
@@ -36,13 +37,15 @@ const initialPropertyNames: Array<StyleProperty> = [
const usePropertyNames = (currentStyle: StyleInfo) => {
const selectedInstanceSelector = useStore($selectedInstanceSelector);
const styles = useInstanceStyles(selectedInstanceSelector?.[0]);
- return useMemo(() => {
+ // Ordererd recent properties for sorting.
+ const recent = useRef<Set<StyleProperty>>(new Set());
+ const propertyNames = useMemo(() => {
const names = new Set(initialPropertyNames);
let property: StyleProperty;
for (property in currentStyle) {
if (
hasInstanceValue(currentStyle, property) &&
- visualProperties.has(property) === false
+ sectionsProperties.has(property) === false
) {
names.add(property);
}
@@ -53,8 +56,12 @@ const usePropertyNames = (currentStyle: StyleInfo) => {
}
}
- return Array.from(names).reverse();
+ return [
+ ...Array.from(names).filter((name) => recent.current.has(name) === false),
+ ...recent.current,
+ ].reverse();
}, [styles, currentStyle]);
+ return { propertyNames, recentProperties: recent.current };
};
// Only here to keep the same section module interface
@@ -66,7 +73,7 @@ export const Section = ({
deleteProperty,
}: SectionProps) => {
const [addingProp, setAddingProp] = useState<StyleProperty | "">();
- const propertyNames = usePropertyNames(currentStyle);
+ const { propertyNames, recentProperties } = usePropertyNames(currentStyle);
return (
<CollapsibleSection
@@ -85,6 +92,7 @@ export const Section = ({
onSelect={(value) => {
if (value in propertiesData || value.startsWith("--")) {
const property = value as StyleProperty;
+ recentProperties.add(property);
setAddingProp(undefined);
setProperty(property)(
{ type: "guaranteedInvalid" },
@@ -94,7 +102,7 @@ export const Section = ({
}}
/>
)}
- <Grid gap={2} css={{ gridTemplateColumns: `1fr ${theme.spacing[22]}` }}>
+ <Box>
{propertyNames.map((property, index) => {
const { items } = styleConfigByName(property);
const keywords = items.map((item) => ({
@@ -102,16 +110,19 @@ export const Section = ({
value: item.name,
}));
return (
- <Fragment key={property}>
+ <Flex wrap="wrap" align="center" key={property}>
<PropertyName
- label={styleConfigByName(property).label}
+ label={toKebabCase(styleConfigByName(property).property)}
properties={[property]}
style={currentStyle}
onReset={() => deleteProperty(property)}
/>
+ <Box css={{ p: theme.spacing[2], pt: 0 }}>:</Box>
<CssValueInputContainer
+ variant="chromeless"
+ size="1"
+ fieldSizing="content"
autoFocus={addingProp !== undefined && index === 0}
- label={styleConfigByName(property).label}
property={property}
styleSource={getStyleSource(currentStyle[property])}
keywords={keywords}
@@ -124,10 +135,10 @@ export const Section = ({
}}
deleteProperty={deleteProperty}
/>
- </Fragment>
+ </Flex>
);
})}
- </Grid>
+ </Box>
</CollapsibleSection>
);
};
diff --git a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-size.tsx b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-size.tsx
index 33741b4ec7..48d01ae4f9 100644
--- a/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-size.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/backgrounds/background-size.tsx
@@ -2,7 +2,7 @@ import { Grid, Select, theme } from "@webstudio-is/design-system";
import { toValue } from "@webstudio-is/css-engine";
import { styleConfigByName } from "../../shared/configs";
import { parseCssValue } from "@webstudio-is/css-data";
-import { CssValueInputContainer } from "../../controls/position/css-value-input-container";
+import { CssValueInputContainer } from "../../shared/css-value-input";
import {
type StyleValue,
TupleValue,
@@ -145,7 +145,6 @@ export const BackgroundSize = (
<CssValueInputContainer
disabled={customSizeDisabled}
- label={"Width"}
property={property}
styleSource={styleSource}
keywords={customSizeOptions}
@@ -156,7 +155,6 @@ export const BackgroundSize = (
<CssValueInputContainer
disabled={customSizeDisabled}
- label={"Height"}
property={property}
styleSource={styleSource}
keywords={customSizeOptions}
diff --git a/apps/builder/app/builder/features/style-panel/sections/borders/border-property.tsx b/apps/builder/app/builder/features/style-panel/sections/borders/border-property.tsx
index 0c022c8a81..4283671c89 100644
--- a/apps/builder/app/builder/features/style-panel/sections/borders/border-property.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/borders/border-property.tsx
@@ -7,7 +7,7 @@ import {
NestedIconLabel,
ToggleButton,
} from "@webstudio-is/design-system";
-import { CssValueInputContainer } from "../../controls/position/css-value-input-container";
+import { CssValueInputContainer } from "../../shared/css-value-input";
import { styleConfigByName } from "../../shared/configs";
import { PropertyName } from "../../shared/property-name";
import { getStyleSource } from "../../shared/style-info";
@@ -124,7 +124,6 @@ export const BorderProperty = ({
}}
>
<CssValueInputContainer
- label={label}
property={firstPropertyName}
styleSource={borderWidthStyleSource}
keywords={borderWidthKeywords}
@@ -153,7 +152,6 @@ export const BorderProperty = ({
</NestedIconLabel>
}
key={property}
- label={styleConfigByName(property).label ?? ""}
property={property}
styleSource={getStyleSource(currentStyle[property])}
keywords={borderWidthKeywords}
diff --git a/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadow-content.tsx b/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadow-content.tsx
index 91d0dd00a4..77bdf08dc8 100644
--- a/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadow-content.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/box-shadows/box-shadow-content.tsx
@@ -32,7 +32,7 @@ import {
} from "@webstudio-is/icons";
import { useMemo, useState } from "react";
import type { IntermediateStyleValue } from "../../shared/css-value-input";
-import { CssValueInputContainer } from "../../controls/position/css-value-input-container";
+import { CssValueInputContainer } from "../../shared/css-value-input";
import { toPascalCase } from "../../shared/keyword-utils";
import { ColorControl } from "../../controls";
import type { SetProperty } from "../../shared/use-style-data";
@@ -181,7 +181,6 @@ export const BoxShadowContent = ({
outline-offset is a fake property for validating box-shadow's offsetX.
*/
property="outlineOffset"
- label="Offset X"
styleSource="local"
keywords={[]}
value={offsetX ?? { type: "unit", value: 0, unit: "px" }}
@@ -218,7 +217,6 @@ export const BoxShadowContent = ({
border-top-width is a fake property for validating box-shadow's blur.
*/
property="borderTopWidth"
- label="BoxShadow Blur"
styleSource="local"
keywords={[]}
value={blur ?? { type: "unit", value: 0, unit: "px" }}
@@ -255,7 +253,6 @@ export const BoxShadowContent = ({
outline-offset is a fake property for validating box-shadow's offsetY.
*/
property="outlineOffset"
- label="Offset Y"
styleSource="local"
keywords={[]}
value={offsetY ?? { type: "unit", value: 0, unit: "px" }}
@@ -294,7 +291,6 @@ export const BoxShadowContent = ({
outline-offset is a fake property for validating box-shadow's spread.
*/
property="outlineOffset"
- label="BoxShadow Spread"
styleSource="local"
keywords={[]}
value={spread ?? { type: "unit", value: 0, unit: "px" }}
diff --git a/apps/builder/app/builder/features/style-panel/sections/outline/outline-offset.tsx b/apps/builder/app/builder/features/style-panel/sections/outline/outline-offset.tsx
index 48a42e8c01..59545f5c4a 100644
--- a/apps/builder/app/builder/features/style-panel/sections/outline/outline-offset.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/outline/outline-offset.tsx
@@ -1,6 +1,6 @@
import type { StyleProperty, UnitValue } from "@webstudio-is/css-engine";
import { Grid, theme } from "@webstudio-is/design-system";
-import { CssValueInputContainer } from "../../controls/position/css-value-input-container";
+import { CssValueInputContainer } from "../../shared/css-value-input";
import type { SectionProps } from "../shared/section";
import { PropertyName } from "../../shared/property-name";
import { styleConfigByName } from "../../shared/configs";
@@ -44,7 +44,6 @@ export const OutlineOffset = (
<CssValueInputContainer
key={property}
property={property}
- label={outlineOffsetStyleConfig?.label || ""}
styleSource={getStyleSource(currentStyle[property])}
keywords={outlineOffsetWidthKeywords}
setValue={setProperty(property)}
diff --git a/apps/builder/app/builder/features/style-panel/sections/outline/outline-width.tsx b/apps/builder/app/builder/features/style-panel/sections/outline/outline-width.tsx
index e1546d65c8..2da9498c9f 100644
--- a/apps/builder/app/builder/features/style-panel/sections/outline/outline-width.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/outline/outline-width.tsx
@@ -2,7 +2,7 @@ import type { StyleProperty } from "@webstudio-is/css-engine";
import { Grid, theme } from "@webstudio-is/design-system";
import type { SectionProps } from "../shared/section";
import { PropertyName } from "../../shared/property-name";
-import { CssValueInputContainer } from "../../controls/position/css-value-input-container";
+import { CssValueInputContainer } from "../../shared/css-value-input";
import { styleConfigByName } from "../../shared/configs";
import { getStyleSource } from "../../shared/style-info";
@@ -36,7 +36,6 @@ export const OutlineWidth = (
<CssValueInputContainer
key={property}
property={property}
- label={outlineStyleConfig?.label || ""}
styleSource={getStyleSource(currentStyle[property])}
keywords={outlineStyleWidthKeywords}
setValue={setProperty(property)}
diff --git a/apps/builder/app/builder/features/style-panel/sections/sections.ts b/apps/builder/app/builder/features/style-panel/sections/sections.ts
index 1276ffa72f..80c85354d6 100644
--- a/apps/builder/app/builder/features/style-panel/sections/sections.ts
+++ b/apps/builder/app/builder/features/style-panel/sections/sections.ts
@@ -39,10 +39,10 @@ export const sections = new Map<
["advanced", advanced],
]);
-export const visualProperties = new Set<StyleProperty>([]);
+export const sectionsProperties = new Set<StyleProperty>([]);
for (const { properties } of sections.values()) {
for (const property of properties) {
- visualProperties.add(property);
+ sectionsProperties.add(property);
}
}
diff --git a/apps/builder/app/builder/features/style-panel/sections/transitions/transition-content.tsx b/apps/builder/app/builder/features/style-panel/sections/transitions/transition-content.tsx
index 5ae0424b2e..48e05fd7f8 100644
--- a/apps/builder/app/builder/features/style-panel/sections/transitions/transition-content.tsx
+++ b/apps/builder/app/builder/features/style-panel/sections/transitions/transition-content.tsx
@@ -31,8 +31,7 @@ import type {
import { type IntermediateStyleValue } from "../../shared/css-value-input";
import { TransitionProperty } from "./transition-property";
import { TransitionTiming } from "./transition-timing";
-import { CssValueInputContainer } from "../../controls/position/css-value-input-container";
-import { styleConfigByName } from "../../shared/configs";
+import { CssValueInputContainer } from "../../shared/css-value-input";
type TransitionContentProps = {
index: number;
@@ -59,9 +58,6 @@ export const TransitionContent = ({
[layer]
);
- const transitionDurationConfig = styleConfigByName("transitionDuration");
- const transitionDelayConfig = styleConfigByName("transitionDelay");
-
const handleChange = (value: string) => {
setIntermediateValue({
type: "intermediate",
@@ -149,7 +145,6 @@ export const TransitionContent = ({
<CssValueInputContainer
key={"transitionDuration"}
property={"transitionDuration"}
- label={transitionDurationConfig.label}
styleSource="local"
/* Browser default for transition-duration */
value={duration ?? { type: "unit", value: 0, unit: "ms" }}
@@ -190,7 +185,6 @@ export const TransitionContent = ({
styleSource="local"
/* Browser default for transition-delay */
value={delay ?? { type: "unit", value: 0, unit: "ms" }}
- label={transitionDelayConfig.label}
keywords={[]}
deleteProperty={() => handlePropertyUpdate({ delay })}
setValue={(value, options) => {
diff --git a/apps/builder/app/builder/features/style-panel/controls/position/css-value-input-container.tsx b/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input-container.tsx
similarity index 66%
rename from apps/builder/app/builder/features/style-panel/controls/position/css-value-input-container.tsx
rename to apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input-container.tsx
index 98fdd66178..4bf9d0f077 100644
--- a/apps/builder/app/builder/features/style-panel/controls/position/css-value-input-container.tsx
+++ b/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input-container.tsx
@@ -1,36 +1,27 @@
import { type ComponentProps, useState } from "react";
-import type { StyleValue, StyleProperty } from "@webstudio-is/css-engine";
+import type { StyleValue } from "@webstudio-is/css-engine";
import { Box } from "@webstudio-is/design-system";
-import {
- CssValueInput,
- type IntermediateStyleValue,
-} from "../../shared/css-value-input";
-import type { StyleSource } from "../../shared/style-info";
-import type { DeleteProperty, SetValue } from "../../shared/use-style-data";
+import { CssValueInput, type IntermediateStyleValue } from ".";
+import type { DeleteProperty, SetValue } from "../use-style-data";
type CssValueInputContainerProps = {
- property: StyleProperty;
- keywords: ComponentProps<typeof CssValueInput>["keywords"];
- label: string;
- styleSource: StyleSource;
- value?: StyleValue;
setValue: SetValue;
deleteProperty: DeleteProperty;
- disabled?: boolean;
- icon?: JSX.Element;
- autoFocus?: boolean;
-};
+} & Omit<
+ ComponentProps<typeof CssValueInput>,
+ | "onChange"
+ | "onHighlight"
+ | "onChangeComplete"
+ | "onAbort"
+ | "intermediateValue"
+>;
export const CssValueInputContainer = ({
property,
keywords,
- styleSource,
- value,
setValue,
deleteProperty,
- disabled,
- icon,
- autoFocus,
+ ...props
}: CssValueInputContainerProps) => {
const [intermediateValue, setIntermediateValue] = useState<
StyleValue | IntermediateStyleValue
@@ -39,12 +30,8 @@ export const CssValueInputContainer = ({
return (
<Box>
<CssValueInput
- autoFocus={autoFocus}
- icon={icon}
- disabled={disabled}
- styleSource={styleSource}
+ {...props}
property={property}
- value={value}
intermediateValue={intermediateValue}
keywords={keywords}
onChange={(styleValue) => {
diff --git a/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx b/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx
index 31b6bf42ae..1f982dfbfe 100644
--- a/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx
+++ b/apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx
@@ -29,6 +29,7 @@ import {
useEffect,
useRef,
useState,
+ type ComponentProps,
} from "react";
import { useUnitSelect } from "./unit-select";
import { parseIntermediateOrInvalidValue } from "./parse-intermediate-or-invalid-value";
@@ -276,8 +277,10 @@ export type ChangeReason =
| "keyword-select"
| "scrub-end";
-type CssValueInputProps = {
- autoFocus?: boolean;
+type CssValueInputProps = Pick<
+ ComponentProps<typeof InputField>,
+ "variant" | "size" | "autoFocus" | "disabled" | "fieldSizing" | "prefix"
+> & {
styleSource: StyleSource;
property: StyleProperty;
value: StyleValue | undefined;
@@ -286,7 +289,6 @@ type CssValueInputProps = {
* Selected item in the dropdown
*/
keywords?: Array<KeywordValue>;
- disabled?: boolean;
onChange: (value: CssValueInputValue | undefined) => void;
onChangeComplete: (event: {
value: StyleValue;
@@ -295,7 +297,6 @@ type CssValueInputProps = {
onHighlight: (value: StyleValue | undefined) => void;
onAbort: () => void;
icon?: ReactNode;
- prefix?: ReactNode;
showSuffix?: boolean;
};
@@ -356,6 +357,9 @@ export const CssValueInput = ({
onHighlight,
onAbort,
disabled,
+ fieldSizing,
+ variant,
+ size,
...props
}: CssValueInputProps) => {
const value = props.intermediateValue ?? props.value ?? initialValue;
@@ -646,7 +650,10 @@ export const CssValueInput = ({
<Box {...getComboboxProps()}>
<ComboboxAnchor>
<InputField
+ size={size}
+ variant={variant}
disabled={disabled}
+ fieldSizing={fieldSizing}
{...inputProps}
onFocus={() => {
const isFocused = document.activeElement === inputRef.current;
@@ -663,7 +670,7 @@ export const CssValueInput = ({
color={value.type === "invalid" ? "error" : undefined}
prefix={finalPrefix}
suffix={suffix}
- css={{ cursor: "default" }}
+ css={{ cursor: "default", minWidth: "2em" }}
/>
</ComboboxAnchor>
{isOpen && (
diff --git a/apps/builder/app/builder/features/style-panel/shared/css-value-input/index.ts b/apps/builder/app/builder/features/style-panel/shared/css-value-input/index.ts
index 977f5f1563..99c6cc8541 100644
--- a/apps/builder/app/builder/features/style-panel/shared/css-value-input/index.ts
+++ b/apps/builder/app/builder/features/style-panel/shared/css-value-input/index.ts
@@ -1 +1,2 @@
export { CssValueInput, type IntermediateStyleValue } from "./css-value-input";
+export { CssValueInputContainer } from "./css-value-input-container";
diff --git a/apps/builder/app/builder/features/topbar/publish.tsx b/apps/builder/app/builder/features/topbar/publish.tsx
index 6f8ebe901f..653cad9e68 100644
--- a/apps/builder/app/builder/features/topbar/publish.tsx
+++ b/apps/builder/app/builder/features/topbar/publish.tsx
@@ -186,7 +186,7 @@ const ChangeProjectDomain = ({
<Grid gap={1}>
<Label htmlFor={id}>Domain:</Label>
<InputField
- variant="mono"
+ text="mono"
id={id}
placeholder="Domain"
value={domain}
@@ -590,7 +590,7 @@ const ExportContent = () => {
<Flex gap={2}>
<InputField
css={{ flex: 1 }}
- variant="mono"
+ text="mono"
readOnly
value={npxCommand}
/>
diff --git a/packages/design-system/src/components/input-field.stories.tsx b/packages/design-system/src/components/input-field.stories.tsx
index 55a52dd87d..2ba3db896b 100644
--- a/packages/design-system/src/components/input-field.stories.tsx
+++ b/packages/design-system/src/components/input-field.stories.tsx
@@ -31,7 +31,7 @@ export const Demo = () => (
<StorySection title="Mono">
<StoryGrid horizontal>
- <InputField defaultValue="mono text" variant="mono" />
+ <InputField defaultValue="mono text" text="mono" />
</StoryGrid>
</StorySection>
diff --git a/packages/design-system/src/components/input-field.tsx b/packages/design-system/src/components/input-field.tsx
index 424281ed95..8866bf45b4 100644
--- a/packages/design-system/src/components/input-field.tsx
+++ b/packages/design-system/src/components/input-field.tsx
@@ -57,19 +57,18 @@ const inputStyle = css({
},
},
variants: {
- variant: {
+ text: {
regular: textVariants.regular,
mono: textVariants.mono,
},
},
defaultVariants: {
- variant: "regular",
+ text: "regular",
},
});
const containerStyle = css({
display: "flex",
- height: theme.spacing[12],
boxSizing: "border-box",
minWidth: 0,
alignItems: "center",
@@ -92,6 +91,27 @@ const containerStyle = css({
"&:has([data-input-field-input]:disabled)": {
backgroundColor: theme.colors.backgroundInputDisabled,
},
+ variants: {
+ variant: {
+ chromeless: {
+ "&:not(:hover)": {
+ borderColor: "transparent",
+ backgroundColor: "transparent",
+ },
+ },
+ },
+ size: {
+ 1: {
+ height: theme.spacing[11],
+ },
+ 2: {
+ height: theme.spacing[12],
+ },
+ },
+ },
+ defaultVariants: {
+ size: 2,
+ },
});
const suffixSlotStyle = css({
@@ -110,12 +130,16 @@ const Container = forwardRef(
css,
prefix,
suffix,
+ variant,
+ size,
...props
}: {
children: ReactNode;
prefix?: ReactNode;
suffix?: ReactNode;
css?: CSS;
+ variant: InputFieldProps["variant"];
+ size: InputFieldProps["size"];
} & Omit<ComponentProps<"div">, "prefix">,
ref: Ref<HTMLDivElement>
) => {
@@ -123,7 +147,7 @@ const Container = forwardRef(
if (!prefix && !suffix) {
return (
<div
- className={containerStyle({ className, css })}
+ className={containerStyle({ className, css, variant, size })}
{...props}
ref={ref}
>
@@ -136,7 +160,7 @@ const Container = forwardRef(
<ArrowFocus
render={({ handleKeyDown }) => (
<div
- className={containerStyle({ className, css })}
+ className={containerStyle({ className, css, variant, size })}
{...props}
onKeyDown={(event) => {
props.onKeyDown?.(event);
@@ -166,12 +190,12 @@ type InputProps = {
type?: (typeof inputFieldTypes)[number];
color?: (typeof inputFieldColors)[number];
css?: CSS;
- variant?: "regular" | "mono";
-} & Omit<InputWithFieldSizingProps, "prefix" | "onFocus" | "onBlur">;
+ text?: "regular" | "mono";
+} & Omit<InputWithFieldSizingProps, "prefix" | "onFocus" | "onBlur" | "size">;
const Input = forwardRef(
(
- { css, className, color, disabled = false, variant, ...props }: InputProps,
+ { css, className, color, disabled = false, text, ...props }: InputProps,
ref: Ref<HTMLInputElement>
) => {
return (
@@ -181,7 +205,7 @@ const Input = forwardRef(
data-input-field-input // to distinguish from potential other inputs in prefix/suffix
data-color={color}
disabled={disabled}
- className={inputStyle({ className, css, variant })}
+ className={inputStyle({ className, css, text })}
ref={ref}
/>
);
@@ -189,6 +213,17 @@ const Input = forwardRef(
);
Input.displayName = "Input";
+type InputFieldProps = {
+ prefix?: ReactNode;
+ suffix?: ReactNode;
+ containerRef?: Ref<HTMLDivElement>;
+ inputRef?: Ref<HTMLInputElement>;
+ onFocus?: FocusEventHandler;
+ onBlur?: FocusEventHandler;
+ variant?: "chromeless";
+ size?: "1" | "2";
+};
+
export const InputField = forwardRef(
(
{
@@ -200,15 +235,10 @@ export const InputField = forwardRef(
inputRef,
onFocus,
onBlur,
+ variant,
+ size,
...inputProps
- }: InputProps & {
- prefix?: ReactNode;
- suffix?: ReactNode;
- containerRef?: Ref<HTMLDivElement>;
- inputRef?: Ref<HTMLInputElement>;
- onFocus?: FocusEventHandler;
- onBlur?: FocusEventHandler;
- },
+ }: InputProps & InputFieldProps,
ref: Ref<HTMLDivElement>
) => {
// Our input field can contain multiple focused elements,
@@ -224,6 +254,8 @@ export const InputField = forwardRef(
className={className}
prefix={prefix}
suffix={suffix}
+ variant={variant}
+ size={size}
{...focusWithinProps}
ref={mergeRefs(ref, containerRef ?? null)}
>