Merge pull request #80 from RBTech-dev/develop

fix: fixate regressioni

Author: GiuseppePennisi

.github/workflows/pr_on_master.yml

@@ -28,15 +28,12 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
+          cache: 'npm'
 
       # Make sure we have all branches
       - name: Fetch other branches
         run: git fetch --no-tags --prune --depth=5 origin master
 
-        # https://github.com/marketplace/actions/npm-install-cache
-      - uses: c-hive/gha-npm-cache@v1
-        if: ${{ !env.ACT }}
-
       - uses: nrwl/nx-set-shas@v3
         with:
           main-branch-name: 'master'

.github/workflows/publish.yml

@@ -28,10 +28,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org/
-
-      # https://github.com/marketplace/actions/npm-install-cache
-      - uses: c-hive/gha-npm-cache@v1
-        if: ${{ !env.ACT }}
+          cache: 'npm'
 
       - name: Set variables
         run: |

apps/winbox-example-app/src/app/app.component.html

@@ -1,2 +1,8 @@
 <rbtech-sidebar [menu]="menu"></rbtech-sidebar>
+<button
+  style="position: fixed; right: 0; top: 0"
+  (click)="winboxService.closeAllWinBoxes()"
+>
+  CHIUDI TUTTE LE SCHEDE
+</button>
 <router-outlet></router-outlet>

apps/winbox-example-app/src/app/app.component.ts

@@ -93,7 +93,7 @@ export class AppComponent implements OnInit {
   };
 
   constructor(
-    private winboxService: WinboxService,
+    protected winboxService: WinboxService,
     private modalService: NgbModal
   ) {}
 

packages/angular-winbox/src/lib/winbox.service.ts

@@ -59,12 +59,11 @@ export class WinboxService {
     const optionsClose = options.onclose;
     winBox.onclose = (force) => {
       if (force) {
-        return this.destroyComponent(componentRef, winBox);
+        return this.destroyComponent<ComponentInstance>(componentRef, winBox);
       }
-
       const isCloseConfirmed = optionsClose?.apply(winBox, [force]);
-      if (isCloseConfirmed) {
-        return this.destroyComponent(componentRef, winBox);
+      if (isCloseConfirmed || !optionsClose) {
+        return this.destroyComponent<ComponentInstance>(componentRef, winBox);
       }
       return true;
     };
@@ -80,7 +79,7 @@ export class WinboxService {
 
   public closeAllWinBoxes() {
     for (const winBox of this.winBoxStack) {
-      winBox.close();
+      winBox.close(true);
     }
     this.winBoxStack = [];
     this.isThereAWinBox = false;
@@ -102,8 +101,8 @@ export class WinboxService {
     this.winBoxStack.find((winbox) => winbox.id === id)?.maximize(state);
   }
 
-  private destroyComponent(
-    componentRef: ComponentRef<any>,
+  private destroyComponent<ComponentInstance>(
+    componentRef: ComponentRef<ComponentInstance>,
     winBox: WinBox
   ): boolean {
     componentRef.destroy();