diff --git a/app/assets/javascripts/Components/Abstract/PureComponent.tsx b/app/assets/javascripts/Components/Abstract/PureComponent.tsx index 6351b53bd..74041cef2 100644 --- a/app/assets/javascripts/Components/Abstract/PureComponent.tsx +++ b/app/assets/javascripts/Components/Abstract/PureComponent.tsx @@ -8,10 +8,7 @@ import { findDOMNode, unmountComponentAtNode } from 'preact/compat' export type PureComponentState = Partial> export type PureComponentProps = Partial> -export abstract class PureComponent< - P = PureComponentProps, - S = PureComponentState, -> extends Component { +export abstract class PureComponent

extends Component { private unsubApp!: () => void private unsubState!: () => void private reactionDisposers: IReactionDisposer[] = [] diff --git a/app/assets/javascripts/Components/AccountMenu/ConfirmPassword.tsx b/app/assets/javascripts/Components/AccountMenu/ConfirmPassword.tsx index db4065ebf..66afcc84e 100644 --- a/app/assets/javascripts/Components/AccountMenu/ConfirmPassword.tsx +++ b/app/assets/javascripts/Components/AccountMenu/ConfirmPassword.tsx @@ -107,10 +107,8 @@ export const ConfirmPassword: FunctionComponent = observer(

Because your notes are encrypted using your password,{' '} - - Standard Notes does not have a password reset option - - . If you forget your password, you will permanently lose access to your data. + Standard Notes does not have a password reset option. If you forget + your password, you will permanently lose access to your data.
= observer( ref={passwordInputRef} value={password} /> - - {isOpen && ( -
- -
- )} - - ) - }, -) + if (newMenuPosition) { + setMenuStyle(newMenuPosition) + } + }) + } + }, [isOpen]) + + return ( + <> + + {isOpen && ( +
+ +
+ )} + + ) +}) diff --git a/app/assets/javascripts/Components/AccountMenu/index.tsx b/app/assets/javascripts/Components/AccountMenu/index.tsx index cf4ae5772..d27726865 100644 --- a/app/assets/javascripts/Components/AccountMenu/index.tsx +++ b/app/assets/javascripts/Components/AccountMenu/index.tsx @@ -51,9 +51,7 @@ const MenuPaneSelector: FunctionComponent = observer( /> ) case AccountMenuPane.SignIn: - return ( - - ) + return case AccountMenuPane.Register: return ( = observer( export const AccountMenu: FunctionComponent = observer( ({ application, appState, onClickOutside, mainApplicationGroup }) => { - const { currentPane, setCurrentPane, shouldAnimateCloseMenu, closeAccountMenu } = - appState.accountMenu + const { currentPane, setCurrentPane, shouldAnimateCloseMenu, closeAccountMenu } = appState.accountMenu const ref = useRef(null) useCloseOnClickOutside(ref, () => { diff --git a/app/assets/javascripts/Components/Button/RoundIconButton.tsx b/app/assets/javascripts/Components/Button/RoundIconButton.tsx index ee3d20325..55882f655 100644 --- a/app/assets/javascripts/Components/Button/RoundIconButton.tsx +++ b/app/assets/javascripts/Components/Button/RoundIconButton.tsx @@ -21,12 +21,7 @@ interface Props { * IconButton component with an icon * preventDefault is already handled within the component */ -export const RoundIconButton: FunctionComponent = ({ - onClick, - type, - className, - icon: iconType, -}) => { +export const RoundIconButton: FunctionComponent = ({ onClick, type, className, icon: iconType }) => { const click = (e: MouseEvent) => { e.preventDefault() onClick() diff --git a/app/assets/javascripts/Components/ChallengeModal/ChallengeModal.tsx b/app/assets/javascripts/Components/ChallengeModal/ChallengeModal.tsx index bd1cdb627..d961747fe 100644 --- a/app/assets/javascripts/Components/ChallengeModal/ChallengeModal.tsx +++ b/app/assets/javascripts/Components/ChallengeModal/ChallengeModal.tsx @@ -34,10 +34,7 @@ type Props = { onDismiss: (challenge: Challenge) => Promise } -const validateValues = ( - values: ChallengeModalValues, - prompts: ChallengePrompt[], -): ChallengeModalValues | undefined => { +const validateValues = (values: ChallengeModalValues, prompts: ChallengePrompt[]): ChallengeModalValues | undefined => { let hasInvalidValues = false const validatedValues = { ...values } for (const prompt of prompts) { @@ -75,10 +72,9 @@ export const ChallengeModal: FunctionComponent = ({ const [isProcessing, setIsProcessing] = useState(false) const [, setProcessingPrompts] = useState([]) const [bypassModalFocusLock, setBypassModalFocusLock] = useState(false) - const shouldShowForgotPasscode = [ - ChallengeReason.ApplicationUnlock, - ChallengeReason.Migration, - ].includes(challenge.reason) + const shouldShowForgotPasscode = [ChallengeReason.ApplicationUnlock, ChallengeReason.Migration].includes( + challenge.reason, + ) const shouldShowWorkspaceSwitcher = challenge.reason === ChallengeReason.ApplicationUnlock const submit = async () => { @@ -268,10 +264,7 @@ export const ChallengeModal: FunctionComponent = ({ )} {shouldShowWorkspaceSwitcher && ( - + )} diff --git a/app/assets/javascripts/Components/ChallengeModal/ChallengePrompt.tsx b/app/assets/javascripts/Components/ChallengeModal/ChallengePrompt.tsx index 406962e4e..116c7a5f9 100644 --- a/app/assets/javascripts/Components/ChallengeModal/ChallengePrompt.tsx +++ b/app/assets/javascripts/Components/ChallengeModal/ChallengePrompt.tsx @@ -1,8 +1,4 @@ -import { - ChallengePrompt, - ChallengeValidation, - ProtectionSessionDurations, -} from '@standardnotes/snjs' +import { ChallengePrompt, ChallengeValidation, ProtectionSessionDurations } from '@standardnotes/snjs' import { FunctionComponent } from 'preact' import { useEffect, useRef } from 'preact/hooks' import { DecoratedInput } from '@/Components/Input/DecoratedInput' @@ -17,13 +13,7 @@ type Props = { isInvalid: boolean } -export const ChallengeModalPrompt: FunctionComponent = ({ - prompt, - values, - index, - onValueChange, - isInvalid, -}) => { +export const ChallengeModalPrompt: FunctionComponent = ({ prompt, values, index, onValueChange, isInvalid }) => { const inputRef = useRef(null) useEffect(() => { @@ -49,9 +39,7 @@ export const ChallengeModalPrompt: FunctionComponent = ({ return (