@bpmn-io/form-js-viewer 0.4.2 → 0.6.0

package/dist/assets/form-js.css

@@ -2,45 +2,42 @@
  * Theming
  */
 .fjs-container {
-  --color-blue-base-65: #4d90ff;
-  --color-blue-base-65-opacity-10: rgba(77, 144, 255, 0.1);
-  --color-blue-darken-48: #005df7;
-  --color-blue-darken-55: #1a70ff;
-  --color-blue-darken-62: #3c85ff;
-  --color-blue-lighten-75: #80b0ff;
-  --color-blue-lighten-82: #a2c5ff;
-  --color-blue-lighten-93: #dbe9ff;
-
-  --color-silver-base-97: #f8f8f8;
-  --color-silver-lighten-99: #fcfcfc;
-  --color-silver-darken-80: #cdcdcd;
-  --color-silver-darken-87: #dedede;
-  --color-silver-darken-94: #efefef;
-
-  --color-grey-base-40: #666666;
-  --color-grey-lighten-56: #909090;
-  --color-grey-darken-23: #3b3b3b;
-  --color-grey-darken-30: #4c4c4c;
-  --color-grey-darken-33: #535353;
-
-  --color-red-base-62: #ff3d3d;
-  --color-red-darken-38: #C20000;
-  --color-red-lighten-85: #ffb3b3;
-
-  --color-black: #000000;
-  --color-white: #ffffff;
+  --color-grey-225-10-15: hsl(225, 10%, 15%);
+  --color-grey-225-10-35: hsl(225, 10%, 35%);
+  --color-grey-225-10-55: hsl(225, 10%, 55%);
+  --color-grey-225-10-75: hsl(225, 10%, 75%);
+  --color-grey-225-10-80: hsl(225, 10%, 80%);
+  --color-grey-225-10-85: hsl(225, 10%, 85%);
+  --color-grey-225-10-90: hsl(225, 10%, 90%);
+  --color-grey-225-10-95: hsl(225, 10%, 95%); 
+  --color-grey-225-10-97: hsl(225, 10%, 97%);
+
+  --color-blue-205-100-45: hsl(205, 100%, 45%);
+  --color-blue-205-100-50: hsl(205, 100%, 50%);
+  --color-blue-205-100-80: hsl(205, 100%, 80%);
+  --color-blue-205-100-95: hsl(205, 100%, 95%);
+
+  --color-green-150-86-44: hsl(150, 86%, 44%);
+
+  --color-red-360-100-40: hsl(360, 100%, 40%);
+  --color-red-360-100-45: hsl(360, 100%, 45%);
+  --color-red-360-100-92: hsl(360, 100%, 92%);
+  --color-red-360-100-97: hsl(360, 100%, 97%);
+
+  --color-white: hsl(0, 0%, 100%);
+  --color-black: hsl(0, 0%, 0%); 
 
   --color-background: var(--color-white);
-  --color-background-disabled: var(--color-silver-darken-94);
-  --color-text: var(--color-grey-darken-23);
-  --color-text-light: var(--color-grey-lighten-56);
-  --color-text-lighter: var(--color-grey-base-40);
+  --color-background-disabled: var(--color-grey-225-10-95);
+  --color-text: var(--color-grey-225-10-15);
+  --color-text-light: var(--color-grey-225-10-35);
+  --color-text-lighter: var(--color-grey-225-10-55);
   --color-text-inverted: var(--color-white);
-  --color-borders: var(--color-grey-lighten-56);
-  --color-borders-disabled: var(--color-silver-darken-80);
-  --color-warning: var(--color-red-base-62);
-  --color-accent: var(--color-blue-darken-62);
-  --color-accent-dark: var(--color-blue-darken-48);
+  --color-borders: var(--color-grey-225-10-55);
+  --color-borders-disabled: var(--color-grey-225-10-75);
+  --color-warning: var(--color-red-360-100-45);
+  --color-accent: var(--color-blue-205-100-45);
+  --color-accent-dark: var(--color-blue-205-100-45);
 
   --font-family: 'IBM Plex Sans', sans-serif;
 
@@ -108,7 +105,7 @@
   font-style: italic;
   letter-spacing: .25px;
 
-  color: var(--color-text-light);
+  color: var(--color-text-lighter);
 }
 
 .fjs-container .fjs-form-field-label {
@@ -217,6 +214,7 @@
 }
 
 .fjs-container .fjs-form-field.fjs-has-errors .fjs-input,
