Skip to content

Commit 72fa0ae

Browse files
committed
Adjusted textfield and select sizes
1 parent 2662e83 commit 72fa0ae

File tree

5 files changed

+49
-10
lines changed

5 files changed

+49
-10
lines changed

examples/example/src/index.css

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,14 @@
33
@tailwind base;
44
@tailwind components;
55
@tailwind utilities;
6+
7+
:root {
8+
--fcms-primary: #0070F4;
9+
--fcms-primary-dark: #0061e6;
10+
--fcms-primary-bg: #0061e610;
11+
--fcms-secondary: #FF5B79;
12+
}
13+
14+
body {
15+
@apply w-full min-h-screen bg-gray-50 dark:bg-gray-900 flex flex-col items-center justify-center;
16+
}

examples/example_pro/src/FirestoreApp/collections/showcase_collection.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,11 @@ export const showcaseCollection = buildCollection({
206206
name: "Selectable",
207207
dataType: "boolean"
208208
}),
209+
metadata: buildProperty({
210+
name: "Metadata",
211+
dataType: "map",
212+
keyValue: true
213+
}),
209214
content: buildProperty({
210215
name: "Content",
211216
dataType: "array",

examples/example_pro/src/FirestoreApp/views/ExampleCMSView.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,13 @@ export function ExampleCMSView() {
162162
</div>
163163
</div>
164164

165-
<div className="flex gap-2">
165+
<div className="w-full flex gap-2">
166166
<TextField
167167
size={"small"}
168168
placeholder="Invite others by email"
169169
className="flex-grow"
170170
endAdornment={<Select
171-
size={"medium"}
171+
size={"small"}
172172
value={"read"}>
173173
<SelectItem value={"write"}>Can edit</SelectItem>
174174
<SelectItem value={"read"}>Can view</SelectItem>

packages/ui/src/components/Select.tsx

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"use client";
2-
import React, { ChangeEvent, forwardRef, useCallback, useEffect, useState } from "react";
2+
import React, { ChangeEvent, Children, forwardRef, useCallback, useEffect, useState } from "react";
33
import * as SelectPrimitive from "@radix-ui/react-select";
44
import {
55
defaultBorderMixin,
@@ -97,26 +97,38 @@ export const Select = forwardRef<HTMLDivElement, SelectProps>(({
9797
{...props}>
9898
{typeof label === "string" ? <SelectInputLabel error={error}>{label}</SelectInputLabel> : label}
9999
<div className={cls(
100-
size === "medium" ? "min-h-[42px]" : "min-h-[64px]",
101100
"select-none rounded-md text-sm",
102101
invisible ? fieldBackgroundInvisibleMixin : fieldBackgroundMixin,
103102
disabled ? fieldBackgroundDisabledMixin : fieldBackgroundHoverMixin,
104103
"relative flex items-center",
105-
className
104+
className,
105+
{
106+
"min-h-[28px]": size === "small",
107+
"min-h-[42px]": size === "medium",
108+
"min-h-[64px]": size === "large"
109+
}
106110
)}>
107111
<SelectPrimitive.Trigger
108112
ref={inputRef}
109113
id={id}
110114
className={cls(
111115
"w-full h-full",
112-
size === "medium" ? "h-[42px]" : "h-[64px]",
113-
padding ? "px-4 " : "",
116+
padding ? {
117+
"px-4": size === "large",
118+
"px-3": size === "medium",
119+
"px-2": size === "small"
120+
} : "",
114121
"outline-none focus:outline-none",
115122
"select-none rounded-md text-sm",
116123
error ? "text-red-500 dark:text-red-600" : "focus:text-text-primary dark:focus:text-text-primary-dark",
117124
error ? "border border-red-500 dark:border-red-600" : "",
118125
disabled ? "text-surface-accent-600 dark:text-surface-accent-400" : "text-surface-accent-800 dark:text-white",
119126
"relative flex flex-row items-center",
127+
{
128+
"min-h-[28px]": size === "small",
129+
"min-h-[42px]": size === "medium",
130+
"min-h-[64px]": size === "large"
131+
},
120132
inputClassName
121133
)}>
122134

@@ -125,7 +137,11 @@ export const Select = forwardRef<HTMLDivElement, SelectProps>(({
125137
className={cls(
126138
"flex-grow w-full max-w-full flex flex-row gap-2 items-center",
127139
"overflow-visible",
128-
size === "medium" ? "h-[42px]" : "h-[64px]"
140+
{
141+
"min-h-[28px]": size === "small",
142+
"min-h-[42px]": size === "medium",
143+
"min-h-[64px]": size === "large"
144+
}
129145
)}
130146
>
131147
<SelectPrimitive.Value
@@ -165,7 +181,10 @@ export const Select = forwardRef<HTMLDivElement, SelectProps>(({
165181
)}
166182
<SelectPrimitive.Icon asChild>
167183
<ExpandMoreIcon size={"medium"}
168-
className={cls("px-2 transition", open ? "rotate-180" : "")}/>
184+
className={cls("transition", open ? "rotate-180" : "", {
185+
"px-2": size === "large",
186+
"px-1": size === "medium" || size === "small",
187+
})}/>
169188
</SelectPrimitive.Icon>
170189
</SelectPrimitive.Trigger>
171190

packages/ui/src/components/TextField.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,11 @@ export function TextField<T extends string | number>({
172172
{input}
173173

174174
{endAdornment && <div
175-
className="flex flex-row justify-center items-center absolute h-full right-0 top-0 mr-4 ">{endAdornment}</div>}
175+
className={cls("flex flex-row justify-center items-center absolute h-full right-0 top-0", {
176+
"mr-4": size === "large",
177+
"mr-3": size === "medium",
178+
"mr-2": size === "small"
179+
})}>{endAdornment}</div>}
176180

177181
</div>
178182
);

0 commit comments

Comments
 (0)