Trying to run HelloWorld...

development
Junsik Shim 2021-09-09 10:14:59 +09:00
parent 65d800d5be
commit a7429b2a54
12 changed files with 67 additions and 60 deletions

View File

@ -44,17 +44,21 @@ class ObjectIdentity {
/** /**
* Returns the ID for the given object or function. * Returns the ID for the given object or function.
*/ */
static get(obj: IdentityObject | IdentityFunction) { static get(obj: IdentityObject | IdentityFunction | null) {
if (isNullish(obj[FIELD_NAME])) { if (obj) {
if (typeof obj === 'object') { if (isNullish(obj[FIELD_NAME])) {
const ctor = getFunctionName(obj.constructor); if (typeof obj === 'object') {
obj[FIELD_NAME] = `${ctor}#${ObjectIdentity.counter++}`; const ctor = getFunctionName(obj.constructor);
} else if (typeof obj === 'function') { obj[FIELD_NAME] = `${ctor}#${ObjectIdentity.counter++}`;
obj[FIELD_NAME] = `Function#${ObjectIdentity.counter++}`; } else if (typeof obj === 'function') {
obj[FIELD_NAME] = `Function#${ObjectIdentity.counter++}`;
}
} }
return obj[FIELD_NAME] as string;
} }
return obj[FIELD_NAME] as string; return null;
} }
/** /**

View File

@ -26,6 +26,7 @@ import {
FONT_STRIKETHROUGH, FONT_STRIKETHROUGH,
FONT_UNDERLINE, FONT_UNDERLINE,
LINE_HEIGHT, LINE_HEIGHT,
NONE,
NS_SVG, NS_SVG,
NS_XLINK, NS_XLINK,
WORD_WRAP, WORD_WRAP,
@ -666,37 +667,37 @@ class SvgCanvas2D extends AbstractCanvas2D {
const { node } = this; const { node } = this;
const s = this.state; const s = this.state;
if (node != null) { if (node) {
if (node.nodeName === 'path') { if (node.nodeName === 'path') {
// Checks if the path is not empty // Checks if the path is not empty
if (this.path != null && this.path.length > 0) { if (this.path && this.path.length > 0) {
node.setAttribute('d', this.path.join(' ')); node.setAttribute('d', this.path.join(' '));
} else { } else {
return; return;
} }
} }
if (filled && s.fillColor != null) { if (filled && s.fillColor !== NONE) {
this.updateFill(); this.updateFill();
} else if (!this.styleEnabled) { } else if (!this.styleEnabled) {
// Workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=814952 // Workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=814952
if (node.nodeName === 'ellipse' && mxClient.IS_FF) { if (node.nodeName === 'ellipse' && mxClient.IS_FF) {
node.setAttribute('fill', 'transparent'); node.setAttribute('fill', 'transparent');
} else { } else {
node.setAttribute('fill', 'none'); node.setAttribute('fill', NONE);
} }
// Sets the actual filled state for stroke tolerance // Sets the actual filled state for stroke tolerance
filled = false; filled = false;
} }
if (stroked && s.strokeColor != null) { if (stroked && s.strokeColor !== NONE) {
this.updateStroke(); this.updateStroke();
} else if (!this.styleEnabled) { } else if (!this.styleEnabled) {
node.setAttribute('stroke', 'none'); node.setAttribute('stroke', NONE);
} }
if (s.transform != null && s.transform.length > 0) { if (s.transform && s.transform.length > 0) {
node.setAttribute('transform', s.transform); node.setAttribute('transform', s.transform);
} }
@ -714,8 +715,8 @@ class SvgCanvas2D extends AbstractCanvas2D {
node.setAttribute('pointer-events', this.pointerEventsValue); node.setAttribute('pointer-events', this.pointerEventsValue);
} }
// Enables clicks for nodes inside a link element // Enables clicks for nodes inside a link element
else if (!this.pointerEvents && this.originalRoot == null) { else if (!this.pointerEvents && !this.originalRoot) {
node.setAttribute('pointer-events', 'none'); node.setAttribute('pointer-events', NONE);
} }
// Removes invisible nodes from output if they don't handle events // Removes invisible nodes from output if they don't handle events
@ -723,10 +724,10 @@ class SvgCanvas2D extends AbstractCanvas2D {
(node.nodeName !== 'rect' && (node.nodeName !== 'rect' &&
node.nodeName !== 'path' && node.nodeName !== 'path' &&
node.nodeName !== 'ellipse') || node.nodeName !== 'ellipse') ||
(node.getAttribute('fill') !== 'none' && (node.getAttribute('fill') !== NONE &&
node.getAttribute('fill') !== 'transparent') || node.getAttribute('fill') !== 'transparent') ||
node.getAttribute('stroke') !== 'none' || node.getAttribute('stroke') !== NONE ||
node.getAttribute('pointer-events') !== 'none' node.getAttribute('pointer-events') !== NONE
) { ) {
// LATER: Update existing DOM for performance // LATER: Update existing DOM for performance
this.root.appendChild(node); this.root.appendChild(node);
@ -748,8 +749,8 @@ class SvgCanvas2D extends AbstractCanvas2D {
this.node.setAttribute('fill-opacity', String(s.alpha * s.fillAlpha)); this.node.setAttribute('fill-opacity', String(s.alpha * s.fillAlpha));
} }
if (s.fillColor) { if (s.fillColor !== NONE) {
if (s.gradientColor) { if (s.gradientColor !== NONE) {
const id = this.getSvgGradient( const id = this.getSvgGradient(
s.fillColor, s.fillColor,
s.gradientColor, s.gradientColor,
@ -790,7 +791,8 @@ class SvgCanvas2D extends AbstractCanvas2D {
const s = this.state; const s = this.state;
if (s.strokeColor) this.node.setAttribute('stroke', s.strokeColor.toLowerCase()); if (s.strokeColor !== NONE)
this.node.setAttribute('stroke', s.strokeColor.toLowerCase());
if (s.alpha < 1 || s.strokeAlpha < 1) { if (s.alpha < 1 || s.strokeAlpha < 1) {
this.node.setAttribute('stroke-opacity', String(s.alpha * s.strokeAlpha)); this.node.setAttribute('stroke-opacity', String(s.alpha * s.strokeAlpha));
@ -894,10 +896,10 @@ class SvgCanvas2D extends AbstractCanvas2D {
shadow.getAttribute('fill') !== 'none' && shadow.getAttribute('fill') !== 'none' &&
(!mxClient.IS_FF || shadow.getAttribute('fill') !== 'transparent') (!mxClient.IS_FF || shadow.getAttribute('fill') !== 'transparent')
) { ) {
shadow.setAttribute('fill', String(s.shadowColor)); shadow.setAttribute('fill', s.shadowColor);
} }
if (shadow.getAttribute('stroke') !== 'none' && s.shadowColor) { if (shadow.getAttribute('stroke') !== 'none' && s.shadowColor !== NONE) {
shadow.setAttribute('stroke', s.shadowColor); shadow.setAttribute('stroke', s.shadowColor);
} }
@ -1725,7 +1727,7 @@ class SvgCanvas2D extends AbstractCanvas2D {
updateFont(node: SVGElement) { updateFont(node: SVGElement) {
const s = this.state; const s = this.state;
if (s.fontColor) node.setAttribute('fill', s.fontColor); if (s.fontColor !== NONE) node.setAttribute('fill', s.fontColor);
if (!this.styleEnabled || s.fontFamily !== DEFAULT_FONTFAMILY) { if (!this.styleEnabled || s.fontFamily !== DEFAULT_FONTFAMILY) {
node.setAttribute('font-family', s.fontFamily); node.setAttribute('font-family', s.fontFamily);

View File

@ -287,7 +287,7 @@ class CellMarker extends EventSource {
if (state !== this.markedState || color !== this.currentColor) { if (state !== this.markedState || color !== this.currentColor) {
this.currentColor = color; this.currentColor = color;
if (state && this.currentColor) { if (state && this.currentColor !== NONE) {
this.markedState = state; this.markedState = state;
this.mark(); this.mark();
} else if (this.markedState) { } else if (this.markedState) {

View File

@ -359,7 +359,6 @@ class CellRenderer {
if (value === 'inherit') { if (value === 'inherit') {
referenced = state.cell.getParent(); referenced = state.cell.getParent();
/* disable swimlane for now
} else if (value === 'swimlane') { } else if (value === 'swimlane') {
// @ts-ignore // @ts-ignore
shape[field] = shape[field] =
@ -371,9 +370,8 @@ class CellRenderer {
referenced = state.cell; referenced = state.cell;
} }
referenced = graph.swimlane.getSwimlane(<Cell>referenced); referenced = graph.getSwimlane(<Cell>referenced);
key = graph.swimlane.swimlaneIndicatorColorAttribute; key = graph.swimlaneIndicatorColorAttribute;
*/
} else if (value === 'indicated' && state.shape) { } else if (value === 'indicated' && state.shape) {
// @ts-ignore // @ts-ignore
shape[field] = state.shape.indicatorColor; shape[field] = state.shape.indicatorColor;
@ -437,7 +435,7 @@ class CellRenderer {
state.text = new this.defaultTextShape( state.text = new this.defaultTextShape(
value, value,
new Rectangle(), new Rectangle(),
state.style.align || ALIGN_CENTER, state.style.align ?? ALIGN_CENTER,
state.getVerticalAlign(), state.getVerticalAlign(),
state.style.fontColor, state.style.fontColor,
state.style.fontFamily, state.style.fontFamily,
@ -455,9 +453,9 @@ class CellRenderer {
graph.isLabelClipped(state.cell), graph.isLabelClipped(state.cell),
state.style.overflow, state.style.overflow,
state.style.labelPadding, state.style.labelPadding,
state.style.textDirection || DEFAULT_TEXT_DIRECTION state.style.textDirection ?? DEFAULT_TEXT_DIRECTION
); );
state.text.opacity = state.style.textOpacity; state.text.opacity = state.style.textOpacity ?? 100;
state.text.dialect = isForceHtml ? DIALECT_STRICTHTML : state.view.graph.dialect; state.text.dialect = isForceHtml ? DIALECT_STRICTHTML : state.view.graph.dialect;
state.text.style = state.style; state.text.style = state.style;
state.text.state = state; state.text.state = state;
@ -928,7 +926,7 @@ class CellRenderer {
const isForceHtml = const isForceHtml =
state.view.graph.isHtmlLabel(state.cell) || (value && isNode(value)); state.view.graph.isHtmlLabel(state.cell) || (value && isNode(value));
const dialect = isForceHtml ? DIALECT_STRICTHTML : state.view.graph.dialect; const dialect = isForceHtml ? DIALECT_STRICTHTML : state.view.graph.dialect;
const overflow = state.style.overflow || 'visible'; const overflow = state.style.overflow ?? 'visible';
if ( if (
state.text && state.text &&

View File

@ -1409,7 +1409,7 @@ const GraphCellsMixin: PartialType = {
this.getModel().setStyle(cell, cellStyle); this.getModel().setStyle(cell, cellStyle);
} else {*/ } else {*/
const state = this.getView().createState(cell); const state = this.getView().createState(cell);
const align = state.style.align || ALIGN_CENTER; const align = state.style.align ?? ALIGN_CENTER;
if (align === ALIGN_RIGHT) { if (align === ALIGN_RIGHT) {
geo.x += geo.width - size.width; geo.x += geo.width - size.width;
@ -2377,7 +2377,7 @@ const GraphCellsMixin: PartialType = {
const state = this.getView().getState(cell); const state = this.getView().getState(cell);
if (state && cell.isVisible() && (!ignoreFn || !ignoreFn(state))) { if (state && cell.isVisible() && (!ignoreFn || !ignoreFn(state))) {
const deg = state.style.rotation; const deg = state.style.rotation ?? 0;
let box: CellState | Rectangle = state; // TODO: CHECK ME!!!! ========================================================== let box: CellState | Rectangle = state; // TODO: CHECK ME!!!! ==========================================================
if (deg !== 0) { if (deg !== 0) {
@ -2486,7 +2486,7 @@ const GraphCellsMixin: PartialType = {
pt = next; pt = next;
} }
} else { } else {
const alpha = toRadians(state.style.rotation); const alpha = toRadians(state.style.rotation ?? 0);
if (alpha !== 0) { if (alpha !== 0) {
const cos = Math.cos(-alpha); const cos = Math.cos(-alpha);

View File

@ -12,7 +12,7 @@ import GraphView from '../../view/GraphView';
import Shape from '../../geometry/shape/Shape'; import Shape from '../../geometry/shape/Shape';
import TextShape from '../../geometry/shape/node/TextShape'; import TextShape from '../../geometry/shape/node/TextShape';
import Dictionary from '../../../util/Dictionary'; import Dictionary from '../../../util/Dictionary';
import { NONE } from '../../../util/Constants'; import { ALIGN_MIDDLE, NONE } from '../../../util/Constants';
import { CellStateStyles } from '../../../types'; import { CellStateStyles } from '../../../types';
import RectangleShape from '../../geometry/shape/node/RectangleShape'; import RectangleShape from '../../geometry/shape/node/RectangleShape';
import CellOverlay from '../CellOverlay'; import CellOverlay from '../CellOverlay';
@ -466,7 +466,7 @@ class CellState extends Rectangle {
* returned. * returned.
*/ */
getVerticalAlign() { getVerticalAlign() {
return this.style.verticalAlign; return this.style.verticalAlign ?? ALIGN_MIDDLE;
} }
/** /**
@ -477,8 +477,8 @@ class CellState extends Rectangle {
isTransparentState() { isTransparentState() {
let result = false; let result = false;
const stroke = this.style.strokeColor; const stroke = this.style.strokeColor ?? NONE;
const fill = this.style.fillColor; const fill = this.style.fillColor ?? NONE;
result = stroke === NONE && fill === NONE && !this.getImageSrc(); result = stroke === NONE && fill === NONE && !this.getImageSrc();

View File

@ -1046,7 +1046,7 @@ class VertexHandler {
*/ */
resizeVertex(me: InternalMouseEvent) { resizeVertex(me: InternalMouseEvent) {
const ct = new Point(this.state.getCenterX(), this.state.getCenterY()); const ct = new Point(this.state.getCenterX(), this.state.getCenterY());
const alpha = toRadians(this.state.style.rotation); const alpha = toRadians(this.state.style.rotation ?? 0);
const point = new Point(me.getGraphX(), me.getGraphY()); const point = new Point(me.getGraphX(), me.getGraphY());
const tr = this.graph.view.translate; const tr = this.graph.view.translate;
const { scale } = this.graph.view; const { scale } = this.graph.view;
@ -1334,7 +1334,7 @@ class VertexHandler {
} }
} else if (index === InternalEvent.ROTATION_HANDLE) { } else if (index === InternalEvent.ROTATION_HANDLE) {
if (this.currentAlpha != null) { if (this.currentAlpha != null) {
const delta = this.currentAlpha - (this.state.style.rotation || 0); const delta = this.currentAlpha - (this.state.style.rotation ?? 0);
if (delta !== 0) { if (delta !== 0) {
this.rotateCell(this.state.cell, delta); this.rotateCell(this.state.cell, delta);
@ -1344,7 +1344,7 @@ class VertexHandler {
} }
} else { } else {
const gridEnabled = this.graph.isGridEnabledEvent(me.getEvent()); const gridEnabled = this.graph.isGridEnabledEvent(me.getEvent());
const alpha = toRadians(this.state.style.rotation); const alpha = toRadians(this.state.style.rotation ?? 0);
const cos = Math.cos(-alpha); const cos = Math.cos(-alpha);
const sin = Math.sin(-alpha); const sin = Math.sin(-alpha);
@ -1523,7 +1523,7 @@ class VertexHandler {
if (geo && this.labelShape && this.labelShape.bounds) { if (geo && this.labelShape && this.labelShape.bounds) {
if (index === InternalEvent.LABEL_HANDLE) { if (index === InternalEvent.LABEL_HANDLE) {
const alpha = -toRadians(this.state.style.rotation); const alpha = -toRadians(this.state.style.rotation ?? 0);
const cos = Math.cos(alpha); const cos = Math.cos(alpha);
const sin = Math.sin(alpha); const sin = Math.sin(alpha);
const { scale } = this.graph.view; const { scale } = this.graph.view;
@ -1923,7 +1923,7 @@ class VertexHandler {
'w-resize', 'w-resize',
]; ];
const alpha = toRadians(this.state.style.rotation); const alpha = toRadians(this.state.style.rotation ?? 0);
const cos = Math.cos(alpha); const cos = Math.cos(alpha);
const sin = Math.sin(alpha); const sin = Math.sin(alpha);
const da = Math.round((alpha * 4) / Math.PI); const da = Math.round((alpha * 4) / Math.PI);

View File

@ -76,7 +76,7 @@ class ConstraintHandler {
focusIcons: ImageShape[] = []; focusIcons: ImageShape[] = [];
constraints: ConnectionConstraint[] = []; constraints: ConnectionConstraint[] | null = null;
currentConstraint: ConnectionConstraint | null = null; currentConstraint: ConnectionConstraint | null = null;
@ -275,6 +275,7 @@ class ConstraintHandler {
2 * tol, 2 * tol,
2 * tol 2 * tol
); );
const state = this.graph.view.getState(this.getCellForEvent(me, point) as Cell); const state = this.graph.view.getState(this.getCellForEvent(me, point) as Cell);
// Keeps focus icons visible while over vertex bounds and no other cell under mouse or shift is pressed // Keeps focus icons visible while over vertex bounds and no other cell under mouse or shift is pressed
@ -396,16 +397,16 @@ class ConstraintHandler {
* the handler is not enabled then the outline is painted, but the constraints * the handler is not enabled then the outline is painted, but the constraints
* are ignored. * are ignored.
*/ */
setFocus(me: InternalMouseEvent, state: CellState, source: boolean) { setFocus(me: InternalMouseEvent, state: CellState | null, source: boolean) {
this.constraints = this.constraints =
state != null && !this.isStateIgnored(state, source) && state.cell.isConnectable() state && !this.isStateIgnored(state, source) && state.cell.isConnectable()
? this.isEnabled() ? this.isEnabled()
? this.graph.getAllConnectionConstraints(state, source) || [] ? this.graph.getAllConnectionConstraints(state, source) ?? []
: [] : []
: []; : null;
// Only uses cells which have constraints // Only uses cells which have constraints
if (this.constraints != null) { if (this.constraints && state) {
this.currentFocus = state; this.currentFocus = state;
this.currentFocusArea = new Rectangle(state.x, state.y, state.width, state.height); this.currentFocusArea = new Rectangle(state.x, state.y, state.width, state.height);

View File

@ -186,8 +186,7 @@ class CellHighlight {
if (this.state != null && this.shape != null) { if (this.state != null && this.shape != null) {
this.shape.scale = this.state.view.scale; this.shape.scale = this.state.view.scale;
// @ts-ignore if (this.state.cell.isEdge()) {
if (this.graph.model.isEdge(this.state.cell)) {
this.shape.strokeWidth = this.getStrokeWidth(); this.shape.strokeWidth = this.getStrokeWidth();
this.shape.points = this.state.absolutePoints; this.shape.points = this.state.absolutePoints;
this.shape.outline = false; this.shape.outline = false;

View File

@ -1,21 +1,22 @@
import '@maxgraph/css/common.css';
export const parameters = { export const parameters = {
actions: { argTypesRegex: "^on[A-Z].*" }, actions: { argTypesRegex: '^on[A-Z].*' },
controls: { controls: {
matchers: { matchers: {
color: /(background|color)$/i, color: /(background|color)$/i,
date: /Date$/, date: /Date$/,
}, },
}, },
} };
export const globalTypes = { export const globalTypes = {
width: { width: {
type: 'number', type: 'number',
defaultValue: 800 defaultValue: 800,
}, },
height: { height: {
type: 'number', type: 'number',
defaultValue: 600 defaultValue: 600,
} },
}; };

View File

@ -1,4 +1,5 @@
import { Graph, InternalEvent, RubberBand } from '@maxgraph/core'; import { Graph, InternalEvent, RubberBand } from '@maxgraph/core';
import { globalTypes } from '../.storybook/preview'; import { globalTypes } from '../.storybook/preview';
export default { export default {

View File

@ -6,6 +6,7 @@ module.exports = merge(base, {
resolve: { resolve: {
alias: { alias: {
'@maxgraph/core': path.resolve(__dirname, '../core/src'), '@maxgraph/core': path.resolve(__dirname, '../core/src'),
'@maxgraph/css': path.resolve(__dirname, '../core/css'),
}, },
}, },
}); });