feat: scatter chart is selected the line style dropdown should be dis…

…abled for scatter chart #2427
awslabs · Jan 31, 2024 · d407ba3 · d407ba3
1 parent c1424a2
commit d407ba3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/...ard/src/customization/propertiesSections/lineAndScatterStyleSettings/lineStyleSection.tsx b/...ard/src/customization/propertiesSections/lineAndScatterStyleSettings/lineStyleSection.tsx
@@ -41,7 +41,8 @@ export const LineStyleSection: FC<LineStyleSectionOptions> = ({
         <SpaceBetween size='m'>
           <LineTypeSection type={lineType} updateType={updateType} />
           <LineStyleDropdown
-            lineStyle={lineStyle}
+            disabled={lineType === 'none'}
+            lineStyle={lineType !== 'none' ? lineStyle ?? 'solid' : undefined}
             updatelineStyle={updatelineStyle}
           />
           <LineThicknessDropdown

diff --git a/.../customization/propertiesSections/propertiesAndAlarmsSettings/styledPropertyComponent.tsx b/.../customization/propertiesSections/propertiesAndAlarmsSettings/styledPropertyComponent.tsx
@@ -50,13 +50,18 @@ const LineStylePropertyConfig = ({
   const [connectionStyle, setConnectionStyle] = useState<
     LineStyles['connectionStyle']
   >(property.line?.connectionStyle ?? 'linear');
+
   const [lineStyle, setLineStyle] = useState<LineStyles['style']>(
-    property.line?.style ?? 'solid'
+    connectionStyle !== 'none' ? property.line?.style ?? 'solid' : undefined
   );
   const [lineThickness, setLinethickness] = useState<string | undefined>(
     property.line?.thickness?.toString() ?? '2'
   );
 
+  const [isPrevLineStyleNone, setIsPrevLineStyleNone] = useState(
+    connectionStyle === 'none'
+  );
+
   const getLineThicknessNumber = (thickness?: string) =>
     thickness ? parseInt(thickness) : undefined;
 
@@ -87,6 +92,14 @@ const LineStylePropertyConfig = ({
   const updateConnectionStyle = (
     connectionStyle: LineStyles['connectionStyle']
   ) => {
+    if (connectionStyle === 'none') {
+      setLineStyle(undefined);
+      setIsPrevLineStyleNone(true);
+    }
+    if (isPrevLineStyleNone && connectionStyle !== 'none') {
+      setLineStyle('solid');
+      setIsPrevLineStyleNone(false);
+    }
     setConnectionStyle(connectionStyle);
     onUpdate({
       line: {
@@ -142,7 +155,7 @@ const LineStylePropertyConfig = ({
             }
           />
           <LineStyleDropdown
-            disabled={useGlobalStyle}
+            disabled={useGlobalStyle || connectionStyle === 'none'}
             lineStyle={lineStyle}
             updatelineStyle={(style) =>
               updateLineStyle(style as LineStyles['style'])