diff --git a/package.json b/package.json
index b526b524..4cfe112b 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
"__prepare-folder": "rimraf dist && copyfiles LICENSE manifest.json dist && copyup public/images/icon128.png public/* dist && cp -R public/themes dist",
"__prepare-folder-develop": "npm run __prepare-folder && cp -R public/integration dist && node --import ./register.js ./env/set-client-id.ts dist/manifest.json",
"__check-types": "tsc --noEmit",
- "__develop-core": "npm run __check-types && NODE_ENV=development node --import ./register.js ./build.ts",
+ "__develop-core": "NODE_ENV=development node --import ./register.js ./build.ts",
"lint": "eslint src --ext .ts,.tsx",
"test": "LOG_LEVEL=SILENT TZ=UTC jest --maxWorkers=4",
"develop": "npm run __prepare-folder-develop && npm run __develop-core",
diff --git a/src/notes/components/SidebarButtons.tsx b/src/notes/components/SidebarButtons.tsx
index 3af015d1..fe8c46b0 100644
--- a/src/notes/components/SidebarButtons.tsx
+++ b/src/notes/components/SidebarButtons.tsx
@@ -4,10 +4,7 @@ import { Os, Sync, MessageType } from "shared/storage/schema";
import clsx from "clsx";
import { t } from "i18n";
import SVG from "notes/components/SVG";
-import FileSvgText from "svg/file.svg";
-import GearSvgText from "svg/gear.svg";
-import RefreshSvgText from "svg/refresh.svg";
-import GridSvgText from "svg/grid.svg";
+import svgs from "svg";
import { importNoteFromTextFile } from "notes/import";
import sendMessage from "shared/messages/send";
import formatDate from "shared/date/format-date";
@@ -51,13 +48,13 @@ const SidebarButtons = ({
>
-
+
-
+
@@ -79,13 +76,13 @@ const SidebarButtons = ({
className={clsx("button", (!sync || !sync.lastSync) && "disabled")}
onClick={() => sync && sendMessage(MessageType.SYNC)}
>
-
+
-
+
diff --git a/src/notes/components/SidebarNotes.tsx b/src/notes/components/SidebarNotes.tsx
index a72ca81a..f5af52e0 100644
--- a/src/notes/components/SidebarNotes.tsx
+++ b/src/notes/components/SidebarNotes.tsx
@@ -6,7 +6,7 @@ import { MessageType } from "shared/storage/schema";
import { SidebarNote } from "notes/adapters";
import clsx from "clsx";
import SVG from "notes/components/SVG";
-import LockSvgText from "svg/lock.svg";
+import svgs from "svg";
import { useKeyboardShortcut, KeyboardShortcut } from "notes/components/hooks/use-keyboard-shortcut";
import sendMessage from "shared/messages/send";
@@ -171,7 +171,7 @@ const SidebarNotes = ({
}}
>
{note.name}
- {note.locked && }
+ {note.locked && }
))}
diff --git a/src/notes/components/Toolbar.tsx b/src/notes/components/Toolbar.tsx
index 03203c29..7febd029 100644
--- a/src/notes/components/Toolbar.tsx
+++ b/src/notes/components/Toolbar.tsx
@@ -8,35 +8,7 @@ import capitalize from "shared/string/capitalize";
import { HIGHLIGHT_COLORS } from "notes/commands/highlight";
import { reinitTables } from "notes/content/table";
import SVG from "notes/components/SVG";
-import BoldSvgText from "svg/bold.svg";
-import ItalicSvgText from "svg/italic.svg";
-import UnderlineSvgText from "svg/underline.svg";
-import StrikethroughSvgText from "svg/strikethrough.svg";
-import TextSvgText from "svg/text.svg";
-import BulletedListSvgText from "svg/bulleted-list.svg";
-import NumberedListSvgText from "svg/numbered-list.svg";
-import OutdentSvgText from "svg/outdent.svg";
-import IndentSvgText from "svg/indent.svg";
-import AlignLeftSvgText from "svg/align-left.svg";
-import AlignCenterSvgText from "svg/align-center.svg";
-import AlignRightSvgText from "svg/align-right.svg";
-import HorizontalRuleSvgText from "svg/horizontal-rule.svg";
-import ImageSvgText from "svg/image.svg";
-import LinkSvgText from "svg/link.svg";
-import EmbedHtmlSvgText from "svg/embed.svg";
-import CodeSvgText from "svg/code.svg";
-import ClockSvgText from "svg/clock.svg";
-import TableSvgText from "svg/table.svg";
-import TableRowAboveSvgText from "svg/table-row-above.svg";
-import TableRowBelowSvgText from "svg/table-row-below.svg";
-import TableColumnLeftSvgText from "svg/table-column-left.svg";
-import TableColumnRightSvgText from "svg/table-column-right.svg";
-import TableLineSvgText from "svg/table-line.svg";
-import TableDeleteRowSvgText from "svg/table-delete-row.svg";
-import TableDeleteColumnSvgText from "svg/table-delete-column.svg";
-import TextColorSvgText from "svg/text-color.svg";
-import RemoveFormatSvgText from "svg/remove-format.svg";
-import InfoSvgText from "svg/info.svg";
+import svgs from "svg";
import {
commands,
InsertImageFactory,
@@ -102,7 +74,7 @@ const Toolbar = ({
: ""}>
-
+
@@ -154,47 +126,47 @@ const Toolbar = ({
table.insertTable(tableCallback)}>
-
+
table.insertRowAbove(tableCallback)}>
-
+
table.insertRowBelow(tableCallback)}>
-
+
table.insertColumnLeft(tableCallback)}>
-
+
table.insertColumnRight(tableCallback)}>
-
+
table.toggleHeadingRow(callback)}>
-
+
table.toggleHeadingColumn(callback)}>
-
+
table.deleteRow(tableCallback)}>
-
+
table.deleteColumn(tableCallback)}>
-
+
@@ -234,79 +206,79 @@ const Toolbar = ({
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -330,7 +302,7 @@ const Toolbar = ({
});
}}
>
-
+
@@ -354,7 +326,7 @@ const Toolbar = ({
});
}}
>
-
+
@@ -378,37 +350,37 @@ const Toolbar = ({
});
}}
>
-
+
-
+
-
+
-
+
-
+
-
+
@@ -418,7 +390,7 @@ const Toolbar = ({
: ""}>
-
+
diff --git a/src/notes/components/Tooltip.tsx b/src/notes/components/Tooltip.tsx
index 8c3b12a6..65449f6c 100644
--- a/src/notes/components/Tooltip.tsx
+++ b/src/notes/components/Tooltip.tsx
@@ -19,13 +19,7 @@ interface TooltipRenderProps {
className?: string
}
-const getContainer = () => {
- const container = document.getElementById("tooltip-container");
- if (!container) {
- throw new Error("Container not found!");
- }
- return container;
-};
+const getContainer = () => document.getElementById("tooltip-container")!;
const MINIMAL_OFFSET = 5;
const EDGE_OFFSET = ".5em";
diff --git a/src/svg/index.ts b/src/svg/index.ts
new file mode 100644
index 00000000..beba2a9c
--- /dev/null
+++ b/src/svg/index.ts
@@ -0,0 +1,71 @@
+import AlignCenterSvgText from "svg/align-center.svg";
+import AlignLeftSvgText from "svg/align-left.svg";
+import AlignRightSvgText from "svg/align-right.svg";
+import BoldSvgText from "svg/bold.svg";
+import BulletedListSvgText from "svg/bulleted-list.svg";
+import ClockSvgText from "svg/clock.svg";
+import CodeSvgText from "svg/code.svg";
+import EmbedHtmlSvgText from "svg/embed.svg";
+import FileSvgText from "svg/file.svg";
+import GearSvgText from "svg/gear.svg";
+import GridSvgText from "svg/grid.svg";
+import HorizontalRuleSvgText from "svg/horizontal-rule.svg";
+import ImageSvgText from "svg/image.svg";
+import IndentSvgText from "svg/indent.svg";
+import InfoSvgText from "svg/info.svg";
+import ItalicSvgText from "svg/italic.svg";
+import LinkSvgText from "svg/link.svg";
+import LockSvgText from "svg/lock.svg";
+import NumberedListSvgText from "svg/numbered-list.svg";
+import OutdentSvgText from "svg/outdent.svg";
+import RefreshSvgText from "svg/refresh.svg";
+import RemoveFormatSvgText from "svg/remove-format.svg";
+import StrikethroughSvgText from "svg/strikethrough.svg";
+import TableColumnLeftSvgText from "svg/table-column-left.svg";
+import TableColumnRightSvgText from "svg/table-column-right.svg";
+import TableDeleteColumnSvgText from "svg/table-delete-column.svg";
+import TableDeleteRowSvgText from "svg/table-delete-row.svg";
+import TableLineSvgText from "svg/table-line.svg";
+import TableRowAboveSvgText from "svg/table-row-above.svg";
+import TableRowBelowSvgText from "svg/table-row-below.svg";
+import TableSvgText from "svg/table.svg";
+import TextColorSvgText from "svg/text-color.svg";
+import TextSvgText from "svg/text.svg";
+import UnderlineSvgText from "svg/underline.svg";
+
+export default {
+ AlignCenterSvgText,
+ AlignLeftSvgText,
+ AlignRightSvgText,
+ BoldSvgText,
+ BulletedListSvgText,
+ ClockSvgText,
+ CodeSvgText,
+ EmbedHtmlSvgText,
+ FileSvgText,
+ GearSvgText,
+ GridSvgText,
+ HorizontalRuleSvgText,
+ ImageSvgText,
+ IndentSvgText,
+ InfoSvgText,
+ ItalicSvgText,
+ LinkSvgText,
+ LockSvgText,
+ NumberedListSvgText,
+ OutdentSvgText,
+ RefreshSvgText,
+ RemoveFormatSvgText,
+ StrikethroughSvgText,
+ TableColumnLeftSvgText,
+ TableColumnRightSvgText,
+ TableDeleteColumnSvgText,
+ TableDeleteRowSvgText,
+ TableLineSvgText,
+ TableRowAboveSvgText,
+ TableRowBelowSvgText,
+ TableSvgText,
+ TextColorSvgText,
+ TextSvgText,
+ UnderlineSvgText,
+};