Browse Source

Persist message draft

pull/71/head
Sacha Weatherstone 4 years ago
parent
commit
0b2140ed2f
No known key found for this signature in database GPG Key ID: 7AB2D7E206124B31
  1. 31
      src/components/PageComponents/Messages/MessageInput.tsx
  2. 15
      src/core/stores/deviceStore.ts

31
src/components/PageComponents/Messages/MessageInput.tsx

@ -1,7 +1,5 @@
import type React from "react"; import type React from "react";
import { useForm } from "react-hook-form";
import { IconButton } from "@app/components/form/IconButton.js"; import { IconButton } from "@app/components/form/IconButton.js";
import { Input } from "@app/components/form/Input.js"; import { Input } from "@app/components/form/Input.js";
import { useDevice } from "@core/providers/useDevice.js"; import { useDevice } from "@core/providers/useDevice.js";
@ -14,20 +12,13 @@ export interface MessageInputProps {
} }
export const MessageInput = ({ channel }: MessageInputProps): JSX.Element => { export const MessageInput = ({ channel }: MessageInputProps): JSX.Element => {
const { connection, setMessageState } = useDevice(); const { connection, setMessageState, messageDraft, setMessageDraft } =
useDevice();
const { register, handleSubmit } = useForm<{
message: string;
}>({
defaultValues: {
message: ""
}
});
const onSubmit = handleSubmit(async (data) => { const sendText = async (message: string) => {
await connection await connection
?.sendText({ ?.sendText({
text: data.message, text: message,
wantAck: true, wantAck: true,
channel: channel.config.index as Types.ChannelNumber channel: channel.config.index as Types.ChannelNumber
}) })
@ -35,11 +26,18 @@ export const MessageInput = ({ channel }: MessageInputProps): JSX.Element => {
.catch((e: Types.PacketError) => .catch((e: Types.PacketError) =>
setMessageState(channel.config.index, e.id, e.error) setMessageState(channel.config.index, e.id, e.error)
); );
}); };
return ( return (
<div className="flex gap-2"> <div className="flex gap-2">
<form className="w-full" onSubmit={onSubmit}> <form
className="w-full"
onSubmit={(e) => {
e.preventDefault();
sendText(messageDraft);
setMessageDraft("");
}}
>
<div className="flex flex-grow gap-2"> <div className="flex flex-grow gap-2">
<span className="w-full"> <span className="w-full">
<Input <Input
@ -47,7 +45,8 @@ export const MessageInput = ({ channel }: MessageInputProps): JSX.Element => {
minLength={2} minLength={2}
label="" label=""
placeholder="Enter Message" placeholder="Enter Message"
{...register("message")} value={messageDraft}
onChange={(e) => setMessageDraft(e.target.value)}
/> />
</span> </span>
<IconButton <IconButton

15
src/core/stores/deviceStore.ts

@ -69,6 +69,7 @@ export interface Device {
shutdownDialogOpen: boolean; shutdownDialogOpen: boolean;
rebootDialogOpen: boolean; rebootDialogOpen: boolean;
pendingSettingsChanges: boolean; pendingSettingsChanges: boolean;
messageDraft: string;
setReady(ready: boolean): void; setReady(ready: boolean): void;
setStatus: (status: Types.DeviceStatusEnum) => void; setStatus: (status: Types.DeviceStatusEnum) => void;
@ -101,6 +102,7 @@ export interface Device {
setShutdownDialogOpen: (open: boolean) => void; setShutdownDialogOpen: (open: boolean) => void;
setRebootDialogOpen: (open: boolean) => void; setRebootDialogOpen: (open: boolean) => void;
processPacket: (data: processPacketParams) => void; processPacket: (data: processPacketParams) => void;
setMessageDraft: (message: string) => void;
} }
export interface DeviceState { export interface DeviceState {
@ -141,6 +143,7 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
shutdownDialogOpen: false, shutdownDialogOpen: false,
rebootDialogOpen: false, rebootDialogOpen: false,
pendingSettingsChanges: false, pendingSettingsChanges: false,
messageDraft: "",
setReady: (ready: boolean) => { setReady: (ready: boolean) => {
set( set(
@ -231,6 +234,8 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
device.moduleConfig.cannedMessage = device.moduleConfig.cannedMessage =
config.payloadVariant.cannedMessage; config.payloadVariant.cannedMessage;
break; break;
case "audio":
device.moduleConfig.audio = config.payloadVariant.audio;
} }
} }
}) })
@ -548,6 +553,16 @@ export const useDeviceStore = create<DeviceState>((set, get) => ({
} }
}) })
); );
},
setMessageDraft: (message: string) => {
set(
produce<DeviceState>((draft) => {
const device = draft.devices.get(id);
if (device) {
device.messageDraft = message;
}
})
);
} }
}); });
}) })

Loading…
Cancel
Save