Fix cussor issue

efreykongcn · efreykongcn · commit 970678dda5cf · 2022-03-30T09:37:18.000+08:00
diff --git a/Important.txt b/Important.txt
@@ -0,0 +1,3 @@
+Git remote:
+  "origin": github.com
+  "gitee": gitee.com
diff --git a/NoteWidgetAddIn/Markdown/Extension/ColorSchemeExtension.cs b/NoteWidgetAddIn/Markdown/Extension/ColorSchemeExtension.cs
@@ -27,14 +27,14 @@ public void Render(HtmlTemplate template)
                 else if (ColorScheme == ColorScheme.Dark)
                 {
                     githubCssFileName = "github-markdown-dark.css";
-                    schemeStyleVar = "body{--color-previewwindow-default: #202020;}.notewidget-footer{--color-fg-default:#c9d1d9;--color-canvas-default:#202020;}::-webkit-scrollbar { width: 10px; height: 10px;}::-webkit-scrollbar-button {  background-color: #666; }::-webkit-scrollbar-track {  background-color: #202020;}::-webkit-scrollbar-track-piece { background-color: #000;}::-webkit-scrollbar-thumb { height: 50px; background-color: #666; border-radius: 3px;}::-webkit-scrollbar-corner { background-color: #202020;}::-webkit-resizer { background-color: #666;}";
+                    schemeStyleVar = "body{--color-previewwindow-default: #101010;}.markdown-body code {color: #d63384;font-size: .875em;}.notewidget-footer{--color-fg-default:#c9d1d9;--color-canvas-default:#202020;}::-webkit-scrollbar { width: 10px; height: 10px;}::-webkit-scrollbar-button {  background-color: #666; }::-webkit-scrollbar-track {  background-color: #202020;}::-webkit-scrollbar-track-piece { background-color: #000;}::-webkit-scrollbar-thumb { height: 50px; background-color: #666; border-radius: 3px;}::-webkit-scrollbar-corner { background-color: #202020;}::-webkit-resizer { background-color: #666;}";
                 }
                 else //Use System Settings
                 {
                     githubCssFileName = "github-markdown.min.css";
-                    schemeStyleVar = "@media (prefers-color-scheme: dark) {body{--color-previewwindow-default: #202020;}.notewidget-footer{--color-fg-default:#c9d1d9;--color-canvas-default:#0d1117;}::-webkit-scrollbar { width: 10px; height: 10px;}::-webkit-scrollbar-button {  background-color: #666; }::-webkit-scrollbar-track {  background-color: #202020;}::-webkit-scrollbar-track-piece { background-color: #000;}::-webkit-scrollbar-thumb { height: 50px; background-color: #666; border-radius: 3px;}::-webkit-scrollbar-corner { background-color: #202020;}::-webkit-resizer { background-color: #666;}}@media(prefers-color-scheme: light){body{--color-previewwindow-default: #ffffff;}.notewidget-footer{--color-fg-default:#24292f;--color-canvas-default:#ffffff}}";
+                    schemeStyleVar = "@media (prefers-color-scheme: dark) {body{--color-previewwindow-default: #202020;}.markdown-body code {color: #d63384;font-size: .875em;}.notewidget-footer{--color-fg-default:#c9d1d9;--color-canvas-default:#0d1117;}::-webkit-scrollbar { width: 10px; height: 10px;}::-webkit-scrollbar-button {  background-color: #666; }::-webkit-scrollbar-track {  background-color: #202020;}::-webkit-scrollbar-track-piece { background-color: #000;}::-webkit-scrollbar-thumb { height: 50px; background-color: #666; border-radius: 3px;}::-webkit-scrollbar-corner { background-color: #202020;}::-webkit-resizer { background-color: #666;}}@media(prefers-color-scheme: light){body{--color-previewwindow-default: #ffffff;}.notewidget-footer{--color-fg-default:#24292f;--color-canvas-default:#ffffff}}";
                 }
