diff --git a/app/soapbox/components/ui/toggle/toggle.tsx b/app/soapbox/components/ui/toggle/toggle.tsx index 466a207f8..27334b1df 100644 --- a/app/soapbox/components/ui/toggle/toggle.tsx +++ b/app/soapbox/components/ui/toggle/toggle.tsx @@ -1,13 +1,37 @@ -import React from 'react'; -import ReactToggle, { ToggleProps } from 'react-toggle'; +import clsx from 'clsx'; +import React, { useRef } from 'react'; + +interface IToggle extends Pick, 'id' | 'checked' | 'onChange' | 'required'> { + +} /** A glorified checkbox. Wrapper around react-toggle. */ -const Toggle: React.FC = ({ icons = false, ...rest }) => { +const Toggle: React.FC = ({ id, checked, onChange, required }) => { + const input = useRef(null); + + const handleClick: React.MouseEventHandler = (e) => { + e.preventDefault(); + input.current?.focus(); + input.current?.click(); + }; + return ( - + ); }; diff --git a/app/soapbox/features/filters/edit-filter.tsx b/app/soapbox/features/filters/edit-filter.tsx index 4d035f8d3..9fd5363fa 100644 --- a/app/soapbox/features/filters/edit-filter.tsx +++ b/app/soapbox/features/filters/edit-filter.tsx @@ -71,7 +71,6 @@ const FilterField: StreamfieldComponent = ({ value, onChange }) => @@ -212,28 +211,24 @@ const EditFilter: React.FC = ({ params }) => { setHomeTimeline(target.checked)} /> setPublicTimeline(target.checked)} /> setNotifications(target.checked)} /> setConversations(target.checked)} /> @@ -241,7 +236,6 @@ const EditFilter: React.FC = ({ params }) => { {features.filtersV2 && ( setAccounts(target.checked)} /> @@ -255,7 +249,6 @@ const EditFilter: React.FC = ({ params }) => { hint={intl.formatMessage(features.filtersV2 ? messages.hide_hint : messages.drop_hint)} > setHide(target.checked)} /> diff --git a/app/soapbox/features/ui/components/modals/edit-announcement-modal.tsx b/app/soapbox/features/ui/components/modals/edit-announcement-modal.tsx index 183519817..3b8c7736f 100644 --- a/app/soapbox/features/ui/components/modals/edit-announcement-modal.tsx +++ b/app/soapbox/features/ui/components/modals/edit-announcement-modal.tsx @@ -98,7 +98,6 @@ const EditAnnouncementModal: React.FC = ({ onClose }) =>