@valtimo/components 12.40.0 → 12.41.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2022/lib/modules/custom-formio-component/create-custom-component.mjs +28 -6
- package/fesm2022/valtimo-components.mjs +27 -5
- package/fesm2022/valtimo-components.mjs.map +1 -1
- package/lib/modules/custom-formio-component/create-custom-component.d.ts +2 -1
- package/lib/modules/custom-formio-component/create-custom-component.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -105,11 +105,7 @@ export function createCustomFormioComponent(customComponentOptions) {
|
|
|
105
105
|
superAttach = super.attach(element);
|
|
106
106
|
}
|
|
107
107
|
// Bind customOptions
|
|
108
|
-
|
|
109
|
-
if (this.component.customOptions.hasOwnProperty(key)) {
|
|
110
|
-
this._customAngularElement[key] = this.component.customOptions[key];
|
|
111
|
-
}
|
|
112
|
-
}
|
|
108
|
+
this.bindCustomOptions();
|
|
113
109
|
// Bind validate options
|
|
114
110
|
for (const key in this.component.validate) {
|
|
115
111
|
if (this.component.validate.hasOwnProperty(key)) {
|
|
@@ -139,6 +135,32 @@ export function createCustomFormioComponent(customComponentOptions) {
|
|
|
139
135
|
}
|
|
140
136
|
return superAttach;
|
|
141
137
|
}
|
|
138
|
+
// Push the (possibly mutated) customOptions onto the Angular element. Extracted from attach() so
|
|
139
|
+
// it can also be re-run from setValue(): a calculateValue expression can mutate
|
|
140
|
+
// this.component.customOptions as a side effect, but attach() (and therefore the original inline
|
|
141
|
+
// binding) only re-runs on a redraw, which is not guaranteed to fire after the calculation.
|
|
142
|
+
// Binding is idempotent, so re-running it is harmless.
|
|
143
|
+
bindCustomOptions() {
|
|
144
|
+
if (!this._customAngularElement) {
|
|
145
|
+
return;
|
|
146
|
+
}
|
|
147
|
+
for (const key in this.component.customOptions) {
|
|
148
|
+
if (Object.prototype.hasOwnProperty.call(this.component.customOptions, key) &&
|
|
149
|
+
key !== '__proto__' &&
|
|
150
|
+
key !== 'constructor' &&
|
|
151
|
+
key !== 'prototype') {
|
|
152
|
+
this._customAngularElement[key] = this.component.customOptions[key];
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
// @ts-ignore
|
|
157
|
+
setValue(value, flags = {}) {
|
|
158
|
+
const changed = super.setValue(value, flags);
|
|
159
|
+
// FormIO calls setValue() immediately after evaluating calculateValue, so re-applying the
|
|
160
|
+
// customOptions here reaches the Angular element right away, independent of redraw timing.
|
|
161
|
+
this.bindCustomOptions();
|
|
162
|
+
return changed;
|
|
163
|
+
}
|
|
142
164
|
// Add extra option to support multiple value (e.g. datagrid) with single angular component (disableMultiValueWrapper)
|
|
143
165
|
useWrapper() {
|
|
144
166
|
return (this.component.hasOwnProperty('multiple') &&
|
|
@@ -159,4 +181,4 @@ export function createCustomFormioComponent(customComponentOptions) {
|
|
|
159
181
|
}
|
|
160
182
|
};
|
|
161
183
|
}
|
|
162
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"create-custom-component.js","sourceRoot":"","sources":["../../../../../../../projects/valtimo/components/src/lib/modules/custom-formio-component/create-custom-component.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright 2015-2024 Ritense BV, the Netherlands.\n *\n * Licensed under EUPL, Version 1.2 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" basis,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {BuilderInfo, Components, ExtendedComponentSchema, Utils as FormioUtils} from 'formiojs';\nimport {FormioCustomComponentInfo, FormioCustomElement, FormioEvent} from './elements.common';\nimport {clone, isArray, isNil} from 'lodash';\n\nconst BaseInputComponent = Components.components.input;\nconst TextfieldComponent = Components.components.textfield;\n\nexport function createCustomFormioComponent(customComponentOptions: FormioCustomComponentInfo) {\n  return class CustomComponent extends BaseInputComponent {\n    static editForm = customComponentOptions.editForm || TextfieldComponent.editForm;\n    id = FormioUtils.getRandomComponentId();\n    type = customComponentOptions.type;\n    _customAngularElement: FormioCustomElement;\n\n    static schema() {\n      return BaseInputComponent.schema({\n        ...customComponentOptions.schema,\n        type: customComponentOptions.type,\n      });\n    }\n\n    // @ts-ignore\n    get defaultSchema() {\n      return CustomComponent.schema();\n    }\n\n    // @ts-ignore\n    get emptyValue() {\n      return customComponentOptions.emptyValue || null;\n    }\n\n    static get builderInfo(): BuilderInfo {\n      return {\n        title: customComponentOptions.title,\n        group: customComponentOptions.group,\n        icon: customComponentOptions.icon,\n        weight: customComponentOptions.weight,\n        documentation: customComponentOptions.documentation,\n        schema: CustomComponent.schema(),\n      };\n    }\n\n    constructor(\n      public component: ExtendedComponentSchema,\n      options: any,\n      data: any\n    ) {\n      super(\n        component,\n        {\n          ...options,\n          sanitizeConfig: {\n            addTags: [customComponentOptions.selector],\n          },\n        },\n        data\n      );\n\n      if (customComponentOptions.extraValidators) {\n        this.validators = this.validators.concat(customComponentOptions.extraValidators);\n      }\n    }\n\n    elementInfo() {\n      const info = super.elementInfo();\n      info.type = customComponentOptions.selector;\n      info.changeEvent = customComponentOptions.changeEvent || 'valueChange';\n      info.attr = {\n        ...info.attr,\n        class: info.attr.class.replace('form-control', 'form-control-custom-field'), // remove the form-control class as the custom angular component may look different\n      };\n      return info;\n    }\n\n    // @ts-ignore\n    get inputInfo() {\n      const info = {\n        id: this.key,\n        ...this.elementInfo(),\n      };\n      return info;\n    }\n\n    renderElement(value: any, index: number) {\n      const info = this.inputInfo;\n      return this.renderTemplate(customComponentOptions.template || 'input', {\n        input: info,\n        value,\n        index,\n      });\n    }\n\n    attach(element: HTMLElement) {\n      let superAttach = super.attach(element);\n\n      this._customAngularElement = element.querySelector(customComponentOptions.selector);\n\n      // Bind the custom options and the validations to the Angular component's inputs (flattened)\n      if (this._customAngularElement) {\n        // To make sure we have working input in IE...\n        // IE doesn't render it properly if it's not visible on the screen\n        // due to the whole structure applied via innerHTML to the parent\n        // so we need to use appendChild\n        if (!this._customAngularElement.getAttribute('ng-version')) {\n          this._customAngularElement.removeAttribute('ref');\n\n          const newCustomElement = document.createElement(\n            customComponentOptions.selector\n          ) as FormioCustomElement;\n\n          newCustomElement.setAttribute('ref', 'input');\n          Object.keys(this.inputInfo.attr).forEach((attr: string) => {\n            newCustomElement.setAttribute(attr, this.inputInfo.attr[attr]);\n          });\n\n          this._customAngularElement.appendChild(newCustomElement);\n          this._customAngularElement = newCustomElement;\n\n          superAttach = super.attach(element);\n        }\n\n        // Bind customOptions\n        for (const key in this.component.customOptions) {\n          if (this.component.customOptions.hasOwnProperty(key)) {\n            this._customAngularElement[key] = this.component.customOptions[key];\n          }\n        }\n        // Bind validate options\n        for (const key in this.component.validate) {\n          if (this.component.validate.hasOwnProperty(key)) {\n            this._customAngularElement[key] = this.component.validate[key];\n          }\n        }\n        // Bind options explicitly set\n        const fieldOptions = customComponentOptions.fieldOptions;\n        if (isArray(fieldOptions) && fieldOptions.length > 0) {\n          for (const key in fieldOptions) {\n            if (fieldOptions.hasOwnProperty(key)) {\n              this._customAngularElement[fieldOptions[key]] = this.component[fieldOptions[key]];\n            }\n          }\n        }\n\n        // Attach event listener for emit event\n        this._customAngularElement.addEventListener(\n          'formioEvent',\n          (event: CustomEvent<FormioEvent>) => {\n            this.emit(event.detail.eventName, {\n              ...event.detail.data,\n              component: this.component,\n            });\n          }\n        );\n\n        // Ensure we bind the value (if it isn't a multiple-value component with no wrapper)\n        if (!this._customAngularElement.value && !this.component.disableMultiValueWrapper) {\n          this.restoreValue();\n        }\n      }\n      return superAttach;\n    }\n\n    // Add extra option to support multiple value (e.g. datagrid) with single angular component (disableMultiValueWrapper)\n    useWrapper() {\n      return (\n        this.component.hasOwnProperty('multiple') &&\n        this.component.multiple &&\n        !this.component.disableMultiValueWrapper\n      );\n    }\n\n    // @ts-ignore\n    get defaultValue() {\n      let defaultValue = this.emptyValue;\n\n      // handle falsy default value\n      if (!isNil(this.component.defaultValue)) {\n        defaultValue = this.component.defaultValue;\n      }\n\n      if (this.component.customDefaultValue && !this.options.preview) {\n        defaultValue = this.evaluate(this.component.customDefaultValue, {value: ''}, 'value');\n      }\n\n      return clone(defaultValue);\n    }\n  };\n}\n"]}
|
|
184
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"create-custom-component.js","sourceRoot":"","sources":["../../../../../../../projects/valtimo/components/src/lib/modules/custom-formio-component/create-custom-component.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright 2015-2024 Ritense BV, the Netherlands.\n *\n * Licensed under EUPL, Version 1.2 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" basis,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {BuilderInfo, Components, ExtendedComponentSchema, Utils as FormioUtils} from 'formiojs';\nimport {FormioCustomComponentInfo, FormioCustomElement, FormioEvent} from './elements.common';\nimport {clone, isArray, isNil} from 'lodash';\n\nconst BaseInputComponent = Components.components.input;\nconst TextfieldComponent = Components.components.textfield;\n\nexport function createCustomFormioComponent(customComponentOptions: FormioCustomComponentInfo) {\n  return class CustomComponent extends BaseInputComponent {\n    static editForm = customComponentOptions.editForm || TextfieldComponent.editForm;\n    id = FormioUtils.getRandomComponentId();\n    type = customComponentOptions.type;\n    _customAngularElement: FormioCustomElement;\n\n    static schema() {\n      return BaseInputComponent.schema({\n        ...customComponentOptions.schema,\n        type: customComponentOptions.type,\n      });\n    }\n\n    // @ts-ignore\n    get defaultSchema() {\n      return CustomComponent.schema();\n    }\n\n    // @ts-ignore\n    get emptyValue() {\n      return customComponentOptions.emptyValue || null;\n    }\n\n    static get builderInfo(): BuilderInfo {\n      return {\n        title: customComponentOptions.title,\n        group: customComponentOptions.group,\n        icon: customComponentOptions.icon,\n        weight: customComponentOptions.weight,\n        documentation: customComponentOptions.documentation,\n        schema: CustomComponent.schema(),\n      };\n    }\n\n    constructor(\n      public component: ExtendedComponentSchema,\n      options: any,\n      data: any\n    ) {\n      super(\n        component,\n        {\n          ...options,\n          sanitizeConfig: {\n            addTags: [customComponentOptions.selector],\n          },\n        },\n        data\n      );\n\n      if (customComponentOptions.extraValidators) {\n        this.validators = this.validators.concat(customComponentOptions.extraValidators);\n      }\n    }\n\n    elementInfo() {\n      const info = super.elementInfo();\n      info.type = customComponentOptions.selector;\n      info.changeEvent = customComponentOptions.changeEvent || 'valueChange';\n      info.attr = {\n        ...info.attr,\n        class: info.attr.class.replace('form-control', 'form-control-custom-field'), // remove the form-control class as the custom angular component may look different\n      };\n      return info;\n    }\n\n    // @ts-ignore\n    get inputInfo() {\n      const info = {\n        id: this.key,\n        ...this.elementInfo(),\n      };\n      return info;\n    }\n\n    renderElement(value: any, index: number) {\n      const info = this.inputInfo;\n      return this.renderTemplate(customComponentOptions.template || 'input', {\n        input: info,\n        value,\n        index,\n      });\n    }\n\n    attach(element: HTMLElement) {\n      let superAttach = super.attach(element);\n\n      this._customAngularElement = element.querySelector(customComponentOptions.selector);\n\n      // Bind the custom options and the validations to the Angular component's inputs (flattened)\n      if (this._customAngularElement) {\n        // To make sure we have working input in IE...\n        // IE doesn't render it properly if it's not visible on the screen\n        // due to the whole structure applied via innerHTML to the parent\n        // so we need to use appendChild\n        if (!this._customAngularElement.getAttribute('ng-version')) {\n          this._customAngularElement.removeAttribute('ref');\n\n          const newCustomElement = document.createElement(\n            customComponentOptions.selector\n          ) as FormioCustomElement;\n\n          newCustomElement.setAttribute('ref', 'input');\n          Object.keys(this.inputInfo.attr).forEach((attr: string) => {\n            newCustomElement.setAttribute(attr, this.inputInfo.attr[attr]);\n          });\n\n          this._customAngularElement.appendChild(newCustomElement);\n          this._customAngularElement = newCustomElement;\n\n          superAttach = super.attach(element);\n        }\n\n        // Bind customOptions\n        this.bindCustomOptions();\n        // Bind validate options\n        for (const key in this.component.validate) {\n          if (this.component.validate.hasOwnProperty(key)) {\n            this._customAngularElement[key] = this.component.validate[key];\n          }\n        }\n        // Bind options explicitly set\n        const fieldOptions = customComponentOptions.fieldOptions;\n        if (isArray(fieldOptions) && fieldOptions.length > 0) {\n          for (const key in fieldOptions) {\n            if (fieldOptions.hasOwnProperty(key)) {\n              this._customAngularElement[fieldOptions[key]] = this.component[fieldOptions[key]];\n            }\n          }\n        }\n\n        // Attach event listener for emit event\n        this._customAngularElement.addEventListener(\n          'formioEvent',\n          (event: CustomEvent<FormioEvent>) => {\n            this.emit(event.detail.eventName, {\n              ...event.detail.data,\n              component: this.component,\n            });\n          }\n        );\n\n        // Ensure we bind the value (if it isn't a multiple-value component with no wrapper)\n        if (!this._customAngularElement.value && !this.component.disableMultiValueWrapper) {\n          this.restoreValue();\n        }\n      }\n      return superAttach;\n    }\n\n    // Push the (possibly mutated) customOptions onto the Angular element. Extracted from attach() so\n    // it can also be re-run from setValue(): a calculateValue expression can mutate\n    // this.component.customOptions as a side effect, but attach() (and therefore the original inline\n    // binding) only re-runs on a redraw, which is not guaranteed to fire after the calculation.\n    // Binding is idempotent, so re-running it is harmless.\n    bindCustomOptions(): void {\n      if (!this._customAngularElement) {\n        return;\n      }\n      for (const key in this.component.customOptions) {\n        if (\n          Object.prototype.hasOwnProperty.call(this.component.customOptions, key) &&\n          key !== '__proto__' &&\n          key !== 'constructor' &&\n          key !== 'prototype'\n        ) {\n          this._customAngularElement[key] = this.component.customOptions[key];\n        }\n      }\n    }\n\n    // @ts-ignore\n    setValue(value: any, flags: any = {}) {\n      const changed = super.setValue(value, flags);\n      // FormIO calls setValue() immediately after evaluating calculateValue, so re-applying the\n      // customOptions here reaches the Angular element right away, independent of redraw timing.\n      this.bindCustomOptions();\n      return changed;\n    }\n\n    // Add extra option to support multiple value (e.g. datagrid) with single angular component (disableMultiValueWrapper)\n    useWrapper() {\n      return (\n        this.component.hasOwnProperty('multiple') &&\n        this.component.multiple &&\n        !this.component.disableMultiValueWrapper\n      );\n    }\n\n    // @ts-ignore\n    get defaultValue() {\n      let defaultValue = this.emptyValue;\n\n      // handle falsy default value\n      if (!isNil(this.component.defaultValue)) {\n        defaultValue = this.component.defaultValue;\n      }\n\n      if (this.component.customDefaultValue && !this.options.preview) {\n        defaultValue = this.evaluate(this.component.customDefaultValue, {value: ''}, 'value');\n      }\n\n      return clone(defaultValue);\n    }\n  };\n}\n"]}
|
|
@@ -2370,11 +2370,7 @@ function createCustomFormioComponent(customComponentOptions) {
|
|
|
2370
2370
|
superAttach = super.attach(element);
|
|
2371
2371
|
}
|
|
2372
2372
|
// Bind customOptions
|
|
2373
|
-
|
|
2374
|
-
if (this.component.customOptions.hasOwnProperty(key)) {
|
|
2375
|
-
this._customAngularElement[key] = this.component.customOptions[key];
|
|
2376
|
-
}
|
|
2377
|
-
}
|
|
2373
|
+
this.bindCustomOptions();
|
|
2378
2374
|
// Bind validate options
|
|
2379
2375
|
for (const key in this.component.validate) {
|
|
2380
2376
|
if (this.component.validate.hasOwnProperty(key)) {
|
|
@@ -2404,6 +2400,32 @@ function createCustomFormioComponent(customComponentOptions) {
|
|
|
2404
2400
|
}
|
|
2405
2401
|
return superAttach;
|
|
2406
2402
|
}
|
|
2403
|
+
// Push the (possibly mutated) customOptions onto the Angular element. Extracted from attach() so
|
|
2404
|
+
// it can also be re-run from setValue(): a calculateValue expression can mutate
|
|
2405
|
+
// this.component.customOptions as a side effect, but attach() (and therefore the original inline
|
|
2406
|
+
// binding) only re-runs on a redraw, which is not guaranteed to fire after the calculation.
|
|
2407
|
+
// Binding is idempotent, so re-running it is harmless.
|
|
2408
|
+
bindCustomOptions() {
|
|
2409
|
+
if (!this._customAngularElement) {
|
|
2410
|
+
return;
|
|
2411
|
+
}
|
|
2412
|
+
for (const key in this.component.customOptions) {
|
|
2413
|
+
if (Object.prototype.hasOwnProperty.call(this.component.customOptions, key) &&
|
|
2414
|
+
key !== '__proto__' &&
|
|
2415
|
+
key !== 'constructor' &&
|
|
2416
|
+
key !== 'prototype') {
|
|
2417
|
+
this._customAngularElement[key] = this.component.customOptions[key];
|
|
2418
|
+
}
|
|
2419
|
+
}
|
|
2420
|
+
}
|
|
2421
|
+
// @ts-ignore
|
|
2422
|
+
setValue(value, flags = {}) {
|
|
2423
|
+
const changed = super.setValue(value, flags);
|
|
2424
|
+
// FormIO calls setValue() immediately after evaluating calculateValue, so re-applying the
|
|
2425
|
+
// customOptions here reaches the Angular element right away, independent of redraw timing.
|
|
2426
|
+
this.bindCustomOptions();
|
|
2427
|
+
return changed;
|
|
2428
|
+
}
|
|
2407
2429
|
// Add extra option to support multiple value (e.g. datagrid) with single angular component (disableMultiValueWrapper)
|
|
2408
2430
|
useWrapper() {
|
|
2409
2431
|
return (this.component.hasOwnProperty('multiple') &&
|