[3.21] Upgrade macaw-ui-next and fix EditorJS list conversion

package.json

@@ -40,7 +40,7 @@
     "@radix-ui/react-radio-group": "^1.2.3",
     "@reach/auto-id": "^0.16.0",
     "@saleor/macaw-ui": "npm:@saleor/macaw-ui@0.7.4",
-    "@saleor/macaw-ui-next": "npm:@saleor/macaw-ui@1.1.19",
+    "@saleor/macaw-ui-next": "npm:@saleor/macaw-ui@1.3.5",
     "@saleor/sdk": "0.6.0",
     "@sentry/react": "^8.21.0",
     "@sentry/vite-plugin": "^2.21.1",

src/components/FilterPresetsSelect/FilterPresetItem.tsx

@@ -49,6 +49,7 @@ export const FilterPresetItem = ({
           >
             <RemoveIcon
               data-test-id="preset-delete-button"
+              // @ts-expect-error - check why style is not accepted in types, but can be used
               color={{
                 default: "default2",
                 hover: "default1",

src/components/RichTextEditor/ReactEditorJS.tsx

@@ -7,6 +7,8 @@ import {
 } from "@react-editor-js/core";
 import React from "react";
 
+import { convertEditorJSListBlocks } from "./utils";
+
 // Source of @react-editor-js
 class ClientEditorCore implements EditorCore {
   private readonly _editorJS: EditorJS;
@@ -27,14 +29,24 @@ class ClientEditorCore implements EditorCore {
     });
   }
 
+  /**
+   * This property is required by the EditorCore interface to optionally expose
+   * the underlying Editor.js instance for advanced use cases. In this implementation,
+   * we intentionally do not expose the low-level instance to maintain encapsulation
+   * and prevent unsafe direct access. Therefore, this always returns null.
+   */
+  get dangerouslyLowLevelInstance(): any | null {
+    return null;
+  }
+
   public async clear() {
     await this._editorJS.clear();
   }
 
   public async save() {
     await this._editorJS.isReady;
 
-    return this._editorJS.save();
+    return convertEditorJSListBlocks(await this._editorJS.save());
   }
 
   public async destroy() {

src/components/RichTextEditor/RichTextEditor.tsx

@@ -10,7 +10,6 @@ import { tools } from "./consts";
 import { useHasRendered, useUpdateOnRerender } from "./hooks";
 import { ReactEditorJS } from "./ReactEditorJS";
 import useStyles from "./styles";
-import { convertEditorJSListBlocks } from "./utils";
 
 export type EditorJsProps = Omit<ReactEditorJSProps, "factory">;
 
@@ -106,7 +105,7 @@ const RichTextEditor: React.FC<RichTextEditorProps> = ({
 
             setHasValue(editorJsValue.blocks.length > 0);
 
-            return onChange?.(convertEditorJSListBlocks(editorJsValue));
+            return onChange?.(editorJsValue);
           }}
           {...props}
         >

src/utils/richText/useRichText.ts

@@ -1,4 +1,3 @@
-import { convertEditorJSListBlocks } from "@dashboard/components/RichTextEditor/utils";
 import { OutputData } from "@editorjs/editorjs";
 import { EditorCore } from "@react-editor-js/core";
 import { MutableRefObject, useMemo, useRef, useState } from "react";
@@ -34,9 +33,7 @@ export function useRichText({
     if (editorRef.current) {
       setIsDirty(false);
 
-      const convertedOutputData = convertEditorJSListBlocks(await editorRef.current.save());
-
-      return convertedOutputData;
+      return editorRef.current.save();
     } else {
       throw new Error("Editor instance is not available");
     }