-                string schemeStyle = "<style>" + schemeStyleVar + "html,body{margin:0;flex-direction: column;background-color: var(--color-previewwindow-default) !important;height:100%;}#___markdown-content___ {padding: 10px !important;min-width:600px;}.notewidget-footer{bottom: 0px;width: 100%;text-align:center;color: var(--color-fg-default);background-color: var(--color-canvas-default);font-family: -apple-system,BlinkMacSystemFont,\"Segoe UI\",Helvetica,Arial,sans-serif,\"Apple Color Emoji\",\"Segoe UI Emoji\";font-size: 16px;line-height: 1.5;}</style>";
+                string schemeStyle = "<style>" + schemeStyleVar + "html,body{margin:0;flex-direction: column;background-color: var(--color-previewwindow-default) !important;height:100%;}.notewidget-footer{bottom: 0px;width: 100%;text-align:center;color: var(--color-fg-default);background-color: var(--color-canvas-default);font-family: -apple-system,BlinkMacSystemFont,\"Segoe UI\",Helvetica,Arial,sans-serif,\"Apple Color Emoji\",\"Segoe UI Emoji\";font-size: 16px;line-height: 1.5;}</style>";
 
                 string gitHubCssUrl;
                 if (ResourceType == TemplateResourceType.Local)
diff --git a/NoteWidgetAddIn/Markdown/HtmlTemplate.cs b/NoteWidgetAddIn/Markdown/HtmlTemplate.cs
@@ -22,15 +22,18 @@ static HtmlTemplate()
         <meta http-equiv=""X-UA-Compatible"" content=""IE=Edge"" />
         <meta charset=""utf-8"" />
         {{HeadContent}}
+        <style>.widget-container{min-width:1000px;}#___markdown-content___ {min-width:400px;max-width:900px;margin: 0 auto; padding:20px;}</style>
         <title>{{Title}}</title>
     </head>
     <body>
-        <div id=""___markdown-content___"" class=""markdown-body"">";
+        <div class=""widget-container"">
+        <div id=""___markdown-content___"" class=""markdown-body""><article>";
         private const string HTML_FOOT = @"
-        </div>        
+        </article></div>
         <footer class=""notewidget-footer"">
             <p>{{footer}}</p>
         </footer>
+        </div>
         {{FootContent}}
     </body>
 </html>
diff --git a/NoteWidgetAddIn/Model/NotePage.cs b/NoteWidgetAddIn/Model/NotePage.cs
@@ -159,44 +159,41 @@ private void AppendElementsInnerText(StringBuilder appender, XElement container)
             {
                 if (item.Name.LocalName == "Outline")
                 {
-                    foreach (var oe in item.Elements(Namespace + "OEChildren").Elements(Namespace + "OE"))
-                    {
-                        AppendElementsInnerText(appender, oe);
-                    }
+                    AppendElementsInnerText(appender, item.Element(Namespace + "OEChildren"));
                 }
                 else if (item.Name.LocalName == "Image")
                 {
                     var ni = new NoteImage(item);
                     //TODO: Large image (more than 2MB) should be saved to file, not embedded in html content.
                     appender.AppendLine($"![]({ni.ToBase64Image()})");
                 }
-                else if (item.Name.LocalName == "T")
-                {
-                    var tr = new NoteTextRange(item);
-                    appender.AppendLine(tr.InnerText);
-                }
                 else if (item.Name.LocalName == "Table" && item.Attribute("hasHeaderRow")?.Value == "false")
                 {
                     foreach(var oe in item.Descendants(Namespace + "OE"))
                     {
-                        AppendElementsInnerText(appender, oe);
-                    }
-                }
-                else if (item.Name.LocalName == "OEChildren")
-                {
-                    foreach (var oe in item.Elements(Namespace + "OE"))
-                    {
-                        if (oe.Elements(Namespace + "T").Count() > 0)
+                        if (item.Elements(Namespace + "T").Count() > 0)
                         {
-                            var tr = new NoteTextRange(new XElement(Namespace + "T", new XCData(oe.Value)));
+                            var tr = new NoteTextRange(new XElement(Namespace + "T", new XCData(item.Value)));
                             appender.AppendLine(tr.InnerText);
                         }
                         else
                         {
-                            AppendElementsInnerText(appender, oe);
+                            AppendElementsInnerText(appender, item);
                         }
                     }
                 }
+                else if (item.Name.LocalName == "OE")
+                {
+                    if (item.Elements(Namespace + "T").Count() > 0)
+                    {
+                        var tr = new NoteTextRange(new XElement(Namespace + "T", new XCData(item.Value)));
+                        appender.AppendLine(tr.InnerText);
+                    }
+                    else
+                    {
+                        AppendElementsInnerText(appender, item);
+                    }
+                }
                 
             }
         }
