diff --git a/libs/fabric/src/lib/components/text-field/base-text-field.component.ts b/libs/fabric/src/lib/components/text-field/base-text-field.component.ts
index ea11852b..75e62dfa 100644
--- a/libs/fabric/src/lib/components/text-field/base-text-field.component.ts
+++ b/libs/fabric/src/lib/components/text-field/base-text-field.component.ts
@@ -65,6 +65,9 @@ export class FabBaseTextFieldComponent extends ReactWrapperComponent<ITextFieldP
   @Input() renderPrefix?: InputRendererOptions<ITextFieldProps>;
   @Input() renderSuffix?: InputRendererOptions<ITextFieldProps>;
 
+  @Output() readonly onFocus = new EventEmitter<FocusEvent>();
+  @Output() readonly onClick = new EventEmitter<MouseEvent>();
+
   @Output() readonly onChange = new EventEmitter<{ event: Event; newValue?: string }>();
   @Output() readonly onBeforeChange = new EventEmitter<{ newValue: any }>();
   @Output() readonly onNotifyValidationResult = new EventEmitter<{ errorMessage: string; value: string | undefined }>();
@@ -93,6 +96,14 @@ export class FabBaseTextFieldComponent extends ReactWrapperComponent<ITextFieldP
     this.onRenderSuffix = this.createRenderPropHandler(this.renderSuffix);
   }
 
+  onClickHandler(ev?: React.MouseEvent) {
+    this.onClick.emit(ev && ev.nativeEvent);
+  }
+
+  onFocusHandler(ev?: React.FocusEvent) {
+    this.onFocus.emit(ev && ev.nativeEvent);
+  }
+
   onChangeHandler(event: React.FormEvent<HTMLInputElement | HTMLTextAreaElement>, newValue?: string) {
     this.onChange.emit({ event: event.nativeEvent, newValue });
 
diff --git a/libs/fabric/src/lib/components/text-field/masked-text-field.component.ts b/libs/fabric/src/lib/components/text-field/masked-text-field.component.ts
index 57127ac6..94f118a9 100644
--- a/libs/fabric/src/lib/components/text-field/masked-text-field.component.ts
+++ b/libs/fabric/src/lib/components/text-field/masked-text-field.component.ts
@@ -58,6 +58,8 @@ import { FabBaseTextFieldComponent } from './base-text-field.component';
       [Change]="onChangeHandler"
       [BeforeChange]="onBeforeChangeHandler"
       [NotifyValidationResult]="onNotifyValidationResultHandler"
+      (onClick)="onClickHandler($event)"
+      (onFocus)="onFocusHandler($event)"
     >
     </MaskedTextField>
   `,
diff --git a/libs/fabric/src/lib/components/text-field/text-field.component.ts b/libs/fabric/src/lib/components/text-field/text-field.component.ts
index 7aa244af..aa236ad9 100644
--- a/libs/fabric/src/lib/components/text-field/text-field.component.ts
+++ b/libs/fabric/src/lib/components/text-field/text-field.component.ts
@@ -58,6 +58,8 @@ import { FabBaseTextFieldComponent } from './base-text-field.component';
       [Change]="onChangeHandler"
       [BeforeChange]="onBeforeChangeHandler"
       [NotifyValidationResult]="onNotifyValidationResultHandler"
+      (onClick)="onClickHandler($event)"
+      (onFocus)="onFocusHandler($event)"
     >
     </TextField>
   `,