cswimr/revite
1
0
Fork 0
mirror of https://github.com/revoltchat/revite.git synced 2024-09-20 01:57:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remember whether reply was a mention or not.

Browse source 
Fix input modals refreshing page.
This commit is contained in:
Paul 2021-08-14 21:37:43 +01:00
parent 8609a1f016
commit f59d0efbcb
2 changed files with 41 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/components/common/messaging/bars/ReplyBar.tsx
View file

@ -11,6 +11,7 @@ import { StateUpdater, useEffect } from "preact/hooks";
import { internalSubscribe } from "../../../../lib/eventEmitter";
import { getRenderer } from "../../../../lib/renderer/Singleton";
import { dispatch, getState } from "../../../../redux";
import { Reply } from "../../../../redux/reducers/queue";
import IconButton from "../../../ui/IconButton";
@ -75,7 +76,7 @@ const Base = styled.div`
`;
// ! FIXME: Move to global config
const MAX_REPLIES = 5;
const MAX_REPLIES = 4;
export default observer(({ channel, replies, setReplies }: Props) => {
useEffect(() => {
return internalSubscribe(
@ -84,7 +85,13 @@ export default observer(({ channel, replies, setReplies }: Props) => {
(id) =>
replies.length < MAX_REPLIES &&
!replies.find((x) => x.id === id) &&
setReplies([...replies, { id: id as string, mention: false }]),
setReplies([
...replies,
{
id: id as string,
mention: getState().sectionToggle.mention ?? false,
},
]),
);
}, [replies, setReplies]);
@ -147,15 +154,28 @@ export default observer(({ channel, replies, setReplies }: Props) => {
</ReplyBase>
<span class="actions">
<IconButton
onClick={() =>
onClick={() => {
let state = false;
setReplies(
replies.map((_, i) =>
i === index
? { ..._, mention: !_.mention }
: _,
),
)
}>
replies.map((_, i) => {
if (i === index) {
state = !_.mention;
return {
..._,
mention: !_.mention,
};
}
return _;
}),
);
dispatch({
type: "SECTION_TOGGLE_SET",
id: "mention",
state,
});
}}>
<span class="toggle">
<At size={16} />{" "}
{reply.mention ? "ON" : "OFF"}

24
src/context/intermediate/modals/Input.tsx
View file

@ -57,19 +57,17 @@ export function InputModal({
},
]}
onClose={onClose}>
<form>
{field ? (
<Overline error={error} block>
{field}
</Overline>
) : (
error && <Overline error={error} type="error" block />
)}
<InputBox
value={value}
onChange={(e) => setValue(e.currentTarget.value)}
/>
</form>
{field ? (
<Overline error={error} block>
{field}
</Overline>
) : (
error && <Overline error={error} type="error" block />
)}
<InputBox
value={value}
onChange={(e) => setValue(e.currentTarget.value)}
/>
</Modal>
);
}