Jelajahi Sumber

Bump prettier from 2.0.2 to 2.0.3 (#1263)

* Bump prettier from 2.0.2 to 2.0.3

Bumps [prettier](https://github.com/prettier/prettier) from 2.0.2 to 2.0.3.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.0.2...2.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Format

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Panayiotis Lipiridis <lipiridis@gmail.com>
dependabot-preview[bot] 5 tahun lalu
induk
melakukan
18f0b76231
7 mengubah file dengan 183 tambahan dan 159 penghapusan
  1. 3 3
      package-lock.json
  2. 1 1
      package.json
  3. 5 3
      src/components/App.tsx
  4. 82 71
      src/element/handlerRectangles.ts
  5. 3 1
      src/is-mobile.tsx
  6. 16 15
      src/keys.ts
  7. 73 65
      src/shapes.tsx

+ 3 - 3
package-lock.json

@@ -12338,9 +12338,9 @@
       "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw="
     },
     "prettier": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.2.tgz",
-      "integrity": "sha512-5xJQIPT8BraI7ZnaDwSbu5zLrB6vvi8hVV58yHQ+QK64qrY40dULy0HSRlQ2/2IdzeBpjhDkqdcFBnFeDEMVdg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.3.tgz",
+      "integrity": "sha512-5qpBDBHO9fpE0zruKiTZm8Gxmz7kknO+WlQR/ivV+RMwgDw/WjOgmxLDn66MPrxq/WZPx/EgEZzh87xJO5E6Fw==",
       "dev": true
     },
     "prettier-linter-helpers": {

+ 1 - 1
package.json

@@ -46,7 +46,7 @@
     "lint-staged": "10.0.10",
     "node-sass": "4.13.1",
     "pepjs": "0.5.2",
-    "prettier": "2.0.2",
+    "prettier": "2.0.3",
     "rewire": "5.0.0",
     "typescript": "3.8.3"
   },

+ 5 - 3
src/components/App.tsx

@@ -120,9 +120,11 @@ import { actionFinalize } from "../actions";
 function withBatchedUpdates<
   TFunction extends ((event: any) => void) | (() => void)
 >(func: Parameters<TFunction>["length"] extends 0 | 1 ? TFunction : never) {
-  return ((event) => {
-    unstable_batchedUpdates(func as TFunction, event);
-  }) as TFunction;
+  return (
+    ((event) => {
+      unstable_batchedUpdates(func as TFunction, event);
+    }) as TFunction
+  );
 }
 
 const { history } = createHistory();

+ 82 - 71
src/element/handlerRectangles.ts

