fix: Fixed issue when importing plaintext file

standardnotes · Nov 24, 2023 · 1f81cad · 1f81cad
1 parent 6a5cbc8
commit 1f81cad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/packages/ui-services/src/Import/PlaintextConverter/PlaintextConverter.ts b/packages/ui-services/src/Import/PlaintextConverter/PlaintextConverter.ts
@@ -27,8 +27,6 @@ export class PlaintextConverter {
     const createdAtDate = file.lastModified ? new Date(file.lastModified) : new Date()
     const updatedAtDate = file.lastModified ? new Date(file.lastModified) : new Date()
 
-    const shouldConvertToSuper = file.type === 'text/markdown' && isEntitledToSuper
-
     return {
       created_at: createdAtDate,
       created_at_timestamp: createdAtDate.getTime(),
@@ -38,9 +36,7 @@ export class PlaintextConverter {
       content_type: ContentType.TYPES.Note,
       content: {
         title: name,
-        text: shouldConvertToSuper
-          ? this.superConverterService.convertOtherFormatToSuperString(content, 'md')
-          : content,
+        text: isEntitledToSuper ? this.superConverterService.convertOtherFormatToSuperString(content, 'md') : content,
         references: [],
         ...(isEntitledToSuper
           ? {

diff --git a/packages/web/src/javascripts/Components/SuperEditor/Tools/HeadlessSuperConverter.tsx b/packages/web/src/javascripts/Components/SuperEditor/Tools/HeadlessSuperConverter.tsx
@@ -1,5 +1,5 @@
 import { createHeadlessEditor } from '@lexical/headless'
-import { $convertToMarkdownString, $convertFromMarkdownString } from '@lexical/markdown'
+import { $convertToMarkdownString } from '@lexical/markdown'
 import { FileItem, GenerateUuid, PrefKey, PrefValue, SuperConverterServiceInterface } from '@standardnotes/snjs'
 import {
   $createParagraphNode,
@@ -19,6 +19,7 @@ import { $createFileExportNode } from '../Lexical/Nodes/FileExportNode'
 import { $createInlineFileNode, $isInlineFileNode, InlineFileNode } from '../Plugins/InlineFilePlugin/InlineFileNode'
 import { $createFileNode } from '../Plugins/EncryptedFilePlugin/Nodes/FileUtils'
 import { RemoteImageNode } from '../Plugins/RemoteImagePlugin/RemoteImageNode'
+import { $convertFromMarkdownString } from '../Lexical/Utils/MarkdownImport'
 export class HeadlessSuperConverter implements SuperConverterServiceInterface {
   private importEditor: LexicalEditor
   private exportEditor: LexicalEditor
@@ -218,7 +219,7 @@ export class HeadlessSuperConverter implements SuperConverterServiceInterface {
       this.importEditor.update(
         () => {
           try {
-            $convertFromMarkdownString(otherFormatString, MarkdownTransformers)
+            $convertFromMarkdownString(otherFormatString, MarkdownTransformers, undefined, true)
           } catch (error) {
             console.error(error)
             didThrow = true