diff --git a/NoteWidgetAddIn/Properties/Settings.Designer.cs b/NoteWidgetAddIn/Properties/Settings.Designer.cs
diff --git a/NoteWidgetAddIn/Properties/Settings.settings b/NoteWidgetAddIn/Properties/Settings.settings
@@ -1,5 +1,5 @@
 ﻿<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="NoteWidget.AddIn.Properties" GeneratedClassName="Settings">
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="NoteWidgetAddIn.Properties" GeneratedClassName="Settings">
   <Profiles />
   <Settings>
     <Setting Name="Markdown_ColorScheme" Type="System.String" Scope="User">
@@ -23,5 +23,11 @@
     <Setting Name="Markdown_CheatSheet_Height" Type="System.Double" Scope="User">
       <Value Profile="(Default)">1000</Value>
     </Setting>
+    <Setting Name="Markdown_Preview_Left" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
+    <Setting Name="Markdown_Preview_Top" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">10</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/NoteWidgetAddIn/app.config b/NoteWidgetAddIn/app.config
@@ -2,10 +2,40 @@
 <configuration>
     <configSections>
         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+            <section name="NoteWidgetAddIn.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
             <section name="NoteWidget.AddIn.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
         </sectionGroup>
     </configSections>
     <userSettings>
+        <NoteWidgetAddIn.Properties.Settings>
+            <setting name="Markdown_ColorScheme" serializeAs="String">
+                <value>System</value>
+            </setting>
+            <setting name="Markdown_HighlightTheme" serializeAs="String">
+                <value>Default</value>
+            </setting>
+            <setting name="Markdown_Preview_Width" serializeAs="String">
+                <value>1200</value>
+            </setting>
+            <setting name="Markdown_Preview_Height" serializeAs="String">
+                <value>1000</value>
+            </setting>
+            <setting name="Markdown_Preview_Singleton" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="Markdown_CheatSheet_Width" serializeAs="String">
+                <value>1500</value>
+            </setting>
+            <setting name="Markdown_CheatSheet_Height" serializeAs="String">
+                <value>1000</value>
+            </setting>
+            <setting name="Markdown_Preview_Left" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="Markdown_Preview_Top" serializeAs="String">
+                <value>10</value>
+            </setting>
+        </NoteWidgetAddIn.Properties.Settings>
         <NoteWidget.AddIn.Properties.Settings>
             <setting name="Markdown_ColorScheme" serializeAs="String">
                 <value>System</value>