@@ -52,57 +52,58 @@ export function handlerRectangles(
 
   const centeringOffset = (size - 8) / (2 * zoom);
 
-  const handlers = {
-    nw: generateHandler(
-      elementX1 - dashedLineMargin - handlerMarginX + centeringOffset,
-      elementY1 - dashedLineMargin - handlerMarginY + centeringOffset,
-      handlerWidth,
-      handlerHeight,
-      cx,
-      cy,
-      angle,
-    ),
-    ne: generateHandler(
-      elementX2 + dashedLineMargin - centeringOffset,
-      elementY1 - dashedLineMargin - handlerMarginY + centeringOffset,
-      handlerWidth,
-      handlerHeight,
-      cx,
-      cy,
-      angle,
-    ),
-    sw: generateHandler(
-      elementX1 - dashedLineMargin - handlerMarginX + centeringOffset,
-      elementY2 + dashedLineMargin - centeringOffset,
-      handlerWidth,
-      handlerHeight,
-      cx,
-      cy,
-      angle,
-    ),
-    se: generateHandler(
-      elementX2 + dashedLineMargin - centeringOffset,
-      elementY2 + dashedLineMargin - centeringOffset,
-      handlerWidth,
-      handlerHeight,
-      cx,
-      cy,
-      angle,
-    ),
-    rotation: generateHandler(
-      elementX1 + elementWidth / 2 - handlerWidth / 2,
-      elementY1 -
-        dashedLineMargin -
-        handlerMarginY +
-        centeringOffset -
-        ROTATION_HANDLER_GAP / zoom,
-      handlerWidth,
-      handlerHeight,
-      cx,
-      cy,
-      angle,
-    ),
-  } as { [T in Sides]: [number, number, number, number] };
+  const handlers =
+    {
+      nw: generateHandler(
+        elementX1 - dashedLineMargin - handlerMarginX + centeringOffset,
+        elementY1 - dashedLineMargin - handlerMarginY + centeringOffset,
+        handlerWidth,
+        handlerHeight,
+        cx,
+        cy,
+        angle,
+      ),
+      ne: generateHandler(
+        elementX2 + dashedLineMargin - centeringOffset,
+        elementY1 - dashedLineMargin - handlerMarginY + centeringOffset,
+        handlerWidth,
+        handlerHeight,
+        cx,
+        cy,
+        angle,
+      ),
+      sw: generateHandler(
+        elementX1 - dashedLineMargin - handlerMarginX + centeringOffset,
+        elementY2 + dashedLineMargin - centeringOffset,
+        handlerWidth,
+        handlerHeight,
+        cx,
+        cy,
+        angle,
+      ),
+      se: generateHandler(
+        elementX2 + dashedLineMargin - centeringOffset,
+        elementY2 + dashedLineMargin - centeringOffset,
+        handlerWidth,
+        handlerHeight,
+        cx,
+        cy,
+        angle,
+      ),
+      rotation: generateHandler(
+        elementX1 + elementWidth / 2 - handlerWidth / 2,
+        elementY1 -
+          dashedLineMargin -
+          handlerMarginY +
+          centeringOffset -
+          ROTATION_HANDLER_GAP / zoom,
+        handlerWidth,
+        handlerHeight,
+        cx,
+        cy,
+        angle,
+      ),
+    } as { [T in Sides]: [number, number, number, number] };
 
   // We only want to show height handlers (all cardinal directions)  above a certain size
   const minimumSizeForEightHandlers = (5 * size) / zoom;
@@ -153,38 +154,48 @@ export function handlerRectangles(
       const [, p1] = element.points;
 
       if (p1[0] === 0 || p1[1] === 0) {
-        return {
-          nw: handlers.nw,
-          se: handlers.se,
-        } as typeof handlers;
+        return (
+          {
+            nw: handlers.nw,
+            se: handlers.se,
+          } as typeof handlers
+        );
       }
 
       if (p1[0] > 0 && p1[1] < 0) {
-        return {
-          ne: handlers.ne,
-          sw: handlers.sw,
-        } as typeof handlers;
+        return (
+          {
+            ne: handlers.ne,
+            sw: handlers.sw,
+          } as typeof handlers
+        );
       }
 
       if (p1[0] > 0 && p1[1] > 0) {
-        return {
-          nw: handlers.nw,
-          se: handlers.se,
-        } as typeof handlers;
+        return (
+          {
+            nw: handlers.nw,
+            se: handlers.se,
+          } as typeof handlers
+        );
       }
 
       if (p1[0] < 0 && p1[1] > 0) {
-        return {
-          ne: handlers.ne,
-          sw: handlers.sw,
-        } as typeof handlers;
+        return (
+          {
+            ne: handlers.ne,
+            sw: handlers.sw,
+          } as typeof handlers
+        );
       }
 
       if (p1[0] < 0 && p1[1] < 0) {
-        return {
-          nw: handlers.nw,
-          se: handlers.se,
-        } as typeof handlers;
+        return (
+          {
+            nw: handlers.nw,
+            se: handlers.se,
+          } as typeof handlers
+        );
       }
     }
   }

+ 3 - 1
src/is-mobile.tsx

@@ -13,7 +13,9 @@ export function IsMobileProvider({ children }: { children: React.ReactNode }) {
           matches: false,
           addListener: () => {},
           removeListener: () => {},
-        } as any) as MediaQueryList);
+        } as
+          any) as
+        MediaQueryList);
   }
   const [isMobile, setMobile] = useState(query.current.matches);
 

+ 16 - 15
src/keys.ts

@@ -1,20 +1,21 @@
 export const isDarwin = /Mac|iPod|iPhone|iPad/.test(window.navigator.platform);
 
-export const KEYS = {
-  ARROW_LEFT: "ArrowLeft",
-  ARROW_RIGHT: "ArrowRight",
-  ARROW_DOWN: "ArrowDown",
-  ARROW_UP: "ArrowUp",
-  ENTER: "Enter",
-  ESCAPE: "Escape",
-  DELETE: "Delete",
-  BACKSPACE: "Backspace",
-  CTRL_OR_CMD: isDarwin ? "metaKey" : "ctrlKey",
-  TAB: "Tab",
-  SPACE: " ",
-  QUESTION_MARK: "?",
-  F_KEY_CODE: 70,
-} as const;
+export const KEYS =
+  {
+    ARROW_LEFT: "ArrowLeft",
+    ARROW_RIGHT: "ArrowRight",
+    ARROW_DOWN: "ArrowDown",
+    ARROW_UP: "ArrowUp",
+    ENTER: "Enter",
+    ESCAPE: "Escape",
+    DELETE: "Delete",
+    BACKSPACE: "Backspace",
+    CTRL_OR_CMD: isDarwin ? "metaKey" : "ctrlKey",
+    TAB: "Tab",
+    SPACE: " ",
+    QUESTION_MARK: "?",
+    F_KEY_CODE: 70,
+  } as const;
 
 export type Key = keyof typeof KEYS;
 

+ 73 - 65
src/shapes.tsx

@@ -1,71 +1,79 @@
 import React from "react";
 
 // We inline font-awesome icons in order to save on js size rather than including the font awesome react library
