TagSpaces is an offline, open source, document manager with tagging support
chore: refactoring html export functionality
Ilian Sapundshiev21018b378ff4
diff --git a/package-lock.json b/package-lock.jsonindex bf952f79a..7ae6f8a58 100644--- a/package-lock.json+++ b/package-lock.json@@ -44,6 +44,7 @@"i18next": "^23.4.6","i18next-http-backend": "^2.2.2","leaflet": "1.9.4",+ "marked": "^17.0.0","mgrs": "^1.0.0","ollama": "^0.5.13","open-location-code": "1.0.3",@@ -16002,6 +16003,18 @@}}},+ "node_modules/@tagspaces/tagspaces-common/node_modules/marked": {+ "version": "15.0.12",+ "resolved": "https://registry.npmjs.org/marked/-/marked-15.0.12.tgz",+ "integrity": "sha512-8dD6FusOQSrpv9Z1rdNMdlSgQOIP880DHqnohobOmYLElGEqAL/JvxvuxZO16r4HtjTlfPRDC1hbvxC9dPN2nA==",+ "license": "MIT",+ "bin": {+ "marked": "bin/marked.js"+ },+ "engines": {+ "node": ">= 18"+ }+ },"node_modules/@tagspaces/tagspaces-common/node_modules/tough-cookie": {"version": "5.1.2","license": "BSD-3-Clause",@@ -28021,13 +28034,15 @@}},"node_modules/marked": {- "version": "15.0.12",+ "version": "17.0.0",+ "resolved": "https://registry.npmjs.org/marked/-/marked-17.0.0.tgz",+ "integrity": "sha512-KkDYEWEEiYJw/KC+DVm1zzlpMQSMIu6YRltkcCvwheCp8HWPXCk9JwOmHJKBlGfzcpzcIt6x3sMnTsRm/51oDg==","license": "MIT","bin": {"marked": "bin/marked.js"},"engines": {- "node": ">= 18"+ "node": ">= 20"}},"node_modules/marky": {diff --git a/package.json b/package.jsonindex e2652e680..28c076ced 100644--- a/package.json+++ b/package.json@@ -200,6 +200,7 @@"i18next": "^23.4.6","i18next-http-backend": "^2.2.2","leaflet": "1.9.4",+ "marked": "17.0.0","mgrs": "^1.0.0","ollama": "^0.5.13","open-location-code": "1.0.3",diff --git a/src/renderer/components/EditDescription.tsx b/src/renderer/components/EditDescription.tsxindex 0af3c38a0..fb8ef9487 100644--- a/src/renderer/components/EditDescription.tsx+++ b/src/renderer/components/EditDescription.tsx@@ -57,7 +57,6 @@ function EditDescription() {}}><EditDescriptionButtons- getHtml={() => milkdownDivRef.current?.innerHTML}resetMdContent={resetMdContent}setEditMode={setEditMode}/>diff --git a/src/renderer/components/EditDescriptionButtons.tsx b/src/renderer/components/EditDescriptionButtons.tsxindex 684ae4000..aec538ba9 100644--- a/src/renderer/components/EditDescriptionButtons.tsx+++ b/src/renderer/components/EditDescriptionButtons.tsx@@ -10,7 +10,11 @@ import { useCurrentLocationContext } from '-/hooks/useCurrentLocationContext';import { useFilePropertiesContext } from '-/hooks/useFilePropertiesContext';import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';import { Pro } from '-/pro';-import { saveAsTextFile } from '-/services/utils-io';+import {+ convertMarkDownToHtml,+ getMimeType,+ saveAsTextFile,+} from '-/services/utils-io';import { ButtonGroup, Tooltip, useTheme } from '@mui/material';import { formatDateTime4Tag } from '@tagspaces/tagspaces-common/misc';import { extractTitle } from '@tagspaces/tagspaces-common/paths';@@ -18,13 +22,11 @@ import React from 'react';import { useTranslation } from 'react-i18next';interface ButtonsProps {- getHtml: () => string;resetMdContent: (md: string) => void;setEditMode: (editMode: boolean) => void;}const EditDescriptionButtons: React.FC<ButtonsProps> = ({- getHtml,resetMdContent,setEditMode,}) => {@@ -82,18 +84,13 @@ const EditDescriptionButtons: React.FC<ButtonsProps> = ({const saveAsHtml = () => {setAnchorEl(null);- const html = getHtml();- if (html) {+ if (openedEntry.meta?.description) {+ const html = convertMarkDownToHtml(openedEntry.meta?.description);const blob = new Blob([html], {- type: 'text/html',+ type: getMimeType('html'),});const dateTimeTag = formatDateTime4Tag(new Date(), true);- const filename =- extractTitle(openedEntry.name) +- ' [description ' +- dateTimeTag +- '].html';-+ const filename = `${extractTitle(openedEntry.name)} [description ${dateTimeTag}].html`;saveAsTextFile(blob, filename);}};@@ -102,14 +99,10 @@ const EditDescriptionButtons: React.FC<ButtonsProps> = ({setAnchorEl(null);if (openedEntry.meta?.description) {const blob = new Blob([openedEntry.meta.description], {- type: 'text/markdown',+ type: getMimeType('md'),});const dateTimeTag = formatDateTime4Tag(new Date(), true);- const filename =- extractTitle(openedEntry.name) +- ' [description ' +- dateTimeTag +- '].md';+ const filename = `${extractTitle(openedEntry.name)} [description ${dateTimeTag}].md`;saveAsTextFile(blob, filename);}diff --git a/src/renderer/components/chat/ChatView.tsx b/src/renderer/components/chat/ChatView.tsxindex a92c0e106..da049e49a 100644--- a/src/renderer/components/chat/ChatView.tsx+++ b/src/renderer/components/chat/ChatView.tsx@@ -31,8 +31,11 @@ import { useChatContext } from '-/hooks/useChatContext';import { useNotificationContext } from '-/hooks/useNotificationContext';import { useOpenedEntryContext } from '-/hooks/useOpenedEntryContext';import { getDefaultAIProvider } from '-/reducers/settings';-import { getMimeType, saveAsTextFile } from '-/services/utils-io';-import versionMeta from '-/version.json';+import {+ convertMarkDownToHtml,+ getMimeType,+ saveAsTextFile,+} from '-/services/utils-io';import { MilkdownProvider } from '@milkdown/react';import CancelIcon from '@mui/icons-material/Cancel';import SendIcon from '@mui/icons-material/Send';@@ -44,7 +47,6 @@ import InputAdornment from '@mui/material/InputAdornment';import { useTheme } from '@mui/material/styles';import { formatDateTime4Tag } from '@tagspaces/tagspaces-common/misc';import { extractFileExtension } from '@tagspaces/tagspaces-common/paths';-import DOMPurify from 'dompurify';import React, { ChangeEvent, useCallback, useReducer, useRef } from 'react';import { NativeTypes } from 'react-dnd-html5-backend';import { useTranslation } from 'react-i18next';@@ -184,31 +186,12 @@ function ChatView() {}, [showNotification, t]);const saveAsHtml = useCallback(() => {setAnchorEl(null);- if (milkdownDivRef.current) {- const creationDate = new Date().toISOString();- const milkdownContent =- milkdownDivRef.current.querySelector('.ProseMirror').innerHTML;- const html = milkdownContent || milkdownDivRef.current.innerHTML;- // tmp solution for hiding unneeded markup- const milkdownCleanerCSS = `- <style>- .label-wrapper, .tools, .cm-gutter, .cm-gap,- .milkdown-table-block, .handle { display: none }- </style>- `;- const blob = new Blob(- [- `<!DOCTYPE html><html>- <head><meta charset="UTF-8">${milkdownCleanerCSS}</head>- <body data-createdwith="${versionMeta.name}" data-createdon="${creationDate}">- ${DOMPurify.sanitize(html)}- </body>- </html>`,- ],- {- type: getMimeType('html'),- },- );+ if (editorRef.current) {+ const md = editorRef.current.getMarkdown();+ const html = convertMarkDownToHtml(md);+ const blob = new Blob([html], {+ type: getMimeType('html'),+ });const dateTimeTag = formatDateTime4Tag(new Date(), true);const filename = `tagspaces-chat [export ${dateTimeTag}].html`;saveAsTextFile(blob, filename);diff --git a/src/renderer/services/utils-io.ts b/src/renderer/services/utils-io.tsindex 2e5718da6..149ddb9c4 100644--- a/src/renderer/services/utils-io.ts+++ b/src/renderer/services/utils-io.ts@@ -28,7 +28,9 @@ import {extractTagsAsObjects,} from '@tagspaces/tagspaces-common/paths';import { getUuid } from '@tagspaces/tagspaces-common/utils-io';+import DOMPurify from 'dompurify';import { saveAs } from 'file-saver';+import { marked } from 'marked';import removeMd from 'remove-markdown';import versionMeta from '../version.json';@@ -549,6 +551,25 @@ export function getDescriptionPreview(mdContent, maxLength = 200) {// return preview.replace(/[#*!_\[\]()`]/g, '');}+export function convertMarkDownToHtml(mdContent: string) {+ marked.setOptions({+ pedantic: false,+ gfm: true,+ breaks: false,+ });+ const creationDate = new Date().toISOString();+ // @ts-ignore+ const sanitiezedHTML = DOMPurify.sanitize(marked.parse(mdContent));+ const result = `<!DOCTYPE html><html>+<head><meta charset="UTF-8"></head>+<body data-createdwith="${versionMeta.name}" data-createdon="${creationDate}">+${sanitiezedHTML}+</body>+</html>`;++ return result;+}+// export function removeMarkDown(mdContent) {// if (!mdContent) return '';// let result = marked.parse(DOMPurify.sanitize(mdContent));