diff --git a/NoteWidgetTests/DummyData/PageWithCursor.xml b/NoteWidgetTests/DummyData/PageWithCursor.xml
@@ -0,0 +1,28 @@
+<one:Page xmlns:one="http://schemas.microsoft.com/office/onenote/2013/onenote" ID="{63DEAA34-59B6-4241-8D4D-DDE122531ABA}{1}{E1957636351534941033821993164913069263156761}" name="Diagram" dateTime="2022-01-19T14:35:06.000Z" lastModifiedTime="2022-01-20T05:43:55.000Z" pageLevel="1" isCurrentlyViewed="true" selected="partial" lang="en-US">
+  <one:QuickStyleDef index="0" name="PageTitle" fontColor="automatic" highlightColor="automatic" font="Microsoft YaHei UI" fontSize="20.0" spaceBefore="0.0" spaceAfter="0.0" />
+  <one:QuickStyleDef index="1" name="p" fontColor="automatic" highlightColor="automatic" font="Microsoft YaHei UI" fontSize="12.0" spaceBefore="0.0" spaceAfter="0.0" />
+  <one:PageSettings RTL="false" color="automatic">
+    <one:PageSize>
+      <one:Automatic />
+    </one:PageSize>
+    <one:RuleLines visible="false" />
+  </one:PageSettings>
+  <one:Title lang="en-US">
+    <one:OE author="efrey kong" authorInitials="EK" lastModifiedBy="efrey kong" lastModifiedByInitials="EK" creationTime="2022-01-19T14:35:07.000Z" lastModifiedTime="2022-01-19T14:35:09.000Z" objectID="{5E565245-3EBA-46A3-8145-326508E77C77}{15}{B0}" alignment="left" quickStyleIndex="0" style="font-family:Calibri;font-size:20.0pt">
+      <one:T><![CDATA[Diagram]]></one:T>
+    </one:OE>
+  </one:Title>
+<one:Outline selected="partial" author="efrey kong" authorInitials="EK" lastModifiedBy="efrey kong" lastModifiedByInitials="EK" lastModifiedTime="2022-01-20T05:43:55.000Z" objectID="{2E610147-F123-4FE7-AFC6-E74AA12ACFE8}{61}{B0}">
+<one:Position x="36.0" y="86.4000015258789" z="0" />
+    <one:Size width="244.4419555664062" height="293.8119812011719" />
+    <one:OEChildren selected="partial">
+    <one:OE creationTime="2022-01-19T15:47:53.000Z" lastModifiedTime="2022-01-19T15:47:53.000Z" objectID="{8B9C63D8-7B85-47C3-BC3A-FC37AF064787}{34}{B0}" alignment="left" quickStyleIndex="1" selected="partial" style="font-family:Calibri;font-size:12.0pt;color:#1B1B2E" lang="zh-CN">
+        <one:T><![CDATA[<span
+style='background:#F8F8F8'>    A[Square Rect] -- L</span>]]></one:T>
+        <one:T selected="all"><![CDATA[]]></one:T>
+        <one:T><![CDATA[<span
+style='background:#F8F8F8'>ink text --&gt; B((Circle))</span>]]></one:T>
+      </one:OE>
+    </one:OEChildren>
+  </one:Outline>
+</one:Page>
diff --git a/NoteWidgetTests/MarkdownTest.cs b/NoteWidgetTests/MarkdownTest.cs
@@ -54,5 +54,21 @@ public void TestTemplateToHtml()
             }
             Assert.IsTrue(System.IO.File.Exists(filePath));
         }
+        [TestMethod]
+        public async Task TestWebView2()
+        {
+            var browser = new WebBrowserWindow();
+            browser.BrowserHtmlContent = "<html><head></head><body><div id=\"content\"><span>Hello world!</span></div></body></html>";
+            browser.webBrowser.NavigationCompleted += async delegate {
+                var result = await browser.webBrowser.ExecuteScriptAsync("document.getElementById('content').innerHTML;");
+                Console.WriteLine(result);
+                await browser.webBrowser.ExecuteScriptAsync("document.getElementById('content').outerHTML = '<span>I am changed</span>';");
+            };
+
+            browser.Show();
+            var app = new System.Windows.Application();
+            app.MainWindow = browser;
+            app.Run();
+        }
     }
 }
diff --git a/NoteWidgetTests/NoteWidgetTests.csproj b/NoteWidgetTests/NoteWidgetTests.csproj
@@ -58,6 +58,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1072.54" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
     <PackageReference Include="coverlet.collector" Version="3.1.0" />
@@ -84,6 +85,9 @@
     <None Update="DummyData\PageHierarchy.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="DummyData\PageWithCursor.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="DummyData\SectionGroupHierarchy.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
diff --git a/NoteWidgetTests/UtilTests.cs b/NoteWidgetTests/UtilTests.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
+using System.Xml.Linq;
 
 namespace NoteWidgetAddIn
 {
@@ -29,5 +30,43 @@ public void TestAvailableExportFormats()
             formats = ExportHelper.GetAvailableExportFormats(Model.NodeType.Section);
             Assert.IsTrue(formats.Length == 6);
         }
