Skip to content

Commit 6f778ba

Browse files
committed
Fix role select not working when adding a team member
This issue is caused by bad Radix code. Root cause can be found here radix-ui/primitives#3759 The fix is quite temporary and ideally should be fixed by refactoring select to be a homebaked component
1 parent a1ac091 commit 6f778ba

File tree

2 files changed

+57
-57
lines changed

2 files changed

+57
-57
lines changed

apps/cyberstorm-remix/app/settings/teams/team/tabs/Members/MemberAddForm.tsx

Lines changed: 56 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -115,65 +115,64 @@ export function MemberAddForm(props: {
115115
</NewButton>
116116
}
117117
>
118-
<form onSubmit={strongForm.handleSubmit}>
119-
<Modal.Body>
120-
<div className="add-member-form__text">
121-
Enter the username of the user you wish to add to the team{" "}
122-
<span className="add-member-form__text--bold">
123-
{props.teamName}
124-
</span>
125-
.
118+
<Modal.Body>
119+
<div className="add-member-form__text">
120+
Enter the username of the user you wish to add to the team{" "}
121+
<span className="add-member-form__text--bold">{props.teamName}</span>.
122+
</div>
123+
<div className="add-member-form__fields">
124+
<div className="add-member-form__field add-member-form__username">
125+
<label className="add-member-form__label" htmlFor="username">
126+
Username <RequiredIndicator />
127+
</label>
128+
<NewTextInput
129+
name={"username"}
130+
placeholder={"Enter username..."}
131+
value={formInputs.username}
132+
onChange={(e) => {
133+
setError(null);
134+
updateFormFieldState({
135+
field: "username",
136+
value: e.target.value,
137+
});
138+
}}
139+
enterHook={() => {
140+
strongForm.handleSubmit();
141+
}}
142+
rootClasses="add-member-form__username-input"
143+
id="username"
144+
{...usernameFieldProps}
145+
/>
146+
{error && <div className="add-member-form__error">{error}</div>}
126147
</div>
127-
<div className="add-member-form__fields">
128-
<div className="add-member-form__field add-member-form__username">
129-
<label className="add-member-form__label" htmlFor="username">
130-
Username <RequiredIndicator />
131-
</label>
132-
<NewTextInput
133-
name={"username"}
134-
placeholder={"Enter username..."}
135-
value={formInputs.username}
136-
onChange={(e) => {
137-
setError(null);
138-
updateFormFieldState({
139-
field: "username",
140-
value: e.target.value,
141-
});
142-
}}
143-
rootClasses="add-member-form__username-input"
144-
id="username"
145-
{...usernameFieldProps}
146-
/>
147-
{error && <div className="add-member-form__error">{error}</div>}
148-
</div>
149-
<div className="add-member-form__field">
150-
<label className="add-member-form__label" htmlFor="role">
151-
Role
152-
</label>
153-
<NewSelect
154-
name={"role"}
155-
placeholder="Select role..."
156-
options={roleOptions}
157-
defaultValue="member"
158-
value={formInputs.role}
159-
onChange={(value) => {
160-
updateFormFieldState({ field: "role", value: value });
161-
}}
162-
id="role"
163-
/>
164-
</div>
148+
<div className="add-member-form__field">
149+
<label className="add-member-form__label" htmlFor="role">
150+
Role
151+
</label>
152+
<NewSelect
153+
name={"role"}
154+
placeholder="Select role..."
155+
options={roleOptions}
156+
defaultValue="member"
157+
value={formInputs.role}
158+
onChange={(value) => {
159+
updateFormFieldState({ field: "role", value: value });
160+
}}
161+
id="role"
162+
/>
165163
</div>
166-
</Modal.Body>
167-
<Modal.Footer>
168-
<NewButton
169-
type="submit"
170-
csVariant="accent"
171-
disabled={!strongForm.isReady}
172-
>
173-
Add member
174-
</NewButton>
175-
</Modal.Footer>
176-
</form>
164+
</div>
165+
</Modal.Body>
166+
<Modal.Footer>
167+
<NewButton
168+
type="submit"
169+
csVariant="accent"
170+
onSubmit={strongForm.handleSubmit}
171+
disabled={!strongForm.isReady}
172+
>
173+
Add member
174+
</NewButton>
175+
</Modal.Footer>
177176
</Modal>
178177
);
179178
}

packages/cyberstorm/src/newComponents/Select/Select.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ function SelectComponent<T extends string>(props: SelectProps<T>) {
7474
>
7575
<Trigger asChild>
7676
<NewButton
77+
type="button"
7778
csVariant="secondary"
7879
csSize={csSize}
7980
aria-label={forwardedProps["aria-label"]}

0 commit comments

Comments
 (0)