Compare commits

Author SHA1 Message Date
saherelm 752efe3e3c add color properties has issues ... 2026-08-31 22:24:40 +03:30
saherelm 864fa79454 apply fix on chart component fullscreen issues and it's now works well ... 2026-08-31 00:52:12 +03:30
saherelm 174300d9f1 last works on xChart component ... 2026-08-30 23:59:21 +03:30
saherelm 30f944123f last works for handle card sizing ... 2026-08-29 17:22:55 +03:30
saherelm 921b9e09f8 fix card fullscreen issues, but still some issues on card background color ... 2026-08-29 09:12:39 +03:30
saherelm 2a45504163 uncomplete works on xCard Fullscreen Support ... 2026-08-29 01:14:08 +03:30
saherelm 7c5fcb8f06 try to implement fullscreen support for xCard Component ... 2026-08-29 00:53:50 +03:30
saherelm 2574c98c65 Resetting Git heade ... 2026-08-28 21:00:41 +03:30
saherelm f9f0408daf apply all x-chart component works ... 2026-08-28 20:56:50 +03:30
saherelm e1b8ebe882 apply card component changes side affects ... 2026-08-28 03:36:54 +03:30
saherelm 6c669f8ce2 last ... 2026-08-25 08:49:56 +03:30
saherelm 6ee51454ce adding toolbar actions simulations on x-chart component ... 2026-08-24 09:38:41 +03:30
saherelm 398f098b8b simulate chart toolbar actions ... 2026-08-24 09:15:11 +03:30
saherelm 78f1ae00aa apply some features on x-chart ... 2026-08-24 01:32:02 +03:30
saherelm c01e6524e4 add new icons ... 2026-08-24 00:15:08 +03:30
saherelm 1c58d263c3 fix dependecy issue ... 2026-08-22 09:02:53 +03:30
saherelm 0f4499830f add new icons ... 2026-08-22 07:58:44 +03:30
saherelm e768ba219c try to implement Chart Toolbars using XActionBar implementation like XIDEComponent ... 2026-08-22 00:07:04 +03:30
18 changed files with 3404 additions and 216 deletions
@@ -0,0 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px">
<path d="M0 0h24v24H0z" fill="none" />
<path
d="M230-360h120v-60H250v-120h100v-60H230q-17 0-28.5 11.5T190-560v160q0 17 11.5 28.5T230-360Zm156 0h120q17 0 28.5-11.5T546-400v-60q0-17-11.5-31.5T506-506h-60v-34h100v-60H426q-17 0-28.5 11.5T386-560v60q0 17 11.5 30.5T426-456h60v36H386v60Zm264 0h60l70-240h-60l-40 138-40-138h-60l70 240ZM160-160q-33 0-56.5-23.5T80-240v-480q0-33 23.5-56.5T160-800h640q33 0 56.5 23.5T880-720v480q0 33-23.5 56.5T800-160H160Z" />
</svg>

After

Width:  |  Height:  |  Size: 566 B

@@ -0,0 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px">
<path d="M0 0h24v24H0z" fill="none" />
<path
d="M260-500v-40h40v40h-40Zm400 140h40q25 0 42.5-17.5T760-420v-60h-60v60h-40v-120h100q0-25-17.5-42.5T700-600h-40q-25 0-42.5 17.5T600-540v120q0 25 17.5 42.5T660-360Zm-460 0h60v-80h60q17 0 28.5-11.5T360-480v-80q0-17-11.5-28.5T320-600H200v240Zm200 0h60v-96l40 96h60v-240h-60v94l-40-94h-60v240ZM160-160q-33 0-56.5-23.5T80-240v-480q0-33 23.5-56.5T160-800h640q33 0 56.5 23.5T880-720v480q0 33-23.5 56.5T800-160H160Zm0-80v-480 480Z" />
</svg>

After

Width:  |  Height:  |  Size: 587 B

@@ -0,0 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px">
<path d="M0 0h24v24H0z" fill="none" />
<path
d="M120-120v-720h80v720h-80Zm640 0v-720h80v720h-80ZM280-440v-80h80v80h-80Zm160 0v-80h80v80h-80Zm160 0v-80h80v80h-80Z" />
</svg>

After

Width:  |  Height:  |  Size: 281 B

@@ -0,0 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px">
<path d="M0 0h24v24H0z" fill="none" />
<path
d="m320-160-56-57 103-103H80v-80h287L264-503l56-57 200 200-200 200Zm320-240L440-600l200-200 56 57-103 103h287v80H593l103 103-56 57Z" />
</svg>

After

Width:  |  Height:  |  Size: 296 B

@@ -0,0 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px">
<path d="M0 0h24v24H0z" fill="none" />
<path
d="m136-80-56-56 264-264H160v-80h320v320h-80v-184L136-80Zm344-400v-320h80v184l264-264 56 56-264 264h184v80H480Z" />
</svg>

