Skip to content

armgit / Piik

Public Imported from GitHub
0

Free, open-source screen sharing for private live streams with friends. Watch together in a browser or self-host Piik. 免费开源的私密屏幕共享,支持游戏直播、一起看电影与自部署。

fix(host): simplify room password controls

AAAcec96da8b84d
diff --git a/src/client/pages/HostPage.tsx b/src/client/pages/HostPage.tsx
index a26ea03b..77fd44af 100644
--- a/src/client/pages/HostPage.tsx
+++ b/src/client/pages/HostPage.tsx
@@ -247,6 +247,8 @@ export function HostPage({ onAuthorizationRequired }: HostPageProps = {}) {
creationProfileRef.current = creationProfile;
}, [creationProfile]);
const [viewerPasswordDraft, setViewerPasswordDraft] = useState("");
+ const [viewerPasswordEditorOpen, setViewerPasswordEditorOpen] =
+ useState(false);
const [viewerPasswordUpdating, setViewerPasswordUpdating] = useState(false);
const [maxViewers, setMaxViewers] = useState<number | null>(null);
const [peerSnapshots, setPeerSnapshots] = useState<Map<string, PeerSnapshot>>(
@@ -532,6 +534,8 @@ export function HostPage({ onAuthorizationRequired }: HostPageProps = {}) {
clearHostRoom();
setRoom(null);
setCopied(false);
+ setViewerPasswordEditorOpen(false);
+ setViewerPasswordDraft("");
}
function endSharing(message: string, notifyServer = true): void {
@@ -1234,6 +1238,7 @@ export function HostPage({ onAuthorizationRequired }: HostPageProps = {}) {
setViewerPasswordUpdating(false);
setViewerPasswordDraft("");
if (action !== undefined) {
+ setViewerPasswordEditorOpen(false);
setNotice(
action === null ? "房间密码已移除" : "房间密码已更新",
);
@@ -2405,67 +2410,102 @@ export function HostPage({ onAuthorizationRequired }: HostPageProps = {}) {
</button>
))}
</div>
- <form
- className="viewer-password-control"
- onSubmit={(event) => {
- event.preventDefault();
- changeViewerPassword(viewerPasswordDraft);
- }}
- >
- <label htmlFor="viewer-password">房间密码</label>
- <span className="input-with-icon">
- <KeyRound size={16} aria-hidden="true" />
- <input
- id="viewer-password"
- type="password"
- value={viewerPasswordDraft}
- maxLength={MAX_VIEWER_PASSWORD_LENGTH}
- autoComplete="new-password"
- placeholder={
- viewerPasswordEnabled ? "输入新密码" : "设置密码"
- }
- disabled={viewerPasswordUpdating || phase !== "live"}
- onChange={(event) =>
- setViewerPasswordDraft(event.target.value)
- }
- />
- </span>
- <button
- className="icon-button"
- type="submit"
- title={viewerPasswordEnabled ? "更改房间密码" : "设置房间密码"}
- aria-label={
- viewerPasswordEnabled ? "更改房间密码" : "设置房间密码"
- }
- disabled={
- viewerPasswordUpdating ||
- phase !== "live" ||
- viewerPasswordDraft.length === 0
- }
+ {viewerPasswordEditorOpen ? (
+ <form
+ className="viewer-password-control"
+ onSubmit={(event) => {
+ event.preventDefault();
+ changeViewerPassword(viewerPasswordDraft);
+ }}
>
- <Check size={18} />
- </button>
- {viewerPasswordEnabled && (
+ <label htmlFor="viewer-password">
+ {viewerPasswordEnabled ? "更改房间密码" : "设置房间密码"}
+ </label>
+ <span className="input-with-icon">
+ <KeyRound size={16} aria-hidden="true" />
+ <input
+ id="viewer-password"
+ type="password"
+ value={viewerPasswordDraft}
+ maxLength={MAX_VIEWER_PASSWORD_LENGTH}
+ autoComplete="new-password"
+ placeholder="输入新密码"
+ autoFocus
+ disabled={viewerPasswordUpdating || phase !== "live"}
+ onChange={(event) =>
+ setViewerPasswordDraft(event.target.value)
+ }
+ />
+ </span>
<button
className="icon-button"
- type="button"
- title={
- activeCodeEntryPolicy === "password"
- ? "请先将房间号加入改为开放或关闭"
- : "移除房间密码"
+ type="submit"
+ title={viewerPasswordEnabled ? "更改房间密码" : "设置房间密码"}
+ aria-label={
+ viewerPasswordEnabled ? "更改房间密码" : "设置房间密码"
}
- aria-label="移除房间密码"
disabled={
viewerPasswordUpdating ||
phase !== "live" ||
- activeCodeEntryPolicy === "password"
+ viewerPasswordDraft.length === 0
}
- onClick={() => changeViewerPassword(null)}
>
- <Trash2 size={18} />
+ <Check size={18} aria-hidden="true" />
</button>
- )}
- </form>
+ <button
+ className="icon-button"
+ type="button"
+ title="取消"
+ aria-label="取消编辑房间密码"
+ disabled={viewerPasswordUpdating}
+ onClick={() => {
+ setViewerPasswordDraft("");
+ setViewerPasswordEditorOpen(false);
+ }}
+ >
+ <X size={18} aria-hidden="true" />
+ </button>
+ </form>
+ ) : (
+ <div className="room-password-summary">
+ <span className="room-password-state">
+ <KeyRound size={15} aria-hidden="true" />
+ {viewerPasswordEnabled
+ ? activeCodeEntryPolicy === "password"
+ ? "密码加入已启用"
+ : "房间密码已设置"
+ : "未设置房间密码"}
+ </span>
+ <div className="room-password-actions">
+ <button
+ className="button button-secondary room-password-edit-action"
+ type="button"
+ disabled={viewerPasswordUpdating || phase !== "live"}
+ onClick={() => setViewerPasswordEditorOpen(true)}
+ >
+ {viewerPasswordEnabled ? (
+ <Pencil size={15} aria-hidden="true" />
+ ) : (
+ <KeyRound size={15} aria-hidden="true" />
+ )}
+ {viewerPasswordEnabled ? "更改" : "设置密码"}
+ </button>
+ {viewerPasswordEnabled &&
+ activeCodeEntryPolicy !== "password" && (
+ <button
+ className="icon-button"
+ type="button"
+ title="移除房间密码"
+ aria-label="移除房间密码"
+ disabled={viewerPasswordUpdating || phase !== "live"}
+ onClick={() => changeViewerPassword(null)}
+ >
+ <Trash2 size={17} aria-hidden="true" />
+ </button>
+ )}
+ </div>
+ </div>
+ )}
</div>
</div>
)}
diff --git a/src/client/styles.css b/src/client/styles.css
index c43ea0c4..3915ad3e 100644
--- a/src/client/styles.css
+++ b/src/client/styles.css
@@ -877,6 +877,40 @@ h3 {
border-top: 1px solid var(--border);
}
+.room-password-summary {
+ display: flex;
+ min-width: 0;
+ align-items: center;
+ justify-content: space-between;
+ gap: 8px;
+ margin-top: 10px;
+ padding-top: 10px;
+ border-top: 1px solid var(--border);
+}
+
+.room-password-state,
+.room-password-actions {
+ display: flex;
+ min-width: 0;
+ align-items: center;
+}
+
+.room-password-state {
+ gap: 6px;
+ color: var(--muted);
+ font-size: 12px;
+}
+
+.room-password-actions {
+ flex: 0 0 auto;
+ gap: 6px;
+}
+
+.room-password-edit-action {
+ min-height: 40px;
+ padding: 7px 10px;
+}
+
.viewer-password-control > label {
grid-column: 1 / -1;
color: var(--muted);