+
+        [TestMethod]
+        public void TestXDocument()
+        {
+            var xml = $@"<?xml version=""1.0"" encoding=""utf-8""?>
+<package xmlns=""http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd"">
+  <metadata>
+    <id>Markdig</id>
+    <version>0.27.0</version>
+    <authors>Alexandre Mutel</authors>
+    <license type=""expression"">BSD-2-Clause</license>
+    <licenseUrl>https://licenses.nuget.org/BSD-2-Clause</licenseUrl>
+    <icon>markdig.png</icon>
+    <readme>readme.md</readme>
+    <projectUrl>https://github.com/lunet-io/markdig</projectUrl>
+    <description>A fast, powerful, CommonMark compliant, extensible Markdown processor for .NET with 20+ builtin extensions (pipetables, footnotes, definition lists... etc.)</description>
+    <releaseNotes>https://github.com/lunet-io/markdig/blob/master/changelog.md</releaseNotes>
+    <copyright>Alexandre Mutel</copyright>
+    <tags>Markdown CommonMark md html md2html</tags>
+    <repository type=""git"" url=""https://github.com/xoofx/markdig"" commit=""5e3527b7d2c103eef66834177e63565089af9534"" />
+    <dependencies>
+      <group targetFramework="".NETFramework4.5.2"">
+        <dependency id=""System.Memory"" version=""4.5.4"" exclude=""Build,Analyzers"" />
+      </group>
+      <group targetFramework="".NETCoreApp2.1"" />
+      <group targetFramework="".NETCoreApp3.1"" />
+      <group targetFramework="".NETStandard2.0"">
+        <dependency id=""System.Memory"" version=""4.5.4"" exclude=""Build,Analyzers"" />
+      </group>
+      <group targetFramework="".NETStandard2.1"" />
+    </dependencies>
+  </metadata>
+</package>";
+            var xe = XElement.Parse(xml);
+            var ns = xe.Name.Namespace;
+            Console.WriteLine(xe.Element(ns + "metadata").Value);
+            Console.WriteLine(xe.Element(ns + "metadata").Element(ns + "id").Value);
+        }
     }
 }
