Merge branch 'dev' into chore/contracts-0.8-upgrade

Author: jaybuidl

.yarn/releases/yarn-4.6.0.cjs renamed to .yarn/releases/yarn-4.8.1.cjs

@@ -2,14 +2,14 @@ compressionLevel: mixed
 
 enableGlobalCache: false
 
-nodeLinker: node-modules
+logFilters:
+  - level: discard
+    pattern: "*(pde6dc), which doesn't satisfy what react-scripts*"
+  - level: discard
+    pattern: "*(p6f2bc), which doesn't satisfy what react-identicons*"
+  - level: discard
+    pattern: "*(pca8b0), which doesn't satisfy what react-identicons*"
 
-yarnPath: .yarn/releases/yarn-4.6.0.cjs
+nodeLinker: node-modules
 
-logFilters:
-  - pattern: "*(pde6dc), which doesn't satisfy what react-scripts*"
-    level: discard
-  - pattern: "*(p6f2bc), which doesn't satisfy what react-identicons*"
-    level: discard
-  - pattern: "*(pca8b0), which doesn't satisfy what react-identicons*"
-    level: discard
+yarnPath: .yarn/releases/yarn-4.8.1.cjs

.yarnrc.yml

@@ -90,6 +90,7 @@
     "eslint": "^9.15.0",
     "ethereumjs-util": "^7.1.5",
     "ethers": "^6.13.5",
+    "gluegun": "^5.2.0",
     "graphql": "^16.9.0",
     "graphql-request": "^7.1.2",
     "hardhat": "2.22.19",

contracts/package.json

@@ -27,10 +27,10 @@
     "tsconfig",
     "kleros-app"
   ],
-  "packageManager": "yarn@4.6.0",
+  "packageManager": "yarn@4.8.1",
   "volta": {
     "node": "20.18.3",
-    "yarn": "4.6.0"
+    "yarn": "4.8.1"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.8.1",
@@ -75,7 +75,8 @@
     "@openzeppelin/contracts-upgradeable@npm:4.8.3": "npm:4.9.6",
     "@openzeppelin/contracts-upgradeable@npm:4.9.3": "npm:4.9.6",
     "elliptic@npm:6.5.4": "npm:6.6.1",
-    "word-wrap@npm:~1.2.3": "npm:1.2.5"
+    "word-wrap@npm:~1.2.3": "npm:1.2.5",
+    "@codemirror/state": "npm:6.5.2"
   },
   "scripts": {
     "check-prerequisites": "scripts/check-prerequisites.sh",

package.json

@@ -47,6 +47,7 @@
     "typescript": "^5.6.3"
   },
   "dependencies": {
+    "@codemirror/state": "^6.5.2",
     "@coinbase/wallet-sdk": "^4.3.2",
     "@kleros/kleros-sdk": "workspace:^",
     "@kleros/kleros-v2-contracts": "workspace:^",
@@ -69,7 +70,7 @@
     "react-use": "^17.5.1",
     "styled-components": "^5.3.3",
     "typewriter-effect": "^2.21.0",
-    "vanilla-jsoneditor": "^0.23.0",
+    "vanilla-jsoneditor": "^3.3.1",
     "viem": "^2.24.1",
     "wagmi": "^2.14.15"
   }

web-devtools/package.json

@@ -1,7 +1,11 @@
 import React, { useEffect, useRef } from "react";
 import styled, { css } from "styled-components";
 
-import { JSONEditor as Editor } from "vanilla-jsoneditor";
+import {
+  createJSONEditor,
+  type JSONEditorPropsOptional,
+  type JsonEditor as VanillaJsonEditor,
+} from "vanilla-jsoneditor";
 
 import { landscapeStyle } from "styles/landscapeStyle";
 
@@ -35,14 +39,13 @@ const Container = styled.div`
 
 const JSONEditor = (props: any) => {
   const refContainer = useRef<HTMLDivElement | null>(null);
-  const refEditor = useRef<Editor | null>(null);
+  const refEditor = useRef<VanillaJsonEditor | null>(null);
+  const refPrevProps = useRef<JSONEditorPropsOptional>(props);
 
   useEffect(() => {
-    refEditor.current = new Editor({
-      target: refContainer.current!,
-      props: {
-        ...props,
-      },
+    refEditor.current = createJSONEditor({
+      target: refContainer.current as HTMLDivElement,
+      props,
     });
 
     return () => {
@@ -53,12 +56,25 @@ const JSONEditor = (props: any) => {
     };
   }, []);
 
+  // update props
   useEffect(() => {
     if (refEditor.current) {
-      refEditor.current.updateProps(props);
+      const changedProps = filterUnchangedProps(props, refPrevProps.current);
+      refEditor.current.updateProps(changedProps);
+      refPrevProps.current = props;
     }
   }, [props]);
 
   return <Container ref={refContainer} className={props.className}></Container>;
 };
+
+function filterUnchangedProps(
+  props: JSONEditorPropsOptional,
+  prevProps: JSONEditorPropsOptional
+): JSONEditorPropsOptional {
+  return Object.fromEntries(
+    Object.entries(props).filter(([key, value]) => value !== prevProps[key as keyof JSONEditorPropsOptional])
+  );
+}
+
 export default JSONEditor;