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
4 changes: 2 additions & 2 deletions demos/aurelia/src/examples/slickgrid/example19-detail-view.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { AureliaSlickRowDetailView } from '@slickgrid-universal/aurelia-row-detail-plugin';
import type { AureliaRowDetailView } from '@slickgrid-universal/aurelia-row-detail-plugin';
import { bindable } from 'aurelia';
import type { SlickDataView, SlickGrid } from 'aurelia-slickgrid';
import './example19-detail-view.scss';
Expand All @@ -19,7 +19,7 @@ export class Example19DetailView {
@bindable() model!: Item;

// you also have access to the following objects (it must match the exact property names shown below)
@bindable() addon!: AureliaSlickRowDetailView; // row detail addon instance
@bindable() addon!: AureliaRowDetailView; // row detail addon instance
@bindable() grid!: SlickGrid;
@bindable() dataView!: SlickDataView;

Expand Down
4 changes: 2 additions & 2 deletions demos/aurelia/src/examples/slickgrid/example19.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AureliaSlickRowDetailView } from '@slickgrid-universal/aurelia-row-detail-plugin';
import { AureliaRowDetailView } from '@slickgrid-universal/aurelia-row-detail-plugin';
import { bindable } from 'aurelia';
import { Editors, Filters, Formatters, type AureliaGridInstance, type Column, type GridOption } from 'aurelia-slickgrid';
import { ExampleDetailPreload } from './example-detail-preload.js';
Expand Down Expand Up @@ -135,7 +135,7 @@ export class Example19 {
rowTopOffsetRenderType: 'top', // RowDetail and/or RowSpan don't render well with "transform", you should use "top"
darkMode: this._darkMode,
datasetIdPropertyName: 'rowId', // optionally use a different "id"
externalResources: [AureliaSlickRowDetailView],
externalResources: [AureliaRowDetailView],
rowDetailView: {
// optionally change the column index position of the icon (defaults to 0)
// columnIndexPosition: 1,
Expand Down
6 changes: 3 additions & 3 deletions demos/aurelia/src/examples/slickgrid/example45.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { faker } from '@faker-js/faker';
import { AureliaSlickRowDetailView } from '@slickgrid-universal/aurelia-row-detail-plugin';
import { AureliaRowDetailView } from '@slickgrid-universal/aurelia-row-detail-plugin';
import { bindable } from 'aurelia';
import { type AureliaGridInstance, type Column, type GridOption } from 'aurelia-slickgrid';
import { Example45DetailView, type Distributor, type OrderData } from './example45-detail-view.js';
Expand All @@ -22,7 +22,7 @@ export class Example45 {
hideSubTitle = false;

get rowDetailInstance() {
return this.aureliaGrid?.extensionService.getExtensionInstanceByName('rowDetailView') as AureliaSlickRowDetailView;
return this.aureliaGrid?.extensionService.getExtensionInstanceByName('rowDetailView') as AureliaRowDetailView;
}

aureliaGridReady(aureliaGrid: AureliaGridInstance) {
Expand Down Expand Up @@ -102,7 +102,7 @@ export class Example45 {
rowTopOffsetRenderType: 'top', // RowDetail and/or RowSpan don't render well with "transform", you should use "top"
darkMode: this._darkMode,
rowHeight: 33,
externalResources: [AureliaSlickRowDetailView],
externalResources: [AureliaRowDetailView],
rowDetailView: {
process: (item) => this.simulateServerAsyncCall(item),
loadOnce: false, // you can't use loadOnce with inner grid because only HTML template are re-rendered, not JS events
Expand Down
4 changes: 2 additions & 2 deletions demos/aurelia/src/examples/slickgrid/example47-detail-view.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { AureliaSlickRowDetailView } from '@slickgrid-universal/aurelia-row-detail-plugin';
import type { AureliaRowDetailView } from '@slickgrid-universal/aurelia-row-detail-plugin';
import { bindable } from 'aurelia';
import type { SlickDataView, SlickGrid } from 'aurelia-slickgrid';
import { showToast } from './utilities.js';
Expand All @@ -20,7 +20,7 @@ export class Example47DetailView {
@bindable() model!: Item;

// you also have access to the following objects (it must match the exact property names shown below)
@bindable() addon!: AureliaSlickRowDetailView; // row detail addon instance
@bindable() addon!: AureliaRowDetailView; // row detail addon instance
@bindable() grid!: SlickGrid;
@bindable() dataView!: SlickDataView;

Expand Down
4 changes: 2 additions & 2 deletions demos/aurelia/src/examples/slickgrid/example47.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AureliaSlickRowDetailView } from '@slickgrid-universal/aurelia-row-detail-plugin';
import { AureliaRowDetailView } from '@slickgrid-universal/aurelia-row-detail-plugin';
import { bindable } from 'aurelia';
import {
Aggregators,
Expand Down Expand Up @@ -183,7 +183,7 @@ export class Example47 {
enableRowDetailView: true,
rowTopOffsetRenderType: 'top', // RowDetail and/or RowSpan don't render well with "transform", you should use "top"
darkMode: this._darkMode,
externalResources: [AureliaSlickRowDetailView],
externalResources: [AureliaRowDetailView],
rowDetailView: {
// optionally change the column index position of the icon (defaults to 0)
// columnIndexPosition: 1,
Expand Down
6 changes: 3 additions & 3 deletions demos/react/src/examples/slickgrid/Example19.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { type EventPubSubService } from '@slickgrid-universal/event-pub-sub';
import { ReactSlickRowDetailView } from '@slickgrid-universal/react-row-detail-plugin';
import { ReactRowDetailView } from '@slickgrid-universal/react-row-detail-plugin';
import React, { useEffect, useRef, useState } from 'react';
import { Editors, Filters, Formatters, SlickgridReact, type Column, type GridOption, type SlickgridReactInstance } from 'slickgrid-react';
import { ExampleDetailPreload } from './Example-detail-preload.js';
Expand Down Expand Up @@ -32,7 +32,7 @@ const Example19: React.FC = () => {
}, []);

function rowDetailInstance() {
return reactGridRef.current?.extensionService.getExtensionInstanceByName('rowDetailView') as ReactSlickRowDetailView;
return reactGridRef.current?.extensionService.getExtensionInstanceByName('rowDetailView') as ReactRowDetailView;
}

const getColumnsDefinition = (): Column[] => {
Expand Down Expand Up @@ -164,7 +164,7 @@ const Example19: React.FC = () => {
darkMode,
datasetIdPropertyName: 'rowId',
preRegisterExternalExtensions: (pubSubService) => {
const rowDetail = new ReactSlickRowDetailView(pubSubService as EventPubSubService);
const rowDetail = new ReactRowDetailView(pubSubService as EventPubSubService);
return [{ name: 'rowDetailView', instance: rowDetail }];
},
rowDetailView: {
Expand Down
6 changes: 3 additions & 3 deletions demos/react/src/examples/slickgrid/Example45.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { faker } from '@faker-js/faker';
import { type EventPubSubService } from '@slickgrid-universal/event-pub-sub';
import { ReactSlickRowDetailView } from '@slickgrid-universal/react-row-detail-plugin';
import { ReactRowDetailView } from '@slickgrid-universal/react-row-detail-plugin';
import React, { useEffect, useRef, useState } from 'react';
import { SlickgridReact, type Column, type GridOption, type SlickgridReactInstance } from 'slickgrid-react';
import Example45DetailView, { type Distributor, type OrderData } from './Example45-detail-view.js';
Expand Down Expand Up @@ -41,7 +41,7 @@ const Example45: React.FC = () => {
}, [isUsingInnerGridStatePresets]);

function rowDetailInstance() {
return reactGridRef.current?.extensionService.getExtensionInstanceByName('rowDetailView') as ReactSlickRowDetailView;
return reactGridRef.current?.extensionService.getExtensionInstanceByName('rowDetailView') as ReactRowDetailView;
}

function getColumnDefinitions(): Column[] {
Expand Down Expand Up @@ -158,7 +158,7 @@ const Example45: React.FC = () => {
rowHeight: 33,
darkMode,
preRegisterExternalExtensions: (pubSubService) => {
const rowDetail = new ReactSlickRowDetailView(pubSubService as EventPubSubService);
const rowDetail = new ReactRowDetailView(pubSubService as EventPubSubService);
return [{ name: 'rowDetailView', instance: rowDetail }];
},
rowDetailView: {
Expand Down
6 changes: 3 additions & 3 deletions demos/react/src/examples/slickgrid/Example47.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { type EventPubSubService } from '@slickgrid-universal/event-pub-sub';
import { ReactSlickRowDetailView } from '@slickgrid-universal/react-row-detail-plugin';
import { ReactRowDetailView } from '@slickgrid-universal/react-row-detail-plugin';
import React, { useEffect, useRef, useState } from 'react';
import {
Aggregators,
Expand Down Expand Up @@ -60,7 +60,7 @@ const Example47: React.FC = () => {
}

function rowDetailInstance() {
return reactGridRef.current?.extensionService.getExtensionInstanceByName(ExtensionName.rowDetailView) as ReactSlickRowDetailView;
return reactGridRef.current?.extensionService.getExtensionInstanceByName(ExtensionName.rowDetailView) as ReactRowDetailView;
}

const getColumnsDefinition = (): Column<Item>[] => {
Expand Down Expand Up @@ -200,7 +200,7 @@ const Example47: React.FC = () => {
rowTopOffsetRenderType: 'top', // RowDetail and/or RowSpan don't render well with "transform", you should use "top"
darkMode,
preRegisterExternalExtensions: (pubSubService) => {
const rowDetail = new ReactSlickRowDetailView(pubSubService as EventPubSubService);
const rowDetail = new ReactRowDetailView(pubSubService as EventPubSubService);
return [{ name: 'rowDetailView', instance: rowDetail }];
},
rowDetailView: {
Expand Down
4 changes: 2 additions & 2 deletions demos/vue/src/components/Example19.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { VueSlickRowDetailView } from '@slickgrid-universal/vue-row-detail-plugin';
import { VueRowDetailView } from '@slickgrid-universal/vue-row-detail-plugin';
import { Editors, Filters, Formatters, SlickgridVue, type Column, type GridOption, type SlickgridVueInstance } from 'slickgrid-vue';
import { computed, onBeforeMount, onUnmounted, ref, type Ref } from 'vue';
import Example19Detail from './Example19Detail.vue';
Expand Down Expand Up @@ -121,7 +121,7 @@ function defineGrid() {
rowTopOffsetRenderType: 'top', // RowDetail and/or RowSpan don't render well with "transform", you should use "top"
darkMode: isDarkMode.value,
datasetIdPropertyName: 'rowId', // optionally use a different "id"
externalResources: [VueSlickRowDetailView],
externalResources: [VueRowDetailView],
rowDetailView: {
// optionally change the column index position of the icon (defaults to 0)
// columnIndexPosition: 1,
Expand Down
6 changes: 3 additions & 3 deletions demos/vue/src/components/Example45.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script setup lang="ts">
import { faker } from '@faker-js/faker';
import { VueSlickRowDetailView } from '@slickgrid-universal/vue-row-detail-plugin';
import { VueRowDetailView } from '@slickgrid-universal/vue-row-detail-plugin';
import { SlickgridVue, type Column, type GridOption, type SlickgridVueInstance } from 'slickgrid-vue';
import { computed, onBeforeMount, onUnmounted, ref, type Ref } from 'vue';
import Example45Detail, { type Distributor, type OrderData } from './Example45Detail.vue';
Expand All @@ -19,7 +19,7 @@ const showSubTitle = ref(true);
const serverWaitDelay = ref(FAKE_SERVER_DELAY); // server simulation with default of 250ms but 50ms for Cypress tests
let vueGrid!: SlickgridVueInstance;

const rowDetailInstance = computed(() => vueGrid?.extensionService.getExtensionInstanceByName('rowDetailView') as VueSlickRowDetailView);
const rowDetailInstance = computed(() => vueGrid?.extensionService.getExtensionInstanceByName('rowDetailView') as VueRowDetailView);

onBeforeMount(() => {
defineGrid();
Expand Down Expand Up @@ -95,7 +95,7 @@ function defineGrid() {
enableRowDetailView: true,
rowTopOffsetRenderType: 'top', // RowDetail and/or RowSpan don't render well with "transform", you should use "top"
rowHeight: 33,
externalResources: [VueSlickRowDetailView],
externalResources: [VueRowDetailView],
rowDetailView: {
process: (item: any) => simulateServerAsyncCall(item),
loadOnce: false, // you can't use loadOnce with inner grid because only HTML template are re-rendered, not JS events
Expand Down
4 changes: 2 additions & 2 deletions demos/vue/src/components/Example47.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { VueSlickRowDetailView } from '@slickgrid-universal/vue-row-detail-plugin';
import { VueRowDetailView } from '@slickgrid-universal/vue-row-detail-plugin';
import {
Aggregators,
Editors,
Expand Down Expand Up @@ -157,7 +157,7 @@ function defineGrid() {
enableRowDetailView: true,
rowTopOffsetRenderType: 'top', // RowDetail and/or RowSpan don't render well with "transform", you should use "top"
darkMode: isDarkMode.value,
externalResources: [VueSlickRowDetailView],
externalResources: [VueRowDetailView],
rowDetailView: {
// We can load the "process" asynchronously in 2 different ways (Fetch OR Promise)
process: (item: any) => simulateServerAsyncCall(item),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import type { EventPubSubService } from '@slickgrid-universal/event-pub-sub';
import { SlickRowDetailView as UniversalSlickRowDetailView } from '@slickgrid-universal/row-detail-view-plugin';
import { type AngularUtilService, type GridOption } from 'angular-slickgrid';
import { Observable, type Subject } from 'rxjs';
import type { RowDetailView } from './interfaces';
import type { RowDetailView } from './interfaces.js';

const ROW_DETAIL_CONTAINER_PREFIX = 'container_';
const PRELOAD_CONTAINER_PREFIX = 'container_loading';
Expand All @@ -30,8 +30,8 @@ export interface CreatedView {
rendered?: boolean;
}

export class AngularSlickRowDetailView extends UniversalSlickRowDetailView {
static readonly pluginName = 'AngularSlickRowDetailView';
export class AngularRowDetailView extends UniversalSlickRowDetailView {
static readonly pluginName = 'AngularRowDetailView';
rowDetailContainer!: ViewContainerRef;
protected _preloadComponent: Type<object> | undefined;
protected _preloadCompRef?: ComponentRef<any>;
Expand Down Expand Up @@ -89,7 +89,7 @@ export class AngularSlickRowDetailView extends UniversalSlickRowDetailView {
}

/** Get the instance of the SlickGrid addon (control or plugin). */
getAddonInstance(): AngularSlickRowDetailView | null {
getAddonInstance(): AngularRowDetailView | null {
return this;
}

Expand All @@ -103,7 +103,7 @@ export class AngularSlickRowDetailView extends UniversalSlickRowDetailView {
* Create the plugin before the Grid creation, else it will behave oddly.
* Mostly because the column definitions might change after the grid creation
*/
register(rowSelectionPlugin?: SelectionModel): AngularSlickRowDetailView {
register(rowSelectionPlugin?: SelectionModel): AngularRowDetailView {
if (typeof this.gridOptions.rowDetailView?.process === 'function') {
// we need to keep the user "process" method and replace it with our own execution method
// we do this because when we get the item detail, we need to call "onAsyncResponse.notify" for the plugin to work
Expand Down
2 changes: 1 addition & 1 deletion frameworks-plugins/angular-row-detail-plugin/src/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export * from './angularSlickRowDetailView';
export * from './angularRowDetailView.js';
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ const ROW_DETAIL_CONTAINER_PREFIX = 'container_';
const PRELOAD_CONTAINER_PREFIX = 'container_loading';

@transient()
export class AureliaSlickRowDetailView extends UniversalSlickRowDetailView {
static readonly pluginName = 'AureliaSlickRowDetailView';
export class AureliaRowDetailView extends UniversalSlickRowDetailView {
static readonly pluginName = 'AureliaRowDetailView';
protected _preloadViewModel?: Constructable;
protected _preloadController?: ICustomElementController;
protected _slots: CreatedView[] = [];
Expand Down Expand Up @@ -72,7 +72,7 @@ export class AureliaSlickRowDetailView extends UniversalSlickRowDetailView {
}

/** Get the instance of the SlickGrid addon (control or plugin). */
getAddonInstance(): AureliaSlickRowDetailView | null {
getAddonInstance(): AureliaRowDetailView | null {
return this;
}

Expand Down
2 changes: 1 addition & 1 deletion frameworks-plugins/aurelia-row-detail-plugin/src/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export * from './aureliaSlickRowDetailView.js';
export * from './aureliaRowDetailView.js';
2 changes: 1 addition & 1 deletion frameworks-plugins/react-row-detail-plugin/src/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export * from './reactSlickRowDetailView.js';
export * from './reactRowDetailView.js';
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ export interface CreatedView {
rendered?: boolean;
}

export class ReactSlickRowDetailView extends UniversalSlickRowDetailView {
static readonly pluginName = 'ReactSlickRowDetailView';
export class ReactRowDetailView extends UniversalSlickRowDetailView {
static readonly pluginName = 'ReactRowDetailView';
protected _component?: any;
protected _preloadComponent?: any;
protected _preloadRoot?: Root;
Expand Down Expand Up @@ -75,7 +75,7 @@ export class ReactSlickRowDetailView extends UniversalSlickRowDetailView {
}

/** Get the instance of the SlickGrid addon (control or plugin). */
getAddonInstance(): ReactSlickRowDetailView | null {
getAddonInstance(): ReactRowDetailView | null {
return this;
}

Expand Down
2 changes: 1 addition & 1 deletion frameworks-plugins/vue-row-detail-plugin/src/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export * from './vueSlickRowDetailView.js';
export * from './vueRowDetailView.js';
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ export interface CreatedView {
instance: ComponentPublicInstance | null;
}

export class VueSlickRowDetailView extends UniversalSlickRowDetailView {
static readonly pluginName = 'VueSlickRowDetailView';
export class VueRowDetailView extends UniversalSlickRowDetailView {
static readonly pluginName = 'VueRowDetailView';
protected _component?: any;
protected _preloadComponent?: any;
protected _preloadApp?: App<Element>;
Expand Down Expand Up @@ -86,7 +86,7 @@ export class VueSlickRowDetailView extends UniversalSlickRowDetailView {
}

/** Get the instance of the SlickGrid addon (control or plugin). */
getAddonInstance(): VueSlickRowDetailView | null {
getAddonInstance(): VueRowDetailView | null {
return this;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ A Row Detail allows you to open a detail panel which can contain extra and/or mo

##### Component
```ts
import { AngularSlickRowDetailView } from '@slickgrid-universal/angular-row-detail-plugin'; // for v10 and above
import { AngularRowDetailView } from '@slickgrid-universal/angular-row-detail-plugin'; // for v10 and above

@Component({
templateUrl: './grid-rowdetail.component.html'
Expand All @@ -66,7 +66,7 @@ export class GridRowDetailComponent implements OnInit, OnDestroy {
selectionOptions: {
selectActiveRow: true
},
externalResources: [AngularSlickRowDetailView], // for v10 and above
externalResources: [AngularRowDetailView], // for v10 and above
rowDetailView: {
// We can load the "process" asynchronously in 2 different ways (httpClient OR even Promise)
process: (item) => this.http.get(`api/item/${item.id}`),
Expand Down Expand Up @@ -401,7 +401,7 @@ Main Grid Component

```ts
import { Component, OnInit, ViewEncapsulation } from '@angular/core';
import { AngularSlickRowDetailView } from '@slickgrid-universal/angular-row-detail-plugin'; // for v10 and above
import { AngularRowDetailView } from '@slickgrid-universal/angular-row-detail-plugin'; // for v10 and above
import { AngularGridInstance, Column, GridOption, GridState } from 'angular-slickgrid';

@Component({
Expand Down Expand Up @@ -436,7 +436,7 @@ export class MainGridComponent implements OnInit {
selectionOptions: {
selectActiveRow: true
},
externalResources: [AngularSlickRowDetailView], // for v10 and above
externalResources: [AngularRowDetailView], // for v10 and above
rowDetailView: {
process: (item: any) => simulateServerAsyncCall(item),
loadOnce: false, // IMPORTANT, you can't use loadOnce with inner grid because only HTML template are re-rendered, not JS events
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ _following changes should be transparent to most users, I'm just listing them in
Since I don't think that Row Detail is being used by everyone, I'm making it an optional plugin (package). This should help decrease build size quite a bit for users who never use it. If however you are one of them using it, then you now need to manually add it as an external resource.

```diff
+ import { AngularSlickRowDetailView } from '@slickgrid-universal/angular-row-detail-plugin';
+ import { AngularRowDetailView } from '@slickgrid-universal/angular-row-detail-plugin';

export class Example {
defineGrid() {
this.gridOptions = {
enableRowDetailView: true,
+ externalResources: [AngularSlickRowDetailView],
+ externalResources: [AngularRowDetailView],
rowDetailView: {
// ...
}
Expand Down
Loading
Loading