@stemy/ngx-utils 19.7.8 → 19.7.10

package/ngx-utils/common-types.d.ts

@@ -47,6 +47,7 @@ export interface IIconService {
     isDisabled: boolean;
     iconsLoaded: EventEmitter<any>;
     getIcon(icon: string, activeIcon: string, active: boolean): Promise<string>;
+    getIconImage(icon: string, modifier?: SvgSourceModifier): Promise<HTMLImageElement>;
 }
 export interface ITranslation {
     lang: string;
@@ -319,6 +320,7 @@ export interface ShapeDistance {
 }
 export interface IShape extends IPoint {
     readonly center: IPoint;
+    draw(ctx: CanvasRenderingContext2D, ratio?: number): void;
     support(dir: IPoint): IPoint;
     move(pos: IPoint): IShape;
     intersection(shape: IShape): ShapeIntersection;
@@ -336,6 +338,14 @@ export interface RectCoords {
     width: number;
     height: number;
 }
+/**
+ * Rectangle frame interface
+ */
+export interface Frame extends IShape {
+    width: number;
+    height: number;
+    rotation: number;
+}
 /**
  * Interface for an interactive canvas params
  */
@@ -350,6 +360,7 @@ export interface InteractiveCanvasParams {
  */
 export interface InteractiveCanvasItem {
     readonly position: IPoint;
+    readonly frame: Frame;
     readonly shapes: ReadonlyArray<IShape>;
     readonly isValid: boolean;
     readonly validPosition: IPoint;
@@ -358,7 +369,7 @@ export interface InteractiveCanvasItem {
     readonly active: boolean;
     readonly canvas: InteractiveCanvas;
     readonly index: number;
-    draw(ctx: CanvasRenderingContext2D): MaybePromise<void>;
+    draw(ctx: CanvasRenderingContext2D, shape: IShape): MaybePromise<void>;
 }
 export type InteractiveCanvasItems = ReadonlyArray<InteractiveCanvasItem>;
 /**
@@ -462,6 +473,12 @@ export interface IHttpService {
     url(url: string): string;
     makeListParams(page: number, itemsPerPage: number, orderBy?: string, orderDescending?: boolean, filter?: string): HttpRequestQuery;
 }
+export interface SvgDefinition {
+    source: SVGSVGElement;
+    width: number;
+    height: number;
+}
+export type SvgSourceModifier = (svg: SVGSVGElement, width: number, height: number) => string;
 export interface IBaseHttpClient extends HttpClient {
     readonly requestHeaders: HttpRequestHeaders;
     readonly requestParams: HttpRequestQuery;

package/ngx-utils/components/interactive-canvas/interactive-canvas.component.d.ts

@@ -90,16 +90,16 @@ export declare class InteractiveCanvasComponent implements InteractiveCanvas, On
     tempPaint(cb: CanvasPaintFunc): Promise<void>;
     resize(): void;
     onTouchStart($event: TouchEvent): void;
-    onTouchEnd($event: TouchEvent): void;
+    onTouchEnd(): void;
     onMouseDown($event: MouseEvent): void;
-    onMouseUp($event: MouseEvent): void;
+    onMouseUp(): void;
     onMouseMove($event: MouseEvent): void;
     onMouseLeave(): void;
     onPanStart(): void;
     onPanMove($event: any): void;
     onPanEnd(): void;
     protected fixRotation(): void;
-    protected selectItem(pointer: InteractiveCanvasPointer): void;
+    protected selectItem(): void;
     protected toCanvasPoint(pointer: InteractiveCanvasPointer): Point;
     protected getIndexUnderPointer(pointer: InteractiveCanvasPointer): number;
     protected updateCursor(): void;

package/ngx-utils/components/interactive-canvas/interactive-circle.component.d.ts

@@ -2,10 +2,9 @@ import { IShape } from "../../common-types";
 import { InteractiveItemComponent } from "./interactive-item.component";
 import * as i0 from "@angular/core";
 export declare class InteractiveCircleComponent extends InteractiveItemComponent {
-    radius: number;
+    readonly radius: import("@angular/core").InputSignal<number>;
     constructor();
-    draw(ctx: CanvasRenderingContext2D): void;
     protected calcShape(x: number, y: number): IShape;
     static ɵfac: i0.ɵɵFactoryDeclaration<InteractiveCircleComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<InteractiveCircleComponent, "interactive-circle", never, { "radius": { "alias": "radius"; "required": false; }; }, {}, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<InteractiveCircleComponent, "interactive-circle", never, { "radius": { "alias": "radius"; "required": false; "isSignal": true; }; }, {}, never, never, false, never>;
 }

package/ngx-utils/components/interactive-canvas/interactive-item.component.d.ts

@@ -1,11 +1,13 @@
 import { OnChanges } from "@angular/core";
-import { CanvasItemDirection, InteractiveCanvas, InteractiveCanvasItem, IPoint, IShape } from "../../common-types";
-import { Point } from "../../utils/geometry";
+import { CanvasItemDirection, InteractiveCanvas, InteractiveCanvasItem, IPoint, IShape, Frame } from "../../common-types";
+import { Point, Rect } from "../../utils/geometry";
 import { MaybePromise } from "../../helper-types";
 import * as i0 from "@angular/core";
 export declare class InteractiveItemComponent implements OnChanges, InteractiveCanvasItem {
     protected pos: Point;
+    protected mFrame: Rect;
     protected mShapes: IShape[];
+    get frame(): Frame;
     get shapes(): ReadonlyArray<IShape>;
     get x(): number;
     set x(value: number);
@@ -28,7 +30,7 @@ export declare class InteractiveItemComponent implements OnChanges, InteractiveC
     protected valid: boolean;
     protected validPos: Point;
     constructor();
-    draw(ctx: CanvasRenderingContext2D): MaybePromise<void>;
+    draw(ctx: CanvasRenderingContext2D, shape: IShape): MaybePromise<void>;
     ngOnChanges(): void;
     calcShapes(): void;
     hit(point: Point): boolean;
@@ -38,6 +40,7 @@ export declare class InteractiveItemComponent implements OnChanges, InteractiveC
     moveY(y: number): void;
     moveEnd(): void;
     protected restrictPosition(x: number, y: number): IPoint;
+    protected checkIsValid(): boolean;
     protected isValidByParams(): boolean;
     protected isValidByDistance(other: InteractiveCanvasItem): boolean;
     protected distToPixels(value: number): number;

package/ngx-utils/components/interactive-canvas/interactive-rect.component.d.ts

@@ -2,12 +2,11 @@ import { IShape } from "../../common-types";
 import { InteractiveItemComponent } from "./interactive-item.component";
 import * as i0 from "@angular/core";
 export declare class InteractiveRectComponent extends InteractiveItemComponent {
-    width: number;
-    height: number;
-    rotation: number;
+    readonly width: import("@angular/core").InputSignal<number>;
+    readonly height: import("@angular/core").InputSignal<number>;
+    readonly rotation: import("@angular/core").InputSignal<number>;
     constructor();
-    draw(ctx: CanvasRenderingContext2D): void;
     protected calcShape(x: number, y: number): IShape;
     static ɵfac: i0.ɵɵFactoryDeclaration<InteractiveRectComponent, never>;
-    static ɵcmp: i0.ɵɵComponentDeclaration<InteractiveRectComponent, "interactive-rect", never, { "width": { "alias": "width"; "required": false; }; "height": { "alias": "height"; "required": false; }; "rotation": { "alias": "rotation"; "required": false; }; }, {}, never, never, false, never>;
+    static ɵcmp: i0.ɵɵComponentDeclaration<InteractiveRectComponent, "interactive-rect", never, { "width": { "alias": "width"; "required": false; "isSignal": true; }; "height": { "alias": "height"; "required": false; "isSignal": true; }; "rotation": { "alias": "rotation"; "required": false; "isSignal": true; }; }, {}, never, never, false, never>;
 }

package/ngx-utils/ngx-utils.imports.d.ts

@@ -64,7 +64,7 @@ import { UploadComponent } from "./components/upload/upload.component";
 export declare const pipes: (typeof FilterPipe | typeof FormatNumberPipe | typeof GlobalTemplatePipe | typeof IncludesPipe | typeof ReducePipe | typeof RoundPipe | typeof SafeHtmlPipe | typeof TranslatePipe)[];
 export declare const directives: (typeof AsyncMethodBase | typeof AsyncMethodTargetDirective | typeof BackgroundDirective | typeof ComponentLoaderDirective | typeof DynamicTableTemplateDirective | typeof GlobalTemplateDirective | typeof IconDirective | typeof NgxTemplateOutletDirective | typeof PaginationDirective | typeof PaginationItemDirective | typeof ResourceIfDirective | typeof StickyDirective | typeof StickyClassDirective | typeof DropdownDirective | typeof DropdownContentDirective | typeof TabsItemDirective | typeof UnorderedListItemDirective | typeof UnorderedListTemplateDirective)[];
 export declare const components: (typeof ChipsComponent | typeof CloseBtnComponent | typeof DropListComponent | typeof DynamicTableComponent | typeof PaginationMenuComponent | typeof UnorderedListComponent | typeof UploadComponent)[];
-export declare const providers: (typeof FilterPipe | typeof FormatNumberPipe | typeof GlobalTemplatePipe | typeof IncludesPipe | typeof ReducePipe | typeof RoundPipe | typeof SafeHtmlPipe | typeof TranslatePipe | typeof BaseHttpClient | typeof BaseHttpService | typeof AuthGuard | typeof AclService | typeof StaticAuthService | typeof ConfigService | typeof BaseDialogService | typeof ErrorHandlerService | typeof EventsService | typeof FormatterService | typeof GlobalTemplateService | typeof IconService | typeof StaticLanguageService | typeof OpenApiService | typeof PromiseService | typeof SocketService | typeof StateService | typeof StorageService | typeof BaseToasterService | typeof CacheService | typeof ComponentLoaderService | typeof TranslatedUrlSerializer | typeof UniversalService | typeof DeviceDetectorService | {
+export declare const providers: (typeof UniversalService | typeof StateService | typeof AuthGuard | typeof EventsService | typeof AclService | typeof BaseHttpClient | typeof StorageService | typeof CacheService | typeof BaseHttpService | typeof StaticAuthService | typeof ConfigService | typeof BaseDialogService | typeof ErrorHandlerService | typeof FormatterService | typeof GlobalTemplateService | typeof IconService | typeof StaticLanguageService | typeof OpenApiService | typeof BaseToasterService | typeof ComponentLoaderService | typeof TranslatedUrlSerializer | typeof PromiseService | typeof SocketService | typeof FilterPipe | typeof FormatNumberPipe | typeof GlobalTemplatePipe | typeof IncludesPipe | typeof ReducePipe | typeof RoundPipe | typeof SafeHtmlPipe | typeof TranslatePipe | typeof DeviceDetectorService | {
     provide: import("@angular/core").InjectionToken<import("@angular/platform-browser").EventManagerPlugin[]>;
     useClass: typeof DragDropEventPlugin;
     multi: boolean;

package/ngx-utils/services/icon.service.d.ts

@@ -1,13 +1,17 @@
 import { EventEmitter } from "@angular/core";
-import { IIconService } from "../common-types";
+import { IIconService, SvgSourceModifier } from "../common-types";
+import { LocalHttpService } from "./local-http.service";
 import * as i0 from "@angular/core";
 export declare class IconService implements IIconService {
+    readonly http: LocalHttpService;
     get isDisabled(): boolean;
     set isDisabled(value: boolean);
     readonly iconsLoaded: EventEmitter<any>;
     protected disabled: boolean;
-    constructor();
+    constructor(http: LocalHttpService);
     getIcon(icon: string, activeIcon: string, active: boolean): Promise<string>;
+    getIconUrl(icon: string, modifier?: SvgSourceModifier): Promise<string>;
+    getIconImage(icon: string, modifier?: SvgSourceModifier): Promise<HTMLImageElement>;
     static ɵfac: i0.ɵɵFactoryDeclaration<IconService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<IconService>;
 }

package/ngx-utils/services/local-http.service.d.ts

@@ -1,8 +1,9 @@
-import { HttpClientRequestOptions, IConfiguration } from "../common-types";
+import { HttpClientRequestOptions, IConfiguration, SvgDefinition, SvgSourceModifier } from "../common-types";
 import { BaseHttpService } from "./base-http.service";
 import * as i0 from "@angular/core";
 export declare class LocalHttpService extends BaseHttpService {
-    private images;
+    protected svgs: Record<string, SvgDefinition>;
+    protected images: Record<string, Promise<HTMLImageElement>>;
     get name(): string;
     get config(): IConfiguration;
     protected get withCredentials(): boolean;
@@ -10,6 +11,10 @@ export declare class LocalHttpService extends BaseHttpService {
     url(url: string): string;
     get(url: string, options?: HttpClientRequestOptions, body?: any): Promise<any>;
     getImage(url: string): Promise<HTMLImageElement>;
+    svgUrlFromSource(sourceStr: string, modifier?: SvgSourceModifier): string;
+    svgFromSource(sourceStr: string, modifier?: SvgSourceModifier): Promise<HTMLImageElement>;
+    getSvgUrl(url: string, modifier?: SvgSourceModifier): Promise<string>;
+    getSvgImage(url: string, modifier?: SvgSourceModifier): Promise<HTMLImageElement>;
     static ɵfac: i0.ɵɵFactoryDeclaration<LocalHttpService, never>;
     static ɵprov: i0.ɵɵInjectableDeclaration<LocalHttpService>;
 }

package/ngx-utils/utils/canvas.d.ts

@@ -1,7 +1,4 @@
 import { CanvasColor } from "../common-types";
-export declare function drawRect(ctx: CanvasRenderingContext2D, w: number, h: number): void;
-export declare function drawOval(ctx: CanvasRenderingContext2D, w: number, h: number): void;
-export declare function drawPoint(ctx: CanvasRenderingContext2D): void;
 export declare class CanvasUtils {
     static manipulatePixels(canvas: HTMLCanvasElement, ctx: CanvasRenderingContext2D, colorTransformer: (color: CanvasColor, greyscale?: number) => CanvasColor): void;
     static thresholding(canvas: HTMLCanvasElement, ctx: CanvasRenderingContext2D, threshold: number, colorTransformer: (color: CanvasColor, limit: boolean, greyscale?: number) => CanvasColor): void;

package/ngx-utils/utils/file.utils.d.ts

@@ -8,7 +8,6 @@ export declare class FileUtils {
     static saveBlob(blob: Blob, fileName: string): void;
     static saveJson(json: any, fileName: string): void;
     static readFileAsText(file: Blob): Promise<string>;
-    static readFileAsBinaryString(file: Blob): Promise<string>;
     static readFileAsDataURL(file: Blob): Promise<string>;
     static base64ToBlob(base64: string, mimeType?: string): Blob;
     static readBlobFromUrl(http: HttpClient, url: string): Promise<Blob>;

package/ngx-utils/utils/geometry/shapes.d.ts

@@ -5,6 +5,7 @@ declare abstract class Shape implements IShape {
     get y(): number;
     protected pt: IPoint;
     protected constructor(x: number, y: number);
+    abstract draw(ctx: CanvasRenderingContext2D, ratio?: number): void;
     abstract support(dir: IPoint): IPoint;
     abstract move(pos: IPoint): IShape;
     intersection(shape: IShape): ShapeIntersection;
@@ -17,6 +18,7 @@ export declare class Point extends Shape {
     get length(): number;
     get perpendicular(): Point;
     constructor(xOrP: number | IPoint, y?: number);
+    draw(ctx: CanvasRenderingContext2D): void;
     support(): IPoint;
     move(pos: IPoint): IShape;
     add(p: IPoint): Point;
@@ -36,6 +38,7 @@ export declare class Rect extends Shape {
     readonly height: number;
     readonly rotation: number;
     constructor(x: number, y: number, width: number, height: number, rotation?: number);
+    draw(ctx: CanvasRenderingContext2D, ratio: number): void;
     support(dir: IPoint): IPoint;
     move(pos: IPoint): Rect;
 }
@@ -44,6 +47,7 @@ export declare class Oval extends Shape {
     readonly height: number;
     readonly rotation: number;
     constructor(x: number, y: number, width: number, height: number, rotation?: number);
+    draw(ctx: CanvasRenderingContext2D, ratio: number): void;
     support(dir: IPoint): IPoint;
     move(pos: IPoint): Oval;
 }

package/ngx-utils/utils/string.utils.d.ts

@@ -1,3 +1,4 @@
+export declare function svgToDataUri(svgString: string): string;
 export declare class StringUtils {
     static concat(separator: string, ...strings: string[]): string;
     static startsWith(str: string, ...starts: string[]): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stemy/ngx-utils",
-  "version": "19.7.8",
+  "version": "19.7.10",
   "license": "MIT",
   "public": true,
   "repository": "https://github.com/stemyke/ngx-utils.git",

package/public_api.d.ts

@@ -1,12 +1,12 @@
 import "zone.js";
 export { MaybePromise, MaybeArray, KeysOfType, ObjOfType, StringKeys, CapitalizeFirst, CamelJoin, PrefixedPick } from "./ngx-utils/helper-types";
-export { DurationUnit, TypedFactoryProvider, TypedValueProvider, TypedExistingProvider, TypedClassProvider, TypedTokenProvider, TypedProvider, CachedFactory, ResolveFactory, IResolveFactory, CanvasColor, IIconService, ITranslation, ITranslations, ILanguageSetting, ILanguageSettings, ILanguageService, IUserData, IAuthService, RouteValidator, IRouteData, IRoute, IAclComponent, IDialogButtonConfig, IDialogConfig, IConfirmMessageConfig, IConfirmDialogConfig, IDialogService, IPromiseService, IRouteStateInfo, NavigationUrlParam, StorageMode, ToastType, IToasterService, IAsyncMessage, AsyncMethod, IconMap, IconProps, ButtonType, ButtonSize, ButtonProps, TabValue, TabOption, ChipValue, ChipStatus, ChipOption, DropdownAttachTo, UnorderedListTemplate, UnorderedListTemplates, UnorderedListStyle, UploadType, IFileUploadResult, IFileUploadProcess, IAjaxRequestDetails, AjaxRequestCallback, ScriptType, ILoadableElement, ILoaderPromises, ISearchObservable, FactoryDependencies, ObjectType, ITimer, IExtraProperties, IGroupMap, TranslationQuery, IPageInfo, IPaginationData, PaginationDataLoader, PaginationItemContext, IPoint, ShapeIntersection, ShapeDistance, IShape, CanvasResizeMode, CanvasItemDirection, CanvasPaintFunc, RangeCoords, RectCoords, InteractiveCanvasParams, InteractiveCanvasItem, InteractiveCanvasItems, InteractiveCanvas, InteractiveCanvasRenderer, InteractivePanEvent, InteractiveCanvasPointer, HttpRequestHeaders, HttpRequestQuery, HttpClientRequestOptions, HttpRequestOptions, UploadData, IIssueContext, IProgress, ProgressListener, CacheExpireMode, IHttpService, IApiService, DynamicSchemaRef, OpenApiSchemaProperty, OpenApiSchema, OpenApiSchemas, TableFilterType, ITableOrders, ITableColumn, ITableColumns, TableColumns, ITableTemplate, ITableTemplates, ITableDataQuery, TableDataItems, TableDataLoader, DragDropEvent, DragEventHandler, ITableDragEvent, DynamicTableDragHandler, ResourceIfContext, CssSelector, CssSelectorList, DynamicComponentLocation, DynamicModuleInfo, DynamicEntryComponents, IConfiguration, IConfigService, ResizeEventStrategy, ErrorHandlerCallback, GlobalComponentModifier, AppInitializerFunc, IModuleConfig, ValuedPromise } from "./ngx-utils/common-types";
+export { DurationUnit, TypedFactoryProvider, TypedValueProvider, TypedExistingProvider, TypedClassProvider, TypedTokenProvider, TypedProvider, CachedFactory, ResolveFactory, IResolveFactory, CanvasColor, IIconService, ITranslation, ITranslations, ILanguageSetting, ILanguageSettings, ILanguageService, IUserData, IAuthService, RouteValidator, IRouteData, IRoute, IAclComponent, IDialogButtonConfig, IDialogConfig, IConfirmMessageConfig, IConfirmDialogConfig, IDialogService, IPromiseService, IRouteStateInfo, NavigationUrlParam, StorageMode, ToastType, IToasterService, IAsyncMessage, AsyncMethod, IconMap, IconProps, ButtonType, ButtonSize, ButtonProps, TabValue, TabOption, ChipValue, ChipStatus, ChipOption, DropdownAttachTo, UnorderedListTemplate, UnorderedListTemplates, UnorderedListStyle, UploadType, IFileUploadResult, IFileUploadProcess, IAjaxRequestDetails, AjaxRequestCallback, ScriptType, ILoadableElement, ILoaderPromises, ISearchObservable, FactoryDependencies, ObjectType, ITimer, IExtraProperties, IGroupMap, TranslationQuery, IPageInfo, IPaginationData, PaginationDataLoader, PaginationItemContext, IPoint, ShapeIntersection, ShapeDistance, IShape, CanvasResizeMode, CanvasItemDirection, CanvasPaintFunc, RangeCoords, RectCoords, Frame, InteractiveCanvasParams, InteractiveCanvasItem, InteractiveCanvasItems, InteractiveCanvas, InteractiveCanvasRenderer, InteractivePanEvent, InteractiveCanvasPointer, HttpRequestHeaders, HttpRequestQuery, HttpClientRequestOptions, HttpRequestOptions, UploadData, IIssueContext, IProgress, ProgressListener, CacheExpireMode, IHttpService, SvgSourceModifier, IApiService, DynamicSchemaRef, OpenApiSchemaProperty, OpenApiSchema, OpenApiSchemas, TableFilterType, ITableOrders, ITableColumn, ITableColumns, TableColumns, ITableTemplate, ITableTemplates, ITableDataQuery, TableDataItems, TableDataLoader, DragDropEvent, DragEventHandler, ITableDragEvent, DynamicTableDragHandler, ResourceIfContext, CssSelector, CssSelectorList, DynamicComponentLocation, DynamicModuleInfo, DynamicEntryComponents, IConfiguration, IConfigService, ResizeEventStrategy, ErrorHandlerCallback, GlobalComponentModifier, AppInitializerFunc, IModuleConfig, ValuedPromise } from "./ngx-utils/common-types";
 export { ICON_TYPE, ICON_MAP, BUTTON_TYPE, ERROR_HANDLER, STATIC_SCHEMAS, RESIZE_STRATEGY, RESIZE_DELAY, ROOT_ELEMENT, SCRIPT_PARAMS, BASE_CONFIG, CONFIG_SERVICE, APP_BASE_URL, API_SERVICE, EXPRESS_REQUEST, PROMISE_SERVICE, DIALOG_SERVICE, TOASTER_SERVICE, AUTH_SERVICE, LANGUAGE_SERVICE, ICON_SERVICE, OPTIONS_TOKEN } from "./ngx-utils/tokens";
 export { AjaxRequestHandler } from "./ngx-utils/utils/ajax-request-handler";
 export { ArrayUtils } from "./ngx-utils/utils/array.utils";
 export { AuthGuard } from "./ngx-utils/utils/auth.guard";
 export { createTypedProvider, cachedFactory } from "./ngx-utils/utils/cached-factory";
-export { drawRect, drawOval, CanvasUtils } from "./ngx-utils/utils/canvas";
+export { CanvasUtils } from "./ngx-utils/utils/canvas";
 export { DateUtils } from "./ngx-utils/utils/date.utils";
 export { FileUtils } from "./ngx-utils/utils/file.utils";
 export { ForbiddenZone } from "./ngx-utils/utils/forbidden-zone";
@@ -22,7 +22,7 @@ export { isBrowser, getRoot, hashCode, switchClass, getCssVariables, checkTransi
 export { ObjectUtils } from "./ngx-utils/utils/object.utils";
 export { ObservableUtils, ISubscriberInfo } from "./ngx-utils/utils/observable.utils";
 export { CancelablePromise, cancelablePromise, impatientPromise } from "./ngx-utils/utils/promise.utils";
-export { StringUtils } from "./ngx-utils/utils/string.utils";
+export { svgToDataUri, StringUtils } from "./ngx-utils/utils/string.utils";
 export { SetUtils } from "./ngx-utils/utils/set.utils";
 export { computedPrevious, cssStyles, cssVariables } from "./ngx-utils/utils/signal-utils";
 export { SocketFactory, SocketData, SocketDataValue, SocketDataObj, SocketClient } from "./ngx-utils/utils/socket-client";