From 6c6c29e6a98fe38cae4d95d1340abc00f6bc6d23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Can=20Y=C4=B1lmaz?=
 <30300440+bariscanyilmaz@users.noreply.github.com>
Date: Fri, 10 Mar 2023 10:52:10 +0300
Subject: [PATCH 1/2] rename component output

---
 .../components/checkbox/checkbox.component.ts | 24 ++++++------
 .../form-input/form-input.component.ts        | 38 ++++++++++---------
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/checkbox/checkbox.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/checkbox/checkbox.component.ts
index 3ead2f929d..db208354ba 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/checkbox/checkbox.component.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/checkbox/checkbox.component.ts
@@ -9,14 +9,16 @@ import { NG_VALUE_ACCESSOR } from '@angular/forms';
       <input
         type="checkbox"
         [(ngModel)]="value"
-        [id]="checkboxId"  
+        [id]="checkboxId"
         [readonly]="checkboxReadonly"
-        [ngClass]="checkboxClass" 
-        [ngStyle]="checkboxStyle" 
-        (blur)="onBlur.next()"
-        (focus)="onFocus.next()" 
-      >    
-      <label *ngIf="label" [ngClass]="labelClass" [for]="checkboxId" > {{label | abpLocalization}} </label>
+        [ngClass]="checkboxClass"
+        [ngStyle]="checkboxStyle"
+        (blur)="checkboxBlur.next()"
+        (focus)="checkboxFocus.next()"
+      />
+      <label *ngIf="label" [ngClass]="labelClass" [for]="checkboxId">
+        {{ label | abpLocalization }}
+      </label>
     </div>
   `,
   providers: [
@@ -25,21 +27,19 @@ import { NG_VALUE_ACCESSOR } from '@angular/forms';
       useExisting: forwardRef(() => FormCheckboxComponent),
       multi: true,
     },
-  ]
+  ],
 })
 export class FormCheckboxComponent extends AbstractNgModelComponent {
-
   @Input() label?: string;
   @Input() labelClass = 'form-check-label';
   @Input() checkboxId!: string;
   @Input() checkboxStyle = '';
   @Input() checkboxClass = 'form-check-input';
   @Input() checkboxReadonly = false;
-  @Output() onBlur = new EventEmitter<void>();
-  @Output() onFocus = new EventEmitter<void>();
+  @Output() checkboxBlur = new EventEmitter<void>();
+  @Output() checkboxFocus = new EventEmitter<void>();
 
   constructor(injector: Injector) {
     super(injector);
   }
-
 }
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/form-input/form-input.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/form-input/form-input.component.ts
index d7f1f48c9d..a901cc2f4e 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/form-input/form-input.component.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/form-input/form-input.component.ts
@@ -6,17 +6,20 @@ import { NG_VALUE_ACCESSOR } from '@angular/forms';
   selector: 'abp-form-input',
   template: `
     <div class="mb-3">
-      <label class= *ngIf="label" [ngClass]="labelClass" [for]="inputId" > {{label | abpLocalization}} </label>
+      <label class="*ngIf" ="label" [ngClass]="labelClass" [for]="inputId">
+        {{ label | abpLocalization }}
+      </label>
       <input
         type="text"
-        [id]="inputId" 
-        [placeholder]="inputPlaceholder" 
+        [id]="inputId"
+        [placeholder]="inputPlaceholder"
         [readonly]="inputReadonly"
-        [ngClass]="inputClass" 
-        [ngStyle]="inputStyle" 
-        (blur)="onBlur.next()"
-        (focus)="onFocus.next()" 
-        [(ngModel)]="value">
+        [ngClass]="inputClass"
+        [ngStyle]="inputStyle"
+        (blur)="formBlur.next()"
+        (focus)="formFocus.next()"
+        [(ngModel)]="value"
+      />
     </div>
   `,
   providers: [
@@ -25,22 +28,21 @@ import { NG_VALUE_ACCESSOR } from '@angular/forms';
       useExisting: forwardRef(() => FormInputComponent),
       multi: true,
     },
-  ]
+  ],
 })
 export class FormInputComponent extends AbstractNgModelComponent {
   @Input() inputId!: string;
-  @Input() inputReadonly: boolean = false;
-  @Input() label: string = '';
+  @Input() inputReadonly = false;
+  @Input() label = '';
   @Input() labelClass = 'form-label';
-  @Input() inputPlaceholder: string = '';
-  @Input() inputType: string = 'text';
-  @Input() inputStyle: string = '';
-  @Input() inputClass: string = 'form-control';
-  @Output() onBlur = new EventEmitter<void>();
-  @Output() onFocus = new EventEmitter<void>();
+  @Input() inputPlaceholder = '';
+  @Input() inputType = 'text';
+  @Input() inputStyle = '';
+  @Input() inputClass = 'form-control';
+  @Output() formBlur = new EventEmitter<void>();
+  @Output() formFocus = new EventEmitter<void>();
 
   constructor(injector: Injector) {
     super(injector);
   }
-
 }

From 1593b3fb75d0d907bf3d9ea03e21cc4ba695dbbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Can=20Y=C4=B1lmaz?=
 <devbariscanyilmaz@gmail.com>
Date: Fri, 10 Mar 2023 14:15:45 +0300
Subject: [PATCH 2/2] Update
 npm/ng-packs/packages/theme-shared/src/lib/components/form-input/form-input.component.ts

Co-authored-by: Qingxiao Ren <rqx110@163.com>
---
 .../src/lib/components/form-input/form-input.component.ts       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/form-input/form-input.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/form-input/form-input.component.ts
index a901cc2f4e..23b18a5486 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/form-input/form-input.component.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/form-input/form-input.component.ts
@@ -6,7 +6,7 @@ import { NG_VALUE_ACCESSOR } from '@angular/forms';
   selector: 'abp-form-input',
   template: `
     <div class="mb-3">
-      <label class="*ngIf" ="label" [ngClass]="labelClass" [for]="inputId">
+      <label *ngIf="label" [ngClass]="labelClass" [for]="inputId">
         {{ label | abpLocalization }}
       </label>
       <input