From 288ba10cf0d876592415b85f7c6d6efa5812d813 Mon Sep 17 00:00:00 2001 From: mcyph <20507948+mcyph@users.noreply.github.com> Date: Sun, 27 Jun 2021 17:23:33 +1000 Subject: [PATCH] conversions to typescript and type fixes --- .../view/{GraphHandler.js => GraphHandler.ts} | 0 .../src/view/connection/ConnectionHandler.ts | 201 +++++++++--------- packages/core/src/view/event/EventSource.ts | 2 +- packages/core/src/view/model/Model.ts | 2 +- ...opupMenuHandler.js => PopupMenuHandler.ts} | 0 packages/core/src/view/snap/GraphSnap.ts | 15 +- .../view/style/{EdgeStyle.js => EdgeStyle.ts} | 0 packages/core/src/view/style/Perimeter.ts | 25 ++- packages/core/src/view/style/StyleRegistry.ts | 2 +- 9 files changed, 135 insertions(+), 112 deletions(-) rename packages/core/src/view/{GraphHandler.js => GraphHandler.ts} (100%) rename packages/core/src/view/popups_menus/{PopupMenuHandler.js => PopupMenuHandler.ts} (100%) rename packages/core/src/view/style/{EdgeStyle.js => EdgeStyle.ts} (100%) diff --git a/packages/core/src/view/GraphHandler.js b/packages/core/src/view/GraphHandler.ts similarity index 100% rename from packages/core/src/view/GraphHandler.js rename to packages/core/src/view/GraphHandler.ts diff --git a/packages/core/src/view/connection/ConnectionHandler.ts b/packages/core/src/view/connection/ConnectionHandler.ts index 21dc66788..2a653db87 100644 --- a/packages/core/src/view/connection/ConnectionHandler.ts +++ b/packages/core/src/view/connection/ConnectionHandler.ts @@ -19,7 +19,7 @@ import { TOOLTIP_VERTICAL_OFFSET, VALID_COLOR, } from '../../util/Constants'; -import utils from '../../util/Utils'; +import utils, { convertPoint, getOffset, getRotatedPoint, getValue, toRadians } from '../../util/Utils'; import InternalMouseEvent from '../event/InternalMouseEvent'; import ImageShape from '../geometry/shape/node/ImageShape'; import CellMarker from '../cell/CellMarker'; @@ -39,6 +39,8 @@ import graph from '../Graph'; import Image from '../image/Image'; import CellState from '../cell/datatypes/CellState'; import Graph from '../Graph'; +import ConnectionConstraint from './ConnectionConstraint'; +import Shape from '../geometry/shape/Shape'; type FactoryMethod = (source: Cell, target: Cell, style?: string) => Cell; @@ -199,7 +201,8 @@ type FactoryMethod = (source: Cell, target: Cell, style?: string) => Cell; * the that represents the new edge. */ class ConnectionHandler extends EventSource { - constructor(graph: Graph, factoryMethod: FactoryMethod | null = null) { + constructor(graph: Graph, + factoryMethod: FactoryMethod | null = null) { super(); this.graph = graph; @@ -214,6 +217,20 @@ class ConnectionHandler extends EventSource { this.graph.addListener(InternalEvent.ESCAPE, this.escapeHandler); } + // TODO: Document me! + previous: CellState | null = null; + iconState: CellState | null = null; + icons: ImageShape[] | null = null; + cell: Cell | null = null; + currentPoint: Point | null = null; + sourceConstraint: ConnectionConstraint | null = null; + shape: Shape | null = null; + icon: ImageShape | null = null; + originalPoint: Point | null = null; + currentState: CellState | null = null; + selectedIcon: ImageShape | null = null; + waypoints: Point[] | null = null; + /** * Variable: graph * @@ -297,7 +314,8 @@ class ConnectionHandler extends EventSource { * * Holds the used for finding source and target cells. */ - marker?: CellMarker; + // @ts-ignore + marker: CellMarker; /** * Variable: constraintHandler @@ -410,7 +428,7 @@ class ConnectionHandler extends EventSource { * * Specifies the cursor to be used while the handler is active. Default is null. */ - cursor: string = null; + cursor: string | null = null; /** * Variable: insertBeforeSource @@ -585,7 +603,7 @@ class ConnectionHandler extends EventSource { // Overrides to return cell at location only if valid (so that // there is no highlight for invalid cells) - getCell = (me) => { + getCell(me: InternalMouseEvent) { let cell = super.getCell(me); self.error = null; @@ -604,9 +622,9 @@ class ConnectionHandler extends EventSource { } if ( - (self.graph.isSwimlane(cell) && + (self.graph.swimlane.isSwimlane(cell) && self.currentPoint != null && - self.graph.hitsSwimlaneContent( + self.graph.swimlane.hitsSwimlaneContent( cell, self.currentPoint.x, self.currentPoint.y @@ -645,29 +663,29 @@ class ConnectionHandler extends EventSource { }; // Sets the highlight color according to validateConnection - isValidState = (state) => { + isValidState(state: CellState) { if (self.isConnecting()) { return self.error == null; } return super.isValidState(state); - }; + } // Overrides to use marker color only in highlight mode or for // target selection - getMarkerColor = (evt, state, isValid) => { + getMarkerColor(evt: Event, state: CellState, isValid: boolean): string | null { return self.connectImage == null || self.isConnecting() ? super.getMarkerColor(evt, state, isValid) : null; - }; + } // Overrides to use hotspot only for source selection otherwise // intersects always returns true when over a cell - intersects = (state, evt) => { + intersects(state: CellState, evt: InternalMouseEvent) { if (self.connectImage != null || self.isConnecting()) { return true; } return super.intersects(state, evt); - }; + } } return new MyCellMarker(this.graph); @@ -747,7 +765,8 @@ class ConnectionHandler extends EventSource { * source - that represents the source terminal. * target - that represents the target terminal. */ - validateConnection(source: Cell, target: Cell): string { + validateConnection(source: Cell, + target: Cell): string { if (!this.isValidTarget(target)) { return ''; } @@ -764,7 +783,7 @@ class ConnectionHandler extends EventSource { * * state - whose connect image should be returned. */ - getConnectImage(state: CellState): Image { + getConnectImage(state: CellState): Image | null { return this.connectImage; } @@ -798,8 +817,7 @@ class ConnectionHandler extends EventSource { * * state - whose connect icons should be returned. */ - // createIcons(state: mxCellState): mxImageShape[]; - createIcons(state) { + createIcons(state: CellState): ImageShape[] | null { const image = this.getConnectImage(state); if (image != null && state != null) { @@ -868,7 +886,8 @@ class ConnectionHandler extends EventSource { * * icons - Optional array of to be redrawn. */ - redrawIcons(icons?: ImageShape[], state?: CellState): void { + redrawIcons(icons?: ImageShape[] | null, + state?: CellState): void { if (icons != null && icons[0] != null && state != null) { const pos = this.getIconPosition(icons[0], state); icons[0].bounds.x = pos.x; @@ -877,16 +896,9 @@ class ConnectionHandler extends EventSource { } } - /** - * Function: redrawIcons - * - * Redraws the given array of . - * - * Parameters: - * - * icons - Optional array of to be redrawn. - */ - getIconPosition(icon?: ImageShape[], state?: CellState): Point { + // TODO: Document me! =========================================================================================================== + getIconPosition(icon: ImageShape, + state: CellState): Point { const { scale } = this.graph.getView(); let cx = state.getCenterX(); let cy = state.getCenterY(); @@ -897,15 +909,15 @@ class ConnectionHandler extends EventSource { cx = size.width !== 0 ? state.x + (size.width * scale) / 2 : cx; cy = size.height !== 0 ? state.y + (size.height * scale) / 2 : cy; - const alpha = utils.toRadians( - utils.getValue(state.style, 'rotation') || 0 + const alpha = toRadians( + getValue(state.style, 'rotation') || 0 ); if (alpha !== 0) { const cos = Math.cos(alpha); const sin = Math.sin(alpha); const ct = new Point(state.getCenterX(), state.getCenterY()); - const pt = utils.getRotatedPoint(new Point(cx, cy), cos, sin, ct); + const pt = getRotatedPoint(new Point(cx, cy), cos, sin, ct); cx = pt.x; cy = pt.y; } @@ -1012,8 +1024,7 @@ class ConnectionHandler extends EventSource { * connecting. This implementation returns true if the state is not movable * in the graph. */ - // isImmediateConnectSource(state: mxCellState): boolean; - isImmediateConnectSource(state) { + isImmediateConnectSource(state: CellState): boolean { return !this.graph.isCellMovable(state.cell); } @@ -1034,8 +1045,7 @@ class ConnectionHandler extends EventSource { * }; * (end) */ - // createEdgeState(me: mxMouseEvent): mxCellState; - createEdgeState(me) { + createEdgeState(me: InternalMouseEvent): CellState | null { return null; } @@ -1045,9 +1055,8 @@ class ConnectionHandler extends EventSource { * Returns true if is true and the source of the event is the outline shape * or shift is pressed. */ - // isOutlineConnectEvent(me: mxMouseEvent): boolean; - isOutlineConnectEvent(me) { - const offset = utils.getOffset(this.graph.container); + isOutlineConnectEvent(me: InternalMouseEvent): boolean { + const offset = getOffset(this.graph.container); const evt = me.getEvent(); const clientX = getClientX(evt); @@ -1080,8 +1089,8 @@ class ConnectionHandler extends EventSource { * Updates the current state for a given mouse move event by using * the . */ - // updateCurrentState(me: mxMouseEvent, point: mxPoint): void; - updateCurrentState(me, point) { + updateCurrentState(me: InternalMouseEvent, + point: Point): void { this.constraintHandler.update( me, this.first == null, @@ -1214,8 +1223,7 @@ class ConnectionHandler extends EventSource { * * Returns true if the given cell does not allow new connections to be created. */ - // isCellEnabled(cell: mxCell): boolean; - isCellEnabled(cell) { + isCellEnabled(cell: Cell): boolean { return true; } @@ -1224,8 +1232,7 @@ class ConnectionHandler extends EventSource { * * Converts the given point from screen coordinates to model coordinates. */ - // convertWaypoint(point: mxPoint): void; - convertWaypoint(point) { + convertWaypoint(point: Point): void { const scale = this.graph.getView().getScale(); const tr = this.graph.getView().getTranslate(); @@ -1239,8 +1246,8 @@ class ConnectionHandler extends EventSource { * Called to snap the given point to the current preview. This snaps to the * first point of the preview if alt is not pressed. */ - // snapToPreview(me: mxMouseEvent, point: mxPoint): void; - snapToPreview(me, point) { + snapToPreview(me: MouseEvent, + point: Point): void { if (!isAltDown(me.getEvent()) && this.previous != null) { const tol = (this.graph.gridSize * this.graph.view.scale) / 2; const tmp = @@ -1264,8 +1271,8 @@ class ConnectionHandler extends EventSource { * Handles the event by updating the preview edge or by highlighting * a possible source or target terminal. */ - // mouseMove(sender: mxMouseEvent, me: mxMouseEvent): void; - mouseMove(sender, me) { + mouseMove(sender: MouseEvent, + me: InternalMouseEvent): void { if ( !me.isConsumed() && (this.ignoreMouseDown || this.first != null || !this.graph.isMouseDown) @@ -1282,10 +1289,10 @@ class ConnectionHandler extends EventSource { let point = new Point(me.getGraphX(), me.getGraphY()); this.error = null; - if (this.graph.isGridEnabledEvent(me.getEvent())) { + if (this.graph.grid.isGridEnabledEvent(me.getEvent())) { point = new point( - (this.graph.snap(point.x / scale - tr.x) + tr.x) * scale, - (this.graph.snap(point.y / scale - tr.y) + tr.y) * scale + (this.graph.grid.snap(point.x / scale - tr.x) + tr.x) * scale, + (this.graph.grid.snap(point.y / scale - tr.y) + tr.y) * scale ); } @@ -1528,8 +1535,8 @@ class ConnectionHandler extends EventSource { * * Updates . */ - // updateEdgeState(current: mxCellState, constraint: mxCellState): void; - updateEdgeState(current, constraint) { + updateEdgeState(current: CellState, + constraint: CellState): void { // TODO: Use generic method for writing constraint to style if (this.sourceConstraint != null && this.sourceConstraint.point != null) { this.edgeState.style.exitX = this.sourceConstraint.point.x; @@ -1609,8 +1616,8 @@ class ConnectionHandler extends EventSource { * state - that represents the target cell state. * me - that represents the mouse move. */ - // getTargetPerimeterPoint(state: mxCellState, me: mxMouseEvent): mxPoint; - getTargetPerimeterPoint(state, me) { + getTargetPerimeterPoint(state: CellState, + me: MouseEvent): Point { let result = null; const { view } = state; const targetPerimeter = view.getPerimeterFunction(state); @@ -1649,19 +1656,20 @@ class ConnectionHandler extends EventSource { * next - that represents the next point along the previewed edge. * me - that represents the mouse move. */ - // getSourcePerimeterPoint(state: mxCellState, next: mxPoint, me: mxMouseEvent): mxPoint; - getSourcePerimeterPoint(state, next, me) { + getSourcePerimeterPoint(state: CellState, + next: Point, + me: MouseEvent): Point { let result = null; const { view } = state; const sourcePerimeter = view.getPerimeterFunction(state); const c = new Point(state.getCenterX(), state.getCenterY()); if (sourcePerimeter != null) { - const theta = utils.getValue(state.style, 'rotation', 0); + const theta = getValue(state.style, 'rotation', 0); const rad = -theta * (Math.PI / 180); if (theta !== 0) { - next = utils.getRotatedPoint( + next = getRotatedPoint( new Point(next.x, next.y), Math.cos(rad), Math.sin(rad), @@ -1678,7 +1686,7 @@ class ConnectionHandler extends EventSource { if (tmp != null) { if (theta !== 0) { - tmp = utils.getRotatedPoint( + tmp = getRotatedPoint( new Point(tmp.x, tmp.y), Math.cos(-rad), Math.sin(-rad), @@ -1707,8 +1715,9 @@ class ConnectionHandler extends EventSource { * icons - Array of currently displayed icons. * me - that contains the mouse event. */ - // updateIcons(state: mxCellState, icons: string[], me: mxMouseEvent): void; - updateIcons(state, icons, me) { + updateIcons(state: CellState, + icons: string[], + me: InternalMouseEvent): void { // empty } @@ -1720,8 +1729,7 @@ class ConnectionHandler extends EventSource { * called if is true. This implemtation returns true * if there is a cell state in the given event. */ - // isStopEvent(me: mxMouseEvent): void; - isStopEvent(me) { + isStopEvent(me: InternalMouseEvent): boolean { return me.getState() != null; } @@ -1730,9 +1738,8 @@ class ConnectionHandler extends EventSource { * * Adds the waypoint for the given event to . */ - // addWaypointForEvent(me: mxMouseEvent): void; - addWaypointForEvent(me) { - let point = utils.convertPoint( + addWaypointForEvent(me: InternalMouseEvent): void { + let point = convertPoint( this.graph.container, me.getX(), me.getY() @@ -1783,8 +1790,8 @@ class ConnectionHandler extends EventSource { * * Handles the event by inserting the new connection. */ - // mouseUp(sender: mxMouseEvent, me: mxMouseEvent): void; - mouseUp(sender, me) { + mouseUp(sender: InternalMouseEvent, + me: InternalMouseEvent): void { if (!me.isConsumed() && this.isConnecting()) { if (this.waypointsEnabled && !this.isStopEvent(me)) { this.addWaypointForEvent(me); @@ -1851,8 +1858,7 @@ class ConnectionHandler extends EventSource { * * Resets the state of this handler. */ - // reset(): void; - reset() { + reset(): void { if (this.shape != null) { this.shape.destroy(); this.shape = null; @@ -1884,8 +1890,7 @@ class ConnectionHandler extends EventSource { * Redraws the preview edge using the color and width returned by * and . */ - // drawPreview(): void; - drawPreview() { + drawPreview(): void { this.updatePreview(this.error == null); this.shape.redraw(); } @@ -1901,8 +1906,7 @@ class ConnectionHandler extends EventSource { * valid - Boolean indicating if the color for a valid edge should be * returned. */ - // updatePreview(valid: boolean): void; - updatePreview(valid) { + updatePreview(valid: boolean): void { this.shape.strokewidth = this.getEdgeWidth(valid); this.shape.stroke = this.getEdgeColor(valid); } @@ -1918,8 +1922,7 @@ class ConnectionHandler extends EventSource { * valid - Boolean indicating if the color for a valid edge should be * returned. */ - // getEdgeColor(valid: boolean): string; - getEdgeColor(valid) { + getEdgeColor(valid: boolean): string { return valid ? VALID_COLOR : INVALID_COLOR; } @@ -1934,8 +1937,7 @@ class ConnectionHandler extends EventSource { * valid - Boolean indicating if the width for a valid edge should be * returned. */ - // getEdgeWidth(valid: boolean): number; - getEdgeWidth(valid) { + getEdgeWidth(valid: boolean): number { return valid ? 3 : 1; } @@ -1953,8 +1955,10 @@ class ConnectionHandler extends EventSource { * dropTarget - that represents the cell under the mouse when it was * released. */ - // connect(source: mxCell, target: mxCell, evt: MouseEvent, dropTarget: mxCell): void; - connect(source, target, evt, dropTarget) { + connect(source: Cell, + target: Cell, + evt: MouseEvent, + dropTarget: Cell): void { if ( target != null || this.isCreateTarget(evt) || @@ -2150,8 +2154,8 @@ class ConnectionHandler extends EventSource { * Selects the given edge after adding a new connection. The target argument * contains the target vertex if one has been inserted. */ - // selectCells(edge: mxCell, target: mxCell): void; - selectCells(edge, target) { + selectCells(edge: Cell, + target: Cell): void { this.graph.setSelectionCell(edge); } @@ -2162,8 +2166,13 @@ class ConnectionHandler extends EventSource { * implementation does only use if is defined, * otherwise will be used. */ - // insertEdge(parent: mxCell, id: string, value: any, source: mxCell, target: mxCell, style: string): mxCell; - insertEdge(parent, id, value, source, target, style) { + insertEdge(parent: Cell, + id: string, + value: any, + source: Cell, + target: Cell, + style: string): Cell { + if (this.factoryMethod == null) { return this.graph.insertEdge(parent, id, value, source, target, style); } @@ -2185,8 +2194,8 @@ class ConnectionHandler extends EventSource { * evt - Mousedown event of the connect gesture. * source - that represents the source terminal. */ - // createTargetVertex(evt: MouseEvent, source: mxCell): mxCell; - createTargetVertex(evt, source) { + createTargetVertex(evt: MouseEvent, + source: Cell): Cell { // Uses the first non-relative source let geo = source.getGeometry(); @@ -2237,11 +2246,10 @@ class ConnectionHandler extends EventSource { * * Returns the tolerance for aligning new targets to sources. This returns the grid size / 2. */ - // getAlignmentTolerance(evt: MouseEvent): number; - getAlignmentTolerance(evt) { - return this.graph.isGridEnabled() - ? this.graph.gridSize / 2 - : this.graph.tolerance; + getAlignmentTolerance(evt: MouseEvent): number { + return this.graph.grid.isGridEnabled() + ? this.graph.grid.gridSize / 2 + : this.graph.grid.tolerance; } /** @@ -2259,8 +2267,10 @@ class ConnectionHandler extends EventSource { * target - that represents the target terminal. * style - Optional style from the preview edge. */ - // createEdge(value?: any, source?: mxCell, target?: mxCell, style?: string): mxCell; - createEdge(value, source, target, style) { + createEdge(value?: any, + source?: Cell, + target?: Cell, + style?: string): Cell { let edge = null; // Creates a new edge using the factoryMethod @@ -2288,8 +2298,7 @@ class ConnectionHandler extends EventSource { * called on all instances. It is called automatically for the built-in * instance created for each . */ - // destroy(): void; - destroy() { + destroy(): void { this.graph.removeMouseListener(this); if (this.shape != null) { diff --git a/packages/core/src/view/event/EventSource.ts b/packages/core/src/view/event/EventSource.ts index ef282ddd6..0afdab324 100644 --- a/packages/core/src/view/event/EventSource.ts +++ b/packages/core/src/view/event/EventSource.ts @@ -151,7 +151,7 @@ class EventSource { fireEvent(evt: EventObject, sender: any = null): void { if (this.eventListeners != null && this.isEventsEnabled()) { if (evt == null) { - evt = new EventObject(); + evt = new EventObject(''); } if (sender == null) { diff --git a/packages/core/src/view/model/Model.ts b/packages/core/src/view/model/Model.ts index 5ca5b3618..88468f60f 100644 --- a/packages/core/src/view/model/Model.ts +++ b/packages/core/src/view/model/Model.ts @@ -887,7 +887,7 @@ class Model extends EventSource { * the new cell style. */ styleForCellChanged(cell: Cell, - style: string): string | null { + style: string | null): string | null { const previous = cell.getStyle(); cell.setStyle(style); diff --git a/packages/core/src/view/popups_menus/PopupMenuHandler.js b/packages/core/src/view/popups_menus/PopupMenuHandler.ts similarity index 100% rename from packages/core/src/view/popups_menus/PopupMenuHandler.js rename to packages/core/src/view/popups_menus/PopupMenuHandler.ts diff --git a/packages/core/src/view/snap/GraphSnap.ts b/packages/core/src/view/snap/GraphSnap.ts index a806ac588..1bb17470b 100644 --- a/packages/core/src/view/snap/GraphSnap.ts +++ b/packages/core/src/view/snap/GraphSnap.ts @@ -1,7 +1,16 @@ import Point from "../geometry/Point"; import Rectangle from "../geometry/Rectangle"; +import Graph from '../Graph'; class GraphSnap { + constructor(graph: Graph) { + this.graph = graph; + } + + // TODO: Document me! + tolerance: number | null = null; + graph: Graph; + /** * Specifies the grid size. * @default 10 @@ -42,8 +51,8 @@ class GraphSnap { ignoreHorizontal: boolean = false, ignoreVertical: boolean = false ): Point { - const t = this.view.translate; - const s = this.view.scale; + const t = this.graph.view.translate; + const s = this.graph.view.scale; if (!ignoreGrid && this.gridEnabled) { const tol = this.gridSize * s * 0.5; @@ -131,7 +140,7 @@ class GraphSnap { /** * Returns {@link tolerance}. */ - getTolerance(): number { + getTolerance(): number | null { return this.tolerance; } diff --git a/packages/core/src/view/style/EdgeStyle.js b/packages/core/src/view/style/EdgeStyle.ts similarity index 100% rename from packages/core/src/view/style/EdgeStyle.js rename to packages/core/src/view/style/EdgeStyle.ts diff --git a/packages/core/src/view/style/Perimeter.ts b/packages/core/src/view/style/Perimeter.ts index 548d7787c..2dd7e5bb0 100644 --- a/packages/core/src/view/style/Perimeter.ts +++ b/packages/core/src/view/style/Perimeter.ts @@ -5,7 +5,7 @@ * Type definitions from the typed-mxgraph project */ -import utils from '../../util/Utils'; +import utils, { intersection } from '../../util/Utils'; import Point from '../geometry/Point'; import { DIRECTION_EAST, @@ -15,6 +15,7 @@ import { } from '../../util/Constants'; import Rectangle from '../geometry/Rectangle'; import CellState from '../cell/datatypes/CellState'; +import { CellStateStyles } from '../../types'; /** * @class Perimeter @@ -292,14 +293,14 @@ class Perimeter { // set the slope and offset of the border line accordingly if (px < cx) { if (py < cy) { - return utils.intersection(px, py, tx, ty, cx, y, x, cy); + return intersection(px, py, tx, ty, cx, y, x, cy); } - return utils.intersection(px, py, tx, ty, cx, y + h, x, cy); + return intersection(px, py, tx, ty, cx, y + h, x, cy); } if (py < cy) { - return utils.intersection(px, py, tx, ty, cx, y, x + w, cy); + return intersection(px, py, tx, ty, cx, y, x + w, cy); } - return utils.intersection(px, py, tx, ty, cx, y + h, x + w, cy); + return intersection(px, py, tx, ty, cx, y + h, x + w, cy); } /** @@ -402,7 +403,7 @@ class Perimeter { (vertical && next.x <= x + w / 2) || (!vertical && next.y <= y + h / 2) ) { - result = utils.intersection( + result = intersection( next.x, next.y, cx, @@ -413,7 +414,7 @@ class Perimeter { corner.y ); } else { - result = utils.intersection( + result = intersection( next.x, next.y, cx, @@ -462,7 +463,7 @@ class Perimeter { const direction = vertex != null - ? utils.getValue(vertex.style, 'direction', DIRECTION_EAST) + ? Perimeter.getValue(vertex.style, 'direction', DIRECTION_EAST) : DIRECTION_EAST; const vertical = direction === DIRECTION_NORTH || direction === DIRECTION_SOUTH; @@ -639,7 +640,7 @@ class Perimeter { } } - result = utils.intersection(tx, ty, next.x, next.y, a.x, a.y, b.x, b.y); + result = intersection(tx, ty, next.x, next.y, a.x, a.y, b.x, b.y); } else { if (vertical) { const beta = Math.atan2(h / 4, w / 2); @@ -730,7 +731,7 @@ class Perimeter { } } - result = utils.intersection(cx, cy, next.x, next.y, a.x, a.y, b.x, b.y); + result = intersection(cx, cy, next.x, next.y, a.x, a.y, b.x, b.y); } if (result == null) { @@ -738,6 +739,10 @@ class Perimeter { } return result; } + + private static getValue(style: CellStateStyles, direction: string, DIRECTION_EAST: string) { + return ''; + } } export default Perimeter; diff --git a/packages/core/src/view/style/StyleRegistry.ts b/packages/core/src/view/style/StyleRegistry.ts index 0c9f3730d..90196b0b8 100644 --- a/packages/core/src/view/style/StyleRegistry.ts +++ b/packages/core/src/view/style/StyleRegistry.ts @@ -29,7 +29,7 @@ import Perimeter from './Perimeter'; * in a style. This is currently only used to perimeters and edge styles. */ class StyleRegistry { - /* + /** * Variable: values * * Maps from strings to objects.