+.fjs-container .fjs-form-field.fjs-has-errors .fjs-select,
 .fjs-container .fjs-form-field.fjs-has-errors .fjs-textarea {
   border-color: var(--color-warning);
 }
@@ -236,5 +234,5 @@
 }
 
 .fjs-container .fjs-form-field-text a {
-  color: var(--color-blue-darken-48);
+  color: var(--color-blue-205-100-45);
 }

package/dist/index.cjs

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var minDash = require('min-dash');
 var Ids = require('ids');
+var minDash = require('min-dash');
 var snarkdown = require('@bpmn-io/snarkdown');
 var jsxRuntime = require('preact/jsx-runtime');
 var hooks = require('preact/hooks');
@@ -610,7 +610,7 @@ class Validator {
       errors = [...errors, `Field must match pattern ${validate.pattern}.`];
     }
 
-    if (validate.required && (typeof value === 'undefined' || value === '')) {
+    if (validate.required && (minDash.isNil(value) || value === '')) {
       errors = [...errors, 'Field is required.'];
     }
 
@@ -726,8 +726,8 @@ class Importer {
     const warnings = [];
 
     try {
-      const importedData = clone(data);
-      const importedSchema = this.importFormField(clone(schema), importedData);
+      const importedSchema = this.importFormField(clone(schema)),
+            importedData = this.importData(clone(data));
       return {
         warnings,
         schema: importedSchema,
@@ -740,14 +740,13 @@ class Importer {
   }
   /**
    * @param {any} formField
-   * @param {Object} [data]
    * @param {string} [parentId]
    *
-   * @return {any} field
+   * @return {any} importedField
    */
 
 
-  importFormField(formField, data = {}, parentId) {
+  importFormField(formField, parentId) {
     const {
       components,
       key,
@@ -770,10 +769,13 @@ class Importer {
         throw new Error(`form field with key <${key}> already exists`);
       }
 
-      this._formFieldRegistry._keys.claim(key, formField); // set form field path
+      this._formFieldRegistry._keys.claim(key, formField); // TODO: buttons should not have key
 
 
-      formField._path = [key];
+      if (type !== 'button') {
+        // set form field path
+        formField._path = [key];
+      }
     }
 
     if (id) {
@@ -791,17 +793,44 @@ class Importer {
     this._formFieldRegistry.add(formField);
 
     if (components) {
-      this.importFormFields(components, data, id);
+      this.importFormFields(components, id);
     }
 
     return formField;
   }
 
-  importFormFields(components, data = {}, parentId) {
+  importFormFields(components, parentId) {
     components.forEach(component => {
-      this.importFormField(component, data, parentId);
+      this.importFormField(component, parentId);
     });
   }
+  /**
+   * @param {Object} data
+   *
+   * @return {Object} importedData
+   */
+
+
+  importData(data) {
+    return this._formFieldRegistry.getAll().reduce((importedData, formField) => {
+      const {
+        defaultValue,
+        _path,
+        type
+      } = formField;
+
+      if (!_path) {
+        return importedData;
+      } // (1) try to get value from data
+      // (2) try to get default value from form field
+      // (3) get empty value from form field
+
+
+      return { ...importedData,
+        [_path[0]]: minDash.get(data, _path, minDash.isUndefined(defaultValue) ? this._formFields.get(type).emptyValue : defaultValue)
+      };
+    }, {});
+  }
 
 }
 Importer.$inject = ['formFieldRegistry', 'formFields'];
@@ -943,7 +972,11 @@ function formFieldClasses(type, errors = []) {
 
   return classes.join(' ');
 }
-function prefixId(id) {
+function prefixId(id, formId) {
+  if (formId) {
+    return `fjs-form-${formId}-${id}`;
+  }
+
   return `fjs-form-${id}`;
 }
 function markdownToHTML(markdown) {
@@ -987,6 +1020,32 @@ Button.type = type$6;
 Button.label = 'Button';
 Button.keyed = true;
 
+const FormRenderContext = preact.createContext({
+  Empty: props => {
+    return null;
+  },
+  Children: props => {
+    return props.children;
+  },
+  Element: props => {
+    return props.children;
+  }
+});
+
+/**
+ * @param {string} type
+ * @param {boolean} [strict]
+ *
+ * @returns {any}
+ */
+
+function getService(type, strict) {}
+
+const FormContext = preact.createContext({
+  getService,
+  formId: null
+});
+
 function Description(props) {
   const {
     description
@@ -1029,15 +1088,10 @@ function Label(props) {
     label,
     required = false
   } = props;
-
-  if (!label) {
-    return null;
-  }
-
   return jsxRuntime.jsxs("label", {
     for: id,
     class: "fjs-form-field-label",
-    children: [props.children, label, required && jsxRuntime.jsx("span", {
+    children: [props.children, label || '', required && jsxRuntime.jsx("span", {
       class: "fjs-asterix",
       children: "*"
     })]
@@ -1067,17 +1121,20 @@ function Checkbox(props) {
     });
   };
 
+  const {
+    formId
+  } = hooks.useContext(FormContext);
   return jsxRuntime.jsxs("div", {
     class: formFieldClasses(type$5, errors),
     children: [jsxRuntime.jsx(Label, {
-      id: prefixId(id),
+      id: prefixId(id, formId),
       label: label,
       required: false,
       children: jsxRuntime.jsx("input", {
         checked: value,
         class: "fjs-input",
         disabled: disabled,
-        id: prefixId(id),
+        id: prefixId(id, formId),
         type: "checkbox",
         onChange: onChange
       })
@@ -1097,31 +1154,7 @@ Checkbox.create = function (options = {}) {
 Checkbox.type = type$5;
 Checkbox.label = 'Checkbox';
 Checkbox.keyed = true;
-
-const FormRenderContext = preact.createContext({
-  Empty: props => {
-    return null;
-  },
-  Children: props => {
-    return props.children;
-  },
-  Element: props => {
-    return props.children;
-  }
-});
-
-/**
- * @param {string} type
- * @param {boolean} [strict]
- *
- * @returns {any}
- */
-
-function getService(type, strict) {}
-
-const FormContext = preact.createContext({
-  getService
-});
+Checkbox.emptyValue = false;
 
 function useService (type, strict) {
   const {
@@ -1344,7 +1377,7 @@ function Number(props) {
     disabled,
     errors = [],
     field,
-    value = ''
+    value
   } = props;
   const {
     description,
@@ -1362,23 +1395,26 @@ function Number(props) {
     const parsedValue = parseInt(target.value, 10);
     props.onChange({
       field,
-      value: isNaN(parsedValue) ? undefined : parsedValue
+      value: isNaN(parsedValue) ? null : parsedValue
     });
   };
 
+  const {
+    formId
+  } = hooks.useContext(FormContext);
   return jsxRuntime.jsxs("div", {
     class: formFieldClasses(type$4, errors),
     children: [jsxRuntime.jsx(Label, {
-      id: prefixId(id),
+      id: prefixId(id, formId),
       label: label,
       required: required
     }), jsxRuntime.jsx("input", {
       class: "fjs-input",
       disabled: disabled,
-      id: prefixId(id),
+      id: prefixId(id, formId),
       onInput: onChange,
       type: "number",
-      value: value
+      value: value || ''
     }), jsxRuntime.jsx(Description, {
       description: description
     }), jsxRuntime.jsx(Errors, {
@@ -1395,6 +1431,7 @@ Number.create = function (options = {}) {
 Number.type = type$4;
 Number.keyed = true;
 Number.label = 'Number';
+Number.emptyValue = null;
 
 const type$3 = 'radio';
 function Radio(props) {
@@ -1418,10 +1455,13 @@ function Radio(props) {
   const onChange = v => {
     props.onChange({
       field,
-      value: v === value ? undefined : v
+      value: v
     });
   };
 
+  const {
+    formId
+  } = hooks.useContext(FormContext);
   return jsxRuntime.jsxs("div", {
     class: formFieldClasses(type$3, errors),
     children: [jsxRuntime.jsx(Label, {
@@ -1429,14 +1469,14 @@ function Radio(props) {
       required: required
     }), values.map((v, index) => {
       return jsxRuntime.jsx(Label, {
-        id: prefixId(`${id}-${index}`),
+        id: prefixId(`${id}-${index}`, formId),
         label: v.label,
         required: false,
         children: jsxRuntime.jsx("input", {
           checked: v.value === value,
           class: "fjs-input",
           disabled: disabled,
-          id: prefixId(`${id}-${index}`),
+          id: prefixId(`${id}-${index}`, formId),
           type: "radio",
           onClick: () => onChange(v.value)
         })
@@ -1462,6 +1502,7 @@ Radio.create = function (options = {}) {
 Radio.type = type$3;
 Radio.label = 'Radio';
 Radio.keyed = true;
+Radio.emptyValue = null;
 
 const type$2 = 'select';
 function Select(props) {
@@ -1487,22 +1528,25 @@ function Select(props) {
   }) => {
     props.onChange({
       field,
-      value: target.value === '' ? undefined : target.value
+      value: target.value === '' ? null : target.value
     });
   };
 
+  const {
+    formId
+  } = hooks.useContext(FormContext);
   return jsxRuntime.jsxs("div", {
     class: formFieldClasses(type$2, errors),
     children: [jsxRuntime.jsx(Label, {
-      id: prefixId(id),
+      id: prefixId(id, formId),
       label: label,
       required: required
     }), jsxRuntime.jsxs("select", {
       class: "fjs-select",
       disabled: disabled,
-      id: prefixId(id),
+      id: prefixId(id, formId),
       onChange: onChange,
-      value: value,
+      value: value || '',
       children: [jsxRuntime.jsx("option", {
         value: ""
       }), values.map(v => {
@@ -1532,6 +1576,7 @@ Select.create = function (options = {}) {
 Select.type = type$2;
 Select.label = 'Select';
 Select.keyed = true;
+Select.emptyValue = null;
 
 const type$1 = 'text';
 function Text(props) {
@@ -1587,16 +1632,19 @@ function Textfield(props) {
     });
   };
 
+  const {
+    formId
+  } = hooks.useContext(FormContext);
   return jsxRuntime.jsxs("div", {
     class: formFieldClasses(type, errors),
     children: [jsxRuntime.jsx(Label, {
-      id: prefixId(id),
+      id: prefixId(id, formId),
       label: label,
       required: required
     }), jsxRuntime.jsx("input", {
       class: "fjs-input",
       disabled: disabled,
-      id: prefixId(id),
+      id: prefixId(id, formId),
       onInput: onChange,
       type: "text",
       value: value
@@ -1616,6 +1664,7 @@ Textfield.create = function (options = {}) {
 Textfield.type = type;
 Textfield.label = 'Text Field';
 Textfield.keyed = true;
+Textfield.emptyValue = '';
 
 const formFields = [Button, Checkbox, Default, Number, Radio, Select, Text, Textfield];
 
@@ -1646,8 +1695,9 @@ function Renderer(config, eventBus, form, injector) {
     const formContext = {
       getService(type, strict = true) {
         return injector.get(type, strict);
-      }
+      },
 
+      formId: form._id
     };
     eventBus.on('changed', newState => {
       setState(newState);
@@ -1727,6 +1777,7 @@ var core = {
  * } } State
  */
 
+const ids = new Ids__default['default']([32, 36, 1]);
 /**
  * The form.
  */
@@ -1737,10 +1788,16 @@ class Form {
    * @param {FormOptions} options
    */
   constructor(options = {}) {
+    /**
+     * @public
+     * @type {String}
+     */
+    this._id = ids.next();
     /**
      * @private
      * @type {Element}
      */
+
     this._container = createFormContainer();
     const {
       container,
@@ -1849,21 +1906,22 @@ class Form {
       throw new Error('form is read-only');
     }
 
-    const formFieldRegistry = this.get('formFieldRegistry'); // do not submit disabled form fields
-
+    const formFieldRegistry = this.get('formFieldRegistry');
     const data = formFieldRegistry.getAll().reduce((data, field) => {
       const {
         disabled,
         _path
-      } = field;
+      } = field; // do not submit disabled form fields
 
-      if (disabled) {
-        // strip disabled field value
-        minDash.set(data, _path, undefined);
+      if (disabled || !_path) {
+        return data;
       }
 
-      return data;
-    }, clone(this._getState().data));
+      const value = minDash.get(this._getState().data, _path);
+      return { ...data,
+        [_path[0]]: value
+      };
+    }, {});
     const errors = this.validate();
 
     this._emit('submit', {
@@ -2087,7 +2145,7 @@ class Form {
 
 }
 
-const schemaVersion = 2;
+const schemaVersion = 3;
 /**
  * @typedef { import('./types').CreateFormOptions } CreateFormOptions
  */