Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 378d0b2

Browse files
authored
Merge pull request #6020 from matrix-org/t3chguy/disable-space-fields-busy
Disable space fields whilst their form is busy
2 parents 5d02e44 + 2c89be3 commit 378d0b2

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

src/components/structures/SpaceRoomView.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,7 @@ const SpaceSetupFirstRooms = ({ space, title, description, onFinished }) => {
451451
value={roomNames[i]}
452452
onChange={ev => setRoomName(i, ev.target.value)}
453453
autoFocus={i === 2}
454+
disabled={busy}
454455
/>;
455456
});
456457

@@ -658,6 +659,7 @@ const SpaceSetupPrivateInvite = ({ space, onFinished }) => {
658659
ref={fieldRefs[i]}
659660
onValidate={validateEmailRules}
660661
autoFocus={i === 0}
662+
disabled={busy}
661663
/>;
662664
});
663665

src/components/views/dialogs/SpaceSettingsDialog.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,13 @@ const SpaceSettingsDialog: React.FC<IProps> = ({ matrixClient: cli, space, onFin
116116

117117
<SpaceBasicSettings
118118
avatarUrl={avatarUrlForRoom(space, 80, 80, "crop")}
119-
avatarDisabled={!canSetAvatar}
119+
avatarDisabled={busy || !canSetAvatar}
120120
setAvatar={setNewAvatar}
121121
name={name}
122-
nameDisabled={!canSetName}
122+
nameDisabled={busy || !canSetName}
123123
setName={setName}
124124
topic={topic}
125-
topicDisabled={!canSetTopic}
125+
topicDisabled={busy || !canSetTopic}
126126
setTopic={setTopic}
127127
/>
128128

src/components/views/spaces/SpaceCreateMenu.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ const SpaceCreateMenu = ({ onFinished }) => {
178178
</p>
179179

180180
<form className="mx_SpaceBasicSettings" onSubmit={onSpaceCreateClick}>
181-
<SpaceAvatar setAvatar={setAvatar} />
181+
<SpaceAvatar setAvatar={setAvatar} avatarDisabled={busy} />
182182

183183
<Field
184184
name="spaceName"
@@ -188,6 +188,7 @@ const SpaceCreateMenu = ({ onFinished }) => {
188188
onChange={ev => setName(ev.target.value)}
189189
ref={spaceNameField}
190190
onValidate={spaceNameValidator}
191+
disabled={busy}
191192
/>
192193

193194
<Field
@@ -197,6 +198,7 @@ const SpaceCreateMenu = ({ onFinished }) => {
197198
value={topic}
198199
onChange={ev => setTopic(ev.target.value)}
199200
rows={3}
201+
disabled={busy}
200202
/>
201203
</form>
202204

0 commit comments

Comments
 (0)