@colisweb/rescript-toolkit 2.8.2 → 2.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "2.8.2",
+  "version": "2.9.0",
   "scripts": {
     "clean": "rescript clean",
     "build": "rescript build",
@@ -55,6 +55,7 @@
     "postcss-loader": "4.2.0",
     "postcss-preset-env": "6.7.0",
     "prismjs": "1.25.0",
+    "react-datepicker": "3.8.0",
     "react-icons": "4.3.1",
     "react-select": "5.2.1",
     "react-table": "7.7.0",
@@ -67,12 +68,11 @@
     "rescript-logger": "2.0.2",
     "rescript-react-update": "5.0.0",
     "restorative": "0.4.0-beta.1",
+    "sanitize-html": "2.6.1",
     "swr": "1.1.1",
-    "tailwindcss": "3.0.2",
-    "react-datepicker": "3.8.0"
+    "tailwindcss": "3.0.2"
   },
   "devDependencies": {
-    "highlight.js": "11.3.1",
     "@babel/core": "7.16.5",
     "@storybook/addon-actions": "6.1.21",
     "@storybook/addon-essentials": "6.1.21",
@@ -82,6 +82,7 @@
     "@storybook/react": "6.1.21",
     "@storybook/theming": "6.1.21",
     "babel-loader": "8.2.3",
+    "highlight.js": "11.3.1",
     "raw-loader": "4.0.2",
     "react": "17.0.2",
     "react-dom": "17.0.2",

package/src/request/Toolkit__Request.res

@@ -54,13 +54,18 @@ let toResult = (
     | Ok(response) =>
       switch response["data"]->mapData {
       | Ok(_) as ok => ok
-      | Error(error) =>
-        Error(
-          #invalidResponseData(
-            response->castToUndecodedResponse,
-            "\"" ++ (error.path ++ ("\" " ++ error.message)),
-          ),
-        )
+      | Error(error) => {
+          %log.error(
+            "Decoder failure"
+            ("err", error)
+          )
+          Error(
+            #invalidResponseData(
+              response->castToUndecodedResponse,
+              "\"" ++ (error.path ++ ("\" " ++ error.message)),
+            ),
+          )
+        }
       }
     | Error(error) =>
       if (error->castToJs)["response"] {

package/src/tailwind/tailwind.config.js

@@ -11,8 +11,7 @@ module.exports = {
       },
       boxShadow: {
         sidenav: "inset 0 0 1px 2px rgba(0, 0, 0, 0.2)",
-        sm:
-          "0px 2px 1px -1px rgba(0,0,0,0.1), 0px 1px 1px 0px rgba(0,0,0,0.1), 0px 1px 3px 0px rgba(0,0,0,0.1)",
+        sm: "0px 2px 1px -1px rgba(0,0,0,0.1), 0px 1px 1px 0px rgba(0,0,0,0.1), 0px 1px 3px 0px rgba(0,0,0,0.1)",
       },
       borderColor: {
         currentColor: "currentColor",
@@ -142,7 +141,7 @@ module.exports = {
       purple: {
         50: "#F8F1FF",
         100: "#DDC8F0",
-        300: "#8787E0",
+        300: "#B787E0",
         400: "#9151C9",
         500: "#6C1CB2",
         600: "#55158B",

package/src/ui/Toolkit__Ui_RichText.res

@@ -1,7 +1,22 @@
 let transformUrl = text =>
   text |> Js.String.unsafeReplaceBy0(%re("/(https?:\\/\\/[^\\s]+)/g"), (url, _, _) =>
-    j`<a target='_blank' class='text-blue-500 underline' href="$url">$url</a>`
+    j`<a target='_blank' class='text-info-500 underline' href="$url">$url</a>`
   )
 
+@module("sanitize-html")
+external sanitizeHtml: (string, Js.t<'a>) => string = "default"
+
 @react.component
-let make = (~text) => <span dangerouslySetInnerHTML={"__html": text->transformUrl} />
+let make = (~text) =>
+  <span
+    dangerouslySetInnerHTML={
+      "__html": text
+      ->sanitizeHtml({
+        "allowedTags": ["a"],
+        "allowedAttributes": {
+          "a": ["href"],
+        },
+      })
+      ->transformUrl,
+    }
+  />

package/src/vendors/BsReactIcons.res

@@ -5893,3 +5893,9 @@ module FaFilter = {
   external make: (~size: int=?, ~color: string=?, ~className: string=?) => React.element =
     "FaFilter"
 }
+
+module IoIosCloseCircle = {
+  @module("react-icons/io") @react.component
+  external make: (~size: int=?, ~color: string=?, ~className: string=?) => React.element =
+    "IoIosCloseCircle"
+}