Skip to content

Commit 8067764

Browse files
feat: Update to f-docs v1.2.1
1 parent 5646066 commit 8067764

14 files changed

+26
-97
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"@angular/platform-browser-dynamic": "^18.1.0",
6060
"@angular/router": "^18.1.0",
6161
"@foblex/core": "^1.1.6",
62-
"@foblex/f-docs": "^1.2.0",
62+
"@foblex/f-docs": "^1.2.1",
6363
"rxjs": "~7.8.0",
6464
"tslib": "^2.3.0",
6565
"zone.js": "~0.14.3"

projects/f-flow/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@foblex/flow",
3-
"version": "12.4.0",
3+
"version": "12.5.0",
44
"description": "An Angular library designed to simplify the creation and manipulation of dynamic flow. Provides components for flows, nodes, and connections, automating node manipulation and inter-node connections.",
55
"main": "index.js",
66
"types": "index.d.ts",
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { SubscribeOnTransformChangesRequest } from './subscribe-on-transform-changes.request';
22
import { Injectable } from '@angular/core';
3-
import { Observable } from 'rxjs';
4-
import { FTransformStore } from '../../f-storage';
3+
import { merge, Observable } from 'rxjs';
4+
import { FComponentsStore, FTransformStore } from '../../f-storage';
55
import { FExecutionRegister, IExecution } from '../../infrastructure';
66

77
@Injectable()
@@ -11,10 +11,14 @@ export class SubscribeOnTransformChangesExecution
1111

1212
constructor(
1313
private fTransformStore: FTransformStore,
14+
private fComponentsStore: FComponentsStore
1415
) {
1516
}
1617

1718
public handle(request: SubscribeOnTransformChangesRequest): Observable<void> {
18-
return this.fTransformStore.changes;
19+
return merge(
20+
this.fTransformStore.changes,
21+
this.fComponentsStore.changes
22+
);
1923
}
2024
}