After

Width:  |  Height:  |  Size: 276 B

@@ -0,0 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px">
<path d="M0 0h24v24H0z" fill="none" />
<path
d="M320-561h80v287l62-62 58 56-160 160-160-160 58-56 62 62v-287Zm320 160h-80v-287l-64 64-56-56 160-160 160 160-56 56-64-64v287Z" />
</svg>

After

Width:  |  Height:  |  Size: 292 B

@@ -0,0 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px">
<path d="M0 0h24v24H0z" fill="none" />
<path
d="M784-120 532-372q-30 24-69 38t-83 14q-109 0-184.5-75.5T120-580q0-109 75.5-184.5T380-840q109 0 184.5 75.5T640-580q0 44-14 83t-38 69l252 252-56 56ZM380-400q75 0 127.5-52.5T560-580q0-75-52.5-127.5T380-760q-75 0-127.5 52.5T200-580q0 75 52.5 127.5T380-400Zm-40-60v-80h-80v-80h80v-80h80v80h80v80h-80v80h-80Z" />
</svg>

After

Width:  |  Height:  |  Size: 469 B

@@ -0,0 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px">
<path d="M0 0h24v24H0z" fill="none" />
<path
d="M784-120 532-372q-30 24-69 38t-83 14q-109 0-184.5-75.5T120-580q0-109 75.5-184.5T380-840q109 0 184.5 75.5T640-580q0 44-14 83t-38 69l252 252-56 56ZM380-400q75 0 127.5-52.5T560-580q0-75-52.5-127.5T380-760q-75 0-127.5 52.5T200-580q0 75 52.5 127.5T380-400ZM280-540v-80h200v80H280Z" />
</svg>

After

Width:  |  Height:  |  Size: 443 B

