From 079fa6bade514aeb499bd8b1667cb501f8956859 Mon Sep 17 00:00:00 2001 From: Claire Date: Wed, 5 Mar 2025 17:55:53 +0100 Subject: [PATCH] [Glitch] Move `app/javascript/hooks` to `app/javascript/flavours/glitch/hooks` Port b57687083f4af178f2e2f43665eb4e49d32a50c2 to glitch-soc Signed-off-by: Claire --- app/javascript/flavours/glitch/components/alt_text_badge.tsx | 2 +- app/javascript/flavours/glitch/components/avatar_overlay.tsx | 5 ++--- app/javascript/flavours/glitch/components/gif.tsx | 2 +- .../features/account_timeline/components/account_header.tsx | 2 +- .../features/alt_text_modal/components/info_button.tsx | 2 +- app/javascript/flavours/glitch/features/directory/index.tsx | 3 +-- app/javascript/flavours/glitch/features/search/index.tsx | 2 +- 7 files changed, 8 insertions(+), 10 deletions(-) diff --git a/app/javascript/flavours/glitch/components/alt_text_badge.tsx b/app/javascript/flavours/glitch/components/alt_text_badge.tsx index 466c5cf1bc..1d1309ba9b 100644 --- a/app/javascript/flavours/glitch/components/alt_text_badge.tsx +++ b/app/javascript/flavours/glitch/components/alt_text_badge.tsx @@ -8,7 +8,7 @@ import type { UsePopperOptions, } from 'react-overlays/esm/usePopper'; -import { useSelectableClick } from '@/hooks/useSelectableClick'; +import { useSelectableClick } from 'flavours/glitch/hooks/useSelectableClick'; const offset = [0, 4] as OffsetValue; const popperConfig = { strategy: 'fixed' } as UsePopperOptions; diff --git a/app/javascript/flavours/glitch/components/avatar_overlay.tsx b/app/javascript/flavours/glitch/components/avatar_overlay.tsx index cddca43d5b..66d85325ed 100644 --- a/app/javascript/flavours/glitch/components/avatar_overlay.tsx +++ b/app/javascript/flavours/glitch/components/avatar_overlay.tsx @@ -1,8 +1,7 @@ +import { useHovering } from 'flavours/glitch/hooks/useHovering'; +import { autoPlayGif } from 'flavours/glitch/initial_state'; import type { Account } from 'flavours/glitch/models/account'; -import { useHovering } from '../hooks/useHovering'; -import { autoPlayGif } from '../initial_state'; - interface Props { account: Account | undefined; // FIXME: remove `undefined` once we know for sure its always there friend: Account | undefined; // FIXME: remove `undefined` once we know for sure its always there diff --git a/app/javascript/flavours/glitch/components/gif.tsx b/app/javascript/flavours/glitch/components/gif.tsx index be2742c0d4..500f64bbe6 100644 --- a/app/javascript/flavours/glitch/components/gif.tsx +++ b/app/javascript/flavours/glitch/components/gif.tsx @@ -1,4 +1,4 @@ -import { useHovering } from '@/hooks/useHovering'; +import { useHovering } from 'flavours/glitch/hooks/useHovering'; import { autoPlayGif } from 'flavours/glitch/initial_state'; export const GIF: React.FC<{ diff --git a/app/javascript/flavours/glitch/features/account_timeline/components/account_header.tsx b/app/javascript/flavours/glitch/features/account_timeline/components/account_header.tsx index 29f12fc56e..049ff68a0e 100644 --- a/app/javascript/flavours/glitch/features/account_timeline/components/account_header.tsx +++ b/app/javascript/flavours/glitch/features/account_timeline/components/account_header.tsx @@ -6,7 +6,6 @@ import classNames from 'classnames'; import { Helmet } from 'react-helmet'; import { NavLink } from 'react-router-dom'; -import { useLinks } from '@/hooks/useLinks'; import CheckIcon from '@/material-icons/400-24px/check.svg?react'; import LockIcon from '@/material-icons/400-24px/lock.svg?react'; import MoreHorizIcon from '@/material-icons/400-24px/more_horiz.svg?react'; @@ -44,6 +43,7 @@ import DropdownMenuContainer from 'flavours/glitch/containers/dropdown_menu_cont import { DomainPill } from 'flavours/glitch/features/account/components/domain_pill'; import AccountNoteContainer from 'flavours/glitch/features/account/containers/account_note_container'; import FollowRequestNoteContainer from 'flavours/glitch/features/account/containers/follow_request_note_container'; +import { useLinks } from 'flavours/glitch/hooks/useLinks'; import { useIdentity } from 'flavours/glitch/identity_context'; import { autoPlayGif, diff --git a/app/javascript/flavours/glitch/features/alt_text_modal/components/info_button.tsx b/app/javascript/flavours/glitch/features/alt_text_modal/components/info_button.tsx index a1a2f60ed9..891702d563 100644 --- a/app/javascript/flavours/glitch/features/alt_text_modal/components/info_button.tsx +++ b/app/javascript/flavours/glitch/features/alt_text_modal/components/info_button.tsx @@ -6,9 +6,9 @@ import classNames from 'classnames'; import Overlay from 'react-overlays/Overlay'; -import { useSelectableClick } from '@/hooks/useSelectableClick'; import QuestionMarkIcon from '@/material-icons/400-24px/question_mark.svg?react'; import { Icon } from 'flavours/glitch/components/icon'; +import { useSelectableClick } from 'flavours/glitch/hooks/useSelectableClick'; const messages = defineMessages({ help: { id: 'info_button.label', defaultMessage: 'Help' }, diff --git a/app/javascript/flavours/glitch/features/directory/index.tsx b/app/javascript/flavours/glitch/features/directory/index.tsx index 2c438ddb32..d7ab68ffe6 100644 --- a/app/javascript/flavours/glitch/features/directory/index.tsx +++ b/app/javascript/flavours/glitch/features/directory/index.tsx @@ -25,10 +25,9 @@ import { LoadMore } from 'flavours/glitch/components/load_more'; import { LoadingIndicator } from 'flavours/glitch/components/loading_indicator'; import { RadioButton } from 'flavours/glitch/components/radio_button'; import ScrollContainer from 'flavours/glitch/containers/scroll_container'; +import { useSearchParam } from 'flavours/glitch/hooks/useSearchParam'; import { useAppDispatch, useAppSelector } from 'flavours/glitch/store'; -import { useSearchParam } from '../../hooks/useSearchParam'; - import { AccountCard } from './components/account_card'; const messages = defineMessages({ diff --git a/app/javascript/flavours/glitch/features/search/index.tsx b/app/javascript/flavours/glitch/features/search/index.tsx index e86f287ca0..82a48771c3 100644 --- a/app/javascript/flavours/glitch/features/search/index.tsx +++ b/app/javascript/flavours/glitch/features/search/index.tsx @@ -4,7 +4,6 @@ import { useIntl, defineMessages, FormattedMessage } from 'react-intl'; import { Helmet } from 'react-helmet'; -import { useSearchParam } from '@/hooks/useSearchParam'; import FindInPageIcon from '@/material-icons/400-24px/find_in_page.svg?react'; import PeopleIcon from '@/material-icons/400-24px/group.svg?react'; import SearchIcon from '@/material-icons/400-24px/search.svg?react'; @@ -20,6 +19,7 @@ import { Icon } from 'flavours/glitch/components/icon'; import ScrollableList from 'flavours/glitch/components/scrollable_list'; import Status from 'flavours/glitch/containers/status_container'; import { Search } from 'flavours/glitch/features/compose/components/search'; +import { useSearchParam } from 'flavours/glitch/hooks/useSearchParam'; import type { Hashtag as HashtagType } from 'flavours/glitch/models/tags'; import { useAppDispatch, useAppSelector } from 'flavours/glitch/store';