Skip to content

Commit

Permalink
fix: Fixed #17588 Fixed #17601
Browse files Browse the repository at this point in the history
  • Loading branch information
cagataycivici committed Feb 6, 2025
1 parent cab3c60 commit 1e98dd5
Show file tree
Hide file tree
Showing 7 changed files with 47 additions and 37 deletions.
2 changes: 1 addition & 1 deletion apps/showcase/app/app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ export const appConfig: ApplicationConfig = {
provideRouter(routes, withInMemoryScrolling({ anchorScrolling: 'enabled', scrollPositionRestoration: 'enabled' })), // withEnabledBlockingInitialNavigation()
provideHttpClient(withFetch()),
provideAnimationsAsync(),
providePrimeNG({ theme: Noir, ripple: false, inputVariant: 'filled' })
providePrimeNG({ theme: Noir, ripple: false })
]
};
3 changes: 2 additions & 1 deletion apps/showcase/doc/configuration/configurationdoc.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { RouterModule } from '@angular/router';
import { CspDoc } from './cspdoc';
import { DynamicDoc } from './dynamicdoc';
import { FilterModeDoc } from './filtermodedoc';
import { InputVariantDoc } from './inputvariantdoc';
import { ApiDoc } from './locale/apidoc';
import { RepositoryDoc } from './locale/repositorydoc';
import { RuntimeDoc } from './locale/runtimedoc';
Expand All @@ -18,6 +19,6 @@ import { ZIndexDoc } from './zindexdoc';
@NgModule({
imports: [CommonModule, AppCodeModule, AppDocModule, RouterModule],
exports: [AppDocModule],
declarations: [FilterModeDoc, ProviderDoc, DynamicDoc, CspDoc, RippleDoc, ZIndexDoc, RuntimeDoc, ApiDoc, RepositoryDoc, TranslationDoc, ThemeDoc]
declarations: [FilterModeDoc, ProviderDoc, DynamicDoc, InputVariantDoc, CspDoc, RippleDoc, ZIndexDoc, RuntimeDoc, ApiDoc, RepositoryDoc, TranslationDoc, ThemeDoc]
})
export class ConfigurationDocModule {}
23 changes: 6 additions & 17 deletions apps/showcase/doc/configuration/filtermodedoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,12 @@ import { Component } from '@angular/core';
})
export class FilterModeDoc {
code: Code = {
typescript: `import { PrimeNG } from 'primeng/config';
@Component({
selector: 'app-root',
templateUrl: './app.component.html'
})
export class AppComponent implements OnInit {
constructor(private primeng: PrimeNG) {}
ngOnInit() {
primeng.filterMatchModeOptions = {
text: [FilterMatchMode.STARTS_WITH, FilterMatchMode.CONTAINS, FilterMatchMode.NOT_CONTAINS, FilterMatchMode.ENDS_WITH, FilterMatchMode.EQUALS, FilterMatchMode.NOT_EQUALS],
numeric: [FilterMatchMode.EQUALS, FilterMatchMode.NOT_EQUALS, FilterMatchMode.LESS_THAN, FilterMatchMode.LESS_THAN_OR_EQUAL_TO, FilterMatchMode.GREATER_THAN, FilterMatchMode.GREATER_THAN_OR_EQUAL_TO],
date: [FilterMatchMode.DATE_IS, FilterMatchMode.DATE_IS_NOT, FilterMatchMode.DATE_BEFORE, FilterMatchMode.DATE_AFTER]
};
typescript: `providePrimeNG({
filterMatchModeOptions: {
text: [FilterMatchMode.STARTS_WITH, FilterMatchMode.CONTAINS, FilterMatchMode.NOT_CONTAINS, FilterMatchMode.ENDS_WITH, FilterMatchMode.EQUALS, FilterMatchMode.NOT_EQUALS],
numeric: [FilterMatchMode.EQUALS, FilterMatchMode.NOT_EQUALS, FilterMatchMode.LESS_THAN, FilterMatchMode.LESS_THAN_OR_EQUAL_TO, FilterMatchMode.GREATER_THAN, FilterMatchMode.GREATER_THAN_OR_EQUAL_TO],
date: [FilterMatchMode.DATE_IS, FilterMatchMode.DATE_IS_NOT, FilterMatchMode.DATE_BEFORE, FilterMatchMode.DATE_AFTER]
}
}`
})`
};
}
23 changes: 23 additions & 0 deletions apps/showcase/doc/configuration/inputvariantdoc.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { Code } from '@/domain/code';
import { Component } from '@angular/core';

@Component({
selector: 'inputvariant-doc',
standalone: false,
template: `
<app-docsectiontext>
<p>
Input fields come in two styles, default is <i>outlined</i> with borders around the field whereas <i>filled</i> alternative adds a background color to the field. A theme such as Material may add more additional design changes per each
variant.
</p>
</app-docsectiontext>
<app-code [code]="code" [hideToggleCode]="true"></app-code>
`
})
export class InputVariantDoc {
code: Code = {
typescript: `providePrimeNG({
inputVariant: 'filled'
})`
};
}
25 changes: 7 additions & 18 deletions apps/showcase/doc/configuration/zindexdoc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,13 @@ import { Component } from '@angular/core';
})
export class ZIndexDoc {
code: Code = {
typescript: `import { PrimeNG } from 'primeng/config';
@Component({
selector: 'app-root',
templateUrl: './app.component.html'
})
export class AppComponent implements OnInit {
constructor(private primeng: PrimeNG) {}
ngOnInit() {
this.primeng.zIndex = {
modal: 1100, // dialog, sidebar
overlay: 1000, // dropdown, overlaypanel
menu: 1000, // overlay menus
tooltip: 1100 // tooltip
};
typescript: `providePrimeNG({
zIndex: {
modal: 1100, // dialog, sidebar
overlay: 1000, // dropdown, overlaypanel
menu: 1000, // overlay menus
tooltip: 1100 // tooltip
}
}`
})`
};
}
6 changes: 6 additions & 0 deletions apps/showcase/pages/configuration/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { ConfigurationDocModule } from '@/doc/configuration/configurationdoc.mod
import { CspDoc } from '@/doc/configuration/cspdoc';
import { DynamicDoc } from '@/doc/configuration/dynamicdoc';
import { FilterModeDoc } from '@/doc/configuration/filtermodedoc';
import { InputVariantDoc } from '@/doc/configuration/inputvariantdoc';
import { ApiDoc } from '@/doc/configuration/locale/apidoc';
import { RepositoryDoc } from '@/doc/configuration/locale/repositorydoc';
import { RuntimeDoc } from '@/doc/configuration/locale/runtimedoc';
Expand Down Expand Up @@ -41,6 +42,11 @@ export class ConfigurationDemo {
label: 'Ripple',
component: RippleDoc
},
{
id: 'inputvariant',
label: 'InputVariant',
component: InputVariantDoc
},
{
id: 'zIndex',
label: 'ZIndex',
Expand Down
2 changes: 2 additions & 0 deletions packages/primeng/src/config/primeng.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ export type PrimeNGConfigType = {
};
overlayOptions?: OverlayOptions;
translation?: Translation;
zIndex?: ZIndex;
filterMatchModeOptions?: any;
} & ThemeConfigType;

@Injectable({ providedIn: 'root' })
Expand Down

0 comments on commit 1e98dd5

Please sign in to comment.