@@ -0,0 +1,4 @@
export interface XSizeModel {
width?: number;
height?: number;
}
@@ -6,9 +6,10 @@
[class.no-text]="isNoTextCard() | async" [class.no-text]="isNoTextCard() | async"
[class.page-card]="getValue(isInPage) | async" [class.page-card]="getValue(isInPage) | async"
[isForeground]="getValue(foregroundColor) | async" [isForeground]="getValue(foregroundColor) | async"
[class.fullscreen]="getValue(isFullscreen) | async"
> >
<!-- Card Header --> <!-- Card Header -->
<mat-card-header class="x-header" *ngIf="getValue(showHeader) | async"> <mat-card-header #cardHeader class="x-header" *ngIf="getValue(showHeader) | async">
<!-- Avatar Image --> <!-- Avatar Image -->
<section <section
*ngIf="notEmptyValue(avatarUrl) | async" *ngIf="notEmptyValue(avatarUrl) | async"
@@ -56,6 +57,7 @@
<!-- Card Image --> <!-- Card Image -->
<img <img
mat-card-image mat-card-image
#cardImage
class="x-image" class="x-image"
[src]="getValue(imageUrl) | async" [src]="getValue(imageUrl) | async"
*ngIf="notEmptyValue(imageUrl) | async" *ngIf="notEmptyValue(imageUrl) | async"
@@ -63,18 +65,18 @@
/> />
<!-- Card Content --> <!-- Card Content -->
<mat-card-content class="x-content" *ngIf="getValue(showContent) | async"> <mat-card-content #cardContent class="x-content" *ngIf="getValue(showContent) | async">
<ng-content></ng-content> <ng-content></ng-content>
</mat-card-content> </mat-card-content>
<!-- Card Actions --> <!-- Card Actions -->
<mat-card-actions class="x-actions" *ngIf="getValue(showActions) | async"> <mat-card-actions #cardActions class="x-actions" *ngIf="getValue(showActions) | async">
<ng-content select="[actions]"></ng-content> <ng-content select="[actions]"></ng-content>
</mat-card-actions> </mat-card-actions>
<!-- Card Footer --> <!-- Card Footer -->
<mat-card-footer <mat-card-footer
#footer #cardFooter
class="x-footer" class="x-footer"
*ngIf="getValue(showFooter) | async" *ngIf="getValue(showFooter) | async"
> >
@@ -1,5 +1,42 @@
// //
@import '../theme/theme.scss'; @import "../theme/theme.scss";
:host {
display: block;
width: inherit;
height: inherit;
}
.x-wrapper {
position: relative;
display: flex;
flex-direction: column;
width: 100%;
height: 100%;
transition: all 0.3s ease-in-out;
border-radius: var(--card-border-radius, 8px);
overflow: hidden;
&:fullscreen {
border-radius: 0;
width: 100vw;
height: 100vh;
.x-header {
padding: 16px 24px;
}
.x-content {
flex: 1;
overflow: auto;
}
.x-image {
max-height: 60vh;
object-fit: contain;
}
}
}
// //
:host::ng-deep.x-card.no-text { :host::ng-deep.x-card.no-text {
@@ -16,11 +53,11 @@
height: var(--height, inherit); height: var(--height, inherit);
} }
.x-card.page-card { .x-card.page-card:not(.fullscreen) {
@include push-auto(); @include push-auto();
@include applyWidthHeight(); @include applyWidthHeight();
@include m-tb($d-l); @include m-tb($d-l);
@include animation('fadeInUp'); @include animation("fadeInUp");
&.mobile { &.mobile {
box-sizing: border-box; box-sizing: border-box;
@@ -5,8 +5,18 @@ import {
} from './x-card.typings'; } from './x-card.typings';
import { Subject, Subscription } from 'rxjs'; import { Subject, Subscription } from 'rxjs';
import { concatMap, map } from 'rxjs/operators'; import { concatMap, map } from 'rxjs/operators';
import { nameof, isNullOrEmptyString } from 'x-framework-core'; import { XSizeModel } from '../classes/x-size.model.';
import { Component, ChangeDetectionStrategy } from '@angular/core'; import {
nameof,
isNullOrEmptyString,
isNullOrUndefined,
} from 'x-framework-core';
import {
Component,
ChangeDetectionStrategy,
ElementRef,
ViewChild,
} from '@angular/core';
@Component({ @Component({
// tslint:disable-next-line:component-selector // tslint:disable-next-line:component-selector
@@ -20,10 +30,109 @@ export class XCardComponent extends XCardContainerComponent {
//#region Props ... //#region Props ...
// //
private ACTION_PROVIDER_SUBSCRIPTION: Subscription; private ACTION_PROVIDER_SUBSCRIPTION: Subscription;
//
//#region Card Elements ....
private CARD_IMAGE: ElementRef<HTMLElement> = undefined;
private CARD_HEADER: ElementRef<HTMLElement> = undefined;
private CARD_FOOTER: ElementRef<HTMLElement> = undefined;
private CARD_CONTENT: ElementRef<HTMLElement> = undefined;
private CARD_ACTIONS: ElementRef<HTMLElement> = undefined;
@ViewChild('cardImage', { static: false })
set cardImage(v: ElementRef<HTMLElement>) {
this.CARD_IMAGE = v;
}
@ViewChild('cardHeader', { static: false })
set cardHeader(v: ElementRef<HTMLElement>) {
this.CARD_HEADER = v;
}
@ViewChild('cardFooter', { static: false })
set cardFooter(v: ElementRef<HTMLElement>) {
this.CARD_FOOTER = v;
}
@ViewChild('cardContent', { static: false })
set cardContent(v: ElementRef<HTMLElement>) {
this.CARD_CONTENT = v;
}
@ViewChild('cardActions', { static: false })
set cardActions(v: ElementRef<HTMLElement>) {
this.CARD_ACTIONS = v;
}
get cardImage() {
return this.CARD_IMAGE;
}
get cardHeader() {
return this.CARD_HEADER;
}
get cardFooter() {
return this.CARD_FOOTER;
}
get cardContent() {
return this.CARD_CONTENT;
}
get cardActions() {
return this.CARD_ACTIONS;
}
//#endregion
//
//#region Full Screen ...
//
private IS_FULLSCREEN: boolean = false;
set isFullscreen(v: boolean) {
//
const isChanged = v != this.IS_FULLSCREEN;
if (isChanged) {
//
this.actionProvider.next({
action: XCardAction.FullScreenToggled,
payload: v,
});
}
//
this.IS_FULLSCREEN = v;
}
get isFullscreen() {
return this.IS_FULLSCREEN;
}
//#endregion
//#endregion //#endregion
// //
//#region LifeCycles ... //#region LifeCycles ...
onInit() {
super.onInit();
//
// Listen for fullscreen change events (handles ESC key and browser UI)
document.addEventListener('fullscreenchange', this.fullscreenChangeHandler);
document.addEventListener(
'webkitfullscreenchange',
this.fullscreenChangeHandler,
);
document.addEventListener(
'mozfullscreenchange',
this.fullscreenChangeHandler,
);
document.addEventListener(
'MSFullscreenChange',
this.fullscreenChangeHandler,
);
}
onChange(changeKeys: string[]) { onChange(changeKeys: string[]) {
super.onChange(changeKeys); super.onChange(changeKeys);
@@ -31,7 +140,7 @@ export class XCardComponent extends XCardContainerComponent {
//#region Action Provider Changed ... //#region Action Provider Changed ...
// //
const isActionProviderChanged = changeKeys.includes( const isActionProviderChanged = changeKeys.includes(
nameof<XCardComponent>('actionProvider') nameof<XCardComponent>('actionProvider'),
); );
if (isActionProviderChanged) { if (isActionProviderChanged) {
this.registerActionProvider(); this.registerActionProvider();
@@ -44,6 +153,24 @@ export class XCardComponent extends XCardContainerComponent {
// //
this.unregisterActionProvider(); this.unregisterActionProvider();
//
document.removeEventListener(
'fullscreenchange',
this.fullscreenChangeHandler,
);
document.removeEventListener(
'webkitfullscreenchange',
this.fullscreenChangeHandler,
);
document.removeEventListener(
'mozfullscreenchange',
this.fullscreenChangeHandler,
);
document.removeEventListener(
'MSFullscreenChange',
this.fullscreenChangeHandler,
);
} }
registerViewHandlers() { registerViewHandlers() {
@@ -71,13 +198,190 @@ export class XCardComponent extends XCardContainerComponent {
isNullOrEmptyString(object.title) && isNullOrEmptyString(object.title) &&
isNullOrEmptyString(object.subTitle) isNullOrEmptyString(object.subTitle)
); );
}) }),
) ),
) ),
); );
} }
//#endregion //#endregion
//
//#region Actions ...
public async enterFullscreen(options?: FullscreenOptions) {
//
if (this.isFullscreen) {
return;
}
//
const element: HTMLElement = this.element?.nativeElement;
if (!element) {
return;
}
//
try {
//
if (!this.canUseFullscreen()) {
return;
}
//
await element.requestFullscreen(options);
//
this.isFullscreen = true;
this.detectChanges();
} catch {}
}
public async exitFullscreen() {
//
if (!this.isFullscreen) {
return;
}
//
try {
//
if (document.fullscreenElement) {
await document.exitFullscreen();
}
//
this.isFullscreen = false;
this.detectChanges();
} catch {}
}
public async toggleFullscreen() {
//
if (this.isFullscreen) {
await this.exitFullscreen();
} else {
await this.enterFullscreen();
}
}
//
//#region Size Calculating ...
public calculateImageSize() {
//
let result: XSizeModel = undefined;
//
// Validate ...
if (
isNullOrUndefined(this.CARD_IMAGE) ||
isNullOrUndefined(this.CARD_IMAGE.nativeElement)
) {
return result;
}
//
result = {
width: this.CARD_IMAGE.nativeElement.offsetWidth,
height: this.CARD_IMAGE.nativeElement.offsetHeight,
};
//
return result;
}
public calculateHeaderSize() {
//
let result: XSizeModel = undefined;
//
// Validate ...
if (
isNullOrUndefined(this.CARD_HEADER) ||
isNullOrUndefined(this.CARD_HEADER.nativeElement)
) {
return result;
}
//
result = {
width: this.CARD_HEADER.nativeElement.offsetWidth,
height: this.CARD_HEADER.nativeElement.offsetHeight,
};
//
return result;
}
public calculateFooterSize() {
//
let result: XSizeModel = undefined;
//
// Validate ...
if (
isNullOrUndefined(this.CARD_FOOTER) ||
isNullOrUndefined(this.CARD_FOOTER.nativeElement)
) {
return result;
}
//
result = {
width: this.CARD_FOOTER.nativeElement.offsetWidth,
height: this.CARD_FOOTER.nativeElement.offsetHeight,
};
//
return result;
}
public calculateContentSize() {
//
let result: XSizeModel = undefined;
//
// Validate ...
if (
isNullOrUndefined(this.CARD_CONTENT) ||
isNullOrUndefined(this.CARD_CONTENT.nativeElement)
) {
return result;
}
//
result = {
width: this.CARD_CONTENT.nativeElement.offsetWidth,
height: this.CARD_CONTENT.nativeElement.offsetHeight,
};
//
return result;
}
public calculateActionsSize() {
//
let result: XSizeModel = undefined;
//
// Validate ...
if (
isNullOrUndefined(this.CARD_ACTIONS) ||
isNullOrUndefined(this.CARD_ACTIONS.nativeElement)
) {
return result;
}
//
result = {
width: this.CARD_ACTIONS.nativeElement.offsetWidth,
height: this.CARD_ACTIONS.nativeElement.offsetHeight,
};
//
return result;
}
//#endregion
//#endregion
// //
//#region Private ... //#region Private ...
// //
@@ -94,7 +398,7 @@ export class XCardComponent extends XCardContainerComponent {
// //
// Handle Action Provider ... // Handle Action Provider ...
this.ACTION_PROVIDER_SUBSCRIPTION = this.applyTakeUntilWrapper( this.ACTION_PROVIDER_SUBSCRIPTION = this.applyTakeUntilWrapper(
this.actionProvider.asObservable() this.actionProvider.asObservable(),
).subscribe(async (model) => { ).subscribe(async (model) => {
// //
if (!model) { if (!model) {
@@ -107,6 +411,21 @@ export class XCardComponent extends XCardContainerComponent {
case XCardAction.Refresh: case XCardAction.Refresh:
this.detectChanges(); this.detectChanges();
break; break;
//
case XCardAction.EnterFullScreen:
await this.enterFullscreen();
break;
//
case XCardAction.ExitFullScreen:
await this.exitFullscreen();
break;
//
case XCardAction.ToggleFullScreen:
await this.toggleFullscreen();
break;
} }
}); });
} }
@@ -122,5 +441,31 @@ export class XCardComponent extends XCardContainerComponent {
this.ACTION_PROVIDER_SUBSCRIPTION = null; this.ACTION_PROVIDER_SUBSCRIPTION = null;
} }
//#endregion //#endregion
//
//#region Fullscreen ...
private fullscreenChangeHandler = () => {
//
const isFullscreen = !!(
document.fullscreenElement ||
(document as any).webkitFullscreenElement ||
(document as any).mozFullScreenElement ||
(document as any).msFullscreenElement
);
//
this.isFullscreen = isFullscreen;
this.detectChanges();
};
private canUseFullscreen(): boolean {
return !!(
document.fullscreenEnabled ||
(document as any).webkitFullscreenEnabled ||
(document as any).mozFullScreenEnabled ||
(document as any).msFullscreenEnabled
);
}
//#endregion
//#endregion //#endregion
} }
@@ -33,13 +33,19 @@ import { X_FRAMEWORK_COMPONENTS_CONFIG } from '../tokens/x-injectable-tokens';
import { XFrameworkComponentsConfig } from '../config/x-framework-components.config'; import { XFrameworkComponentsConfig } from '../config/x-framework-components.config';
export enum XCardAction { export enum XCardAction {
//
Refresh = 'refresh', Refresh = 'refresh',
//
ExitFullScreen = 'exit_full_screen',
EnterFullScreen = 'enter_full_screen',
ToggleFullScreen = 'toggle_full_screen',
//
FullScreenToggled = 'full_screen_toggled',
} }
export type XCardActionIdentifier = XCardAction | string; export type XCardActionIdentifier = XCardAction | string;
export interface XCardActionModel export interface XCardActionModel extends XBaseActionModel<XCardActionIdentifier> {}
extends XBaseActionModel<XCardActionIdentifier> {}
// //
//#region Container ... //#region Container ...
@@ -187,7 +193,7 @@ export abstract class XCardContainerComponent
public ruler: ViewportRuler, public ruler: ViewportRuler,
public zone: NgZone, public zone: NgZone,
public changeDetector: ChangeDetectorRef, public changeDetector: ChangeDetectorRef,
protected propertyProvider: XCardContainer protected propertyProvider: XCardContainer,
) { ) {
super( super(
config, config,
@@ -196,7 +202,7 @@ export abstract class XCardContainerComponent
renderer, renderer,
ruler, ruler,
zone, zone,
changeDetector changeDetector,
); );
} }
//#endregion //#endregion
@@ -204,37 +210,37 @@ export abstract class XCardContainerComponent
// //
//#region Abstract ... //#region Abstract ...
public extractProps( public extractProps(
container?: IXCardContainer container?: IXCardContainer,
): Observable<IXCardContainer> { ): Observable<IXCardContainer> {
return forkJoin({ return forkJoin({
// //
cssClass: this.getArrayValue( cssClass: this.getArrayValue(
container ? container.cssClass : this.cssClass container ? container.cssClass : this.cssClass,
), ),
// //
color: this.getValue(container ? container.color : this.color), color: this.getValue(container ? container.color : this.color),
foregroundColor: this.getValue( foregroundColor: this.getValue(
container ? container.foregroundColor : this.foregroundColor container ? container.foregroundColor : this.foregroundColor,
), ),
// //
showHeader: this.getValue( showHeader: this.getValue(
container ? container.showHeader : this.showHeader container ? container.showHeader : this.showHeader,
), ),
title: this.getValue(container ? container.title : this.title), title: this.getValue(container ? container.title : this.title),
subTitle: this.getValue(container ? container.subTitle : this.subTitle), subTitle: this.getValue(container ? container.subTitle : this.subTitle),
avatarUrl: this.getValue( avatarUrl: this.getValue(
container ? container.avatarUrl : this.avatarUrl container ? container.avatarUrl : this.avatarUrl,
), ),
avatarTemplate: this.getValue( avatarTemplate: this.getValue(
container ? container.avatarTemplate : this.avatarTemplate container ? container.avatarTemplate : this.avatarTemplate,
), ),
// //
imageUrl: this.getValue(container ? container.imageUrl : this.imageUrl), imageUrl: this.getValue(container ? container.imageUrl : this.imageUrl),
imageDescription: this.getValue( imageDescription: this.getValue(
container ? container.imageDescription : this.imageDescription container ? container.imageDescription : this.imageDescription,
), ),
// //
@@ -242,13 +248,13 @@ export abstract class XCardContainerComponent
// //
showContent: this.getValue( showContent: this.getValue(
container ? container.showContent : this.showContent container ? container.showContent : this.showContent,
), ),
showActions: this.getValue( showActions: this.getValue(
container ? container.showActions : this.showActions container ? container.showActions : this.showActions,
), ),
showFooter: this.getValue( showFooter: this.getValue(
container ? container.showFooter : this.showFooter container ? container.showFooter : this.showFooter,
), ),
}).pipe( }).pipe(
map((data) => { map((data) => {
@@ -261,7 +267,7 @@ export abstract class XCardContainerComponent
? container.actionProvider ? container.actionProvider
: this.actionProvider, : this.actionProvider,
}; };
}) }),
); );
} }
//#endregion //#endregion
@@ -285,8 +291,7 @@ type TXComponentCardContainer = {
}; };
export interface IXComponentCardContainer export interface IXComponentCardContainer
extends TXComponentCardContainer, extends TXComponentCardContainer, IXBaseComponentContainer {
IXBaseComponentContainer {
isInPage: XStandardType<boolean>; isInPage: XStandardType<boolean>;
wrapWithCard: XStandardType<boolean>; wrapWithCard: XStandardType<boolean>;
} }
@@ -400,7 +405,7 @@ export abstract class XComponentCardContainerComponent
public ruler: ViewportRuler, public ruler: ViewportRuler,
public zone: NgZone, public zone: NgZone,
public changeDetector: ChangeDetectorRef, public changeDetector: ChangeDetectorRef,
protected propertyProvider: XComponentCardContainer protected propertyProvider: XComponentCardContainer,
) { ) {
super( super(
config, config,
@@ -409,7 +414,7 @@ export abstract class XComponentCardContainerComponent
renderer, renderer,
ruler, ruler,
zone, zone,
changeDetector changeDetector,
); );
} }
//#endregion //#endregion
@@ -417,34 +422,34 @@ export abstract class XComponentCardContainerComponent
// //
//#region Abstract ... //#region Abstract ...
public extractProps( public extractProps(
container?: IXComponentCardContainer container?: IXComponentCardContainer,
): Observable<IXComponentCardContainer> { ): Observable<IXComponentCardContainer> {
return forkJoin({ return forkJoin({
// //
isInPage: this.getValue(container ? container.isInPage : this.isInPage), isInPage: this.getValue(container ? container.isInPage : this.isInPage),
wrapWithCard: this.getValue( wrapWithCard: this.getValue(
container ? container.wrapWithCard : this.wrapWithCard container ? container.wrapWithCard : this.wrapWithCard,
), ),
cardCssClass: this.getValue( cardCssClass: this.getValue(
container ? container.cardCssClass : this.cardCssClass container ? container.cardCssClass : this.cardCssClass,
), ),
cardColor: this.getValue( cardColor: this.getValue(
container ? container.cardColor : this.cardColor container ? container.cardColor : this.cardColor,
), ),
cardForegroundColor: this.getValue( cardForegroundColor: this.getValue(
container ? container.cardForegroundColor : this.cardForegroundColor container ? container.cardForegroundColor : this.cardForegroundColor,
), ),
cardTitle: this.getValue( cardTitle: this.getValue(
container ? container.cardTitle : this.cardTitle container ? container.cardTitle : this.cardTitle,
), ),
cardSubTitle: this.getValue( cardSubTitle: this.getValue(
container ? container.cardSubTitle : this.cardSubTitle container ? container.cardSubTitle : this.cardSubTitle,
), ),
cardShowFooter: this.getValue( cardShowFooter: this.getValue(
container ? container.cardShowFooter : this.cardShowFooter container ? container.cardShowFooter : this.cardShowFooter,
), ),
cardShowActions: this.getValue( cardShowActions: this.getValue(
container ? container.cardShowActions : this.cardShowActions container ? container.cardShowActions : this.cardShowActions,
), ),
}).pipe( }).pipe(
map((data) => { map((data) => {
@@ -457,7 +462,7 @@ export abstract class XComponentCardContainerComponent
? container.cardActionProvider ? container.cardActionProvider
: this.cardActionProvider, : this.cardActionProvider,
}; };
}) }),
); );
} }
//#endregion //#endregion
@@ -1,8 +1,10 @@
<!-- Component Template --> <!-- Component Template -->
<ng-container *ngIf="getValue(wrapWithCard) | async; else componentsRef"> <ng-container *ngIf="getValue(wrapWithCard) | async; else componentsRef">
<x-card <x-card
#chartCard
class="x-card" class="x-card"
[showActions]="true" [showActions]="true"
[actionProvider]="cardActionProvider"
[color]="getValue(cardColor) | async" [color]="getValue(cardColor) | async"
[ngClass]="getValue(cssClass) | async" [ngClass]="getValue(cssClass) | async"
[isInPage]="getValue(isInPage) | async" [isInPage]="getValue(isInPage) | async"
@@ -39,6 +41,23 @@
[class.mobile]="isMobileUi$ | async" [class.mobile]="isMobileUi$ | async"
[ngClass]="getValue(cssClass) | async" [ngClass]="getValue(cssClass) | async"
> >
<!-- Toolbar -->
<x-action-bar
#chartActionBar
[color]="actionBarColor"
[cssClass]="actionBarCssClass"
[actionProvider]="actionBarActionProvider"
[foregroundColor]="actionBarForegroundColor"
(actionFired)="handleActionBarActionFired($event)"
*ngIf="
(getValue(showActionBar) | async) &&
(hasChildValue(actionBarActions) | async) &&
(hasChildValue(availableActionBarItems) | async)
"
[actions]="getArrayValue(actionBarActions) | async"
></x-action-bar>
<!-- Chart Box -->
<div #chartContainer class="x-chart-container"></div> <div #chartContainer class="x-chart-container"></div>
</div> </div>
</ng-template> </ng-template>
File diff suppressed because it is too large Load Diff
@@ -4,6 +4,7 @@ import { XCardModule } from '../x-card/x-card.module';
import { XIconModule } from '../x-icon/x-icon.module'; import { XIconModule } from '../x-icon/x-icon.module';
import { XChartComponent } from './x-chart.component'; import { XChartComponent } from './x-chart.component';
import { XSlotterModule } from '../x-slotter/x-slotter.module'; import { XSlotterModule } from '../x-slotter/x-slotter.module';
import { XActionBarModule } from '../x-action-bar/x-action-bar.module';
import { XBaseComponentModule } from '../modules/x-base-component.module'; import { XBaseComponentModule } from '../modules/x-base-component.module';
@NgModule({ @NgModule({
@@ -15,6 +16,7 @@ import { XBaseComponentModule } from '../modules/x-base-component.module';
XIconModule, XIconModule,
CommonModule, CommonModule,
XSlotterModule, XSlotterModule,
XActionBarModule,
XBaseComponentModule, XBaseComponentModule,
], ],
exports: [ exports: [
@@ -23,6 +25,7 @@ import { XBaseComponentModule } from '../modules/x-base-component.module';
CommonModule, CommonModule,
XSlotterModule, XSlotterModule,
XChartComponent, XChartComponent,
XActionBarModule,
XBaseComponentModule, XBaseComponentModule,
], ],
}) })
File diff suppressed because it is too large Load Diff
@@ -36,12 +36,14 @@ export enum XIconAction {
export type XIconActionIdentifier = XIconAction | string; export type XIconActionIdentifier = XIconAction | string;
export interface XIconActionModel export interface XIconActionModel
extends XBaseActionModel<XIconActionIdentifier> {} extends XBaseActionModel<XIconActionIdentifier> { }
export enum XIconNames { export enum XIconNames {
tv = 'tv', tv = 'tv',
ol = 'ol', ol = 'ol',
ul = 'ul', ul = 'ul',
csv = 'csv',
png = 'png',
job = 'job', job = 'job',
add = 'add', add = 'add',
sad = 'sad', sad = 'sad',
@@ -141,6 +143,10 @@ export enum XIconNames {
flight = 'flight', flight = 'flight',
memory = 'memory', memory = 'memory',
replay = 'replay', replay = 'replay',
x_axis = 'x_axis',
y_axis = 'y_axis',
zoom_in = 'zoom_in',
xy_axis = 'xy_axis',
visible = 'visible', visible = 'visible',
checked = 'checked', checked = 'checked',
unliked = 'unliked', unliked = 'unliked',
@@ -166,6 +172,7 @@ export enum XIconNames {
capture = 'capture', capture = 'capture',
live_tv = 'live_tv', live_tv = 'live_tv',
sd_card = 'sd_card', sd_card = 'sd_card',
zoom_out = 'zoom_out',
verified = 'verified', verified = 'verified',
collapse = 'collapse', collapse = 'collapse',
arrow_up = 'arrow_up', arrow_up = 'arrow_up',
@@ -353,6 +360,7 @@ export enum XIconNames {
menu_horizontal = 'menu_horizontal', menu_horizontal = 'menu_horizontal',
logo_javascript = 'logo_javascript', logo_javascript = 'logo_javascript',
phone_forwarded = 'phone_forwarded', phone_forwarded = 'phone_forwarded',
range_selection = 'range_selection',
string_resources = 'string_resources', string_resources = 'string_resources',
chatbox_ellipses = 'chatbox_ellipses', chatbox_ellipses = 'chatbox_ellipses',
checkmark_circle = 'checkmark_circle', checkmark_circle = 'checkmark_circle',
@@ -430,6 +438,8 @@ export const XProvidedIcons = {
mop: 'mop', mop: 'mop',
sad: 'sad', sad: 'sad',
map: 'map', map: 'map',
csv: 'csv',
png: 'png',
mail: 'mail', mail: 'mail',
undo: 'undo', undo: 'undo',
redo: 'redo', redo: 'redo',
@@ -509,12 +519,15 @@ export const XProvidedIcons = {
flight: 'flight', flight: 'flight',
memory: 'memory', memory: 'memory',
replay: 'replay', replay: 'replay',
x_axis: 'x_axis',
y_axis: 'y_axis',
unknown: 'attach', unknown: 'attach',
video: 'videocam', video: 'videocam',
done: 'checkmark', done: 'checkmark',
logout: 'log-out', logout: 'log-out',
avatars: 'images', avatars: 'images',
account: 'person', account: 'person',
xy_axis: 'xy_axis',
invite: 'contract', invite: 'contract',
archive: 'archive', archive: 'archive',
toolbar: 'toolbar', toolbar: 'toolbar',
@@ -534,11 +547,13 @@ export const XProvidedIcons = {
preview: 'preview', preview: 'preview',
heading: 'heading', heading: 'heading',
refresh: 'refresh', refresh: 'refresh',
zoom_in: 'zoom_in',
lock: 'lock-closed', lock: 'lock-closed',
unlock: 'lock-open', unlock: 'lock-open',
un_checked: 'close', un_checked: 'close',
survey: 'newspaper', survey: 'newspaper',
chat_box: 'chatbox', chat_box: 'chatbox',
zoom_out: 'zoom_out',
verified: 'verified', verified: 'verified',
arrow_up: 'arrow-up', arrow_up: 'arrow-up',
business: 'business', business: 'business',
@@ -738,6 +753,7 @@ export const XProvidedIcons = {
local_shipping: 'local_shipping', local_shipping: 'local_shipping',
cast_connected: 'cast_connected', cast_connected: 'cast_connected',
voice_chat_off: 'voice_chat_off', voice_chat_off: 'voice_chat_off',
range_selection: 'range_selection',
logo_javascript: 'logo-javascript', logo_javascript: 'logo-javascript',
phone_forwarded: 'phone_forwarded', phone_forwarded: 'phone_forwarded',
menu_vertical: 'ellipsis-vertical', menu_vertical: 'ellipsis-vertical',
@@ -791,6 +807,8 @@ export const XCustomIcons: string[] = [
XIconNames.ol, XIconNames.ol,
XIconNames.ul, XIconNames.ul,
XIconNames.tv, XIconNames.tv,
XIconNames.csv,
XIconNames.png,
XIconNames.dns, XIconNames.dns,
XIconNames.dvr, XIconNames.dvr,
XIconNames.fax, XIconNames.fax,
@@ -840,6 +858,10 @@ export const XCustomIcons: string[] = [
XIconNames.replay, XIconNames.replay,
XIconNames.expand, XIconNames.expand,
XIconNames.italic, XIconNames.italic,
XIconNames.x_axis,
XIconNames.y_axis,
XIconNames.zoom_in,
XIconNames.xy_axis,
XIconNames.toolbar, XIconNames.toolbar,
XIconNames.devices, XIconNames.devices,
XIconNames.dialogs, XIconNames.dialogs,
@@ -858,6 +880,7 @@ export const XCustomIcons: string[] = [
XIconNames.monitor, XIconNames.monitor,
XIconNames.preview, XIconNames.preview,
XIconNames.heading, XIconNames.heading,
XIconNames.zoom_out,
XIconNames.dropdown, XIconNames.dropdown,
XIconNames.add_call, XIconNames.add_call,
XIconNames.sim_card, XIconNames.sim_card,
@@ -953,6 +976,7 @@ export const XCustomIcons: string[] = [
XIconNames.cast_connected, XIconNames.cast_connected,
XIconNames.voice_chat_off, XIconNames.voice_chat_off,
XIconNames.phone_forwarded, XIconNames.phone_forwarded,
XIconNames.range_selection,
XIconNames.document_scanner, XIconNames.document_scanner,
XIconNames.splitscreen_left, XIconNames.splitscreen_left,
XIconNames.close_fullscreen, XIconNames.close_fullscreen,
@@ -1025,8 +1049,7 @@ export interface IXIconContainer extends IXBaseContainer {
}) })
export class XIconContainer export class XIconContainer
extends XBaseContainer extends XBaseContainer
implements Readonly<IXIconContainer> implements Readonly<IXIconContainer> {
{
// //
//#region Props ... //#region Props ...
readonly actionProvider: Subject<XIconActionModel> = readonly actionProvider: Subject<XIconActionModel> =
@@ -1057,8 +1080,7 @@ export class XIconContainer
}) })
export abstract class XIconContainerComponent export abstract class XIconContainerComponent
extends XBaseContainerComponent extends XBaseContainerComponent
implements IXIconContainer implements IXIconContainer {
{
// //
//#region Props ... //#region Props ...
// //