sambruk/excalidraw
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Use Math.hypot (#87)

Browse Source 
- Fix context parameter name in isTextElement function
- Remove unused code
- Use block scope everywhere
This commit is contained in:
Sergey Rubanov 2020-01-04 00:20:26 +01:00 committed by Christopher Chedeau
parent 58d81280c9
commit 51bea5eff3
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/index.tsx
View File

@ -16,7 +16,7 @@ type ExcalidrawTextElement = ExcalidrawElement & {
const LOCAL_STORAGE_KEY = "excalidraw"; const LOCAL_STORAGE_KEY = "excalidraw";
const LOCAL_STORAGE_KEY_STATE = "excalidraw-state"; const LOCAL_STORAGE_KEY_STATE = "excalidraw-state";
var elements = Array.of<ExcalidrawElement>(); let elements = Array.of<ExcalidrawElement>();
// https://stackoverflow.com/questions/521295/seeding-the-random-number-generator-in-javascript/47593316#47593316 // https://stackoverflow.com/questions/521295/seeding-the-random-number-generator-in-javascript/47593316#47593316
const LCG = (seed: number) => () => const LCG = (seed: number) => () =>
@ -69,7 +69,7 @@ function distanceBetweenPointAndSegment(
const dx = x - xx; const dx = x - xx;
const dy = y - yy; const dy = y - yy;
return Math.sqrt(dx * dx + dy * dy); return Math.hypot(dx, dy);
} }
function hitTest(element: ExcalidrawElement, x: number, y: number): boolean { function hitTest(element: ExcalidrawElement, x: number, y: number): boolean {
@ -236,18 +236,6 @@ function renderScene(
} }
}); });
let minX = Infinity;
let maxX = 0;
let minY = Infinity;
let maxY = 0;
elements.forEach(element => {
minX = Math.min(minX, getElementAbsoluteX1(element));
maxX = Math.max(maxX, getElementAbsoluteX2(element));
minY = Math.min(minY, getElementAbsoluteY1(element));
maxY = Math.max(maxY, getElementAbsoluteY2(element));
});
const scrollBars = getScrollbars( const scrollBars = getScrollbars(
context.canvas.width, context.canvas.width,
context.canvas.height, context.canvas.height,
@ -375,7 +363,7 @@ function rotate(x1: number, y1: number, x2: number, y2: number, angle: number) {
// Casting second argument (DrawingSurface) to any, // Casting second argument (DrawingSurface) to any,
// because it is requred by TS definitions and not required at runtime // because it is requred by TS definitions and not required at runtime
var generator = rough.generator(null, null as any); const generator = rough.generator(null, null as any);
function isTextElement( function isTextElement(
element: ExcalidrawElement element: ExcalidrawElement
@ -390,7 +378,7 @@ function getArrowPoints(element: ExcalidrawElement) {
const y2 = element.height; const y2 = element.height;
const size = 30; // pixels const size = 30; // pixels
const distance = Math.sqrt(Math.pow(x2 - x1, 2) + Math.pow(y2 - y1, 2)); const distance = Math.hypot(x2 - x1, y2 - y1);
// Scale down the arrow until we hit a certain size so that it doesn't look weird // Scale down the arrow until we hit a certain size so that it doesn't look weird
const minSize = Math.min(size, distance / 2); const minSize = Math.min(size, distance / 2);
const xs = x2 - ((x2 - x1) / distance) * minSize; const xs = x2 - ((x2 - x1) / distance) * minSize;
@ -438,7 +426,7 @@ function generateDraw(element: ExcalidrawElement) {
{ stroke: element.strokeColor, fill: element.backgroundColor } { stroke: element.strokeColor, fill: element.backgroundColor }
) )
); );
element.draw = (rc, contex, { scrollX, scrollY }) => { element.draw = (rc, context, { scrollX, scrollY }) => {
context.translate(element.x + scrollX, element.y + scrollY); context.translate(element.x + scrollX, element.y + scrollY);
rc.draw(shape); rc.draw(shape);
context.translate(-element.x - scrollX, -element.y - scrollY); context.translate(-element.x - scrollX, -element.y - scrollY);
@ -522,7 +510,7 @@ function clearSelection() {
} }
function deleteSelectedElements() { function deleteSelectedElements() {
for (var i = elements.length - 1; i >= 0; --i) { for (let i = elements.length - 1; i >= 0; --i) {
if (elements[i].isSelected) { if (elements[i].isSelected) {
elements.splice(i, 1); elements.splice(i, 1);
} }