Merge master into hflatval/update-release-instructions

cognitedata · Jun 24, 2024 · 60aaf5c · 60aaf5c
2 parents 74738fd + ac73823
commit 60aaf5c
Show file tree

Hide file tree

Showing 26 changed files with 909 additions and 732 deletions.
diff --git a/documentation/package.json b/documentation/package.json
@@ -47,7 +47,7 @@
     "typedoc": "0.25.13",
     "typedoc-plugin-markdown": "3.17.1",
     "typedoc-plugin-no-inherit": "1.4.0",
-    "typescript": "5.4.5"
+    "typescript": "5.5.2"
   },
   "browserslist": {
     "production": [

diff --git a/documentation/yarn.lock b/documentation/yarn.lock
diff --git a/examples/yarn.lock b/examples/yarn.lock
diff --git a/react-components/package.json b/react-components/package.json
@@ -53,9 +53,9 @@
     "@storybook/blocks": "^8.0.9",
     "@storybook/react": "^8.0.9",
     "@storybook/react-vite": "^8.0.9",
-    "@storybook/test": "8.1.9",
+    "@storybook/test": "8.1.10",
     "@tanstack/react-query-devtools": "^5.32.0",
-    "@testing-library/react": "^15.0.5",
+    "@testing-library/react": "^16.0.0",
     "@types/lodash": "^4.17.0",
     "@types/node": "^20.12.7",
     "@types/react": "^18.3.1",

diff --git a/react-components/src/components/Architecture/CommandButton.tsx b/react-components/src/components/Architecture/CommandButton.tsx
@@ -20,7 +20,13 @@ export const CommandButtons = ({
   return (
     <>
       {commands.map(
-        (command, index): ReactElement => addCommandButton(command, isHorizontal, index)
+        (command, index): ReactElement => (
+          <CommandButtonWrapper
+            command={command}
+            isHorizontal={isHorizontal}
+            key={getKey(command, index)}
+          />
+        )
       )}
     </>
   );
@@ -60,7 +66,7 @@ export const CommandButton = ({
     return () => {
       newCommand.removeEventListener(update);
     };
-  }, [newCommand]);
+  }, [newCommand.isEnabled, newCommand.isChecked, newCommand.isVisible]);
 
   if (!isVisible) {
     return <></>;
@@ -106,14 +112,24 @@ function getDefaultCommand(newCommand: BaseCommand, renderTarget: RevealRenderTa
   return newCommand;
 }
 
-function addCommandButton(
-  command: BaseCommand | undefined,
-  isHorizontal: boolean,
-  index: number
-): ReactElement {
+function getKey(command: BaseCommand | undefined, index: number): number {
+  if (command === undefined) {
+    return -index;
+  }
+
+  return command.uniqueId;
+}
+
+function CommandButtonWrapper({
+  command,
+  isHorizontal
+}: {
+  command: BaseCommand | undefined;
+  isHorizontal: boolean;
+}): ReactElement {
   if (command === undefined) {
     const direction = !isHorizontal ? 'horizontal' : 'vertical';
-    return <Divider key={index} weight="2px" length="24px" direction={direction} />;
+    return <Divider weight="2px" length="24px" direction={direction} />;
   }
-  return <CommandButton key={command.uniqueId} command={command} isHorizontal={isHorizontal} />;
+  return <CommandButton command={command} isHorizontal={isHorizontal} />;
 }