fix props

simularium · Oct 4, 2023 · c91aa83 · c91aa83
1 parent ddfc57b
commit c91aa83
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 9 deletions.
diff --git a/src/components/CheckBoxTree/index.tsx b/src/components/CheckBoxTree/index.tsx
@@ -7,6 +7,7 @@ import classNames from "classnames";
 
 import {
     ChangeAgentsRenderingStateAction,
+    ColorChangesMap,
     SetVisibleAction,
     VisibilitySelectionMap,
 } from "../../state/selection/types";
@@ -41,7 +42,11 @@ interface CheckBoxTreeProps {
     payloadForSelectAll: VisibilitySelectionMap;
     payloadForSelectNone: VisibilitySelectionMap;
     isSharedCheckboxIndeterminate: boolean;
-    colorInfoForPicker: any; //TODO: type this
+    recentColors: string[]; //TODO: type this;
+    setColorInfoFromPicker: (
+        colorChanges?: ColorChangesMap,
+        recentColors?: string[]
+    ) => void;
 }
 const CHECKBOX_SPAN_NO = 2;
 const LABEL_SPAN_NO = 6;
@@ -216,7 +221,8 @@ class CheckBoxTree extends React.Component<CheckBoxTreeProps> {
             agentsHighlighted,
             treeData,
             agentsChecked,
-            colorInfoForPicker,
+            recentColors,
+            setColorInfoFromPicker,
         } = this.props;
         return treeData.length > 0 ? (
             <div className={styles.container}>
@@ -258,7 +264,10 @@ class CheckBoxTree extends React.Component<CheckBoxTreeProps> {
                                         color={nodeData.color}
                                         agentName={nodeData.title}
                                         tags={this.getAgentTags(nodeData.title)}
-                                        colorInfoForPicker={colorInfoForPicker}
+                                        recentColors={recentColors}
+                                        setColorInfoFromPicker={
+                                            setColorInfoFromPicker
+                                        }
                                     />
                                     <Text
                                         style={{ maxWidth: 143 }}
@@ -332,6 +341,12 @@ class CheckBoxTree extends React.Component<CheckBoxTreeProps> {
                                                         tags={[
                                                             value.value as string,
                                                         ]}
+                                                        recentColors={
+                                                            recentColors
+                                                        }
+                                                        setColorInfoFromPicker={
+                                                            setColorInfoFromPicker
+                                                        }
                                                     />
                                                     <label
                                                         className={

diff --git a/src/components/ColorSwatch/index.tsx b/src/components/ColorSwatch/index.tsx
@@ -1,22 +1,29 @@
 import * as React from "react";
+import { useState } from "react";
+
+import ColorPicker from "../ColorPicker";
 
 import styles from "./styles.css";
-import ColorPickerPopover from "../ColorPickerPopover";
-import { useState } from "react";
+import { ColorChangesMap } from "../../state/selection/types";
 interface ColorSwatchProps {
     childrenHaveDifferentColors?: boolean;
     color: string;
     agentName: string;
     tags: string[];
-    colorInfoForPicker: any; // TODO: type this
+    recentColors: string[];
+    setColorInfoFromPicker: (
+        colorChanges?: ColorChangesMap,
+        recentColors?: string[]
+    ) => void;
 }
 
 const ColorSwatch = ({
     childrenHaveDifferentColors,
     color,
     agentName,
     tags,
-    colorInfoForPicker,
+    recentColors,
+    setColorInfoFromPicker,
 }: ColorSwatchProps): JSX.Element => {
     const [isColorPickerVisible, setColorPickerVisible] = useState(false);
     const [initialColor, setInitialColor] = useState(color);
@@ -46,13 +53,14 @@ const ColorSwatch = ({
                     openModal();
                 }}
             />
-            <ColorPickerPopover
+            <ColorPicker
                 agentName={agentName}
                 tags={tags}
                 oldColor={initialColor}
                 isOpen={isColorPickerVisible}
                 closeModal={closeModal}
-                colorInfoForPicker={colorInfoForPicker}
+                recentColors={recentColors}
+                setColorInfoFromPicker={setColorInfoFromPicker}
             />
         </>
     );