diff --git a/src/js/components/ManageMenu/CommunityCloud/SearchResult.tsx b/src/js/components/ManageMenu/CommunityCloud/SearchResult.tsx index 3c3ee0ca0..bcf3039b6 100644 --- a/src/js/components/ManageMenu/CommunityCloud/SearchResult.tsx +++ b/src/js/components/ManageMenu/CommunityCloud/SearchResult.tsx @@ -8,7 +8,7 @@ import { Button } from '../../common/Button' import { CloudSnippetDownloadButton } from '../../common/cloud/CloudSnippetDownloadButton' import { CloudSnippetPreviewModal } from '../../common/cloud/CloudSnippetPreviewModal' import { CloudStatusIndicator } from '../../common/cloud/CloudStatusBadge' -import { CloudUpdateIcon } from '../../common/icons/CloudIcons' +import { CloudUpdateIcon } from '../../common/icons/CloudUpdateIcon' import { SnippetCard } from '../../common/SnippetCard' import { useCloudSearch } from './WithCloudSearchContext' import type { ReactNode } from 'react' diff --git a/src/js/components/common/KebabMenu.tsx b/src/js/components/common/KebabMenu.tsx index b22c252d4..9213a3495 100644 --- a/src/js/components/common/KebabMenu.tsx +++ b/src/js/components/common/KebabMenu.tsx @@ -9,6 +9,7 @@ import React, { useRef, useState } from 'react' +import { KebabIcon } from './icons/KebabIcon' import type { Dispatch, PropsWithChildren, ReactNode, RefObject, SetStateAction } from 'react' const FOCUSABLE_SELECTOR = [ @@ -80,20 +81,6 @@ export const KebabMenuRow: React.FC> = ({ {children} -const KebabIcon: React.FC = () => - - interface PopoverBehaviourOptions { isOpen: boolean setIsOpen: Dispatch> diff --git a/src/js/components/common/SnippetViewToggle.tsx b/src/js/components/common/SnippetViewToggle.tsx index 6ab371ad1..3183d7d30 100644 --- a/src/js/components/common/SnippetViewToggle.tsx +++ b/src/js/components/common/SnippetViewToggle.tsx @@ -1,7 +1,8 @@ import React from 'react' import classnames from 'classnames' import { __ } from '@wordpress/i18n' -import { CardViewIcon, TableViewIcon } from './icons/ViewIcons' +import { CardViewIcon } from './icons/CardViewIcon' +import { TableViewIcon } from './icons/TableViewIcon' import type { SnippetView } from '../../types/SnippetView' export interface SnippetViewToggleProps { diff --git a/src/js/components/common/Toolbar.tsx b/src/js/components/common/Toolbar.tsx index 8e4c8fddf..4e5cb0eb2 100644 --- a/src/js/components/common/Toolbar.tsx +++ b/src/js/components/common/Toolbar.tsx @@ -3,7 +3,11 @@ import classnames from 'classnames' import React, { useState } from 'react' import { isLicensed, shouldShowUpsell } from '../../utils/screen' import { buildUrl, fetchQueryParam } from '../../utils/urls' -import { BlueprintIcon, CommunityIcon, LibraryIcon, SettingsIcon, SnippetsIcon } from './icons/ToolbarIcons' +import { BlueprintIcon } from './icons/BlueprintIcon' +import { CommunityIcon } from './icons/CommunityIcon' +import { LibraryIcon } from './icons/LibraryIcon' +import { SettingsIcon } from './icons/SettingsIcon' +import { SnippetsIcon } from './icons/SnippetsIcon' import { UpsellDialog } from './UpsellDialog' import type { ReactNode } from 'react' diff --git a/src/js/components/common/icons/BlueprintIcon.tsx b/src/js/components/common/icons/BlueprintIcon.tsx new file mode 100644 index 000000000..26d7f46d2 --- /dev/null +++ b/src/js/components/common/icons/BlueprintIcon.tsx @@ -0,0 +1,13 @@ +import React from 'react' +import type { SVGProps } from 'react' + +export const BlueprintIcon: React.FC> = props => + + + diff --git a/src/js/components/common/icons/ViewIcons.tsx b/src/js/components/common/icons/CardViewIcon.tsx similarity index 54% rename from src/js/components/common/icons/ViewIcons.tsx rename to src/js/components/common/icons/CardViewIcon.tsx index 0cfaff9ae..7860786af 100644 --- a/src/js/components/common/icons/ViewIcons.tsx +++ b/src/js/components/common/icons/CardViewIcon.tsx @@ -2,33 +2,9 @@ import React from 'react' import type { SVGProps } from 'react' export const CardViewIcon: React.FC> = props => - + - -export const TableViewIcon: React.FC> = props => - - - diff --git a/src/js/components/common/icons/CloudIcons.tsx b/src/js/components/common/icons/CloudIcons.tsx deleted file mode 100644 index 894e3f694..000000000 --- a/src/js/components/common/icons/CloudIcons.tsx +++ /dev/null @@ -1,12 +0,0 @@ -import React from 'react' -import type { SVGProps } from 'react' - -export const CloudUpdateIcon: React.FC> = props => - - - diff --git a/src/js/components/common/icons/CloudUpdateIcon.tsx b/src/js/components/common/icons/CloudUpdateIcon.tsx new file mode 100644 index 000000000..05a694eb2 --- /dev/null +++ b/src/js/components/common/icons/CloudUpdateIcon.tsx @@ -0,0 +1,13 @@ +import React from 'react' +import type { SVGProps } from 'react' + +export const CloudUpdateIcon: React.FC> = props => + + + diff --git a/src/js/components/common/icons/CommunityIcon.tsx b/src/js/components/common/icons/CommunityIcon.tsx new file mode 100644 index 000000000..dca50d4d2 --- /dev/null +++ b/src/js/components/common/icons/CommunityIcon.tsx @@ -0,0 +1,13 @@ +import React from 'react' +import type { SVGProps } from 'react' + +export const CommunityIcon: React.FC> = props => + + + diff --git a/src/js/components/common/icons/CopyIcon.tsx b/src/js/components/common/icons/CopyIcon.tsx index 3e9b553b4..e5469301f 100644 --- a/src/js/components/common/icons/CopyIcon.tsx +++ b/src/js/components/common/icons/CopyIcon.tsx @@ -1,7 +1,7 @@ import React from 'react' import type { SVGProps } from 'react' -export const CopyIcon = (props: SVGProps) => +export const CopyIcon: React.FC> = props => ) => +export const ExpandIcon: React.FC> = props => diff --git a/src/js/components/common/icons/KebabIcon.tsx b/src/js/components/common/icons/KebabIcon.tsx new file mode 100644 index 000000000..65850f502 --- /dev/null +++ b/src/js/components/common/icons/KebabIcon.tsx @@ -0,0 +1,9 @@ +import React from 'react' +import type { SVGProps } from 'react' + +export const KebabIcon: React.FC> = props => + + + + + diff --git a/src/js/components/common/icons/LibraryIcon.tsx b/src/js/components/common/icons/LibraryIcon.tsx new file mode 100644 index 000000000..7560fdb3f --- /dev/null +++ b/src/js/components/common/icons/LibraryIcon.tsx @@ -0,0 +1,13 @@ +import React from 'react' +import type { SVGProps } from 'react' + +export const LibraryIcon: React.FC> = props => + + + diff --git a/src/js/components/common/icons/MinimiseIcon.tsx b/src/js/components/common/icons/MinimiseIcon.tsx index 03579eb1e..6b15aa014 100644 --- a/src/js/components/common/icons/MinimiseIcon.tsx +++ b/src/js/components/common/icons/MinimiseIcon.tsx @@ -1,7 +1,7 @@ import React from 'react' import type { SVGProps } from 'react' -export const MinimiseIcon = (props: SVGProps) => +export const MinimiseIcon: React.FC> = props => diff --git a/src/js/components/common/icons/SettingsIcon.tsx b/src/js/components/common/icons/SettingsIcon.tsx new file mode 100644 index 000000000..abdf7abc6 --- /dev/null +++ b/src/js/components/common/icons/SettingsIcon.tsx @@ -0,0 +1,20 @@ +import React from 'react' +import type { SVGProps } from 'react' + +export const SettingsIcon: React.FC> = props => + + + + diff --git a/src/js/components/common/icons/SnippetsIcon.tsx b/src/js/components/common/icons/SnippetsIcon.tsx new file mode 100644 index 000000000..90da6087d --- /dev/null +++ b/src/js/components/common/icons/SnippetsIcon.tsx @@ -0,0 +1,13 @@ +import React from 'react' +import type { SVGProps } from 'react' + +export const SnippetsIcon: React.FC> = props => + + + diff --git a/src/js/components/common/icons/TableViewIcon.tsx b/src/js/components/common/icons/TableViewIcon.tsx new file mode 100644 index 000000000..475eae770 --- /dev/null +++ b/src/js/components/common/icons/TableViewIcon.tsx @@ -0,0 +1,12 @@ +import React from 'react' +import type { SVGProps } from 'react' + +export const TableViewIcon: React.FC> = props => + + + diff --git a/src/js/components/common/icons/ToolbarIcons.tsx b/src/js/components/common/icons/ToolbarIcons.tsx deleted file mode 100644 index dcdc4590d..000000000 --- a/src/js/components/common/icons/ToolbarIcons.tsx +++ /dev/null @@ -1,64 +0,0 @@ -import React from 'react' -import type { SVGProps } from 'react' - -export const CommunityIcon: React.FC> = props => - - - - -export const LibraryIcon: React.FC> = props => - - - - -export const SettingsIcon: React.FC> = props => - - - - - -export const SnippetsIcon: React.FC> = props => - - - - -export const BlueprintIcon: React.FC> = props => - - -