Merge branch 'master' of https://github.com/primefaces/primeng

primefaces · Nov 27, 2023 · bcc46b0 · bcc46b0 · vercel · Nov 27, 2023
2 parents 832dadc + 64b4b05
commit bcc46b0
Show file tree

Hide file tree

Showing 21 changed files with 18,428 additions and 773 deletions.
diff --git a/angular.json b/angular.json
@@ -33,40 +33,13 @@
                         "outputPath": "dist/primeng/browser",
                         "index": "src/index.html",
                         "main": "src/main.ts",
-                        "polyfills": [
-                            "zone.js"
-                        ],
+                        "polyfills": ["zone.js"],
                         "tsConfig": "tsconfig.app.json",
                         "inlineStyleLanguage": "scss",
-                        "assets": [
-                            "src/favicon.png",
-                            "src/assets",
-                            "src/showcase",
-                            "src/upload.php",
-                            "src/versions.json",
-                            "src/.htaccess"
-                        ],
-                        "styles": [
-                            "src/styles.scss",
-                            "node_modules/primeicons/primeicons.css"
-                        ],
-                        "scripts": [
-                            "./node_modules/prismjs/prism.js",
-                            "./node_modules/prismjs/components/prism-typescript.js",
-                            "./node_modules/prismjs/components/prism-scss.js",
-                            "./node_modules/prismjs/components/prism-bash.js"
-                        ],
-                        "allowedCommonJsDependencies": [
-                            "chart.js",
-                            "xlsx",
-                            "jspdf-autotable",
-                            "file-saver",
-                            "jspdf",
-                            "quill",
-                            "core-js",
-                            "raf",
-                            "rgbcolor"
-                        ]
+                        "assets": ["src/favicon.png", "src/assets"],
+                        "styles": ["src/styles.scss"],
+                        "scripts": ["./node_modules/prismjs/prism.js", "./node_modules/prismjs/components/prism-typescript.js", "./node_modules/prismjs/components/prism-scss.js", "./node_modules/prismjs/components/prism-bash.js"],
+                        "allowedCommonJsDependencies": ["chart.js", "xlsx", "jspdf-autotable", "file-saver", "jspdf", "quill", "core-js", "raf", "rgbcolor"]
                     },
                     "configurations": {
                         "production": {
@@ -119,15 +92,8 @@
                         "polyfills": "src/polyfills.ts",
                         "tsConfig": "tsconfig.spec.json",
                         "karmaConfig": "karma.conf.js",
-                        "assets": [
-                            "src/favicon.png",
-                            "src/assets",
-                            "src/upload.php"
-                        ],
-                        "styles": [
-                            "src/styles.scss",
-                            "src/assets/components/themes/lara-light-blue/theme.css"
-                        ],
+                        "assets": ["src/favicon.png", "src/assets"],
+                        "styles": ["src/styles.scss", "src/assets/components/themes/lara-light-blue/theme.css"],
                         "scripts": []
                     }
                 },
@@ -156,4 +122,4 @@
             }
         }
     }
-}
+}
diff --git a/src/app/showcase/doc/colors/surfacesdoc.ts b/src/app/showcase/doc/colors/surfacesdoc.ts
@@ -1,7 +1,4 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
-import { Subscription } from 'rxjs';
-import { AppConfig } from '../../domain/appconfig';
-import { AppConfigService } from '../../service/appconfigservice';
+import { Component } from '@angular/core';
 
 @Component({
     selector: 'surfaces-doc',
@@ -75,25 +72,8 @@ import { AppConfigService } from '../../service/appconfigservice';
         `
     ]
 })
-export class SurfacesDoc implements OnInit, OnDestroy {
+export class SurfacesDoc {
     colors: string[] = ['blue', 'green', 'yellow', 'cyan', 'pink', 'indigo', 'red', 'teal', 'orange', 'bluegray', 'purple', 'gray', 'primary'];
 
     shades: number[] = [0, 50, 100, 200, 300, 400, 500, 600, 700, 800, 900];
-
-    config: AppConfig;
-
-    subscription: Subscription;
-
-    constructor(private configService: AppConfigService) {}
-
-    ngOnInit() {
-        this.config = this.configService.config;
-        this.subscription = this.configService.configUpdate$.subscribe((config) => (this.config = config));
-    }
-
-    ngOnDestroy() {
-        if (this.subscription) {
-            this.subscription.unsubscribe();
-        }
-    }
 }
diff --git a/src/app/showcase/layout/app.main.component.ts b/src/app/showcase/layout/app.main.component.ts
@@ -12,7 +12,7 @@ import { AppTopBarComponent } from './topbar/app.topbar.component';
 @Component({
     selector: 'app-main',
     template: `
-        <div class="layout-wrapper" [ngClass]="containerClass">
+        <div class="layout-wrapper" [ngClass]="containerClass" [attr.data-p-theme]="theme">
             <app-news></app-news>
             <app-topbar (onDarkModeSwitch)="toggleDarkMode()"></app-topbar>
             <app-config (onDarkModeSwitch)="toggleDarkMode()"></app-config>
@@ -52,6 +52,10 @@ export class AppMainComponent {
         return this.configService.state.menuActive;
     }
 
+    get theme(): string {
+        return this.configService.config.theme;
+    }
+
     get containerClass() {
         return {
             'layout-news-active': this.isNewsActive,