diff --git a/README.MD b/README.MD
diff --git a/commonmark.png b/commonmark.png
diff --git a/diagram-pie.png b/diagram-pie.png
diff --git a/java-code-highlight.png b/java-code-highlight.png

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+Git remote:`
	`2`	`+ "origin": github.com`
	`3`	`+ "gitee": gitee.com`
Original file line number	Diff line number	Diff line change
`@@ -27,14 +27,14 @@ public void Render(HtmlTemplate template)`
`27`	`27`	`else if (ColorScheme == ColorScheme.Dark)`
`28`	`28`	`{`
`29`	`29`	`githubCssFileName = "github-markdown-dark.css";`
`30`		- schemeStyleVar = "body{--color-previewwindow-default: #202020;}.notewidget-footer{--color-fg-default:#c9d1d9;--color-canvas-default:#202020;}::-webkit-scrollbar { width: 10px; height: 10px;}::-webkit-scrollbar-button { background-color: #666; }::-webkit-scrollbar-track { background-color: #202020;}::-webkit-scrollbar-track-piece { background-color: #000;}::-webkit-scrollbar-thumb { height: 50px; background-color: #666; border-radius: 3px;}::-webkit-scrollbar-corner { background-color: #202020;}::-webkit-resizer { background-color: #666;}";
	`30`	+ schemeStyleVar = "body{--color-previewwindow-default: #101010;}.markdown-body code {color: #d63384;font-size: .875em;}.notewidget-footer{--color-fg-default:#c9d1d9;--color-canvas-default:#202020;}::-webkit-scrollbar { width: 10px; height: 10px;}::-webkit-scrollbar-button { background-color: #666; }::-webkit-scrollbar-track { background-color: #202020;}::-webkit-scrollbar-track-piece { background-color: #000;}::-webkit-scrollbar-thumb { height: 50px; background-color: #666; border-radius: 3px;}::-webkit-scrollbar-corner { background-color: #202020;}::-webkit-resizer { background-color: #666;}";
`31`	`31`	`}`
`32`	`32`	`else //Use System Settings`
`33`	`33`	`{`
`34`	`34`	`githubCssFileName = "github-markdown.min.css";`
`35`		- schemeStyleVar = "@media (prefers-color-scheme: dark) {body{--color-previewwindow-default: #202020;}.notewidget-footer{--color-fg-default:#c9d1d9;--color-canvas-default:#0d1117;}::-webkit-scrollbar { width: 10px; height: 10px;}::-webkit-scrollbar-button { background-color: #666; }::-webkit-scrollbar-track { background-color: #202020;}::-webkit-scrollbar-track-piece { background-color: #000;}::-webkit-scrollbar-thumb { height: 50px; background-color: #666; border-radius: 3px;}::-webkit-scrollbar-corner { background-color: #202020;}::-webkit-resizer { background-color: #666;}}@media(prefers-color-scheme: light){body{--color-previewwindow-default: #ffffff;}.notewidget-footer{--color-fg-default:#24292f;--color-canvas-default:#ffffff}}";
	`35`	+ schemeStyleVar = "@media (prefers-color-scheme: dark) {body{--color-previewwindow-default: #202020;}.markdown-body code {color: #d63384;font-size: .875em;}.notewidget-footer{--color-fg-default:#c9d1d9;--color-canvas-default:#0d1117;}::-webkit-scrollbar { width: 10px; height: 10px;}::-webkit-scrollbar-button { background-color: #666; }::-webkit-scrollbar-track { background-color: #202020;}::-webkit-scrollbar-track-piece { background-color: #000;}::-webkit-scrollbar-thumb { height: 50px; background-color: #666; border-radius: 3px;}::-webkit-scrollbar-corner { background-color: #202020;}::-webkit-resizer { background-color: #666;}}@media(prefers-color-scheme: light){body{--color-previewwindow-default: #ffffff;}.notewidget-footer{--color-fg-default:#24292f;--color-canvas-default:#ffffff}}";
`36`	`36`	`}`
`37`		- string schemeStyle = "<style>" + schemeStyleVar + "html,body{margin:0;flex-direction: column;background-color: var(--color-previewwindow-default) !important;height:100%;}#___markdown-content___ {padding: 10px !important;min-width:600px;}.notewidget-footer{bottom: 0px;width: 100%;text-align:center;color: var(--color-fg-default);background-color: var(--color-canvas-default);font-family: -apple-system,BlinkMacSystemFont,\"Segoe UI\",Helvetica,Arial,sans-serif,\"Apple Color Emoji\",\"Segoe UI Emoji\";font-size: 16px;line-height: 1.5;}</style>";
	`37`	`+ string schemeStyle = "<style>" + schemeStyleVar + "html,body{margin:0;flex-direction: column;background-color: var(--color-previewwindow-default) !important;height:100%;}.notewidget-footer{bottom: 0px;width: 100%;text-align:center;color: var(--color-fg-default);background-color: var(--color-canvas-default);font-family: -apple-system,BlinkMacSystemFont,\"Segoe UI\",Helvetica,Arial,sans-serif,\"Apple Color Emoji\",\"Segoe UI Emoji\";font-size: 16px;line-height: 1.5;}</style>";`
`38`	`38`
`39`	`39`	`string gitHubCssUrl;`
`40`	`40`	`if (ResourceType == TemplateResourceType.Local)`
Original file line number	Diff line number	Diff line change
`@@ -159,44 +159,41 @@ private void AppendElementsInnerText(StringBuilder appender, XElement container)`
`159`	`159`	`{`
`160`	`160`	`if (item.Name.LocalName == "Outline")`
`161`	`161`	`{`
`162`		`- foreach (var oe in item.Elements(Namespace + "OEChildren").Elements(Namespace + "OE"))`
`163`		`- {`
`164`		`- AppendElementsInnerText(appender, oe);`
`165`		`- }`
	`162`	`+ AppendElementsInnerText(appender, item.Element(Namespace + "OEChildren"));`
