Merge pull request #351 from ghiscoding/feat/editor-to-native-element

chore(editors): use optional chaining to remove editor from dom
ghiscoding · May 26, 2021 · c490dda · c490dda
2 parents 6220216 + 8ac67f5
commit c490dda
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 33 deletions.
diff --git a/packages/common/src/editors/autoCompleteEditor.ts b/packages/common/src/editors/autoCompleteEditor.ts
@@ -149,7 +149,7 @@ export class AutoCompleteEditor implements Editor {
 
   /** Get the Validator function, can be passed in Editor property or Column Definition */
   get validator(): EditorValidator | undefined {
-    return (this.columnEditor && this.columnEditor.validator) || (this.columnDef && this.columnDef.validator);
+    return this.columnEditor?.validator ?? this.columnDef?.validator;
   }
 
   init() {

diff --git a/packages/common/src/editors/checkboxEditor.ts b/packages/common/src/editors/checkboxEditor.ts
@@ -62,7 +62,7 @@ export class CheckboxEditor implements Editor {
 
   /** Get the Validator function, can be passed in Editor property or Column Definition */
   get validator(): EditorValidator | undefined {
-    return (this.columnEditor && this.columnEditor.validator) || (this.columnDef && this.columnDef.validator);
+    return this.columnEditor?.validator ?? this.columnDef?.validator;
   }
 
   init(): void {

diff --git a/packages/common/src/editors/dualInputEditor.ts b/packages/common/src/editors/dualInputEditor.ts
@@ -103,7 +103,7 @@ export class DualInputEditor implements Editor {
 
   /** Get the Shared Validator function, can be passed in Editor property or Column Definition */
   get validator(): EditorValidator | undefined {
-    return (this.columnEditor && this.columnEditor.validator) || (this.columnDef && this.columnDef.validator);
+    return this.columnEditor?.validator ?? this.columnDef?.validator;
   }
 
   init() {

diff --git a/packages/common/src/editors/floatEditor.ts b/packages/common/src/editors/floatEditor.ts
@@ -66,7 +66,7 @@ export class FloatEditor implements Editor {
 
   /** Get the Validator function, can be passed in Editor property or Column Definition */
   get validator(): EditorValidator | undefined {
-    return (this.columnEditor && this.columnEditor.validator) || (this.columnDef && this.columnDef.validator);
+    return this.columnEditor?.validator ?? this.columnDef?.validator;
   }
 
   init() {
@@ -117,13 +117,7 @@ export class FloatEditor implements Editor {
 
   destroy() {
     this._bindEventService.unbindAll();
-    if (this._input) {
-      setTimeout(() => {
-        if (this._input) {
-          this._input.remove();
-        }
-      });
-    }
+    this._input?.remove?.();
   }
 
   disable(isDisabled = true) {

diff --git a/packages/common/src/editors/integerEditor.ts b/packages/common/src/editors/integerEditor.ts
@@ -64,7 +64,7 @@ export class IntegerEditor implements Editor {
 
   /** Get the Validator function, can be passed in Editor property or Column Definition */
   get validator(): EditorValidator | undefined {
-    return (this.columnEditor && this.columnEditor.validator) || (this.columnDef && this.columnDef.validator);
+    return this.columnEditor?.validator ?? this.columnDef?.validator;
   }
 
   init() {
@@ -114,15 +114,8 @@ export class IntegerEditor implements Editor {
   }
 
   destroy() {
-    if (this._input) {
-      this._bindEventService.unbindAll();
-      setTimeout(() => {
-        if (this._input) {
-          this._input.remove();
-          this._input = undefined;
-        }
-      });
-    }
+    this._bindEventService.unbindAll();
+    this._input?.remove?.();
   }
 
   disable(isDisabled = true) {

diff --git a/packages/common/src/editors/selectEditor.ts b/packages/common/src/editors/selectEditor.ts
@@ -294,7 +294,7 @@ export class SelectEditor implements Editor {
 
   /** Get the Validator function, can be passed in Editor property or Column Definition */
   get validator(): EditorValidator | undefined {
-    return (this.columnEditor && this.columnEditor.validator) || (this.columnDef && this.columnDef.validator);
+    return this.columnEditor?.validator ?? this.columnDef?.validator;
   }
 
   init() {

diff --git a/packages/common/src/editors/sliderEditor.ts b/packages/common/src/editors/sliderEditor.ts
@@ -80,7 +80,7 @@ export class SliderEditor implements Editor {
 
   /** Get the Validator function, can be passed in Editor property or Column Definition */
   get validator(): EditorValidator | undefined {
-    return (this.columnEditor && this.columnEditor.validator) || (this.columnDef && this.columnDef.validator);
+    return this.columnEditor?.validator ?? this.columnDef?.validator;
   }
 
   init(): void {

diff --git a/packages/common/src/editors/textEditor.ts b/packages/common/src/editors/textEditor.ts
@@ -64,7 +64,7 @@ export class TextEditor implements Editor {
 
   /** Get the Validator function, can be passed in Editor property or Column Definition */
   get validator(): EditorValidator | undefined {
-    return (this.columnEditor && this.columnEditor.validator) || (this.columnDef && this.columnDef.validator);
+    return this.columnEditor?.validator ?? this.columnDef?.validator;
   }
 
   init() {
@@ -106,15 +106,8 @@ export class TextEditor implements Editor {
   }
 
   destroy() {
-    if (this._input) {
-      this._bindEventService.unbindAll();
-      setTimeout(() => {
-        if (this._input) {
-          this._input.remove();
-          this._input = undefined;
-        }
-      });
-    }
+    this._bindEventService.unbindAll();
+    this._input?.remove?.();
   }
 
   disable(isDisabled = true) {