diff --git a/packages/icons/src/Icons/ic-caret-right.svg b/packages/icons/src/Icons/ic-caret-right.svg new file mode 100644 index 000000000..cd5c81ede --- /dev/null +++ b/packages/icons/src/Icons/ic-caret-right.svg @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/packages/icons/src/Icons/index.ts b/packages/icons/src/Icons/index.ts index f83440a96..8a340f8eb 100644 --- a/packages/icons/src/Icons/index.ts +++ b/packages/icons/src/Icons/index.ts @@ -29,6 +29,7 @@ import BoldIcon from './ic-bold.svg' import BoxFilledIcon from './ic-box-filled.svg' import BoxIcon from './ic-box.svg' import CameraIcon from './ic-camera.svg' +import CaretRightIcon from './ic-caret-right.svg' import CheckAllIcon from './ic-check-all.svg' import CheckBoldIcon from './ic-check-bold.svg' import CheckCircleFilledIcon from './ic-check-circle-filled.svg' @@ -242,6 +243,7 @@ export { BoxFilledIcon, BoxIcon, CameraIcon, + CaretRightIcon, CheckAllIcon, CheckBoldIcon, CheckCircleFilledIcon, diff --git a/packages/icons/src/Lexical/caret-right-fill.svg b/packages/icons/src/Lexical/caret-right-fill.svg deleted file mode 100644 index 36ad8e60d..000000000 --- a/packages/icons/src/Lexical/caret-right-fill.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/icons/src/Lexical/chat-square-quote.svg b/packages/icons/src/Lexical/chat-square-quote.svg index 6fa97d0b9..fe2937ca5 100755 --- a/packages/icons/src/Lexical/chat-square-quote.svg +++ b/packages/icons/src/Lexical/chat-square-quote.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/Lexical/index.ts b/packages/icons/src/Lexical/index.ts index e4f3b807e..034a7738d 100644 --- a/packages/icons/src/Lexical/index.ts +++ b/packages/icons/src/Lexical/index.ts @@ -1,4 +1,3 @@ -import LexicalCaretRightFill from './caret-right-fill.svg' import LexicalCheck from './square-check.svg' import LexicalCode from './code.svg' import LexicalHorizontalRule from './horizontal-rule.svg' @@ -30,7 +29,6 @@ import LexicalPencilFill from './pencil-fill.svg' import LexicalDraggableBlockMenu from './draggable-block-menu.svg' export { - LexicalCaretRightFill, LexicalCheck, LexicalCode, LexicalHorizontalRule, diff --git a/packages/icons/src/Lexical/table.svg b/packages/icons/src/Lexical/table.svg index e875de5bb..94ee6f7a2 100644 --- a/packages/icons/src/Lexical/table.svg +++ b/packages/icons/src/Lexical/table.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/Lexical/tweet.svg b/packages/icons/src/Lexical/tweet.svg index 2d8dc7d43..b673fe71d 100644 --- a/packages/icons/src/Lexical/tweet.svg +++ b/packages/icons/src/Lexical/tweet.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/icons/src/Lexical/youtube.svg b/packages/icons/src/Lexical/youtube.svg index efaf08dfb..4a99cd29f 100644 --- a/packages/icons/src/Lexical/youtube.svg +++ b/packages/icons/src/Lexical/youtube.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/packages/web/src/javascripts/Components/Icon/IconNameToSvgMapping.tsx b/packages/web/src/javascripts/Components/Icon/IconNameToSvgMapping.tsx index 8848c67b9..836d3e6c2 100644 --- a/packages/web/src/javascripts/Components/Icon/IconNameToSvgMapping.tsx +++ b/packages/web/src/javascripts/Components/Icon/IconNameToSvgMapping.tsx @@ -14,6 +14,7 @@ export const IconNameToSvgMapping = { 'arrows-sort-up': icons.ArrowsSortUpIcon, 'arrows-vertical': icons.ArrowsVerticalIcon, 'attachment-file': icons.AttachmentFileIcon, + 'caret-right': icons.CaretRightIcon, 'check-bold': icons.CheckBoldIcon, 'check-circle-filled': icons.CheckCircleFilledIcon, 'check-circle': icons.CheckCircleIcon, @@ -103,6 +104,7 @@ export const IconNameToSvgMapping = { link: icons.LinkIcon, listed: icons.ListedIcon, lock: icons.LockIcon, + image: icons.ImageIcon, markdown: icons.MarkdownIcon, merge: icons.MergeIcon, more: icons.MoreIcon, diff --git a/packages/web/src/javascripts/Components/Icon/LexicalIcons.tsx b/packages/web/src/javascripts/Components/Icon/LexicalIcons.tsx index d2b915006..49c909011 100644 --- a/packages/web/src/javascripts/Components/Icon/LexicalIcons.tsx +++ b/packages/web/src/javascripts/Components/Icon/LexicalIcons.tsx @@ -6,7 +6,6 @@ export const LexicalIconNameToSvgMapping = { 'align-justify': icons.LexicalTextJustify, 'align-left': icons.LexicalTextLeft, 'align-right': icons.LexicalTextRight, - 'caret-right-fill': icons.LexicalCaretRightFill, 'horizontal-rule': icons.LexicalHorizontalRule, 'list-ol': icons.LexicalListOL, 'list-ul': icons.LexicalListUL, diff --git a/packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/BlockPickerMenuItem.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/BlockPickerMenuItem.tsx index 7e7dfe04f..0716fa15f 100644 --- a/packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/BlockPickerMenuItem.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/BlockPickerPlugin/BlockPickerMenuItem.tsx @@ -29,7 +29,7 @@ export function BlockPickerMenuItem({ onMouseEnter={onMouseEnter} onClick={onClick} > - +
{option.title}
) diff --git a/packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/Collapsible.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/Collapsible.tsx index 54170854d..5eae15b42 100644 --- a/packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/Collapsible.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/Collapsible.tsx @@ -1,11 +1,11 @@ import { LexicalEditor } from 'lexical' import { INSERT_COLLAPSIBLE_COMMAND } from '../../Plugins/CollapsiblePlugin' -import { LexicalIconName } from '@/Components/Icon/LexicalIcons' +import { IconType } from '@standardnotes/snjs' export function GetCollapsibleBlock(editor: LexicalEditor) { return { name: 'Collapsible', - iconName: 'caret-right-fill' as LexicalIconName, + iconName: 'caret-right' as IconType, keywords: ['collapse', 'collapsible', 'toggle'], onSelect: () => editor.dispatchCommand(INSERT_COLLAPSIBLE_COMMAND, undefined), } diff --git a/packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/RemoteImage.tsx b/packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/RemoteImage.tsx index 8b09f66d9..4e6eba56b 100644 --- a/packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/RemoteImage.tsx +++ b/packages/web/src/javascripts/Components/SuperEditor/Plugins/Blocks/RemoteImage.tsx @@ -1,7 +1,7 @@ export function GetRemoteImageBlock(onSelect: () => void) { return { name: 'Image from URL', - iconName: 'file-image', + iconName: 'image', keywords: ['image', 'url'], onSelect, }