From 058a2c69a34d6e5362ac3e523c716fa3d490ca86 Mon Sep 17 00:00:00 2001 From: Aman Harwara Date: Tue, 16 May 2023 18:29:56 +0530 Subject: [PATCH] chore: fix switch on clipper --- .../Components/ClipperView/ClipperView.tsx | 1 + .../Components/Menu/MenuSwitchButtonItem.tsx | 15 ++++++++++++++- .../src/javascripts/Components/Switch/Switch.tsx | 14 +++++++++++--- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/packages/web/src/javascripts/Components/ClipperView/ClipperView.tsx b/packages/web/src/javascripts/Components/ClipperView/ClipperView.tsx index 9489d3d44..2e9fdc7cb 100644 --- a/packages/web/src/javascripts/Components/ClipperView/ClipperView.tsx +++ b/packages/web/src/javascripts/Components/ClipperView/ClipperView.tsx @@ -374,6 +374,7 @@ const ClipperView = ({ setIsScreenshotMode(checked) }} className="flex-row-reverse gap-2" + forceDesktopStyle={true} > Clip as screenshot diff --git a/packages/web/src/javascripts/Components/Menu/MenuSwitchButtonItem.tsx b/packages/web/src/javascripts/Components/Menu/MenuSwitchButtonItem.tsx index 4d8367893..5edceb503 100644 --- a/packages/web/src/javascripts/Components/Menu/MenuSwitchButtonItem.tsx +++ b/packages/web/src/javascripts/Components/Menu/MenuSwitchButtonItem.tsx @@ -11,11 +11,23 @@ type Props = { children: ReactNode onChange: (checked: boolean) => void shortcut?: PlatformedKeyboardShortcut + forceDesktopStyle?: boolean } & Omit, 'onChange'> const MenuSwitchButtonItem = forwardRef( ( - { checked, onChange, disabled, onBlur, tabIndex, children, shortcut, className, ...props }: Props, + { + checked, + onChange, + disabled, + onBlur, + tabIndex, + children, + shortcut, + className, + forceDesktopStyle, + ...props + }: Props, ref: ForwardedRef, ) => { return ( @@ -47,6 +59,7 @@ const MenuSwitchButtonItem = forwardRef( checked={checked} onChange={onChange} tabIndex={FOCUSABLE_BUT_NOT_TABBABLE} + forceDesktopStyle={forceDesktopStyle} /> diff --git a/packages/web/src/javascripts/Components/Switch/Switch.tsx b/packages/web/src/javascripts/Components/Switch/Switch.tsx index 73760a12c..51c1f8080 100644 --- a/packages/web/src/javascripts/Components/Switch/Switch.tsx +++ b/packages/web/src/javascripts/Components/Switch/Switch.tsx @@ -7,22 +7,25 @@ const Switch = ({ className, disabled = false, tabIndex, + forceDesktopStyle, }: { checked: boolean onChange: (checked: boolean) => void className?: string disabled?: boolean tabIndex?: number + forceDesktopStyle?: boolean }) => { const isActive = checked && !disabled return (