Skip to content

Commit

Permalink
fix(core): merge master
Browse files Browse the repository at this point in the history
GH-0
  • Loading branch information
AryanshSourcefuse committed Feb 21, 2024
1 parent 4ade0ea commit c5af844
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
],
"parserOptions": {
"project": [
"tsconfig.json"
"tsconfig.app.json"
],
"createDefaultProgram": true
},
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,6 @@ testem.log
# System files
.DS_Store
Thumbs.db

# Ignore all build files
dist
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ import {
} from '../../services';
import {LocalizationPipe} from '../../pipes/localization.pipe';
import moment from 'moment';
import {GroupService} from './group.service';

@Component({
selector: 'workflow-group',
Expand All @@ -59,6 +60,7 @@ export class GroupComponent<E> implements OnInit, AfterViewInit {
constructor(
private readonly nodes: NodeService<E>,
private readonly localizationSvc: LocalizationProviderService,
private readonly groupService: GroupService,
) {}
public inputType = InputTypes;
private isMouseDown: boolean = false;
Expand Down Expand Up @@ -395,7 +397,10 @@ export class GroupComponent<E> implements OnInit, AfterViewInit {
*/
onPoperClick(event: MouseEvent, popper: NgxPopperjsContentComponent) {
this.prevPopperRef?.hide();
this.groupService.previousPopper?.hide();
this.groupService.previousPopper?.popperInstance.forceUpdate();
this.prevPopperRef = popper;
this.groupService.previousPopper = popper;
event.preventDefault();
event.stopPropagation();
this.prevPopperRef.show();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { TestBed } from '@angular/core/testing';

import { GroupService } from './group.service';

describe('GroupService', () => {
let service: GroupService;

beforeEach(() => {
TestBed.configureTestingModule({});
service = TestBed.inject(GroupService);
});

it('should be created', () => {
expect(service).toBeTruthy();
});
});
11 changes: 11 additions & 0 deletions projects/workflows-creator/src/lib/builder/group/group.service.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import {Injectable} from '@angular/core';
import {NgxPopperjsContentComponent} from 'ngx-popperjs';

@Injectable({
providedIn: 'root',
})
export class GroupService {
public previousPopper?: NgxPopperjsContentComponent;

constructor() {}
}
2 changes: 1 addition & 1 deletion projects/workflows-element/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@
"access": "public",
"directory": "dist"
},
"hash": "90788b80097a03917ae5eb70f77bc7f6b74ac194fe063243573f2f673458f1d8"
"hash": "6c9107a0c33b956a52bc45766ca9fd90ac155cb71a13e718ca394d3f13814207"
}

0 comments on commit c5af844

Please sign in to comment.