From a5d536b5f2512c2cc30efdcf4a15650c5a5be11c Mon Sep 17 00:00:00 2001 From: Aman Harwara Date: Fri, 21 Apr 2023 14:58:35 +0530 Subject: [PATCH] refactor: migrate checkbox from reach-ui --- ...ckbox-npm-0.18.0-817b08c2c9-6f40bfb546.zip | Bin 25576 -> 0 bytes packages/web/package.json | 1 - .../LinkedItems/LinkedFileMenuOptions.tsx | 17 ++-- .../Components/Menu/MenuSwitchButtonItem.tsx | 5 +- .../QuickSettingsMenu/FocusModeSwitch.tsx | 29 ++----- .../javascripts/Components/Switch/Switch.tsx | 77 +++++++++--------- .../Components/Switch/SwitchProps.tsx | 11 --- yarn.lock | 16 ---- 8 files changed, 55 insertions(+), 101 deletions(-) delete mode 100644 .yarn/cache/@reach-checkbox-npm-0.18.0-817b08c2c9-6f40bfb546.zip delete mode 100644 packages/web/src/javascripts/Components/Switch/SwitchProps.tsx diff --git a/.yarn/cache/@reach-checkbox-npm-0.18.0-817b08c2c9-6f40bfb546.zip b/.yarn/cache/@reach-checkbox-npm-0.18.0-817b08c2c9-6f40bfb546.zip deleted file mode 100644 index 7f1ad781146d91bb8dc2f12dc8a1bea568954ff8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25576 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 z

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

- { + checked={isFileProtected} + onChange={() => { handleFileAction({ type: FileItemActionType.ToggleFileProtection, payload: { file }, @@ -49,12 +49,9 @@ const LinkedFileMenuOptions = ({ file, closeMenu, handleFileAction, setIsRenamin }).catch(console.error) }} > - - - Password protect - - - + + Password protect + { diff --git a/packages/web/src/javascripts/Components/Menu/MenuSwitchButtonItem.tsx b/packages/web/src/javascripts/Components/Menu/MenuSwitchButtonItem.tsx index 5b781d150..4658e410f 100644 --- a/packages/web/src/javascripts/Components/Menu/MenuSwitchButtonItem.tsx +++ b/packages/web/src/javascripts/Components/Menu/MenuSwitchButtonItem.tsx @@ -4,13 +4,12 @@ import { PlatformedKeyboardShortcut } from '@standardnotes/ui-services' import { ComponentPropsWithoutRef, ForwardedRef, forwardRef, ReactNode } from 'react' import { KeyboardShortcutIndicator } from '../KeyboardShortcutIndicator/KeyboardShortcutIndicator' import Switch from '../Switch/Switch' -import { SwitchProps } from '../Switch/SwitchProps' import MenuListItem from './MenuListItem' type Props = { checked: boolean children: ReactNode - onChange: NonNullable + onChange: (checked: boolean) => void shortcut?: PlatformedKeyboardShortcut } & Omit, 'onChange'> @@ -42,7 +41,7 @@ const MenuSwitchButtonItem = forwardRef( {children}

{shortcut && } - +
diff --git a/packages/web/src/javascripts/Components/QuickSettingsMenu/FocusModeSwitch.tsx b/packages/web/src/javascripts/Components/QuickSettingsMenu/FocusModeSwitch.tsx index ee7c16bfa..17a3ff5f1 100644 --- a/packages/web/src/javascripts/Components/QuickSettingsMenu/FocusModeSwitch.tsx +++ b/packages/web/src/javascripts/Components/QuickSettingsMenu/FocusModeSwitch.tsx @@ -1,10 +1,8 @@ import { WebApplication } from '@/Application/Application' -import { FunctionComponent, MouseEventHandler, useCallback, useMemo } from 'react' -import Switch from '@/Components/Switch/Switch' +import { FunctionComponent, useCallback, useMemo } from 'react' import { isMobileScreen } from '@/Utils' import { TOGGLE_FOCUS_MODE_COMMAND } from '@standardnotes/ui-services' -import { KeyboardShortcutIndicator } from '../KeyboardShortcutIndicator/KeyboardShortcutIndicator' -import MenuItem from '../Menu/MenuItem' +import MenuSwitchButtonItem from '../Menu/MenuSwitchButtonItem' type Props = { application: WebApplication @@ -14,15 +12,10 @@ type Props = { } const FocusModeSwitch: FunctionComponent = ({ application, onToggle, onClose, isEnabled }) => { - const toggle: MouseEventHandler = useCallback( - (e) => { - e.preventDefault() - - onToggle(!isEnabled) - onClose() - }, - [onToggle, isEnabled, onClose], - ) + const toggle = useCallback(() => { + onToggle(!isEnabled) + onClose() + }, [onToggle, isEnabled, onClose]) const shortcut = useMemo( () => application.keyboardService.keyboardShortcutForCommand(TOGGLE_FOCUS_MODE_COMMAND), @@ -36,13 +29,9 @@ const FocusModeSwitch: FunctionComponent = ({ application, onToggle, onCl } return ( - -
Focus Mode
-
- {shortcut && } - -
-
+ + Focus Mode + ) } diff --git a/packages/web/src/javascripts/Components/Switch/Switch.tsx b/packages/web/src/javascripts/Components/Switch/Switch.tsx index b394ac715..42974e2c6 100644 --- a/packages/web/src/javascripts/Components/Switch/Switch.tsx +++ b/packages/web/src/javascripts/Components/Switch/Switch.tsx @@ -1,49 +1,46 @@ -import { CustomCheckboxContainer, CustomCheckboxInput, CustomCheckboxInputProps } from '@reach/checkbox' -import { FunctionComponent, useState } from 'react' -import { SwitchProps } from './SwitchProps' +import { Checkbox, VisuallyHidden } from '@ariakit/react' +import { classNames } from '@standardnotes/snjs' -const Switch: FunctionComponent = (props: SwitchProps) => { - const [checkedState, setChecked] = useState(props.checked || false) - const checked = props.checked ?? checkedState - const className = props.className ?? '' - - const isDisabled = !!props.disabled - const isActive = checked && !isDisabled +const Switch = ({ + checked, + onChange, + className, + disabled = false, + tabIndex, +}: { + checked: boolean + onChange: (checked: boolean) => void + className?: string + disabled?: boolean + tabIndex?: number +}) => { + const isActive = checked && !disabled return (