merged changes

pimcore · Nov 21, 2024 · 6b3ab68 · 6b3ab68
1 parent f5d8983
commit 6b3ab68
Show file tree

Hide file tree

Showing 4 changed files with 1,758 additions and 2 deletions.
diff --git a/assets/js/src/core/components/sanitize-html/sanitize-html.tsx b/assets/js/src/core/components/sanitize-html/sanitize-html.tsx
@@ -23,7 +23,7 @@ export const SanitizeHtml = ({ html, options }: SanitizeHtmlProps): React.JSX.El
   let cleanHtml: string
 
   if (options !== undefined) {
-    cleanHtml = DOMPurify.sanitize(html, options) as string
+    cleanHtml = DOMPurify.sanitize(html, options)
   } else {
     cleanHtml = DOMPurify.sanitize(html)
   }

diff --git a/...c-types/defintinitions/objects/data-related/types/dynamic-type-object-data-rgba-color.tsx b/...c-types/defintinitions/objects/data-related/types/dynamic-type-object-data-rgba-color.tsx
@@ -24,7 +24,7 @@ export type RgbaColorObjectDataDefinition = AbstractObjectDataDefinition & {
 }
 
 const formatColor = (color: Color): string | null | false => {
-  return color.cleared === true || color.cleared === 'controlled'
+  return color.cleared || color.cleared === 'controlled'
     ? null
     : color.toHexString()
 }

diff --git a/public/build/6be103bc-38d3-4c02-98eb-5b910e346bd2/entrypoints.json b/public/build/6be103bc-38d3-4c02-98eb-5b910e346bd2/entrypoints.json
@@ -0,0 +1,14 @@
+{
+  "entrypoints": {
+    "main": {
+      "css": [
+        "http://localhost:3030/build/6be103bc-38d3-4c02-98eb-5b910e346bd2/vendors-node_modules_dnd-kit_modifiers_dist_modifiers_esm_js-node_modules_dnd-kit_sortable_di-942968.css",
+        "http://localhost:3030/build/6be103bc-38d3-4c02-98eb-5b910e346bd2/main.css"
+      ],
+      "js": [
+        "http://localhost:3030/build/6be103bc-38d3-4c02-98eb-5b910e346bd2/vendors-node_modules_dnd-kit_modifiers_dist_modifiers_esm_js-node_modules_dnd-kit_sortable_di-942968.js",
+        "http://localhost:3030/build/6be103bc-38d3-4c02-98eb-5b910e346bd2/main.js"
+      ]
+    }
+  }
+}