diff --git a/src/@types/AnimatedIconType.ts b/src/@types/AnimatedIconType.ts new file mode 100644 index 0000000000..be421e0a33 --- /dev/null +++ b/src/@types/AnimatedIconType.ts @@ -0,0 +1,9 @@ +import { ReactNode } from 'react' +import IconType from './IconType' + +interface AnimatedIconType extends IconType { + animationData?: object + children?: ReactNode +} + +export default AnimatedIconType diff --git a/src/@types/Icon.ts b/src/@types/Icon.ts deleted file mode 100644 index 1c5ff9e251..0000000000 --- a/src/@types/Icon.ts +++ /dev/null @@ -1,28 +0,0 @@ -import React, { ReactNode } from 'react' -import { SystemStyleObject } from '../../styled-system/types' - -interface IconType { - cssRaw?: SystemStyleObject - fill?: string - height?: number - size?: number - style?: React.CSSProperties - width?: number - animated?: boolean - animationComplete?: () => void -} - -export interface AnimatedIconType { - cssRaw?: SystemStyleObject - fill?: string - height?: number - size?: number - style?: React.CSSProperties - width?: number - animated?: boolean - animationComplete?: () => void - animationData?: object - children?: ReactNode -} - -export default IconType diff --git a/src/@types/IconType.ts b/src/@types/IconType.ts new file mode 100644 index 0000000000..29e94ad607 --- /dev/null +++ b/src/@types/IconType.ts @@ -0,0 +1,15 @@ +import React from 'react' +import { SystemStyleObject } from '../../styled-system/types' + +interface IconType { + cssRaw?: SystemStyleObject + fill?: string + height?: number + size?: number + style?: React.CSSProperties + width?: number + animated?: boolean + animationComplete?: () => void +} + +export default IconType diff --git a/src/@types/Shortcut.ts b/src/@types/Shortcut.ts index 9f2e4223ef..7d37a90fc6 100644 --- a/src/@types/Shortcut.ts +++ b/src/@types/Shortcut.ts @@ -2,7 +2,7 @@ import React from 'react' import { GestureResponderEvent } from 'react-native' import Dispatch from './Dispatch' import GesturePath from './GesturePath' -import Icon from './Icon' +import Icon from './IconType' import Key from './Key' import MulticursorFilter from './MulticursorFilter' import Path from './Path' diff --git a/src/components/QuickDropIcon.tsx b/src/components/QuickDropIcon.tsx index 958ef1646f..20e649d1c9 100644 --- a/src/components/QuickDropIcon.tsx +++ b/src/components/QuickDropIcon.tsx @@ -6,7 +6,7 @@ import { css } from '../../styled-system/css' import DragAndDropType from '../@types/DragAndDropType' import DragThoughtItem from '../@types/DragThoughtItem' import DragThoughtZone from '../@types/DragThoughtZone' -import IconType from '../@types/Icon' +import IconType from '../@types/IconType' import State from '../@types/State' import { alertActionCreator as alert } from '../actions/alert' import { dragInProgressActionCreator as dragInProgress } from '../actions/dragInProgress' diff --git a/src/components/RedoIcon.tsx b/src/components/RedoIcon.tsx index eb125b6c45..0bdbc1e71f 100644 --- a/src/components/RedoIcon.tsx +++ b/src/components/RedoIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../@types/Icon' +import IconType from '../@types/IconType' import AnimatedIcon from './icons/AnimatedIcon' import animationData from './icons/animations/02-redo_2.json' diff --git a/src/components/SearchIcon.tsx b/src/components/SearchIcon.tsx index 9517c6ea37..93e51b5972 100644 --- a/src/components/SearchIcon.tsx +++ b/src/components/SearchIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../@types/Icon' +import IconType from '../@types/IconType' import AnimatedIcon from './icons/AnimatedIcon' import animationData from './icons/animations/12-search.json' diff --git a/src/components/ToolbarButton.tsx b/src/components/ToolbarButton.tsx index 840ba4930e..c3ae188f66 100644 --- a/src/components/ToolbarButton.tsx +++ b/src/components/ToolbarButton.tsx @@ -3,7 +3,7 @@ import { useSelector } from 'react-redux' import { css } from '../../styled-system/css' import { token } from '../../styled-system/tokens' import DragShortcutZone from '../@types/DragShortcutZone' -import Icon from '../@types/Icon' +import Icon from '../@types/IconType' import ShortcutId from '../@types/ShortcutId' import { isTouch } from '../browser' import useDragAndDropToolbarButton from '../hooks/useDragAndDropToolbarButton' diff --git a/src/components/TriangleDown.tsx b/src/components/TriangleDown.tsx index a418b466e7..24996cde95 100644 --- a/src/components/TriangleDown.tsx +++ b/src/components/TriangleDown.tsx @@ -1,5 +1,5 @@ import { css } from '../../styled-system/css' -import Icon from '../@types/Icon' +import Icon from '../@types/IconType' /** A down-facing triangle component. */ const TriangleDown = ({ fill = 'black', size = 20, width, height, style, cssRaw }: Icon) => ( diff --git a/src/components/TriangleLeft.tsx b/src/components/TriangleLeft.tsx index 5fafebdfe8..462a0a6428 100644 --- a/src/components/TriangleLeft.tsx +++ b/src/components/TriangleLeft.tsx @@ -1,5 +1,5 @@ import { css } from '../../styled-system/css' -import Icon from '../@types/Icon' +import Icon from '../@types/IconType' /** A left-facing svg triangle. */ const TriangleLeft = ({ fill = 'black', size = 20, width, height, style, cssRaw }: Icon) => ( diff --git a/src/components/TriangleRight.tsx b/src/components/TriangleRight.tsx index 81311a8968..1e4d5c8593 100644 --- a/src/components/TriangleRight.tsx +++ b/src/components/TriangleRight.tsx @@ -1,5 +1,5 @@ import { css } from '../../styled-system/css' -import Icon from '../@types/Icon' +import Icon from '../@types/IconType' /** A right-facing triangle component. */ const TriangleRight = ({ fill = 'black', size = 20, width, height, style, cssRaw }: Icon) => ( diff --git a/src/components/UndoIcon.tsx b/src/components/UndoIcon.tsx index d7fea62686..385732917f 100644 --- a/src/components/UndoIcon.tsx +++ b/src/components/UndoIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../@types/Icon' +import IconType from '../@types/IconType' import AnimatedIcon from './icons/AnimatedIcon' import animationData from './icons/animations/01-undo_2.json' diff --git a/src/components/icons/AnimatedIcon.tsx b/src/components/icons/AnimatedIcon.tsx index 723f2b1fad..2d5cc979b7 100644 --- a/src/components/icons/AnimatedIcon.tsx +++ b/src/components/icons/AnimatedIcon.tsx @@ -2,7 +2,7 @@ import { useState } from 'react' import { css, cx } from '../../../styled-system/css' import { icon } from '../../../styled-system/recipes' import { token } from '../../../styled-system/tokens' -import { AnimatedIconType } from '../../@types/Icon' +import AnimatedIconType from '../../@types/AnimatedIconType' import { ICON_SCALING_FACTOR } from '../../constants' import LottieAnimation from './LottieAnimation' diff --git a/src/components/icons/ArchiveIcon.tsx b/src/components/icons/ArchiveIcon.tsx index 61e30e0418..7e9a3219a8 100644 --- a/src/components/icons/ArchiveIcon.tsx +++ b/src/components/icons/ArchiveIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/22-trash_3.json' diff --git a/src/components/icons/BackIcon.tsx b/src/components/icons/BackIcon.tsx index 49a65bdd79..06eddd1c48 100644 --- a/src/components/icons/BackIcon.tsx +++ b/src/components/icons/BackIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/06-back.json' diff --git a/src/components/icons/BoldTextIcon.tsx b/src/components/icons/BoldTextIcon.tsx index 11bf1665f4..27361d58d9 100644 --- a/src/components/icons/BoldTextIcon.tsx +++ b/src/components/icons/BoldTextIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/13-bold_4.json' diff --git a/src/components/icons/BumpThoughtDownIcon.tsx b/src/components/icons/BumpThoughtDownIcon.tsx index 70138a41c9..b614f4228b 100644 --- a/src/components/icons/BumpThoughtDownIcon.tsx +++ b/src/components/icons/BumpThoughtDownIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/14-bump-thought-down_2.json' diff --git a/src/components/icons/Check.tsx b/src/components/icons/Check.tsx index 5e590a6c2d..08ade38a98 100644 --- a/src/components/icons/Check.tsx +++ b/src/components/icons/Check.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/12-mark-as-done_3.json' diff --git a/src/components/icons/ClearThoughtIcon.tsx b/src/components/icons/ClearThoughtIcon.tsx index 3f250e693d..5a10d930bd 100644 --- a/src/components/icons/ClearThoughtIcon.tsx +++ b/src/components/icons/ClearThoughtIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/25-clear-thought.json' diff --git a/src/components/icons/CollapseIcon.tsx b/src/components/icons/CollapseIcon.tsx index 3420048c77..4840dee3b8 100644 --- a/src/components/icons/CollapseIcon.tsx +++ b/src/components/icons/CollapseIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/26-collaps_2.json' diff --git a/src/components/icons/CommandLibraryIcon.tsx b/src/components/icons/CommandLibraryIcon.tsx index cb2998e8f2..0f134f3e31 100644 --- a/src/components/icons/CommandLibraryIcon.tsx +++ b/src/components/icons/CommandLibraryIcon.tsx @@ -2,7 +2,7 @@ import { FC } from 'react' import { css, cx } from '../../../styled-system/css' import { icon } from '../../../styled-system/recipes' import { token } from '../../../styled-system/tokens' -import Icon from '../../@types/Icon' +import Icon from '../../@types/IconType' /** Command Library icon that looks like a finger pressing a button. */ const CommandLibraryIcon: FC = ({ cssRaw, fill, style, size = 20 }) => { diff --git a/src/components/icons/CommandPaletteIcon.tsx b/src/components/icons/CommandPaletteIcon.tsx index 5e468771ef..13a4590fee 100644 --- a/src/components/icons/CommandPaletteIcon.tsx +++ b/src/components/icons/CommandPaletteIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/27-command-palette.json' diff --git a/src/components/icons/ContextViewIcon.tsx b/src/components/icons/ContextViewIcon.tsx index bee7ec27db..256b6514c1 100644 --- a/src/components/icons/ContextViewIcon.tsx +++ b/src/components/icons/ContextViewIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/18-context-view_3.json' diff --git a/src/components/icons/ConvertToNoteIcon.tsx b/src/components/icons/ConvertToNoteIcon.tsx index b04f0d4110..c955b90aac 100644 --- a/src/components/icons/ConvertToNoteIcon.tsx +++ b/src/components/icons/ConvertToNoteIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/24-convert-to-note.json' diff --git a/src/components/icons/CopyClipboard.tsx b/src/components/icons/CopyClipboard.tsx index 0258d364eb..32c496bd30 100644 --- a/src/components/icons/CopyClipboard.tsx +++ b/src/components/icons/CopyClipboard.tsx @@ -1,7 +1,7 @@ import { css, cx } from '../../../styled-system/css' import { icon } from '../../../styled-system/recipes' import { token } from '../../../styled-system/tokens' -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import { ICON_SCALING_FACTOR } from '../../constants' /** Copy Clipboard icon. */ diff --git a/src/components/icons/DeleteIcon.tsx b/src/components/icons/DeleteIcon.tsx index 53e4ce254b..075ed996b6 100644 --- a/src/components/icons/DeleteIcon.tsx +++ b/src/components/icons/DeleteIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/31-parmanently-delete_2.json' diff --git a/src/components/icons/DeviceIcon.tsx b/src/components/icons/DeviceIcon.tsx index bf75974fcf..9ea3d9c170 100644 --- a/src/components/icons/DeviceIcon.tsx +++ b/src/components/icons/DeviceIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/26-device-management_2.json' diff --git a/src/components/icons/DownloadIcon.tsx b/src/components/icons/DownloadIcon.tsx index ce3c3e574a..d18f3b8ffe 100644 --- a/src/components/icons/DownloadIcon.tsx +++ b/src/components/icons/DownloadIcon.tsx @@ -1,6 +1,6 @@ import { css, cx } from '../../../styled-system/css' import { icon } from '../../../styled-system/recipes' -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' /** Download icon. */ const DownloadIcon = ({ fill, size = 20, style, cssRaw }: IconType) => { diff --git a/src/components/icons/ExtractThoughtIcon.tsx b/src/components/icons/ExtractThoughtIcon.tsx index bc1d36b990..20f37d3c2d 100644 --- a/src/components/icons/ExtractThoughtIcon.tsx +++ b/src/components/icons/ExtractThoughtIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/28-extract_2.json' diff --git a/src/components/icons/FavoritesIcon.tsx b/src/components/icons/FavoritesIcon.tsx index dc02102f5a..4a47912cf2 100644 --- a/src/components/icons/FavoritesIcon.tsx +++ b/src/components/icons/FavoritesIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/04-favorite_3.json' diff --git a/src/components/icons/GenerateThoughtIcon.tsx b/src/components/icons/GenerateThoughtIcon.tsx index 646bb471b2..e2772fd51c 100644 --- a/src/components/icons/GenerateThoughtIcon.tsx +++ b/src/components/icons/GenerateThoughtIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/29-generate-thought_2.json' diff --git a/src/components/icons/Heading1Icon.tsx b/src/components/icons/Heading1Icon.tsx index fb2726ad10..e820616e8d 100644 --- a/src/components/icons/Heading1Icon.tsx +++ b/src/components/icons/Heading1Icon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/18-heading-one.json' diff --git a/src/components/icons/Heading2Icon.tsx b/src/components/icons/Heading2Icon.tsx index be686bcb17..8cbde78641 100644 --- a/src/components/icons/Heading2Icon.tsx +++ b/src/components/icons/Heading2Icon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/19-heading-two.json' diff --git a/src/components/icons/Heading3Icon.tsx b/src/components/icons/Heading3Icon.tsx index b391767377..cb334e9463 100644 --- a/src/components/icons/Heading3Icon.tsx +++ b/src/components/icons/Heading3Icon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/20-heading-three.json' diff --git a/src/components/icons/Heading4Icon.tsx b/src/components/icons/Heading4Icon.tsx index a75be4fe38..b52fb46d39 100644 --- a/src/components/icons/Heading4Icon.tsx +++ b/src/components/icons/Heading4Icon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/21-heading-four.json' diff --git a/src/components/icons/Heading5Icon.tsx b/src/components/icons/Heading5Icon.tsx index 64b19ad1f5..807efc6fbe 100644 --- a/src/components/icons/Heading5Icon.tsx +++ b/src/components/icons/Heading5Icon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/22-heading-five.json' diff --git a/src/components/icons/HelpIcon.tsx b/src/components/icons/HelpIcon.tsx index 23b0ff7f73..c28b967d3e 100644 --- a/src/components/icons/HelpIcon.tsx +++ b/src/components/icons/HelpIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/13-help_2.json' diff --git a/src/components/icons/HiddenThoughtsIcon.tsx b/src/components/icons/HiddenThoughtsIcon.tsx index 2c78b6bddd..5edd200926 100644 --- a/src/components/icons/HiddenThoughtsIcon.tsx +++ b/src/components/icons/HiddenThoughtsIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/24-show-hidden-thoughts_4.json' diff --git a/src/components/icons/HomeIcon.tsx b/src/components/icons/HomeIcon.tsx index 26f12830ca..085aadc1a3 100644 --- a/src/components/icons/HomeIcon.tsx +++ b/src/components/icons/HomeIcon.tsx @@ -1,7 +1,7 @@ import { useSelector } from 'react-redux' import { css, cx } from '../../../styled-system/css' import { token } from '../../../styled-system/tokens' -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' /** A home icon. */ const HomeIcon = ({ diff --git a/src/components/icons/HomeToolbarIcon.tsx b/src/components/icons/HomeToolbarIcon.tsx index 23f5838d45..25b7560dd7 100644 --- a/src/components/icons/HomeToolbarIcon.tsx +++ b/src/components/icons/HomeToolbarIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/11-home.json' diff --git a/src/components/icons/IndentIcon.tsx b/src/components/icons/IndentIcon.tsx index fe9f57cca3..78123aca9e 100644 --- a/src/components/icons/IndentIcon.tsx +++ b/src/components/icons/IndentIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/06-indent_2.json' diff --git a/src/components/icons/ItalicTextIcon.tsx b/src/components/icons/ItalicTextIcon.tsx index 9b9f1f90c8..9d31b8615d 100644 --- a/src/components/icons/ItalicTextIcon.tsx +++ b/src/components/icons/ItalicTextIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/14-italic_4.json' diff --git a/src/components/icons/JoinThoughtsIcon.tsx b/src/components/icons/JoinThoughtsIcon.tsx index 5762b029ec..ebe52db441 100644 --- a/src/components/icons/JoinThoughtsIcon.tsx +++ b/src/components/icons/JoinThoughtsIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/30-join-thought.json' diff --git a/src/components/icons/JumpBackIcon.tsx b/src/components/icons/JumpBackIcon.tsx index ee731eaef1..9e09b2a987 100644 --- a/src/components/icons/JumpBackIcon.tsx +++ b/src/components/icons/JumpBackIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/07-jump-back.json' diff --git a/src/components/icons/JumpForwardIcon.tsx b/src/components/icons/JumpForwardIcon.tsx index 864127f276..e8ff362890 100644 --- a/src/components/icons/JumpForwardIcon.tsx +++ b/src/components/icons/JumpForwardIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/08-jump-forward.json' diff --git a/src/components/icons/LetterCaseIcon.tsx b/src/components/icons/LetterCaseIcon.tsx index 4346d353a3..aa84f1a0dd 100755 --- a/src/components/icons/LetterCaseIcon.tsx +++ b/src/components/icons/LetterCaseIcon.tsx @@ -1,7 +1,7 @@ import { css, cx } from '../../../styled-system/css' import { icon } from '../../../styled-system/recipes' import { token } from '../../../styled-system/tokens' -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import { ICON_SCALING_FACTOR } from '../../constants' /** Letter-case icon. */ diff --git a/src/components/icons/LetterCaseWithPicker.tsx b/src/components/icons/LetterCaseWithPicker.tsx index ee3b92be6d..f9aa6ff550 100755 --- a/src/components/icons/LetterCaseWithPicker.tsx +++ b/src/components/icons/LetterCaseWithPicker.tsx @@ -1,7 +1,7 @@ import { useRef } from 'react' import { useSelector } from 'react-redux' import { CSSTransition } from 'react-transition-group' -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import LetterCasePicker from '../LetterCasePicker' import LetterCaseIcon from './LetterCaseIcon' diff --git a/src/components/icons/LowerCaseIcon.tsx b/src/components/icons/LowerCaseIcon.tsx index 8276be9946..7305f14c0b 100755 --- a/src/components/icons/LowerCaseIcon.tsx +++ b/src/components/icons/LowerCaseIcon.tsx @@ -1,7 +1,7 @@ import { css, cx } from '../../../styled-system/css' import { icon } from '../../../styled-system/recipes' import { token } from '../../../styled-system/tokens' -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import { ICON_SCALING_FACTOR } from '../../constants' /** Lower-Case icon. */ diff --git a/src/components/icons/MetaIcon.tsx b/src/components/icons/MetaIcon.tsx index 97f636009e..4e9d6c8830 100644 --- a/src/components/icons/MetaIcon.tsx +++ b/src/components/icons/MetaIcon.tsx @@ -2,7 +2,7 @@ import { FC } from 'react' import { css, cx } from '../../../styled-system/css' import { icon } from '../../../styled-system/recipes' import { token } from '../../../styled-system/tokens' -import Icon from '../../@types/Icon' +import Icon from '../../@types/IconType' /** Meta icon that shows code under a magnifying glass. */ // https://thenounproject.com/icon/inspect-element-4199164/ diff --git a/src/components/icons/MoveCursorBackwardIcon.tsx b/src/components/icons/MoveCursorBackwardIcon.tsx index 31ab8ba90f..76b8bb56b1 100644 --- a/src/components/icons/MoveCursorBackwardIcon.tsx +++ b/src/components/icons/MoveCursorBackwardIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/16-move-thought-up.json' diff --git a/src/components/icons/MoveCursorForwardIcon.tsx b/src/components/icons/MoveCursorForwardIcon.tsx index 592fe91118..18c796dd35 100644 --- a/src/components/icons/MoveCursorForwardIcon.tsx +++ b/src/components/icons/MoveCursorForwardIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/15-move-thought-down.json' diff --git a/src/components/icons/MoveThoughtDownIcon.tsx b/src/components/icons/MoveThoughtDownIcon.tsx index 383924cd09..b0e91edbca 100644 --- a/src/components/icons/MoveThoughtDownIcon.tsx +++ b/src/components/icons/MoveThoughtDownIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/15-move-thought-down.json' diff --git a/src/components/icons/MoveThoughtUpIcon.tsx b/src/components/icons/MoveThoughtUpIcon.tsx index 1fd93a1fc3..3b817bcd5f 100644 --- a/src/components/icons/MoveThoughtUpIcon.tsx +++ b/src/components/icons/MoveThoughtUpIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/16-move-thought-up.json' diff --git a/src/components/icons/NewSubthoughtAboveIcon.tsx b/src/components/icons/NewSubthoughtAboveIcon.tsx index ce8f56a5ad..4f4ab977bd 100644 --- a/src/components/icons/NewSubthoughtAboveIcon.tsx +++ b/src/components/icons/NewSubthoughtAboveIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/03-new-subthought-above_2.json' diff --git a/src/components/icons/NewSubthoughtIcon.tsx b/src/components/icons/NewSubthoughtIcon.tsx index 5d1ae8ba10..7ffd3a39db 100644 --- a/src/components/icons/NewSubthoughtIcon.tsx +++ b/src/components/icons/NewSubthoughtIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/02-new-subthought_2.json' diff --git a/src/components/icons/NewSubthoughtNextIcon.tsx b/src/components/icons/NewSubthoughtNextIcon.tsx index 146e7302d2..6cb8c6f600 100644 --- a/src/components/icons/NewSubthoughtNextIcon.tsx +++ b/src/components/icons/NewSubthoughtNextIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/04-new-subthought-next_2.json' diff --git a/src/components/icons/NewThoughtAboveIcon.tsx b/src/components/icons/NewThoughtAboveIcon.tsx index 2d99968331..b98a032381 100644 --- a/src/components/icons/NewThoughtAboveIcon.tsx +++ b/src/components/icons/NewThoughtAboveIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/05-new-thought-above_2.json' diff --git a/src/components/icons/NewThoughtIcon.tsx b/src/components/icons/NewThoughtIcon.tsx index 712019010d..2fd0a8cca6 100644 --- a/src/components/icons/NewThoughtIcon.tsx +++ b/src/components/icons/NewThoughtIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/01-new-thought-new_2.json' diff --git a/src/components/icons/NextIcon.tsx b/src/components/icons/NextIcon.tsx index cae79e2a96..bc97d0f91d 100644 --- a/src/components/icons/NextIcon.tsx +++ b/src/components/icons/NextIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/09-next-thought_2.json' diff --git a/src/components/icons/NormalTextIcon.tsx b/src/components/icons/NormalTextIcon.tsx index dd689a36a2..731e482c6c 100644 --- a/src/components/icons/NormalTextIcon.tsx +++ b/src/components/icons/NormalTextIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/23-normal-text.json' diff --git a/src/components/icons/OutdentIcon.tsx b/src/components/icons/OutdentIcon.tsx index 2c88d85bf4..48d6cebc6a 100644 --- a/src/components/icons/OutdentIcon.tsx +++ b/src/components/icons/OutdentIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/05-outdent_2.json' diff --git a/src/components/icons/PencilIcon.tsx b/src/components/icons/PencilIcon.tsx index 2298a9447b..1988a2e37b 100644 --- a/src/components/icons/PencilIcon.tsx +++ b/src/components/icons/PencilIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/19-note_2.json' diff --git a/src/components/icons/PinAllIcon.tsx b/src/components/icons/PinAllIcon.tsx index 1f1648ddb3..92544c2fdc 100644 --- a/src/components/icons/PinAllIcon.tsx +++ b/src/components/icons/PinAllIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/08-pin-subthought_3.json' diff --git a/src/components/icons/PinIcon.tsx b/src/components/icons/PinIcon.tsx index 30d3775d6c..c55e889ea1 100644 --- a/src/components/icons/PinIcon.tsx +++ b/src/components/icons/PinIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/07-pin_3.json' diff --git a/src/components/icons/PrevIcon.tsx b/src/components/icons/PrevIcon.tsx index 42652514aa..b7922391ce 100644 --- a/src/components/icons/PrevIcon.tsx +++ b/src/components/icons/PrevIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/10-previous-thought_2.json' diff --git a/src/components/icons/ProseViewIcon.tsx b/src/components/icons/ProseViewIcon.tsx index 81cb66614e..0a7dd5cc03 100644 --- a/src/components/icons/ProseViewIcon.tsx +++ b/src/components/icons/ProseViewIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/32-prose-view_2.json' diff --git a/src/components/icons/SentenceCaseIcon.tsx b/src/components/icons/SentenceCaseIcon.tsx index f6d71c35ed..71e5809977 100755 --- a/src/components/icons/SentenceCaseIcon.tsx +++ b/src/components/icons/SentenceCaseIcon.tsx @@ -1,7 +1,7 @@ import { css, cx } from '../../../styled-system/css' import { icon } from '../../../styled-system/recipes' import { token } from '../../../styled-system/tokens' -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import { ICON_SCALING_FACTOR } from '../../constants' /** Sentence-Case icon. */ diff --git a/src/components/icons/SettingsIcon.tsx b/src/components/icons/SettingsIcon.tsx index 8e990b3eb0..4f5ee051ca 100644 --- a/src/components/icons/SettingsIcon.tsx +++ b/src/components/icons/SettingsIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/27-settings_2.json' diff --git a/src/components/icons/ShareIcon.tsx b/src/components/icons/ShareIcon.tsx index a6ccc2f581..f37333e302 100644 --- a/src/components/icons/ShareIcon.tsx +++ b/src/components/icons/ShareIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/25-export_2.json' diff --git a/src/components/icons/Sort.tsx b/src/components/icons/Sort.tsx index 0a66a66037..4483e9930e 100644 --- a/src/components/icons/Sort.tsx +++ b/src/components/icons/Sort.tsx @@ -1,5 +1,5 @@ import { useSelector } from 'react-redux' -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import State from '../../@types/State' import { HOME_PATH } from '../../constants' import getSortPreference from '../../selectors/getSortPreference' diff --git a/src/components/icons/SplitSentencesIcon.tsx b/src/components/icons/SplitSentencesIcon.tsx index 47433b9415..55fbf8006f 100644 --- a/src/components/icons/SplitSentencesIcon.tsx +++ b/src/components/icons/SplitSentencesIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/23-split-sentences_2.json' diff --git a/src/components/icons/StrikethroughIcon.tsx b/src/components/icons/StrikethroughIcon.tsx index 97316df4dd..01d0d614fe 100644 --- a/src/components/icons/StrikethroughIcon.tsx +++ b/src/components/icons/StrikethroughIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/16-strikethrough_3.json' diff --git a/src/components/icons/SubCategorizeAllIcon.tsx b/src/components/icons/SubCategorizeAllIcon.tsx index c6918c14f9..203786b7d1 100644 --- a/src/components/icons/SubCategorizeAllIcon.tsx +++ b/src/components/icons/SubCategorizeAllIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/21-categorize-all_5.json' diff --git a/src/components/icons/SubCategorizeOneIcon.tsx b/src/components/icons/SubCategorizeOneIcon.tsx index daa59edb9c..ca171f716d 100644 --- a/src/components/icons/SubCategorizeOneIcon.tsx +++ b/src/components/icons/SubCategorizeOneIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/20-categorize_3.json' diff --git a/src/components/icons/SwapParentIcon.tsx b/src/components/icons/SwapParentIcon.tsx index d94c5b1453..a1e1766442 100644 --- a/src/components/icons/SwapParentIcon.tsx +++ b/src/components/icons/SwapParentIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/17-swap-parent.json' diff --git a/src/components/icons/TableViewIcon.tsx b/src/components/icons/TableViewIcon.tsx index f415b5c7cd..9f2e6fcc23 100644 --- a/src/components/icons/TableViewIcon.tsx +++ b/src/components/icons/TableViewIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/09-tabel-view_2.json' diff --git a/src/components/icons/TextColor.tsx b/src/components/icons/TextColor.tsx index 1a9b1ba6ed..24199bcebe 100644 --- a/src/components/icons/TextColor.tsx +++ b/src/components/icons/TextColor.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/17-text-color_2.json' diff --git a/src/components/icons/TextColorWithColorPicker.tsx b/src/components/icons/TextColorWithColorPicker.tsx index 6c5b14562a..ec5fad3b82 100644 --- a/src/components/icons/TextColorWithColorPicker.tsx +++ b/src/components/icons/TextColorWithColorPicker.tsx @@ -2,7 +2,7 @@ import { useRef } from 'react' import { useSelector } from 'react-redux' import { CSSTransition } from 'react-transition-group' import { css } from '../../../styled-system/css' -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import durations from '../../util/durations' import ColorPicker from '../ColorPicker' import TextColorIcon from './TextColor' diff --git a/src/components/icons/TitleCaseIcon.tsx b/src/components/icons/TitleCaseIcon.tsx index b1056b65f9..73189c74db 100755 --- a/src/components/icons/TitleCaseIcon.tsx +++ b/src/components/icons/TitleCaseIcon.tsx @@ -1,7 +1,7 @@ import { css, cx } from '../../../styled-system/css' import { icon } from '../../../styled-system/recipes' import { token } from '../../../styled-system/tokens' -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import { ICON_SCALING_FACTOR } from '../../constants' /** Title-Case icon. */ diff --git a/src/components/icons/TutorialsIcon.tsx b/src/components/icons/TutorialsIcon.tsx index 0ab82be5e5..b0c444960b 100644 --- a/src/components/icons/TutorialsIcon.tsx +++ b/src/components/icons/TutorialsIcon.tsx @@ -2,7 +2,7 @@ import { FC } from 'react' import { css, cx } from '../../../styled-system/css' import { icon } from '../../../styled-system/recipes' import { token } from '../../../styled-system/tokens' -import Icon from '../../@types/Icon' +import Icon from '../../@types/IconType' /** Tutorials icon that shows a teacher at a board. */ const TutorialsIcon: FC = ({ cssRaw, fill, style, size = 20 }) => { diff --git a/src/components/icons/UnderlineIcon.tsx b/src/components/icons/UnderlineIcon.tsx index 81067cb1d9..e5f6f9f0fd 100644 --- a/src/components/icons/UnderlineIcon.tsx +++ b/src/components/icons/UnderlineIcon.tsx @@ -1,4 +1,4 @@ -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import AnimatedIcon from './AnimatedIcon' import animationData from './animations/15-underline_2.json' diff --git a/src/components/icons/UpperCaseIcon.tsx b/src/components/icons/UpperCaseIcon.tsx index c74735757b..26e48d82c1 100755 --- a/src/components/icons/UpperCaseIcon.tsx +++ b/src/components/icons/UpperCaseIcon.tsx @@ -1,7 +1,7 @@ import { css, cx } from '../../../styled-system/css' import { icon } from '../../../styled-system/recipes' import { token } from '../../../styled-system/tokens' -import IconType from '../../@types/Icon' +import IconType from '../../@types/IconType' import { ICON_SCALING_FACTOR } from '../../constants' /** Upper-Case icon. */ diff --git a/src/components/modals/Help.tsx b/src/components/modals/Help.tsx index f4988746ca..626af25017 100644 --- a/src/components/modals/Help.tsx +++ b/src/components/modals/Help.tsx @@ -2,7 +2,7 @@ import { FC, useCallback, useState } from 'react' import { useDispatch, useSelector } from 'react-redux' import { css, cx } from '../../../styled-system/css' import { anchorButton, extendTap, modal, modalText } from '../../../styled-system/recipes' -import Icon from '../../@types/Icon' +import Icon from '../../@types/IconType' import { closeModalActionCreator as closeModal } from '../../actions/closeModal' import { tutorialActionCreator as tutorial } from '../../actions/tutorial' import { tutorialStepActionCreator as setTutorialStep } from '../../actions/tutorialStep' diff --git a/src/shortcuts/bindContext.tsx b/src/shortcuts/bindContext.tsx index 1ee1c3b96d..b9d7d321a3 100644 --- a/src/shortcuts/bindContext.tsx +++ b/src/shortcuts/bindContext.tsx @@ -1,6 +1,6 @@ import { css, cx } from '../../styled-system/css' import { icon } from '../../styled-system/recipes' -import IconType from '../@types/Icon' +import IconType from '../@types/IconType' import Shortcut from '../@types/Shortcut' import { toggleAttributeActionCreator as toggleAttribute } from '../actions/toggleAttribute' import isContextViewActive from '../selectors/isContextViewActive' diff --git a/src/shortcuts/cursorDown.tsx b/src/shortcuts/cursorDown.tsx index 5838788cf2..5e7334917e 100644 --- a/src/shortcuts/cursorDown.tsx +++ b/src/shortcuts/cursorDown.tsx @@ -2,7 +2,7 @@ import { Key } from 'ts-key-enum' import { css, cx } from '../../styled-system/css' import { icon } from '../../styled-system/recipes' import Dispatch from '../@types/Dispatch' -import IconType from '../@types/Icon' +import IconType from '../@types/IconType' import Shortcut from '../@types/Shortcut' import State from '../@types/State' import { addMulticursorActionCreator as addMulticursor } from '../actions/addMulticursor' diff --git a/src/shortcuts/cursorForward.tsx b/src/shortcuts/cursorForward.tsx index e43d6c60ec..5ed3acf270 100644 --- a/src/shortcuts/cursorForward.tsx +++ b/src/shortcuts/cursorForward.tsx @@ -1,6 +1,6 @@ import { css, cx } from '../../styled-system/css' import { icon } from '../../styled-system/recipes' -import IconType from '../@types/Icon' +import IconType from '../@types/IconType' import Shortcut from '../@types/Shortcut' import { cursorForwardActionCreator as cursorForward } from '../actions/cursorForward' diff --git a/src/shortcuts/cursorUp.tsx b/src/shortcuts/cursorUp.tsx index 8929b5d1a0..cb649efdfd 100644 --- a/src/shortcuts/cursorUp.tsx +++ b/src/shortcuts/cursorUp.tsx @@ -2,7 +2,7 @@ import { Key } from 'ts-key-enum' import { css, cx } from '../../styled-system/css' import { icon } from '../../styled-system/recipes' import Dispatch from '../@types/Dispatch' -import IconType from '../@types/Icon' +import IconType from '../@types/IconType' import Shortcut from '../@types/Shortcut' import State from '../@types/State' import { addMulticursorActionCreator as addMulticursor } from '../actions/addMulticursor' diff --git a/src/shortcuts/deleteEmptyThoughtOrOutdent.tsx b/src/shortcuts/deleteEmptyThoughtOrOutdent.tsx index 13c6bfb220..5da691b6e1 100644 --- a/src/shortcuts/deleteEmptyThoughtOrOutdent.tsx +++ b/src/shortcuts/deleteEmptyThoughtOrOutdent.tsx @@ -1,7 +1,7 @@ import { Key } from 'ts-key-enum' import { css, cx } from '../../styled-system/css' import { icon } from '../../styled-system/recipes' -import IconType from '../@types/Icon' +import IconType from '../@types/IconType' import Shortcut from '../@types/Shortcut' import State from '../@types/State' import { deleteEmptyThoughtActionCreator as deleteEmptyThought } from '../actions/deleteEmptyThought' diff --git a/src/shortcuts/toggleSplitView.tsx b/src/shortcuts/toggleSplitView.tsx index 9571505730..0dd63f1b56 100644 --- a/src/shortcuts/toggleSplitView.tsx +++ b/src/shortcuts/toggleSplitView.tsx @@ -1,6 +1,6 @@ import { css, cx } from '../../styled-system/css' import { icon } from '../../styled-system/recipes' -import IconType from '../@types/Icon' +import IconType from '../@types/IconType' import Shortcut from '../@types/Shortcut' import { toggleSplitViewActionCreator as toggleSplitView } from '../actions/toggleSplitView'