-export const SHAPES = [
-  {
-    icon: (
-      // fa-mouse-pointer
-      <svg viewBox="0 0 320 512" className="">
-        <path d="M302.189 329.126H196.105l55.831 135.993c3.889 9.428-.555 19.999-9.444 23.999l-49.165 21.427c-9.165 4-19.443-.571-23.332-9.714l-53.053-129.136-86.664 89.138C18.729 472.71 0 463.554 0 447.977V18.299C0 1.899 19.921-6.096 30.277 5.443l284.412 292.542c11.472 11.179 3.007 31.141-12.5 31.141z" />
-      </svg>
-    ),
-    value: "selection",
-  },
-  {
-    icon: (
-      // fa-square
-      <svg viewBox="0 0 448 512">
-        <path d="M400 32H48C21.5 32 0 53.5 0 80v352c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V80c0-26.5-21.5-48-48-48z" />
-      </svg>
-    ),
-    value: "rectangle",
-  },
-  {
-    icon: (
-      // custom
-      <svg viewBox="0 0 223.646 223.646">
-        <path d="M111.823 0L16.622 111.823 111.823 223.646 207.025 111.823z" />
-      </svg>
-    ),
-    value: "diamond",
-  },
-  {
-    icon: (
-      // fa-circle
-      <svg viewBox="0 0 512 512">
-        <path d="M256 8C119 8 8 119 8 256s111 248 248 248 248-111 248-248S393 8 256 8z" />
-      </svg>
-    ),
-    value: "ellipse",
-  },
-  {
-    icon: (
-      // fa-long-arrow-alt-right
-      <svg viewBox="0 0 448 512" className="rtl-mirror">
-        <path d="M313.941 216H12c-6.627 0-12 5.373-12 12v56c0 6.627 5.373 12 12 12h301.941v46.059c0 21.382 25.851 32.09 40.971 16.971l86.059-86.059c9.373-9.373 9.373-24.569 0-33.941l-86.059-86.059c-15.119-15.119-40.971-4.411-40.971 16.971V216z" />
-      </svg>
-    ),
-    value: "arrow",
-  },
-  {
-    icon: (
-      // custom
-      <svg viewBox="0 0 6 6">
-        <line x1="0" y1="3" x2="6" y2="3" stroke="#000" strokeLinecap="round" />
-      </svg>
-    ),
-    value: "line",
-  },
-  {
-    icon: (
-      // fa-font
-      <svg viewBox="0 0 448 512">
-        <path d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z" />
-      </svg>
-    ),
-    value: "text",
-  },
-] as const;
+export const SHAPES =
+  [
+    {
+      icon: (
+        // fa-mouse-pointer
+        <svg viewBox="0 0 320 512" className="">
+          <path d="M302.189 329.126H196.105l55.831 135.993c3.889 9.428-.555 19.999-9.444 23.999l-49.165 21.427c-9.165 4-19.443-.571-23.332-9.714l-53.053-129.136-86.664 89.138C18.729 472.71 0 463.554 0 447.977V18.299C0 1.899 19.921-6.096 30.277 5.443l284.412 292.542c11.472 11.179 3.007 31.141-12.5 31.141z" />
+        </svg>
+      ),
+      value: "selection",
+    },
+    {
+      icon: (
+        // fa-square
+        <svg viewBox="0 0 448 512">
+          <path d="M400 32H48C21.5 32 0 53.5 0 80v352c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V80c0-26.5-21.5-48-48-48z" />
+        </svg>
+      ),
+      value: "rectangle",
+    },
+    {
+      icon: (
+        // custom
+        <svg viewBox="0 0 223.646 223.646">
+          <path d="M111.823 0L16.622 111.823 111.823 223.646 207.025 111.823z" />
+        </svg>
+      ),
+      value: "diamond",
+    },
+    {
+      icon: (
+        // fa-circle
+        <svg viewBox="0 0 512 512">
+          <path d="M256 8C119 8 8 119 8 256s111 248 248 248 248-111 248-248S393 8 256 8z" />
+        </svg>
+      ),
+      value: "ellipse",
+    },
+    {
+      icon: (
+        // fa-long-arrow-alt-right
+        <svg viewBox="0 0 448 512" className="rtl-mirror">
+          <path d="M313.941 216H12c-6.627 0-12 5.373-12 12v56c0 6.627 5.373 12 12 12h301.941v46.059c0 21.382 25.851 32.09 40.971 16.971l86.059-86.059c9.373-9.373 9.373-24.569 0-33.941l-86.059-86.059c-15.119-15.119-40.971-4.411-40.971 16.971V216z" />
+        </svg>
+      ),
+      value: "arrow",
+    },
+    {
+      icon: (
+        // custom
+        <svg viewBox="0 0 6 6">
+          <line
+            x1="0"
+            y1="3"
+            x2="6"
+            y2="3"
+            stroke="#000"
+            strokeLinecap="round"
+          />
+        </svg>
+      ),
+      value: "line",
+    },
+    {
+      icon: (
+        // fa-font
+        <svg viewBox="0 0 448 512">
+          <path d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z" />
+        </svg>
+      ),
+      value: "text",
+    },
+  ] as const;
 
 export const shapesShortcutKeys = SHAPES.map((shape, index) => [
   shape.value[0],