From 76d1f00a7d24be517825fc3f4a0852376d67ebd9 Mon Sep 17 00:00:00 2001 From: Mikhail Preyskurantov <5574159+mpreyskurantov@users.noreply.github.com> Date: Fri, 27 Jun 2025 09:50:17 +0300 Subject: [PATCH] Revert "fix: export types were published incorrectly (#29671)" This reverts commit 5513560a413a4143f0a0be936a391f87e8b5a5f4. --- .../src/common/export/excel/index.ts | 2 - .../src/common/export/excel.ts | 2 - .../devextreme-vue/src/common/export/excel.ts | 2 - .../devextreme/js/common/core/events/click.js | 1 - .../js/common/core/events/contextmenu.js | 1 - .../js/common/core/events/dblclick.js | 1 - .../devextreme/js/common/core/events/drag.js | 36 ++++++------- .../devextreme/js/common/core/events/hold.js | 1 - .../devextreme/js/common/core/events/hover.js | 2 - .../js/common/core/events/pointer.js | 8 --- .../js/common/core/events/remove.js | 1 - .../devextreme/js/common/core/events/swipe.js | 3 -- .../js/common/core/events/transform.js | 24 +++------ .../devextreme/js/common/export/excel.d.ts | 22 +------- .../js/common/export/excel.types.d.ts | 33 ------------ packages/devextreme/js/core/element.d.ts | 2 - .../js/core/templates/template.d.ts | 1 - .../devextreme/js/core/utils/deferred.d.ts | 1 - packages/devextreme/js/data/data_source.d.ts | 1 - .../devextreme/js/events/events.types.d.ts | 2 +- packages/devextreme/js/excel_exporter.d.ts | 4 +- .../devextreme/js/excel_exporter.types.d.ts | 44 +++++++++++++--- .../js/exporter/export_load_panel.d.ts | 1 - packages/devextreme/ts/dx.all.d.ts | 52 ++++++++----------- 24 files changed, 84 insertions(+), 163 deletions(-) delete mode 100644 packages/devextreme/js/common/export/excel.types.d.ts diff --git a/packages/devextreme-angular/src/common/export/excel/index.ts b/packages/devextreme-angular/src/common/export/excel/index.ts index 3950dc29547d..22ad01b8501d 100644 --- a/packages/devextreme-angular/src/common/export/excel/index.ts +++ b/packages/devextreme-angular/src/common/export/excel/index.ts @@ -1,6 +1,4 @@ export { - CellAddress, - CellRange, DataGridCell, DataGridExportOptions, exportDataGrid, diff --git a/packages/devextreme-react/src/common/export/excel.ts b/packages/devextreme-react/src/common/export/excel.ts index 694268a72b5e..62583b766d91 100644 --- a/packages/devextreme-react/src/common/export/excel.ts +++ b/packages/devextreme-react/src/common/export/excel.ts @@ -1,6 +1,4 @@ export { - CellAddress, - CellRange, DataGridCell, DataGridExportOptions, exportDataGrid, diff --git a/packages/devextreme-vue/src/common/export/excel.ts b/packages/devextreme-vue/src/common/export/excel.ts index 694268a72b5e..62583b766d91 100644 --- a/packages/devextreme-vue/src/common/export/excel.ts +++ b/packages/devextreme-vue/src/common/export/excel.ts @@ -1,6 +1,4 @@ export { - CellAddress, - CellRange, DataGridCell, DataGridExportOptions, exportDataGrid, diff --git a/packages/devextreme/js/common/core/events/click.js b/packages/devextreme/js/common/core/events/click.js index 15d947b6278a..e8f6d2b71543 100644 --- a/packages/devextreme/js/common/core/events/click.js +++ b/packages/devextreme/js/common/core/events/click.js @@ -3,7 +3,6 @@ * @type eventType * @type_function_param1 event:event * @module events/click - * @hidden */ export * from '../../../__internal/events/m_click'; diff --git a/packages/devextreme/js/common/core/events/contextmenu.js b/packages/devextreme/js/common/core/events/contextmenu.js index 0bd5b4397bb0..fbc7d931c96a 100644 --- a/packages/devextreme/js/common/core/events/contextmenu.js +++ b/packages/devextreme/js/common/core/events/contextmenu.js @@ -3,7 +3,6 @@ * @type eventType * @type_function_param1 event:event * @module events/contextmenu - * @hidden */ export * from '../../../__internal/events/m_contextmenu'; diff --git a/packages/devextreme/js/common/core/events/dblclick.js b/packages/devextreme/js/common/core/events/dblclick.js index ca7608189c3e..756e4fe2e74c 100644 --- a/packages/devextreme/js/common/core/events/dblclick.js +++ b/packages/devextreme/js/common/core/events/dblclick.js @@ -3,7 +3,6 @@ * @type eventType * @type_function_param1 event:event * @module events/dblclick - * @hidden */ // NOTE: The "double_click" module created to overcome adblock issue https://isc.devexpress.com/Thread/WorkplaceDetails/T465804. This file was kept as a fasade not to create a BC. diff --git a/packages/devextreme/js/common/core/events/drag.js b/packages/devextreme/js/common/core/events/drag.js index 2de4f3363f1d..9a3b67fda0ea 100644 --- a/packages/devextreme/js/common/core/events/drag.js +++ b/packages/devextreme/js/common/core/events/drag.js @@ -1,26 +1,23 @@ /** - * @name UI Events.dxdragenter - * @type eventType - * @type_function_param1 event:event - * @type_function_param1_field1 draggingElement:Element - * @module events/drag - * @hidden +* @name UI Events.dxdragenter +* @type eventType +* @type_function_param1 event:event +* @type_function_param1_field1 draggingElement:Element +* @module events/drag */ /** - * @name UI Events.dxdrop - * @type eventType - * @type_function_param1 event:event - * @type_function_param1_field1 draggingElement:Element - * @module events/drag - * @hidden +* @name UI Events.dxdrop +* @type eventType +* @type_function_param1 event:event +* @type_function_param1_field1 draggingElement:Element +* @module events/drag */ /** - * @name UI Events.dxdragleave - * @type eventType - * @type_function_param1 event:event - * @type_function_param1_field1 draggingElement:Element - * @module events/drag - * @hidden +* @name UI Events.dxdragleave +* @type eventType +* @type_function_param1 event:event +* @type_function_param1_field1 draggingElement:Element +* @module events/drag */ /** * @name UI Events.dxdragstart @@ -28,7 +25,6 @@ * @type_function_param1 event:event * @type_function_param1_field1 cancel:boolean * @module events/drag - * @hidden */ /** * @name UI Events.dxdrag @@ -37,7 +33,6 @@ * @type_function_param1_field1 offset:number * @type_function_param1_field2 cancel:boolean * @module events/drag - * @hidden */ /** * @name UI Events.dxdragend @@ -46,6 +41,5 @@ * @type_function_param1_field1 offset:number * @type_function_param1_field2 cancel:boolean * @module events/drag - * @hidden */ export * from '../../../__internal/events/m_drag'; diff --git a/packages/devextreme/js/common/core/events/hold.js b/packages/devextreme/js/common/core/events/hold.js index 8cca4c902eff..f3370e430a6c 100644 --- a/packages/devextreme/js/common/core/events/hold.js +++ b/packages/devextreme/js/common/core/events/hold.js @@ -3,7 +3,6 @@ * @type eventType * @type_function_param1 event:event * @module events/hold - * @hidden */ export { default } from '../../../__internal/events/m_hold'; diff --git a/packages/devextreme/js/common/core/events/hover.js b/packages/devextreme/js/common/core/events/hover.js index 0d2f788a170d..54da4e40155a 100644 --- a/packages/devextreme/js/common/core/events/hover.js +++ b/packages/devextreme/js/common/core/events/hover.js @@ -3,7 +3,6 @@ * @type eventType * @type_function_param1 event:event * @module events/hover - * @hidden */ /** @@ -11,7 +10,6 @@ * @type eventType * @type_function_param1 event:event * @module events/hover - * @hidden */ export * from '../../../__internal/events/m_hover'; diff --git a/packages/devextreme/js/common/core/events/pointer.js b/packages/devextreme/js/common/core/events/pointer.js index b15899862695..6293482e3f40 100644 --- a/packages/devextreme/js/common/core/events/pointer.js +++ b/packages/devextreme/js/common/core/events/pointer.js @@ -4,7 +4,6 @@ * @type_function_param1 event:event * @type_function_param1_field1 pointerType:string * @module events/pointer - * @hidden */ /** * @name UI Events.dxpointermove @@ -12,7 +11,6 @@ * @type_function_param1 event:event * @type_function_param1_field1 pointerType:string * @module events/pointer - * @hidden */ /** * @name UI Events.dxpointerup @@ -20,7 +18,6 @@ * @type_function_param1 event:event * @type_function_param1_field1 pointerType:string * @module events/pointer - * @hidden */ /** * @name UI Events.dxpointercancel @@ -28,7 +25,6 @@ * @type_function_param1 event:event * @type_function_param1_field1 pointerType:string * @module events/pointer - * @hidden */ /** * @name UI Events.dxpointerover @@ -36,7 +32,6 @@ * @type_function_param1 event:event * @type_function_param1_field1 pointerType:string * @module events/pointer - * @hidden */ /** * @name UI Events.dxpointerout @@ -44,7 +39,6 @@ * @type_function_param1 event:event * @type_function_param1_field1 pointerType:string * @module events/pointer - * @hidden */ /** * @name UI Events.dxpointerenter @@ -52,7 +46,6 @@ * @type_function_param1 event:event * @type_function_param1_field1 pointerType:string * @module events/pointer - * @hidden */ /** * @name UI Events.dxpointerleave @@ -60,7 +53,6 @@ * @type_function_param1 event:event * @type_function_param1_field1 pointerType:string * @module events/pointer - * @hidden */ export { default } from '../../../__internal/events/m_pointer'; diff --git a/packages/devextreme/js/common/core/events/remove.js b/packages/devextreme/js/common/core/events/remove.js index cb7c5be55396..8c8d8ad142d9 100644 --- a/packages/devextreme/js/common/core/events/remove.js +++ b/packages/devextreme/js/common/core/events/remove.js @@ -3,7 +3,6 @@ * @type eventType * @type_function_param1 event:event * @module events/remove - * @hidden */ export * from '../../../__internal/events/m_remove'; diff --git a/packages/devextreme/js/common/core/events/swipe.js b/packages/devextreme/js/common/core/events/swipe.js index 4b223b229f83..a65c8d786508 100644 --- a/packages/devextreme/js/common/core/events/swipe.js +++ b/packages/devextreme/js/common/core/events/swipe.js @@ -4,7 +4,6 @@ * @type_function_param1 event:event * @type_function_param1_field1 cancel:boolean * @module events/swipe - * @hidden */ /** * @name UI Events.dxswipe @@ -13,7 +12,6 @@ * @type_function_param1_field1 offset:number * @type_function_param1_field2 cancel:boolean * @module events/swipe - * @hidden */ /** * @name UI Events.dxswipeend @@ -22,7 +20,6 @@ * @type_function_param1_field1 offset:number * @type_function_param1_field2 targetOffset:number * @module events/swipe - * @hidden */ export * from '../../../__internal/events/m_swipe'; diff --git a/packages/devextreme/js/common/core/events/transform.js b/packages/devextreme/js/common/core/events/transform.js index 7082d4242456..a93e6d82b40b 100644 --- a/packages/devextreme/js/common/core/events/transform.js +++ b/packages/devextreme/js/common/core/events/transform.js @@ -6,7 +6,6 @@ import { exportNames } from '../../../__internal/events/m_transform'; * @type_function_param1 event:event * @type_function_param1_field1 cancel:boolean * @module events/transform - * @hidden */ /** * @name UI Events.dxtransform @@ -20,7 +19,6 @@ import { exportNames } from '../../../__internal/events/m_transform'; * @type_function_param1_field6 deltaTranslation:object * @type_function_param1_field7 cancel:boolean * @module events/transform - * @hidden */ /** * @name UI Events.dxtransformend @@ -34,7 +32,6 @@ import { exportNames } from '../../../__internal/events/m_transform'; * @type_function_param1_field6 deltaTranslation:object * @type_function_param1_field7 cancel:boolean * @module events/transform - * @hidden */ /** @@ -43,7 +40,6 @@ import { exportNames } from '../../../__internal/events/m_transform'; * @type_function_param1 event:event * @type_function_param1_field1 cancel:boolean * @module events/transform - * @hidden */ /** * @name UI Events.dxtranslate @@ -53,7 +49,6 @@ import { exportNames } from '../../../__internal/events/m_transform'; * @type_function_param1_field2 deltaTranslation:object * @type_function_param1_field3 cancel:boolean * @module events/transform - * @hidden */ /** * @name UI Events.dxtranslateend @@ -63,17 +58,15 @@ import { exportNames } from '../../../__internal/events/m_transform'; * @type_function_param1_field2 deltaTranslation:object * @type_function_param1_field3 cancel:boolean * @module events/transform - * @hidden */ /** - * @name UI Events.dxpinchstart - * @type eventType - * @type_function_param1 event:event - * @type_function_param1_field1 cancel:boolean - * @module events/transform - * @hidden -*/ +* @name UI Events.dxpinchstart +* @type eventType +* @type_function_param1 event:event +* @type_function_param1_field1 cancel:boolean +* @module events/transform + */ /** * @name UI Events.dxpinch * @type eventType @@ -82,7 +75,6 @@ import { exportNames } from '../../../__internal/events/m_transform'; * @type_function_param1_field2 deltaScale:number * @type_function_param1_field3 cancel:boolean * @module events/transform - * @hidden */ /** * @name UI Events.dxpinchend @@ -92,7 +84,6 @@ import { exportNames } from '../../../__internal/events/m_transform'; * @type_function_param1_field2 deltaScale:number * @type_function_param1_field3 cancel:boolean * @module events/transform - * @hidden */ /** @@ -101,7 +92,6 @@ import { exportNames } from '../../../__internal/events/m_transform'; * @type_function_param1 event:event * @type_function_param1_field1 cancel:boolean * @module events/transform - * @hidden */ /** * @name UI Events.dxrotate @@ -111,7 +101,6 @@ import { exportNames } from '../../../__internal/events/m_transform'; * @type_function_param1_field2 deltaRotation:number * @type_function_param1_field3 cancel:boolean * @module events/transform - * @hidden */ /** * @name UI Events.dxrotateend @@ -121,7 +110,6 @@ import { exportNames } from '../../../__internal/events/m_transform'; * @type_function_param1_field2 deltaRotation:number * @type_function_param1_field3 cancel:boolean * @module events/transform - * @hidden */ /* eslint-disable spellcheck/spell-checker */ diff --git a/packages/devextreme/js/common/export/excel.d.ts b/packages/devextreme/js/common/export/excel.d.ts index d7118702ae42..9f3700adf226 100644 --- a/packages/devextreme/js/common/export/excel.d.ts +++ b/packages/devextreme/js/common/export/excel.d.ts @@ -3,32 +3,12 @@ import dxPivotGrid from '../../ui/pivot_grid'; import dxDataGrid from '../../ui/data_grid'; import { + CellRange, ExcelDataGridCell, ExcelExportBaseOptions, ExcelPivotGridCell, } from '../../excel_exporter.types'; -import type { - CellAddress as CellAddressInternal, - CellRange as CellRangeInternal, -} from './excel.types'; - -/** - * @docid - * @namespace DevExpress.excelExporter - * @type object - * @public - */ -export type CellAddress = CellAddressInternal; - -/** - * @docid - * @namespace DevExpress.excelExporter - * @type object - * @public - */ -export type CellRange = CellRangeInternal; - /** * @public * @namespace DevExpress.common.Export.excel diff --git a/packages/devextreme/js/common/export/excel.types.d.ts b/packages/devextreme/js/common/export/excel.types.d.ts deleted file mode 100644 index 1b1b33c08a57..000000000000 --- a/packages/devextreme/js/common/export/excel.types.d.ts +++ /dev/null @@ -1,33 +0,0 @@ -/** - * @namespace DevExpress.exportInternal - * @type object - */ -export interface CellAddress { - /** - * @docid - * @public - */ - row?: number; - /** - * @docid - * @public - */ - column?: number; -} - -/** -* @namespace DevExpress.exportInternal -* @type object -*/ -export interface CellRange { -/** - * @docid - * @public - */ -from?: CellAddress; -/** - * @docid - * @public - */ -to?: CellAddress; -} diff --git a/packages/devextreme/js/core/element.d.ts b/packages/devextreme/js/core/element.d.ts index 0755fe85cd71..0a4c4d3e8733 100644 --- a/packages/devextreme/js/core/element.d.ts +++ b/packages/devextreme/js/core/element.d.ts @@ -7,14 +7,12 @@ export interface ElementWrapper { } export interface ElementsArrayWrapper { } /** * @docid - * @hidden * @type HTMLElement|SVGElement|JQuery */ export type DxElement = {} extends Condition ? T : ElementWrapper; /** * @docid - * @hidden * @type HTMLElement|SVGElement|JQuery */ export type UserDefinedElement = {} extends Condition ? T : ElementWrapper | T; diff --git a/packages/devextreme/js/core/templates/template.d.ts b/packages/devextreme/js/core/templates/template.d.ts index 60bb12fd2550..b4417396b48c 100644 --- a/packages/devextreme/js/core/templates/template.d.ts +++ b/packages/devextreme/js/core/templates/template.d.ts @@ -4,7 +4,6 @@ export type { /** * @docid - * @hidden * @type object */ export interface dxTemplateOptions { diff --git a/packages/devextreme/js/core/utils/deferred.d.ts b/packages/devextreme/js/core/utils/deferred.d.ts index a8ad09e12560..069420ecc849 100644 --- a/packages/devextreme/js/core/utils/deferred.d.ts +++ b/packages/devextreme/js/core/utils/deferred.d.ts @@ -28,7 +28,6 @@ export interface PromiseType { } /** * @docid * @type Promise - * @hidden * @namespace DevExpress.core.utils */ // eslint-disable-next-line @typescript-eslint/no-invalid-void-type diff --git a/packages/devextreme/js/data/data_source.d.ts b/packages/devextreme/js/data/data_source.d.ts index d0901753b3d1..d80f91ca37fb 100644 --- a/packages/devextreme/js/data/data_source.d.ts +++ b/packages/devextreme/js/data/data_source.d.ts @@ -23,7 +23,6 @@ export type Options< /** * @docid - * @hidden * @type Store|DataSource|DataSourceOptions|string|Array|null */ export type DataSourceLike = diff --git a/packages/devextreme/js/events/events.types.d.ts b/packages/devextreme/js/events/events.types.d.ts index 2e60d15cf5db..fb26232efc89 100644 --- a/packages/devextreme/js/events/events.types.d.ts +++ b/packages/devextreme/js/events/events.types.d.ts @@ -79,7 +79,7 @@ export interface EventType { } /** * @docid * @type EventObject|jQuery.Event - * @hidden + * */ export type DxEvent = {} extends EventType ? (EventObject & TNativeEvent) : EventType; diff --git a/packages/devextreme/js/excel_exporter.d.ts b/packages/devextreme/js/excel_exporter.d.ts index d9bf8c622148..b6974f3910c8 100644 --- a/packages/devextreme/js/excel_exporter.d.ts +++ b/packages/devextreme/js/excel_exporter.d.ts @@ -5,12 +5,12 @@ export { PivotGridExportOptions as ExcelExportPivotGridProps, exportDataGrid, exportPivotGrid, - CellAddress, - CellRange, } from './common/export/excel'; export { ExcelExportBaseOptions as ExcelExportBaseProps, ExcelPivotGridCell, + CellAddress, + CellRange, ExcelDataGridCell, } from './excel_exporter.types'; diff --git a/packages/devextreme/js/excel_exporter.types.d.ts b/packages/devextreme/js/excel_exporter.types.d.ts index 67729eab69d1..3511378b0536 100644 --- a/packages/devextreme/js/excel_exporter.types.d.ts +++ b/packages/devextreme/js/excel_exporter.types.d.ts @@ -1,7 +1,6 @@ import { ExportLoadPanel } from './exporter/export_load_panel'; import { Cell } from './ui/pivot_grid'; import { Column } from './ui/data_grid'; -import { CellAddress, CellRange } from './common/export/excel.types'; /** * @docid @@ -68,6 +67,44 @@ export interface ExcelPivotGridCell extends Cell { headerType?: 'column' | 'row' | 'data' | 'filter'; } +/** + * @docid + * @namespace DevExpress.excelExporter + * @type object + * @public + */ +export interface CellAddress { + /** + * @docid + * @public + */ + row?: number; + /** + * @docid + * @public + */ + column?: number; +} + +/** +* @docid +* @namespace DevExpress.excelExporter +* @type object +* @public +*/ +export interface CellRange { + /** + * @docid + * @public + */ + from?: CellAddress; + /** + * @docid + * @public + */ + to?: CellAddress; +} + /** * @namespace DevExpress.excelExporter * @deprecated Use DataGridCell instead @@ -119,8 +156,3 @@ export interface ExcelDataGridCell { */ value?: any; } - -export { - CellAddress, - CellRange, -}; diff --git a/packages/devextreme/js/exporter/export_load_panel.d.ts b/packages/devextreme/js/exporter/export_load_panel.d.ts index 47f63f9a21df..d6ef042f215a 100644 --- a/packages/devextreme/js/exporter/export_load_panel.d.ts +++ b/packages/devextreme/js/exporter/export_load_panel.d.ts @@ -2,7 +2,6 @@ * @docid * @type object * @namespace DevExpress - * @hidden */ export interface ExportLoadPanel { /** diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts index f8f262b2ab9e..d63f6ef73dbb 100644 --- a/packages/devextreme/ts/dx.all.d.ts +++ b/packages/devextreme/ts/dx.all.d.ts @@ -7687,11 +7687,29 @@ declare module DevExpress.excelExporter { /** * [descr:CellAddress] */ - export type CellAddress = DevExpress.exportInternal.CellAddress; + export interface CellAddress { + /** + * [descr:CellAddress.row] + */ + row?: number; + /** + * [descr:CellAddress.column] + */ + column?: number; + } /** * [descr:CellRange] */ - export type CellRange = DevExpress.exportInternal.CellRange; + export interface CellRange { + /** + * [descr:CellRange.from] + */ + from?: CellAddress; + /** + * [descr:CellRange.to] + */ + to?: CellAddress; + } /** * @deprecated Use DataGridCell instead * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. @@ -7747,7 +7765,7 @@ declare module DevExpress.excelExporter { /** * [descr:ExcelExportBaseOptions.topLeftCell] */ - topLeftCell?: DevExpress.exportInternal.CellAddress | string; + topLeftCell?: CellAddress | string; /** * [descr:ExcelExportBaseOptions.keepColumnWidths] */ @@ -7784,34 +7802,6 @@ declare module DevExpress.excelExporter { headerType?: 'column' | 'row' | 'data' | 'filter'; } } -declare module DevExpress.exportInternal { - /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - export interface CellAddress { - /** - * [descr:CellAddress.row] - */ - row?: number; - /** - * [descr:CellAddress.column] - */ - column?: number; - } - /** - * @deprecated Attention! This type is for internal purposes only. If you used it previously, please submit a ticket to our {@link https://supportcenter.devexpress.com/ticket/create Support Center}. We will check if there is an alternative solution. - */ - export interface CellRange { - /** - * [descr:CellRange.from] - */ - from?: CellAddress; - /** - * [descr:CellRange.to] - */ - to?: CellAddress; - } -} declare module DevExpress.fileManagement { /** * [descr:CustomFileSystemProvider]