chore: Fix code style

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

packages/ui-components/button/src/button.tsx

@@ -26,21 +26,8 @@ export interface ButtonProps extends ButtonHTMLAttributes<any> {
 }
 
 export const Button = withTooltip((props: ButtonProps) => {
-  const {
+  const { waiting, label, primary, accent, plain, hidden, active, big, round, outlined, light, children, ...btnProps } =
-    waiting,
+    props;
-    label,
-    primary,
-    accent,
-    plain,
-    hidden,
-    active,
-    big,
-    round,
-    outlined,
-    light,
-    children,
-    ...btnProps
-  } = props;
 
   if (hidden) {
     return null;
@@ -70,11 +57,7 @@ export const Button = withTooltip((props: ButtonProps) => {
 
   // render as button
   return (
-    <button
+    <button type="button" {...btnProps} data-waiting={typeof waiting === "boolean" ? String(waiting) : undefined}>
-      type="button"
-      {...btnProps}
-      data-waiting={typeof waiting === "boolean" ? String(waiting) : undefined}
-    >
       {label}
       {children}
     </button>

packages/ui-components/tooltip/src/helpers.ts

@@ -115,8 +115,7 @@ export const computeNextPosition = ({
       tooltipBounds,
       targetBounds,
     });
-    const fitsToWindow =
+    const fitsToWindow = left >= 0 && top >= 0 && right <= viewportWidth && bottom <= viewportHeight;
-      left >= 0 && top >= 0 && right <= viewportWidth && bottom <= viewportHeight;
 
     if (fitsToWindow) {
       return {

packages/ui-components/tooltip/src/tooltip.test.tsx

@@ -11,9 +11,7 @@ import React from "react";
 import { computeNextPosition, RectangleDimensions } from "./helpers";
 import { Tooltip, TooltipPosition } from "./tooltip";
 
-const getRectangle = (
+const getRectangle = (parts: Omit<RectangleDimensions, "width" | "height">): RectangleDimensions => {
-  parts: Omit<RectangleDimensions, "width" | "height">,
-): RectangleDimensions => {
   assert(parts.right >= parts.left);
   assert(parts.bottom >= parts.top);
 
@@ -382,9 +380,7 @@ describe("computeNextPosition technical tests", () => {
       TooltipPosition.TOP_LEFT,
       TooltipPosition.BOTTOM_RIGHT,
       TooltipPosition.BOTTOM_LEFT,
-    ])(
+    ])("computes to the %p if there is space and it is specified as a preferred position", (position) => {
-      "computes to the %p if there is space and it is specified as a preferred position",
-      (position) => {
       expect(
         computeNextPosition({
           preferredPositions: position,
@@ -408,7 +404,6 @@ describe("computeNextPosition technical tests", () => {
       ).toMatchObject({
         position,
       });
-      },
+    });
-    );
   });
 });

packages/ui-components/tooltip/src/withTooltip.test.tsx

@@ -16,14 +16,12 @@ type MyComponentProps = {
   "data-testid"?: string;
 };
 
-const MyComponent = withTooltip(
+const MyComponent = withTooltip(({ text, "data-testid": testId, id, children }: MyComponentProps) => (
-  ({ text, "data-testid": testId, id, children }: MyComponentProps) => (
   <div id={id} data-testid={testId}>
     {text}
     {children}
   </div>
-  ),
+));
-);
 
 describe("withTooltip tests", () => {
   it("does not render a tooltip when not specified", () => {
@@ -42,9 +40,7 @@ describe("withTooltip tests", () => {
     let result: RenderResult;
 
     beforeEach(() => {
-      result = render(
+      result = render(<MyComponent text="foobar" data-testid="my-test-id" tooltip="my-tooltip" id="bat" />);
-        <MyComponent text="foobar" data-testid="my-test-id" tooltip="my-tooltip" id="bat" />,
-      );
     });
 
     it("renders", () => {
@@ -71,12 +67,7 @@ describe("withTooltip tests", () => {
 
     beforeEach(() => {
       result = render(
-        <MyComponent
+        <MyComponent text="foobar" data-testid="my-test-id" tooltip={{ children: "my-tooltip" }} id="bat" />,
-          text="foobar"
-          data-testid="my-test-id"
-          tooltip={{ children: "my-tooltip" }}
-          id="bat"
-        />,
       );
     });
 

packages/ui-components/tooltip/src/withTooltip.tsx

@@ -32,13 +32,7 @@ export function withTooltip<TargetProps>(
     const [defaultTooltipId] = useState(uniqueId("tooltip_target_"));
 
     let { id: targetId, children: targetChildren } = props;
-    const {
+    const { tooltip, tooltipOverrideDisabled, id: _unusedId, children: _unusedTargetChildren, ...targetProps } = props;
-      tooltip,
-      tooltipOverrideDisabled,
-      id: _unusedId,
-      children: _unusedTargetChildren,
-      ...targetProps
-    } = props;
 
     if (tooltip) {
       const tooltipProps: TooltipProps = {