From dd4df61fec5bcda4d8ebdaeab2d9016773636ec7 Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Mon, 10 Jan 2022 18:11:54 -0500 Subject: [PATCH] ISSUE-005 - Added indicator "I" and "O", emulating an accessibility option found in iOS. Added a subtle background color transition. Gave up on the idea of giving the toggle circle a shadow (not worth the hassle). But if I did decide to do that, I'd be able to animate the toggle circle fairly easily, I think. --- .../Common/Inputs/Toggle/Toggle.tsx | 15 ++++++++----- src/components/Common/Inputs/Toggle/styles.ts | 22 +++++++++++++++++++ src/shared/theme.ts | 5 ----- 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/src/components/Common/Inputs/Toggle/Toggle.tsx b/src/components/Common/Inputs/Toggle/Toggle.tsx index 7325765..8273ede 100644 --- a/src/components/Common/Inputs/Toggle/Toggle.tsx +++ b/src/components/Common/Inputs/Toggle/Toggle.tsx @@ -13,13 +13,17 @@ export type ToggleProps = { label: string, toggled: boolean, onToggle: (value: AnimatedBG) => void, + showIndicators?: boolean, }; /** * This is my attempt at making a iOS-style toggle switch. - * @param param0 - * @returns */ -export const Toggle = ({ label, toggled, onToggle }: ToggleProps) => { +export const Toggle = ({ + label, + toggled, + onToggle, + showIndicators = false, +}: ToggleProps) => { const [hovered, setHovered] = useState(false); return ( @@ -37,8 +41,9 @@ export const Toggle = ({ label, toggled, onToggle }: ToggleProps) => { onMouseDown={() => setHovered(true)} onMouseUp={() => setHovered(false)} > - - + + + diff --git a/src/components/Common/Inputs/Toggle/styles.ts b/src/components/Common/Inputs/Toggle/styles.ts index bcd8841..d706654 100644 --- a/src/components/Common/Inputs/Toggle/styles.ts +++ b/src/components/Common/Inputs/Toggle/styles.ts @@ -35,6 +35,7 @@ ToggleLabel.displayName = "ToggleLabel"; type ToggleBackgroundProps = { toggled: boolean, toggledColor?: string, + showIndicators?: boolean, }; export const ToggleBackground = styled.div` background-color: ${({ @@ -47,10 +48,31 @@ export const ToggleBackground = styled.div` )}; width: 100%; height: 100%; + transition: background-color 300ms; ${({ toggled }) => toggled && css` box-shadow: inset 0 0 24px -16px black; `} + + ${({ toggled, showIndicators }) => showIndicators && (toggled ? + css` + div:before { + position: absolute; + right: 26px; + bottom: -2px; + content: "I"; + color: ${p => p.theme.colors.darkGrey}; + } + ` : + css` + div:after { + position: absolute; + left: 23px; + bottom: -2px; + content: "O"; + color: ${p => p.theme.colors.grey}; + } + `)} `; ToggleBackground.displayName = "ToggleBackground"; diff --git a/src/shared/theme.ts b/src/shared/theme.ts index 25d7408..4ee114a 100644 --- a/src/shared/theme.ts +++ b/src/shared/theme.ts @@ -48,9 +48,4 @@ export const GlobalStyle = createGlobalStyle` button { font-family: ${p => p.theme.fonts.basic}; } - - .main { - padding: 70px 0 20px; - min-height: calc(100vh - 50px); - } `;