Skip to content

Commit

Permalink
refactor(standalone): update some components to standalone components
Browse files Browse the repository at this point in the history
includes: Find Form Highlight Image Input InputNumber Layout Link List Loading Menu Message
  • Loading branch information
ng-nest-moon committed Nov 30, 2023
1 parent 390ed18 commit 7ccecc1
Show file tree
Hide file tree
Showing 411 changed files with 3,370 additions and 2,247 deletions.
2 changes: 1 addition & 1 deletion .prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"printWidth": 100,
"printWidth": 120,
"semi": true,
"singleQuote": true,
"trailingComma": "none"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { SidebarComponent } from './sidebar/sidebar.component';
import { TabsComponent } from './tabs/tabs.component';
import { RouterModule } from '@angular/router';
import { mainRoutes } from 'src/environments/routes';
import { XMenuModule } from '@ng-nest/ui/menu';
import { XMenuComponent } from '@ng-nest/ui/menu';
import { XSliderModule } from '@ng-nest/ui/slider';
import { XIconComponent } from '@ng-nest/ui/icon';
import { XCrumbModule } from '@ng-nest/ui/crumb';
Expand All @@ -17,7 +17,7 @@ import { XCrumbModule } from '@ng-nest/ui/crumb';
declarations: [IndexComponent, ContentComponent, CrumbComponent, HeaderComponent, SidebarComponent, TabsComponent],
imports: [
CommonModule,
XMenuModule,
XMenuComponent,
XSliderModule,
XIconComponent,
XCrumbModule,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ import { SidebarComponent } from './sidebar/sidebar.component';
import { TabsComponent } from './tabs/tabs.component';
import { RouterModule } from '@angular/router';
import { mainRoutes } from 'src/environments/routes';
import { XMenuModule } from '@ng-nest/ui/menu';
import { XMenuComponent } from '@ng-nest/ui/menu';
import { XSliderModule } from '@ng-nest/ui/slider';
import { XIconComponent } from '@ng-nest/ui/icon';

@NgModule({
declarations: [IndexComponent, ContentComponent, CrumbComponent, HeaderComponent, SidebarComponent, TabsComponent],
imports: [
CommonModule,
XMenuModule,
XMenuComponent,
XSliderModule,
XIconComponent,
RouterModule.forChild([
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { RouterModule } from '@angular/router';
import { XTableModule } from '@ng-nest/ui/table';
import { UserDetailComponent } from './user-detail/user-detail.component';
import { XButtonComponent } from '@ng-nest/ui/button';
import { XFormModule } from '@ng-nest/ui/form';
import { XFormComponent } from '@ng-nest/ui/form';
import { XMessageModule } from '@ng-nest/ui/message';

@NgModule({
Expand All @@ -14,7 +14,7 @@ import { XMessageModule } from '@ng-nest/ui/message';
CommonModule,
XTableModule,
XButtonComponent,
XFormModule,
XFormComponent,
XMessageModule,
RouterModule.forChild([
{ path: '', component: UserComponent },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { RouterModule } from '@angular/router';
import { XTableModule } from '@ng-nest/ui/table';
import { UserDetailComponent } from './user-detail/user-detail.component';
import { XButtonComponent } from '@ng-nest/ui/button';
import { XFormModule } from '@ng-nest/ui/form';
import { XFormComponent } from '@ng-nest/ui/form';
import { XMessageModule } from '@ng-nest/ui/message';
import { XLinkComponent } from '@ng-nest/ui/link';
import { XMessageBoxModule } from '@ng-nest/ui/message-box';
Expand All @@ -16,7 +16,7 @@ import { XMessageBoxModule } from '@ng-nest/ui/message-box';
CommonModule,
XTableModule,
XButtonComponent,
XFormModule,
XFormComponent,
XMessageModule,
XLinkComponent,
XMessageBoxModule,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ import { XAutoCompleteNode, XAutoCompletePortalPrefix } from './auto-complete.pr
import { Subject, BehaviorSubject } from 'rxjs';
import { XBoolean, XConnectBaseAnimation, XNumber, XPositionTopBottom } from '@ng-nest/ui/core';
import { filter, takeUntil } from 'rxjs/operators';
import { XListComponent, XListModule } from '@ng-nest/ui/list';
import { XListComponent } from '@ng-nest/ui/list';
import { XInputComponent } from '@ng-nest/ui/input';

@Component({
selector: `${XAutoCompletePortalPrefix}`,
standalone: true,
imports: [XListModule],
imports: [XListComponent],
templateUrl: './auto-complete-portal.component.html',
styleUrls: ['./auto-complete-portal.component.scss'],
encapsulation: ViewEncapsulation.None,
Expand Down
8 changes: 4 additions & 4 deletions lib/ng-nest/ui/auto-complete/auto-complete.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import { XData } from '@ng-nest/ui/core';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { XThemeModule } from '@ng-nest/ui/theme';
import { XRadioModule } from '@ng-nest/ui/radio';
import { XInputModule } from '@ng-nest/ui/input';
import { XInputComponent } from '@ng-nest/ui/input';
import { XSelectModule } from '@ng-nest/ui/select';
import { XCascadeComponent } from '@ng-nest/ui/cascade';
import { XColorPickerComponent } from '@ng-nest/ui/color-picker';
import { XFindModule } from '@ng-nest/ui/find';
import { XFindComponent } from '@ng-nest/ui/find';
import { XTextareaModule } from '@ng-nest/ui/textarea';
import { XTimePickerModule } from '@ng-nest/ui/time-picker';
import { XButtonComponent } from '@ng-nest/ui/button';
Expand All @@ -38,10 +38,10 @@ describe(XAutoCompletePrefix, () => {
XRadioModule,
XSelectModule,
XButtonComponent,
XInputModule,
XInputComponent,
XCascadeComponent,
XColorPickerComponent,
XFindModule,
XFindComponent,
XTextareaModule,
XTimePickerModule,
XDatePickerComponent,
Expand Down
58 changes: 42 additions & 16 deletions lib/ng-nest/ui/auto-complete/auto-complete.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ import {
ViewChild,
inject
} from '@angular/core';
import { XAutoCompleteNode, XAutoCompleteProperty, XAutoCompletePrefix } from './auto-complete.property';
import {
XAutoCompleteNode,
XAutoCompleteProperty,
XAutoCompletePrefix
} from './auto-complete.property';
import {
XIsEmpty,
XIsObservable,
Expand All @@ -26,7 +30,7 @@ import {
XParents
} from '@ng-nest/ui/core';
import { XPortalService, XPortalOverlayRef, XPortalConnectedPosition } from '@ng-nest/ui/portal';
import { XInputModule, XInputComponent } from '@ng-nest/ui/input';
import { XInputComponent } from '@ng-nest/ui/input';
import { XAutoCompletePortalComponent } from './auto-complete-portal.component';
import {
Overlay,
Expand All @@ -43,7 +47,13 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@Component({
selector: `${XAutoCompletePrefix}`,
standalone: true,
imports: [FormsModule, ReactiveFormsModule, XInputModule, XControlValueAccessor, XAutoCompletePortalComponent],
imports: [
FormsModule,
ReactiveFormsModule,
XInputComponent,
XControlValueAccessor,
XAutoCompletePortalComponent
],
templateUrl: './auto-complete.component.html',
styleUrls: ['./auto-complete.component.scss'],
encapsulation: ViewEncapsulation.None,
Expand Down Expand Up @@ -93,7 +103,13 @@ export class XAutoCompleteComponent extends XAutoCompleteProperty implements OnI
override cdr = inject(ChangeDetectorRef);

ngOnInit() {
this.setFlex(this.autoComplete.nativeElement, this.renderer, this.justify, this.align, this.direction);
this.setFlex(
this.autoComplete.nativeElement,
this.renderer,
this.justify,
this.align,
this.direction
);
this.setClassMap();
this.setSubject();
this.setParantScroll();
Expand Down Expand Up @@ -257,10 +273,12 @@ export class XAutoCompleteComponent extends XAutoCompleteProperty implements OnI

setPosition(config: OverlayConfig) {
let position = config.positionStrategy as FlexibleConnectedPositionStrategy;
position.positionChanges.pipe(takeUntil(this._unSubject)).subscribe((pos: ConnectedOverlayPositionChange) => {
const place = XPortalConnectedPosition.get(pos.connectionPair) as XPositionTopBottom;
place !== this.placement && this.positionChange.next(place);
});
position.positionChanges
.pipe(takeUntil(this._unSubject))
.subscribe((pos: ConnectedOverlayPositionChange) => {
const place = XPortalConnectedPosition.get(pos.connectionPair) as XPositionTopBottom;
place !== this.placement && this.positionChange.next(place);
});
}

setInstance() {
Expand Down Expand Up @@ -304,7 +322,13 @@ export class XAutoCompleteComponent extends XAutoCompleteProperty implements OnI
setPlacement() {
return this.portalService.setPlacement({
elementRef: this.inputCom.inputRef,
placement: [this.placement as XPositionTopBottom, 'bottom-start', 'bottom-end', 'top-start', 'top-end'],
placement: [
this.placement as XPositionTopBottom,
'bottom-start',
'bottom-end',
'top-start',
'top-end'
],
transformOriginOn: 'x-auto-complete-portal'
});
}
Expand Down Expand Up @@ -334,13 +358,15 @@ export class XAutoCompleteComponent extends XAutoCompleteProperty implements OnI
this.icon = 'fto-loader';
this.iconSpin = true;
this.cdr.detectChanges();
XSetData<XAutoCompleteNode>(this.data, this._unSubject, true, value as any).subscribe((x) => {
this.icon = '';
this.iconSpin = false;
this.nodes = x;
this.dataChange.next(this.nodes);
this.cdr.detectChanges();
});
XSetData<XAutoCompleteNode>(this.data, this._unSubject, true, value as any).subscribe(
(x) => {
this.icon = '';
this.iconSpin = false;
this.nodes = x;
this.dataChange.next(this.nodes);
this.cdr.detectChanges();
}
);
}
}
if (!this.onlySelect) {
Expand Down
4 changes: 2 additions & 2 deletions lib/ng-nest/ui/cascade/cascade-portal.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ import { of, Subject } from 'rxjs';
import { delay, takeUntil } from 'rxjs/operators';
import { XInputComponent } from '@ng-nest/ui/input';
import { CommonModule } from '@angular/common';
import { XListModule } from '@ng-nest/ui/list';
import { XListComponent } from '@ng-nest/ui/list';
import { FormsModule } from '@angular/forms';

@Component({
selector: 'x-cascade-portal',
standalone: true,
imports: [CommonModule, FormsModule, XListModule],
imports: [CommonModule, FormsModule, XListComponent],
templateUrl: './cascade-portal.component.html',
styleUrls: ['./cascade-portal.component.scss'],
encapsulation: ViewEncapsulation.None,
Expand Down
2 changes: 0 additions & 2 deletions lib/ng-nest/ui/cascade/cascade.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { interval } from 'rxjs';
import { ComponentFixture, TestBed } from '@angular/core/testing';

import { XCascadeComponent } from './cascade.component';
import { Component, DebugElement, ChangeDetectorRef } from '@angular/core';
import { By } from '@angular/platform-browser';
import { XCascadeComponent } from '@ng-nest/ui/cascade';
Expand Down
18 changes: 4 additions & 14 deletions lib/ng-nest/ui/cascade/cascade.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,33 +27,23 @@ import {
XParents,
XConfigService
} from '@ng-nest/ui/core';
import {
XPortalService,
XPortalOverlayRef,
XPortalConnectedPosition
} from '@ng-nest/ui/portal';
import { XInputComponent, XInputModule } from '@ng-nest/ui/input';
import { XPortalService, XPortalOverlayRef, XPortalConnectedPosition } from '@ng-nest/ui/portal';
import { XInputComponent } from '@ng-nest/ui/input';
import {
Overlay,
OverlayConfig,
FlexibleConnectedPositionStrategy,
ConnectedOverlayPositionChange
} from '@angular/cdk/overlay';
import { filter, takeUntil } from 'rxjs/operators';
import { XValueAccessor,XControlValueAccessor } from '@ng-nest/ui/base-form';
import { XValueAccessor, XControlValueAccessor } from '@ng-nest/ui/base-form';
import { CommonModule, DOCUMENT } from '@angular/common';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';

@Component({
selector: 'x-cascade',
standalone: true,
imports: [
CommonModule,
FormsModule,
ReactiveFormsModule,
XInputModule,
XControlValueAccessor
],
imports: [CommonModule, FormsModule, ReactiveFormsModule, XInputComponent, XControlValueAccessor],
templateUrl: './cascade.component.html',
styleUrls: ['./cascade.component.scss'],
encapsulation: ViewEncapsulation.None,
Expand Down
8 changes: 4 additions & 4 deletions lib/ng-nest/ui/checkbox/checkbox.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import { XDatePickerComponent } from '@ng-nest/ui/date-picker';
import { XAutoCompleteComponent } from '@ng-nest/ui/auto-complete';
import { XCascadeComponent } from '@ng-nest/ui/cascade';
import { XColorPickerComponent } from '@ng-nest/ui/color-picker';
import { XFindModule } from '@ng-nest/ui/find';
import { XFindComponent } from '@ng-nest/ui/find';
import { XTextareaModule } from '@ng-nest/ui/textarea';
import { XTimePickerModule } from '@ng-nest/ui/time-picker';
import { XInputModule } from '@ng-nest/ui/input';
import { XInputComponent } from '@ng-nest/ui/input';
import { HttpClientTestingModule } from '@angular/common/http/testing';
import { XTagModule } from '@ng-nest/ui/tag';

Expand All @@ -39,10 +39,10 @@ describe(XCheckboxPrefix, () => {
XColComponent,
XCascadeComponent,
XColorPickerComponent,
XFindModule,
XFindComponent,
XTextareaModule,
XTimePickerModule,
XInputModule,
XInputComponent,
XTagModule
],
declarations: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { XCheckboxComponent, XCheckboxNode } from '@ng-nest/ui/checkbox';
import { FormsModule } from '@angular/forms';
import { XSelectModule } from '@ng-nest/ui/select';
import { XButtonComponent } from '@ng-nest/ui/button';
import { XInputModule } from '@ng-nest/ui/input';
import { XInputComponent } from '@ng-nest/ui/input';
import { XDatePickerComponent } from '@ng-nest/ui/date-picker';
import { XAutoCompleteComponent } from '@ng-nest/ui/auto-complete';
import { XCascadeComponent } from '@ng-nest/ui/cascade';
Expand All @@ -19,7 +19,7 @@ import { XTimePickerModule } from '@ng-nest/ui/time-picker';
XCheckboxComponent,
XSelectModule,
XButtonComponent,
XInputModule,
XInputComponent,
XDatePickerComponent,
XAutoCompleteComponent,
XCascadeComponent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { XCheckboxComponent, XCheckboxNode } from '@ng-nest/ui/checkbox';
import { FormsModule } from '@angular/forms';
import { XSelectModule } from '@ng-nest/ui/select';
import { XButtonComponent } from '@ng-nest/ui/button';
import { XInputModule } from '@ng-nest/ui/input';
import { XInputComponent } from '@ng-nest/ui/input';
import { XDatePickerComponent } from '@ng-nest/ui/date-picker';
import { XAutoCompleteComponent } from '@ng-nest/ui/auto-complete';
import { XCascadeComponent } from '@ng-nest/ui/cascade';
Expand All @@ -19,7 +19,7 @@ import { XTimePickerModule } from '@ng-nest/ui/time-picker';
XCheckboxComponent,
XSelectModule,
XButtonComponent,
XInputModule,
XInputComponent,
XDatePickerComponent,
XAutoCompleteComponent,
XCascadeComponent,
Expand Down
Loading

0 comments on commit 7ccecc1

Please sign in to comment.