fix(core): fix various errors during SSR

fix #1821
ngx-formly · Oct 7, 2019 · 921a451 · 921a451
1 parent 6f7a10a
commit 921a451
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/src/core/src/lib/utils.ts b/src/core/src/lib/utils.ts
@@ -102,10 +102,13 @@ export function clone(value: any): any {
     !isObject(value)
     || value instanceof RegExp
     || value instanceof Observable
-    || value instanceof FileList
-    || value instanceof File
-    || value instanceof Blob
-    || /* instanceof SafeHtmlImpl */ value.changingThisBreaksApplicationSecurity) {
+    || /* instanceof SafeHtmlImpl */ value.changingThisBreaksApplicationSecurity
+    || (typeof window !== 'undefined' && (
+      value instanceof FileList
+      || value instanceof File
+      || value instanceof Blob
+    ))
+  ) {
     return value;
   }
 

diff --git a/src/material/form-field/src/form-field.wrapper.ts b/src/material/form-field/src/form-field.wrapper.ts
@@ -62,11 +62,6 @@ export class FormlyWrapperFormField extends FieldWrapper<MatFormlyFieldConfig> i
     private focusMonitor: FocusMonitor,
   ) {
     super();
-
-    focusMonitor.monitor(elementRef, true).subscribe(origin => {
-      this.field.focus = !!origin;
-      this.stateChanges.next();
-    });
   }
 
   ngOnInit() {
@@ -82,6 +77,11 @@ export class FormlyWrapperFormField extends FieldWrapper<MatFormlyFieldConfig> i
     if (this.formlyField.hide && this.formlyField.templateOptions!.appearance === 'outline') {
       this.initialGapCalculated = true;
     }
+
+    this.focusMonitor.monitor(this.elementRef, true).subscribe(origin => {
+      this.field.focus = !!origin;
+      this.stateChanges.next();
+    });
   }
 
   ngAfterContentChecked() {