@gravitee/ui-particles-angular 5.14.0-improve-json-schema-preview-4b7c60a → 5.14.0-improve-json-schema-preview-57932da

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.
@@ -24,17 +24,17 @@ export class GioFormFocusInvalidDirective {
24
24
  onFormSubmit() {
25
25
  const selector = '.ng-invalid[formControlName],input.ng-invalid,mat-select.ng-invalid,textarea.ng-invalid,.gio-ng-invalid';
26
26
  try {
27
+ // Mark all controls as touched to display errors
28
+ if (this.formGroupDirective) {
29
+ this.formGroupDirective.control.markAllAsTouched();
30
+ this.formGroupDirective.control.updateValueAndValidity();
31
+ }
27
32
  let invalidControl = this.renderer.selectRootElement(selector, true);
28
33
  // If the form is a GioFormJsonSchema, we need to focus the first invalid control inside
29
34
  if (invalidControl.tagName === 'GIO-FORM-JSON-SCHEMA') {
30
35
  invalidControl = invalidControl.querySelector(selector);
31
36
  }
32
37
  if (invalidControl) {
33
- // Mark all controls as touched to display errors
34
- if (this.formGroupDirective) {
35
- this.formGroupDirective.control.markAllAsTouched();
36
- this.formGroupDirective.control.updateValueAndValidity();
37
- }
38
38
  invalidControl.scrollIntoView({ behavior: 'smooth', block: 'center' });
39
39
  invalidControl.focus({ preventScroll: true });
40
40
  }
@@ -58,4 +58,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
58
58
  type: HostListener,
59
59
  args: ['submit']
60
60
  }] } });
