Skip to content

Commit

Permalink
fix: fix remaining JSDoc and TS errors
Browse files Browse the repository at this point in the history
  • Loading branch information
philippfromme committed Apr 13, 2023
1 parent e633728 commit c692e16
Show file tree
Hide file tree
Showing 30 changed files with 922 additions and 226 deletions.
4 changes: 4 additions & 0 deletions lib/features/editor-actions/BpmnEditorActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ import {
getBBox
} from 'diagram-js/lib/util/Elements';

/**
* @typedef {import('didi').Injector} Injector
*/

/**
* Registers and executes BPMN specific editor actions.
*
Expand Down
7 changes: 7 additions & 0 deletions lib/features/grid-snapping/BpmnGridSnapping.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
import { isAny } from '../modeling/util/ModelingUtil';

/**
* @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
*/

/**
* @param {EventBus} eventBus
*/
export default function BpmnGridSnapping(eventBus) {
eventBus.on([
'create.init',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,19 @@ import { getNewShapePosition } from '../../auto-place/BpmnAutoPlaceUtil';
import { getMid } from 'diagram-js/lib/layout/LayoutUtil';
import { is } from '../../../util/ModelUtil';

var HIGH_PRIORITY = 2000;
/**
* @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
* @typedef {import('diagram-js/lib/features/grid-snapping/GridSnapping').default} GridSnapping
*
* @typedef {import('diagram-js/lib/util/Types').Axis} Axis
*/

var HIGH_PRIORITY = 2000;

/**
* @param {EventBus} eventBus
* @param {GridSnapping} gridSnapping
*/
export default function GridSnappingAutoPlaceBehavior(eventBus, gridSnapping) {
eventBus.on('autoPlace', HIGH_PRIORITY, function(context) {
var source = context.source,
Expand Down Expand Up @@ -54,6 +64,11 @@ GridSnappingAutoPlaceBehavior.$inject = [

// helpers //////////

/**
* @param {Axis} axis
*
* @return {boolean}
*/
function isHorizontal(axis) {
return axis === 'x';
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,23 @@ import {
assign
} from 'min-dash';

/**
* @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
* @typedef {import('diagram-js/lib/features/grid-snapping/GridSnapping').default} GridSnapping
* @typedef {import('../../modeling/Modeling').default} Modeling
*
* @typedef {import('diagram-js/lib/util/Types').Point} Point
*/

var HIGH_PRIORITY = 3000;


/**
* Snaps connections with Manhattan layout.
*
* @param {EventBus} eventBus
* @param {GridSnapping} gridSnapping
* @param {Modeling} modeling
*/
export default function GridSnappingLayoutConnectionBehavior(eventBus, gridSnapping, modeling) {
CommandInterceptor.call(this, eventBus);
Expand Down Expand Up @@ -53,9 +65,9 @@ inherits(GridSnappingLayoutConnectionBehavior, CommandInterceptor);
/**
* Snap middle segments of a given connection.
*
* @param {Array<Point>} waypoints
* @param {Point[]} waypoints
*
* @returns {Array<Point>}
* @return {Point[]}
*/
GridSnappingLayoutConnectionBehavior.prototype.snapMiddleSegments = function(waypoints) {
var gridSnapping = this._gridSnapping,
Expand All @@ -80,9 +92,9 @@ GridSnappingLayoutConnectionBehavior.prototype.snapMiddleSegments = function(way
/**
* Check whether a connection has a middle segments.
*
* @param {Array} waypoints
* @param {Point[]} waypoints
*
* @returns {boolean}
* @return {boolean}
*/
function hasMiddleSegments(waypoints) {
return waypoints.length > 3;
Expand All @@ -93,7 +105,7 @@ function hasMiddleSegments(waypoints) {
*
* @param {string} aligned
*
* @returns {boolean}
* @return {boolean}
*/
function horizontallyAligned(aligned) {
return aligned === 'h';
Expand All @@ -104,7 +116,7 @@ function horizontallyAligned(aligned) {
*
* @param {string} aligned
*
* @returns {boolean}
* @return {boolean}
*/
function verticallyAligned(aligned) {
return aligned === 'v';
Expand All @@ -113,9 +125,9 @@ function verticallyAligned(aligned) {
/**
* Get middle segments from a given connection.
*
* @param {Array} waypoints
* @param {Point[]} waypoints
*
* @returns {Array}
* @return {Point[]}
*/
function snapSegment(gridSnapping, segmentStart, segmentEnd) {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
import { is } from '../../../util/ModelUtil';

var HIGHER_PRIORITY = 1750;
/**
* @typedef {import('diagram-js/lib/core/Canvas').default} Canvas
* @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
* @typedef {import('diagram-js/lib/features/grid-snapping/GridSnapping').default} GridSnapping
*/

var HIGHER_PRIORITY = 1750;

/**
* @param {Canvas} canvas
* @param {EventBus} eventBus
* @param {GridSnapping} gridSnapping
*/
export default function GridSnappingParticipantBehavior(canvas, eventBus, gridSnapping) {
eventBus.on([
'create.start',
Expand Down
43 changes: 34 additions & 9 deletions lib/features/interaction-events/BpmnInteractionEvents.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@ import { is } from '../../util/ModelUtil';

import { isExpanded } from '../../util/DiUtil';

/**
* @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
* @typedef {import('diagram-js/lib/features/interaction-events/InteractionEvents').default} InteractionEvents
*
* @typedef {import('../../model/Types').BpmnElement} BpmnElement
* @typedef {import('../../model/Types').BpmnShape} BpmnShape
*/

var LABEL_WIDTH = 30,
LABEL_HEIGHT = 30;

Expand All @@ -26,22 +34,22 @@ export default function BpmnInteractionEvents(eventBus, interactionEvents) {
gfx = context.gfx;

if (is(element, 'bpmn:Lane')) {
return self.createParticipantHit(element, gfx);
return self._createParticipantHit(element, gfx);
} else

if (is(element, 'bpmn:Participant')) {
if (isExpanded(element)) {
return self.createParticipantHit(element, gfx);
return self._createParticipantHit(element, gfx);
} else {
return self.createDefaultHit(element, gfx);
return self._createDefaultHit(element, gfx);
}
} else

if (is(element, 'bpmn:SubProcess')) {
if (isExpanded(element)) {
return self.createSubProcessHit(element, gfx);
return self._createSubProcessHit(element, gfx);
} else {
return self.createDefaultHit(element, gfx);
return self._createDefaultHit(element, gfx);
}
}
});
Expand All @@ -53,8 +61,13 @@ BpmnInteractionEvents.$inject = [
'interactionEvents'
];


BpmnInteractionEvents.prototype.createDefaultHit = function(element, gfx) {
/**
* @param {BpmnElement} element
* @param {SVGElement} gfx
*
* @return {boolean}
*/
BpmnInteractionEvents.prototype._createDefaultHit = function(element, gfx) {
this._interactionEvents.removeHits(gfx);

this._interactionEvents.createDefaultHit(element, gfx);
Expand All @@ -63,7 +76,13 @@ BpmnInteractionEvents.prototype.createDefaultHit = function(element, gfx) {
return true;
};

BpmnInteractionEvents.prototype.createParticipantHit = function(element, gfx) {
/**
* @param {BpmnShape} element
* @param {SVGElement} gfx
*
* @return {boolean}
*/
BpmnInteractionEvents.prototype._createParticipantHit = function(element, gfx) {

// remove existing hits
this._interactionEvents.removeHits(gfx);
Expand All @@ -90,7 +109,13 @@ BpmnInteractionEvents.prototype.createParticipantHit = function(element, gfx) {
return true;
};

BpmnInteractionEvents.prototype.createSubProcessHit = function(element, gfx) {
/**
* @param {BpmnShape} element
* @param {SVGElement} gfx
*
* @return {boolean}
*/
BpmnInteractionEvents.prototype._createSubProcessHit = function(element, gfx) {

// remove existing hits
this._interactionEvents.removeHits(gfx);
Expand Down
5 changes: 5 additions & 0 deletions lib/features/keyboard/BpmnKeyboardBindings.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ import inherits from 'inherits-browser';

import KeyboardBindings from 'diagram-js/lib/features/keyboard/KeyboardBindings';

/**
* @typedef {import('didi').Injector} Injector
* @typedef {import('diagram-js/lib/features/editor-actions/EditorActions').default} EditorActions
* @typedef {import('diagram-js/lib/features/keyboard/Keyboard').default} Keyboard
*/

/**
* BPMN 2.0 specific keyboard bindings.
Expand Down
19 changes: 13 additions & 6 deletions lib/features/label-editing/LabelEditingPreview.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,21 @@ import {
translate
} from 'diagram-js/lib/util/SvgTransformUtil';

/**
* @typedef {import('diagram-js/lib/core/Canvas').default} Canvas
* @typedef {import('diagram-js/lib/core/EventBus').default} EventBus
* @typedef {import('../../draw/PathMap').default} PathMap
*/

var MARKER_HIDDEN = 'djs-element-hidden',
MARKER_LABEL_HIDDEN = 'djs-label-hidden';


export default function LabelEditingPreview(
eventBus, canvas, elementRegistry,
pathMap) {
/**
* @param {EventBus} eventBus
* @param {Canvas} canvas
* @param {PathMap} pathMap
*/
export default function LabelEditingPreview(eventBus, canvas, pathMap) {

var self = this;

Expand Down Expand Up @@ -124,12 +132,11 @@ export default function LabelEditingPreview(
LabelEditingPreview.$inject = [
'eventBus',
'canvas',
'elementRegistry',
'pathMap'
];


// helpers ///////////////////
// helpers //////////

function getStrokeColor(element, defaultColor) {
var di = getDi(element);
Expand Down

0 comments on commit c692e16

Please sign in to comment.