projects/f-flow/src/f-draggable/f-draggable.directive.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {
2-
AfterViewInit, ContentChild, ContentChildren,
2+
AfterViewInit, ContentChildren,
33
Directive,
44
ElementRef,
55
EventEmitter, Inject,

projects/f-flow/src/f-draggable/providers.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { EXTERNAL_ITEM_PROVIDERS } from './external-item';
55
import { NODE_PROVIDERS } from './node';
66
import { NODE_RESIZE_PROVIDERS } from './node-resize';
77
import { SELECTION_AREA_PROVIDERS } from './selection-area';
8-
import { F_MINIMAP_DRAG_AND_DROP_PROVIDERS } from '../f-minimap';
8+
import { F_MINIMAP_DRAG_AND_DROP_PROVIDERS } from '../f-minimap/domain/providers';
99

1010
export const F_DRAGGABLE_PROVIDERS = [
1111

projects/f-flow/src/f-minimap/domain/calculate-flow-point-from-minimap-point/calculate-flow-point-from-minimap-point.execution.ts

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ export class CalculateFlowPointFromMinimapPointExecution
1414
return this.fComponentsStore.fCanvas!.transform.scale;
1515
}
1616

17-
1817
constructor(
1918
private fComponentsStore: FComponentsStore
2019
) {

projects/f-flow/src/f-minimap/domain/minimap-drag-preparation/minimap-drag-preparation.validator.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,21 @@ import { Injectable } from '@angular/core';
22
import { MinimapDragPreparationRequest } from './minimap-drag-preparation.request';
33
import { FValidatorRegister, IValidator } from '../../../infrastructure';
44
import { FDraggableDataContext } from '../../../f-draggable';
5+
import { FComponentsStore } from '../../../f-storage';
56

67
@Injectable()
78
@FValidatorRegister(MinimapDragPreparationRequest)
89
export class MinimapDragPreparationValidator implements IValidator<MinimapDragPreparationRequest> {
910

1011
constructor(
12+
private fComponentsStore: FComponentsStore,
1113
private fDraggableDataContext: FDraggableDataContext
1214
) {
1315
}
1416

1517
public handle(request: MinimapDragPreparationRequest): boolean {
1618
return !this.fDraggableDataContext.draggableItems.length &&
17-
!!request.event.targetElement.closest('.f-minimap');
19+
!!request.event.targetElement.closest('.f-minimap') &&
20+
this.fComponentsStore.flowHost.contains(request.event.targetElement);
1821
}
1922
}

projects/f-flow/src/f-minimap/f-minimap-canvas.directive.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ import {
33
} from "@angular/core";
44
import { FComponentsStore } from '../f-storage';
55
import {
6-
DomElementExtensions, IRect, Point,
6+
DomElementExtensions, IRect,
77
RectExtensions
88
} from '@foblex/core';
99
import { FFlowMediator } from '../infrastructure';
1010
import { FNodeBase } from '../f-node';
1111

1212
@Directive({
13-
selector: 'g[f-minimap-canvas]'
13+
selector: 'g[fMinimapCanvas]'
1414
})
1515
export class FMinimapCanvasDirective {
1616

projects/f-flow/src/f-minimap/f-minimap-flow.directive.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ import {
22
Directive, ElementRef, Input,
33
} from "@angular/core";
44
import { FComponentsStore } from '../f-storage';
5-
import { IRect, ISize, Point, RectExtensions, SizeExtensions } from '@foblex/core';
5+
import { IRect, ISize, RectExtensions, SizeExtensions } from '@foblex/core';
66
import { FFlowMediator } from '../infrastructure';
77
import { FMinimapData } from './domain';
88
import { GetNodesRectRequest } from '../domain';
99

1010
@Directive({
11-
selector: 'svg[f-minimap-flow]'
11+
selector: 'svg[fMinimapFlow]'
1212
})
1313
export class FMinimapFlowDirective {
1414

projects/f-flow/src/f-minimap/f-minimap-view.directive.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { FComponentsStore } from '../f-storage';
33
import { IRect, RectExtensions } from '@foblex/core';
44

55
@Directive({
6-
selector: 'rect[f-minimap-view]',
6+
selector: 'rect[fMinimapView]',
77
host: {
88
'class': 'f-component f-minimap-view',
99
}
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
<svg f-minimap-flow width="100%" height="100%" fLockedContext [fMinSize]="fMinSize"
2-
style="display: block; vertical-align: middle;" xmlns="http://www.w3.org/2000/svg">
3-
<g f-minimap-canvas></g>
4-
<rect f-minimap-view x="0" y="0" width="100%" height="100%" stroke="none"/>
1+
<svg fMinimapFlow width="100%" height="100%" fLockedContext [fMinSize]="fMinSize">
2+
<g fMinimapCanvas></g>
3+
<rect fMinimapView x="0" y="0" width="100%" height="100%" stroke="none"/>
54
</svg>
65

projects/f-flow/src/f-minimap/f-minimap.component.ts

+2-7
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@ import {
33
ElementRef, Input, OnDestroy, ViewChild,
44
} from "@angular/core";
55
import { FFlowMediator } from '../infrastructure';
6-
import { debounceTime, merge, Observable, Subscription } from 'rxjs';
6+
import { debounceTime, Observable, Subscription } from 'rxjs';
77
import { SubscribeOnTransformChangesRequest } from '../domain';
88
import { FMinimapFlowDirective } from './f-minimap-flow.directive';
99
import { FMinimapCanvasDirective } from './f-minimap-canvas.directive';
1010
import { FMinimapViewDirective } from './f-minimap-view.directive';
11-
import { FComponentsStore } from '../f-storage';
1211
import { IPointerEvent } from '@foblex/core';
1312
import { F_DRAG_AND_DROP_PLUGIN, IFDragAndDropPlugin } from '../f-draggable';
1413
import { MinimapDragFinalizeRequest, MinimapDragPreparationRequest } from './domain';
@@ -44,7 +43,6 @@ export class FMinimapComponent implements AfterViewInit, OnDestroy, IFDragAndDro
4443

4544
constructor(
4645
private elementReference: ElementRef<HTMLElement>,
47-
private fComponentsStore: FComponentsStore,
4846
private fMediator: FFlowMediator
4947
) {
5048
}
@@ -62,10 +60,7 @@ export class FMinimapComponent implements AfterViewInit, OnDestroy, IFDragAndDro
6260
}
6361

6462
private getTransformChanges(): Observable<void> {
65-
return merge(
66-
this.fMediator.send<Observable<void>>(new SubscribeOnTransformChangesRequest()),
67-
this.fComponentsStore.changes
68-
);
63+
return this.fMediator.send<Observable<void>>(new SubscribeOnTransformChangesRequest());
6964
}
7065

7166
public onPointerDown(event: IPointerEvent): void {

public/docs/en/f-external-item-directive.md

-71
This file was deleted.

src/styles/styles.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
@import "@foblex/f-docs/assets/styles/styles";
1+
@import "@foblex/f-docs/assets/styles/styles.scss";

0 commit comments

Comments
 (0)