Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/pr-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
cache: 'npm'
- run: |
npm ci
npm install rxjs@7.4.0
npm install rxjs@7.5.5
npm run build:packages
build-docs:
needs: build-packages
Expand Down
9,668 changes: 4,074 additions & 5,594 deletions package-lock.json

Large diffs are not rendered by default.

38 changes: 20 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,16 @@
"nebular"
],
"dependencies": {
"@angular/animations": "^21.0.0",
"@angular/cdk": "^21.0.0",
"@angular/common": "^21.0.0",
"@angular/compiler": "^21.0.0",
"@angular/core": "^21.0.0",
"@angular/animations": "^21.1.0",
"@angular/cdk": "^21.1.0",
"@angular/common": "^21.1.0",
"@angular/compiler": "^21.1.0",
"@angular/core": "^21.1.0",
"@angular/fire": "^20.0.1",
"@angular/forms": "^21.0.0",
"@angular/platform-browser": "^21.0.0",
"@angular/platform-browser-dynamic": "^21.0.0",
"@angular/router": "^21.0.0",
"@angular/forms": "^21.1.0",
"@angular/platform-browser": "^21.1.0",
"@angular/platform-browser-dynamic": "^21.1.0",
"@angular/router": "^21.1.0",
"date-fns": "^2.0.0",
"docsearch.js": "^2.5.2",
"eva-icons": "^1.1.3",
Expand All @@ -82,17 +82,17 @@
"normalize.css": "8.0.0",
"pace-js": "^1.0.2",
"rxfire": "^6.0.0",
"rxjs": "^6.5.3 || ^7.4.0",
"rxjs": "^6.5.3 || ^7.5.5",
"tslib": "^2.3.0",
"zone.js": "~0.15.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "^21.0.0",
"@angular-devkit/core": "^21.0.0",
"@angular-devkit/schematics": "^21.0.0",
"@angular/cli": "^21.0.0",
"@angular/compiler-cli": "^21.0.0",
"@angular/language-service": "^21.0.0",
"@angular-devkit/build-angular": "^21.1.0",
"@angular-devkit/core": "^21.1.0",
"@angular-devkit/schematics": "^21.1.0",
"@angular/cli": "^21.1.0",
"@angular/compiler-cli": "^21.1.0",
"@angular/language-service": "^21.1.0",
"@eslint/eslintrc": "^3.1.0",
"@eslint/js": "^9.8.0",
"@schematics/angular": "^21.0.0",
Expand All @@ -104,7 +104,7 @@
"@typescript-eslint/eslint-plugin": "^8.0.0",
"@typescript-eslint/parser": "^8.0.0",
"angular-cli-ghpages": "0.5.0",
"angular-eslint": "~21.0.0",
"angular-eslint": "~21.1.0",
"browserstack-local": "^1.3.7",
"colors.js": "1.2.4",
"conventional-changelog-cli": "1.3.4",
Expand Down Expand Up @@ -145,8 +145,10 @@
"@angular/fire": {
"@angular/common": "$@angular/common",
"@angular/core": "$@angular/core",
"@angular/compiler": "$@angular/compiler",
"@angular/platform-browser": "$@angular/platform-browser",
"@angular/platform-browser-dynamic": "$@angular/platform-browser-dynamic"
"@angular/platform-browser-dynamic": "$@angular/platform-browser-dynamic",
"rxjs": "$rxjs"
}
},
"schematics": "./tools/dev-schematics/dist/collection.json"
Expand Down
16 changes: 6 additions & 10 deletions packages-smoke/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,34 +120,30 @@
}
},
"serve-ssr": {
"builder": "@nguniversal/builders:ssr-dev-server",
"builder": "@angular-devkit/build-angular:ssr-dev-server",
"configurations": {
"development": {
"browserTarget": "packages-smoke:build:development",
"serverTarget": "packages-smoke:server:development"
"buildTarget": "packages-smoke:build:development"
},
"production": {
"browserTarget": "packages-smoke:build:production",
"serverTarget": "packages-smoke:server:production"
"buildTarget": "packages-smoke:build:production"
}
},
"defaultConfiguration": "development"
},
"prerender": {
"builder": "@nguniversal/builders:prerender",
"builder": "@angular-devkit/build-angular:prerender",
"options": {
"routes": [
"/"
]
},
"configurations": {
"production": {
"browserTarget": "packages-smoke:build:production",
"serverTarget": "packages-smoke:server:production"
"buildTarget": "packages-smoke:build:production"
},
"development": {
"browserTarget": "packages-smoke:build:development",
"serverTarget": "packages-smoke:server:development"
"buildTarget": "packages-smoke:build:development"
}
},
"defaultConfiguration": "production"
Expand Down
2 changes: 2 additions & 0 deletions packages-smoke/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
"ng": "ng",
"start": "ng serve",
"build": "ng build",
"build:ssr": "ng build",
"serve:ssr": "node dist/packages-smoke/server/server.mjs",
"watch": "ng build --watch --configuration development",
"test": "ng test",
"lint": "ng lint",
Expand Down
21 changes: 4 additions & 17 deletions src/framework/theme/components/cdk/table/table.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,13 @@ import {
NgModule,
Component,
Optional,
Provider,
SkipSelf,
} from '@angular/core';
import {
CdkTable,
CdkTableModule,
RenderRow,
RowContext,
StickyPositioningListener,
StickyPositioningListener
} from '@angular/cdk/table';
import { _DisposeViewRepeaterStrategy, _VIEW_REPEATER_STRATEGY, _ViewRepeater } from '@angular/cdk/collections';

import { NbBidiModule } from '../bidi/bidi.module';
import { NbDirectionality } from '../bidi/bidi-service';
Expand Down Expand Up @@ -55,17 +51,10 @@ export const NB_TABLE_TEMPLATE = `
<ng-container nbFooterRowOutlet></ng-container>
`;

export const NB_VIEW_REPEATER_STRATEGY = _VIEW_REPEATER_STRATEGY;

export const NB_TABLE_PROVIDERS: Provider[] = [
{ provide: NB_VIEW_REPEATER_STRATEGY, useClass: _DisposeViewRepeaterStrategy },
];

@Component({
selector: 'nb-table-not-implemented',
template: ``,
providers: NB_TABLE_PROVIDERS,
standalone: false
standalone: false,
})
// eslint-disable-next-line @angular-eslint/component-class-suffix
export class NbTable<T> extends CdkTable<T> {
Expand All @@ -77,14 +66,12 @@ export class NbTable<T> extends CdkTable<T> {
dir: NbDirectionality,
@Inject(NB_DOCUMENT) document: any,
platform: NbPlatform,
@Inject(_VIEW_REPEATER_STRATEGY)
protected readonly _viewRepeater: _ViewRepeater<T, RenderRow<T>, RowContext<T>>,
_viewportRuler: NbViewportRulerAdapter,
@Optional() @SkipSelf() @Inject(NB_STICKY_POSITIONING_LISTENER)
protected readonly _stickyPositioningListener: StickyPositioningListener,
) {
super(differs, changeDetectorRef, elementRef, role, dir, document, platform, _viewRepeater,
_viewportRuler, _stickyPositioningListener);
super(differs, changeDetectorRef, elementRef, role, dir, document, platform, _viewportRuler,
_stickyPositioningListener);
}
}

Expand Down
10 changes: 3 additions & 7 deletions src/framework/theme/components/tree-grid/tree-grid.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ import { NbPlatform } from '../cdk/platform/platform-service';
import { NbDirectionality } from '../cdk/bidi/bidi-service';
import {
NB_TABLE_TEMPLATE,
NbTable,
NB_TABLE_PROVIDERS,
NB_VIEW_REPEATER_STRATEGY,
NbTable
} from '../cdk/table/table.module';
import { NB_STICKY_POSITIONING_LISTENER, NbRowContext } from '../cdk/table/type-mappings';
import { NbViewportRulerAdapter } from '../cdk/adapter/viewport-ruler-adapter';
Expand Down Expand Up @@ -145,7 +143,6 @@ import { NbColumnsService } from './tree-grid-columns.service';
{ provide: NB_TREE_GRID, useExisting: NbTreeGridComponent },
{ provide: CDK_TABLE, useExisting: NbTreeGridComponent },
NbColumnsService,
...NB_TABLE_PROVIDERS,
],
standalone: false
})
Expand All @@ -161,13 +158,12 @@ export class NbTreeGridComponent<T> extends NbTable<NbTreeGridPresentationNode<T
@Inject(NB_DOCUMENT) document,
platform: NbPlatform,
@Inject(NB_WINDOW) private window,
@Inject(NB_VIEW_REPEATER_STRATEGY) protected readonly _viewRepeater,
_viewportRuler: NbViewportRulerAdapter,
@Optional() @SkipSelf() @Inject(NB_STICKY_POSITIONING_LISTENER)
protected readonly _stickyPositioningListener,
) {
super(differs, changeDetectorRef, elementRef, role, dir, document, platform, _viewRepeater,
_viewportRuler, _stickyPositioningListener);
super(differs, changeDetectorRef, elementRef, role, dir, document, platform, _viewportRuler,
_stickyPositioningListener);
this.platform = platform;
}

Expand Down
Loading
Loading