use a builder for PassphraseInput
This commit is contained in:
1 parent
39b3f74068
commit
c1186ad55e
4 files changed
+48
-16
No files matched your search
@@ -8,9 +8,6 @@ use gpui_omarchy::{ButtonVariant, icon_button, input};
|
||||
|
||||
|
||||
/// A masked passphrase field with a show/hide toggle.
|
||||
///
|
||||
/// The `show` flag is passed in from outside so that it can be shared
|
||||
/// (e.g. passphrase and confirm-passphrase inputs should share it).
|
||||
pub struct PassphraseInput {
|
||||
id: SharedString,
|
||||
state: Entity<InputState>,
|
||||
@@ -29,17 +26,36 @@ pub enum PassphraseInputEvent {
|
||||
|
||||
impl EventEmitter<PassphraseInputEvent> for PassphraseInput {}
|
||||
|
||||
impl PassphraseInput {
|
||||
pub fn new(id: impl Into<SharedString>, show: Entity<bool>, window: &mut Window, cx: &mut Context<Self>) -> Self {
|
||||
pub struct PassphraseInputBuilder {
|
||||
id: SharedString,
|
||||
show: Option<Entity<bool>>,
|
||||
placeholder: SharedString,
|
||||
}
|
||||
|
||||
impl PassphraseInputBuilder {
|
||||
/// Share the show/hide flag with other inputs (e.g. passphrase and confirm-passphrase).
|
||||
pub fn show(mut self, show: Entity<bool>) -> Self {
|
||||
self.show = Some(show);
|
||||
self
|
||||
}
|
||||
|
||||
pub fn placeholder(mut self, placeholder: impl Into<SharedString>) -> Self {
|
||||
self.placeholder = placeholder.into();
|
||||
self
|
||||
}
|
||||
|
||||
pub fn build(self, window: &mut Window, cx: &mut App) -> Entity<PassphraseInput> {
|
||||
let show = self.show.unwrap_or_else(|| cx.new(|_| false));
|
||||
cx.new(|cx| {
|
||||
let masked = !*show.read(cx);
|
||||
let state = cx.new(|cx| {
|
||||
InputState::new(window, cx)
|
||||
.masked(masked)
|
||||
.placeholder("correct horse battery staple")
|
||||
.placeholder(self.placeholder)
|
||||
});
|
||||
|
||||
// keep this field's masking in sync with the shared flag
|
||||
let sync_mask = cx.observe_in(&show, window, |this, show, window, cx| {
|
||||
let sync_mask = cx.observe_in(&show, window, |this: &mut PassphraseInput, show, window, cx| {
|
||||
let masked = !*show.read(cx);
|
||||
this.state.update(cx, |state, cx| state.set_masked(masked, window, cx));
|
||||
cx.notify();
|
||||
@@ -56,12 +72,23 @@ impl PassphraseInput {
|
||||
cx.emit(event);
|
||||
});
|
||||
|
||||
Self {
|
||||
id: id.into(),
|
||||
PassphraseInput {
|
||||
id: self.id,
|
||||
state,
|
||||
show,
|
||||
_subscriptions: vec![sync_mask, forward],
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
impl PassphraseInput {
|
||||
pub fn builder(id: impl Into<SharedString>) -> PassphraseInputBuilder {
|
||||
PassphraseInputBuilder {
|
||||
id: id.into(),
|
||||
show: None,
|
||||
placeholder: SharedString::default(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn value(&self, cx: &App) -> SharedString {
|
||||
|
||||
@@ -54,8 +54,7 @@ impl CredentialsScreen {
|
||||
fn add_aws(&mut self, window: &mut Window, cx: &mut Context<Self>) {
|
||||
let name = cx.new(|cx| InputState::new(window, cx));
|
||||
let access_key_id = cx.new(|cx| InputState::new(window, cx));
|
||||
let show = cx.new(|_| false);
|
||||
let secret_access_key = cx.new(|cx| PassphraseInput::new("aws-secret", show, window, cx));
|
||||
let secret_access_key = PassphraseInput::builder("aws-secret").build(window, cx);
|
||||
name.update(cx, |name, cx| name.focus(window, cx));
|
||||
|
||||
let mut _subscriptions = Vec::new();
|
||||
|
||||
@@ -22,9 +22,9 @@ pub struct UnlockScreen {
|
||||
|
||||
impl UnlockScreen {
|
||||
pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
|
||||
// nothing else shares the show/hide flag, so it's private to this input
|
||||
let show = cx.new(|_| false);
|
||||
let passphrase = cx.new(|cx| PassphraseInput::new("passphrase", show, window, cx));
|
||||
let passphrase = PassphraseInput::builder("passphrase")
|
||||
.placeholder("correct horse battery staple")
|
||||
.build(window, cx);
|
||||
passphrase.update(cx, |input, cx| input.focus(window, cx));
|
||||
|
||||
let submit = cx.subscribe_in(&passphrase, window, |this, _, event, window, cx| {
|
||||
|
||||
@@ -26,8 +26,14 @@ pub struct WelcomeScreen {
|
||||
impl WelcomeScreen {
|
||||
pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
|
||||
let show = cx.new(|_| false);
|
||||
let passphrase = cx.new(|cx| PassphraseInput::new("passphrase", show.clone(), window, cx));
|
||||
let confirm = cx.new(|cx| PassphraseInput::new("confirm", show, window, cx));
|
||||
let passphrase = PassphraseInput::builder("passphrase")
|
||||
.show(show.clone())
|
||||
.placeholder("correct horse battery staple")
|
||||
.build(window, cx);
|
||||
let confirm = PassphraseInput::builder("confirm")
|
||||
.show(show)
|
||||
.placeholder("correct horse battery staple")
|
||||
.build(window, cx);
|
||||
passphrase.update(cx, |input, cx| input.focus(window, cx));
|
||||
|
||||
let mut _subscriptions = Vec::new();
|
||||
|
||||
Reference in new issue
Block a user