chore: fix super icons

2023-08-02 01:20:14 +05:30
parent 73609ca7e3
commit a059c2e7e9
13 changed files with 16 additions and 12 deletions
--- a/packages/icons/src/Icons/ic-caret-right.svg
+++ b/packages/icons/src/Icons/ic-caret-right.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 9 16">
+	<path fill="currentColor"
+		d="M7.62 7.18L2.79 3.03c-.7-.6-1.79-.1-1.79.82v8.29c0 .93 1.09 1.42 1.79.82l4.83-4.14c.5-.43.5-1.21 0-1.64Z" />
+</svg>
--- 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,
--- a/packages/icons/src/Lexical/caret-right-fill.svg
+++ b/packages/icons/src/Lexical/caret-right-fill.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="bi bi-caret-right-fill"><path d="m12.14 8.753-5.482 4.796c-.646.566-1.658.106-1.658-.753V3.204a1 1 0 0 1 1.659-.753l5.48 4.796a1 1 0 0 1 0 1.506z"/></svg>
--- a/packages/icons/src/Lexical/chat-square-quote.svg
+++ b/packages/icons/src/Lexical/chat-square-quote.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="bi bi-chat-square-quote"><path d="M14 1a1 1 0 0 1 1 1v8a1 1 0 0 1-1 1h-2.5a2 2 0 0 0-1.6.8L8 14.333 6.1 11.8a2 2 0 0 0-1.6-.8H2a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h12zM2 0a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h2.5a1 1 0 0 1 .8.4l1.9 2.533a1 1 0 0 0 1.6 0l1.9-2.533a1 1 0 0 1 .8-.4H14a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2z"/><path d="M7.066 4.76A1.665 1.665 0 0 0 4 5.668a1.667 1.667 0 0 0 2.561 1.406c-.131.389-.375.804-.777 1.22a.417.417 0 1 0 .6.58c1.486-1.54 1.293-3.214.682-4.112zm4 0A1.665 1.665 0 0 0 8 5.668a1.667 1.667 0 0 0 2.561 1.406c-.131.389-.375.804-.777 1.22a.417.417 0 1 0 .6.58c1.486-1.54 1.293-3.214.682-4.112z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="currentColor" d="M9 22c-.6 0-1-.4-1-1v-3H4c-1.1 0-2-.9-2-2V4c0-1.1.9-2 2-2h16c1.1 0 2 .9 2 2v12c0 1.1-.9 2-2 2h-6.1l-3.7 3.7c-.2.2-.4.3-.7.3H9m1-6v3.1l3.1-3.1H20V4H4v12h6m6.3-10l-1.4 3H17v4h-4V8.8L14.3 6h2m-6 0L8.9 9H11v4H7V8.8L8.3 6h2Z"/></svg>
--- 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,
--- a/packages/icons/src/Lexical/table.svg
+++ b/packages/icons/src/Lexical/table.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="bi bi-table"><path d="M0 2a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V2zm15 2h-4v3h4V4zm0 4h-4v3h4V8zm0 4h-4v3h3a1 1 0 0 0 1-1v-2zm-5 3v-3H6v3h4zm-5 0v-3H1v2a1 1 0 0 0 1 1h3zm-4-4h4V8H1v3zm0-4h4V4H1v3zm5-3v3h4V4H6zm4 4H6v3h4V8z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="currentColor" d="M0 2a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V2zm15 2h-4v3h4V4zm0 4h-4v3h4V8zm0 4h-4v3h3a1 1 0 0 0 1-1v-2zm-5 3v-3H6v3h4zm-5 0v-3H1v2a1 1 0 0 0 1 1h3zm-4-4h4V8H1v3zm0-4h4V4H1v3zm5-3v3h4V4H6zm4 4H6v3h4V8z"/></svg>
--- a/packages/icons/src/Lexical/tweet.svg
+++ b/packages/icons/src/Lexical/tweet.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="bi bi-twitter"><path d="M5.026 15c6.038 0 9.341-5.003 9.341-9.334 0-.14 0-.282-.006-.422A6.685 6.685 0 0 0 16 3.542a6.658 6.658 0 0 1-1.889.518 3.301 3.301 0 0 0 1.447-1.817 6.533 6.533 0 0 1-2.087.793A3.286 3.286 0 0 0 7.875 6.03a9.325 9.325 0 0 1-6.767-3.429 3.289 3.289 0 0 0 1.018 4.382A3.323 3.323 0 0 1 .64 6.575v.045a3.288 3.288 0 0 0 2.632 3.218 3.203 3.203 0 0 1-.865.115 3.23 3.23 0 0 1-.614-.057 3.283 3.283 0 0 0 3.067 2.277A6.588 6.588 0 0 1 .78 13.58a6.32 6.32 0 0 1-.78-.045A9.344 9.344 0 0 0 5.026 15z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="currentColor" d="M22.46 6c-.77.35-1.6.58-2.46.69c.88-.53 1.56-1.37 1.88-2.38c-.83.5-1.75.85-2.72 1.05C18.37 4.5 17.26 4 16 4c-2.35 0-4.27 1.92-4.27 4.29c0 .34.04.67.11.98C8.28 9.09 5.11 7.38 3 4.79c-.37.63-.58 1.37-.58 2.15c0 1.49.75 2.81 1.91 3.56c-.71 0-1.37-.2-1.95-.5v.03c0 2.08 1.48 3.82 3.44 4.21a4.22 4.22 0 0 1-1.93.07a4.28 4.28 0 0 0 4 2.98a8.521 8.521 0 0 1-5.33 1.84c-.34 0-.68-.02-1.02-.06C3.44 20.29 5.7 21 8.12 21C16 21 20.33 14.46 20.33 8.79c0-.19 0-.37-.01-.56c.84-.6 1.56-1.36 2.14-2.23Z"/></svg>
--- a/packages/icons/src/Lexical/youtube.svg
+++ b/packages/icons/src/Lexical/youtube.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="bi bi-youtube"><path d="M8.051 1.999h.089c.822.003 4.987.033 6.11.335a2.01 2.01 0 0 1 1.415 1.42c.101.38.172.883.22 1.402l.01.104.022.26.008.104c.065.914.073 1.77.074 1.957v.075c-.001.194-.01 1.108-.082 2.06l-.008.105-.009.104c-.05.572-.124 1.14-.235 1.558a2.007 2.007 0 0 1-1.415 1.42c-1.16.312-5.569.334-6.18.335h-.142c-.309 0-1.587-.006-2.927-.052l-.17-.006-.087-.004-.171-.007-.171-.007c-1.11-.049-2.167-.128-2.654-.26a2.007 2.007 0 0 1-1.415-1.419c-.111-.417-.185-.986-.235-1.558L.09 9.82l-.008-.104A31.4 31.4 0 0 1 0 7.68v-.123c.002-.215.01-.958.064-1.778l.007-.103.003-.052.008-.104.022-.26.01-.104c.048-.519.119-1.023.22-1.402a2.007 2.007 0 0 1 1.415-1.42c.487-.13 1.544-.21 2.654-.26l.17-.007.172-.006.086-.003.171-.007A99.788 99.788 0 0 1 7.858 2h.193zM6.4 5.209v4.818l4.157-2.408L6.4 5.209z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path fill="currentColor" d="m10 15l5.19-3L10 9v6m11.56-7.83c.13.47.22 1.1.28 1.9c.07.8.1 1.49.1 2.09L22 12c0 2.19-.16 3.8-.44 4.83c-.25.9-.83 1.48-1.73 1.73c-.47.13-1.33.22-2.65.28c-1.3.07-2.49.1-3.59.1L12 19c-4.19 0-6.8-.16-7.83-.44c-.9-.25-1.48-.83-1.73-1.73c-.13-.47-.22-1.1-.28-1.9c-.07-.8-.1-1.49-.1-2.09L2 12c0-2.19.16-3.8.44-4.83c.25-.9.83-1.48 1.73-1.73c.47-.13 1.33-.22 2.65-.28c1.3-.07 2.49-.1 3.59-.1L12 5c4.19 0 6.8.16 7.83.44c.9.25 1.48.83 1.73 1.73Z"/></svg>
--- 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,
--- 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,
--- 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}
    >
-      <Icon type={option.iconName} className="mt-1.5 h-5 w-5" />
+      <Icon type={option.iconName} className="h-5 w-5" />
      <div className="text-editor">{option.title}</div>
    </li>
  )
--- 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),
  }
--- 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,
  }
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" class="bi bi-caret-right-fill"><path d="m12.14 8.753-5.482 4.796c-.646.566-1.658.106-1.658-.753V3.204a1 1 0 0 1 1.659-.753l5.48 4.796a1 1 0 0 1 0 1.506z"/></svg>`