From 18f0b76231677c178954daff4cc73b733f82664d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 6 Apr 2020 14:21:07 +0300 Subject: [PATCH] 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] * Format Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Panayiotis Lipiridis --- package-lock.json | 6 +- package.json | 2 +- src/components/App.tsx | 8 +- src/element/handlerRectangles.ts | 153 +++++++++++++++++-------------- src/is-mobile.tsx | 4 +- src/keys.ts | 31 ++++--- src/shapes.tsx | 138 +++++++++++++++------------- 7 files changed, 183 insertions(+), 159 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2f6b9e0d..c9e87082 100644 --- a/package-lock.json +++ b/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": { diff --git a/package.json b/package.json index 14e111cf..217fd74b 100644 --- a/package.json +++ b/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" }, diff --git a/src/components/App.tsx b/src/components/App.tsx index 85f1831d..51296814 100644 --- a/src/components/App.tsx +++ b/src/components/App.tsx @@ -120,9 +120,11 @@ import { actionFinalize } from "../actions"; function withBatchedUpdates< TFunction extends ((event: any) => void) | (() => void) >(func: Parameters["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(); diff --git a/src/element/handlerRectangles.ts b/src/element/handlerRectangles.ts index 0f79c303..d9a00604 100644 --- a/src/element/handlerRectangles.ts +++ b/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 + ); } } } diff --git a/src/is-mobile.tsx b/src/is-mobile.tsx index ec148b4a..d45d1f56 100644 --- a/src/is-mobile.tsx +++ b/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); diff --git a/src/keys.ts b/src/keys.ts index dd2c6bed..804ebcd1 100644 --- a/src/keys.ts +++ b/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; diff --git a/src/shapes.tsx b/src/shapes.tsx index b84cb3af..68a8d7bb 100644 --- a/src/shapes.tsx +++ b/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 - - - - ), - value: "selection", - }, - { - icon: ( - // fa-square - - - - ), - value: "rectangle", - }, - { - icon: ( - // custom - - - - ), - value: "diamond", - }, - { - icon: ( - // fa-circle - - - - ), - value: "ellipse", - }, - { - icon: ( - // fa-long-arrow-alt-right - - - - ), - value: "arrow", - }, - { - icon: ( - // custom - - - - ), - value: "line", - }, - { - icon: ( - // fa-font - - - - ), - value: "text", - }, -] as const; +export const SHAPES = + [ + { + icon: ( + // fa-mouse-pointer + + + + ), + value: "selection", + }, + { + icon: ( + // fa-square + + + + ), + value: "rectangle", + }, + { + icon: ( + // custom + + + + ), + value: "diamond", + }, + { + icon: ( + // fa-circle + + + + ), + value: "ellipse", + }, + { + icon: ( + // fa-long-arrow-alt-right + + + + ), + value: "arrow", + }, + { + icon: ( + // custom + + + + ), + value: "line", + }, + { + icon: ( + // fa-font + + + + ), + value: "text", + }, + ] as const; export const shapesShortcutKeys = SHAPES.map((shape, index) => [ shape.value[0],