diff --git a/package-lock.json b/package-lock.json index cc5d19b..a6ac091 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,10 +18,10 @@ "@angular/platform-browser": "^17.2.0", "@angular/platform-browser-dynamic": "^17.2.0", "@angular/router": "^17.2.0", - "@foblex/core": "^1.1.0", - "@foblex/flow": "^12.2.3", + "@foblex/flow": "^12.6.2", "@foblex/flow-animator": "^16.0.5", "@foblex/ng-clarc": "^1.0.3", + "@foblex/platform": "^1.0.2", "@ngxs/store": "^3.8.2", "rxjs": "~7.8.0", "tslib": "^2.3.0", @@ -2670,24 +2670,30 @@ } }, "node_modules/@foblex/core": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@foblex/core/-/core-1.1.0.tgz", - "integrity": "sha512-kVRJGwfKgYlLlYi0yQ3Sjshnlv9c05edrn7av2PrxVr9HJA/g1KaiRWSlHX6hlvesAhiCFBvJiLAjT3Z28G+Mw==", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/@foblex/core/-/core-1.2.5.tgz", + "integrity": "sha512-9aN+8odoVq+3w7gYvO/HDNlNchk9C/yurQLoDu8MfgcKGOfbbgWLYDDnlhRGly0jGIzcbXh7ZlmixP2qFpBMPA==", + "peer": true, "dependencies": { "tslib": "^2.3.0" + }, + "peerDependencies": { + "@angular/common": ">=12.0.0", + "@angular/core": ">=12.0.0" } }, "node_modules/@foblex/flow": { - "version": "12.2.3", - "resolved": "https://registry.npmjs.org/@foblex/flow/-/flow-12.2.3.tgz", - "integrity": "sha512-QiaVIuc8gQ5JTYu3bxpdLDrntT1KO7cRaovnMU5s4Doxj6+JfV+eCuqK+91gsDCx5sm5OYeNOZi8jbvNuRqUrg==", + "version": "12.6.2", + "resolved": "https://registry.npmjs.org/@foblex/flow/-/flow-12.6.2.tgz", + "integrity": "sha512-QqL99JKdQKDths/wfAvykb7+bMG9XFRLTXPzlYOIeqn+I2GyLumHcLBfKn1Pe3BC4StlnL+SNkw6XD7orgRRBw==", "dependencies": { "tslib": "^2.3.0" }, "peerDependencies": { "@angular/common": ">=12.0.0", "@angular/core": ">=12.0.0", - "@foblex/core": ">=1.1.0", + "@foblex/core": "1.2.5", + "@foblex/platform": "1.0.2", "rxjs": ">=6.6.0" } }, @@ -2712,6 +2718,18 @@ "tslib": "^2.3.0" } }, + "node_modules/@foblex/platform": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@foblex/platform/-/platform-1.0.2.tgz", + "integrity": "sha512-nSE7pYn7VEYj3KIC14Y0Kmm8IXTvj0tJl5+LCZlqkuh26KGUQaVKTHFNWTPOglZKRQuo3g6FUk1CHiyE2Nh+hw==", + "dependencies": { + "tslib": "^2.3.0" + }, + "peerDependencies": { + "@angular/common": ">=12.0.0", + "@angular/core": ">=12.0.0" + } + }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", diff --git a/package.json b/package.json index c31c8f5..5de2b4f 100644 --- a/package.json +++ b/package.json @@ -20,10 +20,10 @@ "@angular/platform-browser": "^17.2.0", "@angular/platform-browser-dynamic": "^17.2.0", "@angular/router": "^17.2.0", - "@foblex/core": "^1.1.0", - "@foblex/flow": "^12.2.3", + "@foblex/flow": "^12.6.2", "@foblex/flow-animator": "^16.0.5", "@foblex/ng-clarc": "^1.0.3", + "@foblex/platform": "^1.0.2", "@ngxs/store": "^3.8.2", "rxjs": "~7.8.0", "tslib": "^2.3.0", diff --git a/projects/cc-call-configuration/src/lib/components/editor/workflow-editor.component.ts b/projects/cc-call-configuration/src/lib/components/editor/workflow-editor.component.ts index 8404447..fee4ba1 100644 --- a/projects/cc-call-configuration/src/lib/components/editor/workflow-editor.component.ts +++ b/projects/cc-call-configuration/src/lib/components/editor/workflow-editor.component.ts @@ -38,6 +38,7 @@ import { Store } from '@ngxs/store'; import { ChangeNodePositionAction, CreateNodeAction, INodeValueModel } from '@domain'; import { EFlowActionPanelEvent } from './action-panel/e-flow-action-panel-event'; import { A, BACKSPACE, DASH, DELETE, NUMPAD_MINUS, NUMPAD_PLUS } from '@angular/cdk/keycodes'; +import { BrowserService, EOperationSystem, PlatformService } from '@foblex/platform'; @Component({ selector: 'workflow-editor', @@ -101,7 +102,8 @@ export class WorkflowEditorComponent implements OnInit, AfterViewInit, OnDestroy private router: Router, private injector: Injector, private activatedRoute: ActivatedRoute, - private changeDetectorRef: ChangeDetectorRef + private changeDetectorRef: ChangeDetectorRef, + private fPlatform: PlatformService ) { } @@ -233,18 +235,18 @@ export class WorkflowEditorComponent implements OnInit, AfterViewInit, OnDestroy this.onRemoveItems(); break; case NUMPAD_PLUS: - if (MouseEventExtensions.isCommandButton(event)) { + if (MouseEventExtensions.isCommandButton(this.fPlatform.getOS() as EOperationSystem, event)) { this.fZoomDirective.zoomIn(); } break; case NUMPAD_MINUS: case DASH: - if (MouseEventExtensions.isCommandButton(event)) { + if (MouseEventExtensions.isCommandButton(this.fPlatform.getOS() as EOperationSystem, event)) { this.fZoomDirective.zoomOut(); } break; case A: - if (MouseEventExtensions.isCommandButton(event)) { + if (MouseEventExtensions.isCommandButton(this.fPlatform.getOS() as EOperationSystem, event)) { this.fFlowComponent.selectAll(); } break;