61
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2lvLWZvcm0tZm9jdXMtZmlyc3QtaW52YWxpZC5kaXJlY3RpdmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy91aS1wYXJ0aWNsZXMtYW5ndWxhci9zcmMvbGliL2dpby1mb3JtLWZvY3VzLWZpcnN0LWludmFsaWQvZ2lvLWZvcm0tZm9jdXMtZmlyc3QtaW52YWxpZC5kaXJlY3RpdmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7Ozs7O0dBY0c7QUFDSCxPQUFPLEVBQUUsU0FBUyxFQUFFLFlBQVksRUFBYSxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7OztBQU03RSxNQUFNLE9BQU8sNEJBQTRCO0lBQ3ZDLFlBQTZCLFFBQW1CLEVBQWlDLGtCQUFzQztRQUExRixhQUFRLEdBQVIsUUFBUSxDQUFXO1FBQWlDLHVCQUFrQixHQUFsQixrQkFBa0IsQ0FBb0I7SUFBRyxDQUFDO0lBR3BILFlBQVk7UUFDakIsTUFBTSxRQUFRLEdBQUcseUdBQXlHLENBQUM7UUFDM0gsSUFBSTtZQUNGLElBQUksY0FBYyxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUMsaUJBQWlCLENBQUMsUUFBUSxFQUFFLElBQUksQ0FBQyxDQUFDO1lBRXJFLHdGQUF3RjtZQUN4RixJQUFJLGNBQWMsQ0FBQyxPQUFPLEtBQUssc0JBQXNCLEVBQUU7Z0JBQ3JELGNBQWMsR0FBRyxjQUFjLENBQUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxDQUFDO2FBQ3pEO1lBRUQsSUFBSSxjQUFjLEVBQUU7Z0JBQ2xCLGlEQUFpRDtnQkFDakQsSUFBSSxJQUFJLENBQUMsa0JBQWtCLEVBQUU7b0JBQzNCLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxPQUFPLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQztvQkFDbkQsSUFBSSxDQUFDLGtCQUFrQixDQUFDLE9BQU8sQ0FBQyxzQkFBc0IsRUFBRSxDQUFDO2lCQUMxRDtnQkFFRCxjQUFjLENBQUMsY0FBYyxDQUFDLEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUUsUUFBUSxFQUFFLENBQUMsQ0FBQztnQkFDdkUsY0FBYyxDQUFDLEtBQUssQ0FBQyxFQUFFLGFBQWEsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO2FBQy9DO1NBQ0Y7UUFBQyxPQUFPLEtBQUssRUFBRTtZQUNkLGlFQUFpRTtZQUNqRSx3Q0FBd0M7U0FDekM7SUFDSCxDQUFDOzswSEE1QlUsNEJBQTRCOzhHQUE1Qiw0QkFBNEI7NEZBQTVCLDRCQUE0QjtrQkFIeEMsU0FBUzttQkFBQztvQkFDVCxRQUFRLEVBQUUsMkJBQTJCO2lCQUN0Qzs7MEJBRW9ELFFBQVE7NENBR3BELFlBQVk7c0JBRGxCLFlBQVk7dUJBQUMsUUFBUSIsInNvdXJjZXNDb250ZW50IjpbIi8qXG4gKiBDb3B5cmlnaHQgKEMpIDIwMTUgVGhlIEdyYXZpdGVlIHRlYW0gKGh0dHA6Ly9ncmF2aXRlZS5pbylcbiAqXG4gKiBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgXCJMaWNlbnNlXCIpO1xuICogeW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLlxuICogWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0XG4gKlxuICogICAgICAgICBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjBcbiAqXG4gKiBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlXG4gKiBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiBcIkFTIElTXCIgQkFTSVMsXG4gKiBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC5cbiAqIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmRcbiAqIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLlxuICovXG5pbXBvcnQgeyBEaXJlY3RpdmUsIEhvc3RMaXN0ZW5lciwgUmVuZGVyZXIyLCBPcHRpb25hbCB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgRm9ybUdyb3VwRGlyZWN0aXZlIH0gZnJvbSAnQGFuZ3VsYXIvZm9ybXMnO1xuXG5ARGlyZWN0aXZlKHtcbiAgc2VsZWN0b3I6ICdmb3JtW2dpb0Zvcm1Gb2N1c0ludmFsaWRdJyxcbn0pXG5leHBvcnQgY2xhc3MgR2lvRm9ybUZvY3VzSW52YWxpZERpcmVjdGl2ZSB7XG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgcmVhZG9ubHkgcmVuZGVyZXI6IFJlbmRlcmVyMiwgQE9wdGlvbmFsKCkgcHJvdGVjdGVkIHJlYWRvbmx5IGZvcm1Hcm91cERpcmVjdGl2ZTogRm9ybUdyb3VwRGlyZWN0aXZlKSB7fVxuXG4gIEBIb3N0TGlzdGVuZXIoJ3N1Ym1pdCcpXG4gIHB1YmxpYyBvbkZvcm1TdWJtaXQoKSB7XG4gICAgY29uc3Qgc2VsZWN0b3IgPSAnLm5nLWludmFsaWRbZm9ybUNvbnRyb2xOYW1lXSxpbnB1dC5uZy1pbnZhbGlkLG1hdC1zZWxlY3QubmctaW52YWxpZCx0ZXh0YXJlYS5uZy1pbnZhbGlkLC5naW8tbmctaW52YWxpZCc7XG4gICAgdHJ5IHtcbiAgICAgIGxldCBpbnZhbGlkQ29udHJvbCA9IHRoaXMucmVuZGVyZXIuc2VsZWN0Um9vdEVsZW1lbnQoc2VsZWN0b3IsIHRydWUpO1xuXG4gICAgICAvLyBJZiB0aGUgZm9ybSBpcyBhIEdpb0Zvcm1Kc29uU2NoZW1hLCB3ZSBuZWVkIHRvIGZvY3VzIHRoZSBmaXJzdCBpbnZhbGlkIGNvbnRyb2wgaW5zaWRlXG4gICAgICBpZiAoaW52YWxpZENvbnRyb2wudGFnTmFtZSA9PT0gJ0dJTy1GT1JNLUpTT04tU0NIRU1BJykge1xuICAgICAgICBpbnZhbGlkQ29udHJvbCA9IGludmFsaWRDb250cm9sLnF1ZXJ5U2VsZWN0b3Ioc2VsZWN0b3IpO1xuICAgICAgfVxuXG4gICAgICBpZiAoaW52YWxpZENvbnRyb2wpIHtcbiAgICAgICAgLy8gTWFyayBhbGwgY29udHJvbHMgYXMgdG91Y2hlZCB0byBkaXNwbGF5IGVycm9yc1xuICAgICAgICBpZiAodGhpcy5mb3JtR3JvdXBEaXJlY3RpdmUpIHtcbiAgICAgICAgICB0aGlzLmZvcm1Hcm91cERpcmVjdGl2ZS5jb250cm9sLm1hcmtBbGxBc1RvdWNoZWQoKTtcbiAgICAgICAgICB0aGlzLmZvcm1Hcm91cERpcmVjdGl2ZS5jb250cm9sLnVwZGF0ZVZhbHVlQW5kVmFsaWRpdHkoKTtcbiAgICAgICAgfVxuXG4gICAgICAgIGludmFsaWRDb250cm9sLnNjcm9sbEludG9WaWV3KHsgYmVoYXZpb3I6ICdzbW9vdGgnLCBibG9jazogJ2NlbnRlcicgfSk7XG4gICAgICAgIGludmFsaWRDb250cm9sLmZvY3VzKHsgcHJldmVudFNjcm9sbDogdHJ1ZSB9KTtcbiAgICAgIH1cbiAgICB9IGNhdGNoIChlcnJvcikge1xuICAgICAgLy8gQmVzdCBlZmZvcnQuIElmIHRoZSBmb2N1cyBkb2Vzbid0IHdvcmsgaXQncyBub3QgdmVyeSBpbXBvcnRhbnRcbiAgICAgIC8vIPCfp6ogVXNlZnVsIHRvIGF2b2lkIHNvbSBlcnJvciBpbiB0ZXN0c1xuICAgIH1cbiAgfVxufVxuIl19
61
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2lvLWZvcm0tZm9jdXMtZmlyc3QtaW52YWxpZC5kaXJlY3RpdmUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy91aS1wYXJ0aWNsZXMtYW5ndWxhci9zcmMvbGliL2dpby1mb3JtLWZvY3VzLWZpcnN0LWludmFsaWQvZ2lvLWZvcm0tZm9jdXMtZmlyc3QtaW52YWxpZC5kaXJlY3RpdmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUE7Ozs7Ozs7Ozs7Ozs7O0dBY0c7QUFDSCxPQUFPLEVBQUUsU0FBUyxFQUFFLFlBQVksRUFBYSxRQUFRLEVBQUUsTUFBTSxlQUFlLENBQUM7OztBQU03RSxNQUFNLE9BQU8sNEJBQTRCO0lBQ3ZDLFlBQTZCLFFBQW1CLEVBQWlDLGtCQUFzQztRQUExRixhQUFRLEdBQVIsUUFBUSxDQUFXO1FBQWlDLHVCQUFrQixHQUFsQixrQkFBa0IsQ0FBb0I7SUFBRyxDQUFDO0lBR3BILFlBQVk7UUFDakIsTUFBTSxRQUFRLEdBQUcseUdBQXlHLENBQUM7UUFDM0gsSUFBSTtZQUNGLGlEQUFpRDtZQUNqRCxJQUFJLElBQUksQ0FBQyxrQkFBa0IsRUFBRTtnQkFDM0IsSUFBSSxDQUFDLGtCQUFrQixDQUFDLE9BQU8sQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDO2dCQUNuRCxJQUFJLENBQUMsa0JBQWtCLENBQUMsT0FBTyxDQUFDLHNCQUFzQixFQUFFLENBQUM7YUFDMUQ7WUFFRCxJQUFJLGNBQWMsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLGlCQUFpQixDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsQ0FBQztZQUVyRSx3RkFBd0Y7WUFDeEYsSUFBSSxjQUFjLENBQUMsT0FBTyxLQUFLLHNCQUFzQixFQUFFO2dCQUNyRCxjQUFjLEdBQUcsY0FBYyxDQUFDLGFBQWEsQ0FBQyxRQUFRLENBQUMsQ0FBQzthQUN6RDtZQUVELElBQUksY0FBYyxFQUFFO2dCQUNsQixjQUFjLENBQUMsY0FBYyxDQUFDLEVBQUUsUUFBUSxFQUFFLFFBQVEsRUFBRSxLQUFLLEVBQUUsUUFBUSxFQUFFLENBQUMsQ0FBQztnQkFDdkUsY0FBYyxDQUFDLEtBQUssQ0FBQyxFQUFFLGFBQWEsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO2FBQy9DO1NBQ0Y7UUFBQyxPQUFPLEtBQUssRUFBRTtZQUNkLGlFQUFpRTtZQUNqRSx3Q0FBd0M7U0FDekM7SUFDSCxDQUFDOzswSEE1QlUsNEJBQTRCOzhHQUE1Qiw0QkFBNEI7NEZBQTVCLDRCQUE0QjtrQkFIeEMsU0FBUzttQkFBQztvQkFDVCxRQUFRLEVBQUUsMkJBQTJCO2lCQUN0Qzs7MEJBRW9ELFFBQVE7NENBR3BELFlBQVk7c0JBRGxCLFlBQVk7dUJBQUMsUUFBUSIsInNvdXJjZXNDb250ZW50IjpbIi8qXG4gKiBDb3B5cmlnaHQgKEMpIDIwMTUgVGhlIEdyYXZpdGVlIHRlYW0gKGh0dHA6Ly9ncmF2aXRlZS5pbylcbiAqXG4gKiBMaWNlbnNlZCB1bmRlciB0aGUgQXBhY2hlIExpY2Vuc2UsIFZlcnNpb24gMi4wICh0aGUgXCJMaWNlbnNlXCIpO1xuICogeW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLlxuICogWW91IG1heSBvYnRhaW4gYSBjb3B5IG9mIHRoZSBMaWNlbnNlIGF0XG4gKlxuICogICAgICAgICBodHRwOi8vd3d3LmFwYWNoZS5vcmcvbGljZW5zZXMvTElDRU5TRS0yLjBcbiAqXG4gKiBVbmxlc3MgcmVxdWlyZWQgYnkgYXBwbGljYWJsZSBsYXcgb3IgYWdyZWVkIHRvIGluIHdyaXRpbmcsIHNvZnR3YXJlXG4gKiBkaXN0cmlidXRlZCB1bmRlciB0aGUgTGljZW5zZSBpcyBkaXN0cmlidXRlZCBvbiBhbiBcIkFTIElTXCIgQkFTSVMsXG4gKiBXSVRIT1VUIFdBUlJBTlRJRVMgT1IgQ09ORElUSU9OUyBPRiBBTlkgS0lORCwgZWl0aGVyIGV4cHJlc3Mgb3IgaW1wbGllZC5cbiAqIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZyBwZXJtaXNzaW9ucyBhbmRcbiAqIGxpbWl0YXRpb25zIHVuZGVyIHRoZSBMaWNlbnNlLlxuICovXG5pbXBvcnQgeyBEaXJlY3RpdmUsIEhvc3RMaXN0ZW5lciwgUmVuZGVyZXIyLCBPcHRpb25hbCB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgRm9ybUdyb3VwRGlyZWN0aXZlIH0gZnJvbSAnQGFuZ3VsYXIvZm9ybXMnO1xuXG5ARGlyZWN0aXZlKHtcbiAgc2VsZWN0b3I6ICdmb3JtW2dpb0Zvcm1Gb2N1c0ludmFsaWRdJyxcbn0pXG5leHBvcnQgY2xhc3MgR2lvRm9ybUZvY3VzSW52YWxpZERpcmVjdGl2ZSB7XG4gIGNvbnN0cnVjdG9yKHByaXZhdGUgcmVhZG9ubHkgcmVuZGVyZXI6IFJlbmRlcmVyMiwgQE9wdGlvbmFsKCkgcHJvdGVjdGVkIHJlYWRvbmx5IGZvcm1Hcm91cERpcmVjdGl2ZTogRm9ybUdyb3VwRGlyZWN0aXZlKSB7fVxuXG4gIEBIb3N0TGlzdGVuZXIoJ3N1Ym1pdCcpXG4gIHB1YmxpYyBvbkZvcm1TdWJtaXQoKSB7XG4gICAgY29uc3Qgc2VsZWN0b3IgPSAnLm5nLWludmFsaWRbZm9ybUNvbnRyb2xOYW1lXSxpbnB1dC5uZy1pbnZhbGlkLG1hdC1zZWxlY3QubmctaW52YWxpZCx0ZXh0YXJlYS5uZy1pbnZhbGlkLC5naW8tbmctaW52YWxpZCc7XG4gICAgdHJ5IHtcbiAgICAgIC8vIE1hcmsgYWxsIGNvbnRyb2xzIGFzIHRvdWNoZWQgdG8gZGlzcGxheSBlcnJvcnNcbiAgICAgIGlmICh0aGlzLmZvcm1Hcm91cERpcmVjdGl2ZSkge1xuICAgICAgICB0aGlzLmZvcm1Hcm91cERpcmVjdGl2ZS5jb250cm9sLm1hcmtBbGxBc1RvdWNoZWQoKTtcbiAgICAgICAgdGhpcy5mb3JtR3JvdXBEaXJlY3RpdmUuY29udHJvbC51cGRhdGVWYWx1ZUFuZFZhbGlkaXR5KCk7XG4gICAgICB9XG5cbiAgICAgIGxldCBpbnZhbGlkQ29udHJvbCA9IHRoaXMucmVuZGVyZXIuc2VsZWN0Um9vdEVsZW1lbnQoc2VsZWN0b3IsIHRydWUpO1xuXG4gICAgICAvLyBJZiB0aGUgZm9ybSBpcyBhIEdpb0Zvcm1Kc29uU2NoZW1hLCB3ZSBuZWVkIHRvIGZvY3VzIHRoZSBmaXJzdCBpbnZhbGlkIGNvbnRyb2wgaW5zaWRlXG4gICAgICBpZiAoaW52YWxpZENvbnRyb2wudGFnTmFtZSA9PT0gJ0dJTy1GT1JNLUpTT04tU0NIRU1BJykge1xuICAgICAgICBpbnZhbGlkQ29udHJvbCA9IGludmFsaWRDb250cm9sLnF1ZXJ5U2VsZWN0b3Ioc2VsZWN0b3IpO1xuICAgICAgfVxuXG4gICAgICBpZiAoaW52YWxpZENvbnRyb2wpIHtcbiAgICAgICAgaW52YWxpZENvbnRyb2wuc2Nyb2xsSW50b1ZpZXcoeyBiZWhhdmlvcjogJ3Ntb290aCcsIGJsb2NrOiAnY2VudGVyJyB9KTtcbiAgICAgICAgaW52YWxpZENvbnRyb2wuZm9jdXMoeyBwcmV2ZW50U2Nyb2xsOiB0cnVlIH0pO1xuICAgICAgfVxuICAgIH0gY2F0Y2ggKGVycm9yKSB7XG4gICAgICAvLyBCZXN0IGVmZm9ydC4gSWYgdGhlIGZvY3VzIGRvZXNuJ3Qgd29yayBpdCdzIG5vdCB2ZXJ5IGltcG9ydGFudFxuICAgICAgLy8g8J+nqiBVc2VmdWwgdG8gYXZvaWQgc29tIGVycm9yIGluIHRlc3RzXG4gICAgfVxuICB9XG59XG4iXX0=
@@ -16,8 +16,8 @@
16
16
  import { Component, Host, Input, Optional } from '@angular/core';
