From 5d8ade8855cc21ac04cd0e3524bd451ecfd043b2 Mon Sep 17 00:00:00 2001 From: Benjamin Dupont Date: Tue, 26 Jul 2022 22:48:57 -0400 Subject: [PATCH] refactor: restyle don't ask again checkbox --- .../components/Modal/AutostartDialog.tsx | 19 ++++++++++++- src/renderer/components/Modal/index.tsx | 27 +++++++++++-------- 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/src/renderer/components/Modal/AutostartDialog.tsx b/src/renderer/components/Modal/AutostartDialog.tsx index 664455a8..ca460b5c 100644 --- a/src/renderer/components/Modal/AutostartDialog.tsx +++ b/src/renderer/components/Modal/AutostartDialog.tsx @@ -66,7 +66,7 @@ interface YesNoOptionToggleProps { disabledBgColor?: string, } -const YesNoOptionToggle: FC = ({ enabled, onToggle, enabledBgColor = 'bg-utility-green', disabledBgColor = 'bg-navy-light', children }) => { +export const YesNoOptionToggle: FC = ({ enabled, onToggle, enabledBgColor = 'bg-utility-green', disabledBgColor = 'bg-navy-light', children }) => { const handleClick = onToggle; const bgColor = enabled ? enabledBgColor : disabledBgColor; @@ -82,3 +82,20 @@ const YesNoOptionToggle: FC = ({ enabled, onToggle, enab ); }; + +export const CompactYesNoOptionToggle: FC = ({ enabled, onToggle, enabledBgColor = 'bg-utility-green', children }) => { + const handleClick = onToggle; + + const borderColor = enabled ? 'border-cyan' : 'border-navy-light'; + const titleColor = enabled ? 'text-cyan' : 'text-quasi-white'; + + return ( +
+ + + + {children} + +
+ ); +}; diff --git a/src/renderer/components/Modal/index.tsx b/src/renderer/components/Modal/index.tsx index 47131a33..76aaf8f0 100644 --- a/src/renderer/components/Modal/index.tsx +++ b/src/renderer/components/Modal/index.tsx @@ -8,6 +8,7 @@ import "./index.css"; import changelog from './../../../../.github/CHANGELOG.yaml'; import * as packageInfo from '../../../../package.json'; import { Button, ButtonType } from "renderer/components/Button"; +import { CompactYesNoOptionToggle } from './AutostartDialog'; interface ModalContextInterface{ showModal: (modal: JSX.Element) => void; @@ -122,16 +123,7 @@ export const PromptModal: FC = ({ )} {dontShowAgainSettingName && ( -
- setCheckMark(!checkMark)} - className=" w-5 h-5 rounded-sm checked:bg-blue-600 checked:border-transparent" - /> - - Don't show me this again -
+ setCheckMark((old) => !old)} /> )}
@@ -270,8 +262,20 @@ export const ChangelogModal: React.FC = () => { ); }; -export const ModalContainer: FC = () => { +interface DoNotAskAgainProps { + checked: boolean, + toggleChecked: () => void, +} +const DoNotAskAgain: FC = ({ checked, toggleChecked }) => ( +
+ + Don't show this again + +
+); + +export const ModalContainer: FC = () => { const onVersionChanged = () => { const { showModal } = useModals(); @@ -280,6 +284,7 @@ export const ModalContainer: FC = () => { showModal(); } }; + onVersionChanged(); const { modal } = useModals();