@metadev/daga 5.0.4 → 5.1.0

package/src/lib/diagram/model/diagram-field.d.ts

@@ -2,6 +2,7 @@ import { Point } from '../../util/canvas-util';
 import { HorizontalAlign, Side, VerticalAlign } from '../../util/svg-util';
 import { CollabTimestamp } from '../collab/primitives';
 import { FieldConfig } from '../config/diagram-config';
+import { FieldLook, FieldLookConfig } from '../config/diagram-look-config';
 import { DiagramElement, DiagramElementSet } from './diagram-element';
 import { DiagramModel } from './diagram-model';
 /**
@@ -11,19 +12,22 @@ import { DiagramModel } from './diagram-model';
  */
 export declare const DIAGRAM_FIELD_DEFAULTS: {
     editable: boolean;
-    fontSize: number;
     margin: number;
     padding: number;
-    fontFamily: string;
-    color: string;
-    selectedColor: string;
-    backgroundColor: string;
     horizontalAlign: HorizontalAlign;
     verticalAlign: VerticalAlign;
     orientation: Side;
     multiline: boolean;
     fit: boolean;
     shrink: boolean;
+    look: {
+        lookType: "field-look";
+        fillColor: string;
+        fontColor: string;
+        fontFamily: string;
+        fontSize: number;
+        fontWeight: number;
+    };
 };
 export interface LabeledElement {
     label?: DiagramField;
@@ -56,26 +60,6 @@ export declare class DiagramField extends DiagramElement {
      * @public
      */
     height: number;
-    /**
-     * Font size of this field.
-     * @public
-     */
-    fontSize: number;
-    /**
-     * Font family of this field. `null` for the default one.
-     * @public
-     */
-    fontFamily: string | null;
-    /**
-     * Font color of this field.
-     * @public
-     */
-    color: string;
-    /**
-     * Font color of this field when selected.
-     * @public
-     */
-    selectedColor: string;
     /**
      * Horizontal alignment of the text of this field.
      * @public
@@ -128,7 +112,16 @@ export declare class DiagramField extends DiagramElement {
      * @public
      */
     shrink: boolean;
-    constructor(model: DiagramModel, rootElement: (LabeledElement & DiagramElement) | undefined, coords: Point, width: number, height: number, fontSize: number, fontFamily: string | null, color: string, selectedColor: string, horizontalAlign: HorizontalAlign, verticalAlign: VerticalAlign, orientation: Side | number, multiline: boolean, text: string, editable: boolean, fit: boolean, shrink: boolean);
+    private defaultLook;
+    private selectedLook;
+    private highlightedLook;
+    private selectedAndHighlightedLook;
+    /**
+     * Current look of this field.
+     * @private
+     */
+    get look(): FieldLook;
+    constructor(model: DiagramModel, rootElement: (LabeledElement & DiagramElement) | undefined, coords: Point, width: number, height: number, horizontalAlign: HorizontalAlign, verticalAlign: VerticalAlign, orientation: Side | number, multiline: boolean, look: FieldLookConfig, text: string, editable: boolean, fit: boolean, shrink: boolean);
     get removed(): boolean;
     updateInView(): void;
     raise(): void;
@@ -151,7 +144,7 @@ export declare class DiagramFieldSet extends DiagramElementSet<DiagramField> {
      * Instance a new field and add it to this set. This method is normally called when instancing an element with a field and it is rarely called by itself.
      * @private
      */
-    new(rootElement: (LabeledElement & DiagramElement) | undefined, coords: Point, fontSize: number, fontFamily: string | null, color: string, selectedColor: string, width: number, height: number, horizontalAlign: HorizontalAlign, verticalAlign: VerticalAlign, orientation: Side | number, multiline: boolean, text: string, editable: boolean, fit: boolean, shrink: boolean): DiagramField;
+    new(rootElement: (LabeledElement & DiagramElement) | undefined, coords: Point, width: number, height: number, horizontalAlign: HorizontalAlign, verticalAlign: VerticalAlign, orientation: Side | number, multiline: boolean, look: FieldLookConfig, text: string, editable: boolean, fit: boolean, shrink: boolean): DiagramField;
     remove(id: string): void;
 }
 export declare const getBottomMargin: (config?: FieldConfig | null) => number;

package/src/lib/diagram/model/diagram-object.d.ts

@@ -2,7 +2,7 @@ import { Point } from '../../util/canvas-util';
 import { DiagramElement, DiagramElementSet } from './diagram-element';
 import { DiagramModel } from './diagram-model';
 /**
- * A foreign object which is inserted with arbitrary html into a diagram.
+ * A foreign object which is inserted with arbitrary SVG code into a diagram.
  * Diagram objects are not serialized with other diagram elements.
  * @public
  */
@@ -23,8 +23,8 @@ export declare class DiagramObject extends DiagramElement {
      */
     height: number;
     priority: number;
-    html: string;
-    constructor(model: DiagramModel, coords: Point, width: number, height: number, priority: number, html: string, id: string);
+    svg: string;
+    constructor(model: DiagramModel, coords: Point, width: number, height: number, priority: number, svg: string, id: string);
     get removed(): boolean;
     updateInView(): void;
     raise(): void;
@@ -50,10 +50,10 @@ export declare class DiagramObjectSet extends DiagramElementSet<DiagramObject> {
      * @param width The dimension of the object along the x axis.
      * @param height The dimension of the object along the y axis.
      * @param priority The priority of the object. Used when filtering by priority.
-     * @param html The html contents of the object.
+     * @param svg The SVG contents of the object.
      * @param id The id of the object. Cannot be an empty string.
      * @returns The instanced object.
      */
-    new(coords: Point, width: number, height: number, priority: number, html: string, id: string): DiagramObject;
+    new(coords: Point, width: number, height: number, priority: number, svg: string, id: string): DiagramObject;
     remove(id: string): void;
 }

package/src/lib/interfaces/canvas.d.ts

@@ -3,15 +3,15 @@ import { DiagramContextMenu } from '../diagram/canvas/diagram-context-menu';
 import { DiagramUserHighlight } from '../diagram/canvas/diagram-user-highlight';
 import { DiagramUserSelection } from '../diagram/canvas/diagram-user-selection';
 import { CollabEngine } from '../diagram/collab/collab-engine';
-import { ActionStack, DiagramAction, DiagramActionMethod, DiagramActions } from '../diagram/diagram-action';
+import { BackgroundConfig, GridConfig } from '../diagram/config/diagram-canvas-config';
 import { UserActionConfig } from '../diagram/config/diagram-config';
+import { ActionStack, DiagramAction, DiagramActionMethod, DiagramActions } from '../diagram/diagram-action';
 import { DiagramEvent } from '../diagram/diagram-event';
 import { DiagramConnectionType } from '../diagram/model/diagram-connection';
 import { DiagramModel } from '../diagram/model/diagram-model';
 import { DiagramValidator } from '../errors/diagram-validator';
 import { Point } from '../util/canvas-util';
 import { DiagramEditor } from './diagram-editor';
-import { GridStyle } from '../diagram/config/diagram-canvas-config';
 /**
  * Represents a specific replica or view of the model.
  * Provides the functionality for the visual representation of the elements of a model.
@@ -54,35 +54,15 @@ export interface Canvas {
      */
     readonly collabEngine: CollabEngine;
     /**
-     * Background color of the diagram.
-     * @public
-     */
-    backgroundColor: string;
-    /**
-     * Style of the grid elements of the diagram.
-     * @public
-     */
-    gridStyle: GridStyle;
-    /**
-     * Distance between the grid points of the diagram in diagram units.
-     * @public
-     */
-    gridSize: number;
-    /**
-     * Size of the grid points of the diagram relative to the distance between grid points in diagram units.
-     * @public
-     */
-    gridThickness: number;
-    /**
-     * Color of the grid elements of the diagram.
+     * Background config of the diagram.
      * @public
      */
-    gridColor: string;
+    backgroundConfig: BackgroundConfig;
     /**
-     * If true, elements moved by the user should be placed on the closest grid point rather than the exact point where they were placed.
+     * Grid config of the diagram.
      * @public
      */
-    snapToGrid: boolean;
+    gridConfig: GridConfig;
     /**
      * The factor by which the zoom level increases or decreases when the user users buttons or keys to zoom in or out. Should be above 1.
      * @public