17
17
  import { FormGroup } from '@angular/forms';
18
18
  import { cloneDeep, isObject } from 'lodash';
19
- import { debounceTime, filter, map, takeUntil, tap } from 'rxjs/operators';
20
- import { Subject } from 'rxjs';
19
+ import { debounceTime, distinctUntilChanged, filter, map, takeUntil } from 'rxjs/operators';
20
+ import { combineLatest, Subject } from 'rxjs';
21
21
  import * as i0 from "@angular/core";
22
22
  import * as i1 from "./gio-formly-json-schema.service";
23
23
  import * as i2 from "@angular/cdk/a11y";
@@ -39,6 +39,7 @@ export class GioFormJsonSchemaComponent {
39
39
  this._onChange = () => ({});
40
40
  this._onTouched = () => ({});
41
41
  this.touched = false;
42
+ this.stateChanges$ = new Subject();
42
43
  if (ngControl) {
43
44
  // Setting the value accessor directly (instead of using
44
45
  // the providers `NG_VALUE_ACCESSOR`) to avoid running into a circular import.
@@ -58,27 +59,38 @@ export class GioFormJsonSchemaComponent {
58
59
  }
59
60
  }
60
61
  ngOnInit() {
61
- // When the parent form is touched, mark all the sub formGroup as touched
62
+ // When the parent form is touched, mark all the sub formGroup as touched ony once
62
63
  const parentControl = this.ngControl?.control?.parent;
63
64
  parentControl?.statusChanges
64
- ?.pipe(takeUntil(this.unsubscribe$), map(() => parentControl?.touched), filter(touched => touched === true), tap(() => this.formGroup.markAllAsTouched()))
65
- .subscribe();
66
- this.formGroup.statusChanges.pipe(takeUntil(this.unsubscribe$)).subscribe(status => {
67
- if (status === 'VALID') {
68
- this.ngControl?.control?.setErrors(null);
69
- }
70
- if (status === 'INVALID') {
71
- this.ngControl?.control?.setErrors({ invalid: true });
72
- }
65
+ ?.pipe(takeUntil(this.unsubscribe$), map(() => parentControl?.touched), filter(touched => touched === true), distinctUntilChanged())
66
+ .subscribe(() => {
67
+ this.formGroup.markAllAsTouched();
68
+ this.stateChanges$.next();
73
69
  });
74
70
  // To simulate the behavior of classic form controls, emit value only when the form is touched
75
71
  // Allow to keep the formControl pristine until the user interact with it
76
- this.formGroup.valueChanges
72
+ combineLatest([this.formGroup.statusChanges, this.formGroup.valueChanges])
77
73
  .pipe(takeUntil(this.unsubscribe$),
78
74
  // Group all valueChanges events emit by formly in a single one
79
- debounceTime(200), filter(() => this.touched))
80
- .subscribe(value => {
81
- this._onChange(value);
75
+ debounceTime(100))
76
+ .subscribe(() => {
77
+ this.stateChanges$.next();
78
+ });
79
+ this.stateChanges$.pipe(takeUntil(this.unsubscribe$)).subscribe(() => {
80
+ const { status, value, touched } = this.formGroup;
81
+ if (touched) {
82
+ this._onTouched();
83
+ this.touched = true;
84
+ }
85
+ if (this.touched) {
86
+ this._onChange(value);
87
+ if (status === 'VALID') {
88
+ this.ngControl?.control?.setErrors(null);
89
+ }
90
+ if (status === 'INVALID') {
91
+ this.ngControl?.control?.setErrors({ invalid: true });
92
+ }
93
+ }
82
94
  });
83
95
  }
84
96
  ngOnDestroy() {
@@ -117,4 +129,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.12", ngImpo
117
129
  }], options: [{
118
130
  type: Input
119
131
  }] } });
