Merge pull request #340 from emerson-eps/fix-breakage

fix: fix breakage due to latest changes
emerson-eps · Nov 14, 2022 · 08910b8 · 08910b8
2 parents cb073ea + 04db0c3
commit 08910b8
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 29 deletions.
diff --git a/react-app/src/component/ColorSelector/ColorSelectorAccordion.tsx b/react-app/src/component/ColorSelector/ColorSelectorAccordion.tsx
@@ -48,38 +48,41 @@ export const ColorSelectorAccordion = (props: any) => {
       className="Container"
       style={{
         width: "316px",
-        position: "absolute",
+        // position: "absolute",
         zIndex: 1000,
         top: getColorSelectorPosition(props.position, props.isHorizontal).top,
         left: getColorSelectorPosition(props.position, props.isHorizontal).left,
       }}
     >
-      {!props.isModal && (
-        <div style={{ cursor: "pointer" }}>
-          <CancelIcon
-            style={{
-              position: "absolute",
-              top: "-10px",
-              right: "-10px",
-              cursor: "pointer",
-              color: "#007079",
-            }}
-            onMouseOver={(e) => {
-              e.preventDefault();
-              const target = e.target as SVGAElement;
-              target.style.color = "#1099a5";
-            }}
-            onMouseOut={(e) => {
-              const target = e.target as SVGAElement;
-              target.style.color = "#007079";
-            }}
-            onClick={props.setIsOpen}
-          />
-        </div>
-      )}
       <Accordion>
         <Accordion.Item isExpanded>
-          <Accordion.Header>Color Scales</Accordion.Header>
+          <Accordion.Header>
+            Color Scales
+            {!props.isModal && (
+              <div style={{ cursor: "pointer" }}>
+                <CancelIcon
+                  style={{
+                    // position: "absolute",
+                    top: "-10px",
+                    right: "-10px",
+                    cursor: "pointer",
+                    color: "#007079",
+                  }}
+                  onMouseOver={(e) => {
+                    e.preventDefault();
+                    const target = e.target as SVGAElement;
+                    target.style.color = "#1099a5";
+                  }}
+                  onMouseOut={(e) => {
+                    const target = e.target as SVGAElement;
+                    target.style.color = "#007079";
+                  }}
+                  onClick={props.setIsOpen}
+                />
+              </div>
+            )}
+          </Accordion.Header>
+
           <Accordion.Panel>
             <Accordion>
               <Accordion.Item>

diff --git a/react-app/src/component/Legend/ContinuousLegend.tsx b/react-app/src/component/Legend/ContinuousLegend.tsx
@@ -401,8 +401,8 @@ export const ContinuousLegend: React.FC<continuousLegendProps> = ({
   return (
     <div
       style={{
-        position: "absolute",
-        left: position ? position.left : " ",
+        // position: "absolute",
+        right: position ? position.left : " ",
         top: position ? position.top : " ",
         zIndex: 999,
       }}

diff --git a/react-app/src/component/Legend/DiscreteLegend.tsx b/react-app/src/component/Legend/DiscreteLegend.tsx
@@ -274,8 +274,8 @@ export const DiscreteColorLegend: React.FC<discreteLegendProps> = ({
   return (
     <div
       style={{
-        position: "absolute",
-        left: position ? position.left : " ",
+        // position: "absolute",
+        right: position ? position.left : " ",
         top: position ? position.top : " ",
         backgroundColor: "#ffffffcc",
         borderRadius: "5px",