Skip to content

Commit 65e1378

Browse files
authored
chore: simplify hooks (#8516)
* chore: simplify hooks * fixup!
1 parent 8dd60ff commit 65e1378

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+116
-233
lines changed

apps/site/components/Common/CodeBox.tsx

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
'use client';
22

3-
import {
4-
DocumentDuplicateIcon,
5-
CodeBracketIcon,
6-
} from '@heroicons/react/24/outline';
73
import BaseCodeBox from '@node-core/ui-components/Common/BaseCodeBox';
84
import { useTranslations } from 'next-intl';
95

106
import Link from '#site/components/Link';
11-
import { useCopyToClipboard } from '#site/hooks';
127

138
import type { FC, PropsWithChildren } from 'react';
149

@@ -18,25 +13,13 @@ type CodeBoxProps = {
1813
};
1914

2015
const CodeBox: FC<PropsWithChildren<CodeBoxProps>> = props => {
21-
const [copied, copyToClipboard] = useCopyToClipboard();
2216
const t = useTranslations();
2317

24-
const ButtonIcon = copied ? DocumentDuplicateIcon : CodeBracketIcon;
25-
2618
return (
2719
<BaseCodeBox
2820
as={Link}
29-
onCopy={copyToClipboard}
30-
buttonContent={
31-
<>
32-
<ButtonIcon className="size-4" />
33-
{t(
34-
copied
35-
? 'components.common.codebox.copied'
36-
: 'components.common.codebox.copy'
37-
)}
38-
</>
39-
}
21+
copyButtonLabel={t('components.common.codebox.copy')}
22+
copiedButtonLabel={t('components.common.codebox.copied')}
4023
{...props}
4124
/>
4225
);

apps/site/components/Downloads/Release/OperatingSystemDropdown.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Select from '@node-core/ui-components/Common/Select';
44
import { useTranslations } from 'next-intl';
55
import { useContext, useEffect, useMemo } from 'react';
66

7-
import { useClientContext } from '#site/hooks';
7+
import { useClientContext } from '#site/hooks/client';
88
import { ReleaseContext } from '#site/providers/releaseProvider';
99
import { nextItem, OPERATING_SYSTEMS, parseCompat } from '#site/util/download';
1010

apps/site/components/Downloads/Release/PlatformDropdown.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import Select from '@node-core/ui-components/Common/Select';
44
import { useTranslations } from 'next-intl';
55
import { useEffect, useContext, useMemo } from 'react';
66

7-
import { useClientContext } from '#site/hooks';
7+
import { useClientContext } from '#site/hooks/client';
88
import { ReleaseContext } from '#site/providers/releaseProvider';
99
import { PLATFORMS, nextItem, parseCompat } from '#site/util/download';
1010
import { getUserPlatform } from '#site/util/userAgent';

apps/site/components/EOL/EOLReleaseTable/TableBody.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ import LinkWithArrow from '#site/components/Common/LinkWithArrow';
88
import EOLModal from '#site/components/EOL/EOLModal';
99
import VulnerabilityChips from '#site/components/EOL/VulnerabilityChips';
1010

11-
import type { NodeRelease } from '#site/types/releases.js';
12-
import type { GroupedVulnerabilities } from '#site/types/vulnerabilities.js';
11+
import type { GroupedVulnerabilities, NodeRelease } from '#site/types';
1312
import type { FC } from 'react';
1413

1514
type EOLReleaseTableBodyProps = {

apps/site/components/Releases/PreviousReleasesTable/TableBody.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import FormattedTime from '#site/components/Common/FormattedTime';
88
import LinkWithArrow from '#site/components/Common/LinkWithArrow';
99
import Link from '#site/components/Link';
1010

11-
import type { NodeRelease } from '#site/types/releases.js';
11+
import type { NodeRelease } from '#site/types';
1212
import type { FC } from 'react';
1313

1414
import ReleaseModal from '../ReleaseModal';

apps/site/components/withBreadcrumbs.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@ import Breadcrumbs from '@node-core/ui-components/Common/Breadcrumbs';
44
import { useTranslations } from 'next-intl';
55

66
import Link from '#site/components/Link';
7-
import {
8-
useClientContext,
9-
useMediaQuery,
10-
useSiteNavigation,
11-
} from '#site/hooks';
7+
import { useClientContext, useMediaQuery } from '#site/hooks/client';
8+
import { useSiteNavigation } from '#site/hooks/generic';
129
import { dashToCamelCase } from '#site/util/string';
1310

1411
import type { NavigationKeys } from '#site/types';

apps/site/components/withMetaBar.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ import { useFormatter, useLocale, useTranslations } from 'next-intl';
77

88
import Link from '#site/components/Link';
99
import WithAvatarGroup from '#site/components/withAvatarGroup';
10-
import { useClientContext } from '#site/hooks/react-client';
11-
import useMediaQuery from '#site/hooks/react-client/useMediaQuery';
10+
import { useClientContext, useMediaQuery } from '#site/hooks/client';
1211
import { DEFAULT_DATE_FORMAT } from '#site/next.calendar.constants.mjs';
1312
import { TRANSLATION_URL } from '#site/next.constants.mjs';
1413
import { getGitHubBlobUrl } from '#site/util/github';

apps/site/components/withNavBar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import SearchButton from '#site/components/Common/Searchbox';
1515
import Link from '#site/components/Link';
1616
import WithBanner from '#site/components/withBanner';
1717
import WithNodejsLogo from '#site/components/withNodejsLogo';
18-
import { useSiteNavigation } from '#site/hooks';
18+
import { useSiteNavigation } from '#site/hooks/generic';
1919
import { useRouter, usePathname } from '#site/navigation.mjs';
2020

2121
import type { SimpleLocaleConfig } from '@node-core/ui-components/types';

apps/site/components/withSidebar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import { usePathname } from 'next/navigation';
55
import { useLocale, useTranslations } from 'next-intl';
66

77
import Link from '#site/components/Link';
8-
import { useClientContext } from '#site/hooks';
9-
import { useSiteNavigation } from '#site/hooks/server';
8+
import { useClientContext } from '#site/hooks/client';
9+
import { useSiteNavigation } from '#site/hooks/generic';
1010
import { useRouter } from '#site/navigation.mjs';
1111

1212
import type { NavigationKeys } from '#site/types';

apps/site/components/withSidebarCrossLinks.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import CrossLink from '#site/components/Common/CrossLink';
2-
import { useClientContext, useSiteNavigation } from '#site/hooks/server';
2+
import { useSiteNavigation } from '#site/hooks/generic';
3+
import { useClientContext } from '#site/hooks/server';
34

45
import type { NavigationKeys } from '#site/types';
56
import type { FC } from 'react';

0 commit comments

Comments
 (0)