120
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"gio-form-json-schema.component.js","sourceRoot":"","sources":["../../../../../projects/ui-particles-angular/src/lib/gio-form-json-schema/gio-form-json-schema.component.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright (C) 2023 The Gravitee team (http://gravitee.io)\n *\n * Licensed under the Apache License, Version 2.0 (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 *         http://www.apache.org/licenses/LICENSE-2.0\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 */\nimport { Component, ElementRef, Host, Input, OnDestroy, OnInit, Optional } from '@angular/core';\nimport { ControlValueAccessor, FormGroup, NgControl } from '@angular/forms';\nimport { FormlyFieldConfig, FormlyFormOptions } from '@ngx-formly/core';\nimport { cloneDeep, isObject } from 'lodash';\nimport { debounceTime, filter, map, takeUntil, tap } from 'rxjs/operators';\nimport { Subject } from 'rxjs';\nimport { FocusMonitor } from '@angular/cdk/a11y';\n\nimport { GioJsonSchema } from './model/GioJsonSchema';\nimport { GioFormlyJsonSchemaService } from './gio-formly-json-schema.service';\n\n@Component({\n  selector: 'gio-form-json-schema',\n  template: `<formly-form *ngIf=\"formGroup\" [fields]=\"fields\" [options]=\"options\" [form]=\"formGroup\" [model]=\"model\"></formly-form>`,\n  styleUrls: ['./gio-form-json-schema.component.scss'],\n})\nexport class GioFormJsonSchemaComponent implements ControlValueAccessor, OnInit, OnDestroy {\n  private unsubscribe$: Subject<void> = new Subject<void>();\n\n  @Input()\n  public set jsonSchema(jsonSchema: GioJsonSchema) {\n    if (isObject(jsonSchema)) {\n      this.fields = [this.gioFormlyJsonSchema.toFormlyFieldConfig(jsonSchema)];\n    }\n  }\n\n  public formGroup: FormGroup = new FormGroup({});\n\n  @Input()\n  public options: FormlyFormOptions = {};\n\n  public model: unknown = {};\n\n  public fields: FormlyFieldConfig[] = [];\n\n  public loading = true;\n\n  public _onChange: (value: unknown | null) => void = () => ({});\n\n  public _onTouched: () => void = () => ({});\n\n  private touched = false;\n\n  constructor(\n    private readonly gioFormlyJsonSchema: GioFormlyJsonSchemaService,\n    private readonly elRef: ElementRef,\n    private readonly fm: FocusMonitor,\n    @Host() @Optional() public readonly ngControl?: NgControl,\n  ) {\n    if (ngControl) {\n      // Setting the value accessor directly (instead of using\n      // the providers `NG_VALUE_ACCESSOR`) to avoid running into a circular import.\n      ngControl.valueAccessor = this;\n    }\n\n    // When the user interact with the form, mark it as touched\n    fm.monitor(elRef.nativeElement, true)\n      .pipe(takeUntil(this.unsubscribe$))\n      .subscribe(() => {\n        this._onTouched();\n        this.touched = true;\n      });\n  }\n\n  public ngOnInit(): void {\n    // When the parent form is touched, mark all the sub formGroup as touched\n    const parentControl = this.ngControl?.control?.parent;\n    parentControl?.statusChanges\n      ?.pipe(\n        takeUntil(this.unsubscribe$),\n        map(() => parentControl?.touched),\n        filter(touched => touched === true),\n        tap(() => this.formGroup.markAllAsTouched()),\n      )\n      .subscribe();\n\n    this.formGroup.statusChanges.pipe(takeUntil(this.unsubscribe$)).subscribe(status => {\n      if (status === 'VALID') {\n        this.ngControl?.control?.setErrors(null);\n      }\n      if (status === 'INVALID') {\n        this.ngControl?.control?.setErrors({ invalid: true });\n      }\n    });\n\n    // To simulate the behavior of classic form controls, emit value only when the form is touched\n    // Allow to keep the formControl pristine until the user interact with it\n    this.formGroup.valueChanges\n      .pipe(\n        takeUntil(this.unsubscribe$),\n        // Group all valueChanges events emit by formly in a single one\n        debounceTime(200),\n        filter(() => this.touched),\n      )\n      .subscribe(value => {\n        this._onChange(value);\n      });\n  }\n\n  public ngOnDestroy() {\n    this.unsubscribe$.next();\n    this.unsubscribe$.unsubscribe();\n    this.fm.stopMonitoring(this.elRef.nativeElement);\n  }\n\n  // From ControlValueAccessor\n  public writeValue(value: unknown): void {\n    this.model = cloneDeep(value) ?? {};\n  }\n\n  // From ControlValueAccessor\n  public registerOnChange(fn: (value: unknown | null) => void): void {\n    this._onChange = fn;\n  }\n\n  // From ControlValueAccessor\n  public registerOnTouched(fn: () => void): void {\n    this._onTouched = fn;\n  }\n\n  // From ControlValueAccessor\n  public setDisabledState?(_isDisabled: boolean): void {\n    throw new Error('Method not implemented.');\n  }\n}\n"]}
132
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"gio-form-json-schema.component.js","sourceRoot":"","sources":["../../../../../projects/ui-particles-angular/src/lib/gio-form-json-schema/gio-form-json-schema.component.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright (C) 2023 The Gravitee team (http://gravitee.io)\n *\n * Licensed under the Apache License, Version 2.0 (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 *         http://www.apache.org/licenses/LICENSE-2.0\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 */\nimport { Component, ElementRef, Host, Input, OnDestroy, OnInit, Optional } from '@angular/core';\nimport { ControlValueAccessor, FormGroup, NgControl } from '@angular/forms';\nimport { FormlyFieldConfig, FormlyFormOptions } from '@ngx-formly/core';\nimport { cloneDeep, isObject } from 'lodash';\nimport { debounceTime, distinctUntilChanged, filter, map, takeUntil } from 'rxjs/operators';\nimport { combineLatest, Subject } from 'rxjs';\nimport { FocusMonitor } from '@angular/cdk/a11y';\n\nimport { GioJsonSchema } from './model/GioJsonSchema';\nimport { GioFormlyJsonSchemaService } from './gio-formly-json-schema.service';\n\n@Component({\n  selector: 'gio-form-json-schema',\n  template: `<formly-form *ngIf=\"formGroup\" [fields]=\"fields\" [options]=\"options\" [form]=\"formGroup\" [model]=\"model\"></formly-form>`,\n  styleUrls: ['./gio-form-json-schema.component.scss'],\n})\nexport class GioFormJsonSchemaComponent implements ControlValueAccessor, OnInit, OnDestroy {\n  private unsubscribe$: Subject<void> = new Subject<void>();\n\n  @Input()\n  public set jsonSchema(jsonSchema: GioJsonSchema) {\n    if (isObject(jsonSchema)) {\n      this.fields = [this.gioFormlyJsonSchema.toFormlyFieldConfig(jsonSchema)];\n    }\n  }\n\n  public formGroup: FormGroup = new FormGroup({});\n\n  @Input()\n  public options: FormlyFormOptions = {};\n\n  public model: unknown = {};\n\n  public fields: FormlyFieldConfig[] = [];\n\n  public loading = true;\n\n  public _onChange: (value: unknown | null) => void = () => ({});\n\n  public _onTouched: () => void = () => ({});\n\n  private touched = false;\n\n  private stateChanges$ = new Subject<void>();\n\n  constructor(\n    private readonly gioFormlyJsonSchema: GioFormlyJsonSchemaService,\n    private readonly elRef: ElementRef,\n    private readonly fm: FocusMonitor,\n    @Host() @Optional() public readonly ngControl?: NgControl,\n  ) {\n    if (ngControl) {\n      // Setting the value accessor directly (instead of using\n      // the providers `NG_VALUE_ACCESSOR`) to avoid running into a circular import.\n      ngControl.valueAccessor = this;\n    }\n\n    // When the user interact with the form, mark it as touched\n    fm.monitor(elRef.nativeElement, true)\n      .pipe(takeUntil(this.unsubscribe$))\n      .subscribe(() => {\n        this._onTouched();\n        this.touched = true;\n      });\n  }\n\n  public ngOnInit(): void {\n    // When the parent form is touched, mark all the sub formGroup as touched ony once\n    const parentControl = this.ngControl?.control?.parent;\n    parentControl?.statusChanges\n      ?.pipe(\n        takeUntil(this.unsubscribe$),\n        map(() => parentControl?.touched),\n        filter(touched => touched === true),\n        distinctUntilChanged(),\n      )\n      .subscribe(() => {\n        this.formGroup.markAllAsTouched();\n        this.stateChanges$.next();\n      });\n\n    // To simulate the behavior of classic form controls, emit value only when the form is touched\n    // Allow to keep the formControl pristine until the user interact with it\n    combineLatest([this.formGroup.statusChanges, this.formGroup.valueChanges])\n      .pipe(\n        takeUntil(this.unsubscribe$),\n        // Group all valueChanges events emit by formly in a single one\n        debounceTime(100),\n      )\n      .subscribe(() => {\n        this.stateChanges$.next();\n      });\n\n    this.stateChanges$.pipe(takeUntil(this.unsubscribe$)).subscribe(() => {\n      const { status, value, touched } = this.formGroup;\n      if (touched) {\n        this._onTouched();\n        this.touched = true;\n      }\n\n      if (this.touched) {\n        this._onChange(value);\n\n        if (status === 'VALID') {\n          this.ngControl?.control?.setErrors(null);\n        }\n        if (status === 'INVALID') {\n          this.ngControl?.control?.setErrors({ invalid: true });\n        }\n      }\n    });\n  }\n\n  public ngOnDestroy() {\n    this.unsubscribe$.next();\n    this.unsubscribe$.unsubscribe();\n    this.fm.stopMonitoring(this.elRef.nativeElement);\n  }\n\n  // From ControlValueAccessor\n  public writeValue(value: unknown): void {\n    this.model = cloneDeep(value) ?? {};\n  }\n\n  // From ControlValueAccessor\n  public registerOnChange(fn: (value: unknown | null) => void): void {\n    this._onChange = fn;\n  }\n\n  // From ControlValueAccessor\n  public registerOnTouched(fn: () => void): void {\n    this._onTouched = fn;\n  }\n\n  // From ControlValueAccessor\n  public setDisabledState?(_isDisabled: boolean): void {\n    throw new Error('Method not implemented.');\n  }\n}\n"]}
@@ -1,7 +1,7 @@
1
1
  import { trigger, transition, style, animate } from '@angular/animations';
