Skip to content

fix /angular circular dependencies #2962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 25, 2025
Merged

fix /angular circular dependencies #2962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion angular/projects/lib/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
* Public API Surface of gridstack-angular
*/

export * from './lib/types';
export * from './lib/base-widget';
export * from './lib/gridstack-item.component';
export * from './lib/gridstack.component';
export * from './lib/base-widget';
export * from './lib/gridstack.module';
2 changes: 1 addition & 1 deletion angular/projects/lib/src/lib/base-widget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*/

import { Injectable } from '@angular/core';
import { NgCompInputs, NgGridStackWidget } from './gridstack.component';
import { NgCompInputs, NgGridStackWidget } from './types';

@Injectable()
export abstract class BaseWidget {
Expand Down
22 changes: 2 additions & 20 deletions angular/projects/lib/src/lib/gridstack.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,16 @@ import { NgIf } from '@angular/common';
import { Subscription } from 'rxjs';
import { GridHTMLElement, GridItemHTMLElement, GridStack, GridStackNode, GridStackOptions, GridStackWidget } from 'gridstack';

import { GridItemCompHTMLElement, GridstackItemComponent } from './gridstack-item.component';
import { NgGridStackNode, NgGridStackWidget } from './types';
import { BaseWidget } from './base-widget';
import { GridItemCompHTMLElement, GridstackItemComponent } from './gridstack-item.component';

/** events handlers emitters signature for different events */
export type eventCB = {event: Event};
export type elementCB = {event: Event, el: GridItemHTMLElement};
export type nodesCB = {event: Event, nodes: GridStackNode[]};
export type droppedCB = {event: Event, previousNode: GridStackNode, newNode: GridStackNode};

export type NgCompInputs = {[key: string]: any};

/** extends to store Ng Component selector, instead/inAddition to content */
export interface NgGridStackWidget extends GridStackWidget {
/** Angular tag selector for this component to create at runtime */
selector?: string;
/** serialized data for the component input fields */
input?: NgCompInputs;
/** nested grid options */
subGridOpts?: NgGridStackOptions;
}
export interface NgGridStackNode extends GridStackNode {
selector?: string; // component type to create as content
}
export interface NgGridStackOptions extends GridStackOptions {
children?: NgGridStackWidget[];
subGridOpts?: NgGridStackOptions;
}

/** store element to Ng Class pointer back */
export interface GridCompHTMLElement extends GridHTMLElement {
_gridComp?: GridstackComponent;
Expand Down
6 changes: 3 additions & 3 deletions angular/projects/lib/src/lib/gridstack.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@

import { NgModule } from "@angular/core";

import { GridstackComponent } from "./gridstack.component";
import { GridstackItemComponent } from "./gridstack-item.component";
import { GridstackComponent } from "./gridstack.component";

// @deprecated use GridstackComponent and GridstackItemComponent as standalone components
@NgModule({
imports: [
GridstackComponent,
GridstackItemComponent,
GridstackComponent,
],
exports: [
GridstackComponent,
GridstackItemComponent,
GridstackComponent,
],
})
export class GridstackModule {}
27 changes: 27 additions & 0 deletions angular/projects/lib/src/lib/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/**
* gridstack-item.component.ts 11.3.0-dev
* Copyright (c) 2025 Alain Dumesny - see GridStack root license
*/

import { GridStackNode, GridStackOptions, GridStackWidget } from "gridstack";

/** extends to store Ng Component selector, instead/inAddition to content */
export interface NgGridStackWidget extends GridStackWidget {
/** Angular tag selector for this component to create at runtime */
selector?: string;
/** serialized data for the component input fields */
input?: NgCompInputs;
/** nested grid options */
subGridOpts?: NgGridStackOptions;
}

export interface NgGridStackNode extends GridStackNode {
selector?: string; // component type to create as content
}

export interface NgGridStackOptions extends GridStackOptions {
children?: NgGridStackWidget[];
subGridOpts?: NgGridStackOptions;
}

export type NgCompInputs = {[key: string]: any};
1 change: 1 addition & 0 deletions doc/CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ Change log
## 11.3.0-dev (TBD)
* fix: [#2921](https://github.com/gridstack/gridstack.js/pull/2921) replace initMouseEvent with MouseEvent constructor and added composed: true
* fix: [#2939](https://github.com/gridstack/gridstack.js/issues/2939) custom drag handle not working with LazyLoad
* fix: [#2955](https://github.com/gridstack/gridstack.js/issues/2955) angular circular dependency

## 11.3.0 (2025-01-26)
* feat: added `isIgnoreChangeCB()` if changeCB should be ignored due to column change, sizeToContent, loading, etc...
Expand Down