`166`	`163`	`}`
`167`	`164`	`else if (item.Name.LocalName == "Image")`
`168`	`165`	`{`
`169`	`166`	`var ni = new NoteImage(item);`
`170`	`167`	`//TODO: Large image (more than 2MB) should be saved to file, not embedded in html content.`
`171`	`168`	`appender.AppendLine($"![]({ni.ToBase64Image()})");`
`172`	`169`	`}`
`173`		`- else if (item.Name.LocalName == "T")`
`174`		`- {`
`175`		`- var tr = new NoteTextRange(item);`
`176`		`- appender.AppendLine(tr.InnerText);`
`177`		`- }`
`178`	`170`	`else if (item.Name.LocalName == "Table" && item.Attribute("hasHeaderRow")?.Value == "false")`
`179`	`171`	`{`
`180`	`172`	`foreach(var oe in item.Descendants(Namespace + "OE"))`
`181`	`173`	`{`
`182`		`- AppendElementsInnerText(appender, oe);`
`183`		`- }`
`184`		`- }`
`185`		`- else if (item.Name.LocalName == "OEChildren")`
`186`		`- {`
`187`		`- foreach (var oe in item.Elements(Namespace + "OE"))`
`188`		`- {`
`189`		`- if (oe.Elements(Namespace + "T").Count() > 0)`
	`174`	`+ if (item.Elements(Namespace + "T").Count() > 0)`
`190`	`175`	`{`
`191`		`- var tr = new NoteTextRange(new XElement(Namespace + "T", new XCData(oe.Value)));`
	`176`	`+ var tr = new NoteTextRange(new XElement(Namespace + "T", new XCData(item.Value)));`
`192`	`177`	`appender.AppendLine(tr.InnerText);`
`193`	`178`	`}`
`194`	`179`	`else`
`195`	`180`	`{`
`196`		`- AppendElementsInnerText(appender, oe);`
	`181`	`+ AppendElementsInnerText(appender, item);`
`197`	`182`	`}`
`198`	`183`	`}`
`199`	`184`	`}`
	`185`	`+ else if (item.Name.LocalName == "OE")`
	`186`	`+ {`
	`187`	`+ if (item.Elements(Namespace + "T").Count() > 0)`
	`188`	`+ {`
	`189`	`+ var tr = new NoteTextRange(new XElement(Namespace + "T", new XCData(item.Value)));`
	`190`	`+ appender.AppendLine(tr.InnerText);`
	`191`	`+ }`
	`192`	`+ else`
	`193`	`+ {`
	`194`	`+ AppendElementsInnerText(appender, item);`
	`195`	`+ }`
	`196`	`+ }`
`200`	`197`
`201`	`198`	`}`
`202`	`199`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,5 +54,21 @@ public void TestTemplateToHtml()`
`54`	`54`	`}`
`55`	`55`	`Assert.IsTrue(System.IO.File.Exists(filePath));`
`56`	`56`	`}`
	`57`	`+ [TestMethod]`
	`58`	`+ public async Task TestWebView2()`
	`59`	`+ {`
	`60`	`+ var browser = new WebBrowserWindow();`
	`61`	`+ browser.BrowserHtmlContent = "<html><head></head><body><div id=\"content\"><span>Hello world!</span></div></body></html>";`
	`62`	`+ browser.webBrowser.NavigationCompleted += async delegate {`
	`63`	`+ var result = await browser.webBrowser.ExecuteScriptAsync("document.getElementById('content').innerHTML;");`
	`64`	`+ Console.WriteLine(result);`
	`65`	`+ await browser.webBrowser.ExecuteScriptAsync("document.getElementById('content').outerHTML = '<span>I am changed</span>';");`
	`66`	`+ };`
	`67`	`+`
	`68`	`+ browser.Show();`
	`69`	`+ var app = new System.Windows.Application();`
	`70`	`+ app.MainWindow = browser;`
	`71`	`+ app.Run();`
	`72`	`+ }`
`57`	`73`	`}`
`58`	`74`	`}`