2
2
  import * as i0 from '@angular/core';
3
3
  import { EventEmitter, Component, HostBinding, Input, Output, HostListener, NgModule, Optional, Self, ViewChild, Directive, Inject, forwardRef, ChangeDetectionStrategy, Injectable, ViewEncapsulation, ContentChildren, Host, ContentChild, InjectionToken } from '@angular/core';
4
- import { timer, Subject, fromEvent, of, BehaviorSubject, ReplaySubject } from 'rxjs';
4
+ import { timer, Subject, fromEvent, of, BehaviorSubject, combineLatest, ReplaySubject } from 'rxjs';
5
5
  import * as i1 from '@angular/material/card';
6
6
  import { MatCardModule } from '@angular/material/card';
7
7
  import * as i2 from '@angular/material/button';
@@ -2838,6 +2838,7 @@ class GioFormJsonSchemaComponent {
2838
2838
  this._onChange = () => ({});
2839
2839
  this._onTouched = () => ({});
2840
2840
  this.touched = false;
2841
+ this.stateChanges$ = new Subject();
2841
2842
  if (ngControl) {
2842
2843
  // Setting the value accessor directly (instead of using
2843
2844
  // the providers `NG_VALUE_ACCESSOR`) to avoid running into a circular import.
@@ -2858,26 +2859,37 @@ class GioFormJsonSchemaComponent {
2858
2859
  }
2859
2860
  ngOnInit() {
2860
2861
  var _a, _b, _c;
2861
- // When the parent form is touched, mark all the sub formGroup as touched
2862
+ // When the parent form is touched, mark all the sub formGroup as touched ony once
2862
2863
  const parentControl = (_b = (_a = this.ngControl) === null || _a === void 0 ? void 0 : _a.control) === null || _b === void 0 ? void 0 : _b.parent;
2863
- (_c = parentControl === null || parentControl === void 0 ? void 0 : parentControl.statusChanges) === null || _c === void 0 ? void 0 : _c.pipe(takeUntil(this.unsubscribe$), map(() => parentControl === null || parentControl === void 0 ? void 0 : parentControl.touched), filter(touched => touched === true), tap(() => this.formGroup.markAllAsTouched())).subscribe();
2864
- this.formGroup.statusChanges.pipe(takeUntil(this.unsubscribe$)).subscribe(status => {
2865
- var _a, _b, _c, _d;
2866
- if (status === 'VALID') {
2867
- (_b = (_a = this.ngControl) === null || _a === void 0 ? void 0 : _a.control) === null || _b === void 0 ? void 0 : _b.setErrors(null);
2868
- }
2869
- if (status === 'INVALID') {
2870
- (_d = (_c = this.ngControl) === null || _c === void 0 ? void 0 : _c.control) === null || _d === void 0 ? void 0 : _d.setErrors({ invalid: true });
2871
- }
2864
+ (_c = parentControl === null || parentControl === void 0 ? void 0 : parentControl.statusChanges) === null || _c === void 0 ? void 0 : _c.pipe(takeUntil(this.unsubscribe$), map(() => parentControl === null || parentControl === void 0 ? void 0 : parentControl.touched), filter(touched => touched === true), distinctUntilChanged()).subscribe(() => {
2865
+ this.formGroup.markAllAsTouched();
2866
+ this.stateChanges$.next();
2872
2867
  });
2873
2868
  // To simulate the behavior of classic form controls, emit value only when the form is touched
2874
2869
  // Allow to keep the formControl pristine until the user interact with it
2875
- this.formGroup.valueChanges
2870
+ combineLatest([this.formGroup.statusChanges, this.formGroup.valueChanges])
2876
2871
  .pipe(takeUntil(this.unsubscribe$),
2877
2872
  // Group all valueChanges events emit by formly in a single one
2878
- debounceTime(200), filter(() => this.touched))
2879
- .subscribe(value => {
2880
- this._onChange(value);
2873
+ debounceTime(100))
2874
+ .subscribe(() => {
2875
+ this.stateChanges$.next();
2876
+ });
2877
+ this.stateChanges$.pipe(takeUntil(this.unsubscribe$)).subscribe(() => {
2878
+ var _a, _b, _c, _d;
2879
+ const { status, value, touched } = this.formGroup;
2880
+ if (touched) {
2881
+ this._onTouched();
2882
+ this.touched = true;
2883
+ }
2884
+ if (this.touched) {
2885
+ this._onChange(value);
2886
+ if (status === 'VALID') {
2887
+ (_b = (_a = this.ngControl) === null || _a === void 0 ? void 0 : _a.control) === null || _b === void 0 ? void 0 : _b.setErrors(null);
2888
+ }
2889
+ if (status === 'INVALID') {
2890
+ (_d = (_c = this.ngControl) === null || _c === void 0 ? void 0 : _c.control) === null || _d === void 0 ? void 0 : _d.setErrors({ invalid: true });
2891
+ }
2892
+ }
2881
2893
  });
2882
2894
  }
2883
2895
  ngOnDestroy() {
@@ -3743,17 +3755,17 @@ class GioFormFocusInvalidDirective {
3743
3755
  onFormSubmit() {
3744
3756
  const selector = '.ng-invalid[formControlName],input.ng-invalid,mat-select.ng-invalid,textarea.ng-invalid,.gio-ng-invalid';
3745
3757
  try {
3758
+ // Mark all controls as touched to display errors
3759
+ if (this.formGroupDirective) {
3760
+ this.formGroupDirective.control.markAllAsTouched();
3761
+ this.formGroupDirective.control.updateValueAndValidity();
3762
+ }
3746
3763
  let invalidControl = this.renderer.selectRootElement(selector, true);
3747
3764
  // If the form is a GioFormJsonSchema, we need to focus the first invalid control inside
3748
3765
  if (invalidControl.tagName === 'GIO-FORM-JSON-SCHEMA') {
3749
3766
  invalidControl = invalidControl.querySelector(selector);
3750
3767
  }
3751
3768
  if (invalidControl) {
3752
- // Mark all controls as touched to display errors
3753
- if (this.formGroupDirective) {
3754
- this.formGroupDirective.control.markAllAsTouched();
3755
- this.formGroupDirective.control.updateValueAndValidity();
3756
- }
3757
3769
  invalidControl.scrollIntoView({ behavior: 'smooth', block: 'center' });
3758
3770
  invalidControl.focus({ preventScroll: true });
3759
3771
  }