diff --git a/Contentstack.Utils.Tests/Constants/JsonToHtmlConstants.cs b/Contentstack.Utils.Tests/Constants/JsonToHtmlConstants.cs index d4abe37..061336e 100644 --- a/Contentstack.Utils.Tests/Constants/JsonToHtmlConstants.cs +++ b/Contentstack.Utils.Tests/Constants/JsonToHtmlConstants.cs @@ -4,21 +4,21 @@ public static class JsonToHtmlResultConstants { public const string kPlainTextHtml = "Aliquam sit amet libero dapibus, eleifend ligula at, varius justoLorem ipsumdolor sit ametconsectetur adipiscing elit.Sed condimentum iaculis magna in vehicula. Vestibulum vitae convallis lacus. "; public const string kParagraphHtml = "

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed condimentum iaculis magna in vehicula. Vestibulum vitae convallis lacus. Praesent a diam iaculis turpis rhoncus faucibus. Aliquam sed pulvinar sem.

"; - public const string kH1Html = "

Lorem ipsum dolor sit amet.

"; + public const string kH1Html = "

Lorem ipsum dolor sit amet.

"; public const string kH2Html = "

Vestibulum a ligula eget massa sagittis aliquam sit amet quis tortor.

"; public const string kH3Html = "

Mauris venenatis dui id massa sollicitudin, non bibendum nunc dictum.

"; public const string kH4Html = "

MaNullam feugiat turpis quis elit interdum, vitae laoreet quam viverra

"; public const string kH5Html = "
Mauris venenatis dui id massa sollicitudin, non bibendum nunc dictum.
"; public const string kH6Html = "
Nunc porta diam vitae purus semper, ut consequat lorem vehicula.
"; - public const string kOrderListHtml = "
  1. Morbi in quam molestie, fermentum diam vitae, bibendum ipsum.
  2. Pellentesque mattis lacus in quam aliquam congue
  3. Integer feugiat leo dignissim, lobortis enim vitae, mollis lectus.
  4. Sed in ante lacinia, molestie metus eu, fringilla sapien.
"; + public const string kOrderListHtml = "
  1. Morbi in quam molestie, fermentum diam vitae, bibendum ipsum.
  2. Pellentesque mattis lacus in quam aliquam congue
  3. Integer feugiat leo dignissim, lobortis enim vitae, mollis lectus.
  4. Sed in ante lacinia, molestie metus eu, fringilla sapien.
"; public const string kIUnorderListHtml = ""; public const string kImgHtml = ""; public const string kTableHtml = "

Header 1

Header 2

Body row 1 data 1

Body row 1 data 2

Body row 2 data 1

Body row 2 data 2

"; public const string kBlockquoteHtml = "
Praesent eu ex sed nibh venenatis pretium.
"; public const string kCodeHtml = "Code template."; - public const string kLinkInPHtml = "

LINK

"; - public const string kLinkInPMailToHtml = "

LINK

"; - public const string kLinkInPMailToTARGEtHtml = "

LINK

"; + public const string kLinkInPHtml = "

LINK

"; + public const string kLinkInPMailToHtml = "

LINK

"; + public const string kLinkInPMailToTARGEtHtml = "

LINK

"; public const string kEmbedHtml = ""; } diff --git a/Contentstack.Utils.Tests/Contentstack.Utils.Tests.csproj b/Contentstack.Utils.Tests/Contentstack.Utils.Tests.csproj index 59c0d34..45ab904 100644 --- a/Contentstack.Utils.Tests/Contentstack.Utils.Tests.csproj +++ b/Contentstack.Utils.Tests/Contentstack.Utils.Tests.csproj @@ -1,21 +1,22 @@ - netstandard2.0;net47;net472; + net7.0 false $(Version) - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Contentstack.Utils/Models/Options.cs b/Contentstack.Utils/Models/Options.cs index d8561e7..9f741ab 100644 --- a/Contentstack.Utils/Models/Options.cs +++ b/Contentstack.Utils/Models/Options.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using Contentstack.Utils.Enums; using Contentstack.Utils.Interfaces; +using Newtonsoft.Json.Linq; namespace Contentstack.Utils.Models { @@ -101,9 +102,10 @@ public virtual string RenderNode(string nodeType, Node node, NodeChildrenCallBac { styleAttrs = $" style=\"{styleVal}\""; } - else if (styleVal is IDictionary) + else if (styleVal is JObject) { - var styleDictionary = (IDictionary)styleVal; + var styleObject = (JObject)styleVal; + var styleDictionary = styleObject.ToObject>(); styleAttrs = " style=\""; foreach (var pair in styleDictionary) {