camunda-bpmn-js 2.0.1 → 2.1.0

package/lib/base/Modeler.js

@@ -4,6 +4,7 @@ import BpmnModeler from 'bpmn-js/lib/Modeler';
 
 import minimapModule from 'diagram-js-minimap';
 
+import gridModule from 'diagram-js-grid';
 import diagramOriginModule from 'diagram-js-origin';
 import alignToOriginModule from '@bpmn-io/align-to-origin';
 
@@ -19,19 +20,23 @@ import {
  * @param {Object} options
  */
 export default function Modeler(options = {}) {
-
-  this._injectOriginModule(options);
-
   BpmnModeler.call(this, options);
 }
 
 inherits(Modeler, BpmnModeler);
 
-Modeler.prototype._injectOriginModule = function(options) {
-  this._modules = [].concat(
-    this._modules,
-    (options && options.disableAdjustOrigin ? diagramOriginModule : alignToOriginModule)
-  );
+Modeler.prototype.getModules = function(options) {
+  const modules = BpmnModeler.prototype.getModules.call(this, options);
+
+  return [
+    ...modules,
+    options.disableAdjustOrigin
+      ? diagramOriginModule
+      : alignToOriginModule,
+    options.disableGrid
+      ? {}
+      : gridModule
+  ];
 };
 
 Modeler.prototype._extensionModules = [

package/lib/camunda-cloud/Modeler.js

@@ -16,14 +16,16 @@ import {
   ZeebeVariableResolverModule as variableResolverModule
 } from '@bpmn-io/variable-resolver';
 
-import replaceModule from './features/replace';
-import sharedReplaceModule from '../shared/features/replace';
+import exampleDataPropertiesProviderModule from '@camunda/example-data-properties-provider';
+
 import colorPickerModule from 'bpmn-js-color-picker';
-import createAppendElementTemplatesModule from './features/create-append-anything';
 import elementTemplateChooserModule from '@bpmn-io/element-template-chooser';
-
 import { commonModdleExtensions, commonModules } from './util/commonModules';
 
+import {
+  CreateAppendAnythingModule as createAppendAnythingModule,
+  CreateAppendElementTemplatesModule as createAppendElementTemplatesModule
+} from 'bpmn-js-create-append-anything';
 
 /**
  *
@@ -64,11 +66,11 @@ Modeler.prototype._camundaCloudModules = [
   rulesModule,
   zeebePropertiesProviderModule,
   cloudElementTemplatesPropertiesProvider,
+  createAppendAnythingModule,
   createAppendElementTemplatesModule,
-  replaceModule,
-  sharedReplaceModule,
   colorPickerModule,
-  variableResolverModule
+  variableResolverModule,
+  exampleDataPropertiesProviderModule
 ];
 
 Modeler.prototype._modules = [].concat(

package/lib/camunda-platform/Modeler.js

@@ -15,9 +15,12 @@ import {
 
 import { commonModdleExtensions } from './util/commonModules';
 
-import sharedReplaceModule from '../shared/features/replace';
 import colorPickerModule from 'bpmn-js-color-picker';
 
+import {
+  UnlinkTemplatesModule as unlinkTemplatesModule
+} from 'bpmn-js-create-append-anything';
+
 
 /**
  *
@@ -42,9 +45,9 @@ Modeler.prototype._camundaPlatformModules = [
   behaviorsModule,
   CamundaPlatformPropertiesProviderModule,
   ElementTemplatesPropertiesProviderModule,
-  sharedReplaceModule,
   colorPickerModule,
-  variableResolverModule
+  variableResolverModule,
+  unlinkTemplatesModule
 ];
 
 Modeler.prototype._modules = [].concat(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "camunda-bpmn-js",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "Embeddable Camunda modeling distributions based on bpmn-js",
   "main": "lib/index.js",
   "scripts": {
@@ -9,7 +9,7 @@
     "dev": "npm test -- --auto-watch --no-single-run",
     "test": "karma start karma.config.js",
     "clean": "del-cli dist",
-    "distro": "rollup -c --failAfterWarnings",
+    "distro": "rollup -c --failAfterWarnings --bundleConfigAsCjs",
     "format": "run-s format:markdown 'lint -- --fix'",
     "format:markdown": "remark . -qo",
     "test:distro": "node tasks/test-distro.js",
@@ -48,32 +48,35 @@
   "license": "MIT",
   "dependencies": {
     "@bpmn-io/align-to-origin": "^0.7.0",
-    "@bpmn-io/element-templates-icons-renderer": "^0.3.0",
     "@bpmn-io/element-template-chooser": "^1.0.0",
+    "@bpmn-io/element-templates-icons-renderer": "^0.3.0",
     "@bpmn-io/variable-resolver": "^0.1.0",
-    "@camunda/linting": "^0.16.0",
-    "bpmn-js": "^11.5.0",
+    "@camunda/example-data-properties-provider": "^1.0.1",
+    "bpmn-js": "^12.0.0",
     "bpmn-js-color-picker": "^0.5.0",
+    "bpmn-js-create-append-anything": "^0.1.0",
     "bpmn-js-executable-fix": "^0.2.0",
-    "camunda-bpmn-js-behaviors": "^0.4.0",
+    "camunda-bpmn-js-behaviors": "^0.5.0",
     "camunda-bpmn-moddle": "^7.0.1",
-    "diagram-js": "^11.11.0",
+    "diagram-js": "^11.12.0",
+    "diagram-js-grid": "^0.2.0",
     "diagram-js-minimap": "^4.0.1",
     "diagram-js-origin": "^1.4.0",
     "inherits-browser": "^0.1.0",
     "min-dash": "^4.0.0",
-    "zeebe-bpmn-moddle": "^0.17.0"
+    "zeebe-bpmn-moddle": "^0.18.0"
   },
   "devDependencies": {
     "@babel/core": "^7.18.13",
-    "@bpmn-io/properties-panel": "^1.4.0",
-    "@rollup/plugin-commonjs": "^23.0.0",
-    "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^14.0.0",
+    "@bpmn-io/properties-panel": "^1.6.2",
+    "@rollup/plugin-commonjs": "^24.0.1",
+    "@rollup/plugin-json": "^6.0.0",
+    "@rollup/plugin-node-resolve": "^15.0.1",
+    "@rollup/plugin-terser": "^0.4.0",
     "babel-loader": "^9.0.0",
     "babel-plugin-istanbul": "^6.1.1",
     "bpmn-js-connectors-extension": "^0.4.6",
-    "bpmn-js-properties-panel": "^1.19.1",
+    "bpmn-js-properties-panel": "^1.20.3",
     "chai": "^4.3.7",
     "cross-env": "^7.0.3",
     "del-cli": "^5.0.0",
@@ -101,9 +104,8 @@
     "raw-loader": "^4.0.2",
     "remark-cli": "^11.0.0",
     "remark-preset-bpmn-io": "^0.2.1",
-    "rollup": "^2.38.4",
-    "rollup-plugin-copy": "^3.3.0",
-    "rollup-plugin-terser": "^7.0.2",
+    "rollup": "^3.0.1",
+    "rollup-plugin-copy": "^3.4.0",
     "sinon": "^15.0.0",
     "sinon-chai": "^3.7.0",
     "webpack": "^5.74.0"

package/styles/camunda-cloud-modeler.css

@@ -1,2 +1,3 @@
 @import './base-modeler.css';
-@import './element-templates.css';
+@import './element-templates.css';
+@import './element-template-chooser.css';

package/lib/camunda-cloud/features/create-append-anything/ElementTemplatesAppendProvider.js

@@ -1,162 +0,0 @@
-import { assign } from 'min-dash';
-
-
-/**
- * A popup menu provider that allows to append elements with
- * element templates.
- */
-export default function ElementTemplatesAppendProvider(
-    popupMenu, translate, elementTemplates,
-    autoPlace, create, mouse, rules) {
-
-  this._popupMenu = popupMenu;
-  this._translate = translate;
-  this._elementTemplates = elementTemplates;
-  this._autoPlace = autoPlace;
-  this._create = create;
-  this._mouse = mouse;
-  this._rules = rules;
-
-  this.register();
-}
-
-ElementTemplatesAppendProvider.$inject = [
-  'popupMenu',
-  'translate',
-  'elementTemplates',
-  'autoPlace',
-  'create',
-  'move',
-  'rules'
-];
-
-/**
- * Register append menu provider in the popup menu
- */
-ElementTemplatesAppendProvider.prototype.register = function() {
-  this._popupMenu.registerProvider('bpmn-append', this);
-};
-
-/**
- * Adds the element templates to the append menu.
- * @param {djs.model.Base} element
- *
- * @returns {Object}
- */
-ElementTemplatesAppendProvider.prototype.getPopupMenuEntries = function(element) {
-  return (entries) => {
-
-    if (!this._rules.allowed('shape.append', { element: element })) {
-      return [];
-    }
-
-    const filteredTemplates = this._filterTemplates(this._elementTemplates.getLatest());
-
-    // add template entries
-    assign(entries, this.getTemplateEntries(element, filteredTemplates));
-
-    return entries;
-  };
-};
-
-/**
- * Get all element templates.
- *
- * @param {djs.model.Base} element
- *
- * @return {Object} element templates as menu entries
- */
-ElementTemplatesAppendProvider.prototype.getTemplateEntries = function(element, templates) {
-
-  const templateEntries = {};
-
-  templates.map(template => {
-
-    const {
-      icon = {},
-      category,
-    } = template;
-
-    const entryId = `append.template-${template.id}`;
-
-    const defaultGroup = {
-      id: 'templates',
-      name: this._translate('Templates')
-    };
-
-    templateEntries[entryId] = {
-      label: template.name,
-      description: template.description,
-      documentationRef: template.documentationRef,
-      imageUrl: icon.contents,
-      group: category || defaultGroup,
-      action: this._getEntryAction(element, template)
-    };
-  });
-
-  return templateEntries;
-};
-
-/**
- * Filter out templates from the options.
- *
- * @param {Array<Object>} templates
- *
- * @returns {Array<Object>}
- */
-ElementTemplatesAppendProvider.prototype._filterTemplates = function(templates) {
-  return templates.filter(template => {
-    const {
-      appliesTo,
-      elementType
-    } = template;
-
-    const type = (elementType && elementType.value) || appliesTo[0];
-
-    // elements that can not be appended
-    if ([
-      'bpmn:StartEvent',
-      'bpmn:Participant'
-    ].includes(type)) {
-      return false;
-    }
-
-    // sequence flow templates are supported
-    // but connections are not appendable
-    if ('bpmn:SequenceFlow' === type) {
-      return false;
-    }
-
-    return true;
-  });
-};
-
-/**
- * Create an action for a given template.
- *
- * @param {djs.model.Base} element
- * @param {Object} template
- *
- * @returns {Object}
- */
-ElementTemplatesAppendProvider.prototype._getEntryAction = function(element, template) {
-  return {
-
-    click: () => {
-      const newElement = this._elementTemplates.createElement(template);
-      this._autoPlace.append(element, newElement);
-    },
-
-    dragstart: (event) => {
-      const newElement = this._elementTemplates.createElement(template);
-
-      if (event instanceof KeyboardEvent) {
-        event = this._mouse.getLastMoveEvent();
-      }
-
-      this._create.start(event, newElement, {
-        source: element
-      });
-    }
-  };
-};

package/lib/camunda-cloud/features/create-append-anything/ElementTemplatesCreateProvider.js

@@ -1,114 +0,0 @@
-import { assign } from 'min-dash';
-
-/**
- * A popup menu provider that allows to create elements with
- * element templates.
- */
-export default function ElementTemplatesCreateProvider(
-    popupMenu, translate, elementTemplates,
-    mouse, create) {
-
-  this._popupMenu = popupMenu;
-  this._translate = translate;
-  this._elementTemplates = elementTemplates;
-  this._mouse = mouse;
-  this._create = create;
-
-  this.register();
-}
-
-ElementTemplatesCreateProvider.$inject = [
-  'popupMenu',
-  'translate',
-  'elementTemplates',
-  'mouse',
-  'create'
-];
-
-/**
- * Register create menu provider in the popup menu
- */
-ElementTemplatesCreateProvider.prototype.register = function() {
-  this._popupMenu.registerProvider('bpmn-create', this);
-};
-
-/**
- * Adds the element templates to the create menu.
- * @param {djs.model.Base} element
- *
- * @returns {Object}
- */
-ElementTemplatesCreateProvider.prototype.getPopupMenuEntries = function(element) {
-  return (entries) => {
-
-    // add template entries
-    assign(entries, this.getTemplateEntries(element));
-
-    return entries;
-  };
-};
-
-/**
- * Get all element templates.
- *
- * @param {djs.model.Base} element
- *
- * @return {Array<Object>} a list of element templates as menu entries
- */
-ElementTemplatesCreateProvider.prototype.getTemplateEntries = function() {
-
-  const templates = this._elementTemplates.getLatest();
-  const templateEntries = {};
-
-  templates.map(template => {
-
-    const {
-      icon = {},
-      category,
-    } = template;
-
-    const entryId = `create.template-${template.id}`;
-
-    const defaultGroup = {
-      id: 'templates',
-      name: this._translate('Templates')
-    };
-
-    templateEntries[entryId] = {
-      label: template.name,
-      description: template.description,
-      documentationRef: template.documentationRef,
-      imageUrl: icon.contents,
-      group: category || defaultGroup,
-      action: {
-        click: this._getEntryAction(template),
-        dragstart: this._getEntryAction(template)
-      }
-    };
-  });
-
-  return templateEntries;
-};
-
-
-ElementTemplatesCreateProvider.prototype._getEntryAction = function(template) {
-  const create = this._create;
-  const popupMenu = this._popupMenu;
-  const elementTemplates = this._elementTemplates;
-  const mouse = this._mouse;
-
-  return (event) => {
-
-    popupMenu.close();
-
-    // create the new element
-    let newElement = elementTemplates.createElement(template);
-
-    // use last mouse event if triggered via keyboard
-    if (event instanceof KeyboardEvent) {
-      event = mouse.getLastMoveEvent();
-    }
-
-    return create.start(event, newElement);
-  };
-};

package/lib/camunda-cloud/features/create-append-anything/index.js

@@ -1,11 +0,0 @@
-import ElementTemplatesAppendProvider from './ElementTemplatesAppendProvider';
-import ElementTemplatesCreateProvider from './ElementTemplatesCreateProvider';
-
-export default {
-  __init__: [
-    'elementTemplatesAppendProvider',
-    'elementTemplatesCreateProvider'
-  ],
-  elementTemplatesAppendProvider: [ 'type', ElementTemplatesAppendProvider ],
-  elementTemplatesCreateProvider: [ 'type', ElementTemplatesCreateProvider ]
-};

package/lib/camunda-cloud/features/replace/ElementTemplatesReplaceProvider.js

@@ -1,118 +0,0 @@
-import {
-  getBusinessObject,
-  isAny
-} from 'bpmn-js/lib/util/ModelUtil';
-
-
-/**
- * A replace menu provider that allows to replace elements with
- * element templates.
- */
-export default function ElementTemplatesReplaceProvider(popupMenu, translate, elementTemplates) {
-
-  this._popupMenu = popupMenu;
-  this._translate = translate;
-  this._elementTemplates = elementTemplates;
-
-  this.register();
-}
-
-ElementTemplatesReplaceProvider.$inject = [
-  'popupMenu',
-  'translate',
-  'elementTemplates'
-];
-
-/**
- * Register replace menu provider in the popup menu
- */
-ElementTemplatesReplaceProvider.prototype.register = function() {
-  this._popupMenu.registerProvider('bpmn-replace', this);
-};
-
-/**
- * Adds the element templates to the replace menu.
- * @param {djs.model.Base} element
- *
- * @returns {Object}
- */
-ElementTemplatesReplaceProvider.prototype.getPopupMenuEntries = function(element) {
-
-  return (entries) => {
-
-    // convert our entries into something sortable
-    let entrySet = Object.entries(entries);
-
-    // add template entries
-    entrySet = [ ...entrySet, ...this.getTemplateEntries(element) ];
-
-    // convert back to object
-    return entrySet.reduce((entries, [ key, value ]) => {
-      entries[key] = value;
-
-      return entries;
-    }, {});
-  };
-};
-
-/**
- * Get all element templates that can be used to replace the given element.
- *
- * @param {djs.model.Base} element
- *
- * @return {Array<Object>} a list of element templates as menu entries
- */
-ElementTemplatesReplaceProvider.prototype.getTemplateEntries = function(element) {
-
-  const templates = this._getMatchingTemplates(element);
-  return templates.map(template => {
-
-    const {
-      icon = {},
-      category,
-    } = template;
-
-    const entryId = `replace.template-${template.id}`;
-
-    const defaultGroup = {
-      id: 'templates',
-      name: this._translate('Templates')
-    };
-
-    return [ entryId, {
-      label: template.name,
-      description: template.description,
-      documentationRef: template.documentationRef,
-      imageUrl: icon.contents,
-      group: category || defaultGroup,
-      action: () => {
-        this._elementTemplates.applyTemplate(element, template);
-      }
-    } ];
-  });
-};
-
-/**
- * Returns the templates that can the element can be replaced with.
- *
- * @param  {djs.model.Base} element
- *
- * @return {Array<ElementTemplate>}
- */
-ElementTemplatesReplaceProvider.prototype._getMatchingTemplates = function(element) {
-  return this._elementTemplates.getLatest().filter(template => {
-    return isAny(element, template.appliesTo) && !isTemplateApplied(element, template);
-  });
-};
-
-
-// helpers ////////////
-export function isTemplateApplied(element, template) {
-  const businessObject = getBusinessObject(element);
-
-  if (businessObject) {
-    return businessObject.get('zeebe:modelerTemplate') === template.id;
-  }
-
-  return false;
-}

package/lib/camunda-cloud/features/replace/index.js

@@ -1,6 +0,0 @@
-import ElementTemplatesReplaceProvider from './ElementTemplatesReplaceProvider';
-
-export default {
-  __init__: [ 'elementTemplatesProvider' ],
-  elementTemplatesProvider: [ 'type', ElementTemplatesReplaceProvider ]
-};