style: satisfy formatters
parent
f6f69b408f
commit
357a1a982b
|
|
@ -151,7 +151,10 @@ struct GeneralSettings: View {
|
||||||
.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)
|
.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)
|
||||||
}
|
}
|
||||||
|
|
||||||
MasterDiscoveryInlineList(discovery: self.masterDiscovery, currentTarget: self.state.remoteTarget) { master in
|
MasterDiscoveryInlineList(
|
||||||
|
discovery: self.masterDiscovery,
|
||||||
|
currentTarget: self.state.remoteTarget)
|
||||||
|
{ master in
|
||||||
self.applyDiscoveredMaster(master)
|
self.applyDiscoveredMaster(master)
|
||||||
}
|
}
|
||||||
.padding(.leading, 58)
|
.padding(.leading, 58)
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,8 @@ struct MasterDiscoveryInlineList: View {
|
||||||
VStack(alignment: .leading, spacing: 6) {
|
VStack(alignment: .leading, spacing: 6) {
|
||||||
ForEach(self.discovery.masters.prefix(6)) { master in
|
ForEach(self.discovery.masters.prefix(6)) { master in
|
||||||
let target = self.suggestedSSHTarget(master)
|
let target = self.suggestedSSHTarget(master)
|
||||||
let selected = target != nil && self.currentTarget?.trimmingCharacters(in: .whitespacesAndNewlines) == target
|
let selected = target != nil && self.currentTarget?
|
||||||
|
.trimmingCharacters(in: .whitespacesAndNewlines) == target
|
||||||
|
|
||||||
Button {
|
Button {
|
||||||
withAnimation(.spring(response: 0.25, dampingFraction: 0.9)) {
|
withAnimation(.spring(response: 0.25, dampingFraction: 0.9)) {
|
||||||
|
|
@ -62,7 +63,9 @@ struct MasterDiscoveryInlineList: View {
|
||||||
.frame(maxWidth: .infinity, alignment: .leading)
|
.frame(maxWidth: .infinity, alignment: .leading)
|
||||||
.background(
|
.background(
|
||||||
RoundedRectangle(cornerRadius: 10, style: .continuous)
|
RoundedRectangle(cornerRadius: 10, style: .continuous)
|
||||||
.fill(self.rowBackground(selected: selected, hovered: self.hoveredMasterID == master.id)))
|
.fill(self.rowBackground(
|
||||||
|
selected: selected,
|
||||||
|
hovered: self.hoveredMasterID == master.id)))
|
||||||
.overlay(
|
.overlay(
|
||||||
RoundedRectangle(cornerRadius: 10, style: .continuous)
|
RoundedRectangle(cornerRadius: 10, style: .continuous)
|
||||||
.strokeBorder(
|
.strokeBorder(
|
||||||
|
|
@ -72,7 +75,8 @@ struct MasterDiscoveryInlineList: View {
|
||||||
}
|
}
|
||||||
.buttonStyle(.plain)
|
.buttonStyle(.plain)
|
||||||
.onHover { hovering in
|
.onHover { hovering in
|
||||||
self.hoveredMasterID = hovering ? master.id : (self.hoveredMasterID == master.id ? nil : self.hoveredMasterID)
|
self.hoveredMasterID = hovering ? master
|
||||||
|
.id : (self.hoveredMasterID == master.id ? nil : self.hoveredMasterID)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -242,7 +242,10 @@ struct OnboardingView: View {
|
||||||
.frame(width: fieldWidth)
|
.frame(width: fieldWidth)
|
||||||
}
|
}
|
||||||
|
|
||||||
MasterDiscoveryInlineList(discovery: self.masterDiscovery, currentTarget: self.state.remoteTarget) { master in
|
MasterDiscoveryInlineList(
|
||||||
|
discovery: self.masterDiscovery,
|
||||||
|
currentTarget: self.state.remoteTarget)
|
||||||
|
{ master in
|
||||||
self.applyDiscoveredMaster(master)
|
self.applyDiscoveredMaster(master)
|
||||||
}
|
}
|
||||||
.frame(width: fieldWidth, alignment: .leading)
|
.frame(width: fieldWidth, alignment: .leading)
|
||||||
|
|
|
||||||
|
|
@ -823,7 +823,8 @@ describe("web auto-reply", () => {
|
||||||
|
|
||||||
const heartbeatCall = replyResolver.mock.calls.find(
|
const heartbeatCall = replyResolver.mock.calls.find(
|
||||||
(call) =>
|
(call) =>
|
||||||
call[0]?.Body === HEARTBEAT_PROMPT && call[0]?.MessageSid === "sid-main",
|
call[0]?.Body === HEARTBEAT_PROMPT &&
|
||||||
|
call[0]?.MessageSid === "sid-main",
|
||||||
);
|
);
|
||||||
expect(heartbeatCall?.[0]?.From).toBe("+1555");
|
expect(heartbeatCall?.[0]?.From).toBe("+1555");
|
||||||
expect(heartbeatCall?.[0]?.To).toBe("+1555");
|
expect(heartbeatCall?.[0]?.To).toBe("+1555");
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue