fix: handle warnings of lgtm.com

antvis · Dec 10, 2019 · 22c054f · 22c054f
1 parent 7caa5e5
commit 22c054f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/examples/x6-example-drawio/src/pages/graph/format-cell.tsx b/examples/x6-example-drawio/src/pages/graph/format-cell.tsx
@@ -296,7 +296,7 @@ export class FormatCell extends React.PureComponent<
                 )}
                 className="x6-editor-format-number right"
                 formatter={value => `${value!}%`}
-                parser={value => value!.replace('%', '')}
+                parser={value => value!.replace(/%$/g, '')}
                 style={{ flex: 1 }}
               />
             )}
@@ -535,21 +535,19 @@ export class FormatCell extends React.PureComponent<
   toggleItalic = () => {
     this.executeCommand('italic')
     const current = (this.state.fontStyle as number) || 0
-    this.setState({
-      fontStyle: FontStyle.isItalic(this.state.fontStyle)
-        ? current - FontStyle.italic
-        : current + FontStyle.italic,
-    })
+    const fontStyle = FontStyle.isItalic(this.state.fontStyle)
+      ? current - FontStyle.italic
+      : current + FontStyle.italic
+    this.setState({ fontStyle })
   }
 
   toggleUnderline = () => {
     this.executeCommand('underline')
     const current = (this.state.fontStyle as number) || 0
-    this.setState({
-      fontStyle: FontStyle.isUnderlined(this.state.fontStyle)
-        ? current - FontStyle.underlined
-        : current + FontStyle.underlined,
-    })
+    const fontStyle = FontStyle.isUnderlined(this.state.fontStyle)
+      ? current - FontStyle.underlined
+      : current + FontStyle.underlined
+    this.setState({ fontStyle })
   }
 
   onFontSizeChanged = (fontSize?: number) => {

diff --git a/packages/x6/src/route/er.ts b/packages/x6/src/route/er.ts
@@ -95,14 +95,14 @@ export function er(
       const targetGeometry = graph.getCellGeometry(targetState.cell)!
       if (targetGeometry.relative) {
         isTargetLeft = targetGeometry.bounds.x <= 0.5
-      } else if (sourceState != null) {
+      } else {
         isTargetLeft =
           sourceState.bounds.x + sourceState.bounds.width < targetState.bounds.x
       }
     }
   }
 
-  if (sourceState != null && targetState != null) {
+  if (sourceState && targetState) {
     const x0 = isSourceLeft
       ? sourceState.bounds.x
       : sourceState.bounds.x + sourceState.bounds.width

diff --git a/packages/x6/src/route/loop.ts b/packages/x6/src/route/loop.ts
@@ -69,7 +69,8 @@ export function loop(
           x = sourceState.bounds.x + sourceState.bounds.width + 2 * dy
         }
       }
-    } else if (pt != null) {
+    } else {
+      // pt is not null
       x = view.getRoutingCenterX(sourceState)
       dx = Math.max(Math.abs(x - pt.x), dy)
       y = pt.y