diff --git a/apps/angular/package.json b/apps/angular/package.json index 7475db83a5a3..1245317d1eb8 100644 --- a/apps/angular/package.json +++ b/apps/angular/package.json @@ -23,7 +23,7 @@ "zone.js": "0.14.10" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.8", + "@angular-devkit/build-angular": "17.3.11", "@angular/cli": "17.3.11", "@angular/language-service": "17.3.12", "@angular/platform-server": "17.3.12", diff --git a/apps/demos/Demos/Chat/AIAndChatbotIntegration/Angular/app/app.component.css b/apps/demos/Demos/Chat/AIAndChatbotIntegration/Angular/app/app.component.css new file mode 100644 index 000000000000..eab5cdc6e206 --- /dev/null +++ b/apps/demos/Demos/Chat/AIAndChatbotIntegration/Angular/app/app.component.css @@ -0,0 +1,65 @@ +.demo-container { + display: flex; + justify-content: center; +} + +::ng-deep .dx-chat { + max-width: 900px; +} + +::ng-deep .dx-chat-messagelist-empty-image { + display: none; +} + +::ng-deep .dx-chat-messagelist-empty-message { + font-size: var(--dx-font-size-heading-5); +} + +::ng-deep .dx-chat-messagebubble-content, +::ng-deep .dx-chat-messagebubble-text { + display: flex; + flex-direction: column; +} + +::ng-deep .dx-bubble-button-container { + display: none; +} + +::ng-deep .dx-button { + display: inline-block; + color: var(--dx-color-icon); +} + +::ng-deep .dx-chat-messagegroup-alignment-start:last-child .dx-chat-messagebubble:last-child .dx-bubble-button-container { + display: flex; + gap: 4px; + margin-top: 8px; +} + +::ng-deep .dx-template-wrapper > div > p:first-child { + margin-top: 0; +} + +::ng-deep .dx-template-wrapper > div > p:last-child { + margin-bottom: 0; +} + +::ng-deep .dx-chat-messagebubble-content ol, +::ng-deep .dx-chat-messagebubble-content ul { + white-space: normal; +} + +::ng-deep .dx-chat-messagebubble-content h1, +::ng-deep .dx-chat-messagebubble-content h2, +::ng-deep .dx-chat-messagebubble-content h3, +::ng-deep .dx-chat-messagebubble-content h4, +::ng-deep .dx-chat-messagebubble-content h5, +::ng-deep .dx-chat-messagebubble-content h6 { + font-size: revert; + font-weight: revert; +} + +::ng-deep .dx-chat-disabled .dx-chat-messagebox { + opacity: 0.5; + pointer-events: none; +} diff --git a/apps/demos/Demos/Chat/AIAndChatbotIntegration/Angular/app/app.component.html b/apps/demos/Demos/Chat/AIAndChatbotIntegration/Angular/app/app.component.html new file mode 100644 index 000000000000..6895eefd74a5 --- /dev/null +++ b/apps/demos/Demos/Chat/AIAndChatbotIntegration/Angular/app/app.component.html @@ -0,0 +1,44 @@ +
+ +
+ + {{ regenerationText }} + + +
+
+
+ + + + +
+ +
+ +
diff --git a/apps/demos/Demos/Chat/AIAndChatbotIntegration/Angular/app/app.component.ts b/apps/demos/Demos/Chat/AIAndChatbotIntegration/Angular/app/app.component.ts new file mode 100644 index 000000000000..dcb678531d0b --- /dev/null +++ b/apps/demos/Demos/Chat/AIAndChatbotIntegration/Angular/app/app.component.ts @@ -0,0 +1,120 @@ +import { NgModule, Component, enableProdMode } from '@angular/core'; +import { BrowserModule } from '@angular/platform-browser'; +import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; + +import { DxChatModule } from 'devextreme-angular'; +import { DxButtonModule } from 'devextreme-angular'; +import { + User, + Alert, + Message, + MessageEnteredEvent +} from 'devextreme/ui/chat'; +import { Observable } from 'rxjs'; +import { AppService } from './app.service'; +import { loadMessages } from 'devextreme/localization'; +import { DataSource } from 'devextreme/common/data'; + +if (!/localhost/.test(document.location.host)) { + enableProdMode(); +} + +let modulePrefix = ''; +// @ts-ignore +if (window && window.config.packageConfigPaths) { + modulePrefix = '/app'; +} + +@Component({ + selector: 'demo-app', + templateUrl: `.${modulePrefix}/app.component.html`, + styleUrls: [`.${modulePrefix}/app.component.css`], +}) +export class AppComponent { + dataSource: DataSource; + + user: User; + + typingUsers$: Observable; + + alerts$: Observable; + + regenerationText: string; + + copyButtonIcon: string; + + isDisabled: boolean; + + constructor(private readonly appService: AppService) { + loadMessages(this.appService.getDictionary()); + + this.dataSource = this.appService.dataSource; + this.user = this.appService.user; + this.alerts$ = this.appService.alerts$; + this.typingUsers$ = this.appService.typingUsers$; + this.regenerationText = this.appService.REGENERATION_TEXT; + this.copyButtonIcon = 'copy'; + this.isDisabled = false; + } + + convertToHtml(message: Message): string { + return this.appService.convertToHtml(message.text); + } + + toggleDisabledState(disabled: boolean, event = undefined) { + this.isDisabled = disabled; + + if (disabled) { + event?.target.blur(); + } else { + event?.target.focus(); + } + }; + + async onMessageEntered(e: MessageEnteredEvent) { + if (!this.appService.alerts.length) { + this.toggleDisabledState(true, e.event); + } + + try { + await this.appService.onMessageEntered(e); + } finally { + this.toggleDisabledState(false, e.event); + } + } + + onCopyButtonClick(message: Message) { + navigator.clipboard?.writeText(message.text); + + this.copyButtonIcon = 'check'; + + setTimeout(() => { + this.copyButtonIcon = 'copy'; + }, 2500); + } + + async onRegenerateButtonClick() { + this.appService.updateLastMessage(); + this.toggleDisabledState(true); + + try { + await this.appService.regenerate(); + } finally { + this.toggleDisabledState(false); + } + } +} + +@NgModule({ + imports: [ + BrowserModule, + DxChatModule, + DxButtonModule, + ], + declarations: [AppComponent], + bootstrap: [AppComponent], + providers: [AppService], +}) +export class AppModule { } + +platformBrowserDynamic().bootstrapModule(AppModule); diff --git a/apps/demos/Demos/Chat/AIAndChatbotIntegration/Angular/app/app.service.ts b/apps/demos/Demos/Chat/AIAndChatbotIntegration/Angular/app/app.service.ts new file mode 100644 index 000000000000..463e986e9edc --- /dev/null +++ b/apps/demos/Demos/Chat/AIAndChatbotIntegration/Angular/app/app.service.ts @@ -0,0 +1,204 @@ +import { Injectable } from '@angular/core'; +import { Observable, BehaviorSubject } from 'rxjs'; +import { AzureOpenAI } from 'openai'; +import { unified } from 'unified'; +import remarkParse from 'remark-parse'; +import remarkRehype from 'remark-rehype'; +import rehypeStringify from 'rehype-stringify'; +import { + User, + Alert, + MessageEnteredEvent +} from 'devextreme/ui/chat'; +import { DataSource, CustomStore } from 'devextreme/common/data'; + +@Injectable({ + providedIn: 'root', +}) + +export class AppService { + chatService: AzureOpenAI; + + AzureOpenAIConfig = { + dangerouslyAllowBrowser: true, + deployment: 'gpt-4o-mini', + apiVersion: '2024-02-01', + endpoint: 'https://public-api.devexpress.com/demo-openai', + apiKey: 'DEMO', + } + + REGENERATION_TEXT = 'Regeneration...'; + ALERT_TIMEOUT = 1000 * 60; + + user: User = { + id: 'user', + }; + + assistant: User = { + id: 'assistant', + name: 'Virtual Assistant', + }; + + store: any[] = []; + messages: any[] = []; + alerts: Alert[] = []; + + customStore: CustomStore; + + dataSource: DataSource; + + typingUsersSubject: BehaviorSubject = new BehaviorSubject([]); + + alertsSubject: BehaviorSubject = new BehaviorSubject([]); + + constructor() { + this.chatService = new AzureOpenAI(this.AzureOpenAIConfig); + this.initDataSource() + this.typingUsersSubject.next([]); + this.alertsSubject.next([]); + } + + get typingUsers$(): Observable { + return this.typingUsersSubject.asObservable(); + } + + get alerts$(): Observable { + return this.alertsSubject.asObservable(); + } + + getDictionary() { + return { + en: { + 'dxChat-emptyListMessage': 'Chat is Empty', + 'dxChat-emptyListPrompt': 'AI Assistant is ready to answer your questions.', + 'dxChat-textareaPlaceholder': 'Ask AI Assistant...', + } + } + } + + initDataSource() { + this.customStore = new CustomStore({ + key: 'id', + load: () => { + return new Promise((resolve) => { + setTimeout(() => { + resolve([...this.store]); + }, 0); + }); + }, + insert: (message) => { + return new Promise((resolve) => { + setTimeout(() => { + this.store.push(message); + resolve(message); + }); + }); + }, + }); + + this.dataSource = new DataSource({ + store: this.customStore, + paginate: false, + }); + } + + async getAIResponse(messages) { + const params = { + messages, + max_tokens: 1000, + temperature: 0.7, + }; + + const response = await this.chatService.chat.completions.create(params); + const data = { choices: response.choices }; + + return data.choices[0].message?.content; + } + + async processMessageSending(message, event) { + this.messages.push({ role: 'user', content: message.text }); + this.typingUsersSubject.next([this.assistant]); + + try { + const aiResponse = await this.getAIResponse(this.messages); + + setTimeout(() => { + this.typingUsersSubject.next([]); + this.messages.push({ role: 'assistant', content: aiResponse }); + this.renderAssistantMessage(aiResponse); + }, 200); + } catch { + this.typingUsersSubject.next([]); + this.messages.pop(); + this.alertLimitReached(); + } + } + + updateLastMessage(text = this.REGENERATION_TEXT) { + const items = this.dataSource.items(); + const lastMessage = items.at(-1); + + this.dataSource.store().push([{ + type: 'update', + key: lastMessage.id, + data: { text }, + }]); + } + + renderAssistantMessage(text: string) { + const message = { + id: Date.now(), + timestamp: new Date(), + author: this.assistant, + text, + }; + + this.dataSource.store().push([{ type: 'insert', data: message }]); + } + + alertLimitReached() { + this.setAlerts([{ + message: 'Request limit reached, try again in a minute.' + }]); + + setTimeout(() => { + this.setAlerts([]); + }, this.ALERT_TIMEOUT); + } + + setAlerts(alerts: Alert[]) { + this.alerts = alerts; + this.alertsSubject.next(alerts); + } + + async regenerate() { + try { + const aiResponse = await this.getAIResponse(this.messages.slice(0, -1)); + + this.updateLastMessage(aiResponse); + this.messages.at(-1).content = aiResponse; + } catch { + this.updateLastMessage(this.messages.at(-1).content); + this.alertLimitReached(); + } + } + + convertToHtml(value: string) { + const result = unified() + .use(remarkParse) + .use(remarkRehype) + .use(rehypeStringify) + .processSync(value) + .toString(); + + return result; + } + + async onMessageEntered({ message, event }: MessageEnteredEvent) { + this.dataSource.store().push([{ type: 'insert', data: { id: Date.now(), ...message } }]); + + if (!this.alerts.length) { + await this.processMessageSending(message, event); + } + } +} diff --git a/apps/demos/Demos/Chat/AIAndChatbotIntegration/Angular/index.html b/apps/demos/Demos/Chat/AIAndChatbotIntegration/Angular/index.html new file mode 100644 index 000000000000..1ab1fb54a1df --- /dev/null +++ b/apps/demos/Demos/Chat/AIAndChatbotIntegration/Angular/index.html @@ -0,0 +1,26 @@ + + + + DevExtreme Demo + + + + + + + + + + + + + + + +
+ Loading... +
+ + diff --git a/apps/demos/Demos/Chat/AIAndChatbotIntegration/React/App.tsx b/apps/demos/Demos/Chat/AIAndChatbotIntegration/React/App.tsx new file mode 100644 index 000000000000..4cba5ee4f435 --- /dev/null +++ b/apps/demos/Demos/Chat/AIAndChatbotIntegration/React/App.tsx @@ -0,0 +1,182 @@ +import React, { useState } from 'react'; +import Chat, { ChatTypes } from 'devextreme-react/chat'; +import { AzureOpenAI } from 'openai'; +import { MessageEnteredEvent } from 'devextreme/ui/chat'; +import CustomStore from 'devextreme/data/custom_store'; +import DataSource from 'devextreme/data/data_source'; +import { loadMessages } from 'devextreme/localization'; +import { + user, + assistant, + AzureOpenAIConfig, + REGENERATION_TEXT, + CHAT_DISABLED_CLASS, + ALERT_TIMEOUT +} from './data.ts'; +import Message from './Message.tsx'; + +const store = []; +const messages = []; + +loadMessages({ + en: { + 'dxChat-emptyListMessage': 'Chat is Empty', + 'dxChat-emptyListPrompt': 'AI Assistant is ready to answer your questions.', + 'dxChat-textareaPlaceholder': 'Ask AI Assistant...', + }, +}); + +const chatService = new AzureOpenAI(AzureOpenAIConfig); + +async function getAIResponse(messages) { + const params = { + messages, + max_tokens: 1000, + temperature: 0.7, + }; + + const response = await chatService.chat.completions.create(params); + const data = { choices: response.choices }; + + return data.choices[0].message?.content; +} + +function updateLastMessage(text = REGENERATION_TEXT) { + const items = dataSource.items(); + const lastMessage = items.at(-1); + + dataSource.store().push([{ + type: 'update', + key: lastMessage.id, + data: { text }, + }]); +} + +function renderAssistantMessage(text) { + const message = { + id: Date.now(), + timestamp: new Date(), + author: assistant, + text, + }; + + dataSource.store().push([{ type: 'insert', data: message }]); +} + +const customStore = new CustomStore({ + key: 'id', + load: () => { + return new Promise((resolve) => { + setTimeout(() => { + resolve([...store]); + }, 0); + }); + }, + insert: (message) => { + return new Promise((resolve) => { + setTimeout(() => { + store.push(message); + resolve(message); + }); + }); + }, +}); + +const dataSource = new DataSource({ + store: customStore, + paginate: false, +}) + +export default function App() { + const [alerts, setAlerts] = useState([]); + const [typingUsers, setTypingUsers] = useState([]); + const [classList, setClassList] = useState(''); + + function alertLimitReached() { + setAlerts([{ + message: 'Request limit reached, try again in a minute.' + }]); + + setTimeout(() => { + setAlerts([]); + }, ALERT_TIMEOUT); + } + + function toggleDisabledState(disabled: boolean, event = undefined) { + setClassList(disabled ? CHAT_DISABLED_CLASS : ''); + + if (disabled) { + event?.target.blur(); + } else { + event?.target.focus(); + } + }; + + async function processMessageSending(message, event) { + toggleDisabledState(true, event); + + messages.push({ role: 'user', content: message.text }); + setTypingUsers([assistant]); + + try { + const aiResponse = await getAIResponse(messages); + + setTimeout(() => { + setTypingUsers([]); + messages.push({ role: 'assistant', content: aiResponse }); + renderAssistantMessage(aiResponse); + }, 200); + } catch { + setTypingUsers([]); + messages.pop(); + alertLimitReached(); + } finally { + toggleDisabledState(false, event); + } + } + + async function regenerate() { + toggleDisabledState(true); + + try { + const aiResponse = await getAIResponse(messages.slice(0, -1)); + + updateLastMessage(aiResponse); + messages.at(-1).content = aiResponse; + } catch { + updateLastMessage(messages.at(-1).content); + alertLimitReached(); + } finally { + toggleDisabledState(false); + } + } + + function onMessageEntered({ message, event }: MessageEnteredEvent) { + dataSource.store().push([{ type: 'insert', data: { id: Date.now(), ...message } }]); + + if (!alerts.length) { + processMessageSending(message, event); + } + } + + function onRegenerateButtonClick() { + updateLastMessage(); + regenerate(); + } + + return ( + Message(data, onRegenerateButtonClick)} + /> + ); +} diff --git a/apps/demos/Demos/Chat/AIAndChatbotIntegration/React/Message.tsx b/apps/demos/Demos/Chat/AIAndChatbotIntegration/React/Message.tsx new file mode 100644 index 000000000000..262cffe611e9 --- /dev/null +++ b/apps/demos/Demos/Chat/AIAndChatbotIntegration/React/Message.tsx @@ -0,0 +1,63 @@ +import React, { useState } from 'react'; +import Button from 'devextreme-react/button'; +import { unified } from 'unified'; +import remarkParse from 'remark-parse'; +import remarkRehype from 'remark-rehype'; +import rehypeStringify from 'rehype-stringify'; +import HTMLReactParser from 'html-react-parser'; + +import { REGENERATION_TEXT } from './data.ts'; + +function convertToHtml(value: string) { + const result = unified() + .use(remarkParse) + .use(remarkRehype) + .use(rehypeStringify) + .processSync(value) + .toString(); + + return result; +} + +function Message({ message }, onRegenerateButtonClick) { + const [icon, setIcon] = useState('copy'); + + if (message.text === REGENERATION_TEXT) { + return {REGENERATION_TEXT}; + } + + function onCopyButtonClick() { + navigator.clipboard?.writeText(message.text); + setIcon('check'); + + setTimeout(() => { + setIcon('copy'); + }, 2500); + } + + return ( + +
+ {HTMLReactParser(convertToHtml(message.text))} +
+
+
+ + ) +} + +export default Message; diff --git a/apps/demos/Demos/Chat/AIAndChatbotIntegration/React/data.ts b/apps/demos/Demos/Chat/AIAndChatbotIntegration/React/data.ts new file mode 100644 index 000000000000..d758d604cb0e --- /dev/null +++ b/apps/demos/Demos/Chat/AIAndChatbotIntegration/React/data.ts @@ -0,0 +1,22 @@ +import { ChatTypes } from 'devextreme-react/chat'; + +export const AzureOpenAIConfig = { + dangerouslyAllowBrowser: true, + deployment: 'gpt-4o-mini', + apiVersion: '2024-02-01', + endpoint: 'https://public-api.devexpress.com/demo-openai', + apiKey: 'DEMO', +} + +export const REGENERATION_TEXT = 'Regeneration...'; +export const CHAT_DISABLED_CLASS = 'dx-chat-disabled'; +export const ALERT_TIMEOUT = 1000 * 60; + +export const user: ChatTypes.User = { + id: 'user', +}; + +export const assistant: ChatTypes.User = { + id: 'assistant', + name: 'Virtual Assistant', +}; diff --git a/apps/demos/Demos/Chat/AIAndChatbotIntegration/React/index.html b/apps/demos/Demos/Chat/AIAndChatbotIntegration/React/index.html new file mode 100644 index 000000000000..ee451f8288ff --- /dev/null +++ b/apps/demos/Demos/Chat/AIAndChatbotIntegration/React/index.html @@ -0,0 +1,24 @@ + + + + DevExtreme Demo + + + + + + + + + + + + + +
+
+
+ + diff --git a/apps/demos/Demos/Chat/AIAndChatbotIntegration/React/index.tsx b/apps/demos/Demos/Chat/AIAndChatbotIntegration/React/index.tsx new file mode 100644 index 000000000000..8acbec4b6179 --- /dev/null +++ b/apps/demos/Demos/Chat/AIAndChatbotIntegration/React/index.tsx @@ -0,0 +1,9 @@ +import React from 'react'; +import ReactDOM from 'react-dom'; + +import App from './App.tsx'; + +ReactDOM.render( + , + document.getElementById('app'), +); diff --git a/apps/demos/Demos/Chat/AIAndChatbotIntegration/React/styles.css b/apps/demos/Demos/Chat/AIAndChatbotIntegration/React/styles.css new file mode 100644 index 000000000000..320a5354463e --- /dev/null +++ b/apps/demos/Demos/Chat/AIAndChatbotIntegration/React/styles.css @@ -0,0 +1,65 @@ +#app { + display: flex; + justify-content: center; +} + +.dx-chat { + max-width: 900px; +} + +.dx-chat-messagelist-empty-image { + display: none; +} + +.dx-chat-messagelist-empty-message { + font-size: var(--dx-font-size-heading-5); +} + +.dx-chat-messagebubble-content, +.dx-chat-messagebubble-text { + display: flex; + flex-direction: column; +} + +.dx-bubble-button-container { + display: none; +} + +.dx-button { + display: inline-block; + color: var(--dx-color-icon); +} + +.dx-chat-messagegroup-alignment-start:last-child .dx-chat-messagebubble:last-child .dx-bubble-button-container { + display: flex; + gap: 4px; + margin-top: 8px; +} + +.dx-chat-messagebubble-content > div > p:first-child { + margin-top: 0; +} + +.dx-chat-messagebubble-content > div > p:last-child { + margin-bottom: 0; +} + +.dx-chat-messagebubble-content ol, +.dx-chat-messagebubble-content ul { + white-space: normal; +} + +.dx-chat-messagebubble-content h1, +.dx-chat-messagebubble-content h2, +.dx-chat-messagebubble-content h3, +.dx-chat-messagebubble-content h4, +.dx-chat-messagebubble-content h5, +.dx-chat-messagebubble-content h6 { + font-size: revert; + font-weight: revert; +} + +.dx-chat-disabled .dx-chat-messagebox { + opacity: 0.5; + pointer-events: none; +} diff --git a/apps/demos/Demos/Chat/AIAndChatbotIntegration/ReactJs/App.js b/apps/demos/Demos/Chat/AIAndChatbotIntegration/ReactJs/App.js new file mode 100644 index 000000000000..8f898bb238c3 --- /dev/null +++ b/apps/demos/Demos/Chat/AIAndChatbotIntegration/ReactJs/App.js @@ -0,0 +1,181 @@ +import React, { useState } from 'react'; +import Chat from 'devextreme-react/chat'; +import { AzureOpenAI } from 'openai'; +import CustomStore from 'devextreme/data/custom_store'; +import DataSource from 'devextreme/data/data_source'; +import { loadMessages } from 'devextreme/localization'; +import { + user, + assistant, + AzureOpenAIConfig, + REGENERATION_TEXT, + CHAT_DISABLED_CLASS, + ALERT_TIMEOUT +} from './data.js'; +import Message from './Message.js'; + +const store = []; +const messages = []; + +loadMessages({ + en: { + 'dxChat-emptyListMessage': 'Chat is Empty', + 'dxChat-emptyListPrompt': 'AI Assistant is ready to answer your questions.', + 'dxChat-textareaPlaceholder': 'Ask AI Assistant...', + }, +}); + +const chatService = new AzureOpenAI(AzureOpenAIConfig); + +async function getAIResponse(messages) { + const params = { + messages, + max_tokens: 1000, + temperature: 0.7, + }; + + const response = await chatService.chat.completions.create(params); + const data = { choices: response.choices }; + + return data.choices[0].message?.content; +} + +function updateLastMessage(text = REGENERATION_TEXT) { + const items = dataSource.items(); + const lastMessage = items.at(-1); + + dataSource.store().push([{ + type: 'update', + key: lastMessage.id, + data: { text }, + }]); +} + +function renderAssistantMessage(text) { + const message = { + id: Date.now(), + timestamp: new Date(), + author: assistant, + text, + }; + + dataSource.store().push([{ type: 'insert', data: message }]); +} + +const customStore = new CustomStore({ + key: 'id', + load: () => { + return new Promise((resolve) => { + setTimeout(() => { + resolve([...store]); + }, 0); + }); + }, + insert: (message) => { + return new Promise((resolve) => { + setTimeout(() => { + store.push(message); + resolve(message); + }); + }); + }, +}); + +const dataSource = new DataSource({ + store: customStore, + paginate: false, +}) + +export default function App() { + const [alerts, setAlerts] = useState([]); + const [typingUsers, setTypingUsers] = useState([]); + const [classList, setClassList] = useState(''); + + function alertLimitReached() { + setAlerts([{ + message: 'Request limit reached, try again in a minute.' + }]); + + setTimeout(() => { + setAlerts([]); + }, ALERT_TIMEOUT); + } + + function toggleDisabledState(disabled, event = undefined) { + setClassList(disabled ? CHAT_DISABLED_CLASS : ''); + + if (disabled) { + event?.target.blur(); + } else { + event?.target.focus(); + } + }; + + async function processMessageSending(message, event) { + toggleDisabledState(true, event); + + messages.push({ role: 'user', content: message.text }); + setTypingUsers([assistant]); + + try { + const aiResponse = await getAIResponse(messages); + + setTimeout(() => { + setTypingUsers([]); + messages.push({ role: 'assistant', content: aiResponse }); + renderAssistantMessage(aiResponse); + }, 200); + } catch { + setTypingUsers([]); + messages.pop(); + alertLimitReached(); + } finally { + toggleDisabledState(false, event); + } + } + + async function regenerate() { + toggleDisabledState(true); + + try { + const aiResponse = await getAIResponse(messages.slice(0, -1)); + + updateLastMessage(aiResponse); + messages.at(-1).content = aiResponse; + } catch { + updateLastMessage(messages.at(-1).content); + alertLimitReached(); + } finally { + toggleDisabledState(false); + } + } + + function onMessageEntered({ message, event }) { + dataSource.store().push([{ type: 'insert', data: { id: Date.now(), ...message } }]); + + if (!alerts.length) { + processMessageSending(message, event); + } + } + + function onRegenerateButtonClick() { + updateLastMessage(); + regenerate(); + } + + return ( + Message(data, onRegenerateButtonClick)} + /> + ); +} diff --git a/apps/demos/Demos/Chat/AIAndChatbotIntegration/ReactJs/Message.js b/apps/demos/Demos/Chat/AIAndChatbotIntegration/ReactJs/Message.js new file mode 100644 index 000000000000..0a2f46d82af2 --- /dev/null +++ b/apps/demos/Demos/Chat/AIAndChatbotIntegration/ReactJs/Message.js @@ -0,0 +1,63 @@ +import React, { useState } from 'react'; +import Button from 'devextreme-react/button'; +import { unified } from 'unified'; +import remarkParse from 'remark-parse'; +import remarkRehype from 'remark-rehype'; +import rehypeStringify from 'rehype-stringify'; +import HTMLReactParser from 'html-react-parser'; + +import { REGENERATION_TEXT } from './data.js'; + +function convertToHtml(value) { + const result = unified() + .use(remarkParse) + .use(remarkRehype) + .use(rehypeStringify) + .processSync(value) + .toString(); + + return result; +} + +function Message({ message }, onRegenerateButtonClick) { + const [icon, setIcon] = useState('copy'); + + if (message.text === REGENERATION_TEXT) { + return {REGENERATION_TEXT}; + } + + function onCopyButtonClick() { + navigator.clipboard?.writeText(message.text); + setIcon('check'); + + setTimeout(() => { + setIcon('copy'); + }, 2500); + } + + return ( + +
+ {HTMLReactParser(convertToHtml(message.text))} +
+
+
+ + ) +} + +export default Message; diff --git a/apps/demos/Demos/Chat/AIAndChatbotIntegration/ReactJs/data.js b/apps/demos/Demos/Chat/AIAndChatbotIntegration/ReactJs/data.js new file mode 100644 index 000000000000..3a66e2b837f0 --- /dev/null +++ b/apps/demos/Demos/Chat/AIAndChatbotIntegration/ReactJs/data.js @@ -0,0 +1,20 @@ +export const AzureOpenAIConfig = { + dangerouslyAllowBrowser: true, + deployment: 'gpt-4o-mini', + apiVersion: '2024-02-01', + endpoint: 'https://public-api.devexpress.com/demo-openai', + apiKey: 'DEMO', +} + +export const REGENERATION_TEXT = 'Regeneration...'; +export const CHAT_DISABLED_CLASS = 'dx-chat-disabled'; +export const ALERT_TIMEOUT = 1000 * 60; + +export const user = { + id: 'user', +}; + +export const assistant = { + id: 'assistant', + name: 'Virtual Assistant', +}; diff --git a/apps/demos/Demos/Chat/AIAndChatbotIntegration/ReactJs/index.html b/apps/demos/Demos/Chat/AIAndChatbotIntegration/ReactJs/index.html new file mode 100644 index 000000000000..db31b0fd60c6 --- /dev/null +++ b/apps/demos/Demos/Chat/AIAndChatbotIntegration/ReactJs/index.html @@ -0,0 +1,44 @@ + + + + DevExtreme Demo + + + + + + + + + + + + + +
+
+
+ + diff --git a/apps/demos/Demos/Chat/AIAndChatbotIntegration/ReactJs/index.js b/apps/demos/Demos/Chat/AIAndChatbotIntegration/ReactJs/index.js new file mode 100644 index 000000000000..d9d7442ce766 --- /dev/null +++ b/apps/demos/Demos/Chat/AIAndChatbotIntegration/ReactJs/index.js @@ -0,0 +1,9 @@ +import React from 'react'; +import ReactDOM from 'react-dom'; + +import App from './App.js'; + +ReactDOM.render( + , + document.getElementById('app'), +); diff --git a/apps/demos/Demos/Chat/AIAndChatbotIntegration/ReactJs/styles.css b/apps/demos/Demos/Chat/AIAndChatbotIntegration/ReactJs/styles.css new file mode 100644 index 000000000000..320a5354463e --- /dev/null +++ b/apps/demos/Demos/Chat/AIAndChatbotIntegration/ReactJs/styles.css @@ -0,0 +1,65 @@ +#app { + display: flex; + justify-content: center; +} + +.dx-chat { + max-width: 900px; +} + +.dx-chat-messagelist-empty-image { + display: none; +} + +.dx-chat-messagelist-empty-message { + font-size: var(--dx-font-size-heading-5); +} + +.dx-chat-messagebubble-content, +.dx-chat-messagebubble-text { + display: flex; + flex-direction: column; +} + +.dx-bubble-button-container { + display: none; +} + +.dx-button { + display: inline-block; + color: var(--dx-color-icon); +} + +.dx-chat-messagegroup-alignment-start:last-child .dx-chat-messagebubble:last-child .dx-bubble-button-container { + display: flex; + gap: 4px; + margin-top: 8px; +} + +.dx-chat-messagebubble-content > div > p:first-child { + margin-top: 0; +} + +.dx-chat-messagebubble-content > div > p:last-child { + margin-bottom: 0; +} + +.dx-chat-messagebubble-content ol, +.dx-chat-messagebubble-content ul { + white-space: normal; +} + +.dx-chat-messagebubble-content h1, +.dx-chat-messagebubble-content h2, +.dx-chat-messagebubble-content h3, +.dx-chat-messagebubble-content h4, +.dx-chat-messagebubble-content h5, +.dx-chat-messagebubble-content h6 { + font-size: revert; + font-weight: revert; +} + +.dx-chat-disabled .dx-chat-messagebox { + opacity: 0.5; + pointer-events: none; +} diff --git a/apps/demos/Demos/Chat/AIAndChatbotIntegration/Vue/App.vue b/apps/demos/Demos/Chat/AIAndChatbotIntegration/Vue/App.vue new file mode 100644 index 000000000000..7d79c37f6389 --- /dev/null +++ b/apps/demos/Demos/Chat/AIAndChatbotIntegration/Vue/App.vue @@ -0,0 +1,267 @@ + + + + + diff --git a/apps/demos/Demos/Chat/AIAndChatbotIntegration/Vue/data.ts b/apps/demos/Demos/Chat/AIAndChatbotIntegration/Vue/data.ts new file mode 100644 index 000000000000..c4a995f167f1 --- /dev/null +++ b/apps/demos/Demos/Chat/AIAndChatbotIntegration/Vue/data.ts @@ -0,0 +1,74 @@ +import CustomStore from "devextreme/data/custom_store"; +import DataSource from "devextreme/data/data_source"; +import { unified } from 'unified'; +import remarkParse from 'remark-parse'; +import remarkRehype from 'remark-rehype'; +import rehypeStringify from 'rehype-stringify'; + +export const dictionary = { + en: { + 'dxChat-emptyListMessage': 'Chat is Empty', + 'dxChat-emptyListPrompt': 'AI Assistant is ready to answer your questions.', + 'dxChat-textareaPlaceholder': 'Ask AI Assistant...', + }, +} + +export const AzureOpenAIConfig = { + dangerouslyAllowBrowser: true, + deployment: 'gpt-4o-mini', + apiVersion: '2024-02-01', + endpoint: 'https://public-api.devexpress.com/demo-openai', + apiKey: 'DEMO', +} + +export const REGENERATION_TEXT = 'Regeneration...'; +export const CHAT_DISABLED_CLASS = 'dx-chat-disabled'; +export const ALERT_TIMEOUT = 1000 * 60; + +export const user = { + id: 'c94c0e76-fb49-4b9b-8f07-9f93ed93b4f3', + name: 'John Doe', +}; + +export const assistant = { + id: 'assistant', + name: 'Virtual Assistant', +}; + +export const store = []; +export const messages = []; + +const customStore = new CustomStore({ + key: 'id', + load: () => { + return new Promise((resolve) => { + setTimeout(() => { + resolve([...store]); + }, 0); + }); + }, + insert: (message) => { + return new Promise((resolve) => { + setTimeout(() => { + store.push(message); + resolve(message); + }); + }); + }, +}); + +export const dataSource = new DataSource({ + store: customStore, + paginate: false, +}) + +export function convertToHtml(value: string) { + const result = unified() + .use(remarkParse) + .use(remarkRehype) + .use(rehypeStringify) + .processSync(value) + .toString(); + + return result; +} diff --git a/apps/demos/Demos/Chat/AIAndChatbotIntegration/Vue/index.html b/apps/demos/Demos/Chat/AIAndChatbotIntegration/Vue/index.html new file mode 100644 index 000000000000..2413f2254bf1 --- /dev/null +++ b/apps/demos/Demos/Chat/AIAndChatbotIntegration/Vue/index.html @@ -0,0 +1,29 @@ + + + + DevExtreme Demo + + + + + + + + + + + + + + +
+
+
+ + diff --git a/apps/demos/Demos/Chat/AIAndChatbotIntegration/Vue/index.ts b/apps/demos/Demos/Chat/AIAndChatbotIntegration/Vue/index.ts new file mode 100644 index 000000000000..684d04215d72 --- /dev/null +++ b/apps/demos/Demos/Chat/AIAndChatbotIntegration/Vue/index.ts @@ -0,0 +1,4 @@ +import { createApp } from 'vue'; +import App from './App.vue'; + +createApp(App).mount('#app'); diff --git a/apps/demos/Demos/Chat/AIAndChatbotIntegration/description.md b/apps/demos/Demos/Chat/AIAndChatbotIntegration/description.md index 67c1bba41e26..a7e914317678 100644 --- a/apps/demos/Demos/Chat/AIAndChatbotIntegration/description.md +++ b/apps/demos/Demos/Chat/AIAndChatbotIntegration/description.md @@ -1 +1,18 @@ -Chat is an interactive interface that allows users to send and receive messages in real time. +This demo uses an [Azure OpenAI](https://azure.microsoft.com/en-us/products/ai-services/openai-service) service and the DevExtreme Chat component to create a chatbot UI. You can integrate Chat with various AI services, including [OpenAI](https://openai.com/), [Google Dialogflow](https://cloud.google.com/dialogflow/docs), and [Microsoft Bot Framework](https://dev.botframework.com/). + +## Handling dataSource (reloadOnChange: false) + +The Chat component's [dataSource](/Documentation/ApiReference/UI_Components/dxChat/Configuration/#dataSource) is a [CustomStore](/Documentation/ApiReference/Data_Layer/CustomStore/) that implements its own load and insert functions. The Chat deactivates [reloadOnChange](/Documentation/ApiReference/UI_Components/dxChat/Configuration/#reloadOnChange) to push updates directly into the store and update the conversation manually. See the [onMessageEntered](/Documentation/ApiReference/UI_Components/dxChat/Configuration/#onMessageEntered) event handler and the `processMessageSending` function to review the code that manages data transfer between the Chat and its data store. + + +## Custom Message Template + +The Chat specifies a [messageTemplate](/Documentation/ApiReference/UI_Components/dxChat/Configuration/#messageTemplate) that displays "Copy" and "Regenerate" buttons in bot messages. + +## Response Format Conversion: Markdown to HTML + +The AI model outputs responses in Markdown, while the Chat requires HTML output. This example uses the [unified](https://github.com/unifiedjs) plugin library to convert response content. Review `convertToHtml` function code for implementation details. + +## Default Caption Customization + +The Chat component in this demo displays modified captions when the conversation is empty. The demo uses [localization](/Documentation/Guide/Common/Localization/) techniques to alter built-in text. \ No newline at end of file diff --git a/apps/demos/Demos/Chat/Customization/React/index.html b/apps/demos/Demos/Chat/Customization/React/index.html index e90d25ad8798..ee451f8288ff 100644 --- a/apps/demos/Demos/Chat/Customization/React/index.html +++ b/apps/demos/Demos/Chat/Customization/React/index.html @@ -17,7 +17,7 @@ -
+
diff --git a/apps/demos/Demos/Chat/Customization/ReactJs/index.html b/apps/demos/Demos/Chat/Customization/ReactJs/index.html index c9ee055d50a5..db31b0fd60c6 100644 --- a/apps/demos/Demos/Chat/Customization/ReactJs/index.html +++ b/apps/demos/Demos/Chat/Customization/ReactJs/index.html @@ -37,7 +37,7 @@ -
+
diff --git a/apps/demos/Demos/DataGrid/FixedAndStickyColumns/description.md b/apps/demos/Demos/DataGrid/FixedAndStickyColumns/description.md index 19b882579083..33e1bbc0b9f0 100644 --- a/apps/demos/Demos/DataGrid/FixedAndStickyColumns/description.md +++ b/apps/demos/Demos/DataGrid/FixedAndStickyColumns/description.md @@ -10,6 +10,6 @@ The column is fixed to the right edge of the grid. - *'sticky'* The column sticks to left and right edges when it reaches them. - -To fix or unfix a column, users should right-click the column's header and select the corresponding operation in the context menu. To prevent users from fixing or unfixing a column, set its [allowFixing](/Documentation/ApiReference/UI_Components/dxDataGrid/Configuration/columns/#allowFixing) property to `false`. \ No newline at end of file +To fix or unfix a column, users should right-click the column's header and select the corresponding operation in the context menu. To prevent users from fixing or unfixing a column, set its [allowFixing](/Documentation/ApiReference/UI_Components/dxDataGrid/Configuration/columns/#allowFixing) property to `false`. + \ No newline at end of file diff --git a/apps/demos/Demos/Pagination/Overview/description.md b/apps/demos/Demos/Pagination/Overview/description.md index ada1cc79830e..e334bd8d669b 100644 --- a/apps/demos/Demos/Pagination/Overview/description.md +++ b/apps/demos/Demos/Pagination/Overview/description.md @@ -1,4 +1,4 @@ -DevExpress Pagination UI component allows users to navigate between pages and adjust page size at runtime. The Pagination component in this demo allows users to browse employee cards. +DevExpress Pagination UI component allows users to navigate between pages and adjust page size at runtime. In this demo, users can browse employee cards with the Pagination component. To set up a Pagination component, specify the following options: diff --git a/apps/demos/Demos/Scheduler/Overview/Angular/app/app.component.css b/apps/demos/Demos/Scheduler/Overview/Angular/app/app.component.css index a4c619487f71..3c13932a2a05 100644 --- a/apps/demos/Demos/Scheduler/Overview/Angular/app/app.component.css +++ b/apps/demos/Demos/Scheduler/Overview/Angular/app/app.component.css @@ -3,6 +3,10 @@ position: relative; } +::ng-deep .dx-scheduler-group-header-content { + padding-left: 8px; +} + ::ng-deep .dx-color-scheme-light, ::ng-deep .dx-color-scheme-carmine, ::ng-deep .dx-color-scheme-softblue, @@ -50,7 +54,8 @@ color: var(--text-color-1); } -::ng-deep .dx-scheduler-work-space-month .dx-scheduler-appointment { +::ng-deep .dx-scheduler-work-space-month .dx-scheduler-appointment, +::ng-deep .dx-scheduler-work-space-month .dx-scheduler-appointment.dx-state-focused { color: var(--text-color-2); line-height: 22px; } diff --git a/apps/demos/Demos/Scheduler/Overview/React/styles.css b/apps/demos/Demos/Scheduler/Overview/React/styles.css index 1f104cd1c477..97f1dab526a7 100644 --- a/apps/demos/Demos/Scheduler/Overview/React/styles.css +++ b/apps/demos/Demos/Scheduler/Overview/React/styles.css @@ -3,6 +3,10 @@ position: relative; } +.dx-scheduler-group-header-content { + padding-left: 8px; +} + .dx-color-scheme-light, .dx-color-scheme-carmine, .dx-color-scheme-softblue, @@ -50,7 +54,8 @@ color: var(--text-color-1); } -.dx-scheduler-work-space-month .dx-scheduler-appointment { +.dx-scheduler-work-space-month .dx-scheduler-appointment, +.dx-scheduler-work-space-month .dx-scheduler-appointment.dx-state-focused { color: var(--text-color-2); line-height: 22px; } diff --git a/apps/demos/Demos/Scheduler/Overview/ReactJs/styles.css b/apps/demos/Demos/Scheduler/Overview/ReactJs/styles.css index 1f104cd1c477..97f1dab526a7 100644 --- a/apps/demos/Demos/Scheduler/Overview/ReactJs/styles.css +++ b/apps/demos/Demos/Scheduler/Overview/ReactJs/styles.css @@ -3,6 +3,10 @@ position: relative; } +.dx-scheduler-group-header-content { + padding-left: 8px; +} + .dx-color-scheme-light, .dx-color-scheme-carmine, .dx-color-scheme-softblue, @@ -50,7 +54,8 @@ color: var(--text-color-1); } -.dx-scheduler-work-space-month .dx-scheduler-appointment { +.dx-scheduler-work-space-month .dx-scheduler-appointment, +.dx-scheduler-work-space-month .dx-scheduler-appointment.dx-state-focused { color: var(--text-color-2); line-height: 22px; } diff --git a/apps/demos/Demos/Scheduler/Overview/Vue/App.vue b/apps/demos/Demos/Scheduler/Overview/Vue/App.vue index 2bcfe477aed7..226fce3440e2 100644 --- a/apps/demos/Demos/Scheduler/Overview/Vue/App.vue +++ b/apps/demos/Demos/Scheduler/Overview/Vue/App.vue @@ -51,6 +51,10 @@ const dataSource = data; position: relative; } +.dx-scheduler-group-header-content { + padding-left: 8px; +} + .dx-color-scheme-light, .dx-color-scheme-carmine, .dx-color-scheme-softblue, @@ -98,7 +102,8 @@ const dataSource = data; color: var(--text-color-1); } -.dx-scheduler-work-space-month .dx-scheduler-appointment { +.dx-scheduler-work-space-month .dx-scheduler-appointment, +.dx-scheduler-work-space-month .dx-scheduler-appointment.dx-state-focused { color: var(--text-color-2); line-height: 22px; } diff --git a/apps/demos/Demos/Scheduler/Overview/jQuery/styles.css b/apps/demos/Demos/Scheduler/Overview/jQuery/styles.css index 1f104cd1c477..97f1dab526a7 100644 --- a/apps/demos/Demos/Scheduler/Overview/jQuery/styles.css +++ b/apps/demos/Demos/Scheduler/Overview/jQuery/styles.css @@ -3,6 +3,10 @@ position: relative; } +.dx-scheduler-group-header-content { + padding-left: 8px; +} + .dx-color-scheme-light, .dx-color-scheme-carmine, .dx-color-scheme-softblue, @@ -50,7 +54,8 @@ color: var(--text-color-1); } -.dx-scheduler-work-space-month .dx-scheduler-appointment { +.dx-scheduler-work-space-month .dx-scheduler-appointment, +.dx-scheduler-work-space-month .dx-scheduler-appointment.dx-state-focused { color: var(--text-color-2); line-height: 22px; } diff --git a/apps/demos/Demos/SelectBox/GroupedItems/Angular/app/app.component.css b/apps/demos/Demos/SelectBox/GroupedItems/Angular/app/app.component.css index 61138f2a6bf1..7038173143d2 100644 --- a/apps/demos/Demos/SelectBox/GroupedItems/Angular/app/app.component.css +++ b/apps/demos/Demos/SelectBox/GroupedItems/Angular/app/app.component.css @@ -1,5 +1,9 @@ ::ng-deep .custom-icon .icon { - font-size: 17px; color: #f05b41; - margin-right: 2px; +} + +::ng-deep .custom-icon { + display: flex; + align-items: center; + gap: 4px; } diff --git a/apps/demos/Demos/SelectBox/GroupedItems/React/styles.css b/apps/demos/Demos/SelectBox/GroupedItems/React/styles.css index 437d26328ad2..63ce2320c355 100644 --- a/apps/demos/Demos/SelectBox/GroupedItems/React/styles.css +++ b/apps/demos/Demos/SelectBox/GroupedItems/React/styles.css @@ -1,5 +1,9 @@ .custom-icon .icon { - font-size: 17px; color: #f05b41; - margin-right: 2px; +} + +.custom-icon { + display: flex; + align-items: center; + gap: 4px; } diff --git a/apps/demos/Demos/SelectBox/GroupedItems/ReactJs/styles.css b/apps/demos/Demos/SelectBox/GroupedItems/ReactJs/styles.css index 437d26328ad2..63ce2320c355 100644 --- a/apps/demos/Demos/SelectBox/GroupedItems/ReactJs/styles.css +++ b/apps/demos/Demos/SelectBox/GroupedItems/ReactJs/styles.css @@ -1,5 +1,9 @@ .custom-icon .icon { - font-size: 17px; color: #f05b41; - margin-right: 2px; +} + +.custom-icon { + display: flex; + align-items: center; + gap: 4px; } diff --git a/apps/demos/Demos/SelectBox/GroupedItems/Vue/Group.vue b/apps/demos/Demos/SelectBox/GroupedItems/Vue/Group.vue index 66496ebe1912..bd738f14b7e1 100644 --- a/apps/demos/Demos/SelectBox/GroupedItems/Vue/Group.vue +++ b/apps/demos/Demos/SelectBox/GroupedItems/Vue/Group.vue @@ -13,8 +13,12 @@ withDefaults(defineProps<{ diff --git a/apps/demos/Demos/SelectBox/GroupedItems/jQuery/styles.css b/apps/demos/Demos/SelectBox/GroupedItems/jQuery/styles.css index 437d26328ad2..63ce2320c355 100644 --- a/apps/demos/Demos/SelectBox/GroupedItems/jQuery/styles.css +++ b/apps/demos/Demos/SelectBox/GroupedItems/jQuery/styles.css @@ -1,5 +1,9 @@ .custom-icon .icon { - font-size: 17px; color: #f05b41; - margin-right: 2px; +} + +.custom-icon { + display: flex; + align-items: center; + gap: 4px; } diff --git a/apps/demos/Demos/TagBox/GroupedItems/Angular/app/app.component.css b/apps/demos/Demos/TagBox/GroupedItems/Angular/app/app.component.css index 035fc75aaef9..01e5b0b3bd12 100644 --- a/apps/demos/Demos/TagBox/GroupedItems/Angular/app/app.component.css +++ b/apps/demos/Demos/TagBox/GroupedItems/Angular/app/app.component.css @@ -1,7 +1,11 @@ ::ng-deep .custom-icon .icon { - font-size: 17px; color: #f05b41; - margin-right: 2px; +} + +::ng-deep .custom-icon { + display: flex; + align-items: center; + gap: 4px; } ::ng-deep .dx-field { diff --git a/apps/demos/Demos/TagBox/GroupedItems/React/styles.css b/apps/demos/Demos/TagBox/GroupedItems/React/styles.css index 37568462f9fb..f997c92f251f 100644 --- a/apps/demos/Demos/TagBox/GroupedItems/React/styles.css +++ b/apps/demos/Demos/TagBox/GroupedItems/React/styles.css @@ -1,7 +1,11 @@ .custom-icon .icon { - font-size: 17px; color: #f05b41; - margin-right: 2px; +} + +.custom-icon { + display: flex; + align-items: center; + gap: 4px; } .dx-field { diff --git a/apps/demos/Demos/TagBox/GroupedItems/ReactJs/styles.css b/apps/demos/Demos/TagBox/GroupedItems/ReactJs/styles.css index 37568462f9fb..f997c92f251f 100644 --- a/apps/demos/Demos/TagBox/GroupedItems/ReactJs/styles.css +++ b/apps/demos/Demos/TagBox/GroupedItems/ReactJs/styles.css @@ -1,7 +1,11 @@ .custom-icon .icon { - font-size: 17px; color: #f05b41; - margin-right: 2px; +} + +.custom-icon { + display: flex; + align-items: center; + gap: 4px; } .dx-field { diff --git a/apps/demos/Demos/TagBox/GroupedItems/Vue/Group.vue b/apps/demos/Demos/TagBox/GroupedItems/Vue/Group.vue index 66496ebe1912..bd738f14b7e1 100644 --- a/apps/demos/Demos/TagBox/GroupedItems/Vue/Group.vue +++ b/apps/demos/Demos/TagBox/GroupedItems/Vue/Group.vue @@ -13,8 +13,12 @@ withDefaults(defineProps<{ diff --git a/apps/demos/Demos/TagBox/GroupedItems/jQuery/styles.css b/apps/demos/Demos/TagBox/GroupedItems/jQuery/styles.css index 37568462f9fb..f997c92f251f 100644 --- a/apps/demos/Demos/TagBox/GroupedItems/jQuery/styles.css +++ b/apps/demos/Demos/TagBox/GroupedItems/jQuery/styles.css @@ -1,7 +1,11 @@ .custom-icon .icon { - font-size: 17px; color: #f05b41; - margin-right: 2px; +} + +.custom-icon { + display: flex; + align-items: center; + gap: 4px; } .dx-field { diff --git a/apps/demos/Demos/TreeList/ColumnFixing/description.md b/apps/demos/Demos/TreeList/ColumnFixing/description.md index 11b58966bb5d..d8d8917ac35d 100644 --- a/apps/demos/Demos/TreeList/ColumnFixing/description.md +++ b/apps/demos/Demos/TreeList/ColumnFixing/description.md @@ -10,6 +10,6 @@ The column is fixed to the right edge of the grid. - *'sticky'* The column sticks to left and right edges when it reaches them. - -To fix or unfix a column, users should right-click the column's header and select the corresponding operation in the context menu. To prevent users from fixing or unfixing a column, set its [allowFixing](/Documentation/ApiReference/UI_Components/dxTreeList/Configuration/columns/#allowFixing) property to `false`. \ No newline at end of file +To fix or unfix a column, users should right-click the column's header and select the corresponding operation in the context menu. To prevent users from fixing or unfixing a column, set its [allowFixing](/Documentation/ApiReference/UI_Components/dxTreeList/Configuration/columns/#allowFixing) property to `false`. + \ No newline at end of file diff --git a/apps/demos/configs/Angular/config.bundle.js b/apps/demos/configs/Angular/config.bundle.js index 460e4aa1af56..57d089649471 100644 --- a/apps/demos/configs/Angular/config.bundle.js +++ b/apps/demos/configs/Angular/config.bundle.js @@ -2,8 +2,9 @@ const bundleConfig = { bundles: { 'devextreme.angular.systemjs.js': [ 'devextreme/*', + 'devextreme/data/*', + 'devextreme/data/odata/*', 'devextreme/animation/*', - 'devextreme/common/*', 'devextreme/core/*', 'devextreme/core/utils/*', 'devextreme/data/*', @@ -23,8 +24,21 @@ const bundleConfig = { 'devextreme/ui/toast/*', 'devextreme/viz/*', 'devextreme/viz/vector_map/*', + 'devextreme/common/*', + 'devextreme/common/data/*', + 'devextreme/common/data/odata/*', + 'devextreme/common/export/*', + 'devextreme/common/core/*', + 'devextreme/common/core/animation/*', + 'devextreme/common/core/environment/*', + 'devextreme/common/core/events/*', + 'devextreme/common/core/localization/*', 'devextreme-angular', 'devextreme-angular/*', + 'devextreme-angular/core/*', + 'devextreme-angular/common/*', + 'devextreme-angular/common/core/*', + 'devextreme-angular/common/export/*', 'devexpress-gantt', 'devexpress-diagram', 'rxjs/*', diff --git a/apps/demos/configs/React/config.bundle.js b/apps/demos/configs/React/config.bundle.js index b00bed0cee17..b603c1619458 100644 --- a/apps/demos/configs/React/config.bundle.js +++ b/apps/demos/configs/React/config.bundle.js @@ -2,8 +2,9 @@ const bundleConfig = { bundles: { 'devextreme.react.systemjs.js': [ 'devextreme/*', + 'devextreme/data/*', + 'devextreme/data/odata/*', 'devextreme/animation/*', - 'devextreme/common/*', 'devextreme/core/*', 'devextreme/core/utils/*', 'devextreme/data/*', @@ -23,8 +24,21 @@ const bundleConfig = { 'devextreme/ui/toast/*', 'devextreme/viz/*', 'devextreme/viz/vector_map/*', + 'devextreme/common/*', + 'devextreme/common/data/*', + 'devextreme/common/data/odata/*', + 'devextreme/common/export/*', + 'devextreme/common/core/*', + 'devextreme/common/core/animation/*', + 'devextreme/common/core/environment/*', + 'devextreme/common/core/events/*', + 'devextreme/common/core/localization/*', + 'devextreme/common/core/localization/globalize/*', 'devextreme-react/*', 'devextreme-react/core/*', + 'devextreme-react/common/*', + 'devextreme-react/common/core/*', + 'devextreme-react/common/export/*', 'devexpress-gantt', 'devexpress-diagram', 'react/*', diff --git a/apps/demos/configs/ReactJs/config.bundle.js b/apps/demos/configs/ReactJs/config.bundle.js index 754c39a693d0..698ffa4e391c 100644 --- a/apps/demos/configs/ReactJs/config.bundle.js +++ b/apps/demos/configs/ReactJs/config.bundle.js @@ -2,6 +2,8 @@ const bundleConfig = { bundles: { 'devextreme.react.systemjs.js': [ 'devextreme/*', + 'devextreme/data/*', + 'devextreme/data/odata/*', 'devextreme/animation/*', 'devextreme/core/*', 'devextreme/core/utils/*', @@ -17,7 +19,21 @@ const bundleConfig = { 'devextreme/ui/pivot_grid/*', 'devextreme/viz/*', 'devextreme/viz/vector_map/*', + 'devextreme/common/*', + 'devextreme/common/data/*', + 'devextreme/common/data/odata/*', + 'devextreme/common/export/*', + 'devextreme/common/core/*', + 'devextreme/common/core/animation/*', + 'devextreme/common/core/environment/*', + 'devextreme/common/core/events/*', + 'devextreme/common/core/localization/*', + 'devextreme/common/core/localization/globalize/*', 'devextreme-react/*', + 'devextreme-react/core/*', + 'devextreme-react/common/*', + 'devextreme-react/common/core/*', + 'devextreme-react/common/export/*', 'devexpress-gantt', 'devexpress-diagram', 'react/*', diff --git a/apps/demos/configs/Vue/config.bundle.js b/apps/demos/configs/Vue/config.bundle.js index 6123fa5a4b09..fe075b6666a3 100644 --- a/apps/demos/configs/Vue/config.bundle.js +++ b/apps/demos/configs/Vue/config.bundle.js @@ -2,8 +2,9 @@ const bundleConfig = { bundles: { 'devextreme.vue.systemjs.js': [ 'devextreme/*', + 'devextreme/data/*', + 'devextreme/data/odata/*', 'devextreme/animation/*', - 'devextreme/common/*', 'devextreme/core/*', 'devextreme/core/utils/*', 'devextreme/data/*', @@ -23,7 +24,20 @@ const bundleConfig = { 'devextreme/ui/toast/*', 'devextreme/viz/*', 'devextreme/viz/vector_map/*', + 'devextreme/common/*', + 'devextreme/common/data/*', + 'devextreme/common/data/odata/*', + 'devextreme/common/export/*', + 'devextreme/common/core/*', + 'devextreme/common/core/animation/*', + 'devextreme/common/core/environment/*', + 'devextreme/common/core/events/*', + 'devextreme/common/core/localization/*', 'devextreme-vue/*', + 'devextreme-vue/core/*', + 'devextreme-vue/common/*', + 'devextreme-vue/common/core/*', + 'devextreme-vue/common/export/*', 'devexpress-gantt', 'devexpress-diagram', ], diff --git a/apps/demos/menuMeta.json b/apps/demos/menuMeta.json index 656d9ffd7ad0..2893f7cf8b59 100644 --- a/apps/demos/menuMeta.json +++ b/apps/demos/menuMeta.json @@ -2086,7 +2086,13 @@ "Name": "Customization", "DocUrl": "Guide/UI_Components/Chat/Customization/", "Widget": "Chat", - "DemoType": "Web" + "DemoType": "Web", + "MvcAdditionalFiles": [ + "/Models/SampleData/ChatData.cs", + "/Models/Chat/User.cs", + "/Models/Chat/Message.cs", + "/ViewModels/ChatViewModel.cs" + ] } ] }, @@ -2098,6 +2104,7 @@ "Title": "AI and Chatbot Integration", "Name": "AIAndChatbotIntegration", "Widget": "Chat", + "Modules": "html-react-parser", "DemoType": "Web" } ] diff --git a/apps/demos/package.json b/apps/demos/package.json index 8877d377c4ff..144dacfc0d5e 100644 --- a/apps/demos/package.json +++ b/apps/demos/package.json @@ -111,7 +111,7 @@ "eslint-plugin-deprecation": "2.0.0", "eslint-plugin-react": "7.33.2", "eslint-plugin-react-perf": "3.3.2", - "express": "4.20.0", + "express": "4.21.1", "glob": "10.4.5", "gulp": "4.0.2", "gulp-clean": "0.4.0", @@ -128,7 +128,7 @@ "prettier": "2.8.8", "rollup": "4.22.4", "serve-index": "1.9.1", - "serve-static": "1.16.0", + "serve-static": "1.16.2", "stylelint": "16.5.0", "stylelint-config-recommended-vue": "1.5.0", "stylelint-config-standard": "35.0.0", diff --git a/apps/demos/rollup.devextreme-angular.umd.config.mjs b/apps/demos/rollup.devextreme-angular.umd.config.mjs index f15ea55bbc80..7c78bf2f10cb 100644 --- a/apps/demos/rollup.devextreme-angular.umd.config.mjs +++ b/apps/demos/rollup.devextreme-angular.umd.config.mjs @@ -4,16 +4,19 @@ import babel from '@rollup/plugin-babel'; import fs from 'fs-extra'; const baseDir = './node_modules/devextreme-angular/fesm2022/'; -const componentNames = fs.readdirSync(baseDir) +const fileNames = fs.readdirSync(baseDir) .filter((fileName) => fileName.indexOf('mjs.map') !== -1) - .filter((fileName) => fileName.indexOf('devextreme-angular-ui') === 0) + .filter((fileName) => + fileName.indexOf('devextreme-angular-ui') === 0 + || fileName.indexOf('devextreme-angular-common') === 0 + ) .map((fileName) => fileName.replace('.mjs.map', '')); const inputs = { 'devextreme-angular': `${baseDir}devextreme-angular.mjs`, 'devextreme-angular-core': `${baseDir}devextreme-angular-core.mjs`, 'devextreme-angular-http': `${baseDir}devextreme-angular-http.mjs`, - ...componentNames.reduce((acc, name) => { + ...fileNames.reduce((acc, name) => { acc[name] = `${baseDir}${name}.mjs`; return acc; diff --git a/apps/demos/testing/etalons/Scheduler-Overview.png b/apps/demos/testing/etalons/Scheduler-Overview.png index e0d9643cd098..bfcf62ce8298 100644 Binary files a/apps/demos/testing/etalons/Scheduler-Overview.png and b/apps/demos/testing/etalons/Scheduler-Overview.png differ diff --git a/apps/demos/testing/widgets/scheduler/etalons/scheduler_overview_selection.png b/apps/demos/testing/widgets/scheduler/etalons/scheduler_overview_selection.png index a136bce0faa7..5793b8a02466 100644 Binary files a/apps/demos/testing/widgets/scheduler/etalons/scheduler_overview_selection.png and b/apps/demos/testing/widgets/scheduler/etalons/scheduler_overview_selection.png differ diff --git a/apps/demos/testing/widgets/selectbox/GroupedItems.test.js b/apps/demos/testing/widgets/selectbox/GroupedItems.test.js new file mode 100644 index 000000000000..a8f2fc26beda --- /dev/null +++ b/apps/demos/testing/widgets/selectbox/GroupedItems.test.js @@ -0,0 +1,47 @@ +import { createScreenshotsComparer } from 'devextreme-screenshot-comparer'; +import { Selector as $ } from 'testcafe'; +import { runManualTest } from '../../../utils/visual-tests/matrix-test-helper'; +import { testScreenshot } from '../../../utils/visual-tests/helpers/theme-utils'; + +fixture('SelectBox.GroupedItems') + .page('http://localhost:8080/') + .before(async (ctx) => { + ctx.initialWindowSize = [900, 600]; + }); + +runManualTest('SelectBox', 'GroupedItems', ['jQuery', 'React', 'Vue', 'Angular'], (test) => { + test('GroupedItems', async (t) => { + const SELECT_BOX_CLASS = 'dx-selectbox'; + const { takeScreenshot, compareResults } = createScreenshotsComparer(t); + + await t + .click($(`.${SELECT_BOX_CLASS}`).nth(0)) + .wait(200); + + await testScreenshot(t, takeScreenshot, 'selectbox_groupeditems_first_opened.png'); + + await t + .click($(`.${SELECT_BOX_CLASS}`).nth(0)) + .wait(200); + + await t + .click($(`.${SELECT_BOX_CLASS}`).nth(1)) + .wait(200); + + await testScreenshot(t, takeScreenshot, 'selectbox_groupeditems_second_opened.png'); + + await t + .click($(`.${SELECT_BOX_CLASS}`).nth(1)) + .wait(200); + + await t + .click($(`.${SELECT_BOX_CLASS}`).nth(2)) + .wait(200); + + await testScreenshot(t, takeScreenshot, 'selectbox_groupeditems_third_opened.png'); + + await t + .expect(compareResults.isValid()) + .ok(compareResults.errorMessages()); + }); +}); diff --git a/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_first_opened (fluent.blue.light).png b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_first_opened (fluent.blue.light).png new file mode 100644 index 000000000000..2744d9ef4c4b Binary files /dev/null and b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_first_opened (fluent.blue.light).png differ diff --git a/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_first_opened (material.blue.light).png b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_first_opened (material.blue.light).png new file mode 100644 index 000000000000..3dc3ec5ef727 Binary files /dev/null and b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_first_opened (material.blue.light).png differ diff --git a/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_first_opened.png b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_first_opened.png new file mode 100644 index 000000000000..2795e515cfd6 Binary files /dev/null and b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_first_opened.png differ diff --git a/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_second_opened (fluent.blue.light).png b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_second_opened (fluent.blue.light).png new file mode 100644 index 000000000000..fc86112f8270 Binary files /dev/null and b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_second_opened (fluent.blue.light).png differ diff --git a/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_second_opened (material.blue.light).png b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_second_opened (material.blue.light).png new file mode 100644 index 000000000000..2af7b026eb5e Binary files /dev/null and b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_second_opened (material.blue.light).png differ diff --git a/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_second_opened.png b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_second_opened.png new file mode 100644 index 000000000000..485dffc0fda7 Binary files /dev/null and b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_second_opened.png differ diff --git a/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_third_opened (fluent.blue.light).png b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_third_opened (fluent.blue.light).png new file mode 100644 index 000000000000..a164d2a9b3ae Binary files /dev/null and b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_third_opened (fluent.blue.light).png differ diff --git a/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_third_opened (material.blue.light).png b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_third_opened (material.blue.light).png new file mode 100644 index 000000000000..c19fd5d976f9 Binary files /dev/null and b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_third_opened (material.blue.light).png differ diff --git a/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_third_opened.png b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_third_opened.png new file mode 100644 index 000000000000..207ebdac4531 Binary files /dev/null and b/apps/demos/testing/widgets/selectbox/etalons/selectbox_groupeditems_third_opened.png differ diff --git a/apps/demos/testing/widgets/tagbox/GroupedItems.test.js b/apps/demos/testing/widgets/tagbox/GroupedItems.test.js new file mode 100644 index 000000000000..d7d2f288a577 --- /dev/null +++ b/apps/demos/testing/widgets/tagbox/GroupedItems.test.js @@ -0,0 +1,43 @@ +import { createScreenshotsComparer } from 'devextreme-screenshot-comparer'; +import { runManualTest } from '../../../utils/visual-tests/matrix-test-helper'; +import { testScreenshot } from '../../../utils/visual-tests/helpers/theme-utils'; + +fixture('TagBox.GroupedItems') + .page('http://localhost:8080/') + .before(async (ctx) => { + ctx.initialWindowSize = [900, 600]; + }); + +runManualTest('TagBox', 'GroupedItems', ['jQuery', 'React', 'Vue', 'Angular'], (test) => { + test('GroupedItems', async (t) => { + const { takeScreenshot, compareResults } = createScreenshotsComparer(t); + + await t + .pressKey('tab') + .pressKey('alt+down'); + + await testScreenshot(t, takeScreenshot, 'tagbox_groupeditems_first_opened.png'); + + await t + .pressKey('esc'); + + await t + .pressKey('tab') + .pressKey('alt+down'); + + await testScreenshot(t, takeScreenshot, 'tagbox_groupeditems_second_opened.png'); + + await t + .pressKey('esc'); + + await t + .pressKey('tab') + .pressKey('alt+down'); + + await testScreenshot(t, takeScreenshot, 'tagbox_groupeditems_third_opened.png'); + + await t + .expect(compareResults.isValid()) + .ok(compareResults.errorMessages()); + }); +}); diff --git a/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_first_opened (fluent.blue.light).png b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_first_opened (fluent.blue.light).png new file mode 100644 index 000000000000..e2f8c00ebfb6 Binary files /dev/null and b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_first_opened (fluent.blue.light).png differ diff --git a/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_first_opened (material.blue.light).png b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_first_opened (material.blue.light).png new file mode 100644 index 000000000000..45c22f3680d4 Binary files /dev/null and b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_first_opened (material.blue.light).png differ diff --git a/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_first_opened.png b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_first_opened.png new file mode 100644 index 000000000000..470a876c8d81 Binary files /dev/null and b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_first_opened.png differ diff --git a/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_second_opened (fluent.blue.light).png b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_second_opened (fluent.blue.light).png new file mode 100644 index 000000000000..5de81bbb86cc Binary files /dev/null and b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_second_opened (fluent.blue.light).png differ diff --git a/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_second_opened (material.blue.light).png b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_second_opened (material.blue.light).png new file mode 100644 index 000000000000..686a775fdcdd Binary files /dev/null and b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_second_opened (material.blue.light).png differ diff --git a/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_second_opened.png b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_second_opened.png new file mode 100644 index 000000000000..5d70be663736 Binary files /dev/null and b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_second_opened.png differ diff --git a/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_third_opened (fluent.blue.light).png b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_third_opened (fluent.blue.light).png new file mode 100644 index 000000000000..3865ae3e51ec Binary files /dev/null and b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_third_opened (fluent.blue.light).png differ diff --git a/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_third_opened (material.blue.light).png b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_third_opened (material.blue.light).png new file mode 100644 index 000000000000..130534e91cda Binary files /dev/null and b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_third_opened (material.blue.light).png differ diff --git a/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_third_opened.png b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_third_opened.png new file mode 100644 index 000000000000..dc11796e37e0 Binary files /dev/null and b/apps/demos/testing/widgets/tagbox/etalons/tagbox_groupeditems_third_opened.png differ diff --git a/apps/demos/utils/bundle/index.js b/apps/demos/utils/bundle/index.js index beef028630e9..de1daa887370 100644 --- a/apps/demos/utils/bundle/index.js +++ b/apps/demos/utils/bundle/index.js @@ -5,6 +5,7 @@ const Builder = require('systemjs-builder'); const babel = require('@babel/core'); const url = require('url'); +const GRID_COMMON_STAR_IMPORT = 'exports.Grids = __importStar(require("./grids"));'; // https://stackoverflow.com/questions/42412965/how-to-load-named-exports-with-systemjs/47108328 const prepareModulesToNamedImport = () => { @@ -133,6 +134,7 @@ const prepareConfigs = (framework)=> { prepareDevextremexAngularFiles(); const bundlesRoot = 'node_modules/devextreme-angular/bundles'; + const componentNames = fs.readdirSync(bundlesRoot) .filter((fileName) => fileName.indexOf('umd.js') !== -1) .filter((fileName) => fileName.indexOf('devextreme-angular-ui') === 0) @@ -215,6 +217,14 @@ const prepareConfigs = (framework)=> { ] }; + // This auto-generated runtime import is useless because grid.js exports only types, + // but System.js transpiles this import into code that crashes when triggered in a Demo. + const removeImportTranspiledToCrashingCode = (result) => { + if(result.code.includes(GRID_COMMON_STAR_IMPORT)) { + result.code = result.code.replace(GRID_COMMON_STAR_IMPORT, ''); + } + } + const result = new Promise((resolve) => { // systemjs-builder uses babel 6, so we use babel 7 here for transpiling ES2020 babel.transformFile(url.fileURLToPath(load.name), babelOptions, (err, result) => { @@ -222,6 +232,7 @@ const prepareConfigs = (framework)=> { fetch(load).then(r => resolve(r)); console.log('Unexpected transipling error (babel 7): ' + err); } else { + removeImportTranspiledToCrashingCode(result); resolve(result.code); } }); diff --git a/e2e/compilation-cases/data/data_source.ts b/e2e/compilation-cases/data/data_source.ts index 833d4350e6fc..093405f6ec13 100644 --- a/e2e/compilation-cases/data/data_source.ts +++ b/e2e/compilation-cases/data/data_source.ts @@ -1,6 +1,20 @@ /* eslint-disable import/named */ /* eslint-disable @typescript-eslint/no-type-alias */ /* eslint-disable @typescript-eslint/no-unsafe-return */ +import { + Store, + DataSource, + CustomStore, + ArrayStore, + ODataStore, + LocalStore, +} from 'devextreme/common/data'; + +import { + DataSourceOptionsStub, + DataSourceLike, +} from 'devextreme/data/data_source'; + import { AnotherType, ANY, @@ -11,16 +25,6 @@ import { SomeType, } from '../consts'; -import DataSource, { - DataSourceLike, - DataSourceOptionsStub, -} from 'devextreme/data/data_source'; -import CustomStore from 'devextreme/data/custom_store'; -import ArrayStore from 'devextreme/data/array_store'; -import ODataStore from 'devextreme/data/odata/store'; -import LocalStore from 'devextreme/data/local_store'; -import { Store } from 'devextreme/data/index'; - export function promiseResolveAcceptsMultipleArguments() { const callback: (a: any, b: any) => void = ANY; const dataSource: DataSource = ANY; diff --git a/e2e/compilation-cases/data/stores.ts b/e2e/compilation-cases/data/stores.ts index 7ee011fd9056..35781a8da55b 100644 --- a/e2e/compilation-cases/data/stores.ts +++ b/e2e/compilation-cases/data/stores.ts @@ -3,8 +3,13 @@ // eslint-disable-next-line import/no-extraneous-dependencies import $ from 'jquery'; import { HttpClient } from '@angular/common/http'; -import CustomStore from 'devextreme/data/custom_store'; -import { Store, StoreOptions } from 'devextreme/data'; +import { + Store, + StoreOptions, + CustomStore, + LoadResult, +} from 'devextreme/common/data'; + import { ANY, assertType, @@ -12,7 +17,6 @@ import { notNever, toAssertion, } from '../consts'; -import type { LoadResult } from 'devextreme/common/data/custom-store'; export async function infersTItemFromComplexLoadResult() { const store = new CustomStore({ diff --git a/package.json b/package.json index 8bd4f5883b77..8430bb09e076 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "axe-core": "4.10.2", "cheerio": "1.0.0-rc.10", "codelyzer": "6.0.2", - "devextreme-internal-tools": "16.0.0-beta.18", + "devextreme-internal-tools": "16.0.0", "devextreme-nx-plugin": "workspace:*", "http-server": "14.1.1", "husky": "8.0.3", diff --git a/packages/devextreme-angular/build.config.js b/packages/devextreme-angular/build.config.js index d338e587bd20..0a8123bcb4ee 100644 --- a/packages/devextreme-angular/build.config.js +++ b/packages/devextreme-angular/build.config.js @@ -55,7 +55,7 @@ module.exports = { outputFileName: 'tests/src/server/component-names.ts' }, commonReexportsGenerator: { - metadataPath: './metadata/NGMetaData.json', + imdMetadataFilePath: './metadata/integration-data.json', outputPath: './src/' }, }, diff --git a/packages/devextreme-angular/gulpfile.js b/packages/devextreme-angular/gulpfile.js index 856bb6fe25b4..07885794ed44 100644 --- a/packages/devextreme-angular/gulpfile.js +++ b/packages/devextreme-angular/gulpfile.js @@ -84,14 +84,28 @@ gulp.task('before-generate.preserve-component-files', (done) => { gulp.task('generate.facades', gulp.series('generate.moduleFacades', (done) => { const facadeGenerator = new AngularFacadeGenerator(); - facadeGenerator.generate(buildConfig.tools.facadeGenerator); + facadeGenerator.generate({ + ...buildConfig.tools.facadeGenerator, + templatingOptions: { + quotes: 'single', + excplicitIndexInImports: true, + }, + }); + done(); })); gulp.task('generate.common-reexports', (done) => { - const commonReexportsGenerator = new AngularCommonReexportsGenerator(); - - commonReexportsGenerator.generate(buildConfig.tools.commonReexportsGenerator); + const { outputPath, imdMetadataFilePath } = buildConfig.tools.commonReexportsGenerator; + + AngularCommonReexportsGenerator.generate({ + outputPath, + metadata: JSON.parse(fs.readFileSync(imdMetadataFilePath).toString()), + templatingOptions: { + quotes: 'single', + excplicitIndexInImports: true, + }, + }); done(); }); diff --git a/packages/devextreme-angular/package.json b/packages/devextreme-angular/package.json index 4b0966c87fd2..7b9b1bcd0222 100644 --- a/packages/devextreme-angular/package.json +++ b/packages/devextreme-angular/package.json @@ -24,7 +24,7 @@ "devextreme": "workspace:~" }, "devDependencies": { - "@angular-devkit/architect": "0.1703.11", + "@angular-devkit/architect": "0.1900.2", "@angular-devkit/schematics": "17.3.11", "@angular/animations": "17.3.12", "@angular/cli": "17.3.11", @@ -73,7 +73,7 @@ "devexpress" ], "dependencies": { - "@angular-devkit/schematics": "17.3.8", + "@angular-devkit/schematics": "17.3.11", "devextreme-schematics": "*", "inferno-server": "8.2.3" }, diff --git a/packages/devextreme-angular/src/common/core/animation/index.ts b/packages/devextreme-angular/src/common/core/animation/index.ts new file mode 100644 index 000000000000..9014c94673c5 --- /dev/null +++ b/packages/devextreme-angular/src/common/core/animation/index.ts @@ -0,0 +1,12 @@ +export { + AnimationConfig, + animationPresets, + AnimationState, + cancelAnimationFrame, + CollisionResolution, + CollisionResolutionCombination, + fx, + PositionConfig, + requestAnimationFrame, + TransitionExecutor, +} from 'devextreme/common/core/animation'; diff --git a/packages/devextreme-angular/src/common/core/animation/ng-package.json b/packages/devextreme-angular/src/common/core/animation/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/core/animation/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/core/environment/index.ts b/packages/devextreme-angular/src/common/core/environment/index.ts new file mode 100644 index 000000000000..19ae8891d1ea --- /dev/null +++ b/packages/devextreme-angular/src/common/core/environment/index.ts @@ -0,0 +1,7 @@ +export { + Device, + getTimeZones, + hideTopOverlay, + initMobileViewport, + SchedulerTimeZone, +} from 'devextreme/common/core/environment'; diff --git a/packages/devextreme-angular/src/common/core/environment/ng-package.json b/packages/devextreme-angular/src/common/core/environment/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/core/environment/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/core/events/index.ts b/packages/devextreme-angular/src/common/core/events/index.ts new file mode 100644 index 000000000000..23f9af001715 --- /dev/null +++ b/packages/devextreme-angular/src/common/core/events/index.ts @@ -0,0 +1,14 @@ +export { + AsyncCancelable, + Cancelable, + ChangedOptionInfo, + EventInfo, + EventObject, + InitializedEventInfo, + ItemInfo, + NativeEventInfo, + off, + on, + one, + trigger, +} from 'devextreme/common/core/events'; diff --git a/packages/devextreme-angular/src/common/core/events/ng-package.json b/packages/devextreme-angular/src/common/core/events/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/core/events/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/core/index.ts b/packages/devextreme-angular/src/common/core/index.ts new file mode 100644 index 000000000000..3e8c304c3d8b --- /dev/null +++ b/packages/devextreme-angular/src/common/core/index.ts @@ -0,0 +1,4 @@ +export * as Animation from './animation'; +export * as Environment from './environment'; +export * as Events from './events'; +export * as Localization from './localization'; diff --git a/packages/devextreme-angular/src/common/core/localization/index.ts b/packages/devextreme-angular/src/common/core/localization/index.ts new file mode 100644 index 000000000000..e2fe4bb70025 --- /dev/null +++ b/packages/devextreme-angular/src/common/core/localization/index.ts @@ -0,0 +1,10 @@ +export { + Format, + formatDate, + formatMessage, + formatNumber, + loadMessages, + locale, + parseDate, + parseNumber, +} from 'devextreme/common/core/localization'; diff --git a/packages/devextreme-angular/src/common/core/localization/ng-package.json b/packages/devextreme-angular/src/common/core/localization/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/core/localization/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/core/ng-package.json b/packages/devextreme-angular/src/common/core/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/core/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/data/index.ts b/packages/devextreme-angular/src/common/data/index.ts new file mode 100644 index 000000000000..25c15fd09554 --- /dev/null +++ b/packages/devextreme-angular/src/common/data/index.ts @@ -0,0 +1,43 @@ +export { + applyChanges, + ArrayStore, + ArrayStoreOptions, + base64_encode, + compileGetter, + compileSetter, + CustomStore, + CustomStoreOptions, + DataSource, + DataSourceOptions, + EdmLiteral, + EndpointSelector, + errorHandler, + FilterDescriptor, + GroupDescriptor, + GroupingInterval, + GroupItem, + isGroupItemsArray, + isItemsArray, + isLoadResultObject, + keyConverters, + LangParams, + LoadOptions, + LoadResult, + LoadResultObject, + LocalStore, + LocalStoreOptions, + ODataContext, + ODataContextOptions, + ODataStore, + ODataStoreOptions, + query, + Query, + ResolvedData, + SearchOperation, + SelectDescriptor, + setErrorHandler, + SortDescriptor, + Store, + StoreOptions, + SummaryDescriptor, +} from 'devextreme/common/data'; diff --git a/packages/devextreme-angular/src/common/data/ng-package.json b/packages/devextreme-angular/src/common/data/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/data/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/export/excel/index.ts b/packages/devextreme-angular/src/common/export/excel/index.ts new file mode 100644 index 000000000000..22ad01b8501d --- /dev/null +++ b/packages/devextreme-angular/src/common/export/excel/index.ts @@ -0,0 +1,8 @@ +export { + DataGridCell, + DataGridExportOptions, + exportDataGrid, + exportPivotGrid, + PivotGridCell, + PivotGridExportOptions, +} from 'devextreme/common/export/excel'; diff --git a/packages/devextreme-angular/src/common/export/excel/ng-package.json b/packages/devextreme-angular/src/common/export/excel/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/export/excel/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/export/index.ts b/packages/devextreme-angular/src/common/export/index.ts new file mode 100644 index 000000000000..ef73ffadf731 --- /dev/null +++ b/packages/devextreme-angular/src/common/export/index.ts @@ -0,0 +1,2 @@ +export * as Excel from './excel'; +export * as Pdf from './pdf'; diff --git a/packages/devextreme-angular/src/common/export/ng-package.json b/packages/devextreme-angular/src/common/export/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/export/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/export/pdf/index.ts b/packages/devextreme-angular/src/common/export/pdf/index.ts new file mode 100644 index 000000000000..e2deb669df82 --- /dev/null +++ b/packages/devextreme-angular/src/common/export/pdf/index.ts @@ -0,0 +1,9 @@ +export { + Cell, + DataGridCell, + DataGridExportOptions, + exportDataGrid, + exportGantt, + GanttExportFont, + GanttExportOptions, +} from 'devextreme/common/export/pdf'; diff --git a/packages/devextreme-angular/src/common/export/pdf/ng-package.json b/packages/devextreme-angular/src/common/export/pdf/ng-package.json new file mode 100644 index 000000000000..3360c83b3395 --- /dev/null +++ b/packages/devextreme-angular/src/common/export/pdf/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "index.ts" + } +} \ No newline at end of file diff --git a/packages/devextreme-angular/src/common/index.ts b/packages/devextreme-angular/src/common/index.ts index ccdb9057c493..2b0c97f54bd0 100644 --- a/packages/devextreme-angular/src/common/index.ts +++ b/packages/devextreme-angular/src/common/index.ts @@ -5,9 +5,11 @@ export { ButtonType, CompareRule, ComparisonOperator, + config, CustomRule, DataStructure, DataType, + DefaultOptionsRule, Direction, DisplayMode, DragDirection, @@ -18,8 +20,10 @@ export { ExportFormat, FieldChooserLayout, FirstDayOfWeek, + FloatingActionButtonDirection, Format, GlobalConfig, + Guid, HorizontalAlignment, HorizontalEdge, LabelMode, @@ -29,7 +33,6 @@ export { Orientation, PageLoadMode, PageOrientation, - PagerBase, PatternRule, Position, PositionAlignment, @@ -41,6 +44,7 @@ export { ScrollMode, SearchMode, SelectAllMode, + setTemplateEngine, SimplifiedSearchMode, SingleMultipleAllOrNone, SingleMultipleOrNone, @@ -54,6 +58,7 @@ export { SubmenuShowMode, TabsIconPosition, TabsStyle, + template, TextBoxPredefinedButton, TextEditorButton, TextEditorButtonLocation, @@ -68,3 +73,9 @@ export { VerticalAlignment, VerticalEdge, } from 'devextreme/common'; + +export * as Charts from './charts'; +export * as Core from './core/index'; +export * as Data from './data'; +export * as Export from './export/index'; +export * as Grids from './grids'; diff --git a/packages/devextreme-angular/src/core/integration.ts b/packages/devextreme-angular/src/core/integration.ts index 56f7ee8703af..c27505a6b4e5 100644 --- a/packages/devextreme-angular/src/core/integration.ts +++ b/packages/devextreme-angular/src/core/integration.ts @@ -7,7 +7,7 @@ import httpRequest from 'devextreme/core/http_request'; import domAdapter from 'devextreme/core/dom_adapter'; import readyCallbacks from 'devextreme/core/utils/ready_callbacks'; -import eventsEngine from 'devextreme/events/core/events_engine'; +import eventsEngine from 'devextreme/common/core/events/core/events_engine'; const outsideZoneEvents = ['mousemove', 'mouseover', 'mouseout']; const insideZoneEvents = ['mouseup', 'click', 'mousedown', 'transitionend', 'wheel']; diff --git a/packages/devextreme-angular/src/index.ts b/packages/devextreme-angular/src/index.ts index 11c7941acde7..ff5791301f30 100644 --- a/packages/devextreme-angular/src/index.ts +++ b/packages/devextreme-angular/src/index.ts @@ -85,3 +85,4 @@ export { DxValidationGroupComponent, DxValidationGroupModule } from 'devextreme- export { DxValidationSummaryComponent, DxValidationSummaryModule } from 'devextreme-angular/ui/validation-summary'; export { DxValidatorComponent, DxValidatorModule } from 'devextreme-angular/ui/validator'; export { DxVectorMapComponent, DxVectorMapModule } from 'devextreme-angular/ui/vector-map'; +export * as Common from './common/index'; diff --git a/packages/devextreme-angular/src/ui/action-sheet/nested/item-dxi.ts b/packages/devextreme-angular/src/ui/action-sheet/nested/item-dxi.ts index 575663e2d67d..1e2405909913 100644 --- a/packages/devextreme-angular/src/ui/action-sheet/nested/item-dxi.ts +++ b/packages/devextreme-angular/src/ui/action-sheet/nested/item-dxi.ts @@ -16,7 +16,7 @@ import { import { DOCUMENT } from '@angular/common'; -import { NativeEventInfo } from 'devextreme/events/index'; +import { NativeEventInfo } from 'devextreme/common/core/events'; import { ButtonStyle, ButtonType } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/autocomplete/nested/animation.ts b/packages/devextreme-angular/src/ui/autocomplete/nested/animation.ts index 05a49a13f7dd..0953f1a1a004 100644 --- a/packages/devextreme-angular/src/ui/autocomplete/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/autocomplete/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/autocomplete/nested/collision.ts b/packages/devextreme-angular/src/ui/autocomplete/nested/collision.ts index f5126f4c9957..2e129d0ac7c1 100644 --- a/packages/devextreme-angular/src/ui/autocomplete/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/autocomplete/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/autocomplete/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/autocomplete/nested/drop-down-options.ts index a1d375dcdfff..5156a47fb20a 100644 --- a/packages/devextreme-angular/src/ui/autocomplete/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/autocomplete/nested/drop-down-options.ts @@ -22,11 +22,11 @@ import { import dxOverlay from 'devextreme/ui/overlay'; import DOMComponent from 'devextreme/core/dom_component'; import dxPopup from 'devextreme/ui/popup'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event, EventInfo } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event } from 'devextreme/events/events.types'; +import { EventInfo } from 'devextreme/common/core/events'; import { Component as CoreComponent } from 'devextreme/core/component'; import { PositionAlignment } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import { diff --git a/packages/devextreme-angular/src/ui/autocomplete/nested/from.ts b/packages/devextreme-angular/src/ui/autocomplete/nested/from.ts index 54ce1c662675..6d8dc118d5cf 100644 --- a/packages/devextreme-angular/src/ui/autocomplete/nested/from.ts +++ b/packages/devextreme-angular/src/ui/autocomplete/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/autocomplete/nested/hide.ts b/packages/devextreme-angular/src/ui/autocomplete/nested/hide.ts index 74b61fe5d3ab..9c532f71abd7 100644 --- a/packages/devextreme-angular/src/ui/autocomplete/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/autocomplete/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/autocomplete/nested/position.ts b/packages/devextreme-angular/src/ui/autocomplete/nested/position.ts index 9405f811d75f..f199249dd61b 100644 --- a/packages/devextreme-angular/src/ui/autocomplete/nested/position.ts +++ b/packages/devextreme-angular/src/ui/autocomplete/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/autocomplete/nested/show.ts b/packages/devextreme-angular/src/ui/autocomplete/nested/show.ts index f612fb5564d7..d22f90790723 100644 --- a/packages/devextreme-angular/src/ui/autocomplete/nested/show.ts +++ b/packages/devextreme-angular/src/ui/autocomplete/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/autocomplete/nested/to.ts b/packages/devextreme-angular/src/ui/autocomplete/nested/to.ts index 64b733e9b604..a15af212abc5 100644 --- a/packages/devextreme-angular/src/ui/autocomplete/nested/to.ts +++ b/packages/devextreme-angular/src/ui/autocomplete/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/bar-gauge/index.ts b/packages/devextreme-angular/src/ui/bar-gauge/index.ts index e6b4592062ad..49e6e94b53ce 100644 --- a/packages/devextreme-angular/src/ui/bar-gauge/index.ts +++ b/packages/devextreme-angular/src/ui/bar-gauge/index.ts @@ -22,7 +22,7 @@ import { import { AnimationEaseMode, Font, DashStyle, Palette, PaletteExtensionMode, ShiftLabelOverlap, Theme, TextOverflow, WordWrap } from 'devextreme/common/charts'; import { ExportFormat, HorizontalAlignment, Position, Orientation, VerticalEdge } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { BarGaugeBarInfo, BarGaugeLegendItem, DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, OptionChangedEvent, TooltipHiddenEvent, TooltipShownEvent } from 'devextreme/viz/bar_gauge'; import DxBarGauge from 'devextreme/viz/bar_gauge'; diff --git a/packages/devextreme-angular/src/ui/bar-gauge/nested/label.ts b/packages/devextreme-angular/src/ui/bar-gauge/nested/label.ts index 3c031d962378..f7560007f376 100644 --- a/packages/devextreme-angular/src/ui/bar-gauge/nested/label.ts +++ b/packages/devextreme-angular/src/ui/bar-gauge/nested/label.ts @@ -15,7 +15,7 @@ import { import { Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/bar-gauge/nested/legend.ts b/packages/devextreme-angular/src/ui/bar-gauge/nested/legend.ts index 12dd055a8faf..ff86c5503627 100644 --- a/packages/devextreme-angular/src/ui/bar-gauge/nested/legend.ts +++ b/packages/devextreme-angular/src/ui/bar-gauge/nested/legend.ts @@ -17,7 +17,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; import { BarGaugeBarInfo, BarGaugeLegendItem } from 'devextreme/viz/bar_gauge'; import { HorizontalAlignment, Position, Orientation, VerticalEdge } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/bar-gauge/nested/tooltip.ts b/packages/devextreme-angular/src/ui/bar-gauge/nested/tooltip.ts index 40a4c62e6593..250fa8bbf6ec 100644 --- a/packages/devextreme-angular/src/ui/bar-gauge/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/bar-gauge/nested/tooltip.ts @@ -15,7 +15,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/bullet/index.ts b/packages/devextreme-angular/src/ui/bullet/index.ts index f809df9ddf53..31b3405d3944 100644 --- a/packages/devextreme-angular/src/ui/bullet/index.ts +++ b/packages/devextreme-angular/src/ui/bullet/index.ts @@ -19,7 +19,7 @@ import { import { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, OptionChangedEvent, TooltipHiddenEvent, TooltipShownEvent } from 'devextreme/viz/bullet'; import { Theme, DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import DxBullet from 'devextreme/viz/bullet'; diff --git a/packages/devextreme-angular/src/ui/bullet/nested/tooltip.ts b/packages/devextreme-angular/src/ui/bullet/nested/tooltip.ts index f44c3042bea2..a174f9387ffc 100644 --- a/packages/devextreme-angular/src/ui/bullet/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/bullet/nested/tooltip.ts @@ -15,7 +15,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/chart/index.ts b/packages/devextreme-angular/src/ui/chart/index.ts index 4494c09e7bbd..6d526b4650a0 100644 --- a/packages/devextreme-angular/src/ui/chart/index.ts +++ b/packages/devextreme-angular/src/ui/chart/index.ts @@ -27,7 +27,7 @@ import * as CommonChartTypes from 'devextreme/common/charts'; import { AnimationEaseMode, TimeInterval, ChartsDataType, ScaleBreak, ScaleBreakLineStyle, DashStyle, Font, RelativePosition, DiscreteAxisDivisionMode, ArgumentAxisHoverMode, ChartsAxisLabelOverlap, TextOverflow, WordWrap, AxisScaleType, VisualRangeUpdateMode, ChartsColor, SeriesHoverMode, HatchDirection, PointInteractionMode, PointSymbol, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType, SeriesLabel, SeriesPoint, LegendItem, LegendHoverMode, Palette, PaletteExtensionMode, ChartsLabelOverlap, Theme } from 'devextreme/common/charts'; import { dxChartAnnotationConfig, AggregatedPointsPosition, ChartLabelDisplayMode, dxChartCommonAnnotationConfig, chartPointAggregationInfoObject, chartSeriesObject, ChartSeriesAggregationMethod, FinancialChartReductionLevel, chartPointObject, ArgumentAxisClickEvent, DisposingEvent, DoneEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, LegendClickEvent, OptionChangedEvent, PointClickEvent, PointHoverChangedEvent, PointSelectionChangedEvent, SeriesClickEvent, SeriesHoverChangedEvent, SeriesSelectionChangedEvent, TooltipHiddenEvent, TooltipShownEvent, ZoomEndEvent, ZoomStartEvent, ChartTooltipLocation, ChartZoomAndPanMode, EventKeyModifier } from 'devextreme/viz/chart'; import { HorizontalAlignment, VerticalAlignment, Position, ExportFormat, Orientation, VerticalEdge, SingleOrMultiple } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DataSourceOptions } from 'devextreme/data/data_source'; import { Store } from 'devextreme/data/store'; import { ChartSeries } from 'devextreme/viz/common'; diff --git a/packages/devextreme-angular/src/ui/chart/nested/argument-axis.ts b/packages/devextreme-angular/src/ui/chart/nested/argument-axis.ts index 07a34a2ae592..be0dc37a5606 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/argument-axis.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/argument-axis.ts @@ -23,7 +23,7 @@ import * as CommonChartTypes from 'devextreme/common/charts'; import { AggregatedPointsPosition, ChartLabelDisplayMode } from 'devextreme/viz/chart'; import { TimeInterval, ChartsDataType, ScaleBreak, ScaleBreakLineStyle, DashStyle, Font, RelativePosition, DiscreteAxisDivisionMode, ArgumentAxisHoverMode, ChartsAxisLabelOverlap, TextOverflow, WordWrap, AxisScaleType, VisualRangeUpdateMode } from 'devextreme/common/charts'; import { HorizontalAlignment, VerticalAlignment, Position } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/chart/nested/axis-label.ts b/packages/devextreme-angular/src/ui/chart/nested/axis-label.ts index e029b1c99a90..6e322dc076f6 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/axis-label.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/axis-label.ts @@ -21,7 +21,7 @@ import { DOCUMENT } from '@angular/common'; import { HorizontalAlignment, Position } from 'devextreme/common'; import { ChartLabelDisplayMode } from 'devextreme/viz/chart'; import { Font, ChartsAxisLabelOverlap, RelativePosition, TextOverflow, WordWrap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/chart/nested/common-series-settings-label.ts b/packages/devextreme-angular/src/ui/chart/nested/common-series-settings-label.ts index 653960933dd8..3aa1257cf3f8 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/common-series-settings-label.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/common-series-settings-label.ts @@ -15,7 +15,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DashStyle, Font, RelativePosition } from 'devextreme/common/charts'; import { diff --git a/packages/devextreme-angular/src/ui/chart/nested/common-series-settings.ts b/packages/devextreme-angular/src/ui/chart/nested/common-series-settings.ts index 4a7b2ab1fd50..5b14d47032ae 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/common-series-settings.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/common-series-settings.ts @@ -17,7 +17,7 @@ import { import { chartPointAggregationInfoObject, chartSeriesObject, ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { DashStyle, ChartsColor, SeriesHoverMode, HatchDirection, Font, RelativePosition, PointInteractionMode, PointSymbol, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; import { HorizontalAlignment } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/chart/nested/crosshair.ts b/packages/devextreme-angular/src/ui/chart/nested/crosshair.ts index f72f38b67343..39830b0a17c9 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/crosshair.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/crosshair.ts @@ -16,7 +16,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; import { chartPointObject } from 'devextreme/viz/chart'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/chart/nested/horizontal-line-label.ts b/packages/devextreme-angular/src/ui/chart/nested/horizontal-line-label.ts index 0b05dc4539e2..0e80954b30aa 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/horizontal-line-label.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/horizontal-line-label.ts @@ -16,7 +16,7 @@ import { import { chartPointObject } from 'devextreme/viz/chart'; import { Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/chart/nested/horizontal-line.ts b/packages/devextreme-angular/src/ui/chart/nested/horizontal-line.ts index 68ce7faa2ef5..c2c28da8c72f 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/horizontal-line.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/horizontal-line.ts @@ -16,7 +16,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; import { chartPointObject } from 'devextreme/viz/chart'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/chart/nested/label.ts b/packages/devextreme-angular/src/ui/chart/nested/label.ts index f8b166a145c9..4d4d4f318601 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/label.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/label.ts @@ -21,7 +21,7 @@ import { DOCUMENT } from '@angular/common'; import { Font, RelativePosition, ChartsAxisLabelOverlap, TextOverflow, WordWrap, DashStyle } from 'devextreme/common/charts'; import { HorizontalAlignment, Position, VerticalAlignment } from 'devextreme/common'; import { ChartLabelDisplayMode } from 'devextreme/viz/chart'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/chart/nested/series-dxi.ts b/packages/devextreme-angular/src/ui/chart/nested/series-dxi.ts index e01a29fea933..cbc8463f7271 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/series-dxi.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/series-dxi.ts @@ -15,7 +15,7 @@ import { import { chartPointAggregationInfoObject, chartSeriesObject, ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { DashStyle, ChartsColor, SeriesHoverMode, HatchDirection, Font, RelativePosition, PointInteractionMode, PointSymbol, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; import { HorizontalAlignment } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/chart/nested/tooltip.ts b/packages/devextreme-angular/src/ui/chart/nested/tooltip.ts index 30b9488b3b05..159fac95755f 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/tooltip.ts @@ -14,7 +14,7 @@ import { -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DashStyle, Font } from 'devextreme/common/charts'; import { ChartTooltipLocation } from 'devextreme/viz/chart'; diff --git a/packages/devextreme-angular/src/ui/chart/nested/value-axis-dxi.ts b/packages/devextreme-angular/src/ui/chart/nested/value-axis-dxi.ts index 45cf04d3f7a6..31156ae930f3 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/value-axis-dxi.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/value-axis-dxi.ts @@ -21,7 +21,7 @@ import * as CommonChartTypes from 'devextreme/common/charts'; import { AggregatedPointsPosition, ChartLabelDisplayMode } from 'devextreme/viz/chart'; import { ScaleBreak, ScaleBreakLineStyle, DashStyle, Font, RelativePosition, DiscreteAxisDivisionMode, ChartsAxisLabelOverlap, TextOverflow, WordWrap, TimeInterval, AxisScaleType, ChartsDataType, VisualRangeUpdateMode } from 'devextreme/common/charts'; import { HorizontalAlignment, VerticalAlignment, Position } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/chart/nested/vertical-line.ts b/packages/devextreme-angular/src/ui/chart/nested/vertical-line.ts index 77b0d6d99f0d..b8cb87725a27 100644 --- a/packages/devextreme-angular/src/ui/chart/nested/vertical-line.ts +++ b/packages/devextreme-angular/src/ui/chart/nested/vertical-line.ts @@ -16,7 +16,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; import { chartPointObject } from 'devextreme/viz/chart'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/chat/index.ts b/packages/devextreme-angular/src/ui/chat/index.ts index 130a45304484..00d47f0e5160 100644 --- a/packages/devextreme-angular/src/ui/chat/index.ts +++ b/packages/devextreme-angular/src/ui/chat/index.ts @@ -26,7 +26,7 @@ import DataSource from 'devextreme/data/data_source'; import { Alert, Message, DisposingEvent, InitializedEvent, MessageEnteredEvent, OptionChangedEvent, TypingEndEvent, TypingStartEvent, User } from 'devextreme/ui/chat'; import { DataSourceOptions } from 'devextreme/data/data_source'; import { Store } from 'devextreme/data/store'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import DxChat from 'devextreme/ui/chat'; diff --git a/packages/devextreme-angular/src/ui/circular-gauge/index.ts b/packages/devextreme-angular/src/ui/circular-gauge/index.ts index 2b0018e383ee..8fb541bdca3a 100644 --- a/packages/devextreme-angular/src/ui/circular-gauge/index.ts +++ b/packages/devextreme-angular/src/ui/circular-gauge/index.ts @@ -23,7 +23,7 @@ import { import { AnimationEaseMode, Font, ChartsColor, Palette, PaletteExtensionMode, LabelOverlap, Theme, TextOverflow, WordWrap, DashStyle } from 'devextreme/common/charts'; import { ExportFormat, HorizontalAlignment, VerticalEdge } from 'devextreme/common'; import { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, OptionChangedEvent, TooltipHiddenEvent, TooltipShownEvent, CircularGaugeElementOrientation, CircularGaugeLabelOverlap } from 'devextreme/viz/circular_gauge'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { GaugeIndicator } from 'devextreme/viz/gauges/base_gauge'; import DxCircularGauge from 'devextreme/viz/circular_gauge'; diff --git a/packages/devextreme-angular/src/ui/circular-gauge/nested/label.ts b/packages/devextreme-angular/src/ui/circular-gauge/nested/label.ts index c6146bdb857f..1f849eecb21a 100644 --- a/packages/devextreme-angular/src/ui/circular-gauge/nested/label.ts +++ b/packages/devextreme-angular/src/ui/circular-gauge/nested/label.ts @@ -15,7 +15,7 @@ import { import { Font, LabelOverlap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { CircularGaugeLabelOverlap } from 'devextreme/viz/circular_gauge'; import { diff --git a/packages/devextreme-angular/src/ui/circular-gauge/nested/scale.ts b/packages/devextreme-angular/src/ui/circular-gauge/nested/scale.ts index 5c333f7867ff..46a851b24c80 100644 --- a/packages/devextreme-angular/src/ui/circular-gauge/nested/scale.ts +++ b/packages/devextreme-angular/src/ui/circular-gauge/nested/scale.ts @@ -15,7 +15,7 @@ import { import { Font, LabelOverlap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { CircularGaugeLabelOverlap, CircularGaugeElementOrientation } from 'devextreme/viz/circular_gauge'; import { diff --git a/packages/devextreme-angular/src/ui/circular-gauge/nested/subvalue-indicator.ts b/packages/devextreme-angular/src/ui/circular-gauge/nested/subvalue-indicator.ts index 7514b1c26f16..a3fab690eb86 100644 --- a/packages/devextreme-angular/src/ui/circular-gauge/nested/subvalue-indicator.ts +++ b/packages/devextreme-angular/src/ui/circular-gauge/nested/subvalue-indicator.ts @@ -16,7 +16,7 @@ import { import { ChartsColor, Palette, Font } from 'devextreme/common/charts'; import { HorizontalEdge, VerticalEdge } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/circular-gauge/nested/text.ts b/packages/devextreme-angular/src/ui/circular-gauge/nested/text.ts index 2f2c724587c7..c5b26f387f86 100644 --- a/packages/devextreme-angular/src/ui/circular-gauge/nested/text.ts +++ b/packages/devextreme-angular/src/ui/circular-gauge/nested/text.ts @@ -15,7 +15,7 @@ import { import { Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/circular-gauge/nested/tooltip.ts b/packages/devextreme-angular/src/ui/circular-gauge/nested/tooltip.ts index 2aa92c806253..7cf8df6aba42 100644 --- a/packages/devextreme-angular/src/ui/circular-gauge/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/circular-gauge/nested/tooltip.ts @@ -15,7 +15,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/circular-gauge/nested/value-indicator.ts b/packages/devextreme-angular/src/ui/circular-gauge/nested/value-indicator.ts index c884eaaad999..78b0128b1b35 100644 --- a/packages/devextreme-angular/src/ui/circular-gauge/nested/value-indicator.ts +++ b/packages/devextreme-angular/src/ui/circular-gauge/nested/value-indicator.ts @@ -16,7 +16,7 @@ import { import { ChartsColor, Palette, Font } from 'devextreme/common/charts'; import { HorizontalEdge, VerticalEdge } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/color-box/nested/animation.ts b/packages/devextreme-angular/src/ui/color-box/nested/animation.ts index 17e6fdaf455f..efa548f41597 100644 --- a/packages/devextreme-angular/src/ui/color-box/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/color-box/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/color-box/nested/collision.ts b/packages/devextreme-angular/src/ui/color-box/nested/collision.ts index 6b91b5e9a69f..b2a7380744fc 100644 --- a/packages/devextreme-angular/src/ui/color-box/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/color-box/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/color-box/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/color-box/nested/drop-down-options.ts index 705976f9b24c..98c2ecf6d1f9 100644 --- a/packages/devextreme-angular/src/ui/color-box/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/color-box/nested/drop-down-options.ts @@ -22,11 +22,11 @@ import { import dxOverlay from 'devextreme/ui/overlay'; import DOMComponent from 'devextreme/core/dom_component'; import dxPopup from 'devextreme/ui/popup'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event, EventInfo } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event } from 'devextreme/events/events.types'; +import { EventInfo } from 'devextreme/common/core/events'; import { Component as CoreComponent } from 'devextreme/core/component'; import { PositionAlignment } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import { diff --git a/packages/devextreme-angular/src/ui/color-box/nested/from.ts b/packages/devextreme-angular/src/ui/color-box/nested/from.ts index 153eca2035c8..6327ea7bd6fa 100644 --- a/packages/devextreme-angular/src/ui/color-box/nested/from.ts +++ b/packages/devextreme-angular/src/ui/color-box/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/color-box/nested/hide.ts b/packages/devextreme-angular/src/ui/color-box/nested/hide.ts index 31807132def2..e9980912df78 100644 --- a/packages/devextreme-angular/src/ui/color-box/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/color-box/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/color-box/nested/position.ts b/packages/devextreme-angular/src/ui/color-box/nested/position.ts index c868a6cdbfec..a7fc8ea8074d 100644 --- a/packages/devextreme-angular/src/ui/color-box/nested/position.ts +++ b/packages/devextreme-angular/src/ui/color-box/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/color-box/nested/show.ts b/packages/devextreme-angular/src/ui/color-box/nested/show.ts index 1c8f66266247..927924fb2fa2 100644 --- a/packages/devextreme-angular/src/ui/color-box/nested/show.ts +++ b/packages/devextreme-angular/src/ui/color-box/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/color-box/nested/to.ts b/packages/devextreme-angular/src/ui/color-box/nested/to.ts index a7b9b3051f3f..9d4b13663230 100644 --- a/packages/devextreme-angular/src/ui/color-box/nested/to.ts +++ b/packages/devextreme-angular/src/ui/color-box/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/context-menu/index.ts b/packages/devextreme-angular/src/ui/context-menu/index.ts index 2ba095b072c4..e5e900a726ff 100644 --- a/packages/devextreme-angular/src/ui/context-menu/index.ts +++ b/packages/devextreme-angular/src/ui/context-menu/index.ts @@ -24,12 +24,11 @@ import { export { ExplicitTypes } from 'devextreme/ui/context_menu'; import DataSource from 'devextreme/data/data_source'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event } from 'devextreme/events/events.types'; import { dxContextMenuItem, ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemRenderedEvent, OptionChangedEvent, PositioningEvent, SelectionChangedEvent, ShowingEvent, ShownEvent, ContextSubmenuDirection } from 'devextreme/ui/context_menu'; import { DataSourceOptions } from 'devextreme/data/data_source'; import { Store } from 'devextreme/data/store'; -import { PositionConfig } from 'devextreme/animation/position'; import { SingleOrNone, SubmenuShowMode } from 'devextreme/common'; import DxContextMenu from 'devextreme/ui/context_menu'; diff --git a/packages/devextreme-angular/src/ui/context-menu/nested/animation.ts b/packages/devextreme-angular/src/ui/context-menu/nested/animation.ts index 3a4b35d6ae27..7594966972fa 100644 --- a/packages/devextreme-angular/src/ui/context-menu/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/context-menu/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/context-menu/nested/collision.ts b/packages/devextreme-angular/src/ui/context-menu/nested/collision.ts index 5a545dec5ade..f79e7ebb3cb9 100644 --- a/packages/devextreme-angular/src/ui/context-menu/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/context-menu/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/context-menu/nested/from.ts b/packages/devextreme-angular/src/ui/context-menu/nested/from.ts index a843a8b291c0..f59884706bc3 100644 --- a/packages/devextreme-angular/src/ui/context-menu/nested/from.ts +++ b/packages/devextreme-angular/src/ui/context-menu/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/context-menu/nested/hide.ts b/packages/devextreme-angular/src/ui/context-menu/nested/hide.ts index 76255d0fed32..b6f569ec7eae 100644 --- a/packages/devextreme-angular/src/ui/context-menu/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/context-menu/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/context-menu/nested/position.ts b/packages/devextreme-angular/src/ui/context-menu/nested/position.ts index 362c1f0cb085..748a7a42bc70 100644 --- a/packages/devextreme-angular/src/ui/context-menu/nested/position.ts +++ b/packages/devextreme-angular/src/ui/context-menu/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/context-menu/nested/show.ts b/packages/devextreme-angular/src/ui/context-menu/nested/show.ts index 1ea02551ade3..a0183da6a6e7 100644 --- a/packages/devextreme-angular/src/ui/context-menu/nested/show.ts +++ b/packages/devextreme-angular/src/ui/context-menu/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/context-menu/nested/to.ts b/packages/devextreme-angular/src/ui/context-menu/nested/to.ts index 2a62ccce7f31..6ff30d7125ea 100644 --- a/packages/devextreme-angular/src/ui/context-menu/nested/to.ts +++ b/packages/devextreme-angular/src/ui/context-menu/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/index.ts b/packages/devextreme-angular/src/ui/data-grid/index.ts index cb73f73643b1..6d60f8d17b7b 100644 --- a/packages/devextreme-angular/src/ui/data-grid/index.ts +++ b/packages/devextreme-angular/src/ui/data-grid/index.ts @@ -28,7 +28,7 @@ import dxDataGrid from 'devextreme/ui/data_grid'; import dxSortable from 'devextreme/ui/sortable'; import dxDraggable from 'devextreme/ui/draggable'; import { ColumnChooserMode, ColumnChooserSearchConfig, ColumnChooserSelectionConfig, ColumnResizeMode, DataChange, GridsEditMode, NewRowPosition, GridsEditRefreshMode, StartEditAction, GridBase, ApplyFilterMode, GroupExpandMode, HeaderFilterSearchConfig, EnterKeyAction, EnterKeyDirection, Pager, DataRenderMode, SelectionColumnDisplayMode, StateStoreType, SummaryType } from 'devextreme/common/grids'; -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { SortOrder, Mode, DragDirection, DragHighlight, ScrollbarMode, SingleMultipleOrNone, SelectAllMode, HorizontalAlignment } from 'devextreme/common'; import { dxDataGridColumn, dxDataGridRowObject, DataGridExportFormat, AdaptiveDetailRowPreparingEvent, CellClickEvent, CellDblClickEvent, CellHoverChangedEvent, CellPreparedEvent, ContentReadyEvent, ContextMenuPreparingEvent, DataErrorOccurredEvent, DisposingEvent, EditCanceledEvent, EditCancelingEvent, EditingStartEvent, EditorPreparedEvent, EditorPreparingEvent, ExportingEvent, FocusedCellChangedEvent, FocusedCellChangingEvent, FocusedRowChangedEvent, FocusedRowChangingEvent, InitializedEvent, InitNewRowEvent, KeyDownEvent, OptionChangedEvent, RowClickEvent, RowCollapsedEvent, RowCollapsingEvent, RowDblClickEvent, RowExpandedEvent, RowExpandingEvent, RowInsertedEvent, RowInsertingEvent, RowPreparedEvent, RowRemovedEvent, RowRemovingEvent, RowUpdatedEvent, RowUpdatingEvent, RowValidatingEvent, SavedEvent, SavingEvent, SelectionChangedEvent, ToolbarPreparingEvent, DataGridScrollMode, SelectionSensitivity, dxDataGridToolbar } from 'devextreme/ui/data_grid'; import { DataSourceOptions } from 'devextreme/data/data_source'; @@ -36,8 +36,8 @@ import { Store } from 'devextreme/data/store'; import { dxFormOptions } from 'devextreme/ui/form'; import { dxPopupOptions } from 'devextreme/ui/popup'; import { dxFilterBuilderOptions } from 'devextreme/ui/filter_builder'; -import { event } from 'devextreme/events/index'; -import { Format } from 'devextreme/localization'; +import { event } from 'devextreme/events/events.types'; +import { Format } from 'devextreme/common/core/localization'; import DxDataGrid from 'devextreme/ui/data_grid'; diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/animation.ts b/packages/devextreme-angular/src/ui/data-grid/nested/animation.ts index 0e47d8ab5bf9..160a4e032aa1 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/collision.ts b/packages/devextreme-angular/src/ui/data-grid/nested/collision.ts index b9d4a89d65ff..1aee9afb4442 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/column-chooser.ts b/packages/devextreme-angular/src/ui/data-grid/nested/column-chooser.ts index ca1d8d41e4dd..5990d158da3c 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/column-chooser.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/column-chooser.ts @@ -15,7 +15,7 @@ import { import { ColumnChooserMode, ColumnChooserSearchConfig, ColumnChooserSelectionConfig } from 'devextreme/common/grids'; -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { SortOrder } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/column-dxi.ts b/packages/devextreme-angular/src/ui/data-grid/nested/column-dxi.ts index 671f1861226f..9cb8be81f4b7 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/column-dxi.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/column-dxi.ts @@ -21,7 +21,7 @@ import * as CommonTypes from 'devextreme/common'; import { HorizontalAlignment, DataType, SearchMode, SortOrder } from 'devextreme/common'; import { DataGridPredefinedColumnButton, dxDataGridColumnButton, dxDataGridColumn, DataGridCommandColumnType } from 'devextreme/ui/data_grid'; import { FilterOperation, FilterType, FixedPosition, HeaderFilterGroupInterval, ColumnHeaderFilterSearchConfig, SelectedFilterOperation } from 'devextreme/common/grids'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { dxFormSimpleItem } from 'devextreme/ui/form'; import { DataSourceOptions } from 'devextreme/data/data_source'; import { Store } from 'devextreme/data/store'; diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/field-dxi.ts b/packages/devextreme-angular/src/ui/data-grid/nested/field-dxi.ts index 200376dfee4c..6330206edd52 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/field-dxi.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/field-dxi.ts @@ -14,7 +14,7 @@ import { import { DataType } from 'devextreme/common'; import { FilterBuilderOperation } from 'devextreme/ui/filter_builder'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DataSourceOptions } from 'devextreme/data/data_source'; import { Store } from 'devextreme/data/store'; diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/filter-builder-popup.ts b/packages/devextreme-angular/src/ui/data-grid/nested/filter-builder-popup.ts index 56ef89ad8f5b..f2ccc16f1e2c 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/filter-builder-popup.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/filter-builder-popup.ts @@ -19,11 +19,11 @@ import { import dxOverlay from 'devextreme/ui/overlay'; import DOMComponent from 'devextreme/core/dom_component'; import dxPopup from 'devextreme/ui/popup'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event, EventInfo } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event } from 'devextreme/events/events.types'; +import { EventInfo } from 'devextreme/common/core/events'; import { Component as CoreComponent } from 'devextreme/core/component'; import { PositionAlignment } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import { diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/from.ts b/packages/devextreme-angular/src/ui/data-grid/nested/from.ts index 35ac8347631e..b3c614629467 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/from.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/group-item-dxi.ts b/packages/devextreme-angular/src/ui/data-grid/nested/group-item-dxi.ts index 28b64dd4ccc1..ec16af30e49e 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/group-item-dxi.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/group-item-dxi.ts @@ -13,7 +13,7 @@ import { import { SummaryType } from 'devextreme/common/grids'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/hide.ts b/packages/devextreme-angular/src/ui/data-grid/nested/hide.ts index 100b25b03d7d..30b53359f0f2 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/popup.ts b/packages/devextreme-angular/src/ui/data-grid/nested/popup.ts index 0ebef132c2b3..9c4460ca91a9 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/popup.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/popup.ts @@ -22,11 +22,11 @@ import { import dxOverlay from 'devextreme/ui/overlay'; import DOMComponent from 'devextreme/core/dom_component'; import dxPopup from 'devextreme/ui/popup'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event, EventInfo } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event } from 'devextreme/events/events.types'; +import { EventInfo } from 'devextreme/common/core/events'; import { Component as CoreComponent } from 'devextreme/core/component'; import { PositionAlignment } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import { diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/position.ts b/packages/devextreme-angular/src/ui/data-grid/nested/position.ts index e91c6fe35523..a97f07d52165 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/position.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/row-dragging.ts b/packages/devextreme-angular/src/ui/data-grid/nested/row-dragging.ts index 92b57f53eca7..6a983762ff22 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/row-dragging.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/row-dragging.ts @@ -18,7 +18,7 @@ import dxSortable from 'devextreme/ui/sortable'; import dxDraggable from 'devextreme/ui/draggable'; import { DragDirection, DragHighlight } from 'devextreme/common'; import { GridBase } from 'devextreme/common/grids'; -import { event } from 'devextreme/events/index'; +import { event } from 'devextreme/events/events.types'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/show.ts b/packages/devextreme-angular/src/ui/data-grid/nested/show.ts index 257067fb9748..eda205474729 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/show.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/summary.ts b/packages/devextreme-angular/src/ui/data-grid/nested/summary.ts index 18c76d902d1f..faf42826c052 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/summary.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/summary.ts @@ -19,7 +19,7 @@ import { import dxDataGrid from 'devextreme/ui/data_grid'; import { SummaryType } from 'devextreme/common/grids'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { HorizontalAlignment } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/to.ts b/packages/devextreme-angular/src/ui/data-grid/nested/to.ts index ee98029726ab..9c2c85a94905 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/to.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/data-grid/nested/total-item-dxi.ts b/packages/devextreme-angular/src/ui/data-grid/nested/total-item-dxi.ts index 870cfd595f20..d912608733ac 100644 --- a/packages/devextreme-angular/src/ui/data-grid/nested/total-item-dxi.ts +++ b/packages/devextreme-angular/src/ui/data-grid/nested/total-item-dxi.ts @@ -14,7 +14,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { SummaryType } from 'devextreme/common/grids'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-box/index.ts b/packages/devextreme-angular/src/ui/date-box/index.ts index ebf9b047aade..7c5d2ee31505 100644 --- a/packages/devextreme-angular/src/ui/date-box/index.ts +++ b/packages/devextreme-angular/src/ui/date-box/index.ts @@ -28,7 +28,7 @@ import dxDateBox from 'devextreme/ui/date_box'; import { ApplyValueMode, TextEditorButton, LabelMode, EditorStyle, ValidationMessageMode, Mode, Position, ValidationStatus } from 'devextreme/common'; import { DropDownPredefinedButton } from 'devextreme/ui/drop_down_editor/ui.drop_down_editor'; import { dxCalendarOptions } from 'devextreme/ui/calendar'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { dxPopupOptions } from 'devextreme/ui/popup'; import { ChangeEvent, ClosedEvent, ContentReadyEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, KeyDownEvent, KeyUpEvent, OpenedEvent, OptionChangedEvent, PasteEvent, ValueChangedEvent, DatePickerType, DateType } from 'devextreme/ui/date_box'; diff --git a/packages/devextreme-angular/src/ui/date-box/nested/animation.ts b/packages/devextreme-angular/src/ui/date-box/nested/animation.ts index 44b52ee168a3..e4098f25e80b 100644 --- a/packages/devextreme-angular/src/ui/date-box/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/date-box/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-box/nested/collision.ts b/packages/devextreme-angular/src/ui/date-box/nested/collision.ts index 9fc9e5a49952..f295cc9a4276 100644 --- a/packages/devextreme-angular/src/ui/date-box/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/date-box/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-box/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/date-box/nested/drop-down-options.ts index 4e6f15ca3766..f8b528cf8c18 100644 --- a/packages/devextreme-angular/src/ui/date-box/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/date-box/nested/drop-down-options.ts @@ -22,11 +22,11 @@ import { import dxOverlay from 'devextreme/ui/overlay'; import DOMComponent from 'devextreme/core/dom_component'; import dxPopup from 'devextreme/ui/popup'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event, EventInfo } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event } from 'devextreme/events/events.types'; +import { EventInfo } from 'devextreme/common/core/events'; import { Component as CoreComponent } from 'devextreme/core/component'; import { PositionAlignment } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import { diff --git a/packages/devextreme-angular/src/ui/date-box/nested/from.ts b/packages/devextreme-angular/src/ui/date-box/nested/from.ts index 14f8a16f2eab..7755cc879f71 100644 --- a/packages/devextreme-angular/src/ui/date-box/nested/from.ts +++ b/packages/devextreme-angular/src/ui/date-box/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-box/nested/hide.ts b/packages/devextreme-angular/src/ui/date-box/nested/hide.ts index 5cdca518af54..e79f9ea03eb6 100644 --- a/packages/devextreme-angular/src/ui/date-box/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/date-box/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/date-box/nested/position.ts b/packages/devextreme-angular/src/ui/date-box/nested/position.ts index f668ab56626d..e5ba8c6be6f6 100644 --- a/packages/devextreme-angular/src/ui/date-box/nested/position.ts +++ b/packages/devextreme-angular/src/ui/date-box/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-box/nested/show.ts b/packages/devextreme-angular/src/ui/date-box/nested/show.ts index 965f23179de4..db9a83fee1ce 100644 --- a/packages/devextreme-angular/src/ui/date-box/nested/show.ts +++ b/packages/devextreme-angular/src/ui/date-box/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/date-box/nested/to.ts b/packages/devextreme-angular/src/ui/date-box/nested/to.ts index d354fb9adeff..26f927f858e6 100644 --- a/packages/devextreme-angular/src/ui/date-box/nested/to.ts +++ b/packages/devextreme-angular/src/ui/date-box/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-range-box/index.ts b/packages/devextreme-angular/src/ui/date-range-box/index.ts index 17ed3de6c059..a457b2e7525b 100644 --- a/packages/devextreme-angular/src/ui/date-range-box/index.ts +++ b/packages/devextreme-angular/src/ui/date-range-box/index.ts @@ -27,7 +27,7 @@ import { import { ApplyValueMode, TextEditorButton, LabelMode, EditorStyle, ValidationMessageMode, Mode, Position, ValidationStatus } from 'devextreme/common'; import { DropDownPredefinedButton } from 'devextreme/ui/drop_down_editor/ui.drop_down_editor'; import { dxCalendarOptions } from 'devextreme/ui/calendar'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { dxPopupOptions } from 'devextreme/ui/popup'; import { ChangeEvent, ClosedEvent, ContentReadyEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, KeyDownEvent, KeyUpEvent, OpenedEvent, OptionChangedEvent, PasteEvent, ValueChangedEvent } from 'devextreme/ui/date_range_box'; diff --git a/packages/devextreme-angular/src/ui/date-range-box/nested/animation.ts b/packages/devextreme-angular/src/ui/date-range-box/nested/animation.ts index 3f73fa4bd6b3..70af37164f88 100644 --- a/packages/devextreme-angular/src/ui/date-range-box/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/date-range-box/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-range-box/nested/collision.ts b/packages/devextreme-angular/src/ui/date-range-box/nested/collision.ts index 1ff952ce579b..afa98b591c22 100644 --- a/packages/devextreme-angular/src/ui/date-range-box/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/date-range-box/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-range-box/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/date-range-box/nested/drop-down-options.ts index 99ec00b6e941..83d6b1c676db 100644 --- a/packages/devextreme-angular/src/ui/date-range-box/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/date-range-box/nested/drop-down-options.ts @@ -22,11 +22,11 @@ import { import dxOverlay from 'devextreme/ui/overlay'; import DOMComponent from 'devextreme/core/dom_component'; import dxPopup from 'devextreme/ui/popup'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event, EventInfo } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event } from 'devextreme/events/events.types'; +import { EventInfo } from 'devextreme/common/core/events'; import { Component as CoreComponent } from 'devextreme/core/component'; import { PositionAlignment } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import { diff --git a/packages/devextreme-angular/src/ui/date-range-box/nested/from.ts b/packages/devextreme-angular/src/ui/date-range-box/nested/from.ts index 0207d77f4b67..432c15d7564b 100644 --- a/packages/devextreme-angular/src/ui/date-range-box/nested/from.ts +++ b/packages/devextreme-angular/src/ui/date-range-box/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-range-box/nested/hide.ts b/packages/devextreme-angular/src/ui/date-range-box/nested/hide.ts index 8188e978b63e..b3b160576e49 100644 --- a/packages/devextreme-angular/src/ui/date-range-box/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/date-range-box/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/date-range-box/nested/position.ts b/packages/devextreme-angular/src/ui/date-range-box/nested/position.ts index 1f7613b959a4..37f6437612b5 100644 --- a/packages/devextreme-angular/src/ui/date-range-box/nested/position.ts +++ b/packages/devextreme-angular/src/ui/date-range-box/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/date-range-box/nested/show.ts b/packages/devextreme-angular/src/ui/date-range-box/nested/show.ts index 9dc70f99e7d8..0b1534035978 100644 --- a/packages/devextreme-angular/src/ui/date-range-box/nested/show.ts +++ b/packages/devextreme-angular/src/ui/date-range-box/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/date-range-box/nested/to.ts b/packages/devextreme-angular/src/ui/date-range-box/nested/to.ts index b8d6422ac390..81387cd87520 100644 --- a/packages/devextreme-angular/src/ui/date-range-box/nested/to.ts +++ b/packages/devextreme-angular/src/ui/date-range-box/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/defer-rendering/index.ts b/packages/devextreme-angular/src/ui/defer-rendering/index.ts index 8542e8a4bd30..04d631d6906e 100644 --- a/packages/devextreme-angular/src/ui/defer-rendering/index.ts +++ b/packages/devextreme-angular/src/ui/defer-rendering/index.ts @@ -17,7 +17,7 @@ import { } from '@angular/core'; -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { ContentReadyEvent, DisposingEvent, InitializedEvent, OptionChangedEvent, RenderedEvent, ShownEvent } from 'devextreme/ui/defer_rendering'; import { DxPromise } from 'devextreme/core/utils/deferred'; diff --git a/packages/devextreme-angular/src/ui/defer-rendering/nested/animation.ts b/packages/devextreme-angular/src/ui/defer-rendering/nested/animation.ts index b8a057314a3d..465536f13366 100644 --- a/packages/devextreme-angular/src/ui/defer-rendering/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/defer-rendering/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/defer-rendering/nested/collision.ts b/packages/devextreme-angular/src/ui/defer-rendering/nested/collision.ts index 85417424ea71..b4f2f9c8ee0c 100644 --- a/packages/devextreme-angular/src/ui/defer-rendering/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/defer-rendering/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/defer-rendering/nested/from.ts b/packages/devextreme-angular/src/ui/defer-rendering/nested/from.ts index ed0b403192c7..5bf137547e7f 100644 --- a/packages/devextreme-angular/src/ui/defer-rendering/nested/from.ts +++ b/packages/devextreme-angular/src/ui/defer-rendering/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/defer-rendering/nested/position.ts b/packages/devextreme-angular/src/ui/defer-rendering/nested/position.ts index 1e8a23218e8c..0800808757c7 100644 --- a/packages/devextreme-angular/src/ui/defer-rendering/nested/position.ts +++ b/packages/devextreme-angular/src/ui/defer-rendering/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/defer-rendering/nested/to.ts b/packages/devextreme-angular/src/ui/defer-rendering/nested/to.ts index 045b06934978..c6d052ce5b90 100644 --- a/packages/devextreme-angular/src/ui/defer-rendering/nested/to.ts +++ b/packages/devextreme-angular/src/ui/defer-rendering/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drawer/index.ts b/packages/devextreme-angular/src/ui/drawer/index.ts index 053816ce6a0f..a2f08d33ed0e 100644 --- a/packages/devextreme-angular/src/ui/drawer/index.ts +++ b/packages/devextreme-angular/src/ui/drawer/index.ts @@ -17,7 +17,7 @@ import { } from '@angular/core'; -import { event } from 'devextreme/events/index'; +import { event } from 'devextreme/events/events.types'; import { DisposingEvent, InitializedEvent, OptionChangedEvent, OpenedStateMode, PanelLocation, RevealMode } from 'devextreme/ui/drawer'; import DxDrawer from 'devextreme/ui/drawer'; diff --git a/packages/devextreme-angular/src/ui/drop-down-box/nested/animation.ts b/packages/devextreme-angular/src/ui/drop-down-box/nested/animation.ts index f4357f00e3fc..0b9911cc3fe3 100644 --- a/packages/devextreme-angular/src/ui/drop-down-box/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/drop-down-box/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-box/nested/collision.ts b/packages/devextreme-angular/src/ui/drop-down-box/nested/collision.ts index 46c782f70fd3..733a0006099c 100644 --- a/packages/devextreme-angular/src/ui/drop-down-box/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/drop-down-box/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-box/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/drop-down-box/nested/drop-down-options.ts index 61ed85322d1a..fdd881c15fae 100644 --- a/packages/devextreme-angular/src/ui/drop-down-box/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/drop-down-box/nested/drop-down-options.ts @@ -22,11 +22,11 @@ import { import dxOverlay from 'devextreme/ui/overlay'; import DOMComponent from 'devextreme/core/dom_component'; import dxPopup from 'devextreme/ui/popup'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event, EventInfo } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event } from 'devextreme/events/events.types'; +import { EventInfo } from 'devextreme/common/core/events'; import { Component as CoreComponent } from 'devextreme/core/component'; import { PositionAlignment } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import { diff --git a/packages/devextreme-angular/src/ui/drop-down-box/nested/from.ts b/packages/devextreme-angular/src/ui/drop-down-box/nested/from.ts index 0f9a2ae35b13..739262cdb6ce 100644 --- a/packages/devextreme-angular/src/ui/drop-down-box/nested/from.ts +++ b/packages/devextreme-angular/src/ui/drop-down-box/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-box/nested/hide.ts b/packages/devextreme-angular/src/ui/drop-down-box/nested/hide.ts index 84bd2aa37da8..b166131c7f6b 100644 --- a/packages/devextreme-angular/src/ui/drop-down-box/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/drop-down-box/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/drop-down-box/nested/position.ts b/packages/devextreme-angular/src/ui/drop-down-box/nested/position.ts index 014e0c6946ec..be2f0d4975cc 100644 --- a/packages/devextreme-angular/src/ui/drop-down-box/nested/position.ts +++ b/packages/devextreme-angular/src/ui/drop-down-box/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-box/nested/show.ts b/packages/devextreme-angular/src/ui/drop-down-box/nested/show.ts index f44e7d7bb8d6..fd58c8b41bf5 100644 --- a/packages/devextreme-angular/src/ui/drop-down-box/nested/show.ts +++ b/packages/devextreme-angular/src/ui/drop-down-box/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/drop-down-box/nested/to.ts b/packages/devextreme-angular/src/ui/drop-down-box/nested/to.ts index f4235b576860..8ef6ad765f6e 100644 --- a/packages/devextreme-angular/src/ui/drop-down-box/nested/to.ts +++ b/packages/devextreme-angular/src/ui/drop-down-box/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-button/nested/animation.ts b/packages/devextreme-angular/src/ui/drop-down-button/nested/animation.ts index 781529c8020a..8d8cd936e825 100644 --- a/packages/devextreme-angular/src/ui/drop-down-button/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/drop-down-button/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-button/nested/collision.ts b/packages/devextreme-angular/src/ui/drop-down-button/nested/collision.ts index a2c31d7d31f9..b1c7c167e2e0 100644 --- a/packages/devextreme-angular/src/ui/drop-down-button/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/drop-down-button/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-button/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/drop-down-button/nested/drop-down-options.ts index 61fe5cced05e..e1bdf04c2a90 100644 --- a/packages/devextreme-angular/src/ui/drop-down-button/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/drop-down-button/nested/drop-down-options.ts @@ -22,11 +22,11 @@ import { import dxOverlay from 'devextreme/ui/overlay'; import DOMComponent from 'devextreme/core/dom_component'; import dxPopup from 'devextreme/ui/popup'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event, EventInfo } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event } from 'devextreme/events/events.types'; +import { EventInfo } from 'devextreme/common/core/events'; import { Component as CoreComponent } from 'devextreme/core/component'; import { PositionAlignment } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import { diff --git a/packages/devextreme-angular/src/ui/drop-down-button/nested/from.ts b/packages/devextreme-angular/src/ui/drop-down-button/nested/from.ts index 8b3d9f53f4e6..55ff680aae74 100644 --- a/packages/devextreme-angular/src/ui/drop-down-button/nested/from.ts +++ b/packages/devextreme-angular/src/ui/drop-down-button/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-button/nested/hide.ts b/packages/devextreme-angular/src/ui/drop-down-button/nested/hide.ts index 0b1b5f03aad2..8c68b022f457 100644 --- a/packages/devextreme-angular/src/ui/drop-down-button/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/drop-down-button/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/drop-down-button/nested/position.ts b/packages/devextreme-angular/src/ui/drop-down-button/nested/position.ts index a20075abb9b5..e1b2d36af4df 100644 --- a/packages/devextreme-angular/src/ui/drop-down-button/nested/position.ts +++ b/packages/devextreme-angular/src/ui/drop-down-button/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/drop-down-button/nested/show.ts b/packages/devextreme-angular/src/ui/drop-down-button/nested/show.ts index e85d7ffd3989..c7b67a45e6d1 100644 --- a/packages/devextreme-angular/src/ui/drop-down-button/nested/show.ts +++ b/packages/devextreme-angular/src/ui/drop-down-button/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/drop-down-button/nested/to.ts b/packages/devextreme-angular/src/ui/drop-down-button/nested/to.ts index db2ced937087..d88f223fc5cb 100644 --- a/packages/devextreme-angular/src/ui/drop-down-button/nested/to.ts +++ b/packages/devextreme-angular/src/ui/drop-down-button/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/filter-builder/nested/field-dxi.ts b/packages/devextreme-angular/src/ui/filter-builder/nested/field-dxi.ts index 5f78539ce8fd..ffb2e61c6519 100644 --- a/packages/devextreme-angular/src/ui/filter-builder/nested/field-dxi.ts +++ b/packages/devextreme-angular/src/ui/filter-builder/nested/field-dxi.ts @@ -14,7 +14,7 @@ import { import { DataType } from 'devextreme/common'; import { FilterBuilderOperation } from 'devextreme/ui/filter_builder'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DataSourceOptions } from 'devextreme/data/data_source'; import { Store } from 'devextreme/data/store'; diff --git a/packages/devextreme-angular/src/ui/funnel/index.ts b/packages/devextreme-angular/src/ui/funnel/index.ts index 73880049619e..c691dba9fc12 100644 --- a/packages/devextreme-angular/src/ui/funnel/index.ts +++ b/packages/devextreme-angular/src/ui/funnel/index.ts @@ -26,7 +26,7 @@ import { DataSourceOptions } from 'devextreme/data/data_source'; import { Store } from 'devextreme/data/store'; import { ExportFormat, HorizontalEdge, HorizontalAlignment, Position, Orientation, VerticalEdge, SingleMultipleOrNone } from 'devextreme/common'; import { HatchDirection, DashStyle, Font, LabelPosition, TextOverflow, WordWrap, Palette, PaletteExtensionMode, ShiftLabelOverlap, Theme } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import DxFunnel from 'devextreme/viz/funnel'; diff --git a/packages/devextreme-angular/src/ui/funnel/nested/label.ts b/packages/devextreme-angular/src/ui/funnel/nested/label.ts index 0c05a4adc84b..fb2972425491 100644 --- a/packages/devextreme-angular/src/ui/funnel/nested/label.ts +++ b/packages/devextreme-angular/src/ui/funnel/nested/label.ts @@ -16,7 +16,7 @@ import { import { DashStyle, Font, LabelPosition, TextOverflow, WordWrap } from 'devextreme/common/charts'; import { dxFunnelItem } from 'devextreme/viz/funnel'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { HorizontalEdge } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/funnel/nested/tooltip.ts b/packages/devextreme-angular/src/ui/funnel/nested/tooltip.ts index 835371e807ff..a7954d27429e 100644 --- a/packages/devextreme-angular/src/ui/funnel/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/funnel/nested/tooltip.ts @@ -16,7 +16,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; import { dxFunnelItem } from 'devextreme/viz/funnel'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/gantt/nested/column-dxi.ts b/packages/devextreme-angular/src/ui/gantt/nested/column-dxi.ts index a918dd31e800..177604efadfb 100644 --- a/packages/devextreme-angular/src/ui/gantt/nested/column-dxi.ts +++ b/packages/devextreme-angular/src/ui/gantt/nested/column-dxi.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment, DataType, SearchMode, SortOrder } from 'devextreme/common'; import { FilterOperation, FilterType, HeaderFilterGroupInterval, ColumnHeaderFilterSearchConfig, SelectedFilterOperation } from 'devextreme/common/grids'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DataSourceOptions } from 'devextreme/data/data_source'; import { Store } from 'devextreme/data/store'; diff --git a/packages/devextreme-angular/src/ui/linear-gauge/index.ts b/packages/devextreme-angular/src/ui/linear-gauge/index.ts index b370530cfe7e..1e5c288ef831 100644 --- a/packages/devextreme-angular/src/ui/linear-gauge/index.ts +++ b/packages/devextreme-angular/src/ui/linear-gauge/index.ts @@ -23,7 +23,7 @@ import { import { AnimationEaseMode, Font, ChartsColor, Palette, PaletteExtensionMode, LabelOverlap, Theme, TextOverflow, WordWrap, DashStyle } from 'devextreme/common/charts'; import { ExportFormat, Orientation, HorizontalAlignment, VerticalAlignment, VerticalEdge } from 'devextreme/common'; import { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, OptionChangedEvent, TooltipHiddenEvent, TooltipShownEvent } from 'devextreme/viz/linear_gauge'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { GaugeIndicator } from 'devextreme/viz/gauges/base_gauge'; import DxLinearGauge from 'devextreme/viz/linear_gauge'; diff --git a/packages/devextreme-angular/src/ui/linear-gauge/nested/label.ts b/packages/devextreme-angular/src/ui/linear-gauge/nested/label.ts index 96f74dcec348..28632aa4d778 100644 --- a/packages/devextreme-angular/src/ui/linear-gauge/nested/label.ts +++ b/packages/devextreme-angular/src/ui/linear-gauge/nested/label.ts @@ -15,7 +15,7 @@ import { import { Font, LabelOverlap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/linear-gauge/nested/scale.ts b/packages/devextreme-angular/src/ui/linear-gauge/nested/scale.ts index c766ac842cfc..58c1a6f1df91 100644 --- a/packages/devextreme-angular/src/ui/linear-gauge/nested/scale.ts +++ b/packages/devextreme-angular/src/ui/linear-gauge/nested/scale.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; import { Font, LabelOverlap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/linear-gauge/nested/subvalue-indicator.ts b/packages/devextreme-angular/src/ui/linear-gauge/nested/subvalue-indicator.ts index 3384cebac527..7a93ee9fc71c 100644 --- a/packages/devextreme-angular/src/ui/linear-gauge/nested/subvalue-indicator.ts +++ b/packages/devextreme-angular/src/ui/linear-gauge/nested/subvalue-indicator.ts @@ -16,7 +16,7 @@ import { import { ChartsColor, Palette, Font } from 'devextreme/common/charts'; import { HorizontalEdge, VerticalEdge } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/linear-gauge/nested/text.ts b/packages/devextreme-angular/src/ui/linear-gauge/nested/text.ts index 80329ef6bdd6..5fa1f10a102a 100644 --- a/packages/devextreme-angular/src/ui/linear-gauge/nested/text.ts +++ b/packages/devextreme-angular/src/ui/linear-gauge/nested/text.ts @@ -15,7 +15,7 @@ import { import { Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/linear-gauge/nested/tooltip.ts b/packages/devextreme-angular/src/ui/linear-gauge/nested/tooltip.ts index 982a5fb06475..26713d4276bb 100644 --- a/packages/devextreme-angular/src/ui/linear-gauge/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/linear-gauge/nested/tooltip.ts @@ -15,7 +15,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/linear-gauge/nested/value-indicator.ts b/packages/devextreme-angular/src/ui/linear-gauge/nested/value-indicator.ts index 57808a3c4ed4..61d93efc1c45 100644 --- a/packages/devextreme-angular/src/ui/linear-gauge/nested/value-indicator.ts +++ b/packages/devextreme-angular/src/ui/linear-gauge/nested/value-indicator.ts @@ -16,7 +16,7 @@ import { import { ChartsColor, Palette, Font } from 'devextreme/common/charts'; import { HorizontalEdge, VerticalEdge } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/load-panel/index.ts b/packages/devextreme-angular/src/ui/load-panel/index.ts index 022b1a9ccabe..95fb08fa0afc 100644 --- a/packages/devextreme-angular/src/ui/load-panel/index.ts +++ b/packages/devextreme-angular/src/ui/load-panel/index.ts @@ -17,11 +17,10 @@ import { } from '@angular/core'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event } from 'devextreme/events/events.types'; import { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, OptionChangedEvent, ShowingEvent, ShownEvent } from 'devextreme/ui/load_panel'; import { PositionAlignment } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import DxLoadPanel from 'devextreme/ui/load_panel'; diff --git a/packages/devextreme-angular/src/ui/load-panel/nested/animation.ts b/packages/devextreme-angular/src/ui/load-panel/nested/animation.ts index 2cb5791080dc..c7cff62b2841 100644 --- a/packages/devextreme-angular/src/ui/load-panel/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/load-panel/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/load-panel/nested/collision.ts b/packages/devextreme-angular/src/ui/load-panel/nested/collision.ts index 7109f2eb3c11..995b9f1624aa 100644 --- a/packages/devextreme-angular/src/ui/load-panel/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/load-panel/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/load-panel/nested/from.ts b/packages/devextreme-angular/src/ui/load-panel/nested/from.ts index 53f095a9513f..d01f068fd4cf 100644 --- a/packages/devextreme-angular/src/ui/load-panel/nested/from.ts +++ b/packages/devextreme-angular/src/ui/load-panel/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/load-panel/nested/hide.ts b/packages/devextreme-angular/src/ui/load-panel/nested/hide.ts index 3addc875e492..c67345051c2b 100644 --- a/packages/devextreme-angular/src/ui/load-panel/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/load-panel/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/load-panel/nested/position.ts b/packages/devextreme-angular/src/ui/load-panel/nested/position.ts index f2896806b615..1abc67b6f244 100644 --- a/packages/devextreme-angular/src/ui/load-panel/nested/position.ts +++ b/packages/devextreme-angular/src/ui/load-panel/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/load-panel/nested/show.ts b/packages/devextreme-angular/src/ui/load-panel/nested/show.ts index 21b4ba122e75..ef0fd098d6be 100644 --- a/packages/devextreme-angular/src/ui/load-panel/nested/show.ts +++ b/packages/devextreme-angular/src/ui/load-panel/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/load-panel/nested/to.ts b/packages/devextreme-angular/src/ui/load-panel/nested/to.ts index ce9bb916da11..da284d7812e9 100644 --- a/packages/devextreme-angular/src/ui/load-panel/nested/to.ts +++ b/packages/devextreme-angular/src/ui/load-panel/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/lookup/nested/animation.ts b/packages/devextreme-angular/src/ui/lookup/nested/animation.ts index 900c13f36186..05c6d7cc4ecb 100644 --- a/packages/devextreme-angular/src/ui/lookup/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/lookup/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/lookup/nested/collision.ts b/packages/devextreme-angular/src/ui/lookup/nested/collision.ts index 753713672a8c..9908a9cfe74d 100644 --- a/packages/devextreme-angular/src/ui/lookup/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/lookup/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/lookup/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/lookup/nested/drop-down-options.ts index 193d199a0394..558010270f05 100644 --- a/packages/devextreme-angular/src/ui/lookup/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/lookup/nested/drop-down-options.ts @@ -19,11 +19,10 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event } from 'devextreme/events/events.types'; import { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, OptionChangedEvent, ShowingEvent, ShownEvent, TitleRenderedEvent } from 'devextreme/ui/popover'; import { Position } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import { diff --git a/packages/devextreme-angular/src/ui/lookup/nested/from.ts b/packages/devextreme-angular/src/ui/lookup/nested/from.ts index 36e9627ed2df..2aec82a953d3 100644 --- a/packages/devextreme-angular/src/ui/lookup/nested/from.ts +++ b/packages/devextreme-angular/src/ui/lookup/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/lookup/nested/hide.ts b/packages/devextreme-angular/src/ui/lookup/nested/hide.ts index da1d44676aae..e4be9750b683 100644 --- a/packages/devextreme-angular/src/ui/lookup/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/lookup/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/lookup/nested/position.ts b/packages/devextreme-angular/src/ui/lookup/nested/position.ts index 302ed789f4f5..87d896602897 100644 --- a/packages/devextreme-angular/src/ui/lookup/nested/position.ts +++ b/packages/devextreme-angular/src/ui/lookup/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/lookup/nested/show.ts b/packages/devextreme-angular/src/ui/lookup/nested/show.ts index 7f2ee01e84f7..49ffef9c6145 100644 --- a/packages/devextreme-angular/src/ui/lookup/nested/show.ts +++ b/packages/devextreme-angular/src/ui/lookup/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/lookup/nested/to.ts b/packages/devextreme-angular/src/ui/lookup/nested/to.ts index e5e04fce98ec..89b998e5ecb2 100644 --- a/packages/devextreme-angular/src/ui/lookup/nested/to.ts +++ b/packages/devextreme-angular/src/ui/lookup/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/menu/index.ts b/packages/devextreme-angular/src/ui/menu/index.ts index db41fafbbb49..cd91855cf623 100644 --- a/packages/devextreme-angular/src/ui/menu/index.ts +++ b/packages/devextreme-angular/src/ui/menu/index.ts @@ -24,7 +24,7 @@ import { export { ExplicitTypes } from 'devextreme/ui/menu'; import DataSource from 'devextreme/data/data_source'; -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { dxMenuItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemRenderedEvent, OptionChangedEvent, SelectionChangedEvent, SubmenuHiddenEvent, SubmenuHidingEvent, SubmenuShowingEvent, SubmenuShownEvent, SubmenuDirection } from 'devextreme/ui/menu'; import { DataSourceOptions } from 'devextreme/data/data_source'; import { Store } from 'devextreme/data/store'; diff --git a/packages/devextreme-angular/src/ui/menu/nested/animation.ts b/packages/devextreme-angular/src/ui/menu/nested/animation.ts index cd7e878fc913..a98dab3094cd 100644 --- a/packages/devextreme-angular/src/ui/menu/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/menu/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/menu/nested/collision.ts b/packages/devextreme-angular/src/ui/menu/nested/collision.ts index f11ee240aa26..a7c6e8af4beb 100644 --- a/packages/devextreme-angular/src/ui/menu/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/menu/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/menu/nested/from.ts b/packages/devextreme-angular/src/ui/menu/nested/from.ts index f173416ca0de..6235dab8a5dd 100644 --- a/packages/devextreme-angular/src/ui/menu/nested/from.ts +++ b/packages/devextreme-angular/src/ui/menu/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/menu/nested/hide.ts b/packages/devextreme-angular/src/ui/menu/nested/hide.ts index 73047a4e778a..86811db81e82 100644 --- a/packages/devextreme-angular/src/ui/menu/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/menu/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/menu/nested/position.ts b/packages/devextreme-angular/src/ui/menu/nested/position.ts index 7787511df6cc..5949479c0abe 100644 --- a/packages/devextreme-angular/src/ui/menu/nested/position.ts +++ b/packages/devextreme-angular/src/ui/menu/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/menu/nested/show.ts b/packages/devextreme-angular/src/ui/menu/nested/show.ts index e320f5dfb2b0..53329bb95207 100644 --- a/packages/devextreme-angular/src/ui/menu/nested/show.ts +++ b/packages/devextreme-angular/src/ui/menu/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/menu/nested/to.ts b/packages/devextreme-angular/src/ui/menu/nested/to.ts index 37871e39905d..3445d880111c 100644 --- a/packages/devextreme-angular/src/ui/menu/nested/to.ts +++ b/packages/devextreme-angular/src/ui/menu/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/argument-axis.ts b/packages/devextreme-angular/src/ui/nested/argument-axis.ts index 161d9aa70846..8a2b3b8fef76 100644 --- a/packages/devextreme-angular/src/ui/nested/argument-axis.ts +++ b/packages/devextreme-angular/src/ui/nested/argument-axis.ts @@ -21,7 +21,7 @@ import { import { HorizontalAlignment, Position, VerticalAlignment } from 'devextreme/common'; import { ArgumentAxisHoverMode, AxisScaleType, ChartsAxisLabelOverlap, ChartsDataType, DashStyle, DiscreteAxisDivisionMode, Font, LabelOverlap, RelativePosition, ScaleBreak, ScaleBreakLineStyle, TextOverflow, TimeInterval, VisualRange, VisualRangeUpdateMode, WordWrap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { AggregatedPointsPosition, ChartLabelDisplayMode } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/nested/base/animation-config.ts b/packages/devextreme-angular/src/ui/nested/base/animation-config.ts index 859514f90e03..5f63df1cbb0b 100644 --- a/packages/devextreme-angular/src/ui/nested/base/animation-config.ts +++ b/packages/devextreme-angular/src/ui/nested/base/animation-config.ts @@ -5,9 +5,9 @@ import { Component, } from '@angular/core'; -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; import { Direction } from 'devextreme/common'; import { AnimationEaseMode } from 'devextreme/common/charts'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; @Component({ template: '' diff --git a/packages/devextreme-angular/src/ui/nested/base/animation-state.ts b/packages/devextreme-angular/src/ui/nested/base/animation-state.ts index 48d3349934e2..9d5c2c2466de 100644 --- a/packages/devextreme-angular/src/ui/nested/base/animation-state.ts +++ b/packages/devextreme-angular/src/ui/nested/base/animation-state.ts @@ -5,7 +5,7 @@ import { Component, } from '@angular/core'; -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; @Component({ template: '' diff --git a/packages/devextreme-angular/src/ui/nested/base/chart-common-series-settings.ts b/packages/devextreme-angular/src/ui/nested/base/chart-common-series-settings.ts index b8427cc08ad9..7d37c32de86f 100644 --- a/packages/devextreme-angular/src/ui/nested/base/chart-common-series-settings.ts +++ b/packages/devextreme-angular/src/ui/nested/base/chart-common-series-settings.ts @@ -7,7 +7,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, ChartsDataType, DashStyle, Font, HatchDirection, LabelPosition, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, TextOverflow, ValueErrorBarDisplayMode, ValueErrorBarType, WordWrap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { PieChartSeriesInteractionMode, SmallValuesGroupingMode } from 'devextreme/viz/pie_chart'; import { PolarChartSeriesType } from 'devextreme/viz/polar_chart'; diff --git a/packages/devextreme-angular/src/ui/nested/base/chart-series-dxi.ts b/packages/devextreme-angular/src/ui/nested/base/chart-series-dxi.ts index 38e4a2acb339..b6a09e261006 100644 --- a/packages/devextreme-angular/src/ui/nested/base/chart-series-dxi.ts +++ b/packages/devextreme-angular/src/ui/nested/base/chart-series-dxi.ts @@ -7,7 +7,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; import { ChartsColor, ChartsDataType, DashStyle, Font, HatchDirection, LabelPosition, PointInteractionMode, PointSymbol, RelativePosition, SeriesHoverMode, SeriesSelectionMode, SeriesType, TextOverflow, ValueErrorBarDisplayMode, ValueErrorBarType, WordWrap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { PieChartSeriesInteractionMode, SmallValuesGroupingMode } from 'devextreme/viz/pie_chart'; import { PolarChartSeriesType } from 'devextreme/viz/polar_chart'; diff --git a/packages/devextreme-angular/src/ui/nested/base/data-grid-column-dxi.ts b/packages/devextreme-angular/src/ui/nested/base/data-grid-column-dxi.ts index 465fd6e907c0..ef55b211cdb5 100644 --- a/packages/devextreme-angular/src/ui/nested/base/data-grid-column-dxi.ts +++ b/packages/devextreme-angular/src/ui/nested/base/data-grid-column-dxi.ts @@ -6,10 +6,10 @@ import { } from '@angular/core'; import { AsyncRule, CompareRule, CustomRule, DataType, EmailRule, HorizontalAlignment, NumericRule, PatternRule, RangeRule, RequiredRule, SearchMode, SortOrder, StringLengthRule } from 'devextreme/common'; +import { Format } from 'devextreme/common/core/localization'; import { ColumnHeaderFilterSearchConfig, FilterOperation, FilterType, FixedPosition, HeaderFilterGroupInterval, SelectedFilterOperation } from 'devextreme/common/grids'; import { Store } from 'devextreme/data'; import { Options as DataSourceOptions } from 'devextreme/data/data_source'; -import { Format } from 'devextreme/localization'; import { DataGridCommandColumnType, DataGridPredefinedColumnButton, dxDataGridColumn, dxDataGridColumnButton } from 'devextreme/ui/data_grid'; import { SimpleItem } from 'devextreme/ui/form'; import { dxTreeListColumn, dxTreeListColumnButton, TreeListCommandColumnType, TreeListPredefinedColumnButton } from 'devextreme/ui/tree_list'; diff --git a/packages/devextreme-angular/src/ui/nested/base/filter-builder-field-dxi.ts b/packages/devextreme-angular/src/ui/nested/base/filter-builder-field-dxi.ts index 0ce11e619bab..07eaf9b5941c 100644 --- a/packages/devextreme-angular/src/ui/nested/base/filter-builder-field-dxi.ts +++ b/packages/devextreme-angular/src/ui/nested/base/filter-builder-field-dxi.ts @@ -6,9 +6,9 @@ import { } from '@angular/core'; import { DataType } from 'devextreme/common'; +import { Format } from 'devextreme/common/core/localization'; import { Store } from 'devextreme/data'; import { Options as DataSourceOptions } from 'devextreme/data/data_source'; -import { Format } from 'devextreme/localization'; import { FilterBuilderOperation } from 'devextreme/ui/filter_builder'; @Component({ diff --git a/packages/devextreme-angular/src/ui/nested/base/gauge-indicator.ts b/packages/devextreme-angular/src/ui/nested/base/gauge-indicator.ts index b808425e48db..78d398d6d07c 100644 --- a/packages/devextreme-angular/src/ui/nested/base/gauge-indicator.ts +++ b/packages/devextreme-angular/src/ui/nested/base/gauge-indicator.ts @@ -7,7 +7,7 @@ import { import { HorizontalEdge, VerticalEdge } from 'devextreme/common'; import { ChartsColor, Font, Palette } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; @Component({ template: '' diff --git a/packages/devextreme-angular/src/ui/nested/base/popup-options.ts b/packages/devextreme-angular/src/ui/nested/base/popup-options.ts index 148143298022..ed8c7cc868ff 100644 --- a/packages/devextreme-angular/src/ui/nested/base/popup-options.ts +++ b/packages/devextreme-angular/src/ui/nested/base/popup-options.ts @@ -5,9 +5,8 @@ import { Component, } from '@angular/core'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { PositionConfig } from 'devextreme/animation/position'; import { Position, PositionAlignment, ToolbarItemComponent, ToolbarItemLocation } from 'devextreme/common'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; import { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, OptionChangedEvent, ShowingEvent, ShownEvent, TitleRenderedEvent } from 'devextreme/ui/popover'; import { ToolbarLocation } from 'devextreme/ui/popup'; diff --git a/packages/devextreme-angular/src/ui/nested/base/position-config.ts b/packages/devextreme-angular/src/ui/nested/base/position-config.ts index f838b71c3506..c0e802676268 100644 --- a/packages/devextreme-angular/src/ui/nested/base/position-config.ts +++ b/packages/devextreme-angular/src/ui/nested/base/position-config.ts @@ -5,8 +5,8 @@ import { Component, } from '@angular/core'; -import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/animation/position'; import { HorizontalAlignment, PositionAlignment, VerticalAlignment } from 'devextreme/common'; +import { CollisionResolution, CollisionResolutionCombination } from 'devextreme/common/core/animation'; import { UserDefinedElement } from 'devextreme/core/element'; @Component({ diff --git a/packages/devextreme-angular/src/ui/nested/collision.ts b/packages/devextreme-angular/src/ui/nested/collision.ts index 1c795c5c8d35..903767654a73 100644 --- a/packages/devextreme-angular/src/ui/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/column-chooser.ts b/packages/devextreme-angular/src/ui/nested/column-chooser.ts index 1365e382fcd7..3e4fa34a6efe 100644 --- a/packages/devextreme-angular/src/ui/nested/column-chooser.ts +++ b/packages/devextreme-angular/src/ui/nested/column-chooser.ts @@ -14,8 +14,8 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; import { SortOrder } from 'devextreme/common'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { ColumnChooserMode, ColumnChooserSearchConfig, ColumnChooserSelectionConfig } from 'devextreme/common/grids'; import { UserDefinedElement } from 'devextreme/core/element'; diff --git a/packages/devextreme-angular/src/ui/nested/crosshair.ts b/packages/devextreme-angular/src/ui/nested/crosshair.ts index 4ebdfbfb59bf..477682bfc464 100644 --- a/packages/devextreme-angular/src/ui/nested/crosshair.ts +++ b/packages/devextreme-angular/src/ui/nested/crosshair.ts @@ -15,7 +15,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/nested/drop-down-options.ts index 3f0a050b4109..f6496c54d1f6 100644 --- a/packages/devextreme-angular/src/ui/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/nested/drop-down-options.ts @@ -19,8 +19,8 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; import { PositionAlignment } from 'devextreme/common'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/filter-builder-popup.ts b/packages/devextreme-angular/src/ui/nested/filter-builder-popup.ts index 8fbb64ea323f..353146f654cd 100644 --- a/packages/devextreme-angular/src/ui/nested/filter-builder-popup.ts +++ b/packages/devextreme-angular/src/ui/nested/filter-builder-popup.ts @@ -19,8 +19,8 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; import { PositionAlignment } from 'devextreme/common'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/group-item-dxi.ts b/packages/devextreme-angular/src/ui/nested/group-item-dxi.ts index 52dc82043c6b..8adde0461d43 100644 --- a/packages/devextreme-angular/src/ui/nested/group-item-dxi.ts +++ b/packages/devextreme-angular/src/ui/nested/group-item-dxi.ts @@ -12,8 +12,8 @@ import { +import { Format } from 'devextreme/common/core/localization'; import { SummaryType } from 'devextreme/common/grids'; -import { Format } from 'devextreme/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/horizontal-line.ts b/packages/devextreme-angular/src/ui/nested/horizontal-line.ts index 80f837bfbb98..b0c033ffb200 100644 --- a/packages/devextreme-angular/src/ui/nested/horizontal-line.ts +++ b/packages/devextreme-angular/src/ui/nested/horizontal-line.ts @@ -15,7 +15,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/label.ts b/packages/devextreme-angular/src/ui/nested/label.ts index 75c69f62901c..563517b58ba1 100644 --- a/packages/devextreme-angular/src/ui/nested/label.ts +++ b/packages/devextreme-angular/src/ui/nested/label.ts @@ -20,7 +20,7 @@ import { DOCUMENT } from '@angular/common'; import { HorizontalAlignment, HorizontalEdge, Position, VerticalAlignment, VerticalEdge } from 'devextreme/common'; import { ChartsAxisLabelOverlap, DashStyle, Font, LabelOverlap, LabelPosition, RelativePosition, TextOverflow, WordWrap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { LabelLocation } from 'devextreme/ui/form'; import { ChartLabelDisplayMode } from 'devextreme/viz/chart'; import { CircularGaugeLabelOverlap } from 'devextreme/viz/circular_gauge'; diff --git a/packages/devextreme-angular/src/ui/nested/legend.ts b/packages/devextreme-angular/src/ui/nested/legend.ts index 8cf1ed2c4038..d006e72bc1f2 100644 --- a/packages/devextreme-angular/src/ui/nested/legend.ts +++ b/packages/devextreme-angular/src/ui/nested/legend.ts @@ -16,7 +16,7 @@ import { import { HorizontalAlignment, Orientation, Position, VerticalEdge } from 'devextreme/common'; import { DashStyle, Font, LegendHoverMode, RelativePosition } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { PieChartLegendHoverMode } from 'devextreme/viz/pie_chart'; import { diff --git a/packages/devextreme-angular/src/ui/nested/marker.ts b/packages/devextreme-angular/src/ui/nested/marker.ts index 173b9dcf3be4..245c671f5e35 100644 --- a/packages/devextreme-angular/src/ui/nested/marker.ts +++ b/packages/devextreme-angular/src/ui/nested/marker.ts @@ -14,7 +14,7 @@ import { -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/popup.ts b/packages/devextreme-angular/src/ui/nested/popup.ts index 2b5b38c36f40..c9840eeaf512 100644 --- a/packages/devextreme-angular/src/ui/nested/popup.ts +++ b/packages/devextreme-angular/src/ui/nested/popup.ts @@ -19,8 +19,8 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; import { PositionAlignment } from 'devextreme/common'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/scale.ts b/packages/devextreme-angular/src/ui/nested/scale.ts index 56bea2049279..3b1d47833168 100644 --- a/packages/devextreme-angular/src/ui/nested/scale.ts +++ b/packages/devextreme-angular/src/ui/nested/scale.ts @@ -19,7 +19,7 @@ import { import { HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; import { ChartsDataType, DiscreteAxisDivisionMode, Font, LabelOverlap, ScaleBreak, ScaleBreakLineStyle, TimeInterval } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { CircularGaugeElementOrientation, CircularGaugeLabelOverlap } from 'devextreme/viz/circular_gauge'; import { AxisScale } from 'devextreme/viz/range_selector'; diff --git a/packages/devextreme-angular/src/ui/nested/slider-marker.ts b/packages/devextreme-angular/src/ui/nested/slider-marker.ts index 0da3ebd79507..78272623c01d 100644 --- a/packages/devextreme-angular/src/ui/nested/slider-marker.ts +++ b/packages/devextreme-angular/src/ui/nested/slider-marker.ts @@ -15,7 +15,7 @@ import { import { Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/summary.ts b/packages/devextreme-angular/src/ui/nested/summary.ts index de507d25dc21..0b3c0a05b433 100644 --- a/packages/devextreme-angular/src/ui/nested/summary.ts +++ b/packages/devextreme-angular/src/ui/nested/summary.ts @@ -18,8 +18,8 @@ import { import { HorizontalAlignment } from 'devextreme/common'; +import { Format } from 'devextreme/common/core/localization'; import { SummaryType } from 'devextreme/common/grids'; -import { Format } from 'devextreme/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/text.ts b/packages/devextreme-angular/src/ui/nested/text.ts index 22fd2330441e..5c54bb0697f1 100644 --- a/packages/devextreme-angular/src/ui/nested/text.ts +++ b/packages/devextreme-angular/src/ui/nested/text.ts @@ -15,7 +15,7 @@ import { import { Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/tooltip.ts b/packages/devextreme-angular/src/ui/nested/tooltip.ts index 885756c84840..024ccec46dd2 100644 --- a/packages/devextreme-angular/src/ui/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/nested/tooltip.ts @@ -16,8 +16,8 @@ import { import { TooltipShowMode, VerticalEdge } from 'devextreme/common'; import { DashStyle, Font } from 'devextreme/common/charts'; +import { Format } from 'devextreme/common/core/localization'; import { UserDefinedElement } from 'devextreme/core/element'; -import { Format } from 'devextreme/localization'; import { ChartTooltipLocation } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/nested/total-item-dxi.ts b/packages/devextreme-angular/src/ui/nested/total-item-dxi.ts index 274918db3850..8360826e4c03 100644 --- a/packages/devextreme-angular/src/ui/nested/total-item-dxi.ts +++ b/packages/devextreme-angular/src/ui/nested/total-item-dxi.ts @@ -13,8 +13,8 @@ import { import { HorizontalAlignment } from 'devextreme/common'; +import { Format } from 'devextreme/common/core/localization'; import { SummaryType } from 'devextreme/common/grids'; -import { Format } from 'devextreme/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/nested/value-axis-dxi.ts b/packages/devextreme-angular/src/ui/nested/value-axis-dxi.ts index 439e3cc53aac..cf0e23dd86d8 100644 --- a/packages/devextreme-angular/src/ui/nested/value-axis-dxi.ts +++ b/packages/devextreme-angular/src/ui/nested/value-axis-dxi.ts @@ -19,7 +19,7 @@ import { import { HorizontalAlignment, Position, VerticalAlignment } from 'devextreme/common'; import { AxisScaleType, ChartsAxisLabelOverlap, ChartsDataType, DashStyle, DiscreteAxisDivisionMode, Font, RelativePosition, ScaleBreak, ScaleBreakLineStyle, TextOverflow, TimeInterval, VisualRange, VisualRangeUpdateMode, WordWrap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { AggregatedPointsPosition, ChartLabelDisplayMode } from 'devextreme/viz/chart'; import { diff --git a/packages/devextreme-angular/src/ui/nested/value-axis.ts b/packages/devextreme-angular/src/ui/nested/value-axis.ts index a4c12614ba46..9742edbbfdd0 100644 --- a/packages/devextreme-angular/src/ui/nested/value-axis.ts +++ b/packages/devextreme-angular/src/ui/nested/value-axis.ts @@ -20,7 +20,7 @@ import { import { AxisScaleType, ChartsDataType, DashStyle, DiscreteAxisDivisionMode, Font, LabelOverlap, TimeInterval, VisualRange } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ValueAxisVisualRangeUpdateMode } from 'devextreme/viz/polar_chart'; import { ChartAxisScale } from 'devextreme/viz/range_selector'; diff --git a/packages/devextreme-angular/src/ui/nested/vertical-line.ts b/packages/devextreme-angular/src/ui/nested/vertical-line.ts index 3d0da13e4fdc..b8fb96f249a6 100644 --- a/packages/devextreme-angular/src/ui/nested/vertical-line.ts +++ b/packages/devextreme-angular/src/ui/nested/vertical-line.ts @@ -15,7 +15,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/number-box/index.ts b/packages/devextreme-angular/src/ui/number-box/index.ts index d6c39f0ae2e6..da92d1b40943 100644 --- a/packages/devextreme-angular/src/ui/number-box/index.ts +++ b/packages/devextreme-angular/src/ui/number-box/index.ts @@ -26,7 +26,7 @@ import { import { NumberBoxPredefinedButton, NumberBoxType, ChangeEvent, ContentReadyEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, KeyDownEvent, KeyUpEvent, OptionChangedEvent, PasteEvent, ValueChangedEvent } from 'devextreme/ui/number_box'; import { TextEditorButton, LabelMode, EditorStyle, ValidationMessageMode, Position, ValidationStatus } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import DxNumberBox from 'devextreme/ui/number_box'; diff --git a/packages/devextreme-angular/src/ui/pagination/index.ts b/packages/devextreme-angular/src/ui/pagination/index.ts index 73177e097030..9dff7b407b9f 100644 --- a/packages/devextreme-angular/src/ui/pagination/index.ts +++ b/packages/devextreme-angular/src/ui/pagination/index.ts @@ -21,7 +21,7 @@ import { import { DisplayMode } from 'devextreme/common'; -import { EventInfo } from 'devextreme/events/index'; +import { EventInfo } from 'devextreme/common/core/events'; import DxPagination from 'devextreme/ui/pagination'; diff --git a/packages/devextreme-angular/src/ui/pie-chart/index.ts b/packages/devextreme-angular/src/ui/pie-chart/index.ts index f4fe3a97df1d..204333de521e 100644 --- a/packages/devextreme-angular/src/ui/pie-chart/index.ts +++ b/packages/devextreme-angular/src/ui/pie-chart/index.ts @@ -25,7 +25,7 @@ import { import DataSource from 'devextreme/data/data_source'; import { AnimationEaseMode, ChartsDataType, DashStyle, ChartsColor, HatchDirection, Font, LabelPosition, TextOverflow, WordWrap, SeriesLabel, SeriesPoint, Palette, PaletteExtensionMode, ShiftLabelOverlap, Theme } from 'devextreme/common/charts'; import { dxPieChartAnnotationConfig, dxPieChartCommonAnnotationConfig, PieChartSeriesInteractionMode, SmallValuesGroupingMode, PieChartLegendItem, PieChartLegendHoverMode, DisposingEvent, DoneEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, LegendClickEvent, OptionChangedEvent, PointClickEvent, PointHoverChangedEvent, PointSelectionChangedEvent, TooltipHiddenEvent, TooltipShownEvent, PieChartSegmentDirection, PieChartSeries, PieChartType } from 'devextreme/viz/pie_chart'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DataSourceOptions } from 'devextreme/data/data_source'; import { Store } from 'devextreme/data/store'; import { ExportFormat, HorizontalAlignment, Position, Orientation, VerticalEdge, SingleOrMultiple } from 'devextreme/common'; diff --git a/packages/devextreme-angular/src/ui/pie-chart/nested/common-series-settings.ts b/packages/devextreme-angular/src/ui/pie-chart/nested/common-series-settings.ts index eee8b3abc395..3d43f7a13380 100644 --- a/packages/devextreme-angular/src/ui/pie-chart/nested/common-series-settings.ts +++ b/packages/devextreme-angular/src/ui/pie-chart/nested/common-series-settings.ts @@ -16,7 +16,7 @@ import { import { ChartsDataType, DashStyle, ChartsColor, HatchDirection, Font, LabelPosition, TextOverflow, WordWrap } from 'devextreme/common/charts'; import { PieChartSeriesInteractionMode, SmallValuesGroupingMode } from 'devextreme/viz/pie_chart'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/pie-chart/nested/label.ts b/packages/devextreme-angular/src/ui/pie-chart/nested/label.ts index ecac58d09e53..c59524fbf495 100644 --- a/packages/devextreme-angular/src/ui/pie-chart/nested/label.ts +++ b/packages/devextreme-angular/src/ui/pie-chart/nested/label.ts @@ -14,7 +14,7 @@ import { -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DashStyle, Font, LabelPosition, TextOverflow, WordWrap } from 'devextreme/common/charts'; import { diff --git a/packages/devextreme-angular/src/ui/pie-chart/nested/series-dxi.ts b/packages/devextreme-angular/src/ui/pie-chart/nested/series-dxi.ts index d7e525417730..38b5741a3f45 100644 --- a/packages/devextreme-angular/src/ui/pie-chart/nested/series-dxi.ts +++ b/packages/devextreme-angular/src/ui/pie-chart/nested/series-dxi.ts @@ -14,7 +14,7 @@ import { import { ChartsDataType, DashStyle, ChartsColor, HatchDirection, Font, LabelPosition, TextOverflow, WordWrap } from 'devextreme/common/charts'; import { PieChartSeriesInteractionMode, SmallValuesGroupingMode } from 'devextreme/viz/pie_chart'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/pie-chart/nested/tooltip.ts b/packages/devextreme-angular/src/ui/pie-chart/nested/tooltip.ts index c7f46210a58e..3ff86be913d3 100644 --- a/packages/devextreme-angular/src/ui/pie-chart/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/pie-chart/nested/tooltip.ts @@ -14,7 +14,7 @@ import { -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DashStyle, Font } from 'devextreme/common/charts'; import { diff --git a/packages/devextreme-angular/src/ui/polar-chart/index.ts b/packages/devextreme-angular/src/ui/polar-chart/index.ts index d214bda9aa7c..4882b6ca7db3 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/index.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/index.ts @@ -26,7 +26,7 @@ import DataSource from 'devextreme/data/data_source'; import * as CommonChartTypes from 'devextreme/common/charts'; import { AnimationEaseMode, ChartsDataType, DashStyle, Font, DiscreteAxisDivisionMode, ArgumentAxisHoverMode, LabelOverlap, TimeInterval, AxisScaleType, ChartsColor, SeriesHoverMode, HatchDirection, RelativePosition, PointInteractionMode, PointSymbol, SeriesSelectionMode, ValueErrorBarDisplayMode, ValueErrorBarType, SeriesLabel, SeriesPoint, LegendItem, LegendHoverMode, Palette, PaletteExtensionMode, Theme, TextOverflow, WordWrap } from 'devextreme/common/charts'; import { dxPolarChartAnnotationConfig, dxPolarChartCommonAnnotationConfig, PolarChartSeriesType, ArgumentAxisClickEvent, DisposingEvent, DoneEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, LegendClickEvent, OptionChangedEvent, PointClickEvent, PointHoverChangedEvent, PointSelectionChangedEvent, SeriesClickEvent, SeriesHoverChangedEvent, SeriesSelectionChangedEvent, TooltipHiddenEvent, TooltipShownEvent, ZoomEndEvent, ZoomStartEvent, PolarChartSeries, ValueAxisVisualRangeUpdateMode } from 'devextreme/viz/polar_chart'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DataSourceOptions } from 'devextreme/data/data_source'; import { Store } from 'devextreme/data/store'; import { ExportFormat, HorizontalAlignment, Position, Orientation, VerticalEdge, SingleOrMultiple } from 'devextreme/common'; diff --git a/packages/devextreme-angular/src/ui/polar-chart/nested/argument-axis.ts b/packages/devextreme-angular/src/ui/polar-chart/nested/argument-axis.ts index 00b3d6735aae..dee78c55d0fa 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/nested/argument-axis.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/nested/argument-axis.ts @@ -18,7 +18,7 @@ import { import { ChartsDataType, DashStyle, Font, DiscreteAxisDivisionMode, ArgumentAxisHoverMode, LabelOverlap, TimeInterval, AxisScaleType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/polar-chart/nested/axis-label.ts b/packages/devextreme-angular/src/ui/polar-chart/nested/axis-label.ts index ed0e7c37ea83..7fcac53012a4 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/nested/axis-label.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/nested/axis-label.ts @@ -15,7 +15,7 @@ import { import { Font, LabelOverlap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/polar-chart/nested/common-series-settings-label.ts b/packages/devextreme-angular/src/ui/polar-chart/nested/common-series-settings-label.ts index 139a3857d52f..ff87a4b3d874 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/nested/common-series-settings-label.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/nested/common-series-settings-label.ts @@ -14,7 +14,7 @@ import { -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DashStyle, Font, RelativePosition } from 'devextreme/common/charts'; import { diff --git a/packages/devextreme-angular/src/ui/polar-chart/nested/common-series-settings.ts b/packages/devextreme-angular/src/ui/polar-chart/nested/common-series-settings.ts index 9baef2d25455..dfa61343c7b3 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/nested/common-series-settings.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/nested/common-series-settings.ts @@ -15,7 +15,7 @@ import { import { DashStyle, ChartsColor, SeriesHoverMode, HatchDirection, Font, RelativePosition, PointInteractionMode, PointSymbol, SeriesSelectionMode, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { PolarChartSeriesType } from 'devextreme/viz/polar_chart'; import { diff --git a/packages/devextreme-angular/src/ui/polar-chart/nested/label.ts b/packages/devextreme-angular/src/ui/polar-chart/nested/label.ts index bd39d7126a31..7c022434c13d 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/nested/label.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/nested/label.ts @@ -15,7 +15,7 @@ import { import { Font, LabelOverlap, DashStyle, RelativePosition } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/polar-chart/nested/series-dxi.ts b/packages/devextreme-angular/src/ui/polar-chart/nested/series-dxi.ts index 02f5d7db1348..7f884bb86330 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/nested/series-dxi.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/nested/series-dxi.ts @@ -13,7 +13,7 @@ import { import { DashStyle, ChartsColor, SeriesHoverMode, HatchDirection, Font, RelativePosition, PointInteractionMode, PointSymbol, SeriesSelectionMode, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { PolarChartSeriesType } from 'devextreme/viz/polar_chart'; import { diff --git a/packages/devextreme-angular/src/ui/polar-chart/nested/tooltip.ts b/packages/devextreme-angular/src/ui/polar-chart/nested/tooltip.ts index a76ca20604ed..fbf88b3c37d3 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/nested/tooltip.ts @@ -14,7 +14,7 @@ import { -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DashStyle, Font } from 'devextreme/common/charts'; import { diff --git a/packages/devextreme-angular/src/ui/polar-chart/nested/value-axis.ts b/packages/devextreme-angular/src/ui/polar-chart/nested/value-axis.ts index 211b55872202..81b945ceac82 100644 --- a/packages/devextreme-angular/src/ui/polar-chart/nested/value-axis.ts +++ b/packages/devextreme-angular/src/ui/polar-chart/nested/value-axis.ts @@ -21,7 +21,7 @@ import { import * as CommonChartTypes from 'devextreme/common/charts'; import { DashStyle, Font, DiscreteAxisDivisionMode, LabelOverlap, TimeInterval, AxisScaleType, ChartsDataType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { ValueAxisVisualRangeUpdateMode } from 'devextreme/viz/polar_chart'; import { diff --git a/packages/devextreme-angular/src/ui/popover/index.ts b/packages/devextreme-angular/src/ui/popover/index.ts index 6f8193921573..ecc68f7f6d96 100644 --- a/packages/devextreme-angular/src/ui/popover/index.ts +++ b/packages/devextreme-angular/src/ui/popover/index.ts @@ -22,11 +22,10 @@ import { } from '@angular/core'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event } from 'devextreme/events/events.types'; import { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, OptionChangedEvent, ShowingEvent, ShownEvent, TitleRenderedEvent } from 'devextreme/ui/popover'; import { Position } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import DxPopover from 'devextreme/ui/popover'; diff --git a/packages/devextreme-angular/src/ui/popover/nested/animation.ts b/packages/devextreme-angular/src/ui/popover/nested/animation.ts index d784bdadaf04..38c8781c8890 100644 --- a/packages/devextreme-angular/src/ui/popover/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/popover/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popover/nested/collision.ts b/packages/devextreme-angular/src/ui/popover/nested/collision.ts index 8c5b8e2f0a31..52dab6839e2e 100644 --- a/packages/devextreme-angular/src/ui/popover/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/popover/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popover/nested/from.ts b/packages/devextreme-angular/src/ui/popover/nested/from.ts index dea87b235570..f888ecbc0634 100644 --- a/packages/devextreme-angular/src/ui/popover/nested/from.ts +++ b/packages/devextreme-angular/src/ui/popover/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popover/nested/hide.ts b/packages/devextreme-angular/src/ui/popover/nested/hide.ts index 418d365da7c7..5df21ee2d81f 100644 --- a/packages/devextreme-angular/src/ui/popover/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/popover/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/popover/nested/position.ts b/packages/devextreme-angular/src/ui/popover/nested/position.ts index dd19514546e7..8ce3f2b2799f 100644 --- a/packages/devextreme-angular/src/ui/popover/nested/position.ts +++ b/packages/devextreme-angular/src/ui/popover/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popover/nested/show.ts b/packages/devextreme-angular/src/ui/popover/nested/show.ts index bb44b0f1fb69..d16201da11b1 100644 --- a/packages/devextreme-angular/src/ui/popover/nested/show.ts +++ b/packages/devextreme-angular/src/ui/popover/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/popover/nested/to.ts b/packages/devextreme-angular/src/ui/popover/nested/to.ts index 4a9de746d777..5000a1ac3293 100644 --- a/packages/devextreme-angular/src/ui/popover/nested/to.ts +++ b/packages/devextreme-angular/src/ui/popover/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popup/component.ts b/packages/devextreme-angular/src/ui/popup/component.ts index bf435f45b105..5605258d13af 100644 --- a/packages/devextreme-angular/src/ui/popup/component.ts +++ b/packages/devextreme-angular/src/ui/popup/component.ts @@ -22,10 +22,10 @@ import { } from '@angular/core'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event, EventInfo } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event } from 'devextreme/events/events.types'; +import { EventInfo } from 'devextreme/common/core/events'; import { PositionAlignment } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import DxPopup from 'devextreme/ui/popup'; diff --git a/packages/devextreme-angular/src/ui/popup/nested/animation.ts b/packages/devextreme-angular/src/ui/popup/nested/animation.ts index c2630d3bfad1..a050f8eccd3d 100644 --- a/packages/devextreme-angular/src/ui/popup/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/popup/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popup/nested/collision.ts b/packages/devextreme-angular/src/ui/popup/nested/collision.ts index 9edb75160069..57363e68ef79 100644 --- a/packages/devextreme-angular/src/ui/popup/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/popup/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popup/nested/from.ts b/packages/devextreme-angular/src/ui/popup/nested/from.ts index be32f403443c..3834b7d3ee0a 100644 --- a/packages/devextreme-angular/src/ui/popup/nested/from.ts +++ b/packages/devextreme-angular/src/ui/popup/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popup/nested/hide.ts b/packages/devextreme-angular/src/ui/popup/nested/hide.ts index def87a09a119..536323c6753e 100644 --- a/packages/devextreme-angular/src/ui/popup/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/popup/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/popup/nested/position.ts b/packages/devextreme-angular/src/ui/popup/nested/position.ts index bf86cf989b5a..f05a55f570ba 100644 --- a/packages/devextreme-angular/src/ui/popup/nested/position.ts +++ b/packages/devextreme-angular/src/ui/popup/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/popup/nested/show.ts b/packages/devextreme-angular/src/ui/popup/nested/show.ts index 112f0385fc79..74261df2153e 100644 --- a/packages/devextreme-angular/src/ui/popup/nested/show.ts +++ b/packages/devextreme-angular/src/ui/popup/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/popup/nested/to.ts b/packages/devextreme-angular/src/ui/popup/nested/to.ts index 45f10f0cfa6e..ad1ead9058aa 100644 --- a/packages/devextreme-angular/src/ui/popup/nested/to.ts +++ b/packages/devextreme-angular/src/ui/popup/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/range-selector/index.ts b/packages/devextreme-angular/src/ui/range-selector/index.ts index f9ac9cf94332..67a0615b7a5f 100644 --- a/packages/devextreme-angular/src/ui/range-selector/index.ts +++ b/packages/devextreme-angular/src/ui/range-selector/index.ts @@ -31,7 +31,7 @@ import { Palette, PaletteExtensionMode, ChartsDataType, Font, TimeInterval, Scal import { ChartSeries } from 'devextreme/viz/common'; import { DataSourceOptions } from 'devextreme/data/data_source'; import { Store } from 'devextreme/data/store'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import DxRangeSelector from 'devextreme/viz/range_selector'; diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/common-series-settings-label.ts b/packages/devextreme-angular/src/ui/range-selector/nested/common-series-settings-label.ts index ca1ac88a2d85..e1a94f7bc716 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/common-series-settings-label.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/common-series-settings-label.ts @@ -15,7 +15,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DashStyle, Font, RelativePosition } from 'devextreme/common/charts'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/common-series-settings.ts b/packages/devextreme-angular/src/ui/range-selector/nested/common-series-settings.ts index c845f5c3da4f..9543a6420612 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/common-series-settings.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/common-series-settings.ts @@ -17,7 +17,7 @@ import { import { chartPointAggregationInfoObject, chartSeriesObject, ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { DashStyle, ChartsColor, SeriesHoverMode, HatchDirection, Font, RelativePosition, PointInteractionMode, PointSymbol, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; import { HorizontalAlignment } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/label.ts b/packages/devextreme-angular/src/ui/range-selector/nested/label.ts index 31150268dba6..c03a0d07aba8 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/label.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/label.ts @@ -15,7 +15,7 @@ import { import { HorizontalAlignment } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DashStyle, Font, RelativePosition, LabelOverlap } from 'devextreme/common/charts'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/marker-label.ts b/packages/devextreme-angular/src/ui/range-selector/nested/marker-label.ts index c92c350ab57a..9575932ec2c1 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/marker-label.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/marker-label.ts @@ -14,7 +14,7 @@ import { -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/marker.ts b/packages/devextreme-angular/src/ui/range-selector/nested/marker.ts index 71f3cc27a0c2..b19a945a1b0d 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/marker.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/marker.ts @@ -14,7 +14,7 @@ import { -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/scale-label.ts b/packages/devextreme-angular/src/ui/range-selector/nested/scale-label.ts index 2938e2ebfa96..393b0053f851 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/scale-label.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/scale-label.ts @@ -15,7 +15,7 @@ import { import { Font, LabelOverlap } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/scale.ts b/packages/devextreme-angular/src/ui/range-selector/nested/scale.ts index eff7923d23cb..ee2716f2c432 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/scale.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/scale.ts @@ -18,7 +18,7 @@ import { import { TimeInterval, ScaleBreak, ScaleBreakLineStyle, DiscreteAxisDivisionMode, Font, LabelOverlap, ChartsDataType } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { AxisScale } from 'devextreme/viz/range_selector'; import { diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/series-dxi.ts b/packages/devextreme-angular/src/ui/range-selector/nested/series-dxi.ts index d53e269f571d..5e2d146b86cb 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/series-dxi.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/series-dxi.ts @@ -15,7 +15,7 @@ import { import { chartPointAggregationInfoObject, chartSeriesObject, ChartSeriesAggregationMethod, FinancialChartReductionLevel } from 'devextreme/viz/chart'; import { DashStyle, ChartsColor, SeriesHoverMode, HatchDirection, Font, RelativePosition, PointInteractionMode, PointSymbol, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType } from 'devextreme/common/charts'; import { HorizontalAlignment } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/range-selector/nested/slider-marker.ts b/packages/devextreme-angular/src/ui/range-selector/nested/slider-marker.ts index 46af6f4e7164..5a15d3be666d 100644 --- a/packages/devextreme-angular/src/ui/range-selector/nested/slider-marker.ts +++ b/packages/devextreme-angular/src/ui/range-selector/nested/slider-marker.ts @@ -15,7 +15,7 @@ import { import { Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/range-slider/index.ts b/packages/devextreme-angular/src/ui/range-slider/index.ts index 2c00152aca79..b32fd8c57c62 100644 --- a/packages/devextreme-angular/src/ui/range-slider/index.ts +++ b/packages/devextreme-angular/src/ui/range-slider/index.ts @@ -22,7 +22,7 @@ import { } from '@angular/core'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { VerticalEdge, TooltipShowMode, ValidationMessageMode, Position, ValidationStatus, SliderValueChangeMode } from 'devextreme/common'; import { ContentReadyEvent, DisposingEvent, InitializedEvent, OptionChangedEvent, ValueChangedEvent } from 'devextreme/ui/range_slider'; diff --git a/packages/devextreme-angular/src/ui/range-slider/nested/label.ts b/packages/devextreme-angular/src/ui/range-slider/nested/label.ts index 2e031d4c1153..6357eccab218 100644 --- a/packages/devextreme-angular/src/ui/range-slider/nested/label.ts +++ b/packages/devextreme-angular/src/ui/range-slider/nested/label.ts @@ -14,7 +14,7 @@ import { -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { VerticalEdge } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/range-slider/nested/tooltip.ts b/packages/devextreme-angular/src/ui/range-slider/nested/tooltip.ts index 47e5f948d0cc..6f11cabf389f 100644 --- a/packages/devextreme-angular/src/ui/range-slider/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/range-slider/nested/tooltip.ts @@ -14,7 +14,7 @@ import { -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { VerticalEdge, TooltipShowMode } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/sankey/index.ts b/packages/devextreme-angular/src/ui/sankey/index.ts index 5a0fa72c86f1..84c56ba43dfb 100644 --- a/packages/devextreme-angular/src/ui/sankey/index.ts +++ b/packages/devextreme-angular/src/ui/sankey/index.ts @@ -26,7 +26,7 @@ import { DataSourceOptions } from 'devextreme/data/data_source'; import { Store } from 'devextreme/data/store'; import { dxSankeyNode, SankeyColorMode, DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, LinkClickEvent, LinkHoverEvent, NodeClickEvent, NodeHoverEvent, OptionChangedEvent } from 'devextreme/viz/sankey'; import { Font, TextOverflow, HatchDirection, Palette, PaletteExtensionMode, Theme, WordWrap, DashStyle } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import DxSankey from 'devextreme/viz/sankey'; diff --git a/packages/devextreme-angular/src/ui/sankey/nested/tooltip.ts b/packages/devextreme-angular/src/ui/sankey/nested/tooltip.ts index b61986a93759..c8537baafb1f 100644 --- a/packages/devextreme-angular/src/ui/sankey/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/sankey/nested/tooltip.ts @@ -15,7 +15,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/scheduler/index.ts b/packages/devextreme-angular/src/ui/scheduler/index.ts index 7d088d319113..b1ceeb417a34 100644 --- a/packages/devextreme-angular/src/ui/scheduler/index.ts +++ b/packages/devextreme-angular/src/ui/scheduler/index.ts @@ -27,7 +27,7 @@ import dxSortable from 'devextreme/ui/sortable'; import dxDraggable from 'devextreme/ui/draggable'; import DataSource from 'devextreme/data/data_source'; import { AllDayPanelMode, ViewType, dxSchedulerAppointment, CellAppointmentsLimit, AppointmentAddedEvent, AppointmentAddingEvent, AppointmentClickEvent, AppointmentContextMenuEvent, AppointmentDblClickEvent, AppointmentDeletedEvent, AppointmentDeletingEvent, AppointmentFormOpeningEvent, AppointmentRenderedEvent, AppointmentTooltipShowingEvent, AppointmentUpdatedEvent, AppointmentUpdatingEvent, CellClickEvent, CellContextMenuEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, OptionChangedEvent, RecurrenceEditMode, dxSchedulerScrolling } from 'devextreme/ui/scheduler'; -import { event } from 'devextreme/events/index'; +import { event } from 'devextreme/events/events.types'; import { DataSourceOptions } from 'devextreme/data/data_source'; import { Store } from 'devextreme/data/store'; import { FirstDayOfWeek, Orientation } from 'devextreme/common'; diff --git a/packages/devextreme-angular/src/ui/scheduler/nested/appointment-dragging.ts b/packages/devextreme-angular/src/ui/scheduler/nested/appointment-dragging.ts index a1c8bec4678d..9e7f49a34adf 100644 --- a/packages/devextreme-angular/src/ui/scheduler/nested/appointment-dragging.ts +++ b/packages/devextreme-angular/src/ui/scheduler/nested/appointment-dragging.ts @@ -17,7 +17,7 @@ import { import dxScheduler from 'devextreme/ui/scheduler'; import dxSortable from 'devextreme/ui/sortable'; import dxDraggable from 'devextreme/ui/draggable'; -import { event } from 'devextreme/events/index'; +import { event } from 'devextreme/events/events.types'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/select-box/nested/animation.ts b/packages/devextreme-angular/src/ui/select-box/nested/animation.ts index a7b9b5fe87d6..34ca3515b53b 100644 --- a/packages/devextreme-angular/src/ui/select-box/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/select-box/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/select-box/nested/collision.ts b/packages/devextreme-angular/src/ui/select-box/nested/collision.ts index 140a6d979619..0f1cde5cf6b5 100644 --- a/packages/devextreme-angular/src/ui/select-box/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/select-box/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/select-box/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/select-box/nested/drop-down-options.ts index 3c671c6655ac..38ac6e8f873f 100644 --- a/packages/devextreme-angular/src/ui/select-box/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/select-box/nested/drop-down-options.ts @@ -22,11 +22,11 @@ import { import dxOverlay from 'devextreme/ui/overlay'; import DOMComponent from 'devextreme/core/dom_component'; import dxPopup from 'devextreme/ui/popup'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event, EventInfo } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event } from 'devextreme/events/events.types'; +import { EventInfo } from 'devextreme/common/core/events'; import { Component as CoreComponent } from 'devextreme/core/component'; import { PositionAlignment } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import { diff --git a/packages/devextreme-angular/src/ui/select-box/nested/from.ts b/packages/devextreme-angular/src/ui/select-box/nested/from.ts index a59a2637f568..d33c1f81df37 100644 --- a/packages/devextreme-angular/src/ui/select-box/nested/from.ts +++ b/packages/devextreme-angular/src/ui/select-box/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/select-box/nested/hide.ts b/packages/devextreme-angular/src/ui/select-box/nested/hide.ts index 65b786caf822..89c672c2aedb 100644 --- a/packages/devextreme-angular/src/ui/select-box/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/select-box/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/select-box/nested/position.ts b/packages/devextreme-angular/src/ui/select-box/nested/position.ts index c2b86c2f83cc..1ae4c8b36b48 100644 --- a/packages/devextreme-angular/src/ui/select-box/nested/position.ts +++ b/packages/devextreme-angular/src/ui/select-box/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/select-box/nested/show.ts b/packages/devextreme-angular/src/ui/select-box/nested/show.ts index 964efc86c600..8d3befd818cc 100644 --- a/packages/devextreme-angular/src/ui/select-box/nested/show.ts +++ b/packages/devextreme-angular/src/ui/select-box/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/select-box/nested/to.ts b/packages/devextreme-angular/src/ui/select-box/nested/to.ts index 3f32772932ff..4a9297f5b6da 100644 --- a/packages/devextreme-angular/src/ui/select-box/nested/to.ts +++ b/packages/devextreme-angular/src/ui/select-box/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/slider/index.ts b/packages/devextreme-angular/src/ui/slider/index.ts index f9aff56fc538..e358987f24fb 100644 --- a/packages/devextreme-angular/src/ui/slider/index.ts +++ b/packages/devextreme-angular/src/ui/slider/index.ts @@ -22,7 +22,7 @@ import { } from '@angular/core'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { VerticalEdge, TooltipShowMode, ValidationMessageMode, Position, ValidationStatus, SliderValueChangeMode } from 'devextreme/common'; import { ContentReadyEvent, DisposingEvent, InitializedEvent, OptionChangedEvent, ValueChangedEvent } from 'devextreme/ui/slider'; diff --git a/packages/devextreme-angular/src/ui/slider/nested/label.ts b/packages/devextreme-angular/src/ui/slider/nested/label.ts index a3d55351985e..6742dd91e95e 100644 --- a/packages/devextreme-angular/src/ui/slider/nested/label.ts +++ b/packages/devextreme-angular/src/ui/slider/nested/label.ts @@ -14,7 +14,7 @@ import { -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { VerticalEdge } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/slider/nested/tooltip.ts b/packages/devextreme-angular/src/ui/slider/nested/tooltip.ts index 836389384ec7..d3fd30f1d7a6 100644 --- a/packages/devextreme-angular/src/ui/slider/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/slider/nested/tooltip.ts @@ -14,7 +14,7 @@ import { -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { VerticalEdge, TooltipShowMode } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/sparkline/index.ts b/packages/devextreme-angular/src/ui/sparkline/index.ts index d296dcdb2d3b..daa6feffe5a6 100644 --- a/packages/devextreme-angular/src/ui/sparkline/index.ts +++ b/packages/devextreme-angular/src/ui/sparkline/index.ts @@ -25,7 +25,7 @@ import { DataSourceOptions } from 'devextreme/data/data_source'; import { Store } from 'devextreme/data/store'; import { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, OptionChangedEvent, TooltipHiddenEvent, TooltipShownEvent, SparklineType } from 'devextreme/viz/sparkline'; import { PointSymbol, Theme, DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import DxSparkline from 'devextreme/viz/sparkline'; diff --git a/packages/devextreme-angular/src/ui/sparkline/nested/tooltip.ts b/packages/devextreme-angular/src/ui/sparkline/nested/tooltip.ts index 281e8b9b7d07..b767a362b104 100644 --- a/packages/devextreme-angular/src/ui/sparkline/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/sparkline/nested/tooltip.ts @@ -15,7 +15,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tag-box/nested/animation.ts b/packages/devextreme-angular/src/ui/tag-box/nested/animation.ts index 8f4d9c9aa83f..9e1c688b3b02 100644 --- a/packages/devextreme-angular/src/ui/tag-box/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/tag-box/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tag-box/nested/collision.ts b/packages/devextreme-angular/src/ui/tag-box/nested/collision.ts index c75faa719140..85c893579381 100644 --- a/packages/devextreme-angular/src/ui/tag-box/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/tag-box/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tag-box/nested/drop-down-options.ts b/packages/devextreme-angular/src/ui/tag-box/nested/drop-down-options.ts index 85a863201d05..79c00e738c4a 100644 --- a/packages/devextreme-angular/src/ui/tag-box/nested/drop-down-options.ts +++ b/packages/devextreme-angular/src/ui/tag-box/nested/drop-down-options.ts @@ -22,11 +22,11 @@ import { import dxOverlay from 'devextreme/ui/overlay'; import DOMComponent from 'devextreme/core/dom_component'; import dxPopup from 'devextreme/ui/popup'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event, EventInfo } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event } from 'devextreme/events/events.types'; +import { EventInfo } from 'devextreme/common/core/events'; import { Component as CoreComponent } from 'devextreme/core/component'; import { PositionAlignment } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import { diff --git a/packages/devextreme-angular/src/ui/tag-box/nested/from.ts b/packages/devextreme-angular/src/ui/tag-box/nested/from.ts index 5dd638ed90e6..3291f16a0602 100644 --- a/packages/devextreme-angular/src/ui/tag-box/nested/from.ts +++ b/packages/devextreme-angular/src/ui/tag-box/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tag-box/nested/hide.ts b/packages/devextreme-angular/src/ui/tag-box/nested/hide.ts index 8baefb8950a0..8ad992628548 100644 --- a/packages/devextreme-angular/src/ui/tag-box/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/tag-box/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/tag-box/nested/position.ts b/packages/devextreme-angular/src/ui/tag-box/nested/position.ts index 6181878d06bb..120b1cd0e98b 100644 --- a/packages/devextreme-angular/src/ui/tag-box/nested/position.ts +++ b/packages/devextreme-angular/src/ui/tag-box/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tag-box/nested/show.ts b/packages/devextreme-angular/src/ui/tag-box/nested/show.ts index b9207fd4dce2..f91b97713945 100644 --- a/packages/devextreme-angular/src/ui/tag-box/nested/show.ts +++ b/packages/devextreme-angular/src/ui/tag-box/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/tag-box/nested/to.ts b/packages/devextreme-angular/src/ui/tag-box/nested/to.ts index ad95687a67b5..a03da04325ad 100644 --- a/packages/devextreme-angular/src/ui/tag-box/nested/to.ts +++ b/packages/devextreme-angular/src/ui/tag-box/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/toast/index.ts b/packages/devextreme-angular/src/ui/toast/index.ts index 237eee0a03d4..161fd1e18d51 100644 --- a/packages/devextreme-angular/src/ui/toast/index.ts +++ b/packages/devextreme-angular/src/ui/toast/index.ts @@ -17,10 +17,9 @@ import { } from '@angular/core'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event } from 'devextreme/events/events.types'; import { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, OptionChangedEvent, ShowingEvent, ShownEvent, ToastType } from 'devextreme/ui/toast'; -import { PositionConfig } from 'devextreme/animation/position'; import DxToast from 'devextreme/ui/toast'; diff --git a/packages/devextreme-angular/src/ui/toast/nested/animation.ts b/packages/devextreme-angular/src/ui/toast/nested/animation.ts index 06dd2a36410d..a0f9f1438029 100644 --- a/packages/devextreme-angular/src/ui/toast/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/toast/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/toast/nested/collision.ts b/packages/devextreme-angular/src/ui/toast/nested/collision.ts index db4bc386a255..f92ec128eddf 100644 --- a/packages/devextreme-angular/src/ui/toast/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/toast/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/toast/nested/from.ts b/packages/devextreme-angular/src/ui/toast/nested/from.ts index 05d6130081b4..418751d7b926 100644 --- a/packages/devextreme-angular/src/ui/toast/nested/from.ts +++ b/packages/devextreme-angular/src/ui/toast/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/toast/nested/hide.ts b/packages/devextreme-angular/src/ui/toast/nested/hide.ts index 1a52b282afa4..1246163797e0 100644 --- a/packages/devextreme-angular/src/ui/toast/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/toast/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/toast/nested/position.ts b/packages/devextreme-angular/src/ui/toast/nested/position.ts index c25e1fe24c7b..7dd608676487 100644 --- a/packages/devextreme-angular/src/ui/toast/nested/position.ts +++ b/packages/devextreme-angular/src/ui/toast/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/toast/nested/show.ts b/packages/devextreme-angular/src/ui/toast/nested/show.ts index 993a9b4b7691..e11095bacde9 100644 --- a/packages/devextreme-angular/src/ui/toast/nested/show.ts +++ b/packages/devextreme-angular/src/ui/toast/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/toast/nested/to.ts b/packages/devextreme-angular/src/ui/toast/nested/to.ts index 879deac6622e..e7b55d3f52c1 100644 --- a/packages/devextreme-angular/src/ui/toast/nested/to.ts +++ b/packages/devextreme-angular/src/ui/toast/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tooltip/index.ts b/packages/devextreme-angular/src/ui/tooltip/index.ts index 11a57be8f40b..eac27fa9a018 100644 --- a/packages/devextreme-angular/src/ui/tooltip/index.ts +++ b/packages/devextreme-angular/src/ui/tooltip/index.ts @@ -17,11 +17,10 @@ import { } from '@angular/core'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event } from 'devextreme/events/events.types'; import { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, OptionChangedEvent, ShowingEvent, ShownEvent } from 'devextreme/ui/tooltip'; import { Position } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import DxTooltip from 'devextreme/ui/tooltip'; diff --git a/packages/devextreme-angular/src/ui/tooltip/nested/animation.ts b/packages/devextreme-angular/src/ui/tooltip/nested/animation.ts index 270af13dfbda..23c9849f2d78 100644 --- a/packages/devextreme-angular/src/ui/tooltip/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/tooltip/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tooltip/nested/collision.ts b/packages/devextreme-angular/src/ui/tooltip/nested/collision.ts index ed6b3416ac00..2639bce9ef13 100644 --- a/packages/devextreme-angular/src/ui/tooltip/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/tooltip/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tooltip/nested/from.ts b/packages/devextreme-angular/src/ui/tooltip/nested/from.ts index 5144c70872ae..79c86175fa6f 100644 --- a/packages/devextreme-angular/src/ui/tooltip/nested/from.ts +++ b/packages/devextreme-angular/src/ui/tooltip/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tooltip/nested/hide.ts b/packages/devextreme-angular/src/ui/tooltip/nested/hide.ts index 099fe1dd9a87..3a401c65a4b8 100644 --- a/packages/devextreme-angular/src/ui/tooltip/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/tooltip/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/tooltip/nested/position.ts b/packages/devextreme-angular/src/ui/tooltip/nested/position.ts index 63b651d776f2..27f33da4338a 100644 --- a/packages/devextreme-angular/src/ui/tooltip/nested/position.ts +++ b/packages/devextreme-angular/src/ui/tooltip/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tooltip/nested/show.ts b/packages/devextreme-angular/src/ui/tooltip/nested/show.ts index adca2825ebed..1b71b964d33e 100644 --- a/packages/devextreme-angular/src/ui/tooltip/nested/show.ts +++ b/packages/devextreme-angular/src/ui/tooltip/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/tooltip/nested/to.ts b/packages/devextreme-angular/src/ui/tooltip/nested/to.ts index 9d90b605e8b5..2efe0dd47553 100644 --- a/packages/devextreme-angular/src/ui/tooltip/nested/to.ts +++ b/packages/devextreme-angular/src/ui/tooltip/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-list/index.ts b/packages/devextreme-angular/src/ui/tree-list/index.ts index b324ada9952e..c86e64430245 100644 --- a/packages/devextreme-angular/src/ui/tree-list/index.ts +++ b/packages/devextreme-angular/src/ui/tree-list/index.ts @@ -28,7 +28,7 @@ import dxTreeList from 'devextreme/ui/tree_list'; import dxSortable from 'devextreme/ui/sortable'; import dxDraggable from 'devextreme/ui/draggable'; import { ColumnChooserMode, ColumnChooserSearchConfig, ColumnChooserSelectionConfig, ColumnResizeMode, DataChange, GridsEditMode, GridsEditRefreshMode, StartEditAction, GridBase, ApplyFilterMode, HeaderFilterSearchConfig, EnterKeyAction, EnterKeyDirection, Pager, DataRenderMode, StateStoreType } from 'devextreme/common/grids'; -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { SortOrder, Mode, DataStructure, DragDirection, DragHighlight, ScrollMode, ScrollbarMode, SingleMultipleOrNone } from 'devextreme/common'; import { dxTreeListColumn, dxTreeListRowObject, TreeListFilterMode, AdaptiveDetailRowPreparingEvent, CellClickEvent, CellDblClickEvent, CellHoverChangedEvent, CellPreparedEvent, ContentReadyEvent, ContextMenuPreparingEvent, DataErrorOccurredEvent, DisposingEvent, EditCanceledEvent, EditCancelingEvent, EditingStartEvent, EditorPreparedEvent, EditorPreparingEvent, FocusedCellChangedEvent, FocusedCellChangingEvent, FocusedRowChangedEvent, FocusedRowChangingEvent, InitializedEvent, InitNewRowEvent, KeyDownEvent, NodesInitializedEvent, OptionChangedEvent, RowClickEvent, RowCollapsedEvent, RowCollapsingEvent, RowDblClickEvent, RowExpandedEvent, RowExpandingEvent, RowInsertedEvent, RowInsertingEvent, RowPreparedEvent, RowRemovedEvent, RowRemovingEvent, RowUpdatedEvent, RowUpdatingEvent, RowValidatingEvent, SavedEvent, SavingEvent, SelectionChangedEvent, ToolbarPreparingEvent, dxTreeListToolbar } from 'devextreme/ui/tree_list'; import { DataSourceOptions } from 'devextreme/data/data_source'; @@ -36,7 +36,7 @@ import { Store } from 'devextreme/data/store'; import { dxFormOptions } from 'devextreme/ui/form'; import { dxPopupOptions } from 'devextreme/ui/popup'; import { dxFilterBuilderOptions } from 'devextreme/ui/filter_builder'; -import { event } from 'devextreme/events/index'; +import { event } from 'devextreme/events/events.types'; import DxTreeList from 'devextreme/ui/tree_list'; diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/animation.ts b/packages/devextreme-angular/src/ui/tree-list/nested/animation.ts index 54d3f19ca2bd..0a6824844552 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/animation.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/animation.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig } from 'devextreme/animation/fx'; +import { AnimationConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/button-dxi.ts b/packages/devextreme-angular/src/ui/tree-list/nested/button-dxi.ts index ee808b103129..baeca5d53a37 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/button-dxi.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/button-dxi.ts @@ -18,7 +18,7 @@ import { DOCUMENT } from '@angular/common'; import dxTreeList from 'devextreme/ui/tree_list'; import { dxTreeListColumn, dxTreeListRowObject, TreeListPredefinedColumnButton } from 'devextreme/ui/tree_list'; -import { event } from 'devextreme/events/index'; +import { event } from 'devextreme/events/events.types'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/collision.ts b/packages/devextreme-angular/src/ui/tree-list/nested/collision.ts index e9c9a7d53b97..46468bc320db 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/collision.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/collision.ts @@ -14,7 +14,7 @@ import { -import { CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/column-chooser.ts b/packages/devextreme-angular/src/ui/tree-list/nested/column-chooser.ts index fad9cbc4661f..e6e5ea981f8e 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/column-chooser.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/column-chooser.ts @@ -15,7 +15,7 @@ import { import { ColumnChooserMode, ColumnChooserSearchConfig, ColumnChooserSelectionConfig } from 'devextreme/common/grids'; -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { SortOrder } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/column-dxi.ts b/packages/devextreme-angular/src/ui/tree-list/nested/column-dxi.ts index cb0d8c652c79..970abd8f1770 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/column-dxi.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/column-dxi.ts @@ -21,7 +21,7 @@ import * as CommonTypes from 'devextreme/common'; import { HorizontalAlignment, DataType, SearchMode, SortOrder } from 'devextreme/common'; import { dxTreeListColumnButton, TreeListPredefinedColumnButton, dxTreeListColumn, TreeListCommandColumnType } from 'devextreme/ui/tree_list'; import { FilterOperation, FilterType, FixedPosition, HeaderFilterGroupInterval, ColumnHeaderFilterSearchConfig, SelectedFilterOperation } from 'devextreme/common/grids'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { dxFormSimpleItem } from 'devextreme/ui/form'; import { DataSourceOptions } from 'devextreme/data/data_source'; import { Store } from 'devextreme/data/store'; diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/field-dxi.ts b/packages/devextreme-angular/src/ui/tree-list/nested/field-dxi.ts index 2344562fd990..97d502327ad1 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/field-dxi.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/field-dxi.ts @@ -14,7 +14,7 @@ import { import { DataType } from 'devextreme/common'; import { FilterBuilderOperation } from 'devextreme/ui/filter_builder'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { DataSourceOptions } from 'devextreme/data/data_source'; import { Store } from 'devextreme/data/store'; diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/filter-builder-popup.ts b/packages/devextreme-angular/src/ui/tree-list/nested/filter-builder-popup.ts index 360b5ea82dbd..3fb56eaa79af 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/filter-builder-popup.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/filter-builder-popup.ts @@ -19,11 +19,11 @@ import { import dxOverlay from 'devextreme/ui/overlay'; import DOMComponent from 'devextreme/core/dom_component'; import dxPopup from 'devextreme/ui/popup'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event, EventInfo } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event } from 'devextreme/events/events.types'; +import { EventInfo } from 'devextreme/common/core/events'; import { Component as CoreComponent } from 'devextreme/core/component'; import { PositionAlignment } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import { diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/from.ts b/packages/devextreme-angular/src/ui/tree-list/nested/from.ts index 24e6b43c3f34..bc9d851683d7 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/from.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/from.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/hide.ts b/packages/devextreme-angular/src/ui/tree-list/nested/hide.ts index 050dc41d4f5a..b93ff8cf7c8c 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/hide.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/hide.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/popup.ts b/packages/devextreme-angular/src/ui/tree-list/nested/popup.ts index 329bd9500597..ddd81446603a 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/popup.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/popup.ts @@ -22,11 +22,11 @@ import { import dxOverlay from 'devextreme/ui/overlay'; import DOMComponent from 'devextreme/core/dom_component'; import dxPopup from 'devextreme/ui/popup'; -import { AnimationConfig } from 'devextreme/animation/fx'; -import { event, EventInfo } from 'devextreme/events/index'; +import { AnimationConfig, PositionConfig } from 'devextreme/common/core/animation'; +import { event } from 'devextreme/events/events.types'; +import { EventInfo } from 'devextreme/common/core/events'; import { Component as CoreComponent } from 'devextreme/core/component'; import { PositionAlignment } from 'devextreme/common'; -import { PositionConfig } from 'devextreme/animation/position'; import { dxPopupToolbarItem } from 'devextreme/ui/popup'; import { diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/position.ts b/packages/devextreme-angular/src/ui/tree-list/nested/position.ts index 88ed7d08bb5c..314d3115cc42 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/position.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/position.ts @@ -15,7 +15,7 @@ import { import { PositionAlignment, HorizontalAlignment, VerticalAlignment } from 'devextreme/common'; -import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/animation/position'; +import { CollisionResolutionCombination, CollisionResolution } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/row-dragging.ts b/packages/devextreme-angular/src/ui/tree-list/nested/row-dragging.ts index d0c5e3323b5d..52f4fe10b497 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/row-dragging.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/row-dragging.ts @@ -18,7 +18,7 @@ import dxSortable from 'devextreme/ui/sortable'; import dxDraggable from 'devextreme/ui/draggable'; import { DragDirection, DragHighlight } from 'devextreme/common'; import { GridBase } from 'devextreme/common/grids'; -import { event } from 'devextreme/events/index'; +import { event } from 'devextreme/events/events.types'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/show.ts b/packages/devextreme-angular/src/ui/tree-list/nested/show.ts index 39a5b26d6913..944c53a59ad5 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/show.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/show.ts @@ -14,7 +14,7 @@ import { -import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/animation/fx'; +import { AnimationConfig, AnimationState, AnimationType } from 'devextreme/common/core/animation'; import { Direction } from 'devextreme/common'; import { diff --git a/packages/devextreme-angular/src/ui/tree-list/nested/to.ts b/packages/devextreme-angular/src/ui/tree-list/nested/to.ts index 035eabc3a27b..10f6b797162a 100644 --- a/packages/devextreme-angular/src/ui/tree-list/nested/to.ts +++ b/packages/devextreme-angular/src/ui/tree-list/nested/to.ts @@ -14,7 +14,7 @@ import { -import { PositionConfig } from 'devextreme/animation/position'; +import { PositionConfig } from 'devextreme/common/core/animation'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/tree-map/index.ts b/packages/devextreme-angular/src/ui/tree-map/index.ts index 80aa452da90f..265d37a315e2 100644 --- a/packages/devextreme-angular/src/ui/tree-map/index.ts +++ b/packages/devextreme-angular/src/ui/tree-map/index.ts @@ -26,7 +26,7 @@ import { TreeMapColorizerType, TreeMapLayoutAlgorithm, TreeMapLayoutDirection, C import { DataSourceOptions } from 'devextreme/data/data_source'; import { Store } from 'devextreme/data/store'; import { ExportFormat, SingleMultipleOrNone, HorizontalAlignment, VerticalEdge } from 'devextreme/common'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import DxTreeMap from 'devextreme/viz/tree_map'; diff --git a/packages/devextreme-angular/src/ui/tree-map/nested/tooltip.ts b/packages/devextreme-angular/src/ui/tree-map/nested/tooltip.ts index bb46b8444e6d..7d3d0e9d1a87 100644 --- a/packages/devextreme-angular/src/ui/tree-map/nested/tooltip.ts +++ b/packages/devextreme-angular/src/ui/tree-map/nested/tooltip.ts @@ -16,7 +16,7 @@ import { import { DashStyle, Font } from 'devextreme/common/charts'; import { dxTreeMapNode } from 'devextreme/viz/tree_map'; -import { Format } from 'devextreme/localization'; +import { Format } from 'devextreme/common/core/localization'; import { NestedOptionHost, diff --git a/packages/devextreme-angular/src/ui/validator/index.ts b/packages/devextreme-angular/src/ui/validator/index.ts index 7e2e6108c70a..e2a7c2a6f7db 100644 --- a/packages/devextreme-angular/src/ui/validator/index.ts +++ b/packages/devextreme-angular/src/ui/validator/index.ts @@ -26,7 +26,7 @@ import { import * as CommonTypes from 'devextreme/common'; -import { EventInfo } from 'devextreme/events/index'; +import { EventInfo } from 'devextreme/common/core/events'; import DxValidator from 'devextreme/ui/validator'; diff --git a/packages/devextreme-react/gulpfile.js b/packages/devextreme-react/gulpfile.js index 56a059f18672..20cfb76606ed 100644 --- a/packages/devextreme-react/gulpfile.js +++ b/packages/devextreme-react/gulpfile.js @@ -43,6 +43,10 @@ gulp.task(GEN_RUN, (done) => { generateReexports: true, generateCustomTypes: true, }, + templatingOptions: { + quotes: 'double', + excplicitIndexInImports: true, + }, }); done(); @@ -96,7 +100,9 @@ gulp.task(NPM_PREPARE_MODULES, (done) => { const packParamsForFolders = [ ['common'], ['core', ['template', 'config', 'nested-option', 'component', 'extension-component']], + ['common/core'], ['common/data'], + ['common/export'], ]; const modulesImportsFromIndex = fs.readFileSync( config.npm.dist + 'esm/index.js', @@ -110,7 +116,7 @@ gulp.task(NPM_PREPARE_MODULES, (done) => { return ['', [moduleFileName], moduleFilePath]; }); - [...packParamsForFolders, ...packParamsForModules].forEach( + [ ...packParamsForModules, ...packParamsForFolders].forEach( ([folder, moduleFileNames, moduleFilePath]) => makeModule(folder, moduleFileNames, moduleFilePath) ); diff --git a/packages/devextreme-react/src/accordion.ts b/packages/devextreme-react/src/accordion.ts index 20a1cbbc5bbc..2ec57dba5f21 100644 --- a/packages/devextreme-react/src/accordion.ts +++ b/packages/devextreme-react/src/accordion.ts @@ -11,7 +11,7 @@ import NestedOption from "./core/nested-option"; import type { dxAccordionItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, ItemTitleClickEvent } from "devextreme/ui/accordion"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; +import type { template } from "devextreme/common"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/action-sheet.ts b/packages/devextreme-react/src/action-sheet.ts index ccdf5b015571..3233b4ff60cf 100644 --- a/packages/devextreme-react/src/action-sheet.ts +++ b/packages/devextreme-react/src/action-sheet.ts @@ -10,10 +10,9 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { dxActionSheetItem, CancelClickEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent } from "devextreme/ui/action_sheet"; -import type { NativeEventInfo } from "devextreme/events/index"; -import type { ButtonStyle, ButtonType } from "devextreme/common"; +import type { NativeEventInfo } from "devextreme/common/core/events"; +import type { ButtonStyle, template, ButtonType } from "devextreme/common"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/autocomplete.ts b/packages/devextreme-react/src/autocomplete.ts index 6e968e1342ee..57d227f2a8b0 100644 --- a/packages/devextreme-react/src/autocomplete.ts +++ b/packages/devextreme-react/src/autocomplete.ts @@ -10,11 +10,10 @@ import NestedOption from "./core/nested-option"; import type { ChangeEvent, ClosedEvent, ContentReadyEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, ItemClickEvent, KeyDownEvent, KeyUpEvent, OpenedEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/autocomplete"; import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, ClickEvent, OptionChangedEvent } from "devextreme/ui/button"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; -import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { event, EventInfo } from "devextreme/events/index"; -import type { template } from "devextreme/core/templates/template"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; +import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, template, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; +import type { event } from "devextreme/events/events.types"; +import type { EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; diff --git a/packages/devextreme-react/src/bar-gauge.ts b/packages/devextreme-react/src/bar-gauge.ts index 3b873c46f29c..a6c571afd8d0 100644 --- a/packages/devextreme-react/src/bar-gauge.ts +++ b/packages/devextreme-react/src/bar-gauge.ts @@ -10,9 +10,8 @@ import NestedOption from "./core/nested-option"; import type { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, TooltipHiddenEvent, TooltipShownEvent, BarGaugeBarInfo, BarGaugeLegendItem } from "devextreme/viz/bar_gauge"; import type { AnimationEaseMode, Font as ChartsFont, TextOverflow, WordWrap, DashStyle } from "devextreme/common/charts"; -import type { HorizontalAlignment, VerticalEdge, ExportFormat, Format as CommonFormat, Position, Orientation } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; -import type { template } from "devextreme/core/templates/template"; +import type { HorizontalAlignment, VerticalEdge, ExportFormat, Format as CommonFormat, Position, template, Orientation } from "devextreme/common"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/box.ts b/packages/devextreme-react/src/box.ts index bfc0fb2c1451..99c0f2ba0cdc 100644 --- a/packages/devextreme-react/src/box.ts +++ b/packages/devextreme-react/src/box.ts @@ -11,7 +11,7 @@ import NestedOption from "./core/nested-option"; import type { dxBoxItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, dxBoxOptions } from "devextreme/ui/box"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; +import type { template } from "devextreme/common"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/bullet.ts b/packages/devextreme-react/src/bullet.ts index e9f7bdca1143..4e8af405a8d0 100644 --- a/packages/devextreme-react/src/bullet.ts +++ b/packages/devextreme-react/src/bullet.ts @@ -10,9 +10,8 @@ import NestedOption from "./core/nested-option"; import type { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, TooltipHiddenEvent, TooltipShownEvent } from "devextreme/viz/bullet"; import type { DashStyle, Font as ChartsFont } from "devextreme/common/charts"; -import type { Format as CommonFormat } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; -import type { template } from "devextreme/core/templates/template"; +import type { Format as CommonFormat, template } from "devextreme/common"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/button-group.ts b/packages/devextreme-react/src/button-group.ts index 7b793ba37864..cc4890c95fda 100644 --- a/packages/devextreme-react/src/button-group.ts +++ b/packages/devextreme-react/src/button-group.ts @@ -10,8 +10,7 @@ import NestedOption from "./core/nested-option"; import type { ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent } from "devextreme/ui/button_group"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; -import type { ButtonType } from "devextreme/common"; +import type { template, ButtonType } from "devextreme/common"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/chart.ts b/packages/devextreme-react/src/chart.ts index c4b6d8b69dbb..e06cd5fc6206 100644 --- a/packages/devextreme-react/src/chart.ts +++ b/packages/devextreme-react/src/chart.ts @@ -10,9 +10,8 @@ import NestedOption from "./core/nested-option"; import type { ArgumentAxisClickEvent, DisposingEvent, DoneEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, LegendClickEvent, PointClickEvent, SeriesClickEvent, TooltipHiddenEvent, TooltipShownEvent, ZoomEndEvent, ZoomStartEvent, chartPointAggregationInfoObject, chartSeriesObject, ChartSeriesAggregationMethod, dxChartAnnotationConfig, AggregatedPointsPosition, ChartLabelDisplayMode, FinancialChartReductionLevel, chartPointObject, ChartTooltipLocation, ChartZoomAndPanMode, EventKeyModifier } from "devextreme/viz/chart"; import type { AnimationEaseMode, DashStyle, Font as ChartsFont, TextOverflow, AnnotationType, WordWrap, TimeInterval, ChartsDataType, ScaleBreak, ScaleBreakLineStyle, RelativePosition, DiscreteAxisDivisionMode, ArgumentAxisHoverMode, ChartsAxisLabelOverlap, AxisScaleType, VisualRangeUpdateMode, ChartsColor, SeriesHoverMode, HatchDirection, PointInteractionMode, PointSymbol, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType, LegendItem, LegendHoverMode } from "devextreme/common/charts"; -import type { template } from "devextreme/core/templates/template"; -import type { HorizontalAlignment, VerticalAlignment, Format as CommonFormat, Position, VerticalEdge, ExportFormat, Orientation } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; +import type { template, HorizontalAlignment, VerticalAlignment, Format as CommonFormat, Position, VerticalEdge, ExportFormat, Orientation } from "devextreme/common"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; import type { ChartSeries } from "devextreme/viz/common"; import type * as CommonChartTypes from "devextreme/common/charts"; diff --git a/packages/devextreme-react/src/circular-gauge.ts b/packages/devextreme-react/src/circular-gauge.ts index 19be891c22cc..5509ec7be869 100644 --- a/packages/devextreme-react/src/circular-gauge.ts +++ b/packages/devextreme-react/src/circular-gauge.ts @@ -10,9 +10,8 @@ import NestedOption from "./core/nested-option"; import type { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, TooltipHiddenEvent, TooltipShownEvent, CircularGaugeLabelOverlap, CircularGaugeElementOrientation } from "devextreme/viz/circular_gauge"; import type { AnimationEaseMode, DashStyle, Font as ChartsFont, LabelOverlap, ChartsColor, Palette, PaletteExtensionMode, TextOverflow, WordWrap } from "devextreme/common/charts"; -import type { ExportFormat, Format as CommonFormat, HorizontalEdge, VerticalEdge, HorizontalAlignment } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; -import type { template } from "devextreme/core/templates/template"; +import type { ExportFormat, Format as CommonFormat, HorizontalEdge, VerticalEdge, HorizontalAlignment, template } from "devextreme/common"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/color-box.ts b/packages/devextreme-react/src/color-box.ts index 2a623a732ded..340029dc2111 100644 --- a/packages/devextreme-react/src/color-box.ts +++ b/packages/devextreme-react/src/color-box.ts @@ -10,11 +10,10 @@ import NestedOption from "./core/nested-option"; import type { ChangeEvent, ClosedEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, KeyDownEvent, KeyUpEvent, OpenedEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/color_box"; import type { DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, ClickEvent, ContentReadyEvent, OptionChangedEvent } from "devextreme/ui/button"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; -import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { event, EventInfo } from "devextreme/events/index"; -import type { template } from "devextreme/core/templates/template"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; +import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, template, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; +import type { event } from "devextreme/events/events.types"; +import type { EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; diff --git a/packages/devextreme-react/src/common/core/animation.ts b/packages/devextreme-react/src/common/core/animation.ts new file mode 100644 index 000000000000..65dbc2236713 --- /dev/null +++ b/packages/devextreme-react/src/common/core/animation.ts @@ -0,0 +1,12 @@ +export { + AnimationConfig, + animationPresets, + AnimationState, + cancelAnimationFrame, + CollisionResolution, + CollisionResolutionCombination, + fx, + PositionConfig, + requestAnimationFrame, + TransitionExecutor, +} from "devextreme/common/core/animation"; diff --git a/packages/devextreme-react/src/common/core/environment.ts b/packages/devextreme-react/src/common/core/environment.ts new file mode 100644 index 000000000000..8830f31c4290 --- /dev/null +++ b/packages/devextreme-react/src/common/core/environment.ts @@ -0,0 +1,7 @@ +export { + Device, + getTimeZones, + hideTopOverlay, + initMobileViewport, + SchedulerTimeZone, +} from "devextreme/common/core/environment"; diff --git a/packages/devextreme-react/src/common/core/events.ts b/packages/devextreme-react/src/common/core/events.ts new file mode 100644 index 000000000000..f7b89308f060 --- /dev/null +++ b/packages/devextreme-react/src/common/core/events.ts @@ -0,0 +1,14 @@ +export { + AsyncCancelable, + Cancelable, + ChangedOptionInfo, + EventInfo, + EventObject, + InitializedEventInfo, + ItemInfo, + NativeEventInfo, + off, + on, + one, + trigger, +} from "devextreme/common/core/events"; diff --git a/packages/devextreme-react/src/common/core/index.ts b/packages/devextreme-react/src/common/core/index.ts new file mode 100644 index 000000000000..2f48cae6d949 --- /dev/null +++ b/packages/devextreme-react/src/common/core/index.ts @@ -0,0 +1,4 @@ +export * as Animation from "./animation"; +export * as Environment from "./environment"; +export * as Events from "./events"; +export * as Localization from "./localization"; diff --git a/packages/devextreme-react/src/common/core/localization.ts b/packages/devextreme-react/src/common/core/localization.ts new file mode 100644 index 000000000000..8dd8ec2ad04b --- /dev/null +++ b/packages/devextreme-react/src/common/core/localization.ts @@ -0,0 +1,10 @@ +export { + Format, + formatDate, + formatMessage, + formatNumber, + loadMessages, + locale, + parseDate, + parseNumber, +} from "devextreme/common/core/localization"; diff --git a/packages/devextreme-react/src/common/data.ts b/packages/devextreme-react/src/common/data.ts new file mode 100644 index 000000000000..16a77b01921d --- /dev/null +++ b/packages/devextreme-react/src/common/data.ts @@ -0,0 +1,43 @@ +export { + applyChanges, + ArrayStore, + ArrayStoreOptions, + base64_encode, + compileGetter, + compileSetter, + CustomStore, + CustomStoreOptions, + DataSource, + DataSourceOptions, + EdmLiteral, + EndpointSelector, + errorHandler, + FilterDescriptor, + GroupDescriptor, + GroupingInterval, + GroupItem, + isGroupItemsArray, + isItemsArray, + isLoadResultObject, + keyConverters, + LangParams, + LoadOptions, + LoadResult, + LoadResultObject, + LocalStore, + LocalStoreOptions, + ODataContext, + ODataContextOptions, + ODataStore, + ODataStoreOptions, + query, + Query, + ResolvedData, + SearchOperation, + SelectDescriptor, + setErrorHandler, + SortDescriptor, + Store, + StoreOptions, + SummaryDescriptor, +} from "devextreme/common/data"; diff --git a/packages/devextreme-react/src/common/export/excel.ts b/packages/devextreme-react/src/common/export/excel.ts new file mode 100644 index 000000000000..62583b766d91 --- /dev/null +++ b/packages/devextreme-react/src/common/export/excel.ts @@ -0,0 +1,8 @@ +export { + DataGridCell, + DataGridExportOptions, + exportDataGrid, + exportPivotGrid, + PivotGridCell, + PivotGridExportOptions, +} from "devextreme/common/export/excel"; diff --git a/packages/devextreme-react/src/common/export/index.ts b/packages/devextreme-react/src/common/export/index.ts new file mode 100644 index 000000000000..ece2a724b2db --- /dev/null +++ b/packages/devextreme-react/src/common/export/index.ts @@ -0,0 +1,2 @@ +export * as Excel from "./excel"; +export * as Pdf from "./pdf"; diff --git a/packages/devextreme-react/src/common/export/pdf.ts b/packages/devextreme-react/src/common/export/pdf.ts new file mode 100644 index 000000000000..2b95e14b2487 --- /dev/null +++ b/packages/devextreme-react/src/common/export/pdf.ts @@ -0,0 +1,9 @@ +export { + Cell, + DataGridCell, + DataGridExportOptions, + exportDataGrid, + exportGantt, + GanttExportFont, + GanttExportOptions, +} from "devextreme/common/export/pdf"; diff --git a/packages/devextreme-react/src/common/index.ts b/packages/devextreme-react/src/common/index.ts index 4cddfd8869c9..c9e79d048002 100644 --- a/packages/devextreme-react/src/common/index.ts +++ b/packages/devextreme-react/src/common/index.ts @@ -5,9 +5,11 @@ export { ButtonType, CompareRule, ComparisonOperator, + config, CustomRule, DataStructure, DataType, + DefaultOptionsRule, Direction, DisplayMode, DragDirection, @@ -18,8 +20,10 @@ export { ExportFormat, FieldChooserLayout, FirstDayOfWeek, + FloatingActionButtonDirection, Format, GlobalConfig, + Guid, HorizontalAlignment, HorizontalEdge, LabelMode, @@ -29,7 +33,6 @@ export { Orientation, PageLoadMode, PageOrientation, - PagerBase, PatternRule, Position, PositionAlignment, @@ -41,6 +44,7 @@ export { ScrollMode, SearchMode, SelectAllMode, + setTemplateEngine, SimplifiedSearchMode, SingleMultipleAllOrNone, SingleMultipleOrNone, @@ -54,6 +58,7 @@ export { SubmenuShowMode, TabsIconPosition, TabsStyle, + template, TextBoxPredefinedButton, TextEditorButton, TextEditorButtonLocation, @@ -68,3 +73,9 @@ export { VerticalAlignment, VerticalEdge, } from "devextreme/common"; + +export * as Charts from "./charts"; +export * as Core from "./core/index"; +export * as Data from "./data"; +export * as Export from "./export/index"; +export * as Grids from "./grids"; diff --git a/packages/devextreme-react/src/context-menu.ts b/packages/devextreme-react/src/context-menu.ts index 2465a8e627b0..aed0d6d798ff 100644 --- a/packages/devextreme-react/src/context-menu.ts +++ b/packages/devextreme-react/src/context-menu.ts @@ -10,11 +10,9 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { dxContextMenuItem, ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemRenderedEvent, PositioningEvent, ShowingEvent, ShownEvent } from "devextreme/ui/context_menu"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; -import type { HorizontalAlignment, VerticalAlignment, Direction, PositionAlignment, SubmenuShowMode } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; +import type { HorizontalAlignment, VerticalAlignment, Direction, template, PositionAlignment, SubmenuShowMode } from "devextreme/common"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/data-grid.ts b/packages/devextreme-react/src/data-grid.ts index a8537858c8cc..fcc218aea737 100644 --- a/packages/devextreme-react/src/data-grid.ts +++ b/packages/devextreme-react/src/data-grid.ts @@ -11,17 +11,16 @@ import NestedOption from "./core/nested-option"; import type { dxDataGridColumn, AdaptiveDetailRowPreparingEvent, CellClickEvent, CellDblClickEvent, CellPreparedEvent, ContentReadyEvent, ContextMenuPreparingEvent, DataErrorOccurredEvent, DisposingEvent, EditCanceledEvent, EditCancelingEvent, EditingStartEvent, EditorPreparedEvent, EditorPreparingEvent, ExportingEvent, FocusedCellChangingEvent, FocusedRowChangingEvent, InitializedEvent, InitNewRowEvent, KeyDownEvent, RowClickEvent, RowCollapsedEvent, RowCollapsingEvent, RowDblClickEvent, RowExpandedEvent, RowExpandingEvent, RowInsertedEvent, RowInsertingEvent, RowPreparedEvent, RowRemovedEvent, RowRemovingEvent, RowUpdatedEvent, RowUpdatingEvent, RowValidatingEvent, SavedEvent, SavingEvent, ToolbarPreparingEvent, dxDataGridRowObject, DataGridPredefinedColumnButton, ColumnButtonClickEvent, dxDataGridColumnButton, DataGridCommandColumnType, SelectionSensitivity, DataGridExportFormat, DataGridPredefinedToolbarItem, DataGridScrollMode, dxDataGridToolbarItem } from "devextreme/ui/data_grid"; import type { DataChange, DataChangeType, FilterOperation, FilterType, FixedPosition, HeaderFilterGroupInterval, ColumnHeaderFilterSearchConfig, SelectedFilterOperation, ColumnChooserMode, ColumnChooserSearchConfig, ColumnChooserSelectionConfig, HeaderFilterSearchConfig, SelectionColumnDisplayMode, GridsEditMode, NewRowPosition, GridsEditRefreshMode, StartEditAction, GridBase, ApplyFilterMode, GroupExpandMode, SummaryType, EnterKeyAction, EnterKeyDirection, PagerPageSize, DataRenderMode, StateStoreType } from "devextreme/common/grids"; -import type { Mode, ValidationRuleType, HorizontalAlignment, VerticalAlignment, DataType, Format as CommonFormat, SearchMode, SortOrder, ComparisonOperator, SingleMultipleOrNone, SelectAllMode, PositionAlignment, Direction, ToolbarItemLocation, ToolbarItemComponent, DisplayMode, DragDirection, DragHighlight, ScrollbarMode } from "devextreme/common"; +import type { Mode, ValidationRuleType, HorizontalAlignment, VerticalAlignment, template, DataType, Format as CommonFormat, SearchMode, SortOrder, ComparisonOperator, SingleMultipleOrNone, SelectAllMode, PositionAlignment, Direction, ToolbarItemLocation, ToolbarItemComponent, DisplayMode, DragDirection, DragHighlight, ScrollbarMode } from "devextreme/common"; import type { ContentReadyEvent as FilterBuilderContentReadyEvent, DisposingEvent as FilterBuilderDisposingEvent, EditorPreparedEvent as FilterBuilderEditorPreparedEvent, EditorPreparingEvent as FilterBuilderEditorPreparingEvent, InitializedEvent as FilterBuilderInitializedEvent, dxFilterBuilderField, FilterBuilderOperation, dxFilterBuilderCustomOperation, GroupOperation, OptionChangedEvent, ValueChangedEvent } from "devextreme/ui/filter_builder"; import type { ContentReadyEvent as FormContentReadyEvent, DisposingEvent as FormDisposingEvent, InitializedEvent as FormInitializedEvent, dxFormSimpleItem, dxFormOptions, OptionChangedEvent as FormOptionChangedEvent, dxFormGroupItem, dxFormTabbedItem, dxFormEmptyItem, dxFormButtonItem, LabelLocation, FormLabelMode, EditorEnterKeyEvent, FieldDataChangedEvent, FormItemComponent, FormItemType } from "devextreme/ui/form"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; -import type { template } from "devextreme/core/templates/template"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { Format as LocalizationFormat } from "devextreme/localization"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; import type { DataSourceOptions } from "devextreme/data/data_source"; import type { Store } from "devextreme/data/store"; import type { dxPopupOptions, dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; -import type { event, EventInfo } from "devextreme/events/index"; +import type { event } from "devextreme/events/events.types"; +import type { EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; diff --git a/packages/devextreme-react/src/date-box.ts b/packages/devextreme-react/src/date-box.ts index a95259345931..976a4b16a7c4 100644 --- a/packages/devextreme-react/src/date-box.ts +++ b/packages/devextreme-react/src/date-box.ts @@ -11,11 +11,10 @@ import NestedOption from "./core/nested-option"; import type { ChangeEvent, ClosedEvent, ContentReadyEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, KeyDownEvent, KeyUpEvent, OpenedEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/date_box"; import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, OptionChangedEvent as ButtonOptionChangedEvent, ClickEvent } from "devextreme/ui/button"; import type { DisposingEvent as CalendarDisposingEvent, InitializedEvent as CalendarInitializedEvent, ValueChangedEvent as CalendarValueChangedEvent, DisabledDate, CalendarZoomLevel, OptionChangedEvent, CalendarSelectionMode, WeekNumberRule } from "devextreme/ui/calendar"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; -import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, FirstDayOfWeek, ValidationMessageMode, Position as CommonPosition, ValidationStatus, Format, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { template } from "devextreme/core/templates/template"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { event, EventInfo } from "devextreme/events/index"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; +import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, template, FirstDayOfWeek, ValidationMessageMode, Position as CommonPosition, ValidationStatus, Format, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; +import type { event } from "devextreme/events/events.types"; +import type { EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; diff --git a/packages/devextreme-react/src/date-range-box.ts b/packages/devextreme-react/src/date-range-box.ts index 066d3d9adf30..5ce467df5291 100644 --- a/packages/devextreme-react/src/date-range-box.ts +++ b/packages/devextreme-react/src/date-range-box.ts @@ -11,11 +11,10 @@ import NestedOption from "./core/nested-option"; import type { ChangeEvent, ClosedEvent, ContentReadyEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, KeyDownEvent, KeyUpEvent, OpenedEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/date_range_box"; import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, OptionChangedEvent as ButtonOptionChangedEvent, ClickEvent } from "devextreme/ui/button"; import type { DisposingEvent as CalendarDisposingEvent, InitializedEvent as CalendarInitializedEvent, ValueChangedEvent as CalendarValueChangedEvent, DisabledDate, CalendarZoomLevel, OptionChangedEvent, CalendarSelectionMode, WeekNumberRule } from "devextreme/ui/calendar"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; -import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, FirstDayOfWeek, ValidationMessageMode, Position as CommonPosition, ValidationStatus, Format, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { template } from "devextreme/core/templates/template"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { event, EventInfo } from "devextreme/events/index"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; +import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, template, FirstDayOfWeek, ValidationMessageMode, Position as CommonPosition, ValidationStatus, Format, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; +import type { event } from "devextreme/events/events.types"; +import type { EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; diff --git a/packages/devextreme-react/src/defer-rendering.ts b/packages/devextreme-react/src/defer-rendering.ts index 4b35f95f5991..1635440aaada 100644 --- a/packages/devextreme-react/src/defer-rendering.ts +++ b/packages/devextreme-react/src/defer-rendering.ts @@ -9,9 +9,8 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { ContentReadyEvent, DisposingEvent, InitializedEvent, RenderedEvent, ShownEvent } from "devextreme/ui/defer_rendering"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; +import type { AnimationConfig, AnimationState, AnimationType, CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { Direction, HorizontalAlignment, VerticalAlignment, PositionAlignment } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/diagram.ts b/packages/devextreme-react/src/diagram.ts index e4047b6cf0ab..44b8bd2c1031 100644 --- a/packages/devextreme-react/src/diagram.ts +++ b/packages/devextreme-react/src/diagram.ts @@ -9,9 +9,8 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { ContentReadyEvent, CustomCommandEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemDblClickEvent, RequestEditOperationEvent, RequestLayoutUpdateEvent, DataLayoutType, Command as DiagramCommand, CustomCommand, ShapeCategory, ToolboxDisplayMode, ShapeType, dxDiagramShape, ConnectorLineEnd, ConnectorLineType, PanelVisibility } from "devextreme/ui/diagram"; -import type { Orientation, ToolbarItemLocation } from "devextreme/common"; +import type { Orientation, ToolbarItemLocation, template } from "devextreme/common"; import type { dxSVGElement } from "devextreme/core/element"; -import type { template } from "devextreme/core/templates/template"; import type { DataSourceOptions } from "devextreme/data/data_source"; import type { Store } from "devextreme/data/store"; diff --git a/packages/devextreme-react/src/drop-down-box.ts b/packages/devextreme-react/src/drop-down-box.ts index c79e93cf6e0c..315e56332bb4 100644 --- a/packages/devextreme-react/src/drop-down-box.ts +++ b/packages/devextreme-react/src/drop-down-box.ts @@ -10,11 +10,10 @@ import NestedOption from "./core/nested-option"; import type { ChangeEvent, ClosedEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, KeyDownEvent, KeyUpEvent, OpenedEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/drop_down_box"; import type { DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, ClickEvent, ContentReadyEvent, OptionChangedEvent } from "devextreme/ui/button"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; -import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { event, EventInfo } from "devextreme/events/index"; -import type { template } from "devextreme/core/templates/template"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; +import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, template, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; +import type { event } from "devextreme/events/events.types"; +import type { EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; diff --git a/packages/devextreme-react/src/drop-down-button.ts b/packages/devextreme-react/src/drop-down-button.ts index 550797ada27d..f34fe455cf04 100644 --- a/packages/devextreme-react/src/drop-down-button.ts +++ b/packages/devextreme-react/src/drop-down-button.ts @@ -9,11 +9,10 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { ButtonClickEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent } from "devextreme/ui/drop_down_button"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; -import type { HorizontalAlignment, VerticalAlignment, PositionAlignment, Direction, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { event, EventInfo } from "devextreme/events/index"; -import type { template } from "devextreme/core/templates/template"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; +import type { HorizontalAlignment, VerticalAlignment, template, PositionAlignment, Direction, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; +import type { event } from "devextreme/events/events.types"; +import type { EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; diff --git a/packages/devextreme-react/src/filter-builder.ts b/packages/devextreme-react/src/filter-builder.ts index fb2bf41d88f5..2a7c73c85b43 100644 --- a/packages/devextreme-react/src/filter-builder.ts +++ b/packages/devextreme-react/src/filter-builder.ts @@ -9,9 +9,8 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { ContentReadyEvent, DisposingEvent, EditorPreparedEvent, EditorPreparingEvent, InitializedEvent, ValueChangedEvent, dxFilterBuilderField, FilterBuilderOperation } from "devextreme/ui/filter_builder"; -import type { DataType, Format as CommonFormat } from "devextreme/common"; -import type { template } from "devextreme/core/templates/template"; -import type { Format as LocalizationFormat } from "devextreme/localization"; +import type { DataType, template, Format as CommonFormat } from "devextreme/common"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; import type { DataSourceOptions } from "devextreme/data/data_source"; import type { Store } from "devextreme/data/store"; diff --git a/packages/devextreme-react/src/form.ts b/packages/devextreme-react/src/form.ts index df4b103107cf..40474ca2cf63 100644 --- a/packages/devextreme-react/src/form.ts +++ b/packages/devextreme-react/src/form.ts @@ -11,8 +11,7 @@ import NestedOption from "./core/nested-option"; import type { ContentReadyEvent, DisposingEvent, EditorEnterKeyEvent, InitializedEvent, FormItemType, dxFormButtonItem, dxFormEmptyItem, dxFormGroupItem, dxFormSimpleItem, dxFormTabbedItem, FormItemComponent, LabelLocation } from "devextreme/ui/form"; import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, ClickEvent, OptionChangedEvent } from "devextreme/ui/button"; import type { ContentReadyEvent as TabPanelContentReadyEvent, DisposingEvent as TabPanelDisposingEvent, InitializedEvent as TabPanelInitializedEvent, OptionChangedEvent as TabPanelOptionChangedEvent, dxTabPanelOptions, dxTabPanelItem, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, SelectionChangedEvent, SelectionChangingEvent, TitleClickEvent, TitleHoldEvent, TitleRenderedEvent } from "devextreme/ui/tab_panel"; -import type { ValidationRuleType, HorizontalAlignment, VerticalAlignment, ButtonStyle, ButtonType, ComparisonOperator, TabsIconPosition, TabsStyle, Position } from "devextreme/common"; -import type { template } from "devextreme/core/templates/template"; +import type { ValidationRuleType, HorizontalAlignment, VerticalAlignment, ButtonStyle, template, ButtonType, ComparisonOperator, TabsIconPosition, TabsStyle, Position } from "devextreme/common"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; import type { DataSourceOptions } from "devextreme/data/data_source"; import type { Store } from "devextreme/data/store"; diff --git a/packages/devextreme-react/src/funnel.ts b/packages/devextreme-react/src/funnel.ts index 6b056272ffa7..1420402a680a 100644 --- a/packages/devextreme-react/src/funnel.ts +++ b/packages/devextreme-react/src/funnel.ts @@ -10,9 +10,8 @@ import NestedOption from "./core/nested-option"; import type { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, ItemClickEvent, LegendClickEvent, dxFunnelItem, FunnelLegendItem } from "devextreme/viz/funnel"; import type { DashStyle, Font as ChartsFont, TextOverflow, WordWrap, HatchDirection, LabelPosition } from "devextreme/common/charts"; -import type { ExportFormat, Format as CommonFormat, HorizontalAlignment, VerticalEdge, HorizontalEdge, Position, Orientation } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; -import type { template } from "devextreme/core/templates/template"; +import type { ExportFormat, Format as CommonFormat, HorizontalAlignment, VerticalEdge, HorizontalEdge, Position, template, Orientation } from "devextreme/common"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/gallery.ts b/packages/devextreme-react/src/gallery.ts index 60b12c214861..a35001b635ce 100644 --- a/packages/devextreme-react/src/gallery.ts +++ b/packages/devextreme-react/src/gallery.ts @@ -11,7 +11,7 @@ import NestedOption from "./core/nested-option"; import type { dxGalleryItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent } from "devextreme/ui/gallery"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; +import type { template } from "devextreme/common"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/gantt.ts b/packages/devextreme-react/src/gantt.ts index 8f8fa8c1ee4b..2b7f4ed136ea 100644 --- a/packages/devextreme-react/src/gantt.ts +++ b/packages/devextreme-react/src/gantt.ts @@ -9,11 +9,10 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { ContentReadyEvent, ContextMenuPreparingEvent, CustomCommandEvent, DependencyDeletedEvent, DependencyDeletingEvent, DependencyInsertedEvent, DependencyInsertingEvent, DisposingEvent, InitializedEvent, ResourceAssignedEvent, ResourceAssigningEvent, ResourceDeletedEvent, ResourceDeletingEvent, ResourceInsertedEvent, ResourceInsertingEvent, ResourceManagerDialogShowingEvent, ResourceUnassignedEvent, ResourceUnassigningEvent, ScaleCellPreparedEvent, TaskClickEvent, TaskDblClickEvent, TaskDeletedEvent, TaskDeletingEvent, TaskEditDialogShowingEvent, TaskInsertedEvent, TaskInsertingEvent, TaskMovingEvent, TaskUpdatedEvent, TaskUpdatingEvent, dxGanttContextMenuItem, GanttPredefinedContextMenuItem, dxGanttFilterRowOperationDescriptions, dxGanttHeaderFilterTexts, GanttPredefinedToolbarItem, GanttScaleType, dxGanttToolbarItem } from "devextreme/ui/gantt"; -import type { HorizontalAlignment, DataType, Format as CommonFormat, SearchMode, SortOrder, ToolbarItemLocation, ToolbarItemComponent, SingleMultipleOrNone } from "devextreme/common"; +import type { HorizontalAlignment, template, DataType, Format as CommonFormat, SearchMode, SortOrder, ToolbarItemLocation, ToolbarItemComponent, SingleMultipleOrNone } from "devextreme/common"; import type { dxTreeListColumn, dxTreeListRowObject } from "devextreme/ui/tree_list"; -import type { template } from "devextreme/core/templates/template"; import type { FilterOperation, FilterType, HeaderFilterGroupInterval, ColumnHeaderFilterSearchConfig, SelectedFilterOperation, HeaderFilterSearchConfig } from "devextreme/common/grids"; -import type { Format as LocalizationFormat } from "devextreme/localization"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; import type { DataSourceOptions } from "devextreme/data/data_source"; import type { Store } from "devextreme/data/store"; import type { dxContextMenuItem } from "devextreme/ui/context_menu"; diff --git a/packages/devextreme-react/src/html-editor.ts b/packages/devextreme-react/src/html-editor.ts index d1971a16c4a4..05b8d1ae8972 100644 --- a/packages/devextreme-react/src/html-editor.ts +++ b/packages/devextreme-react/src/html-editor.ts @@ -10,9 +10,8 @@ import NestedOption from "./core/nested-option"; import type { ContentReadyEvent, DisposingEvent, FocusInEvent, FocusOutEvent, InitializedEvent, ValueChangedEvent, HtmlEditorImageUploadMode, dxHtmlEditorImageUploadTabItem, HtmlEditorImageUploadTab, dxHtmlEditorTableContextMenuItem, HtmlEditorPredefinedContextMenuItem, HtmlEditorPredefinedToolbarItem, dxHtmlEditorToolbarItem } from "devextreme/ui/html_editor"; import type { ContentReadyEvent as FileUploaderContentReadyEvent, DisposingEvent as FileUploaderDisposingEvent, InitializedEvent as FileUploaderInitializedEvent, ValueChangedEvent as FileUploaderValueChangedEvent, BeforeSendEvent, DropZoneEnterEvent, DropZoneLeaveEvent, FilesUploadedEvent, OptionChangedEvent, ProgressEvent, UploadAbortedEvent, UploadedEvent, UploadErrorEvent, UploadStartedEvent, UploadHttpMethod, FileUploadMode, dxFileUploaderOptions } from "devextreme/ui/file_uploader"; -import type { ValidationStatus, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; +import type { ValidationStatus, template, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; import type { DataSourceOptions } from "devextreme/data/data_source"; import type { Store } from "devextreme/data/store"; diff --git a/packages/devextreme-react/src/index.ts b/packages/devextreme-react/src/index.ts index 35e83de9b5dd..a64994655c3e 100644 --- a/packages/devextreme-react/src/index.ts +++ b/packages/devextreme-react/src/index.ts @@ -81,3 +81,5 @@ export { ValidationGroup } from "./validation-group"; export { ValidationSummary } from "./validation-summary"; export { Validator } from "./validator"; export { VectorMap } from "./vector-map"; + +export * as Common from "./common/index"; diff --git a/packages/devextreme-react/src/linear-gauge.ts b/packages/devextreme-react/src/linear-gauge.ts index 85d4ba287a59..55be571d0ac0 100644 --- a/packages/devextreme-react/src/linear-gauge.ts +++ b/packages/devextreme-react/src/linear-gauge.ts @@ -10,9 +10,8 @@ import NestedOption from "./core/nested-option"; import type { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, TooltipHiddenEvent, TooltipShownEvent } from "devextreme/viz/linear_gauge"; import type { AnimationEaseMode, DashStyle, Font as ChartsFont, LabelOverlap, ChartsColor, Palette, PaletteExtensionMode, TextOverflow, WordWrap } from "devextreme/common/charts"; -import type { ExportFormat, Format as CommonFormat, Orientation, HorizontalAlignment, VerticalAlignment, HorizontalEdge, VerticalEdge } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; -import type { template } from "devextreme/core/templates/template"; +import type { ExportFormat, Format as CommonFormat, Orientation, HorizontalAlignment, VerticalAlignment, HorizontalEdge, VerticalEdge, template } from "devextreme/common"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/list.ts b/packages/devextreme-react/src/list.ts index 115851fb8970..e83415365b33 100644 --- a/packages/devextreme-react/src/list.ts +++ b/packages/devextreme-react/src/list.ts @@ -13,9 +13,8 @@ import type { dxListItem, ContentReadyEvent, DisposingEvent, GroupRenderedEvent, import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, OptionChangedEvent as ButtonOptionChangedEvent, ClickEvent } from "devextreme/ui/button"; import type { ContentReadyEvent as TextBoxContentReadyEvent, DisposingEvent as TextBoxDisposingEvent, InitializedEvent as TextBoxInitializedEvent, OptionChangedEvent as TextBoxOptionChangedEvent, TextBoxType, ChangeEvent, CopyEvent, CutEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InputEvent, KeyDownEvent, KeyUpEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/text_box"; import type { DisposingEvent as SortableDisposingEvent, InitializedEvent as SortableInitializedEvent, AddEvent, DragChangeEvent, DragEndEvent, DragMoveEvent, DragStartEvent, OptionChangedEvent, RemoveEvent, ReorderEvent } from "devextreme/ui/sortable"; -import type { TextEditorButtonLocation, DragDirection, DragHighlight, Orientation, ButtonStyle, ButtonType, TextBoxPredefinedButton, TextEditorButton, LabelMode, MaskMode, EditorStyle, ValidationMessageMode, Position, ValidationStatus } from "devextreme/common"; +import type { TextEditorButtonLocation, template, DragDirection, DragHighlight, Orientation, ButtonStyle, ButtonType, TextBoxPredefinedButton, TextEditorButton, LabelMode, MaskMode, EditorStyle, ValidationMessageMode, Position, ValidationStatus } from "devextreme/common"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/load-panel.ts b/packages/devextreme-react/src/load-panel.ts index 1931a98758c0..0c94781a31db 100644 --- a/packages/devextreme-react/src/load-panel.ts +++ b/packages/devextreme-react/src/load-panel.ts @@ -9,9 +9,8 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { PositionAlignment, HorizontalAlignment, VerticalAlignment, Direction } from "devextreme/common"; -import type { PositionConfig, CollisionResolution, CollisionResolutionCombination } from "devextreme/animation/position"; +import type { PositionConfig, AnimationConfig, CollisionResolution, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, ShowingEvent, ShownEvent } from "devextreme/ui/load_panel"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/lookup.ts b/packages/devextreme-react/src/lookup.ts index 90b75034912a..0378331475b4 100644 --- a/packages/devextreme-react/src/lookup.ts +++ b/packages/devextreme-react/src/lookup.ts @@ -10,11 +10,9 @@ import NestedOption from "./core/nested-option"; import type { ClosedEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, OpenedEvent, PageLoadingEvent, PullRefreshEvent, ScrollEvent, ValueChangedEvent } from "devextreme/ui/lookup"; import type { ContentReadyEvent as PopoverContentReadyEvent, DisposingEvent as PopoverDisposingEvent, InitializedEvent as PopoverInitializedEvent, HiddenEvent, HidingEvent, OptionChangedEvent, ShowingEvent, ShownEvent, TitleRenderedEvent } from "devextreme/ui/popover"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; -import type { HorizontalAlignment, VerticalAlignment, Position as CommonPosition, Direction, PositionAlignment, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { event } from "devextreme/events/index"; -import type { template } from "devextreme/core/templates/template"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; +import type { HorizontalAlignment, VerticalAlignment, template, Position as CommonPosition, Direction, PositionAlignment, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; +import type { event } from "devextreme/events/events.types"; import type { dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; diff --git a/packages/devextreme-react/src/menu.ts b/packages/devextreme-react/src/menu.ts index 7f0047324f5f..1fc037165ac8 100644 --- a/packages/devextreme-react/src/menu.ts +++ b/packages/devextreme-react/src/menu.ts @@ -10,11 +10,9 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { dxMenuItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemRenderedEvent, SubmenuHiddenEvent, SubmenuHidingEvent, SubmenuShowingEvent, SubmenuShownEvent } from "devextreme/ui/menu"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; -import type { HorizontalAlignment, VerticalAlignment, Direction, PositionAlignment, SubmenuShowMode } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; +import type { HorizontalAlignment, VerticalAlignment, Direction, template, PositionAlignment, SubmenuShowMode } from "devextreme/common"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/multi-view.ts b/packages/devextreme-react/src/multi-view.ts index 7654df8dc704..ac1eb16d0553 100644 --- a/packages/devextreme-react/src/multi-view.ts +++ b/packages/devextreme-react/src/multi-view.ts @@ -11,7 +11,7 @@ import NestedOption from "./core/nested-option"; import type { dxMultiViewItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent } from "devextreme/ui/multi_view"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; +import type { template } from "devextreme/common"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/number-box.ts b/packages/devextreme-react/src/number-box.ts index e4e1850a3cd7..e5fe00988f19 100644 --- a/packages/devextreme-react/src/number-box.ts +++ b/packages/devextreme-react/src/number-box.ts @@ -10,8 +10,7 @@ import NestedOption from "./core/nested-option"; import type { ChangeEvent, ContentReadyEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, KeyDownEvent, KeyUpEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/number_box"; import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, ClickEvent, OptionChangedEvent } from "devextreme/ui/button"; -import type { TextEditorButtonLocation, Format as CommonFormat, ButtonStyle, ButtonType } from "devextreme/common"; -import type { template } from "devextreme/core/templates/template"; +import type { TextEditorButtonLocation, Format as CommonFormat, ButtonStyle, template, ButtonType } from "devextreme/common"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/pie-chart.ts b/packages/devextreme-react/src/pie-chart.ts index 87f9e7aadc78..d6a07b402585 100644 --- a/packages/devextreme-react/src/pie-chart.ts +++ b/packages/devextreme-react/src/pie-chart.ts @@ -10,9 +10,8 @@ import NestedOption from "./core/nested-option"; import type { DisposingEvent, DoneEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, LegendClickEvent, PointClickEvent, TooltipHiddenEvent, TooltipShownEvent, dxPieChartAnnotationConfig, PieChartAnnotationLocation, dxPieChartCommonAnnotationConfig, PieChartSeriesInteractionMode, SmallValuesGroupingMode, PieChartLegendItem, PieChartLegendHoverMode, PieChartSeries } from "devextreme/viz/pie_chart"; import type { AnimationEaseMode, DashStyle, Font as ChartsFont, TextOverflow, AnnotationType, WordWrap, ChartsDataType, ChartsColor, HatchDirection, LabelPosition } from "devextreme/common/charts"; -import type { template } from "devextreme/core/templates/template"; -import type { Format as CommonFormat, ExportFormat, HorizontalAlignment, Position, Orientation, VerticalEdge } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; +import type { template, Format as CommonFormat, ExportFormat, HorizontalAlignment, Position, Orientation, VerticalEdge } from "devextreme/common"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/polar-chart.ts b/packages/devextreme-react/src/polar-chart.ts index 478f49b1624f..10eb641b5eb5 100644 --- a/packages/devextreme-react/src/polar-chart.ts +++ b/packages/devextreme-react/src/polar-chart.ts @@ -10,9 +10,8 @@ import NestedOption from "./core/nested-option"; import type { ArgumentAxisClickEvent, DisposingEvent, DoneEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, LegendClickEvent, PointClickEvent, SeriesClickEvent, TooltipHiddenEvent, TooltipShownEvent, ZoomEndEvent, ZoomStartEvent, dxPolarChartAnnotationConfig, dxPolarChartCommonAnnotationConfig, PolarChartSeriesType, PolarChartSeries, ValueAxisVisualRangeUpdateMode } from "devextreme/viz/polar_chart"; import type { AnimationEaseMode, DashStyle, Font as ChartsFont, TextOverflow, AnnotationType, WordWrap, ChartsDataType, DiscreteAxisDivisionMode, ArgumentAxisHoverMode, LabelOverlap, TimeInterval, AxisScaleType, ChartsColor, SeriesHoverMode, HatchDirection, RelativePosition, PointInteractionMode, PointSymbol, SeriesSelectionMode, ValueErrorBarDisplayMode, ValueErrorBarType, LegendItem, LegendHoverMode } from "devextreme/common/charts"; -import type { template } from "devextreme/core/templates/template"; -import type { Format as LocalizationFormat } from "devextreme/localization"; -import type { Format as CommonFormat, ExportFormat, HorizontalAlignment, Position, Orientation, VerticalEdge } from "devextreme/common"; +import type { template, Format as CommonFormat, ExportFormat, HorizontalAlignment, Position, Orientation, VerticalEdge } from "devextreme/common"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; import type * as CommonChartTypes from "devextreme/common/charts"; diff --git a/packages/devextreme-react/src/popover.ts b/packages/devextreme-react/src/popover.ts index 77772afc929b..2944ec976a3e 100644 --- a/packages/devextreme-react/src/popover.ts +++ b/packages/devextreme-react/src/popover.ts @@ -8,12 +8,10 @@ import dxPopover, { import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponentMeta } from "./core/component"; import NestedOption from "./core/nested-option"; -import type { Position as CommonPosition, HorizontalAlignment, VerticalAlignment, Direction, PositionAlignment, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { PositionConfig, CollisionResolution, CollisionResolutionCombination } from "devextreme/animation/position"; +import type { Position as CommonPosition, HorizontalAlignment, VerticalAlignment, Direction, PositionAlignment, ToolbarItemLocation, template, ToolbarItemComponent } from "devextreme/common"; +import type { PositionConfig, AnimationConfig, CollisionResolution, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, ShowingEvent, ShownEvent, TitleRenderedEvent } from "devextreme/ui/popover"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; -import type { template } from "devextreme/core/templates/template"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; import type { ToolbarLocation } from "devextreme/ui/popup"; diff --git a/packages/devextreme-react/src/popup.ts b/packages/devextreme-react/src/popup.ts index 57d43b08d20a..c154741ec2c6 100644 --- a/packages/devextreme-react/src/popup.ts +++ b/packages/devextreme-react/src/popup.ts @@ -8,11 +8,9 @@ import dxPopup, { import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponentMeta } from "./core/component"; import NestedOption from "./core/nested-option"; -import type { PositionAlignment, HorizontalAlignment, VerticalAlignment, Direction, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { PositionConfig, CollisionResolution, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; +import type { PositionAlignment, HorizontalAlignment, VerticalAlignment, Direction, ToolbarItemLocation, template, ToolbarItemComponent } from "devextreme/common"; +import type { PositionConfig, AnimationConfig, CollisionResolution, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; -import type { template } from "devextreme/core/templates/template"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; import type { ToolbarLocation } from "devextreme/ui/popup"; diff --git a/packages/devextreme-react/src/radio-group.ts b/packages/devextreme-react/src/radio-group.ts index 376c30251d61..b5bd19351d91 100644 --- a/packages/devextreme-react/src/radio-group.ts +++ b/packages/devextreme-react/src/radio-group.ts @@ -10,7 +10,7 @@ import NestedOption from "./core/nested-option"; import type { ContentReadyEvent, DisposingEvent, InitializedEvent, ValueChangedEvent } from "devextreme/ui/radio_group"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; +import type { template } from "devextreme/common"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/range-selector.ts b/packages/devextreme-react/src/range-selector.ts index 04fdcdac92eb..07dda4721180 100644 --- a/packages/devextreme-react/src/range-selector.ts +++ b/packages/devextreme-react/src/range-selector.ts @@ -11,7 +11,7 @@ import NestedOption from "./core/nested-option"; import type { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, ValueChangedEvent, BackgroundImageLocation, ValueChangedCallMode, ChartAxisScale, AxisScale } from "devextreme/viz/range_selector"; import type { chartPointAggregationInfoObject, chartSeriesObject, ChartSeriesAggregationMethod, dxChartCommonSeriesSettings, FinancialChartReductionLevel } from "devextreme/viz/chart"; import type { Format as CommonFormat, SliderValueChangeMode, HorizontalAlignment, ExportFormat, VerticalEdge } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; import type { DashStyle, ScaleBreakLineStyle, Palette, PaletteExtensionMode, ChartsDataType, ChartsColor, SeriesHoverMode, HatchDirection, Font as ChartsFont, RelativePosition, PointInteractionMode, PointSymbol, SeriesSelectionMode, SeriesType, ValueErrorBarDisplayMode, ValueErrorBarType, LabelOverlap, TimeInterval, ScaleBreak, DiscreteAxisDivisionMode, TextOverflow, WordWrap } from "devextreme/common/charts"; import type { ChartSeries } from "devextreme/viz/common"; diff --git a/packages/devextreme-react/src/range-slider.ts b/packages/devextreme-react/src/range-slider.ts index 06eb1e3f5726..7cfa337269c4 100644 --- a/packages/devextreme-react/src/range-slider.ts +++ b/packages/devextreme-react/src/range-slider.ts @@ -10,7 +10,7 @@ import NestedOption from "./core/nested-option"; import type { ContentReadyEvent, DisposingEvent, InitializedEvent, ValueChangedEvent } from "devextreme/ui/range_slider"; import type { Format as CommonFormat, VerticalEdge, TooltipShowMode } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/responsive-box.ts b/packages/devextreme-react/src/responsive-box.ts index 652c2841cc8f..b54b1f17996e 100644 --- a/packages/devextreme-react/src/responsive-box.ts +++ b/packages/devextreme-react/src/responsive-box.ts @@ -11,7 +11,7 @@ import NestedOption from "./core/nested-option"; import type { dxResponsiveBoxItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent } from "devextreme/ui/responsive_box"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; +import type { template } from "devextreme/common"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/sankey.ts b/packages/devextreme-react/src/sankey.ts index b5d4eb4e7ee0..a2a6eb65ba34 100644 --- a/packages/devextreme-react/src/sankey.ts +++ b/packages/devextreme-react/src/sankey.ts @@ -10,9 +10,8 @@ import NestedOption from "./core/nested-option"; import type { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, LinkClickEvent, NodeClickEvent, dxSankeyNode, SankeyColorMode } from "devextreme/viz/sankey"; import type { DashStyle, HatchDirection, Font as ChartsFont, TextOverflow, WordWrap } from "devextreme/common/charts"; -import type { ExportFormat, Format as CommonFormat, HorizontalAlignment, VerticalEdge } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; -import type { template } from "devextreme/core/templates/template"; +import type { ExportFormat, Format as CommonFormat, HorizontalAlignment, VerticalEdge, template } from "devextreme/common"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/scheduler.ts b/packages/devextreme-react/src/scheduler.ts index a7137a629e1f..5941feacfd13 100644 --- a/packages/devextreme-react/src/scheduler.ts +++ b/packages/devextreme-react/src/scheduler.ts @@ -9,11 +9,10 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { ViewType, AppointmentAddedEvent, AppointmentAddingEvent, AppointmentClickEvent, AppointmentContextMenuEvent, AppointmentDblClickEvent, AppointmentDeletedEvent, AppointmentDeletingEvent, AppointmentFormOpeningEvent, AppointmentRenderedEvent, AppointmentTooltipShowingEvent, AppointmentUpdatedEvent, AppointmentUpdatingEvent, CellClickEvent, CellContextMenuEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, AllDayPanelMode, AppointmentTemplateData, AppointmentTooltipTemplateData, CellAppointmentsLimit, dxSchedulerScrolling } from "devextreme/ui/scheduler"; -import type { event } from "devextreme/events/index"; +import type { event } from "devextreme/events/events.types"; import type { DataSourceOptions } from "devextreme/data/data_source"; import type { Store } from "devextreme/data/store"; -import type { ScrollMode, FirstDayOfWeek, Orientation } from "devextreme/common"; -import type { template } from "devextreme/core/templates/template"; +import type { ScrollMode, template, FirstDayOfWeek, Orientation } from "devextreme/common"; import type dxSortable from "devextreme/ui/sortable"; import type dxDraggable from "devextreme/ui/draggable"; diff --git a/packages/devextreme-react/src/select-box.ts b/packages/devextreme-react/src/select-box.ts index 16359d264bd5..0416561ca8f7 100644 --- a/packages/devextreme-react/src/select-box.ts +++ b/packages/devextreme-react/src/select-box.ts @@ -10,11 +10,10 @@ import NestedOption from "./core/nested-option"; import type { ChangeEvent, ClosedEvent, ContentReadyEvent, CopyEvent, CustomItemCreatingEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, ItemClickEvent, KeyDownEvent, KeyUpEvent, OpenedEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/select_box"; import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, ClickEvent, OptionChangedEvent } from "devextreme/ui/button"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; -import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { event, EventInfo } from "devextreme/events/index"; -import type { template } from "devextreme/core/templates/template"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; +import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, template, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; +import type { event } from "devextreme/events/events.types"; +import type { EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; diff --git a/packages/devextreme-react/src/slider.ts b/packages/devextreme-react/src/slider.ts index a74eab576ad5..71c4245b0769 100644 --- a/packages/devextreme-react/src/slider.ts +++ b/packages/devextreme-react/src/slider.ts @@ -10,7 +10,7 @@ import NestedOption from "./core/nested-option"; import type { ContentReadyEvent, DisposingEvent, InitializedEvent, ValueChangedEvent } from "devextreme/ui/slider"; import type { Format as CommonFormat, VerticalEdge, TooltipShowMode } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/sparkline.ts b/packages/devextreme-react/src/sparkline.ts index e471329f086e..78498e9233d7 100644 --- a/packages/devextreme-react/src/sparkline.ts +++ b/packages/devextreme-react/src/sparkline.ts @@ -10,9 +10,8 @@ import NestedOption from "./core/nested-option"; import type { DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, TooltipHiddenEvent, TooltipShownEvent } from "devextreme/viz/sparkline"; import type { DashStyle, Font as ChartsFont } from "devextreme/common/charts"; -import type { Format as CommonFormat } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; -import type { template } from "devextreme/core/templates/template"; +import type { Format as CommonFormat, template } from "devextreme/common"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/splitter.ts b/packages/devextreme-react/src/splitter.ts index 7364dde388bf..c2514fdf1083 100644 --- a/packages/devextreme-react/src/splitter.ts +++ b/packages/devextreme-react/src/splitter.ts @@ -11,7 +11,7 @@ import NestedOption from "./core/nested-option"; import type { dxSplitterItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemCollapsedEvent, ItemContextMenuEvent, ItemExpandedEvent, ItemRenderedEvent, ResizeEvent, ResizeEndEvent, ResizeStartEvent, dxSplitterOptions } from "devextreme/ui/splitter"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; +import type { template } from "devextreme/common"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/tab-panel.ts b/packages/devextreme-react/src/tab-panel.ts index 4164d1fcb4a4..89b26a2ba489 100644 --- a/packages/devextreme-react/src/tab-panel.ts +++ b/packages/devextreme-react/src/tab-panel.ts @@ -10,7 +10,7 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { dxTabPanelItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, SelectionChangingEvent, TitleClickEvent, TitleHoldEvent, TitleRenderedEvent } from "devextreme/ui/tab_panel"; -import type { template } from "devextreme/core/templates/template"; +import type { template } from "devextreme/common"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; type ReplaceFieldTypes = { diff --git a/packages/devextreme-react/src/tabs.ts b/packages/devextreme-react/src/tabs.ts index d6d6ef54cdf1..8256de19f30c 100644 --- a/packages/devextreme-react/src/tabs.ts +++ b/packages/devextreme-react/src/tabs.ts @@ -11,7 +11,7 @@ import NestedOption from "./core/nested-option"; import type { dxTabsItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, SelectionChangingEvent } from "devextreme/ui/tabs"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; +import type { template } from "devextreme/common"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/tag-box.ts b/packages/devextreme-react/src/tag-box.ts index 28e59fce03e1..20f2c86b9888 100644 --- a/packages/devextreme-react/src/tag-box.ts +++ b/packages/devextreme-react/src/tag-box.ts @@ -10,11 +10,10 @@ import NestedOption from "./core/nested-option"; import type { ChangeEvent, ClosedEvent, ContentReadyEvent, CustomItemCreatingEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, ItemClickEvent, KeyDownEvent, KeyUpEvent, MultiTagPreparingEvent, OpenedEvent, SelectAllValueChangedEvent, ValueChangedEvent } from "devextreme/ui/tag_box"; import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, ClickEvent, OptionChangedEvent } from "devextreme/ui/button"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; -import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { event, EventInfo } from "devextreme/events/index"; -import type { template } from "devextreme/core/templates/template"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; +import type { HorizontalAlignment, VerticalAlignment, TextEditorButtonLocation, template, PositionAlignment, Direction, ButtonStyle, ButtonType, ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; +import type { event } from "devextreme/events/events.types"; +import type { EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; diff --git a/packages/devextreme-react/src/text-box.ts b/packages/devextreme-react/src/text-box.ts index 638b7e089fb5..e57e143d5ebd 100644 --- a/packages/devextreme-react/src/text-box.ts +++ b/packages/devextreme-react/src/text-box.ts @@ -10,8 +10,7 @@ import NestedOption from "./core/nested-option"; import type { ChangeEvent, ContentReadyEvent, CopyEvent, CutEvent, DisposingEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InitializedEvent, InputEvent, KeyDownEvent, KeyUpEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/text_box"; import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, ClickEvent, OptionChangedEvent } from "devextreme/ui/button"; -import type { TextEditorButtonLocation, ButtonStyle, ButtonType } from "devextreme/common"; -import type { template } from "devextreme/core/templates/template"; +import type { TextEditorButtonLocation, ButtonStyle, template, ButtonType } from "devextreme/common"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/tile-view.ts b/packages/devextreme-react/src/tile-view.ts index 2f65dd0837c7..a744f149259c 100644 --- a/packages/devextreme-react/src/tile-view.ts +++ b/packages/devextreme-react/src/tile-view.ts @@ -11,7 +11,7 @@ import NestedOption from "./core/nested-option"; import type { dxTileViewItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent } from "devextreme/ui/tile_view"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; +import type { template } from "devextreme/common"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/toast.ts b/packages/devextreme-react/src/toast.ts index 94151bbaa10e..9b617397d34c 100644 --- a/packages/devextreme-react/src/toast.ts +++ b/packages/devextreme-react/src/toast.ts @@ -8,9 +8,8 @@ import dxToast, { import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponentMeta } from "./core/component"; import NestedOption from "./core/nested-option"; -import type { PositionConfig, CollisionResolution, CollisionResolutionCombination } from "devextreme/animation/position"; +import type { PositionConfig, AnimationConfig, CollisionResolution, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, ShowingEvent, ShownEvent } from "devextreme/ui/toast"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; import type { HorizontalAlignment, VerticalAlignment, Direction, PositionAlignment } from "devextreme/common"; type ReplaceFieldTypes = { diff --git a/packages/devextreme-react/src/toolbar.ts b/packages/devextreme-react/src/toolbar.ts index c36af03d1dee..e1e423d59aba 100644 --- a/packages/devextreme-react/src/toolbar.ts +++ b/packages/devextreme-react/src/toolbar.ts @@ -10,8 +10,7 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { dxToolbarItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; -import type { ToolbarItemLocation, ToolbarItemComponent } from "devextreme/common"; -import type { template } from "devextreme/core/templates/template"; +import type { ToolbarItemLocation, template, ToolbarItemComponent } from "devextreme/common"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; type ReplaceFieldTypes = { diff --git a/packages/devextreme-react/src/tooltip.ts b/packages/devextreme-react/src/tooltip.ts index 75b3182cf150..62d99865ebe5 100644 --- a/packages/devextreme-react/src/tooltip.ts +++ b/packages/devextreme-react/src/tooltip.ts @@ -9,9 +9,8 @@ import { Component as BaseComponent, IHtmlOptions, ComponentRef, NestedComponent import NestedOption from "./core/nested-option"; import type { Position as CommonPosition, HorizontalAlignment, VerticalAlignment, Direction, PositionAlignment } from "devextreme/common"; -import type { PositionConfig, CollisionResolution, CollisionResolutionCombination } from "devextreme/animation/position"; +import type { PositionConfig, AnimationConfig, CollisionResolution, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; import type { ContentReadyEvent, DisposingEvent, HiddenEvent, HidingEvent, InitializedEvent, ShowingEvent, ShownEvent } from "devextreme/ui/tooltip"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/tree-list.ts b/packages/devextreme-react/src/tree-list.ts index 70e4a925d34b..10b572bb4787 100644 --- a/packages/devextreme-react/src/tree-list.ts +++ b/packages/devextreme-react/src/tree-list.ts @@ -13,15 +13,14 @@ import type { dxTreeListColumn, AdaptiveDetailRowPreparingEvent, CellClickEvent, import type { DataChange, DataChangeType, FilterOperation, FilterType, FixedPosition, HeaderFilterGroupInterval, ColumnHeaderFilterSearchConfig, SelectedFilterOperation, ColumnChooserMode, ColumnChooserSearchConfig, ColumnChooserSelectionConfig, GridsEditMode, GridsEditRefreshMode, StartEditAction, GridBase, ApplyFilterMode, HeaderFilterSearchConfig, EnterKeyAction, EnterKeyDirection, PagerPageSize, DataRenderMode, StateStoreType } from "devextreme/common/grids"; import type { ContentReadyEvent as FilterBuilderContentReadyEvent, DisposingEvent as FilterBuilderDisposingEvent, EditorPreparedEvent as FilterBuilderEditorPreparedEvent, EditorPreparingEvent as FilterBuilderEditorPreparingEvent, InitializedEvent as FilterBuilderInitializedEvent, dxFilterBuilderField, FilterBuilderOperation, dxFilterBuilderCustomOperation, GroupOperation, OptionChangedEvent, ValueChangedEvent } from "devextreme/ui/filter_builder"; import type { ContentReadyEvent as FormContentReadyEvent, DisposingEvent as FormDisposingEvent, InitializedEvent as FormInitializedEvent, dxFormSimpleItem, dxFormOptions, OptionChangedEvent as FormOptionChangedEvent, dxFormGroupItem, dxFormTabbedItem, dxFormEmptyItem, dxFormButtonItem, LabelLocation, FormLabelMode, EditorEnterKeyEvent, FieldDataChangedEvent, FormItemComponent, FormItemType } from "devextreme/ui/form"; -import type { AnimationConfig, AnimationState, AnimationType } from "devextreme/animation/fx"; -import type { ValidationRuleType, HorizontalAlignment, VerticalAlignment, DataType, Format as CommonFormat, SearchMode, SortOrder, ComparisonOperator, PositionAlignment, Mode, Direction, ToolbarItemLocation, ToolbarItemComponent, DisplayMode, DragDirection, DragHighlight, ScrollMode, ScrollbarMode, SingleMultipleOrNone } from "devextreme/common"; -import type { event, EventInfo } from "devextreme/events/index"; -import type { template } from "devextreme/core/templates/template"; -import type { CollisionResolution, PositionConfig, CollisionResolutionCombination } from "devextreme/animation/position"; -import type { Format as LocalizationFormat } from "devextreme/localization"; +import type { AnimationConfig, CollisionResolution, PositionConfig, AnimationState, AnimationType, CollisionResolutionCombination } from "devextreme/common/core/animation"; +import type { ValidationRuleType, HorizontalAlignment, VerticalAlignment, template, DataType, Format as CommonFormat, SearchMode, SortOrder, ComparisonOperator, PositionAlignment, Mode, Direction, ToolbarItemLocation, ToolbarItemComponent, DisplayMode, DragDirection, DragHighlight, ScrollMode, ScrollbarMode, SingleMultipleOrNone } from "devextreme/common"; +import type { event } from "devextreme/events/events.types"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; import type { DataSourceOptions } from "devextreme/data/data_source"; import type { Store } from "devextreme/data/store"; import type { dxPopupOptions, dxPopupToolbarItem, ToolbarLocation } from "devextreme/ui/popup"; +import type { EventInfo } from "devextreme/common/core/events"; import type { Component } from "devextreme/core/component"; import type { LocateInMenuMode, ShowTextMode } from "devextreme/ui/toolbar"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; diff --git a/packages/devextreme-react/src/tree-map.ts b/packages/devextreme-react/src/tree-map.ts index b5fee547ac6b..f3d8ac0d8fad 100644 --- a/packages/devextreme-react/src/tree-map.ts +++ b/packages/devextreme-react/src/tree-map.ts @@ -10,9 +10,8 @@ import NestedOption from "./core/nested-option"; import type { ClickEvent, DisposingEvent, DrawnEvent, DrillEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, NodesInitializedEvent, NodesRenderingEvent, TreeMapColorizerType, dxTreeMapNode } from "devextreme/viz/tree_map"; import type { DashStyle, Palette, PaletteExtensionMode, Font as ChartsFont, TextOverflow, WordWrap } from "devextreme/common/charts"; -import type { ExportFormat, Format as CommonFormat, HorizontalAlignment, VerticalEdge } from "devextreme/common"; -import type { Format as LocalizationFormat } from "devextreme/localization"; -import type { template } from "devextreme/core/templates/template"; +import type { ExportFormat, Format as CommonFormat, HorizontalAlignment, VerticalEdge, template } from "devextreme/common"; +import type { Format as LocalizationFormat } from "devextreme/common/core/localization"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/tree-view.ts b/packages/devextreme-react/src/tree-view.ts index 87ce7d4a12bd..ad79b0f61970 100644 --- a/packages/devextreme-react/src/tree-view.ts +++ b/packages/devextreme-react/src/tree-view.ts @@ -12,9 +12,8 @@ import NestedOption from "./core/nested-option"; import type { dxTreeViewItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemCollapsedEvent, ItemContextMenuEvent, ItemExpandedEvent, ItemHoldEvent, ItemRenderedEvent, SelectAllValueChangedEvent } from "devextreme/ui/tree_view"; import type { ContentReadyEvent as ButtonContentReadyEvent, DisposingEvent as ButtonDisposingEvent, InitializedEvent as ButtonInitializedEvent, dxButtonOptions, ClickEvent, OptionChangedEvent } from "devextreme/ui/button"; import type { ContentReadyEvent as TextBoxContentReadyEvent, DisposingEvent as TextBoxDisposingEvent, InitializedEvent as TextBoxInitializedEvent, OptionChangedEvent as TextBoxOptionChangedEvent, TextBoxType, ChangeEvent, CopyEvent, CutEvent, EnterKeyEvent, FocusInEvent, FocusOutEvent, InputEvent, KeyDownEvent, KeyUpEvent, PasteEvent, ValueChangedEvent } from "devextreme/ui/text_box"; -import type { TextEditorButtonLocation, ButtonStyle, ButtonType, TextBoxPredefinedButton, TextEditorButton, LabelMode, MaskMode, EditorStyle, ValidationMessageMode, Position, ValidationStatus } from "devextreme/common"; +import type { TextEditorButtonLocation, template, ButtonStyle, ButtonType, TextBoxPredefinedButton, TextEditorButton, LabelMode, MaskMode, EditorStyle, ValidationMessageMode, Position, ValidationStatus } from "devextreme/common"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; -import type { template } from "devextreme/core/templates/template"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/validation-summary.ts b/packages/devextreme-react/src/validation-summary.ts index a9fce1865b99..1c573f9573ad 100644 --- a/packages/devextreme-react/src/validation-summary.ts +++ b/packages/devextreme-react/src/validation-summary.ts @@ -11,7 +11,7 @@ import NestedOption from "./core/nested-option"; import type { CollectionWidgetItem } from "devextreme/ui/collection/ui.collection_widget.base"; import type { ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent } from "devextreme/ui/validation_summary"; -import type { template } from "devextreme/core/templates/template"; +import type { template } from "devextreme/common"; type ReplaceFieldTypes = { [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P]; diff --git a/packages/devextreme-react/src/vector-map.ts b/packages/devextreme-react/src/vector-map.ts index 154e0617f822..a8c3e8e20bc3 100644 --- a/packages/devextreme-react/src/vector-map.ts +++ b/packages/devextreme-react/src/vector-map.ts @@ -10,8 +10,7 @@ import NestedOption from "./core/nested-option"; import type { ClickEvent, DisposingEvent, DrawnEvent, ExportedEvent, ExportingEvent, FileSavingEvent, IncidentOccurredEvent, InitializedEvent, TooltipHiddenEvent, TooltipShownEvent, dxVectorMapAnnotationConfig, MapLayerElement, VectorMapMarkerType, VectorMapLayerType, VectorMapLegendItem, VectorMapMarkerShape } from "devextreme/viz/vector_map"; import type { DashStyle, Font as ChartsFont, TextOverflow, AnnotationType, WordWrap, Palette } from "devextreme/common/charts"; -import type { template } from "devextreme/core/templates/template"; -import type { HorizontalAlignment, VerticalEdge, ExportFormat, SingleMultipleOrNone, Position, Orientation } from "devextreme/common"; +import type { template, HorizontalAlignment, VerticalEdge, ExportFormat, SingleMultipleOrNone, Position, Orientation } from "devextreme/common"; import type { DataSourceOptions } from "devextreme/data/data_source"; import type { Store } from "devextreme/data/store"; diff --git a/packages/devextreme-themebuilder/package.json b/packages/devextreme-themebuilder/package.json index 3e1e41ce19ba..fa5b749ced5f 100644 --- a/packages/devextreme-themebuilder/package.json +++ b/packages/devextreme-themebuilder/package.json @@ -39,7 +39,7 @@ "eslint-config-airbnb-base": "15.0.0", "eslint-config-airbnb-typescript": "17.1.0", "eslint-config-devextreme": "1.1.5", - "express": "4.20.0", + "express": "4.21.1", "filing-cabinet": "4.1.6", "fs-extra": "11.2.0", "immutable": "4.3.5", diff --git a/packages/devextreme-vue/gulpfile.js b/packages/devextreme-vue/gulpfile.js index e0a1f8ce05eb..640075b42fcf 100644 --- a/packages/devextreme-vue/gulpfile.js +++ b/packages/devextreme-vue/gulpfile.js @@ -44,7 +44,11 @@ gulp.task(GENERATE, }, config.widgetsPackage, VUE_VERSION, - true + true, + { + quotes: 'double', + excplicitIndexInImports: true, + } ); done(); @@ -117,7 +121,7 @@ gulp.task(NPM_PREPARE_MODULES, (done) => { return ['', [moduleFileName], moduleFilePath]; }); - [...packParamsForFolders, ...packParamsForModules].forEach( + [ ...packParamsForModules, ...packParamsForFolders].forEach( ([folder, moduleFileNames, moduleFilePath]) => makeModule(folder, moduleFileNames, moduleFilePath) ); diff --git a/packages/devextreme-vue/src/accordion.ts b/packages/devextreme-vue/src/accordion.ts index 3fc2789d558f..d85be8b2f15f 100644 --- a/packages/devextreme-vue/src/accordion.ts +++ b/packages/devextreme-vue/src/accordion.ts @@ -19,7 +19,7 @@ import { } from "devextreme/ui/accordion"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; @@ -76,7 +76,7 @@ const componentConfig = { activeStateEnabled: Boolean, animationDuration: Number, collapsible: Boolean, - dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>, deferRendering: Boolean, disabled: Boolean, elementAttr: Object as PropType>, diff --git a/packages/devextreme-vue/src/action-sheet.ts b/packages/devextreme-vue/src/action-sheet.ts index 04792e583d60..cef00037f9fc 100644 --- a/packages/devextreme-vue/src/action-sheet.ts +++ b/packages/devextreme-vue/src/action-sheet.ts @@ -18,13 +18,13 @@ import { } from "devextreme/ui/action_sheet"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; import { NativeEventInfo, -} from "devextreme/events/index"; +} from "devextreme/common/core/events"; import { ButtonStyle, ButtonType, @@ -68,7 +68,7 @@ interface DxActionSheet extends AccessibleOptions { const componentConfig = { props: { cancelText: String, - dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>, disabled: Boolean, elementAttr: Object as PropType>, height: [Function, Number, String] as PropType<((() => number | string)) | number | string>, diff --git a/packages/devextreme-vue/src/autocomplete.ts b/packages/devextreme-vue/src/autocomplete.ts index fb680a5dde2c..07857a865727 100644 --- a/packages/devextreme-vue/src/autocomplete.ts +++ b/packages/devextreme-vue/src/autocomplete.ts @@ -33,7 +33,7 @@ import { } from "devextreme/ui/collection/ui.collection_widget.base"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; @@ -65,9 +65,12 @@ import { } from "devextreme/ui/autocomplete"; import { AnimationConfig, + CollisionResolution, + PositionConfig, AnimationState, AnimationType, -} from "devextreme/animation/fx"; + CollisionResolutionCombination, +} from "devextreme/common/core/animation"; import { dxButtonOptions, ClickEvent, @@ -76,15 +79,12 @@ import { InitializedEvent as ButtonInitializedEvent, OptionChangedEvent as ButtonOptionChangedEvent, } from "devextreme/ui/button"; -import { - CollisionResolution, - PositionConfig, - CollisionResolutionCombination, -} from "devextreme/animation/position"; import { event, +} from "devextreme/events/events.types"; +import { EventInfo, -} from "devextreme/events/index"; +} from "devextreme/common/core/events"; import { Component, } from "devextreme/core/component"; @@ -179,7 +179,7 @@ const componentConfig = { accessKey: String, activeStateEnabled: Boolean, buttons: Array as PropType>, - dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>, deferRendering: Boolean, disabled: Boolean, displayValue: String, diff --git a/packages/devextreme-vue/src/bar-gauge.ts b/packages/devextreme-vue/src/bar-gauge.ts index 28007a51b561..55960c741ffb 100644 --- a/packages/devextreme-vue/src/bar-gauge.ts +++ b/packages/devextreme-vue/src/bar-gauge.ts @@ -37,7 +37,7 @@ import { } from "devextreme/common"; import { Format as LocalizationFormat, -} from "devextreme/localization"; +} from "devextreme/common/core/localization"; import { prepareConfigurationComponentConfig } from "./core/index"; type AccessibleOptions = Pick, crossAlign: String as PropType, - dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>, direction: String as PropType, disabled: Boolean, elementAttr: Object as PropType>, diff --git a/packages/devextreme-vue/src/bullet.ts b/packages/devextreme-vue/src/bullet.ts index 8c1b11e0c400..9e715de1178f 100644 --- a/packages/devextreme-vue/src/bullet.ts +++ b/packages/devextreme-vue/src/bullet.ts @@ -24,7 +24,7 @@ import { } from "devextreme/common"; import { Format as LocalizationFormat, -} from "devextreme/localization"; +} from "devextreme/common/core/localization"; import { prepareConfigurationComponentConfig } from "./core/index"; type AccessibleOptions = Pick SeriesLabel)>, customizePoint: Function as PropType<((pointInfo: any) => SeriesPoint)>, dataPrepareSettings: Object as PropType>, - dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>, defaultPane: String, disabled: Boolean, elementAttr: Object as PropType>, diff --git a/packages/devextreme-vue/src/chat.ts b/packages/devextreme-vue/src/chat.ts index d7da98cb6f99..957ef24b90cb 100644 --- a/packages/devextreme-vue/src/chat.ts +++ b/packages/devextreme-vue/src/chat.ts @@ -16,13 +16,13 @@ import { } from "devextreme/ui/chat"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; import { Format, -} from "devextreme/localization"; +} from "devextreme/common/core/localization"; import { Format as CommonFormat, } from "devextreme/common"; @@ -70,7 +70,7 @@ const componentConfig = { accessKey: String, activeStateEnabled: Boolean, alerts: Array as PropType>, - dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>, dayHeaderFormat: [Object, String, Function] as PropType string)) | Record | string>, disabled: Boolean, elementAttr: Object as PropType>, diff --git a/packages/devextreme-vue/src/circular-gauge.ts b/packages/devextreme-vue/src/circular-gauge.ts index 57e9b96f1ddc..99012c4abbb2 100644 --- a/packages/devextreme-vue/src/circular-gauge.ts +++ b/packages/devextreme-vue/src/circular-gauge.ts @@ -40,7 +40,7 @@ import { } from "devextreme/common"; import { Format as LocalizationFormat, -} from "devextreme/localization"; +} from "devextreme/common/core/localization"; import { prepareConfigurationComponentConfig } from "./core/index"; type AccessibleOptions = Pick>, closeOnOutsideClick: [Boolean, Function] as PropType boolean))>, cssClass: String, - dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>, disabled: Boolean, disabledExpr: [Function, String] as PropType<((() => void)) | string>, displayExpr: [Function, String] as PropType<(((item: any) => string)) | string>, diff --git a/packages/devextreme-vue/src/core/__tests__/textbox.test.ts b/packages/devextreme-vue/src/core/__tests__/textbox.test.ts index 29a3885f9b56..bb60c478f8ac 100644 --- a/packages/devextreme-vue/src/core/__tests__/textbox.test.ts +++ b/packages/devextreme-vue/src/core/__tests__/textbox.test.ts @@ -82,4 +82,28 @@ describe('two-way binding', () => { expect(component.element.classList.toString()).toBe('custom2 dx-show-invalid-badge dx-textbox dx-texteditor dx-editor-outlined dx-texteditor-empty dx-widget'); }); }); + + it('dxClass should be set when class attr is undefined', async () => { + expect.assertions(1); + const vm = defineComponent({ + template: + ` + `, + components: { + DxTextBox, + }, + props: { + customClass: { + type: String, + default: true, + }, + }, + }); + const wrapper = mount(vm); + const component = wrapper.getComponent('#component'); + await wrapper.setProps({ customClass: false }); + await nextTick(() => { + expect(component.element.classList.toString()).toBe(' dx-show-invalid-badge dx-textbox dx-texteditor dx-editor-outlined dx-texteditor-empty dx-widget'); + }); + }); }); diff --git a/packages/devextreme-vue/src/core/component.ts b/packages/devextreme-vue/src/core/component.ts index de579a29874a..f09aec6d430b 100644 --- a/packages/devextreme-vue/src/core/component.ts +++ b/packages/devextreme-vue/src/core/component.ts @@ -54,7 +54,7 @@ function getAttrs(attrs, dxClasses: string[]) { const attributes = {}; includeAttrs.forEach((attr) => { const attrValue = attrs[attr]; - if (attrValue) { + if (attrValue !== undefined && attrValue !== null) { attributes[attr] = attr === 'class' && dxClasses.length ? `${attrValue} ${dxClasses.join(' ')}` : attrValue; } }); diff --git a/packages/devextreme-vue/src/data-grid.ts b/packages/devextreme-vue/src/data-grid.ts index 9e1801683f11..b5cf5b8faeb0 100644 --- a/packages/devextreme-vue/src/data-grid.ts +++ b/packages/devextreme-vue/src/data-grid.ts @@ -97,7 +97,6 @@ import { } from "devextreme/ui/data_grid"; import { Mode, - PagerBase, ValidationRuleType, HorizontalAlignment, VerticalAlignment, @@ -119,7 +118,7 @@ import { } from "devextreme/common"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; @@ -143,18 +142,19 @@ import { ToolbarLocation, } from "devextreme/ui/popup"; import { - AnimationConfig, - AnimationState, - AnimationType, -} from "devextreme/animation/fx"; + PagerBase, +} from "devextreme/ui/pagination"; import { + AnimationConfig, CollisionResolution, PositionConfig, + AnimationState, + AnimationType, CollisionResolutionCombination, -} from "devextreme/animation/position"; +} from "devextreme/common/core/animation"; import { Format, -} from "devextreme/localization"; +} from "devextreme/common/core/localization"; import { dxFormSimpleItem, dxFormOptions, @@ -175,8 +175,10 @@ import { } from "devextreme/ui/form"; import { event, +} from "devextreme/events/events.types"; +import { EventInfo, -} from "devextreme/events/index"; +} from "devextreme/common/core/events"; import { Component, } from "devextreme/core/component"; @@ -329,7 +331,7 @@ const componentConfig = { columnWidth: [String, Number] as PropType, customizeColumns: Function as PropType<((columns: Array) => void)>, dataRowTemplate: {}, - dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>, dateSerializationFormat: String, disabled: Boolean, editing: Object as PropType>, @@ -1104,7 +1106,7 @@ const DxColumnHeaderFilterConfig = { props: { allowSearch: Boolean, allowSelectAll: Boolean, - dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { component: Record, dataSource: DataSourceOptions | null }) => void)) | null | Store>, + dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { component: Record, dataSource: DataSourceOptions | null }) => void)) | null | Store | Record>, groupInterval: [String, Number] as PropType, height: [Number, String], search: Object as PropType>, @@ -1161,7 +1163,7 @@ const DxColumnLookupConfig = { props: { allowClearing: Boolean, calculateCellValue: Function as PropType<((rowData: any) => any)>, - dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { data: Record, key: any }) => Array | Store | DataSourceOptions)) | null | Store>, + dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { data: Record, key: any }) => Array | Store | DataSourceOptions)) | null | Store | Record>, displayExpr: [Function, String] as PropType<(((data: any) => string)) | string>, valueExpr: String } @@ -1612,7 +1614,7 @@ const DxFieldLookupConfig = { }, props: { allowClearing: Boolean, - dataSource: [Array, Object] as PropType | DataSourceOptions | Store>, + dataSource: [Array, Object] as PropType | DataSourceOptions | Store | Record>, displayExpr: [Function, String] as PropType<(((data: any) => string)) | string>, valueExpr: [Function, String] as PropType<(((data: any) => string | number | boolean)) | string> } @@ -2308,7 +2310,7 @@ const DxHeaderFilterConfig = { props: { allowSearch: Boolean, allowSelectAll: Boolean, - dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { component: Record, dataSource: DataSourceOptions | null }) => void)) | null | Store>, + dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { component: Record, dataSource: DataSourceOptions | null }) => void)) | null | Store | Record>, groupInterval: [String, Number] as PropType, height: [Number, String], search: Object as PropType>, @@ -2533,7 +2535,7 @@ const DxLookupConfig = { props: { allowClearing: Boolean, calculateCellValue: Function as PropType<((rowData: any) => any)>, - dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { data: Record, key: any }) => Array | Store | DataSourceOptions)) | null | Store>, + dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { data: Record, key: any }) => Array | Store | DataSourceOptions)) | null | Store | Record>, displayExpr: [Function, String] as PropType<(((data: any) => string)) | string>, valueExpr: [String, Function] as PropType string | number | boolean))> } diff --git a/packages/devextreme-vue/src/date-box.ts b/packages/devextreme-vue/src/date-box.ts index 7f8a3ac49ac3..6d80105498aa 100644 --- a/packages/devextreme-vue/src/date-box.ts +++ b/packages/devextreme-vue/src/date-box.ts @@ -43,7 +43,7 @@ import { } from "devextreme/ui/calendar"; import { Format, -} from "devextreme/localization"; +} from "devextreme/common/core/localization"; import { dxPopupOptions, dxPopupToolbarItem, @@ -72,9 +72,12 @@ import { } from "devextreme/ui/date_box"; import { AnimationConfig, + CollisionResolution, + PositionConfig, AnimationState, AnimationType, -} from "devextreme/animation/fx"; + CollisionResolutionCombination, +} from "devextreme/common/core/animation"; import { dxButtonOptions, ClickEvent, @@ -83,15 +86,12 @@ import { InitializedEvent as ButtonInitializedEvent, OptionChangedEvent as ButtonOptionChangedEvent, } from "devextreme/ui/button"; -import { - CollisionResolution, - PositionConfig, - CollisionResolutionCombination, -} from "devextreme/animation/position"; import { event, +} from "devextreme/events/events.types"; +import { EventInfo, -} from "devextreme/events/index"; +} from "devextreme/common/core/events"; import { Component, } from "devextreme/core/component"; diff --git a/packages/devextreme-vue/src/date-range-box.ts b/packages/devextreme-vue/src/date-range-box.ts index 9f9f039c1e3e..0f4caf1e2465 100644 --- a/packages/devextreme-vue/src/date-range-box.ts +++ b/packages/devextreme-vue/src/date-range-box.ts @@ -42,7 +42,7 @@ import { } from "devextreme/ui/calendar"; import { Format, -} from "devextreme/localization"; +} from "devextreme/common/core/localization"; import { dxPopupOptions, dxPopupToolbarItem, @@ -69,9 +69,12 @@ import { } from "devextreme/ui/date_range_box"; import { AnimationConfig, + CollisionResolution, + PositionConfig, AnimationState, AnimationType, -} from "devextreme/animation/fx"; + CollisionResolutionCombination, +} from "devextreme/common/core/animation"; import { dxButtonOptions, ClickEvent, @@ -80,15 +83,12 @@ import { InitializedEvent as ButtonInitializedEvent, OptionChangedEvent as ButtonOptionChangedEvent, } from "devextreme/ui/button"; -import { - CollisionResolution, - PositionConfig, - CollisionResolutionCombination, -} from "devextreme/animation/position"; import { event, +} from "devextreme/events/events.types"; +import { EventInfo, -} from "devextreme/events/index"; +} from "devextreme/common/core/events"; import { Component, } from "devextreme/core/component"; diff --git a/packages/devextreme-vue/src/defer-rendering.ts b/packages/devextreme-vue/src/defer-rendering.ts index 0e961b630dfe..8764bcff1d56 100644 --- a/packages/devextreme-vue/src/defer-rendering.ts +++ b/packages/devextreme-vue/src/defer-rendering.ts @@ -6,7 +6,10 @@ import { AnimationConfig, AnimationState, AnimationType, -} from "devextreme/animation/fx"; + CollisionResolution, + PositionConfig, + CollisionResolutionCombination, +} from "devextreme/common/core/animation"; import { ContentReadyEvent, DisposingEvent, @@ -21,11 +24,6 @@ import { VerticalAlignment, PositionAlignment, } from "devextreme/common"; -import { - CollisionResolution, - PositionConfig, - CollisionResolutionCombination, -} from "devextreme/animation/position"; import { prepareConfigurationComponentConfig } from "./core/index"; type AccessibleOptions = Pick any)) | string>, - dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>, fromExpr: [Function, String] as PropType<(((data: any, value: any) => any)) | string>, fromLineEndExpr: [Function, String] as PropType<(((data: any, value: any) => any)) | string>, fromPointIndexExpr: [Function, String] as PropType<(((data: any, value: any) => any)) | string>, @@ -745,7 +745,7 @@ const DxNodesConfig = { containerChildrenExpr: [Function, String] as PropType<(((data: any, value: any) => any)) | string>, containerKeyExpr: [Function, String] as PropType<(((data: any, value: any) => any)) | string>, customDataExpr: [Function, String] as PropType<(((data: any, value: any) => any)) | string>, - dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>, heightExpr: [Function, String] as PropType<(((data: any, value: any) => any)) | string>, imageUrlExpr: [Function, String] as PropType<(((data: any, value: any) => any)) | string>, itemsExpr: [Function, String] as PropType<(((data: any, value: any) => any)) | string>, diff --git a/packages/devextreme-vue/src/drawer.ts b/packages/devextreme-vue/src/drawer.ts index 3ef1cab47451..7726fdafbcff 100644 --- a/packages/devextreme-vue/src/drawer.ts +++ b/packages/devextreme-vue/src/drawer.ts @@ -4,7 +4,7 @@ import { prepareComponentConfig } from "./core/index"; import Drawer, { Properties } from "devextreme/ui/drawer"; import { event, -} from "devextreme/events/index"; +} from "devextreme/events/events.types"; import { DisposingEvent, InitializedEvent, diff --git a/packages/devextreme-vue/src/drop-down-box.ts b/packages/devextreme-vue/src/drop-down-box.ts index 1cbc58a4d2c8..3dfa84f00f07 100644 --- a/packages/devextreme-vue/src/drop-down-box.ts +++ b/packages/devextreme-vue/src/drop-down-box.ts @@ -29,7 +29,7 @@ import { } from "devextreme/common"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; @@ -58,9 +58,12 @@ import { } from "devextreme/ui/drop_down_box"; import { AnimationConfig, + CollisionResolution, + PositionConfig, AnimationState, AnimationType, -} from "devextreme/animation/fx"; + CollisionResolutionCombination, +} from "devextreme/common/core/animation"; import { dxButtonOptions, ClickEvent, @@ -69,15 +72,12 @@ import { InitializedEvent as ButtonInitializedEvent, OptionChangedEvent as ButtonOptionChangedEvent, } from "devextreme/ui/button"; -import { - CollisionResolution, - PositionConfig, - CollisionResolutionCombination, -} from "devextreme/animation/position"; import { event, +} from "devextreme/events/events.types"; +import { EventInfo, -} from "devextreme/events/index"; +} from "devextreme/common/core/events"; import { Component, } from "devextreme/core/component"; @@ -163,7 +163,7 @@ const componentConfig = { activeStateEnabled: Boolean, buttons: Array as PropType>, contentTemplate: {}, - dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>, deferRendering: Boolean, disabled: Boolean, displayExpr: [Function, String] as PropType<(((item: any) => string)) | string>, diff --git a/packages/devextreme-vue/src/drop-down-button.ts b/packages/devextreme-vue/src/drop-down-button.ts index c4c7fb7f3e99..dd082cc2423c 100644 --- a/packages/devextreme-vue/src/drop-down-button.ts +++ b/packages/devextreme-vue/src/drop-down-button.ts @@ -18,7 +18,7 @@ import { } from "devextreme/ui/drop_down_button"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; @@ -39,18 +39,18 @@ import { } from "devextreme/common"; import { AnimationConfig, - AnimationState, - AnimationType, -} from "devextreme/animation/fx"; -import { CollisionResolution, PositionConfig, + AnimationState, + AnimationType, CollisionResolutionCombination, -} from "devextreme/animation/position"; +} from "devextreme/common/core/animation"; import { event, +} from "devextreme/events/events.types"; +import { EventInfo, -} from "devextreme/events/index"; +} from "devextreme/common/core/events"; import { Component, } from "devextreme/core/component"; @@ -112,7 +112,7 @@ const componentConfig = { props: { accessKey: String, activeStateEnabled: Boolean, - dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>, deferRendering: Boolean, disabled: Boolean, displayExpr: [Function, String] as PropType<(((itemData: any) => string)) | string>, diff --git a/packages/devextreme-vue/src/filter-builder.ts b/packages/devextreme-vue/src/filter-builder.ts index 4d5f6be6e0a9..35d76cf8ad04 100644 --- a/packages/devextreme-vue/src/filter-builder.ts +++ b/packages/devextreme-vue/src/filter-builder.ts @@ -21,10 +21,10 @@ import { } from "devextreme/common"; import { Format, -} from "devextreme/localization"; +} from "devextreme/common/core/localization"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; @@ -327,7 +327,7 @@ const DxLookupConfig = { }, props: { allowClearing: Boolean, - dataSource: [Array, Object] as PropType | DataSourceOptions | Store>, + dataSource: [Array, Object] as PropType | DataSourceOptions | Store | Record>, displayExpr: [Function, String] as PropType<(((data: any) => string)) | string>, valueExpr: [Function, String] as PropType<(((data: any) => string | number | boolean)) | string> } diff --git a/packages/devextreme-vue/src/form.ts b/packages/devextreme-vue/src/form.ts index 7e04351738da..95f468f87af5 100644 --- a/packages/devextreme-vue/src/form.ts +++ b/packages/devextreme-vue/src/form.ts @@ -59,7 +59,7 @@ import { } from "devextreme/ui/tab_panel"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; @@ -1000,7 +1000,7 @@ const DxTabPanelOptionsConfig = { activeStateEnabled: Boolean, animationEnabled: Boolean, bindingOptions: Object as PropType>, - dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>, deferRendering: Boolean, disabled: Boolean, elementAttr: Object as PropType>, diff --git a/packages/devextreme-vue/src/funnel.ts b/packages/devextreme-vue/src/funnel.ts index 455f4b198833..b02723eab9e5 100644 --- a/packages/devextreme-vue/src/funnel.ts +++ b/packages/devextreme-vue/src/funnel.ts @@ -22,7 +22,7 @@ import { } from "devextreme/viz/funnel"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; @@ -50,7 +50,7 @@ import { } from "devextreme/common"; import { Format as LocalizationFormat, -} from "devextreme/localization"; +} from "devextreme/common/core/localization"; import { prepareConfigurationComponentConfig } from "./core/index"; type AccessibleOptions = Pick, argumentField: String, colorField: String, - dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>, disabled: Boolean, elementAttr: Object as PropType>, export: Object as PropType>, diff --git a/packages/devextreme-vue/src/gallery.ts b/packages/devextreme-vue/src/gallery.ts index d5430067f7b2..31149912175e 100644 --- a/packages/devextreme-vue/src/gallery.ts +++ b/packages/devextreme-vue/src/gallery.ts @@ -18,7 +18,7 @@ import { } from "devextreme/ui/gallery"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; @@ -74,7 +74,7 @@ const componentConfig = { accessKey: String, animationDuration: Number, animationEnabled: Boolean, - dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>, disabled: Boolean, elementAttr: Object as PropType>, focusStateEnabled: Boolean, diff --git a/packages/devextreme-vue/src/gantt.ts b/packages/devextreme-vue/src/gantt.ts index 9be6cc9e97a9..0d9d928a6ab8 100644 --- a/packages/devextreme-vue/src/gantt.ts +++ b/packages/devextreme-vue/src/gantt.ts @@ -72,10 +72,10 @@ import { } from "devextreme/common/grids"; import { Format, -} from "devextreme/localization"; +} from "devextreme/common/core/localization"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; @@ -452,7 +452,7 @@ const DxColumnHeaderFilterConfig = { props: { allowSearch: Boolean, allowSelectAll: Boolean, - dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { component: Record, dataSource: DataSourceOptions | null }) => void)) | null | Store>, + dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { component: Record, dataSource: DataSourceOptions | null }) => void)) | null | Store | Record>, groupInterval: [String, Number] as PropType, height: [Number, String], search: Object as PropType>, @@ -568,7 +568,7 @@ const DxDependenciesConfig = { "update:typeExpr": null, }, props: { - dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>, keyExpr: [Function, String] as PropType<((() => void)) | string>, predecessorIdExpr: [Function, String] as PropType<((() => void)) | string>, successorIdExpr: [Function, String] as PropType<((() => void)) | string>, @@ -754,7 +754,7 @@ const DxHeaderFilterConfig = { props: { allowSearch: Boolean, allowSelectAll: Boolean, - dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { component: Record, dataSource: DataSourceOptions | null }) => void)) | null | Store>, + dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { component: Record, dataSource: DataSourceOptions | null }) => void)) | null | Store | Record>, groupInterval: [String, Number] as PropType, height: [Number, String], search: Object as PropType>, @@ -878,7 +878,7 @@ const DxResourceAssignmentsConfig = { "update:taskIdExpr": null, }, props: { - dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>, keyExpr: [Function, String] as PropType<((() => void)) | string>, resourceIdExpr: [Function, String] as PropType<((() => void)) | string>, taskIdExpr: [Function, String] as PropType<((() => void)) | string> @@ -902,7 +902,7 @@ const DxResourcesConfig = { }, props: { colorExpr: [Function, String] as PropType<((() => void)) | string>, - dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>, keyExpr: [Function, String] as PropType<((() => void)) | string>, textExpr: [Function, String] as PropType<((() => void)) | string> } @@ -1022,7 +1022,7 @@ const DxTasksConfig = { }, props: { colorExpr: [Function, String] as PropType<((() => void)) | string>, - dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>, endExpr: [Function, String] as PropType<((() => void)) | string>, keyExpr: [Function, String] as PropType<((() => void)) | string>, parentIdExpr: [Function, String] as PropType<((() => void)) | string>, diff --git a/packages/devextreme-vue/src/html-editor.ts b/packages/devextreme-vue/src/html-editor.ts index ddff5eba478a..5d8a8a17a38f 100644 --- a/packages/devextreme-vue/src/html-editor.ts +++ b/packages/devextreme-vue/src/html-editor.ts @@ -61,7 +61,7 @@ import { } from "devextreme/ui/toolbar"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; @@ -518,7 +518,7 @@ const DxMentionConfig = { "update:valueExpr": null, }, props: { - dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>, displayExpr: [Function, String] as PropType<(((item: any) => string)) | string>, itemTemplate: {}, marker: String, @@ -718,7 +718,7 @@ const DxVariablesConfig = { "update:escapeChar": null, }, props: { - dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>, escapeChar: [Array, String] as PropType | string> } }; diff --git a/packages/devextreme-vue/src/index.ts b/packages/devextreme-vue/src/index.ts index e4cc601bdbd0..ed23d5d7580f 100644 --- a/packages/devextreme-vue/src/index.ts +++ b/packages/devextreme-vue/src/index.ts @@ -80,3 +80,5 @@ export { DxValidationGroup } from "./validation-group"; export { DxValidationSummary } from "./validation-summary"; export { DxValidator } from "./validator"; export { DxVectorMap } from "./vector-map"; + +export * as Common from "./common/index"; diff --git a/packages/devextreme-vue/src/linear-gauge.ts b/packages/devextreme-vue/src/linear-gauge.ts index 2f0cbed6bd49..60bfe321fba6 100644 --- a/packages/devextreme-vue/src/linear-gauge.ts +++ b/packages/devextreme-vue/src/linear-gauge.ts @@ -40,7 +40,7 @@ import { } from "devextreme/common"; import { Format as LocalizationFormat, -} from "devextreme/localization"; +} from "devextreme/common/core/localization"; import { prepareConfigurationComponentConfig } from "./core/index"; type AccessibleOptions = Pick) | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>, disabled: Boolean, displayExpr: [Function, String] as PropType<(((item: any) => string)) | string>, elementAttr: Object as PropType>, diff --git a/packages/devextreme-vue/src/load-panel.ts b/packages/devextreme-vue/src/load-panel.ts index 81ab0fece3d9..9398bd096e1c 100644 --- a/packages/devextreme-vue/src/load-panel.ts +++ b/packages/devextreme-vue/src/load-panel.ts @@ -4,7 +4,7 @@ import { prepareComponentConfig } from "./core/index"; import LoadPanel, { Properties } from "devextreme/ui/load_panel"; import { event, -} from "devextreme/events/index"; +} from "devextreme/events/events.types"; import { ContentReadyEvent, DisposingEvent, @@ -23,14 +23,12 @@ import { } from "devextreme/common"; import { PositionConfig, - CollisionResolution, - CollisionResolutionCombination, -} from "devextreme/animation/position"; -import { AnimationConfig, + CollisionResolution, AnimationState, AnimationType, -} from "devextreme/animation/fx"; + CollisionResolutionCombination, +} from "devextreme/common/core/animation"; import { prepareConfigurationComponentConfig } from "./core/index"; type AccessibleOptions = Pick) | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>, deferRendering: Boolean, disabled: Boolean, displayExpr: [Function, String] as PropType<(((item: any) => string)) | string>, diff --git a/packages/devextreme-vue/src/menu.ts b/packages/devextreme-vue/src/menu.ts index ebd0e464128d..a71b0dbacf2b 100644 --- a/packages/devextreme-vue/src/menu.ts +++ b/packages/devextreme-vue/src/menu.ts @@ -22,7 +22,7 @@ import { } from "devextreme/ui/menu"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; @@ -37,14 +37,12 @@ import { } from "devextreme/common"; import { AnimationConfig, - AnimationState, - AnimationType, -} from "devextreme/animation/fx"; -import { CollisionResolution, PositionConfig, + AnimationState, + AnimationType, CollisionResolutionCombination, -} from "devextreme/animation/position"; +} from "devextreme/common/core/animation"; import { prepareConfigurationComponentConfig } from "./core/index"; type AccessibleOptions = Pick>, cssClass: String, - dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>, disabled: Boolean, disabledExpr: [Function, String] as PropType<((() => void)) | string>, displayExpr: [Function, String] as PropType<(((item: any) => string)) | string>, diff --git a/packages/devextreme-vue/src/multi-view.ts b/packages/devextreme-vue/src/multi-view.ts index 579dcf15025d..e11636d960c8 100644 --- a/packages/devextreme-vue/src/multi-view.ts +++ b/packages/devextreme-vue/src/multi-view.ts @@ -18,7 +18,7 @@ import { } from "devextreme/ui/multi_view"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; @@ -68,7 +68,7 @@ const componentConfig = { accessKey: String, activeStateEnabled: Boolean, animationEnabled: Boolean, - dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>, deferRendering: Boolean, disabled: Boolean, elementAttr: Object as PropType>, diff --git a/packages/devextreme-vue/src/number-box.ts b/packages/devextreme-vue/src/number-box.ts index bbc411e9fa62..0758b41ecfac 100644 --- a/packages/devextreme-vue/src/number-box.ts +++ b/packages/devextreme-vue/src/number-box.ts @@ -35,7 +35,7 @@ import { } from "devextreme/common"; import { Format, -} from "devextreme/localization"; +} from "devextreme/common/core/localization"; import { dxButtonOptions, ClickEvent, diff --git a/packages/devextreme-vue/src/pagination.ts b/packages/devextreme-vue/src/pagination.ts index 59b18008c71a..dbaf168edbc3 100644 --- a/packages/devextreme-vue/src/pagination.ts +++ b/packages/devextreme-vue/src/pagination.ts @@ -8,7 +8,7 @@ import { } from "devextreme/common"; import { EventInfo, -} from "devextreme/events/index"; +} from "devextreme/common/core/events"; import { Component, } from "devextreme/core/component"; diff --git a/packages/devextreme-vue/src/pie-chart.ts b/packages/devextreme-vue/src/pie-chart.ts index 118a1afda2a4..585db5aa0143 100644 --- a/packages/devextreme-vue/src/pie-chart.ts +++ b/packages/devextreme-vue/src/pie-chart.ts @@ -50,7 +50,7 @@ import { } from "devextreme/common/charts"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; @@ -65,7 +65,7 @@ import { } from "devextreme/common"; import { Format as LocalizationFormat, -} from "devextreme/localization"; +} from "devextreme/common/core/localization"; import { prepareConfigurationComponentConfig } from "./core/index"; type AccessibleOptions = Pick dxPieChartAnnotationConfig)>, customizeLabel: Function as PropType<((pointInfo: any) => SeriesLabel)>, customizePoint: Function as PropType<((pointInfo: any) => SeriesPoint)>, - dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>, diameter: Number, disabled: Boolean, elementAttr: Object as PropType>, diff --git a/packages/devextreme-vue/src/polar-chart.ts b/packages/devextreme-vue/src/polar-chart.ts index 0100ea41ef08..ec3d53acebe3 100644 --- a/packages/devextreme-vue/src/polar-chart.ts +++ b/packages/devextreme-vue/src/polar-chart.ts @@ -63,7 +63,7 @@ import { } from "devextreme/common/charts"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; @@ -78,7 +78,7 @@ import { } from "devextreme/common"; import { Format as LocalizationFormat, -} from "devextreme/localization"; +} from "devextreme/common/core/localization"; import * as CommonChartTypes from "devextreme/common/charts"; import { prepareConfigurationComponentConfig } from "./core/index"; @@ -164,7 +164,7 @@ const componentConfig = { customizeLabel: Function as PropType<((pointInfo: any) => SeriesLabel)>, customizePoint: Function as PropType<((pointInfo: any) => SeriesPoint)>, dataPrepareSettings: Object as PropType>, - dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>, disabled: Boolean, elementAttr: Object as PropType>, export: Object as PropType>, diff --git a/packages/devextreme-vue/src/popover.ts b/packages/devextreme-vue/src/popover.ts index 1f07651bd22c..acf2a4dee774 100644 --- a/packages/devextreme-vue/src/popover.ts +++ b/packages/devextreme-vue/src/popover.ts @@ -4,7 +4,7 @@ import { prepareComponentConfig } from "./core/index"; import Popover, { Properties } from "devextreme/ui/popover"; import { event, -} from "devextreme/events/index"; +} from "devextreme/events/events.types"; import { ContentReadyEvent, DisposingEvent, @@ -27,18 +27,16 @@ import { } from "devextreme/common"; import { PositionConfig, + AnimationConfig, CollisionResolution, + AnimationState, + AnimationType, CollisionResolutionCombination, -} from "devextreme/animation/position"; +} from "devextreme/common/core/animation"; import { dxPopupToolbarItem, ToolbarLocation, } from "devextreme/ui/popup"; -import { - AnimationConfig, - AnimationState, - AnimationType, -} from "devextreme/animation/fx"; import { LocateInMenuMode, ShowTextMode, diff --git a/packages/devextreme-vue/src/popup.ts b/packages/devextreme-vue/src/popup.ts index d19d09498aff..edba5edad721 100644 --- a/packages/devextreme-vue/src/popup.ts +++ b/packages/devextreme-vue/src/popup.ts @@ -7,8 +7,10 @@ import DOMComponent from "devextreme/core/dom_component"; import dxPopup from "devextreme/ui/popup"; import { event, +} from "devextreme/events/events.types"; +import { EventInfo, -} from "devextreme/events/index"; +} from "devextreme/common/core/events"; import { Component, } from "devextreme/core/component"; @@ -22,18 +24,16 @@ import { } from "devextreme/common"; import { PositionConfig, + AnimationConfig, CollisionResolution, + AnimationState, + AnimationType, CollisionResolutionCombination, -} from "devextreme/animation/position"; +} from "devextreme/common/core/animation"; import { dxPopupToolbarItem, ToolbarLocation, } from "devextreme/ui/popup"; -import { - AnimationConfig, - AnimationState, - AnimationType, -} from "devextreme/animation/fx"; import { LocateInMenuMode, ShowTextMode, diff --git a/packages/devextreme-vue/src/radio-group.ts b/packages/devextreme-vue/src/radio-group.ts index e3f20973fec7..aeb17a95db3c 100644 --- a/packages/devextreme-vue/src/radio-group.ts +++ b/packages/devextreme-vue/src/radio-group.ts @@ -8,7 +8,7 @@ import { } from "devextreme/ui/collection/ui.collection_widget.base"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; @@ -71,7 +71,7 @@ const componentConfig = { props: { accessKey: String, activeStateEnabled: Boolean, - dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>, disabled: Boolean, displayExpr: [Function, String] as PropType<(((item: any) => string)) | string>, elementAttr: Object as PropType>, diff --git a/packages/devextreme-vue/src/range-selector.ts b/packages/devextreme-vue/src/range-selector.ts index 3cf6c28ce018..4954b8a9845b 100644 --- a/packages/devextreme-vue/src/range-selector.ts +++ b/packages/devextreme-vue/src/range-selector.ts @@ -5,7 +5,7 @@ import RangeSelector, { Properties } from "devextreme/viz/range_selector"; import DataSource from "devextreme/data/data_source"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; @@ -69,7 +69,7 @@ import { } from "devextreme/viz/common"; import { Format as LocalizationFormat, -} from "devextreme/localization"; +} from "devextreme/common/core/localization"; import * as CommonChartTypes from "devextreme/common/charts"; import { prepareConfigurationComponentConfig } from "./core/index"; @@ -120,7 +120,7 @@ const componentConfig = { behavior: Object as PropType>, chart: Object as PropType>, containerBackgroundColor: String, - dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>, dataSourceField: String, disabled: Boolean, elementAttr: Object as PropType>, diff --git a/packages/devextreme-vue/src/range-slider.ts b/packages/devextreme-vue/src/range-slider.ts index 05b79a2bca06..0e5831933e14 100644 --- a/packages/devextreme-vue/src/range-slider.ts +++ b/packages/devextreme-vue/src/range-slider.ts @@ -20,7 +20,7 @@ import { } from "devextreme/common"; import { Format as LocalizationFormat, -} from "devextreme/localization"; +} from "devextreme/common/core/localization"; import { prepareConfigurationComponentConfig } from "./core/index"; type AccessibleOptions = Pick>>, - dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>, disabled: Boolean, elementAttr: Object as PropType>, height: [Function, Number, String] as PropType<((() => number | string)) | number | string>, diff --git a/packages/devextreme-vue/src/sankey.ts b/packages/devextreme-vue/src/sankey.ts index beb90f8edb49..ca0b4b261547 100644 --- a/packages/devextreme-vue/src/sankey.ts +++ b/packages/devextreme-vue/src/sankey.ts @@ -12,7 +12,7 @@ import { } from "devextreme/common"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; @@ -44,7 +44,7 @@ import { } from "devextreme/common/charts"; import { Format as LocalizationFormat, -} from "devextreme/localization"; +} from "devextreme/common/core/localization"; import { prepareConfigurationComponentConfig } from "./core/index"; type AccessibleOptions = Pick>, alignment: [Array, String] as PropType | VerticalAlignment>, - dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>, disabled: Boolean, elementAttr: Object as PropType>, export: Object as PropType>, diff --git a/packages/devextreme-vue/src/scheduler.ts b/packages/devextreme-vue/src/scheduler.ts index 48e4dca6beee..3f82f7ff64d7 100644 --- a/packages/devextreme-vue/src/scheduler.ts +++ b/packages/devextreme-vue/src/scheduler.ts @@ -34,7 +34,7 @@ import { } from "devextreme/ui/scheduler"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; @@ -45,7 +45,7 @@ import { } from "devextreme/common"; import { event, -} from "devextreme/events/index"; +} from "devextreme/events/events.types"; import { prepareConfigurationComponentConfig } from "./core/index"; type AccessibleOptions = Pick, customizeDateNavigatorText: Function as PropType<((info: { endDate: Date, startDate: Date, text: string }) => string)>, dataCellTemplate: {}, - dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>, dateCellTemplate: {}, dateSerializationFormat: String, descriptionExpr: String, @@ -397,7 +397,7 @@ const DxResourceConfig = { props: { allowMultiple: Boolean, colorExpr: String, - dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>, displayExpr: [Function, String] as PropType<(((resource: any) => string)) | string>, fieldExpr: String, label: String, diff --git a/packages/devextreme-vue/src/select-box.ts b/packages/devextreme-vue/src/select-box.ts index ef9f164df19f..fbfbdcda589e 100644 --- a/packages/devextreme-vue/src/select-box.ts +++ b/packages/devextreme-vue/src/select-box.ts @@ -33,7 +33,7 @@ import { } from "devextreme/ui/collection/ui.collection_widget.base"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; @@ -66,9 +66,12 @@ import { } from "devextreme/ui/select_box"; import { AnimationConfig, + CollisionResolution, + PositionConfig, AnimationState, AnimationType, -} from "devextreme/animation/fx"; + CollisionResolutionCombination, +} from "devextreme/common/core/animation"; import { dxButtonOptions, ClickEvent, @@ -77,15 +80,12 @@ import { InitializedEvent as ButtonInitializedEvent, OptionChangedEvent as ButtonOptionChangedEvent, } from "devextreme/ui/button"; -import { - CollisionResolution, - PositionConfig, - CollisionResolutionCombination, -} from "devextreme/animation/position"; import { event, +} from "devextreme/events/events.types"; +import { EventInfo, -} from "devextreme/events/index"; +} from "devextreme/common/core/events"; import { Component, } from "devextreme/core/component"; @@ -190,7 +190,7 @@ const componentConfig = { activeStateEnabled: Boolean, buttons: Array as PropType>, customItemCreateEvent: String, - dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>, deferRendering: Boolean, disabled: Boolean, displayExpr: [Function, String] as PropType<(((item: any) => string)) | string>, diff --git a/packages/devextreme-vue/src/slider.ts b/packages/devextreme-vue/src/slider.ts index 649b05e7e9f4..a58af3f34560 100644 --- a/packages/devextreme-vue/src/slider.ts +++ b/packages/devextreme-vue/src/slider.ts @@ -20,7 +20,7 @@ import { } from "devextreme/common"; import { Format as LocalizationFormat, -} from "devextreme/localization"; +} from "devextreme/common/core/localization"; import { prepareConfigurationComponentConfig } from "./core/index"; type AccessibleOptions = Pick | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>, disabled: Boolean, elementAttr: Object as PropType>, firstLastColor: String, diff --git a/packages/devextreme-vue/src/splitter.ts b/packages/devextreme-vue/src/splitter.ts index c29ee3ea9476..809a36e2b3b4 100644 --- a/packages/devextreme-vue/src/splitter.ts +++ b/packages/devextreme-vue/src/splitter.ts @@ -22,7 +22,7 @@ import { } from "devextreme/ui/splitter"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; @@ -66,7 +66,7 @@ interface DxSplitter extends AccessibleOptions { const componentConfig = { props: { allowKeyboardNavigation: Boolean, - dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>, disabled: Boolean, elementAttr: Object as PropType>, height: [Function, Number, String] as PropType<((() => number | string)) | number | string>, diff --git a/packages/devextreme-vue/src/tab-panel.ts b/packages/devextreme-vue/src/tab-panel.ts index a27846f63cc4..4d9d15e37988 100644 --- a/packages/devextreme-vue/src/tab-panel.ts +++ b/packages/devextreme-vue/src/tab-panel.ts @@ -22,7 +22,7 @@ import { } from "devextreme/ui/tab_panel"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; @@ -89,7 +89,7 @@ const componentConfig = { accessKey: String, activeStateEnabled: Boolean, animationEnabled: Boolean, - dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>, deferRendering: Boolean, disabled: Boolean, elementAttr: Object as PropType>, diff --git a/packages/devextreme-vue/src/tabs.ts b/packages/devextreme-vue/src/tabs.ts index c0484d3854fe..864a2640800b 100644 --- a/packages/devextreme-vue/src/tabs.ts +++ b/packages/devextreme-vue/src/tabs.ts @@ -19,7 +19,7 @@ import { } from "devextreme/ui/tabs"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; @@ -80,7 +80,7 @@ interface DxTabs extends AccessibleOptions { const componentConfig = { props: { accessKey: String, - dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>, disabled: Boolean, elementAttr: Object as PropType>, focusStateEnabled: Boolean, diff --git a/packages/devextreme-vue/src/tag-box.ts b/packages/devextreme-vue/src/tag-box.ts index a08333a47c27..96833a2dcedb 100644 --- a/packages/devextreme-vue/src/tag-box.ts +++ b/packages/devextreme-vue/src/tag-box.ts @@ -35,7 +35,7 @@ import { } from "devextreme/ui/collection/ui.collection_widget.base"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; @@ -67,9 +67,12 @@ import { } from "devextreme/ui/tag_box"; import { AnimationConfig, + CollisionResolution, + PositionConfig, AnimationState, AnimationType, -} from "devextreme/animation/fx"; + CollisionResolutionCombination, +} from "devextreme/common/core/animation"; import { dxButtonOptions, ClickEvent, @@ -78,15 +81,12 @@ import { InitializedEvent as ButtonInitializedEvent, OptionChangedEvent as ButtonOptionChangedEvent, } from "devextreme/ui/button"; -import { - CollisionResolution, - PositionConfig, - CollisionResolutionCombination, -} from "devextreme/animation/position"; import { event, +} from "devextreme/events/events.types"; +import { EventInfo, -} from "devextreme/events/index"; +} from "devextreme/common/core/events"; import { Component, } from "devextreme/core/component"; @@ -198,7 +198,7 @@ const componentConfig = { applyValueMode: String as PropType, buttons: Array as PropType>, customItemCreateEvent: String, - dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>, deferRendering: Boolean, disabled: Boolean, displayExpr: [Function, String] as PropType<(((item: any) => string)) | string>, diff --git a/packages/devextreme-vue/src/tile-view.ts b/packages/devextreme-vue/src/tile-view.ts index 461134b50112..3b5c75a5a642 100644 --- a/packages/devextreme-vue/src/tile-view.ts +++ b/packages/devextreme-vue/src/tile-view.ts @@ -17,7 +17,7 @@ import { } from "devextreme/ui/tile_view"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; @@ -70,7 +70,7 @@ const componentConfig = { activeStateEnabled: Boolean, baseItemHeight: Number, baseItemWidth: Number, - dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>, direction: String as PropType, disabled: Boolean, elementAttr: Object as PropType>, diff --git a/packages/devextreme-vue/src/toast.ts b/packages/devextreme-vue/src/toast.ts index d53834b3c496..44aa5e3b41ac 100644 --- a/packages/devextreme-vue/src/toast.ts +++ b/packages/devextreme-vue/src/toast.ts @@ -4,7 +4,7 @@ import { prepareComponentConfig } from "./core/index"; import Toast, { Properties } from "devextreme/ui/toast"; import { event, -} from "devextreme/events/index"; +} from "devextreme/events/events.types"; import { ContentReadyEvent, DisposingEvent, @@ -18,14 +18,12 @@ import { } from "devextreme/ui/toast"; import { PositionConfig, - CollisionResolution, - CollisionResolutionCombination, -} from "devextreme/animation/position"; -import { AnimationConfig, + CollisionResolution, AnimationState, AnimationType, -} from "devextreme/animation/fx"; + CollisionResolutionCombination, +} from "devextreme/common/core/animation"; import { HorizontalAlignment, VerticalAlignment, diff --git a/packages/devextreme-vue/src/toolbar.ts b/packages/devextreme-vue/src/toolbar.ts index 2db3c3d3eb1c..b261d6d05e36 100644 --- a/packages/devextreme-vue/src/toolbar.ts +++ b/packages/devextreme-vue/src/toolbar.ts @@ -19,7 +19,7 @@ import { } from "devextreme/ui/toolbar"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; @@ -60,7 +60,7 @@ interface DxToolbar extends AccessibleOptions { const componentConfig = { props: { - dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType<(Array) | DataSource | DataSourceOptions | null | Store | string | Record>, disabled: Boolean, elementAttr: Object as PropType>, hint: String, diff --git a/packages/devextreme-vue/src/tooltip.ts b/packages/devextreme-vue/src/tooltip.ts index 97bf2ec8f7dd..b81ab2e1ff4e 100644 --- a/packages/devextreme-vue/src/tooltip.ts +++ b/packages/devextreme-vue/src/tooltip.ts @@ -4,7 +4,7 @@ import { prepareComponentConfig } from "./core/index"; import Tooltip, { Properties } from "devextreme/ui/tooltip"; import { event, -} from "devextreme/events/index"; +} from "devextreme/events/events.types"; import { ContentReadyEvent, DisposingEvent, @@ -24,14 +24,12 @@ import { } from "devextreme/common"; import { PositionConfig, - CollisionResolution, - CollisionResolutionCombination, -} from "devextreme/animation/position"; -import { AnimationConfig, + CollisionResolution, AnimationState, AnimationType, -} from "devextreme/animation/fx"; + CollisionResolutionCombination, +} from "devextreme/common/core/animation"; import { prepareConfigurationComponentConfig } from "./core/index"; type AccessibleOptions = Pick>, columnWidth: [String, Number] as PropType, customizeColumns: Function as PropType<((columns: Array) => void)>, - dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>, dataStructure: String as PropType, dateSerializationFormat: String, disabled: Boolean, @@ -1078,7 +1080,7 @@ const DxColumnHeaderFilterConfig = { props: { allowSearch: Boolean, allowSelectAll: Boolean, - dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { component: Record, dataSource: DataSourceOptions | null }) => void)) | null | Store>, + dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { component: Record, dataSource: DataSourceOptions | null }) => void)) | null | Store | Record>, groupInterval: [String, Number] as PropType, height: [Number, String], search: Object as PropType>, @@ -1135,7 +1137,7 @@ const DxColumnLookupConfig = { props: { allowClearing: Boolean, calculateCellValue: Function as PropType<((rowData: any) => any)>, - dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { data: Record, key: any }) => Array | Store | DataSourceOptions)) | null | Store>, + dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { data: Record, key: any }) => Array | Store | DataSourceOptions)) | null | Store | Record>, displayExpr: [Function, String] as PropType<(((data: any) => string)) | string>, valueExpr: String } @@ -1430,7 +1432,7 @@ const DxFieldLookupConfig = { }, props: { allowClearing: Boolean, - dataSource: [Array, Object] as PropType | DataSourceOptions | Store>, + dataSource: [Array, Object] as PropType | DataSourceOptions | Store | Record>, displayExpr: [Function, String] as PropType<(((data: any) => string)) | string>, valueExpr: [Function, String] as PropType<(((data: any) => string | number | boolean)) | string> } @@ -2012,7 +2014,7 @@ const DxHeaderFilterConfig = { props: { allowSearch: Boolean, allowSelectAll: Boolean, - dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { component: Record, dataSource: DataSourceOptions | null }) => void)) | null | Store>, + dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { component: Record, dataSource: DataSourceOptions | null }) => void)) | null | Store | Record>, groupInterval: [String, Number] as PropType, height: [Number, String], search: Object as PropType>, @@ -2237,7 +2239,7 @@ const DxLookupConfig = { props: { allowClearing: Boolean, calculateCellValue: Function as PropType<((rowData: any) => any)>, - dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { data: Record, key: any }) => Array | Store | DataSourceOptions)) | null | Store>, + dataSource: [Array, Object, Function] as PropType | DataSourceOptions | (((options: { data: Record, key: any }) => Array | Store | DataSourceOptions)) | null | Store | Record>, displayExpr: [Function, String] as PropType<(((data: any) => string)) | string>, valueExpr: [String, Function] as PropType string | number | boolean))> } diff --git a/packages/devextreme-vue/src/tree-map.ts b/packages/devextreme-vue/src/tree-map.ts index a6f8a22c5d27..3aa000d89090 100644 --- a/packages/devextreme-vue/src/tree-map.ts +++ b/packages/devextreme-vue/src/tree-map.ts @@ -5,7 +5,7 @@ import TreeMap, { Properties } from "devextreme/viz/tree_map"; import DataSource from "devextreme/data/data_source"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; @@ -47,7 +47,7 @@ import { } from "devextreme/common/charts"; import { Format as LocalizationFormat, -} from "devextreme/localization"; +} from "devextreme/common/core/localization"; import { prepareConfigurationComponentConfig } from "./core/index"; type AccessibleOptions = Pick>, - dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>, disabled: Boolean, elementAttr: Object as PropType>, export: Object as PropType>, diff --git a/packages/devextreme-vue/src/tree-view.ts b/packages/devextreme-vue/src/tree-view.ts index 815e00c8879e..4e393e7c1264 100644 --- a/packages/devextreme-vue/src/tree-view.ts +++ b/packages/devextreme-vue/src/tree-view.ts @@ -25,7 +25,7 @@ import { } from "devextreme/ui/tree_view"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; @@ -150,7 +150,7 @@ const componentConfig = { animationEnabled: Boolean, collapseIcon: String as PropType, createChildren: Function as PropType<((parentNode: dxTreeViewNode) => any | Array>)>, - dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string>, + dataSource: [Array, Object, String] as PropType | DataSource | DataSourceOptions | null | Store | string | Record>, dataStructure: String as PropType, disabled: Boolean, disabledExpr: [Function, String] as PropType<((() => void)) | string>, diff --git a/packages/devextreme-vue/src/validator.ts b/packages/devextreme-vue/src/validator.ts index c32abb3d1152..5b5dc4c0686b 100644 --- a/packages/devextreme-vue/src/validator.ts +++ b/packages/devextreme-vue/src/validator.ts @@ -5,7 +5,7 @@ import Validator, { Properties } from "devextreme/ui/validator"; import DOMComponent from "devextreme/core/dom_component"; import { EventInfo, -} from "devextreme/events/index"; +} from "devextreme/common/core/events"; import { Component, } from "devextreme/core/component"; diff --git a/packages/devextreme-vue/src/vector-map.ts b/packages/devextreme-vue/src/vector-map.ts index 2a4df6389d2a..e11a7f08666a 100644 --- a/packages/devextreme-vue/src/vector-map.ts +++ b/packages/devextreme-vue/src/vector-map.ts @@ -49,7 +49,7 @@ import { } from "devextreme/common"; import { DataSourceOptions, -} from "devextreme/data/data_source"; +} from "devextreme/common/data"; import { Store, } from "devextreme/data/store"; diff --git a/packages/devextreme/.eslintignore b/packages/devextreme/.eslintignore index 70ca1568cdd2..1a2960b65e26 100644 --- a/packages/devextreme/.eslintignore +++ b/packages/devextreme/.eslintignore @@ -11,5 +11,5 @@ themebuilder-scss/src/data/metadata/* js/bundles/dx.custom.js testing/jest/utils/transformers/* ts/ -js/localization/cldr-data/* -js/localization/default_messages.js +js/common/core/localization/cldr-data/* +js/common/core/localization/default_messages.js diff --git a/packages/devextreme/.gitignore b/packages/devextreme/.gitignore index 9347be9d0813..75c06f7e6232 100644 --- a/packages/devextreme/.gitignore +++ b/packages/devextreme/.gitignore @@ -5,8 +5,8 @@ node_modules /testing/LastSuiteTime.txt /dotnet_packages /js/bundles/dx.custom.js -/js/localization/default_messages.js -/js/localization/cldr-data +/js/common/core/localization/default_messages.js +/js/common/core/localization/cldr-data /js/renovation/**/*.j.tsx /js/renovation/code_coverage /scss/bundles/*.scss diff --git a/packages/devextreme/build/gulp/localization-template.jst b/packages/devextreme/build/gulp/localization-template.jst index 43dffba193b4..a4d509eaba9d 100644 --- a/packages/devextreme/build/gulp/localization-template.jst +++ b/packages/devextreme/build/gulp/localization-template.jst @@ -1,10 +1,10 @@ (function(root, factory) { if(typeof define === 'function' && define.amd) { define(function(require) { - factory(require("devextreme/localization")); + factory(require("devextreme/common/core/localization")); }); } else if(typeof module === "object" && module.exports) { - factory(require("devextreme/localization")); + factory(require("devextreme/common/core/localization")); } else { factory(DevExpress.localization); } diff --git a/packages/devextreme/build/gulp/localization.js b/packages/devextreme/build/gulp/localization.js index e106422732f0..b8269002aae1 100644 --- a/packages/devextreme/build/gulp/localization.js +++ b/packages/devextreme/build/gulp/localization.js @@ -110,7 +110,7 @@ const getMessages = function(directory, locale) { }; gulp.task('clean-cldr-data', function() { - return del('js/localization/cldr-data/**', { force: true }); + return del('js/common/core/localization/cldr-data/**', { force: true }); }); gulp.task('generate-community-locales', () => { @@ -172,35 +172,35 @@ gulp.task('localization-generated-sources', gulp.parallel([ data: require('../../js/localization/messages/en.json'), filename: 'default_messages.js', exportName: 'defaultMessages', - destination: 'js/localization' + destination: 'js/common/core/localization' }, { data: parentLocales, filename: 'parent_locales.js', - destination: 'js/localization/cldr-data' + destination: 'js/common/core/localization/cldr-data' }, { data: firstDayOfWeekData(), filename: 'first_day_of_week_data.js', - destination: 'js/localization/cldr-data' + destination: 'js/common/core/localization/cldr-data' }, { data: accountingFormats(), filename: 'accounting_formats.js', - destination: 'js/localization/cldr-data' + destination: 'js/common/core/localization/cldr-data' }, { data: globalizeEnCldr, exportName: 'enCldr', filename: 'en.js', - destination: 'js/localization/cldr-data' + destination: 'js/common/core/localization/cldr-data' }, { data: globalizeSupplementalCldr, exportName: 'supplementalCldr', filename: 'supplemental.js', - destination: 'js/localization/cldr-data' + destination: 'js/common/core/localization/cldr-data' } ].map((source) => Object.assign( function() { diff --git a/packages/devextreme/build/gulp/modules_metadata.json b/packages/devextreme/build/gulp/modules_metadata.json index b29735d5bebe..a06c27b264f0 100644 --- a/packages/devextreme/build/gulp/modules_metadata.json +++ b/packages/devextreme/build/gulp/modules_metadata.json @@ -1,39 +1,33 @@ [ { - "name": "animation/frame", + "name": "common/core/animation", "exports": { "cancelAnimationFrame": { "path": "utils.cancelAnimationFrame" }, - "requestAnimationFrame": { "path": "utils.requestAnimationFrame" } + "requestAnimationFrame": { "path": "utils.requestAnimationFrame" }, + "fx": { "path": "fx" }, + "animationPresets": { "path": "animationPresets" }, + "TransitionExecutor": { "path": "TransitionExecutor" } } }, { - "name": "animation/fx", + "name": "core/component_registrator", "exports": { - "default": { "path": "fx" } + "default": { "path": "registerComponent" } } }, { - "name": "animation/presets", + "name": "common", "exports": { - "default": { "path": "animationPresets" } + "config": { "path": "config" }, + "Guid": { "path": "data.Guid" }, + "setTemplateEngine": { "path": "setTemplateEngine" } } }, { - "name": "animation/transition_executor", + "name": "common/core/environment", "exports": { - "default": { "path": "TransitionExecutor" } - } - }, - { - "name": "core/component_registrator", - "exports": { - "default": { "path": "registerComponent" } - } - }, - { - "name": "core/config", - "exports": { - "default": { "path": "config" } + "hideTopOverlay": { "path": "hideTopOverlay" }, + "initMobileViewport": { "path": "utils.initMobileViewport" } } }, { @@ -56,130 +50,63 @@ } }, { - "name": "core/guid", - "exports": { - "default": { "path": "data.Guid" } - } - }, - { - "name": "core/set_template_engine", - "exports": { - "default": { "path": "setTemplateEngine" } - } - }, - { - "name": "data/apply_changes", + "name": "common/data", "exports": { - "default": { "path": "data.applyChanges" } + "LoadOptions": { "path": "data.LoadOptions", "exportAs": "type" }, + "errorHandler": { "path": "data.errorHandler" }, + "EdmLiteral": { "path": "data.EdmLiteral" }, + "keyConverters": { "path": "data.utils.odata.keyConverters" }, + "base64_encode": { "path": "data.base64_encode" }, + "applyChanges": { "path": "data.applyChanges" }, + "ArrayStore": { "path": "data.ArrayStore" }, + "CustomStore": { "path": "data.CustomStore" }, + "DataSource": { "path": "data.DataSource" }, + "EndpointSelector": { "path": "EndpointSelector" }, + "LocalStore": { "path": "data.LocalStore" }, + "ODataContext": { "path": "data.ODataContext" }, + "ODataStore": { "path": "data.ODataStore" }, + "query": { "path": "data.query" } } }, { - "name": "data/array_store", - "exports": { - "default": { "path": "data.ArrayStore" } - } + "name": "common/core/events/click" }, { - "name": "data/custom_store", - "exports": { - "default": { "path": "data.CustomStore" } - } + "name": "common/core/events/contextmenu" }, { - "name": "data/data_source", - "exports": { - "default": { "path": "data.DataSource" } - } + "name": "common/core/events/dblclick" }, { - "name": "data/endpoint_selector", - "exports": { - "default": { "path": "EndpointSelector" } - } + "name": "common/core/events/drag" }, { - "name": "data/errors", - "exports": { - "errorHandler": { "path": "data.errorHandler" } - } + "name": "common/core/events/hold" }, { - "name": "data/index", - "exports": { - "LoadOptions": { "path": "data.LoadOptions", "exportAs": "type" } - } + "name": "common/core/events/hover" }, { - "name": "data/local_store", - "exports": { - "default": { "path": "data.LocalStore" } - } + "name": "common/core/events/pointer" }, { - "name": "data/odata/context", - "exports": { - "default": { "path": "data.ODataContext" } - } + "name": "common/core/events/swipe" }, { - "name": "data/odata/store", - "exports": { - "default": { "path": "data.ODataStore" } - } + "name": "common/core/events/transform" }, { - "name": "data/odata/utils", + "name": "common/core/events", "exports": { - "EdmLiteral": { "path": "data.EdmLiteral" }, - "keyConverters": { "path": "data.utils.odata.keyConverters" } - } - }, - { - "name": "data/query", - "exports": { - "default": { "path": "data.query" } - } - }, - { - "name": "data/utils", - "exports": { - "base64_encode": { "path": "data.base64_encode" } + "on": { "path": "events.on" }, + "one": { "path": "events.one" }, + "off": { "path": "events.off" }, + "trigger": { "path": "events.trigger" } } }, - { - "name": "events/click" - }, - { - "name": "events/contextmenu" - }, - { - "name": "events/dblclick" - }, - { - "name": "events/drag" - }, - { - "name": "events/hold" - }, - { - "name": "events/hover" - }, - { - "name": "events/pointer" - }, - { - "name": "events/swipe" - }, - { - "name": "events/transform" - }, { "name": "events", "exports": { - "on": { "path": "events.on" }, - "one": { "path": "events.one" }, - "off": { "path": "events.off" }, - "trigger": { "path": "events.trigger" }, "triggerHandler": { "path": "events.triggerHandler" } } }, @@ -217,7 +144,7 @@ "name": "integration/jquery" }, { - "name": "localization", + "name": "common/core/localization", "exports": { "loadMessages": { "path": "localization.loadMessages" }, "formatMessage": { "path": "localization.formatMessage" }, @@ -228,18 +155,6 @@ "locale": { "path": "localization.locale" } } }, - { - "name": "mobile/hide_top_overlay", - "exports": { - "default": { "path": "hideTopOverlay" } - } - }, - { - "name": "mobile/init_mobile_viewport", - "exports": { - "default": { "path": "utils.initMobileViewport" } - } - }, { "name": "ui/speed_dial_action", "exports": { diff --git a/packages/devextreme/js/__internal/core/m_element_data.ts b/packages/devextreme/js/__internal/core/m_element_data.ts index 8af4d1935a13..11b9557bf56a 100644 --- a/packages/devextreme/js/__internal/core/m_element_data.ts +++ b/packages/devextreme/js/__internal/core/m_element_data.ts @@ -1,7 +1,7 @@ /* eslint-disable object-shorthand */ +import eventsEngine from '@js/common/core/events/core/events_engine'; import domAdapter from '@js/core/dom_adapter'; import MemorizedCallbacks from '@js/core/memorized_callbacks'; -import eventsEngine from '@js/events/core/events_engine'; const dataMap = new WeakMap(); let strategy; diff --git a/packages/devextreme/js/__internal/core/r1/component_wrapper.ts b/packages/devextreme/js/__internal/core/r1/component_wrapper.ts index cee61acf9bbb..99e8958dcf09 100644 --- a/packages/devextreme/js/__internal/core/r1/component_wrapper.ts +++ b/packages/devextreme/js/__internal/core/r1/component_wrapper.ts @@ -1,9 +1,9 @@ /* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable class-methods-use-this */ -import '@js/events/click'; -import '@js/events/core/emitter.feedback'; -import '@js/events/hover'; +import '@js/common/core/events/click'; +import '@js/common/core/events/core/emitter.feedback'; +import '@js/common/core/events/hover'; import domAdapter from '@js/core/dom_adapter'; import DOMComponent from '@js/core/dom_component'; @@ -21,8 +21,8 @@ import { createRef, } from 'inferno'; +import KeyboardProcessor from '../../../common/core/events/core/keyboard_processor'; import renderer from '../../../core/inferno_renderer'; -import KeyboardProcessor from '../../../events/core/keyboard_processor'; import type { TemplateModel } from './template_wrapper'; import { buildTemplateArgs, TemplateWrapper } from './template_wrapper'; import type { Option, TemplateComponent } from './types'; diff --git a/packages/devextreme/js/__internal/core/r1/utils/resolve_rtl.ts b/packages/devextreme/js/__internal/core/r1/utils/resolve_rtl.ts index 246e558ae571..7c0700be9562 100644 --- a/packages/devextreme/js/__internal/core/r1/utils/resolve_rtl.ts +++ b/packages/devextreme/js/__internal/core/r1/utils/resolve_rtl.ts @@ -1,4 +1,4 @@ -import globalConfig from '../../../../core/config'; +import { config as globalConfig } from '../../../../common'; import { isDefined } from '../../../../core/utils/type'; import type { ConfigContextValue } from '../config_context'; diff --git a/packages/devextreme/js/__internal/core/r1/utils/subscribe_to_event.ts b/packages/devextreme/js/__internal/core/r1/utils/subscribe_to_event.ts index 677c90d89209..7dfc1d9c63b2 100644 --- a/packages/devextreme/js/__internal/core/r1/utils/subscribe_to_event.ts +++ b/packages/devextreme/js/__internal/core/r1/utils/subscribe_to_event.ts @@ -1,8 +1,8 @@ -import * as clickEvent from '../../../../events/click'; -import eventsEngine from '../../../../events/core/events_engine'; -import scrollEvents from '../../../../events/gesture/emitter.gesture.scroll'; -import pointerEvents from '../../../../events/pointer'; -import { addNamespace } from '../../../../events/utils/index'; +import * as clickEvent from '../../../../common/core/events/click'; +import eventsEngine from '../../../../common/core/events/core/events_engine'; +import scrollEvents from '../../../../common/core/events/gesture/emitter.gesture.scroll'; +import pointerEvents from '../../../../common/core/events/pointer'; +import { addNamespace } from '../../../../common/core/events/utils/index'; import type { EffectReturn } from './effect_return'; export function subscribeToEvent(eventName: string) { diff --git a/packages/devextreme/js/__internal/core/r1/widget.tsx b/packages/devextreme/js/__internal/core/r1/widget.tsx index 52b1cf9d11d0..526403080bd6 100644 --- a/packages/devextreme/js/__internal/core/r1/widget.tsx +++ b/packages/devextreme/js/__internal/core/r1/widget.tsx @@ -2,22 +2,22 @@ /* eslint-disable spellcheck/spell-checker */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ /* eslint-disable @typescript-eslint/no-explicit-any */ -import '@js/events/click'; -import '@js/events/hover'; +import '@js/common/core/events/click'; +import '@js/common/core/events/hover'; import { createReRenderEffect, InfernoEffect, InfernoWrapperComponent, } from '@devextreme/runtime/inferno'; import type { RefObject } from '@devextreme-generator/declarations'; +import { + dxClick, focus, keyboard, resize, visibility, +} from '@js/common/core/events/short'; import domAdapter from '@js/core/dom_adapter'; import errors from '@js/core/errors'; import { extend } from '@js/core/utils/extend'; import resizeCallbacks from '@js/core/utils/resize_callbacks'; import { normalizeStyleProp } from '@js/core/utils/style'; import { isFunction } from '@js/core/utils/type'; -import { - dxClick, focus, keyboard, resize, visibility, -} from '@js/events/short'; import type { ConfigContextValue } from '@ts/core/r1/config_context'; import { ConfigContext } from '@ts/core/r1/config_context'; import { ConfigProvider } from '@ts/core/r1/config_provider'; diff --git a/packages/devextreme/js/__internal/core/templates/m_bindable_template.ts b/packages/devextreme/js/__internal/core/templates/m_bindable_template.ts index b3239ee92178..5c47e96de8bd 100644 --- a/packages/devextreme/js/__internal/core/templates/m_bindable_template.ts +++ b/packages/devextreme/js/__internal/core/templates/m_bindable_template.ts @@ -1,8 +1,8 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { removeEvent } from '@js/common/core/events/remove'; import $ from '@js/core/renderer'; import { TemplateBase } from '@js/core/templates/template_base'; import { isPrimitive } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { removeEvent } from '@js/events/remove'; const watchChanges = (function () { const globalWatch = (data, watchMethod, callback) => watchMethod(() => data, callback); diff --git a/packages/devextreme/js/__internal/core/templates/m_template_base.ts b/packages/devextreme/js/__internal/core/templates/m_template_base.ts index e3f84627b56e..31170824a5c2 100644 --- a/packages/devextreme/js/__internal/core/templates/m_template_base.ts +++ b/packages/devextreme/js/__internal/core/templates/m_template_base.ts @@ -1,9 +1,9 @@ +import { triggerShownEvent } from '@js/common/core/events/visibility_change'; import domAdapter from '@js/core/dom_adapter'; import errors from '@js/core/errors'; import $ from '@js/core/renderer'; import Callbacks from '@js/core/utils/callbacks'; import { contains } from '@js/core/utils/dom'; -import { triggerShownEvent } from '@js/events/visibility_change'; export const renderedCallbacks = Callbacks({ syncStrategy: true }); diff --git a/packages/devextreme/js/__internal/core/utils/m_date_serialization.ts b/packages/devextreme/js/__internal/core/utils/m_date_serialization.ts index 09ffd2877370..5b38c0af6aa1 100644 --- a/packages/devextreme/js/__internal/core/utils/m_date_serialization.ts +++ b/packages/devextreme/js/__internal/core/utils/m_date_serialization.ts @@ -1,7 +1,7 @@ +import defaultDateNames from '@js/common/core/localization/default_date_names'; +import { getFormatter as getLDMLFormatter } from '@js/common/core/localization/ldml/date.formatter'; import config from '@js/core/config'; import { isDate, isNumeric as isNumber, isString } from '@js/core/utils/type'; -import defaultDateNames from '@js/localization/default_date_names'; -import { getFormatter as getLDMLFormatter } from '@js/localization/ldml/date.formatter'; const NUMBER_SERIALIZATION_FORMAT = 'number'; const DATE_SERIALIZATION_FORMAT = 'yyyy/MM/dd'; diff --git a/packages/devextreme/js/__internal/core/utils/m_public_component.ts b/packages/devextreme/js/__internal/core/utils/m_public_component.ts index be3be2f12cd1..3501b55626e0 100644 --- a/packages/devextreme/js/__internal/core/utils/m_public_component.ts +++ b/packages/devextreme/js/__internal/core/utils/m_public_component.ts @@ -1,7 +1,7 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { removeEvent } from '@js/common/core/events/remove'; import { data as elementData } from '@js/core/element_data'; import { isDefined } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { removeEvent } from '@js/events/remove'; const COMPONENT_NAMES_DATA_KEY = 'dxComponents'; const ANONYMOUS_COMPONENT_DATA_KEY = 'dxPrivateComponent'; diff --git a/packages/devextreme/js/__internal/core/utils/m_support.ts b/packages/devextreme/js/__internal/core/utils/m_support.ts index c1c0927d4b92..720ea36d07e6 100644 --- a/packages/devextreme/js/__internal/core/utils/m_support.ts +++ b/packages/devextreme/js/__internal/core/utils/m_support.ts @@ -1,4 +1,4 @@ -import devices from '@js/core/devices'; +import devices from '@js/common/core/environment/devices'; import domAdapter from '@js/core/dom_adapter'; import callOnce from '@js/core/utils/call_once'; import { styleProp, stylePropPrefix } from '@js/core/utils/style'; @@ -19,7 +19,6 @@ const supportProp = function (prop) { }; const isNativeScrollingSupported = function () { - // @ts-expect-error mac doesnt exist in public type const { platform, mac: isMac } = devices.real(); const isNativeScrollDevice = platform === 'ios' || platform === 'android' || isMac; diff --git a/packages/devextreme/js/__internal/core/widget/dom_component.ts b/packages/devextreme/js/__internal/core/widget/dom_component.ts index 56d047f0054c..15e3a1187f28 100644 --- a/packages/devextreme/js/__internal/core/widget/dom_component.ts +++ b/packages/devextreme/js/__internal/core/widget/dom_component.ts @@ -1,3 +1,4 @@ +import { resize as resizeEvent, visibility as visibilityEvents } from '@js/common/core/events/short'; import config from '@js/core/config'; import type { DOMComponentOptions } from '@js/core/dom_component'; import { getPublicElement } from '@js/core/element'; @@ -14,8 +15,6 @@ import windowResizeCallbacks from '@js/core/utils/resize_callbacks'; import { addShadowDomStyles } from '@js/core/utils/shadow_dom'; import { isDefined, isFunction, isString } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import { resize as resizeEvent, visibility as visibilityEvents } from '@js/events/short'; -// eslint-disable-next-line @typescript-eslint/no-unused-vars import license, { peekValidationPerformed } from '@ts/core/license/license_validation'; import TemplateManagerModule from '@ts/core/m_template_manager'; diff --git a/packages/devextreme/js/__internal/core/widget/widget.ts b/packages/devextreme/js/__internal/core/widget/widget.ts index 7bc01ab41ff0..10fed27edd87 100644 --- a/packages/devextreme/js/__internal/core/widget/widget.ts +++ b/packages/devextreme/js/__internal/core/widget/widget.ts @@ -1,7 +1,10 @@ -import '@js/events/click'; -import '@js/events/core/emitter.feedback'; -import '@js/events/hover'; +import '@js/common/core/events/click'; +import '@js/common/core/events/core/emitter.feedback'; +import '@js/common/core/events/hover'; +import { + active, focus, hover, keyboard, +} from '@js/common/core/events/short'; import Action from '@js/core/action'; import devices from '@js/core/devices'; import type { DefaultOptionsRule } from '@js/core/options/utils'; @@ -13,9 +16,6 @@ import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { isDefined, isPlainObject } from '@js/core/utils/type'; import { compare as compareVersions } from '@js/core/utils/version'; -import { - active, focus, hover, keyboard, -} from '@js/events/short'; import { focusable as focusableSelector } from '@js/ui/widget/selectors'; import type { WidgetOptions } from '@js/ui/widget/ui.widget'; diff --git a/packages/devextreme/js/__internal/data/data_source/m_data_source.ts b/packages/devextreme/js/__internal/data/data_source/m_data_source.ts index be4f4ea3fd45..292ccff274d8 100644 --- a/packages/devextreme/js/__internal/data/data_source/m_data_source.ts +++ b/packages/devextreme/js/__internal/data/data_source/m_data_source.ts @@ -1,3 +1,16 @@ +import { applyBatch } from '@js/common/data/array_utils'; +import { CustomStore } from '@js/common/data/custom_store'; +import OperationManager from '@js/common/data/data_source/operation_manager'; +import { + CANCELED_TOKEN, + isPending, + mapDataRespectingGrouping, + normalizeDataSourceOptions, + normalizeLoadResult, + normalizeStoreLoadOptionAccessorArguments, +} from '@js/common/data/data_source/utils'; +import { errors } from '@js/common/data/errors'; +import { throttleChanges } from '@js/common/data/utils'; import Class from '@js/core/class'; import { EventsStrategy } from '@js/core/events_strategy'; import { Deferred, when } from '@js/core/utils/deferred'; @@ -7,21 +20,6 @@ import { create } from '@js/core/utils/queue'; import { isBoolean, isDefined, isEmptyObject, isNumeric, isObject, isString, } from '@js/core/utils/type'; -import { applyBatch } from '@js/data/array_utils'; -import CustomStore from '@js/data/custom_store'; -import OperationManager from '@js/data/data_source/operation_manager'; -import { - CANCELED_TOKEN, - isPending, - mapDataRespectingGrouping, - normalizeDataSourceOptions, - normalizeLoadResult, - normalizeStoreLoadOptionAccessorArguments, -} from '@js/data/data_source/utils'; -// @ts-expect-error -import { errors } from '@js/data/errors'; -// @ts-expect-error -import { throttleChanges } from '@js/data/utils'; import commonUtils from '@ts/core/utils/m_common'; export const DataSource = Class.inherit({ @@ -354,7 +352,7 @@ export const DataSource = Class.inherit({ const handleDone = (data) => { const isEmptyArray = Array.isArray(data) && !data.length; if (!isDefined(data) || isEmptyArray) { - d.reject(new errors.Error('E4009')); + d.reject(errors.Error('E4009')); } else { if (!Array.isArray(data)) { data = [data]; @@ -375,7 +373,6 @@ export const DataSource = Class.inherit({ delete options.refresh; delete options.pageIndex; delete options.searchString; - // @ts-expect-error const shouldForceByKey = () => (store instanceof CustomStore) && !store._byKeyViaLoad(); (() => { diff --git a/packages/devextreme/js/__internal/data/data_source/m_operation_manager.ts b/packages/devextreme/js/__internal/data/data_source/m_operation_manager.ts index 2723d076cd8a..cfde35fffb6f 100644 --- a/packages/devextreme/js/__internal/data/data_source/m_operation_manager.ts +++ b/packages/devextreme/js/__internal/data/data_source/m_operation_manager.ts @@ -1,4 +1,4 @@ -import { CANCELED_TOKEN } from '@js/data/data_source/utils'; +import { CANCELED_TOKEN } from '@js/common/data/data_source/utils'; export default class OperationManager { constructor() { diff --git a/packages/devextreme/js/__internal/data/data_source/m_utils.ts b/packages/devextreme/js/__internal/data/data_source/m_utils.ts index dabe7a87573a..40192c669e20 100644 --- a/packages/devextreme/js/__internal/data/data_source/m_utils.ts +++ b/packages/devextreme/js/__internal/data/data_source/m_utils.ts @@ -1,12 +1,11 @@ +import ArrayStore from '@js/common/data/array_store'; +import { CustomStore } from '@js/common/data/custom_store'; +import { normalizeSortingInfo } from '@js/common/data/utils'; import ajaxUtils from '@js/core/utils/ajax'; import { extend } from '@js/core/utils/extend'; import { each, map } from '@js/core/utils/iterator'; import { isPlainObject } from '@js/core/utils/type'; import Store from '@js/data/abstract_store'; -import ArrayStore from '@js/data/array_store'; -import CustomStore from '@js/data/custom_store'; -// @ts-expect-error -import { normalizeSortingInfo } from '@js/data/utils'; export const CANCELED_TOKEN = 'canceled'; @@ -66,7 +65,6 @@ const createCustomStoreFromLoadFunc = (options) => { // eslint-disable-next-line @typescript-eslint/no-dynamic-delete delete options[this]; }); - // @ts-expect-error return new CustomStore(storeConfig); }; @@ -112,7 +110,6 @@ export const normalizeDataSourceOptions = (options, normalizationOptions) => { if ('load' in options) { store = createCustomStoreFromLoadFunc(options); } else if (Array.isArray(store)) { - // @ts-expect-error store = new ArrayStore(store); } else if (isPlainObject(store)) { store = createStoreFromConfig(extend({}, store)); diff --git a/packages/devextreme/js/__internal/data/m_abstract_store.ts b/packages/devextreme/js/__internal/data/m_abstract_store.ts index 9e2a8b6fb1a6..ac3fa00acaed 100644 --- a/packages/devextreme/js/__internal/data/m_abstract_store.ts +++ b/packages/devextreme/js/__internal/data/m_abstract_store.ts @@ -1,3 +1,6 @@ +import { errors, handleError } from '@js/common/data/errors'; +import storeHelper from '@js/common/data/store_helper'; +import { processRequestResultLock } from '@js/common/data/utils'; import Class from '@js/core/class'; import { EventsStrategy } from '@js/core/events_strategy'; import { noop } from '@js/core/utils/common'; @@ -5,11 +8,6 @@ import { compileGetter } from '@js/core/utils/data'; import { Deferred, when } from '@js/core/utils/deferred'; import { each } from '@js/core/utils/iterator'; import { isEmptyObject } from '@js/core/utils/type'; -// @ts-expect-error -import { errors, handleError } from '@js/data/errors'; -import storeHelper from '@js/data/store_helper'; -// @ts-expect-error -import { processRequestResultLock } from '@js/data/utils'; const { abstract } = Class; const { queryByOptions } = storeHelper; diff --git a/packages/devextreme/js/__internal/data/m_array_query.ts b/packages/devextreme/js/__internal/data/m_array_query.ts index 6c02d4285a66..6bc800f398dc 100644 --- a/packages/devextreme/js/__internal/data/m_array_query.ts +++ b/packages/devextreme/js/__internal/data/m_array_query.ts @@ -1,24 +1,17 @@ -import Class from '@js/core/class'; -import { compileGetter, toComparable } from '@js/core/utils/data'; -import { Deferred } from '@js/core/utils/deferred'; -import { each, map } from '@js/core/utils/iterator'; -import { isDefined, isFunction, isString } from '@js/core/utils/type'; -// @ts-expect-error -import { errors, handleError as handleDataError } from '@js/data/errors'; +import { errors, handleError as handleDataError } from '@js/common/data/errors'; import { - // @ts-expect-error aggregators, - // @ts-expect-error isConjunctiveOperator as isConjunctiveOperatorChecker, - // @ts-expect-error isGroupCriterion, - // @ts-expect-error isUnaryOperation, - // @ts-expect-error isUniformEqualsByOr, - // @ts-expect-error normalizeBinaryCriterion, -} from '@js/data/utils'; +} from '@js/common/data/utils'; +import Class from '@js/core/class'; +import { compileGetter, toComparable } from '@js/core/utils/data'; +import { Deferred } from '@js/core/utils/deferred'; +import { each, map } from '@js/core/utils/iterator'; +import { isDefined, isFunction, isString } from '@js/core/utils/type'; const Iterator = Class.inherit({ @@ -281,7 +274,7 @@ const compileCriteria = (function () { each(crit, function () { if (Array.isArray(this) || isFunction(this)) { if (ops.length > 1 && isConjunctiveOperator !== isConjunctiveNextOperator) { - throw new errors.Error('E4019'); + throw errors.Error('E4019'); } // @ts-expect-error ops.push(compileCriteria(this, langParams)); diff --git a/packages/devextreme/js/__internal/data/m_array_store.ts b/packages/devextreme/js/__internal/data/m_array_store.ts index 2fc03b31d615..3ce70870936f 100644 --- a/packages/devextreme/js/__internal/data/m_array_store.ts +++ b/packages/devextreme/js/__internal/data/m_array_store.ts @@ -1,12 +1,10 @@ -import Store from '@js/data/abstract_store'; import { applyBatch, indexByKey, insert, remove, update, -} from '@js/data/array_utils'; -// @ts-expect-error -import { errors } from '@js/data/errors'; -import Query from '@js/data/query'; -// @ts-expect-error -import { rejectedPromise, trivialPromise } from '@js/data/utils'; +} from '@js/common/data/array_utils'; +import { errors } from '@js/common/data/errors'; +import Query from '@js/common/data/query'; +import { rejectedPromise, trivialPromise } from '@js/common/data/utils'; +import Store from '@js/data/abstract_store'; // @ts-expect-error const ArrayStore = Store.inherit({ @@ -28,6 +26,7 @@ const ArrayStore = Store.inherit({ }, createQuery() { + // @ts-expect-error return Query(this._array, { errorHandler: this._errorHandler, }); @@ -37,9 +36,11 @@ const ArrayStore = Store.inherit({ const index = indexByKey(this, this._array, key); if (index === -1) { + // @ts-expect-error return rejectedPromise(errors.Error('E4009')); } + // @ts-expect-error return trivialPromise(this._array[index]); }, diff --git a/packages/devextreme/js/__internal/data/m_array_utils.ts b/packages/devextreme/js/__internal/data/m_array_utils.ts index 818eb0ee1ff8..4922dc77ef28 100644 --- a/packages/devextreme/js/__internal/data/m_array_utils.ts +++ b/packages/devextreme/js/__internal/data/m_array_utils.ts @@ -1,3 +1,5 @@ +import { errors } from '@js/common/data/errors'; +import { keysEqual, rejectedPromise, trivialPromise } from '@js/common/data/utils'; import config from '@js/core/config'; import Guid from '@js/core/guid'; import { compileGetter } from '@js/core/utils/data'; @@ -6,10 +8,6 @@ import { deepExtendArraySafe } from '@js/core/utils/object'; import { isDefined, isEmptyObject, isObject, isPlainObject, } from '@js/core/utils/type'; -// @ts-expect-error -import { errors } from '@js/data/errors'; -// @ts-expect-error -import { keysEqual, rejectedPromise, trivialPromise } from '@js/data/utils'; function hasKey(target, keyOrKeys) { let key; @@ -143,6 +141,7 @@ function applyBatch({ } function getErrorResult(isBatch, logError, errorCode) { + // @ts-expect-error return !isBatch ? rejectedPromise(errors.Error(errorCode)) : logError && errors.log(errorCode); } @@ -188,6 +187,7 @@ function update(keyInfo, array, key, data, isBatch, immutable, logError) { if (immutable === true && isDefined(target)) { const newTarget = createObjectWithChanges(target, data); array[index] = newTarget; + // @ts-expect-error return !isBatch && trivialPromise(newTarget, key); } } @@ -198,8 +198,10 @@ function update(keyInfo, array, key, data, isBatch, immutable, logError) { deepExtendArraySafe(target, data, extendComplexObject, false, true, true); if (!isBatch) { if (config().useLegacyStoreResult) { + // @ts-expect-error return trivialPromise(key, data); } + // @ts-expect-error return trivialPromise(target, key); } } @@ -232,6 +234,7 @@ function insert(keyInfo, array, data, index, isBatch, logError, skipCopying) { setDataByKeyMapValue(array, keyValue, obj); if (!isBatch) { + // @ts-expect-error return trivialPromise(config().useLegacyStoreResult ? data : obj, keyValue); } } @@ -243,6 +246,7 @@ function remove(keyInfo, array, key, isBatch, logError) { setDataByKeyMapValue(array, key, null); } if (!isBatch) { + // @ts-expect-error return trivialPromise(key); } if (index < 0) { return getErrorResult(isBatch, logError, 'E4009'); diff --git a/packages/devextreme/js/__internal/data/m_custom_store.ts b/packages/devextreme/js/__internal/data/m_custom_store.ts index c36840d51bad..897bc7d603fa 100644 --- a/packages/devextreme/js/__internal/data/m_custom_store.ts +++ b/packages/devextreme/js/__internal/data/m_custom_store.ts @@ -1,22 +1,18 @@ +import arrayQuery from '@js/common/data/array_query'; +import { applyBatch } from '@js/common/data/array_utils'; +import { errors } from '@js/common/data/errors'; +import storeHelper from '@js/common/data/store_helper'; +import { + errorMessageFromXhr as errorMessageFromXhrUtility, + keysEqual, + XHR_ERROR_UNLOAD, +} from '@js/common/data/utils'; import config from '@js/core/config'; import $ from '@js/core/renderer'; // @ts-expect-error import { Deferred, fromPromise, when } from '@js/core/utils/deferred'; import { isFunction } from '@js/core/utils/type'; import Store from '@js/data/abstract_store'; -import arrayQuery from '@js/data/array_query'; -import { applyBatch } from '@js/data/array_utils'; -// @ts-expect-error -import { errors } from '@js/data/errors'; -import storeHelper from '@js/data/store_helper'; -import { - // @ts-expect-error - errorMessageFromXhr as errorMessageFromXhrUtility, - // @ts-expect-error - keysEqual, - // @ts-expect-error - XHR_ERROR_UNLOAD, -} from '@js/data/utils'; const TOTAL_COUNT = 'totalCount'; const LOAD = 'load'; @@ -228,6 +224,7 @@ function runRawLoadWithKey(pendingDeferred, store, key) { pendingDeferred.reject(errors.Error('E4009')); }); } + // @ts-expect-error const CustomStore = Store.inherit({ ctor(options) { diff --git a/packages/devextreme/js/__internal/data/m_local_store.ts b/packages/devextreme/js/__internal/data/m_local_store.ts index 118cea0ecf27..6bf755e1db08 100644 --- a/packages/devextreme/js/__internal/data/m_local_store.ts +++ b/packages/devextreme/js/__internal/data/m_local_store.ts @@ -1,10 +1,9 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import ArrayStore from '@js/common/data/array_store'; +import { errors } from '@js/common/data/errors'; import Class from '@js/core/class'; import domAdapter from '@js/core/dom_adapter'; import { getWindow } from '@js/core/utils/window'; -import ArrayStore from '@js/data/array_store'; -// @ts-expect-error -import { errors } from '@js/data/errors'; -import eventsEngine from '@js/events/core/events_engine'; const window = getWindow(); const { abstract } = Class; @@ -89,7 +88,6 @@ const DomLocalStoreBackend = LocalStoreBackend.inherit({ const localStoreBackends = { dom: DomLocalStoreBackend, }; -// @ts-expect-error const LocalStore = ArrayStore.inherit({ ctor(options) { diff --git a/packages/devextreme/js/__internal/data/m_query.ts b/packages/devextreme/js/__internal/data/m_query.ts index e308e41f081f..c35f346ae08c 100644 --- a/packages/devextreme/js/__internal/data/m_query.ts +++ b/packages/devextreme/js/__internal/data/m_query.ts @@ -1,4 +1,4 @@ -import { queryImpl } from '@js/data/query_implementation'; +import { queryImpl } from '@js/common/data/query_implementation'; const query = function () { const impl = Array.isArray(arguments[0]) ? 'array' : 'remote'; diff --git a/packages/devextreme/js/__internal/data/m_remote_query.ts b/packages/devextreme/js/__internal/data/m_remote_query.ts index 46b9ad0a6309..53fb79c54c50 100644 --- a/packages/devextreme/js/__internal/data/m_remote_query.ts +++ b/packages/devextreme/js/__internal/data/m_remote_query.ts @@ -1,11 +1,10 @@ /* eslint-disable @typescript-eslint/naming-convention */ +import arrayQueryImpl from '@js/common/data/array_query'; +import { errors, handleError } from '@js/common/data/errors'; +import queryAdapters from '@js/common/data/query_adapters'; import { Deferred } from '@js/core/utils/deferred'; import { each } from '@js/core/utils/iterator'; import { isFunction } from '@js/core/utils/type'; -import arrayQueryImpl from '@js/data/array_query'; -// @ts-expect-error -import { errors, handleError } from '@js/data/errors'; -import queryAdapters from '@js/data/query_adapters'; const remoteQueryImpl = function (url, queryOptions, tasks) { tasks = tasks || []; diff --git a/packages/devextreme/js/__internal/data/m_store_helper.ts b/packages/devextreme/js/__internal/data/m_store_helper.ts index 532127da73ae..fda349998c10 100644 --- a/packages/devextreme/js/__internal/data/m_store_helper.ts +++ b/packages/devextreme/js/__internal/data/m_store_helper.ts @@ -1,10 +1,9 @@ +import arrayQuery from '@js/common/data/array_query'; +import { normalizeSortingInfo } from '@js/common/data/utils'; // @ts-expect-error import { grep } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; -import arrayQuery from '@js/data/array_query'; -// @ts-expect-error -import { normalizeSortingInfo } from '@js/data/utils'; function multiLevelGroup(query, groupInfo) { query = query.groupBy(groupInfo[0].selector); diff --git a/packages/devextreme/js/__internal/data/odata/m_context.ts b/packages/devextreme/js/__internal/data/odata/m_context.ts index 0da972b6b409..d8ea84c46b9a 100644 --- a/packages/devextreme/js/__internal/data/odata/m_context.ts +++ b/packages/devextreme/js/__internal/data/odata/m_context.ts @@ -1,12 +1,12 @@ -import '@js/data/odata/query_adapter'; +import '@js/common/data/odata/query_adapter'; +import RequestDispatcher from '@js/common/data/odata/request_dispatcher'; +import ODataStore from '@js/common/data/odata/store'; import Class from '@js/core/class'; import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { isDefined, isPlainObject } from '@js/core/utils/type'; -import RequestDispatcher from '@js/data/odata/request_dispatcher'; -import ODataStore from '@js/data/odata/store'; import { errors, handleError } from '../m_errors'; import { escapeServiceOperationParams, formatFunctionInvocationUrl } from './m_utils'; diff --git a/packages/devextreme/js/__internal/data/odata/m_query_adapter.ts b/packages/devextreme/js/__internal/data/odata/m_query_adapter.ts index 95a3eb1e1fbd..8e06ae78e816 100644 --- a/packages/devextreme/js/__internal/data/odata/m_query_adapter.ts +++ b/packages/devextreme/js/__internal/data/odata/m_query_adapter.ts @@ -1,8 +1,8 @@ +import queryAdapters from '@js/common/data/query_adapters'; import config from '@js/core/config'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { isFunction } from '@js/core/utils/type'; -import queryAdapters from '@js/data/query_adapters'; import { errors } from '../m_errors'; import { diff --git a/packages/devextreme/js/__internal/data/odata/m_request_dispatcher.ts b/packages/devextreme/js/__internal/data/odata/m_request_dispatcher.ts index 616638cac8bf..c1dbe9f8ca6b 100644 --- a/packages/devextreme/js/__internal/data/odata/m_request_dispatcher.ts +++ b/packages/devextreme/js/__internal/data/odata/m_request_dispatcher.ts @@ -1,7 +1,6 @@ -import '@js/data/odata/query_adapter'; +import '@js/common/data/odata/query_adapter'; -// @ts-expect-error -import { sendRequest } from '@js/data/odata/utils'; +import { sendRequest } from '@js/common/data/odata/utils'; const DEFAULT_PROTOCOL_VERSION = 4; diff --git a/packages/devextreme/js/__internal/data/odata/m_store.ts b/packages/devextreme/js/__internal/data/odata/m_store.ts index 0442335481a6..9bf2c95863d0 100644 --- a/packages/devextreme/js/__internal/data/odata/m_store.ts +++ b/packages/devextreme/js/__internal/data/odata/m_store.ts @@ -1,13 +1,12 @@ -import '@js/data/odata/query_adapter'; +import '@js/common/data/odata/query_adapter'; +import { errors } from '@js/common/data/errors'; +import RequestDispatcher from '@js/common/data/odata/request_dispatcher'; +import query from '@js/common/data/query'; import config from '@js/core/config'; import { Deferred, when } from '@js/core/utils/deferred'; import { isDefined } from '@js/core/utils/type'; import Store from '@js/data/abstract_store'; -// @ts-expect-error -import { errors } from '@js/data/errors'; -import RequestDispatcher from '@js/data/odata/request_dispatcher'; -import query from '@js/data/query'; import { convertPrimitiveValue, @@ -41,6 +40,7 @@ const mergeFieldTypesWithKeyType = (fieldTypes, keyType) => { return result; }; + // @ts-expect-error const ODataStore = Store.inherit({ @@ -129,6 +129,7 @@ const ODataStore = Store.inherit({ } } + // @ts-expect-error return query(url, queryOptions); }, diff --git a/packages/devextreme/js/__internal/data/odata/m_utils.ts b/packages/devextreme/js/__internal/data/odata/m_utils.ts index fcbbd5117c4d..cf043c0de3c9 100644 --- a/packages/devextreme/js/__internal/data/odata/m_utils.ts +++ b/packages/devextreme/js/__internal/data/odata/m_utils.ts @@ -1,3 +1,5 @@ +import { errors } from '@js/common/data/errors'; +import { errorMessageFromXhr, XHR_ERROR_UNLOAD } from '@js/common/data/utils'; import Class from '@js/core/class'; import Guid from '@js/core/guid'; import ajax from '@js/core/utils/ajax'; @@ -10,10 +12,6 @@ import { format as stringFormat } from '@js/core/utils/string'; import { isDefined, isObject, isPlainObject, type, } from '@js/core/utils/type'; -// @ts-expect-error -import { errors } from '@js/data/errors'; -// @ts-expect-error -import { errorMessageFromXhr, XHR_ERROR_UNLOAD } from '@js/data/utils'; const GUID_REGEX = /^(\{{0,1}([0-9a-fA-F]){8}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){4}-([0-9a-fA-F]){12}\}{0,1})$/; @@ -237,7 +235,7 @@ export const sendRequest = (protocolVersion, request, options) => { if (isFinite(count)) { d.resolve(count); } else { - d.reject(new errors.Error('E4018')); + d.reject(errors.Error('E4018')); } } else if (nextUrl && !isPaged) { if (!isAbsoluteUrl(nextUrl)) { diff --git a/packages/devextreme/js/__internal/data_controller.ts b/packages/devextreme/js/__internal/data_controller.ts index 45aaa57acaf9..941aa26d9b66 100644 --- a/packages/devextreme/js/__internal/data_controller.ts +++ b/packages/devextreme/js/__internal/data_controller.ts @@ -1,10 +1,10 @@ import { Deferred } from '@js/core/utils/deferred'; +import ArrayStore from '../common/data/array_store'; +import { DataSource } from '../common/data/data_source/data_source'; +import { normalizeDataSourceOptions } from '../common/data/data_source/utils'; import { extend } from '../core/utils/extend'; import { isDefined } from '../core/utils/type'; -import ArrayStore from '../data/array_store'; -import { DataSource } from '../data/data_source/data_source'; -import { normalizeDataSourceOptions } from '../data/data_source/utils'; interface DataSourceType { _userData: unknown; diff --git a/packages/devextreme/js/__internal/events/core/m_emitter.feedback.ts b/packages/devextreme/js/__internal/events/core/m_emitter.feedback.ts index 1649da5afd88..cd2ced59a6df 100644 --- a/packages/devextreme/js/__internal/events/core/m_emitter.feedback.ts +++ b/packages/devextreme/js/__internal/events/core/m_emitter.feedback.ts @@ -1,10 +1,10 @@ +import Emitter from '@js/common/core/events/core/emitter'; +import registerEmitter from '@js/common/core/events/core/emitter_registrator'; +import pointerEvents from '@js/common/core/events/pointer'; +import { isMouseEvent } from '@js/common/core/events/utils/index'; import Class from '@js/core/class'; import { ensureDefined, noop } from '@js/core/utils/common'; import { contains } from '@js/core/utils/dom'; -import Emitter from '@js/events/core/emitter'; -import registerEmitter from '@js/events/core/emitter_registrator'; -import pointerEvents from '@js/events/pointer'; -import { isMouseEvent } from '@js/events/utils/index'; import devices from '@ts/core/m_devices'; const ACTIVE_EVENT_NAME = 'dxactive'; diff --git a/packages/devextreme/js/__internal/events/core/m_emitter.ts b/packages/devextreme/js/__internal/events/core/m_emitter.ts index 65d31a3b7aa6..fd09b7c43782 100644 --- a/packages/devextreme/js/__internal/events/core/m_emitter.ts +++ b/packages/devextreme/js/__internal/events/core/m_emitter.ts @@ -1,9 +1,9 @@ +import { fireEvent, hasTouches, isDxMouseWheelEvent } from '@js/common/core/events/utils/index'; import Class from '@js/core/class'; import $ from '@js/core/renderer'; import Callbacks from '@js/core/utils/callbacks'; import { noop } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; -import { fireEvent, hasTouches, isDxMouseWheelEvent } from '@js/events/utils/index'; const Emitter = Class.inherit({ diff --git a/packages/devextreme/js/__internal/events/core/m_emitter_registrator.ts b/packages/devextreme/js/__internal/events/core/m_emitter_registrator.ts index 48d06a7f38bd..801b84dddb0c 100644 --- a/packages/devextreme/js/__internal/events/core/m_emitter_registrator.ts +++ b/packages/devextreme/js/__internal/events/core/m_emitter_registrator.ts @@ -1,3 +1,8 @@ +import registerEvent from '@js/common/core/events/core/event_registrator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { name as wheelEventName } from '@js/common/core/events/core/wheel'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace, isMouseEvent } from '@js/common/core/events/utils/index'; import Class from '@js/core/class'; import domAdapter from '@js/core/dom_adapter'; import { data as elementData } from '@js/core/element_data'; @@ -5,11 +10,6 @@ import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import readyCallbacks from '@js/core/utils/ready_callbacks'; -import registerEvent from '@js/events/core/event_registrator'; -import eventsEngine from '@js/events/core/events_engine'; -import { name as wheelEventName } from '@js/events/core/wheel'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace, isMouseEvent } from '@js/events/utils/index'; const MANAGER_EVENT = 'dxEventManager'; const EMITTER_DATA = 'dxEmitter'; diff --git a/packages/devextreme/js/__internal/events/core/m_event_registrator.ts b/packages/devextreme/js/__internal/events/core/m_event_registrator.ts index 1300b04f4577..b84e875dfc31 100644 --- a/packages/devextreme/js/__internal/events/core/m_event_registrator.ts +++ b/packages/devextreme/js/__internal/events/core/m_event_registrator.ts @@ -1,5 +1,5 @@ +import callbacks from '@js/common/core/events/core/event_registrator_callbacks'; import { each } from '@js/core/utils/iterator'; -import callbacks from '@js/events/core/event_registrator_callbacks'; const registerEvent = function (name, eventObject) { const strategy: any = {}; diff --git a/packages/devextreme/js/__internal/events/core/m_events_engine.ts b/packages/devextreme/js/__internal/events/core/m_events_engine.ts index 53f51b8a8fd8..26730956c6d8 100644 --- a/packages/devextreme/js/__internal/events/core/m_events_engine.ts +++ b/packages/devextreme/js/__internal/events/core/m_events_engine.ts @@ -1,3 +1,6 @@ +import registerEventCallbacks from '@js/common/core/events/core/event_registrator_callbacks'; +import hookTouchProps from '@js/common/core/events/core/hook_touch_props'; +import { getEventTarget } from '@js/common/core/events/utils/event_target'; import domAdapter from '@js/core/dom_adapter'; import errors from '@js/core/errors'; import callOnce from '@js/core/utils/call_once'; @@ -8,9 +11,6 @@ import { isFunction, isObject, isString, isWindow, } from '@js/core/utils/type'; import { getWindow, hasWindow } from '@js/core/utils/window'; -import registerEventCallbacks from '@js/events/core/event_registrator_callbacks'; -import hookTouchProps from '@js/events/core/hook_touch_props'; -import { getEventTarget } from '@js/events/utils/event_target'; const window = getWindow(); diff --git a/packages/devextreme/js/__internal/events/core/m_keyboard_processor.ts b/packages/devextreme/js/__internal/events/core/m_keyboard_processor.ts index bc3194beeda1..6c8cda2690f9 100644 --- a/packages/devextreme/js/__internal/events/core/m_keyboard_processor.ts +++ b/packages/devextreme/js/__internal/events/core/m_keyboard_processor.ts @@ -1,7 +1,7 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace, normalizeKeyName } from '@js/common/core/events/utils/index'; import Class from '@js/core/class'; import $ from '@js/core/renderer'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace, normalizeKeyName } from '@js/events/utils/index'; const COMPOSITION_START_EVENT = 'compositionstart'; const COMPOSITION_END_EVENT = 'compositionend'; diff --git a/packages/devextreme/js/__internal/events/core/m_wheel.ts b/packages/devextreme/js/__internal/events/core/m_wheel.ts index f4f94e27f02a..c579e0ec7856 100644 --- a/packages/devextreme/js/__internal/events/core/m_wheel.ts +++ b/packages/devextreme/js/__internal/events/core/m_wheel.ts @@ -1,7 +1,7 @@ +import registerEvent from '@js/common/core/events/core/event_registrator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace, fireEvent } from '@js/common/core/events/utils/index'; import $ from '@js/core/renderer'; -import registerEvent from '@js/events/core/event_registrator'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace, fireEvent } from '@js/events/utils/index'; const EVENT_NAME = 'dxmousewheel'; const EVENT_NAMESPACE = 'dxWheel'; diff --git a/packages/devextreme/js/__internal/events/gesture/m_emitter.gesture.scroll.ts b/packages/devextreme/js/__internal/events/gesture/m_emitter.gesture.scroll.ts index abd66c8d2c0d..6edadbe1125b 100644 --- a/packages/devextreme/js/__internal/events/gesture/m_emitter.gesture.scroll.ts +++ b/packages/devextreme/js/__internal/events/gesture/m_emitter.gesture.scroll.ts @@ -1,11 +1,11 @@ -import { cancelAnimationFrame, requestAnimationFrame } from '@js/animation/frame'; -import Class from '@js/core/class'; -import registerEmitter from '@js/events/core/emitter_registrator'; -import eventsEngine from '@js/events/core/events_engine'; -import GestureEmitter from '@js/events/gesture/emitter.gesture'; +import { cancelAnimationFrame, requestAnimationFrame } from '@js/common/core/animation/frame'; +import registerEmitter from '@js/common/core/events/core/emitter_registrator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import GestureEmitter from '@js/common/core/events/gesture/emitter.gesture'; import { addNamespace, eventData, eventDelta, isDxMouseWheelEvent, isMouseEvent, -} from '@js/events/utils/index'; +} from '@js/common/core/events/utils/index'; +import Class from '@js/core/class'; import devices from '@ts/core/m_devices'; const { abstract } = Class; diff --git a/packages/devextreme/js/__internal/events/gesture/m_emitter.gesture.ts b/packages/devextreme/js/__internal/events/gesture/m_emitter.gesture.ts index c507772f7c90..26a9be9ac708 100644 --- a/packages/devextreme/js/__internal/events/gesture/m_emitter.gesture.ts +++ b/packages/devextreme/js/__internal/events/gesture/m_emitter.gesture.ts @@ -1,3 +1,8 @@ +import Emitter from '@js/common/core/events/core/emitter'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { + createEvent, eventData, eventDelta, isDxMouseWheelEvent, isTouchEvent, needSkipEvent, +} from '@js/common/core/events/utils/index'; import $ from '@js/core/renderer'; import callOnce from '@js/core/utils/call_once'; import { noop } from '@js/core/utils/common'; @@ -5,11 +10,6 @@ import { sign } from '@js/core/utils/math'; import readyCallbacks from '@js/core/utils/ready_callbacks'; import { styleProp } from '@js/core/utils/style'; import { isDefined } from '@js/core/utils/type'; -import Emitter from '@js/events/core/emitter'; -import eventsEngine from '@js/events/core/events_engine'; -import { - createEvent, eventData, eventDelta, isDxMouseWheelEvent, isTouchEvent, needSkipEvent, -} from '@js/events/utils/index'; import devices from '@ts/core/m_devices'; import domUtils from '@ts/core/utils/m_dom'; diff --git a/packages/devextreme/js/__internal/events/gesture/m_swipeable.ts b/packages/devextreme/js/__internal/events/gesture/m_swipeable.ts index 4ba1540119cd..d321ed8f4a38 100644 --- a/packages/devextreme/js/__internal/events/gesture/m_swipeable.ts +++ b/packages/devextreme/js/__internal/events/gesture/m_swipeable.ts @@ -1,14 +1,14 @@ -import DOMComponent from '@js/core/dom_component'; -import { extend } from '@js/core/utils/extend'; -import { each } from '@js/core/utils/iterator'; -import { name } from '@js/core/utils/public_component'; -import eventsEngine from '@js/events/core/events_engine'; +import eventsEngine from '@js/common/core/events/core/events_engine'; import { end as swipeEventEnd, start as swipeEventStart, swipe as swipeEventSwipe, -} from '@js/events/swipe'; -import { addNamespace } from '@js/events/utils/index'; +} from '@js/common/core/events/swipe'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import DOMComponent from '@js/core/dom_component'; +import { extend } from '@js/core/utils/extend'; +import { each } from '@js/core/utils/iterator'; +import { name } from '@js/core/utils/public_component'; const DX_SWIPEABLE = 'dxSwipeable'; const SWIPEABLE_CLASS = 'dx-swipeable'; diff --git a/packages/devextreme/js/__internal/events/m_click.ts b/packages/devextreme/js/__internal/events/m_click.ts index 6b1804bc55e2..03bc4dc7d685 100644 --- a/packages/devextreme/js/__internal/events/m_click.ts +++ b/packages/devextreme/js/__internal/events/m_click.ts @@ -1,13 +1,13 @@ import { cancelAnimationFrame, requestAnimationFrame } from '@js/animation/frame'; +import Emitter from '@js/common/core/events/core/emitter'; +import registerEmitter from '@js/common/core/events/core/emitter_registrator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import pointerEvents from '@js/common/core/events/pointer'; +import { subscribeNodesDisposing, unsubscribeNodesDisposing } from '@js/common/core/events/utils/event_nodes_disposing'; +import { getEventTarget } from '@js/common/core/events/utils/event_target'; +import { addNamespace, fireEvent } from '@js/common/core/events/utils/index'; import domAdapter from '@js/core/dom_adapter'; import $ from '@js/core/renderer'; -import Emitter from '@js/events/core/emitter'; -import registerEmitter from '@js/events/core/emitter_registrator'; -import eventsEngine from '@js/events/core/events_engine'; -import pointerEvents from '@js/events/pointer'; -import { subscribeNodesDisposing, unsubscribeNodesDisposing } from '@js/events/utils/event_nodes_disposing'; -import { getEventTarget } from '@js/events/utils/event_target'; -import { addNamespace, fireEvent } from '@js/events/utils/index'; import devices from '@ts/core/m_devices'; import domUtils from '@ts/core/utils/m_dom'; diff --git a/packages/devextreme/js/__internal/events/m_contextmenu.ts b/packages/devextreme/js/__internal/events/m_contextmenu.ts index d0816416647c..e4b7c1f54023 100644 --- a/packages/devextreme/js/__internal/events/m_contextmenu.ts +++ b/packages/devextreme/js/__internal/events/m_contextmenu.ts @@ -1,9 +1,9 @@ +import registerEvent from '@js/common/core/events/core/event_registrator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import holdEvent from '@js/common/core/events/hold'; +import { addNamespace, fireEvent, isMouseEvent } from '@js/common/core/events/utils/index'; import Class from '@js/core/class'; import $ from '@js/core/renderer'; -import registerEvent from '@js/events/core/event_registrator'; -import eventsEngine from '@js/events/core/events_engine'; -import holdEvent from '@js/events/hold'; -import { addNamespace, fireEvent, isMouseEvent } from '@js/events/utils/index'; import devices from '@ts/core/m_devices'; import supportUtils from '@ts/core/utils/m_support'; diff --git a/packages/devextreme/js/__internal/events/m_dblclick.ts b/packages/devextreme/js/__internal/events/m_dblclick.ts index 6628b8d0c4fe..646a7793fff9 100644 --- a/packages/devextreme/js/__internal/events/m_dblclick.ts +++ b/packages/devextreme/js/__internal/events/m_dblclick.ts @@ -1,9 +1,9 @@ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace, fireEvent } from '@js/common/core/events/utils/index'; import Class from '@js/core/class'; import domAdapter from '@js/core/dom_adapter'; import { closestCommonParent } from '@js/core/utils/dom'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace, fireEvent } from '@js/events/utils/index'; const DBLCLICK_EVENT_NAME = 'dxdblclick'; const DBLCLICK_NAMESPACE = 'dxDblClick'; diff --git a/packages/devextreme/js/__internal/events/m_drag.ts b/packages/devextreme/js/__internal/events/m_drag.ts index 952dd4b7f624..30388f15bff5 100644 --- a/packages/devextreme/js/__internal/events/m_drag.ts +++ b/packages/devextreme/js/__internal/events/m_drag.ts @@ -1,12 +1,12 @@ +import registerEmitter from '@js/common/core/events/core/emitter_registrator'; +import registerEvent from '@js/common/core/events/core/event_registrator'; +import GestureEmitter from '@js/common/core/events/gesture/emitter.gesture'; +import { eventData as eData, fireEvent } from '@js/common/core/events/utils/index'; import { data as elementData, removeData } from '@js/core/element_data'; import $ from '@js/core/renderer'; import { wrapToArray } from '@js/core/utils/array'; import { contains } from '@js/core/utils/dom'; import * as iteratorUtils from '@js/core/utils/iterator'; -import registerEmitter from '@js/events/core/emitter_registrator'; -import registerEvent from '@js/events/core/event_registrator'; -import GestureEmitter from '@js/events/gesture/emitter.gesture'; -import { eventData as eData, fireEvent } from '@js/events/utils/index'; const DRAG_START_EVENT = 'dxdragstart'; const DRAG_EVENT = 'dxdrag'; diff --git a/packages/devextreme/js/__internal/events/m_hold.ts b/packages/devextreme/js/__internal/events/m_hold.ts index f5fb13543588..3248dc50f4f8 100644 --- a/packages/devextreme/js/__internal/events/m_hold.ts +++ b/packages/devextreme/js/__internal/events/m_hold.ts @@ -1,6 +1,6 @@ -import Emitter from '@js/events/core/emitter'; -import registerEmitter from '@js/events/core/emitter_registrator'; -import { eventData, eventDelta } from '@js/events/utils/index'; +import Emitter from '@js/common/core/events/core/emitter'; +import registerEmitter from '@js/common/core/events/core/emitter_registrator'; +import { eventData, eventDelta } from '@js/common/core/events/utils/index'; const { abs } = Math; diff --git a/packages/devextreme/js/__internal/events/m_hover.ts b/packages/devextreme/js/__internal/events/m_hover.ts index ef963775cc64..29f764e69be2 100644 --- a/packages/devextreme/js/__internal/events/m_hover.ts +++ b/packages/devextreme/js/__internal/events/m_hover.ts @@ -1,9 +1,9 @@ +import registerEvent from '@js/common/core/events/core/event_registrator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace, fireEvent, isTouchEvent } from '@js/common/core/events/utils/index'; import Class from '@js/core/class'; import { data as elementData, removeData } from '@js/core/element_data'; -import registerEvent from '@js/events/core/event_registrator'; -import eventsEngine from '@js/events/core/events_engine'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace, fireEvent, isTouchEvent } from '@js/events/utils/index'; import devices from '@ts/core/m_devices'; const HOVERSTART_NAMESPACE = 'dxHoverStart'; diff --git a/packages/devextreme/js/__internal/events/m_pointer.ts b/packages/devextreme/js/__internal/events/m_pointer.ts index e4025dbd0371..2db6c39e3a42 100644 --- a/packages/devextreme/js/__internal/events/m_pointer.ts +++ b/packages/devextreme/js/__internal/events/m_pointer.ts @@ -1,9 +1,9 @@ +import registerEvent from '@js/common/core/events/core/event_registrator'; +import MouseStrategy from '@js/common/core/events/pointer/mouse'; +import MouseAndTouchStrategy from '@js/common/core/events/pointer/mouse_and_touch'; +import TouchStrategy from '@js/common/core/events/pointer/touch'; import GlobalConfig from '@js/core/config'; import { each } from '@js/core/utils/iterator'; -import registerEvent from '@js/events/core/event_registrator'; -import MouseStrategy from '@js/events/pointer/mouse'; -import MouseAndTouchStrategy from '@js/events/pointer/mouse_and_touch'; -import TouchStrategy from '@js/events/pointer/touch'; import devices from '@ts/core/m_devices'; import support from '@ts/core/utils/m_support'; diff --git a/packages/devextreme/js/__internal/events/m_remove.ts b/packages/devextreme/js/__internal/events/m_remove.ts index 7db6f04f4725..4131b1b6533c 100644 --- a/packages/devextreme/js/__internal/events/m_remove.ts +++ b/packages/devextreme/js/__internal/events/m_remove.ts @@ -1,7 +1,7 @@ +import registerEvent from '@js/common/core/events/core/event_registrator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; import { beforeCleanData } from '@js/core/element_data'; import $ from '@js/core/renderer'; -import registerEvent from '@js/events/core/event_registrator'; -import eventsEngine from '@js/events/core/events_engine'; export const removeEvent = 'dxremove'; const eventPropName = 'dxRemoveEvent'; diff --git a/packages/devextreme/js/__internal/events/m_short.ts b/packages/devextreme/js/__internal/events/m_short.ts index 4ef502a5058f..b65e4fd4d2c4 100644 --- a/packages/devextreme/js/__internal/events/m_short.ts +++ b/packages/devextreme/js/__internal/events/m_short.ts @@ -1,6 +1,6 @@ -import eventsEngine from '@js/events/core/events_engine'; -import KeyboardProcessor from '@js/events/core/keyboard_processor'; -import { addNamespace as pureAddNamespace } from '@js/events/utils/index'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import KeyboardProcessor from '@js/common/core/events/core/keyboard_processor'; +import { addNamespace as pureAddNamespace } from '@js/common/core/events/utils/index'; function addNamespace(event, namespace) { return namespace ? pureAddNamespace(event, namespace) : event; diff --git a/packages/devextreme/js/__internal/events/m_swipe.ts b/packages/devextreme/js/__internal/events/m_swipe.ts index fbea0dddd200..4b533b43885a 100644 --- a/packages/devextreme/js/__internal/events/m_swipe.ts +++ b/packages/devextreme/js/__internal/events/m_swipe.ts @@ -1,7 +1,7 @@ +import registerEmitter from '@js/common/core/events/core/emitter_registrator'; +import GestureEmitter from '@js/common/core/events/gesture/emitter.gesture'; +import { eventData } from '@js/common/core/events/utils/index'; import { getHeight, getWidth } from '@js/core/utils/size'; -import registerEmitter from '@js/events/core/emitter_registrator'; -import GestureEmitter from '@js/events/gesture/emitter.gesture'; -import { eventData } from '@js/events/utils/index'; const SWIPE_START_EVENT = 'dxswipestart'; const SWIPE_EVENT = 'dxswipe'; diff --git a/packages/devextreme/js/__internal/events/m_transform.ts b/packages/devextreme/js/__internal/events/m_transform.ts index 6f3ae247bc28..3fea6fd1756c 100644 --- a/packages/devextreme/js/__internal/events/m_transform.ts +++ b/packages/devextreme/js/__internal/events/m_transform.ts @@ -1,8 +1,8 @@ +import Emitter from '@js/common/core/events/core/emitter'; +import registerEmitter from '@js/common/core/events/core/emitter_registrator'; +import { hasTouches } from '@js/common/core/events/utils/index'; import * as iteratorUtils from '@js/core/utils/iterator'; import { fitIntoRange, sign as mathSign } from '@js/core/utils/math'; -import Emitter from '@js/events/core/emitter'; -import registerEmitter from '@js/events/core/emitter_registrator'; -import { hasTouches } from '@js/events/utils/index'; interface EventAlias { name: string; diff --git a/packages/devextreme/js/__internal/events/m_visibility_change.ts b/packages/devextreme/js/__internal/events/m_visibility_change.ts index 73649aaeb138..278bc4047a3d 100644 --- a/packages/devextreme/js/__internal/events/m_visibility_change.ts +++ b/packages/devextreme/js/__internal/events/m_visibility_change.ts @@ -1,5 +1,5 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; import $ from '@js/core/renderer'; -import eventsEngine from '@js/events/core/events_engine'; const triggerVisibilityChangeEvent = function (eventName) { const VISIBILITY_CHANGE_SELECTOR = '.dx-visibility-change-handler'; diff --git a/packages/devextreme/js/__internal/events/pointer/m_base.ts b/packages/devextreme/js/__internal/events/pointer/m_base.ts index 9f09bc77971f..4a74403e2b36 100644 --- a/packages/devextreme/js/__internal/events/pointer/m_base.ts +++ b/packages/devextreme/js/__internal/events/pointer/m_base.ts @@ -1,9 +1,9 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { getEventTarget } from '@js/common/core/events/utils/event_target'; +import { addNamespace, eventSource, fireEvent } from '@js/common/core/events/utils/index'; import Class from '@js/core/class'; import domAdapter from '@js/core/dom_adapter'; import browser from '@js/core/utils/browser'; -import eventsEngine from '@js/events/core/events_engine'; -import { getEventTarget } from '@js/events/utils/event_target'; -import { addNamespace, eventSource, fireEvent } from '@js/events/utils/index'; const POINTER_EVENTS_NAMESPACE = 'dxPointerEvents'; diff --git a/packages/devextreme/js/__internal/events/pointer/m_mouse.ts b/packages/devextreme/js/__internal/events/pointer/m_mouse.ts index 6923ca95f16e..c5bb04abef0d 100644 --- a/packages/devextreme/js/__internal/events/pointer/m_mouse.ts +++ b/packages/devextreme/js/__internal/events/pointer/m_mouse.ts @@ -1,6 +1,6 @@ +import BaseStrategy from '@js/common/core/events/pointer/base'; +import Observer from '@js/common/core/events/pointer/observer'; import { extend } from '@js/core/utils/extend'; -import BaseStrategy from '@js/events/pointer/base'; -import Observer from '@js/events/pointer/observer'; /* eslint-disable spellcheck/spell-checker */ const eventMap = { diff --git a/packages/devextreme/js/__internal/events/pointer/m_mouse_and_touch.ts b/packages/devextreme/js/__internal/events/pointer/m_mouse_and_touch.ts index ace13e48880c..c4a325233da1 100644 --- a/packages/devextreme/js/__internal/events/pointer/m_mouse_and_touch.ts +++ b/packages/devextreme/js/__internal/events/pointer/m_mouse_and_touch.ts @@ -1,8 +1,8 @@ +import BaseStrategy from '@js/common/core/events/pointer/base'; +import MouseStrategy from '@js/common/core/events/pointer/mouse'; +import TouchStrategy from '@js/common/core/events/pointer/touch'; +import { isMouseEvent } from '@js/common/core/events/utils/index'; import { extend } from '@js/core/utils/extend'; -import BaseStrategy from '@js/events/pointer/base'; -import MouseStrategy from '@js/events/pointer/mouse'; -import TouchStrategy from '@js/events/pointer/touch'; -import { isMouseEvent } from '@js/events/utils/index'; /* eslint-disable spellcheck/spell-checker */ const eventMap = { diff --git a/packages/devextreme/js/__internal/events/pointer/m_touch.ts b/packages/devextreme/js/__internal/events/pointer/m_touch.ts index f6fc7b28f21f..159f8652c595 100644 --- a/packages/devextreme/js/__internal/events/pointer/m_touch.ts +++ b/packages/devextreme/js/__internal/events/pointer/m_touch.ts @@ -1,6 +1,6 @@ +import BaseStrategy from '@js/common/core/events/pointer/base'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; -import BaseStrategy from '@js/events/pointer/base'; import devices from '@ts/core/m_devices'; /* eslint-disable spellcheck/spell-checker */ diff --git a/packages/devextreme/js/__internal/events/utils/index.ts b/packages/devextreme/js/__internal/events/utils/index.ts index 407f3dced19d..ed0d11d30964 100644 --- a/packages/devextreme/js/__internal/events/utils/index.ts +++ b/packages/devextreme/js/__internal/events/utils/index.ts @@ -1,7 +1,7 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; -import eventsEngine from '@js/events/core/events_engine'; import { focused } from '@js/ui/widget/selectors'; import mappedAddNamespace from './m_add_namespace'; diff --git a/packages/devextreme/js/__internal/events/utils/m_event_nodes_disposing.ts b/packages/devextreme/js/__internal/events/utils/m_event_nodes_disposing.ts index 3baf9abb34ae..4db01c1452c5 100644 --- a/packages/devextreme/js/__internal/events/utils/m_event_nodes_disposing.ts +++ b/packages/devextreme/js/__internal/events/utils/m_event_nodes_disposing.ts @@ -1,5 +1,5 @@ -import eventsEngine from '@js/events/core/events_engine'; -import { removeEvent } from '@js/events/remove'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { removeEvent } from '@js/common/core/events/remove'; function nodesByEvent(event) { return event && [ diff --git a/packages/devextreme/js/__internal/filter_builder/m_filter_builder.ts b/packages/devextreme/js/__internal/filter_builder/m_filter_builder.ts index 992e4395f599..abf302038afd 100644 --- a/packages/devextreme/js/__internal/filter_builder/m_filter_builder.ts +++ b/packages/devextreme/js/__internal/filter_builder/m_filter_builder.ts @@ -1,4 +1,7 @@ /* eslint-disable max-classes-per-file */ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { normalizeKeyName } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import domAdapter from '@js/core/dom_adapter'; import Guid from '@js/core/guid'; @@ -6,9 +9,6 @@ import $ from '@js/core/renderer'; import { when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { isDefined } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { normalizeKeyName } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import Popup from '@js/ui/popup/ui.popup'; import EditorFactoryMixin from '@js/ui/shared/ui.editor_factory_mixin'; import TreeView from '@js/ui/tree_view'; diff --git a/packages/devextreme/js/__internal/filter_builder/m_utils.ts b/packages/devextreme/js/__internal/filter_builder/m_utils.ts index 600b85c216da..373b1ff2dbf3 100644 --- a/packages/devextreme/js/__internal/filter_builder/m_utils.ts +++ b/packages/devextreme/js/__internal/filter_builder/m_utils.ts @@ -1,14 +1,13 @@ +import messageLocalization from '@js/common/core/localization/message'; +import { DataSource } from '@js/common/data/data_source/data_source'; +import { errors as dataErrors } from '@js/common/data/errors'; import $ from '@js/core/renderer'; import { compileGetter } from '@js/core/utils/data'; import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { captionize } from '@js/core/utils/inflector'; import { isDefined, isFunction } from '@js/core/utils/type'; -import { DataSource } from '@js/data/data_source/data_source'; -// @ts-expect-error errors.d.ts is badly typed and doesn't contain all exported entities. -import { errors as dataErrors } from '@js/data/errors'; import formatHelper from '@js/format_helper'; -import messageLocalization from '@js/localization/message'; import filterUtils from '@js/ui/shared/filtering'; import errors from '@js/ui/widget/ui.errors'; @@ -142,7 +141,7 @@ function getCriteriaOperation(criteria) { const item = criteria[i]; if (!Array.isArray(item)) { if (value && value !== item) { - throw new dataErrors.Error('E4019'); + throw dataErrors.Error('E4019'); } if (item !== '!') { value = item; diff --git a/packages/devextreme/js/__internal/grids/data_grid/export/m_export.ts b/packages/devextreme/js/__internal/grids/data_grid/export/m_export.ts index d27e6139b0e9..b3bee519040b 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/export/m_export.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/export/m_export.ts @@ -2,13 +2,13 @@ import '@js/ui/button'; import '@js/ui/drop_down_button'; +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { getDefaultAlignment } from '@js/core/utils/position'; import { format } from '@js/core/utils/string'; import { isDefined, isFunction } from '@js/core/utils/type'; -import messageLocalization from '@js/localization/message'; import List from '@js/ui/list_light'; import errors from '@js/ui/widget/ui.errors'; import { prepareItems } from '@ts/grids/grid_core/m_export'; diff --git a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping.ts b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping.ts index 7093eac76a80..921272af50c6 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping.ts @@ -1,12 +1,12 @@ /* eslint-disable max-classes-per-file */ /* eslint-disable @typescript-eslint/method-signature-style */ +import messageLocalization from '@js/common/core/localization/message'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; import { Deferred, when } from '@js/core/utils/deferred'; import { each } from '@js/core/utils/iterator'; import { getHeight } from '@js/core/utils/size'; import { isDefined, isString } from '@js/core/utils/type'; -import messageLocalization from '@js/localization/message'; import { restoreFocus, setTabIndex } from '@js/ui/shared/accessibility'; import type { DataController } from '@ts/grids/grid_core/data_controller/m_data_controller'; import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/m_data_source_adapter'; diff --git a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_collapsed.ts b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_collapsed.ts index 6ab6b600ee71..72613af77893 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_collapsed.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_collapsed.ts @@ -1,8 +1,7 @@ +import { errors as dataErrors } from '@js/common/data/errors'; import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; -// @ts-expect-error -import { errors as dataErrors } from '@js/data/errors'; import errors from '@js/ui/widget/ui.errors'; import dataGridCore from '../m_core'; diff --git a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_core.ts b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_core.ts index 1ae9b0b1dc66..b876477b9cde 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_core.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_core.ts @@ -1,7 +1,6 @@ +import { normalizeSortingInfo } from '@js/common/data/utils'; import $ from '@js/core/renderer'; import { when } from '@js/core/utils/deferred'; -// @ts-expect-error -import { normalizeSortingInfo } from '@js/data/utils'; import gridCore from '../m_core'; diff --git a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_expanded.ts b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_expanded.ts index 77c4f349e578..86133e053ac0 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_expanded.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/grouping/m_grouping_expanded.ts @@ -1,11 +1,10 @@ +import dataQuery from '@js/common/data/query'; +import storeHelper from '@js/common/data/store_helper'; +import { keysEqual } from '@js/common/data/utils'; import { toComparable } from '@js/core/utils/data'; import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; -import dataQuery from '@js/data/query'; -import storeHelper from '@js/data/store_helper'; -// @ts-expect-error -import { keysEqual } from '@js/data/utils'; import dataGridCore from '../m_core'; import { createGroupFilter } from '../m_utils'; @@ -288,6 +287,7 @@ export class GroupingHelper extends GroupingHelperCore { if (groupCount) { let { data } = options; + // @ts-expect-error const query = dataQuery(data); storeHelper.multiLevelGroup(query, groups).enumerate().done((groupedData) => { data = groupedData; diff --git a/packages/devextreme/js/__internal/grids/data_grid/m_aggregate_calculator.ts b/packages/devextreme/js/__internal/grids/data_grid/m_aggregate_calculator.ts index 89a0e7cb35d7..4c9f0afb875c 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/m_aggregate_calculator.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/m_aggregate_calculator.ts @@ -1,9 +1,7 @@ +import { errors } from '@js/common/data/errors'; +import { aggregators } from '@js/common/data/utils'; import { compileGetter } from '@js/core/utils/data'; import { isFunction } from '@js/core/utils/type'; -// @ts-expect-error -import { errors } from '@js/data/errors'; -// @ts-expect-error -import { aggregators } from '@js/data/utils'; function depthFirstSearch(i, depth, root, callback) { let j = 0; diff --git a/packages/devextreme/js/__internal/grids/data_grid/m_utils.ts b/packages/devextreme/js/__internal/grids/data_grid/m_utils.ts index cb7600b999ef..0d2a9d97bc6a 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/m_utils.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/m_utils.ts @@ -1,5 +1,4 @@ -// @ts-expect-error -import { normalizeSortingInfo } from '@js/data/utils'; +import { normalizeSortingInfo } from '@js/common/data/utils'; import gridCoreUtils from '@ts/grids/grid_core/m_utils'; export function createGroupFilter(path, storeLoadOptions) { diff --git a/packages/devextreme/js/__internal/grids/data_grid/summary/m_summary.ts b/packages/devextreme/js/__internal/grids/data_grid/summary/m_summary.ts index 2374ed7fb45b..307de0b4286c 100644 --- a/packages/devextreme/js/__internal/grids/data_grid/summary/m_summary.ts +++ b/packages/devextreme/js/__internal/grids/data_grid/summary/m_summary.ts @@ -1,4 +1,8 @@ /* eslint-disable max-classes-per-file */ +import messageLocalization from '@js/common/core/localization/message'; +import dataQuery from '@js/common/data/query'; +import storeHelper from '@js/common/data/store_helper'; +import { normalizeSortingInfo } from '@js/common/data/utils'; import $ from '@js/core/renderer'; import { noop } from '@js/core/utils/common'; import { compileGetter } from '@js/core/utils/data'; @@ -8,11 +12,6 @@ import { isDefined, isEmptyObject, isFunction, isPlainObject, isString, } from '@js/core/utils/type'; -import dataQuery from '@js/data/query'; -import storeHelper from '@js/data/store_helper'; -// @ts-expect-error -import { normalizeSortingInfo } from '@js/data/utils'; -import messageLocalization from '@js/localization/message'; import errors from '@js/ui/widget/ui.errors'; import type { DataController } from '@ts/grids/grid_core/data_controller/m_data_controller'; import type DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/m_data_source_adapter'; @@ -128,6 +127,7 @@ const sortGroupsBySummaryCore = function (items, groups, sortByGroups) { let query; if (group && sorts && sorts.length) { + // @ts-expect-error query = dataQuery(items); each(sorts, function (index) { if (index === 0) { @@ -340,6 +340,7 @@ const dataSourceAdapterExtender = (Base: ModuleType) => class } private sortLastLevelGroupItems(items, groups, paths) { + // @ts-expect-error const groupedItems = storeHelper.multiLevelGroup(dataQuery(items), groups).toArray(); let result = []; diff --git a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/m_adaptivity.ts b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/m_adaptivity.ts index 2397d606f47d..f4b44409b835 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/adaptivity/m_adaptivity.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/adaptivity/m_adaptivity.ts @@ -1,5 +1,10 @@ /* eslint-disable @typescript-eslint/method-signature-style */ /* eslint-disable max-classes-per-file */ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { removeEvent } from '@js/common/core/events/remove'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import Guid from '@js/core/guid'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; @@ -10,11 +15,6 @@ import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { getWidth } from '@js/core/utils/size'; import { isDefined, isString } from '@js/core/utils/type'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { removeEvent } from '@js/events/remove'; -import { addNamespace } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import Form from '@js/ui/form'; import { isMaterial } from '@js/ui/themes'; import type { ResizingController } from '@ts/grids/grid_core/views/m_grid_view'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/column_chooser/m_column_chooser.ts b/packages/devextreme/js/__internal/grids/grid_core/column_chooser/m_column_chooser.ts index e761ee727f64..cc4332fbf51d 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/column_chooser/m_column_chooser.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/column_chooser/m_column_chooser.ts @@ -1,4 +1,5 @@ /* eslint-disable max-classes-per-file */ +import messageLocalization from '@js/common/core/localization/message'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; import { deferUpdate } from '@js/core/utils/common'; @@ -6,7 +7,6 @@ import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { getOuterHeight, getOuterWidth } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; -import messageLocalization from '@js/localization/message'; // eslint-disable-next-line @typescript-eslint/no-unused-vars import Button from '@js/ui/button'; import Popup from '@js/ui/popup/ui.popup'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/column_fixing/m_column_fixing.ts b/packages/devextreme/js/__internal/grids/grid_core/column_fixing/m_column_fixing.ts index 7e5c3b6e8a85..10d20bad13ea 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/column_fixing/m_column_fixing.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/column_fixing/m_column_fixing.ts @@ -1,7 +1,10 @@ /* eslint-disable max-classes-per-file */ // TODO Move DataGrid's summary methods to the DataGrid // TODO Move virtual scrolling related methods to the virtual_scrolling -import { move } from '@js/animation/translator'; +import { move } from '@js/common/core/animation/translator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { name as wheelEventName } from '@js/common/core/events/core/wheel'; +import messageLocalization from '@js/common/core/localization/message'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import browser from '@js/core/utils/browser'; @@ -11,9 +14,6 @@ import { getBoundingRect } from '@js/core/utils/position'; import { getOuterWidth } from '@js/core/utils/size'; import { setWidth } from '@js/core/utils/style'; import { isDefined } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { name as wheelEventName } from '@js/events/core/wheel'; -import messageLocalization from '@js/localization/message'; import Scrollable from '@js/ui/scroll_view/ui.scrollable'; import type { EditorFactory } from '@ts/grids/grid_core/editor_factory/m_editor_factory'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/column_headers/m_column_headers.ts b/packages/devextreme/js/__internal/grids/grid_core/column_headers/m_column_headers.ts index bbd921c1439e..b3b267cbc9a7 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/column_headers/m_column_headers.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/column_headers/m_column_headers.ts @@ -1,3 +1,5 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import messageLocalization from '@js/common/core/localization/message'; import domAdapter from '@js/core/dom_adapter'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; @@ -5,8 +7,6 @@ import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { getHeight } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import messageLocalization from '@js/localization/message'; import type { HeaderFilterController } from '@ts/grids/grid_core/header_filter/m_header_filter'; import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/m_header_panel'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller.ts index 9c656763152e..053f199517be 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller.ts @@ -1,4 +1,8 @@ /* eslint-disable prefer-destructuring */ +import dateLocalization from '@js/common/core/localization/date'; +import messageLocalization from '@js/common/core/localization/message'; +import { DataSource } from '@js/common/data/data_source/data_source'; +import { normalizeDataSourceOptions } from '@js/common/data/data_source/utils'; import type { ColumnBase } from '@js/common/grids'; import config from '@js/core/config'; import $ from '@js/core/renderer'; @@ -14,10 +18,6 @@ import { } from '@js/core/utils/type'; import variableWrapper from '@js/core/utils/variable_wrapper'; import Store from '@js/data/abstract_store'; -import { DataSource } from '@js/data/data_source/data_source'; -import { normalizeDataSourceOptions } from '@js/data/data_source/utils'; -import dateLocalization from '@js/localization/date'; -import messageLocalization from '@js/localization/message'; import filterUtils from '@js/ui/shared/filtering'; import errors from '@js/ui/widget/ui.errors'; import inflector from '@ts/core/utils/m_inflector'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller_utils.ts b/packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller_utils.ts index ca081854f989..8753c2518ede 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller_utils.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/columns_controller/m_columns_controller_utils.ts @@ -1,4 +1,5 @@ /* eslint-disable prefer-destructuring */ +import numberLocalization from '@js/common/core/localization/number'; import { normalizeIndexes } from '@js/core/utils/array'; import { equalByValue } from '@js/core/utils/common'; import { compileGetter, compileSetter } from '@js/core/utils/data'; @@ -11,7 +12,6 @@ import { isDefined, isFunction, isNumeric, isObject, isString, type, } from '@js/core/utils/type'; import variableWrapper from '@js/core/utils/variable_wrapper'; -import numberLocalization from '@js/localization/number'; import { HIDDEN_COLUMNS_WIDTH } from '../adaptivity/const'; import gridCoreUtils from '../m_utils'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/columns_resizing_reordering/m_columns_resizing_reordering.ts b/packages/devextreme/js/__internal/grids/grid_core/columns_resizing_reordering/m_columns_resizing_reordering.ts index e51c32750e9f..be6be7f5cd72 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/columns_resizing_reordering/m_columns_resizing_reordering.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/columns_resizing_reordering/m_columns_resizing_reordering.ts @@ -1,5 +1,13 @@ /* eslint-disable max-classes-per-file */ -import fx from '@js/animation/fx'; +import { fx } from '@js/common/core/animation'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { + end as dragEventEnd, + move as dragEventMove, + start as dragEventStart, +} from '@js/common/core/events/drag'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace, eventData as getEventData, isTouchEvent } from '@js/common/core/events/utils/index'; import domAdapter from '@js/core/dom_adapter'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; @@ -12,14 +20,6 @@ import { setHeight, setWidth, } from '@js/core/utils/size'; import { isDefined, isObject, isString } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { - end as dragEventEnd, - move as dragEventMove, - start as dragEventStart, -} from '@js/events/drag'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace, eventData as getEventData, isTouchEvent } from '@js/events/utils/index'; import swatchContainer from '@js/ui/widget/swatch_container'; import type { EditorFactory } from '@ts/grids/grid_core/editor_factory/m_editor_factory'; import type { ModuleType } from '@ts/grids/grid_core/m_types'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_controller.ts b/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_controller.ts index 1512ba48ea41..ce924bf71a0e 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_controller.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_controller.ts @@ -1,4 +1,6 @@ /* eslint-disable @typescript-eslint/method-signature-style */ +import ArrayStore from '@js/common/data/array_store'; +import { CustomStore } from '@js/common/data/custom_store'; import $ from '@js/core/renderer'; import { findChanges } from '@js/core/utils/array_compare'; import { deferRender, equalByValue } from '@js/core/utils/common'; @@ -6,8 +8,6 @@ import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { isDefined, isObject } from '@js/core/utils/type'; -import ArrayStore from '@js/data/array_store'; -import CustomStore from '@js/data/custom_store'; import errors from '@js/ui/widget/ui.errors'; import type { EditingController } from '@ts/grids/grid_core/editing/m_editing'; import type { EditorFactory } from '@ts/grids/grid_core/editor_factory/m_editor_factory'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_helper_mixin.ts b/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_helper_mixin.ts index 50c95f81ed83..b05b335e9fdd 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_helper_mixin.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/data_controller/m_data_helper_mixin.ts @@ -1,6 +1,6 @@ +import { DataSource } from '@js/common/data/data_source/data_source'; +import { normalizeDataSourceOptions } from '@js/common/data/data_source/utils'; import { extend } from '@js/core/utils/extend'; -import { DataSource } from '@js/data/data_source/data_source'; -import { normalizeDataSourceOptions } from '@js/data/data_source/utils'; import DataController from '@ts/ui/collection/m_data_controller'; import type { Controller } from '../m_modules'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/m_data_source_adapter.ts b/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/m_data_source_adapter.ts index abc0466823e5..3b6c735dcb9a 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/m_data_source_adapter.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/data_source_adapter/m_data_source_adapter.ts @@ -1,12 +1,12 @@ /* eslint-disable @typescript-eslint/no-dynamic-delete */ +import ArrayStore from '@js/common/data/array_store'; +import { applyBatch } from '@js/common/data/array_utils'; import Callbacks from '@js/core/utils/callbacks'; import { getKeyHash } from '@js/core/utils/common'; import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { isDefined, isFunction, isPlainObject } from '@js/core/utils/type'; -import ArrayStore from '@js/data/array_store'; -import { applyBatch } from '@js/data/array_utils'; import modules from '../m_modules'; import gridCoreUtils from '../m_utils'; @@ -529,7 +529,6 @@ export default class DataSourceAdapter extends modules.Controller { options.data = this._cachedStoreData = this._cachedStoreData.concat(options.data); } } - // @ts-expect-error new ArrayStore(options.data).load(loadOptions).done((data) => { options.data = data; if (needStoreCache) { diff --git a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts index a8a4617bc2aa..f2b311cfa752 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing.ts @@ -1,4 +1,11 @@ /* eslint-disable @typescript-eslint/no-unused-vars, max-classes-per-file */ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import pointerEvents from '@js/common/core/events/pointer'; +import { removeEvent } from '@js/common/core/events/remove'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; +import { createObjectWithChanges } from '@js/common/data/array_utils'; import type { GridsEditMode } from '@js/common/grids'; import devices from '@js/core/devices'; import domAdapter from '@js/core/dom_adapter'; @@ -17,13 +24,6 @@ import { isDefined, isEmptyObject, isFunction, isObject, } from '@js/core/utils/type'; -import { createObjectWithChanges } from '@js/data/array_utils'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import pointerEvents from '@js/events/pointer'; -import { removeEvent } from '@js/events/remove'; -import { addNamespace } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import { confirm } from '@js/ui/dialog'; import { current, isFluent } from '@js/ui/themes'; import domUtils from '@ts/core/utils/m_dom'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_cell_based.ts b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_cell_based.ts index ce2c2a1936c0..f6a407840b87 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_cell_based.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_cell_based.ts @@ -1,4 +1,10 @@ /* eslint-disable max-classes-per-file */ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import holdEvent from '@js/common/core/events/hold'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import { createObjectWithChanges } from '@js/common/data/array_utils'; import domAdapter from '@js/core/dom_adapter'; import $ from '@js/core/renderer'; import { deferRender } from '@js/core/utils/common'; @@ -6,12 +12,6 @@ import type { DeferredObj } from '@js/core/utils/deferred'; import { Deferred, when } from '@js/core/utils/deferred'; import { isElementInDom } from '@js/core/utils/dom'; import { isDefined, isString } from '@js/core/utils/type'; -import { createObjectWithChanges } from '@js/data/array_utils'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import holdEvent from '@js/events/hold'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace } from '@js/events/utils/index'; import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/m_header_panel'; import type { RowsView } from '@ts/grids/grid_core/views/m_rows_view'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_form_based.ts b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_form_based.ts index 640d8e1c773c..05a530e0f618 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_form_based.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/editing/m_editing_form_based.ts @@ -1,4 +1,6 @@ /* eslint-disable max-classes-per-file */ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { removeEvent } from '@js/common/core/events/remove'; import devices from '@js/core/devices'; import Guid from '@js/core/guid'; import type { dxElementWrapper } from '@js/core/renderer'; @@ -9,8 +11,6 @@ import { isElementInDom } from '@js/core/utils/dom'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { isDefined, isString } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { removeEvent } from '@js/events/remove'; import Button from '@js/ui/button'; import Form from '@js/ui/form'; import Popup from '@js/ui/popup/ui.popup'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/editor_factory/m_editor_factory.ts b/packages/devextreme/js/__internal/grids/grid_core/editor_factory/m_editor_factory.ts index 3eb1bf61695e..61c2c2ec7a26 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/editor_factory/m_editor_factory.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/editor_factory/m_editor_factory.ts @@ -1,5 +1,9 @@ /* eslint-disable @typescript-eslint/method-signature-style */ -import positionUtils from '@js/animation/position'; +import positionUtils from '@js/common/core/animation/position'; +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace, normalizeKeyName } from '@js/common/core/events/utils/index'; import domAdapter from '@js/core/dom_adapter'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; @@ -10,10 +14,6 @@ import { getOuterHeight, getOuterWidth, setOuterHeight, setOuterWidth, } from '@js/core/utils/size'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace, normalizeKeyName } from '@js/events/utils/index'; import EditorFactoryMixin from '@js/ui/shared/ui.editor_factory_mixin'; import type { ColumnsResizerViewController, @@ -194,7 +194,6 @@ export class EditorFactory extends ViewControllerWithMixin { protected updateFocusOverlaySize($element, position): void { $element.hide(); - // @ts-expect-error const location = positionUtils.calculate($element, extend({ collision: 'fit' }, position)); if (location.h.oversize > 0) { @@ -254,7 +253,6 @@ export class EditorFactory extends ViewControllerWithMixin { }; this.updateFocusOverlaySize(this._$focusOverlay, focusOverlayPosition); - // @ts-expect-error positionUtils.setup(this._$focusOverlay, focusOverlayPosition); this._$focusOverlay.css('visibility', 'visible'); // for ios diff --git a/packages/devextreme/js/__internal/grids/grid_core/error_handling/m_error_handling.ts b/packages/devextreme/js/__internal/grids/grid_core/error_handling/m_error_handling.ts index e3130f6ba24f..d73f533a203c 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/error_handling/m_error_handling.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/error_handling/m_error_handling.ts @@ -1,9 +1,9 @@ /* eslint-disable max-classes-per-file */ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { each } from '@js/core/utils/iterator'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import messageLocalization from '@js/localization/message'; import type { ColumnsController } from '@ts/grids/grid_core/columns_controller/m_columns_controller'; import type { ResizingController } from '@ts/grids/grid_core/views/m_grid_view'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_builder.ts b/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_builder.ts index da01a1164d22..ba331eaf8860 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_builder.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_builder.ts @@ -1,6 +1,6 @@ +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; -import messageLocalization from '@js/localization/message'; import FilterBuilder from '@js/ui/filter_builder'; import Popup from '@js/ui/popup/ui.popup'; import ScrollView from '@js/ui/scroll_view'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_custom_operations.ts b/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_custom_operations.ts index b852a5466d81..9a64587d5845 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_custom_operations.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_custom_operations.ts @@ -1,8 +1,8 @@ +import messageLocalization from '@js/common/core/localization/message'; +import { DataSource } from '@js/common/data/data_source/data_source'; import $ from '@js/core/renderer'; import { Deferred } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; -import { DataSource } from '@js/data/data_source/data_source'; -import messageLocalization from '@js/localization/message'; import errors from '@js/ui/widget/ui.errors'; import { getFilterExpression, isCondition, isGroup, renderValueText, diff --git a/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_panel.tsx b/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_panel.tsx index 1e658b6ac84f..690a9c2d645a 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_panel.tsx +++ b/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_panel.tsx @@ -1,7 +1,8 @@ /* eslint-disable max-classes-per-file */ +import messageLocalization from '@js/common/core/localization/message'; +import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import { isDefined } from '@js/core/utils/type'; -import messageLocalization from '@js/localization/message'; import inflector from '@ts/core/utils/m_inflector'; import { getCaptionByOperation, getCurrentLookupValueText, getCurrentValueText, diff --git a/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_row.ts b/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_row.ts index 55bc1642dd67..496779c3de95 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_row.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/filter/m_filter_row.ts @@ -1,13 +1,13 @@ /* eslint-disable max-classes-per-file */ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { normalizeKeyName } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { equalByValue } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; import { each, map } from '@js/core/utils/iterator'; import { getOuterWidth } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { normalizeKeyName } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import Editor from '@js/ui/editor/editor'; import Menu from '@js/ui/menu'; import Overlay from '@js/ui/overlay/ui.overlay'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter.ts b/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter.ts index 8e93098c9c74..9701c24a428c 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter.ts @@ -1,17 +1,17 @@ /* eslint-disable max-classes-per-file */ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import dateLocalization from '@js/common/core/localization/date'; +import messageLocalization from '@js/common/core/localization/message'; +import { normalizeDataSourceOptions } from '@js/common/data/data_source/utils'; +import dataQuery from '@js/common/data/query'; +import storeHelper from '@js/common/data/store_helper'; import { compileGetter } from '@js/core/utils/data'; import { Deferred } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { getDefaultAlignment } from '@js/core/utils/position'; import { isDefined, isFunction, isObject } from '@js/core/utils/type'; -import { normalizeDataSourceOptions } from '@js/data/data_source/utils'; -import dataQuery from '@js/data/query'; -import storeHelper from '@js/data/store_helper'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import dateLocalization from '@js/localization/date'; -import messageLocalization from '@js/localization/message'; import { restoreFocus, saveFocusedElementInfo } from '@js/ui/shared/accessibility'; import filterUtils from '@js/ui/shared/filtering'; import type { ColumnHeadersView } from '@ts/grids/grid_core/column_headers/m_column_headers'; @@ -62,6 +62,7 @@ function ungroupUTCDates(items, dateParts?, dates?) { function convertDataFromUTCToLocal(data, column) { const dates = ungroupUTCDates(data); + // @ts-expect-error const query = dataQuery(dates); const group = gridCoreUtils.getHeaderFilterGroupParameters({ ...column, diff --git a/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter_core.ts b/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter_core.ts index 56b1eed01234..4eaa86385eb8 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter_core.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/header_filter/m_header_filter_core.ts @@ -2,11 +2,11 @@ import '@ts/ui/list/modules/m_search'; import '@ts/ui/list/modules/m_selection'; +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { isDefined, isFunction } from '@js/core/utils/type'; -import messageLocalization from '@js/localization/message'; import List from '@js/ui/list_light'; import Popup from '@js/ui/popup/ui.popup'; import TreeView from '@js/ui/tree_view'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/header_panel/m_header_panel.ts b/packages/devextreme/js/__internal/grids/grid_core/header_panel/m_header_panel.ts index 9a0565cb7b7d..b89733dfe7f3 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/header_panel/m_header_panel.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/header_panel/m_header_panel.ts @@ -1,9 +1,9 @@ /* eslint-disable max-classes-per-file */ +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { getPathParts } from '@js/core/utils/data'; import { extend } from '@js/core/utils/extend'; import { isDefined, isString } from '@js/core/utils/type'; -import messageLocalization from '@js/localization/message'; import type { Properties as ToolbarProperties } from '@js/ui/toolbar'; import Toolbar from '@js/ui/toolbar'; import type { EditingController } from '@ts/grids/grid_core/editing/m_editing'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_keyboard_navigation.ts b/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_keyboard_navigation.ts index a7b43ddb972c..aca95231433f 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_keyboard_navigation.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/keyboard_navigation/m_keyboard_navigation.ts @@ -1,4 +1,13 @@ /* eslint-disable max-classes-per-file */ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import pointerEvents from '@js/common/core/events/pointer'; +import { keyboard } from '@js/common/core/events/short'; +import { + addNamespace, + createEvent, + isCommandKeyPressed, +} from '@js/common/core/events/utils/index'; import { noop } from '@js/core//utils/common'; import domAdapter from '@js/core/dom_adapter'; import { getPublicElement } from '@js/core/element'; @@ -13,15 +22,6 @@ import { getWidth, } from '@js/core/utils/size'; import { isDeferred, isDefined, isEmptyObject } from '@js/core/utils/type'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import pointerEvents from '@js/events/pointer'; -import { keyboard } from '@js/events/short'; -import { - addNamespace, - createEvent, - isCommandKeyPressed, -} from '@js/events/utils/index'; import * as accessibility from '@js/ui/shared/accessibility'; import { focused } from '@js/ui/widget/selectors'; import type { AdaptiveColumnsController } from '@ts/grids/grid_core/adaptivity/m_adaptivity'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/m_modules.ts b/packages/devextreme/js/__internal/grids/grid_core/m_modules.ts index f5d352d81686..16c78be9799d 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/m_modules.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/m_modules.ts @@ -2,6 +2,7 @@ /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */ /* eslint-disable max-classes-per-file */ /* eslint-disable @typescript-eslint/method-signature-style */ +import messageLocalization from '@js/common/core/localization/message'; import type { Component } from '@js/core/component'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; @@ -11,7 +12,6 @@ import { grep } from '@js/core/utils/common'; import { each } from '@js/core/utils/iterator'; import { isFunction } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import messageLocalization from '@js/localization/message'; import errors from '@js/ui/widget/ui.errors'; import { DIContext } from '@ts/core/di/index'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/m_utils.ts b/packages/devextreme/js/__internal/grids/grid_core/m_utils.ts index ed1b02a6e6f8..8b3916fd8a25 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/m_utils.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/m_utils.ts @@ -1,5 +1,9 @@ // @ts-check +import eventsEngine from '@js/common/core/events/core/events_engine'; +import DataSource from '@js/common/data/data_source'; +import { normalizeDataSourceOptions } from '@js/common/data/data_source/utils'; +import { normalizeSortingInfo as normalizeSortingInfoUtility } from '@js/common/data/utils'; import $ from '@js/core/renderer'; import { equalByValue } from '@js/core/utils/common'; import { toComparable } from '@js/core/utils/data'; @@ -12,11 +16,6 @@ import { format } from '@js/core/utils/string'; import { isDefined, isFunction, isString } from '@js/core/utils/type'; import variableWrapper from '@js/core/utils/variable_wrapper'; import { getWindow } from '@js/core/utils/window'; -import { DataSource } from '@js/data/data_source/data_source'; -import { normalizeDataSourceOptions } from '@js/data/data_source/utils'; -// @ts-expect-error -import { normalizeSortingInfo as normalizeSortingInfoUtility } from '@js/data/utils'; -import eventsEngine from '@js/events/core/events_engine'; import formatHelper from '@js/format_helper'; import LoadPanel from '@js/ui/load_panel'; import sharedFiltering from '@js/ui/shared/filtering'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/master_detail/m_master_detail.ts b/packages/devextreme/js/__internal/grids/grid_core/master_detail/m_master_detail.ts index b8c03fb566b3..abfb08354af7 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/master_detail/m_master_detail.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/master_detail/m_master_detail.ts @@ -1,4 +1,5 @@ /* eslint-disable max-classes-per-file */ +import messageLocalization from '@js/common/core/localization/message'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; // @ts-expect-error @@ -7,7 +8,6 @@ import { Deferred, when } from '@js/core/utils/deferred'; import { each } from '@js/core/utils/iterator'; import { getHeight, getWidth } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; -import messageLocalization from '@js/localization/message'; import type { ColumnsController } from '@ts/grids/grid_core/columns_controller/m_columns_controller'; import type { DataController } from '@ts/grids/grid_core/data_controller/m_data_controller'; import type { ModuleType } from '@ts/grids/grid_core/m_types'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/pager/m_pager.ts b/packages/devextreme/js/__internal/grids/grid_core/pager/m_pager.ts index 7170204ec4b7..b372da09ccdd 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/pager/m_pager.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/pager/m_pager.ts @@ -1,6 +1,6 @@ +import messageLocalization from '@js/common/core/localization/message'; import { isDefined } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import messageLocalization from '@js/localization/message'; import Pagination from '@ts/pagination/wrappers/pagination'; import { View } from '../m_modules'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/search/m_search.ts b/packages/devextreme/js/__internal/grids/grid_core/search/m_search.ts index f88bd74c25cc..bf39e10ba154 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/search/m_search.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/search/m_search.ts @@ -1,10 +1,10 @@ /* eslint-disable max-classes-per-file */ /* eslint-disable @typescript-eslint/method-signature-style */ +import messageLocalization from '@js/common/core/localization/message'; +import dataQuery from '@js/common/data/query'; import domAdapter from '@js/core/dom_adapter'; import $ from '@js/core/renderer'; import { compileGetter, toComparable } from '@js/core/utils/data'; -import dataQuery from '@js/data/query'; -import messageLocalization from '@js/localization/message'; import type { Column } from '../columns_controller/m_columns_controller'; import type { DataController, Filter } from '../data_controller/m_data_controller'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/selection/m_selection.ts b/packages/devextreme/js/__internal/grids/grid_core/selection/m_selection.ts index f285d250cc38..0c91b098fa77 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/selection/m_selection.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/selection/m_selection.ts @@ -1,4 +1,10 @@ /* eslint-disable max-classes-per-file */ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import holdEvent from '@js/common/core/events/hold'; +import { addNamespace, isCommandKeyPressed } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; +import { applyBatch } from '@js/common/data/array_utils'; import $ from '@js/core/renderer'; import { equalByValue } from '@js/core/utils/common'; import type { DeferredObj } from '@js/core/utils/deferred'; @@ -6,12 +12,6 @@ import { Deferred } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { isDefined } from '@js/core/utils/type'; -import { applyBatch } from '@js/data/array_utils'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import holdEvent from '@js/events/hold'; -import { addNamespace, isCommandKeyPressed } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import errors from '@js/ui/widget/ui.errors'; import supportUtils from '@ts/core/utils/m_support'; import type { ColumnHeadersView } from '@ts/grids/grid_core/column_headers/m_column_headers'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/sorting/m_sorting.ts b/packages/devextreme/js/__internal/grids/grid_core/sorting/m_sorting.ts index 9bdd1b6867c7..a9c53b297c68 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/sorting/m_sorting.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/sorting/m_sorting.ts @@ -1,10 +1,10 @@ /* eslint-disable max-classes-per-file */ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace, isCommandKeyPressed } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { isDefined } from '@js/core/utils/type'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace, isCommandKeyPressed } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import type { ColumnHeadersView } from '@ts/grids/grid_core/column_headers/m_column_headers'; import type { HeaderPanel } from '@ts/grids/grid_core/header_panel/m_header_panel'; import type { ModuleType } from '@ts/grids/grid_core/m_types'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/sorting/m_sorting_mixin.ts b/packages/devextreme/js/__internal/grids/grid_core/sorting/m_sorting_mixin.ts index 089620c6a2db..6e47646043a8 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/sorting/m_sorting_mixin.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/sorting/m_sorting_mixin.ts @@ -1,6 +1,6 @@ +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { isDefined } from '@js/core/utils/type'; -import messageLocalization from '@js/localization/message'; import type { ModuleType } from '@ts/grids/grid_core/m_types'; const SORT_CLASS = 'dx-sort'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/state_storing/m_state_storing_core.ts b/packages/devextreme/js/__internal/grids/grid_core/state_storing/m_state_storing_core.ts index 62a492635cf6..81e653e05061 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/state_storing/m_state_storing_core.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/state_storing/m_state_storing_core.ts @@ -1,3 +1,4 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; // @ts-expect-error import { fromPromise } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; @@ -5,7 +6,6 @@ import { each } from '@js/core/utils/iterator'; import { sessionStorage } from '@js/core/utils/storage'; import { isDefined, isEmptyObject, isPlainObject } from '@js/core/utils/type'; import { getWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; import errors from '@js/ui/widget/ui.errors'; import type { ExportController } from '@ts/grids/data_grid/export/m_export'; import type { ColumnsController } from '@ts/grids/grid_core/columns_controller/m_columns_controller'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/validating/m_validating.ts b/packages/devextreme/js/__internal/grids/grid_core/validating/m_validating.ts index 80fc4a699287..4297f34c398c 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/validating/m_validating.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/validating/m_validating.ts @@ -1,5 +1,9 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ /* eslint-disable max-classes-per-file */ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import pointerEvents from '@js/common/core/events/pointer'; +import messageLocalization from '@js/common/core/localization/message'; +import { createObjectWithChanges } from '@js/common/data/array_utils'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import browser from '@js/core/utils/browser'; @@ -14,10 +18,6 @@ import { } from '@js/core/utils/size'; import { encodeHtml } from '@js/core/utils/string'; import { isDefined, isEmptyObject, isObject } from '@js/core/utils/type'; -import { createObjectWithChanges } from '@js/data/array_utils'; -import eventsEngine from '@js/events/core/events_engine'; -import pointerEvents from '@js/events/pointer'; -import messageLocalization from '@js/localization/message'; import Button from '@js/ui/button'; import LoadIndicator from '@js/ui/load_indicator'; import Overlay from '@js/ui/overlay/ui.overlay'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/views/m_columns_view.ts b/packages/devextreme/js/__internal/grids/grid_core/views/m_columns_view.ts index 29b39673635f..b5501429c804 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/views/m_columns_view.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/views/m_columns_view.ts @@ -1,4 +1,9 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { name as dblclickEvent } from '@js/common/core/events/double_click'; +import pointerEvents from '@js/common/core/events/pointer'; +import { removeEvent } from '@js/common/core/events/remove'; import domAdapter from '@js/core/dom_adapter'; import { getPublicElement } from '@js/core/element'; import { data as elementData } from '@js/core/element_data'; @@ -21,11 +26,6 @@ import { isRenderer, isString, } from '@js/core/utils/type'; import { getWindow, hasWindow } from '@js/core/utils/window'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { name as dblclickEvent } from '@js/events/double_click'; -import pointerEvents from '@js/events/pointer'; -import { removeEvent } from '@js/events/remove'; import supportUtils from '@ts/core/utils/m_support'; import type { AdaptiveColumnsController } from '@ts/grids/grid_core/adaptivity/m_adaptivity'; import type { ColumnChooserController, ColumnChooserView } from '@ts/grids/grid_core/column_chooser/m_column_chooser'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/views/m_grid_view.ts b/packages/devextreme/js/__internal/grids/grid_core/views/m_grid_view.ts index 85818fb3a0ef..738fcdf312b7 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/views/m_grid_view.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/views/m_grid_view.ts @@ -1,4 +1,5 @@ /* eslint-disable max-classes-per-file */ +import messageLocalization from '@js/common/core/localization/message'; import domAdapter from '@js/core/dom_adapter'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; @@ -11,7 +12,6 @@ import { getBoundingRect } from '@js/core/utils/position'; import { getHeight, getWidth } from '@js/core/utils/size'; import { isDefined, isNumeric, isString } from '@js/core/utils/type'; import { getWindow, hasWindow } from '@js/core/utils/window'; -import messageLocalization from '@js/localization/message'; import * as accessibility from '@js/ui/shared/accessibility'; import type { EditorFactory } from '@ts/grids/grid_core/editor_factory/m_editor_factory'; import { A11yStatusContainerComponent } from '@ts/grids/grid_core/views/a11y_status_container_component'; diff --git a/packages/devextreme/js/__internal/grids/grid_core/views/m_rows_view.ts b/packages/devextreme/js/__internal/grids/grid_core/views/m_rows_view.ts index 4fead939fd26..58645a2fb7e5 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/views/m_rows_view.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/views/m_rows_view.ts @@ -1,5 +1,8 @@ /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */ /* eslint-disable @typescript-eslint/no-unused-vars */ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { removeEvent } from '@js/common/core/events/remove'; +import messageLocalization from '@js/common/core/localization/message'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import browser from '@js/core/utils/browser'; @@ -13,9 +16,6 @@ import { isEmpty } from '@js/core/utils/string'; import { setHeight } from '@js/core/utils/style'; import { isDefined, isNumeric, isString } from '@js/core/utils/type'; import { getWindow, hasWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import { removeEvent } from '@js/events/remove'; -import messageLocalization from '@js/localization/message'; import Scrollable from '@js/ui/scroll_view/ui.scrollable'; import type { ColumnHeadersView } from '@ts/grids/grid_core/column_headers/m_column_headers'; import type { diff --git a/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling_core.ts b/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling_core.ts index 94c528bfed7f..6126c458ccc9 100644 --- a/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling_core.ts +++ b/packages/devextreme/js/__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling_core.ts @@ -1,4 +1,5 @@ -import positionUtils from '@js/animation/position'; +import positionUtils from '@js/common/core/animation/position'; +import eventsEngine from '@js/common/core/events/core/events_engine'; import $ from '@js/core/renderer'; import browser from '@js/core/utils/browser'; import Callbacks from '@js/core/utils/callbacks'; @@ -6,7 +7,6 @@ import { Deferred } from '@js/core/utils/deferred'; import { each } from '@js/core/utils/iterator'; import { isDefined } from '@js/core/utils/type'; import { getWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; import gridCoreUtils from '../m_utils'; import { VirtualDataLoader } from '../virtual_data_loader/m_virtual_data_loader'; @@ -27,7 +27,6 @@ function subscribeToExternalScrollers($element, scrollChangedHandler, $targetEle function getElementOffset(scrollable) { const $scrollableElement = scrollable.element ? scrollable.$element() : scrollable; - // @ts-expect-error const scrollableOffset = positionUtils.offset($scrollableElement); if (!scrollableOffset) { diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/data_source/m_data_source.ts b/packages/devextreme/js/__internal/grids/pivot_grid/data_source/m_data_source.ts index e918861e9f53..ce4da7a1481d 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/data_source/m_data_source.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/data_source/m_data_source.ts @@ -1,3 +1,4 @@ +import { normalizeDataSourceOptions } from '@js/common/data/data_source/utils'; import Class from '@js/core/class'; import { EventsStrategy } from '@js/core/events_strategy'; import { normalizeIndexes } from '@js/core/utils/array'; @@ -9,7 +10,6 @@ import { isString, } from '@js/core/utils/type'; import Store from '@js/data/abstract_store'; -import { normalizeDataSourceOptions } from '@js/data/data_source/utils'; import commonUtils from '@ts/core/utils/m_common'; import inflector from '@ts/core/utils/m_inflector'; diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/export/m_export.ts b/packages/devextreme/js/__internal/grids/pivot_grid/export/m_export.ts index 2eb856688eaa..62779c70e2be 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/export/m_export.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/export/m_export.ts @@ -1,3 +1,4 @@ +import localizationNumber from '@js/common/core/localization/number'; import Class from '@js/core/class'; import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; @@ -6,7 +7,6 @@ import { getDefaultAlignment } from '@js/core/utils/position'; import { isDefined, isFunction } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; import formatHelper from '@js/format_helper'; -import localizationNumber from '@js/localization/number'; import { prepareItems } from '@ts/grids/grid_core/m_export'; const DEFAULT_DATA_TYPE = 'string'; diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser.ts b/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser.ts index 8de13c1f0cf1..91a449e64ae4 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser.ts @@ -1,5 +1,6 @@ import '../data_source/m_data_source'; +import localizationMessage from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; @@ -7,7 +8,6 @@ import { getImageContainer } from '@js/core/utils/icon'; import { each } from '@js/core/utils/iterator'; import { isDefined } from '@js/core/utils/type'; import { hasWindow as hasWindowFn } from '@js/core/utils/window'; -import localizationMessage from '@js/localization/message'; import ContextMenu from '@js/ui/context_menu'; import TreeView from '@js/ui/tree_view'; diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser_base.ts b/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser_base.ts index f5529b5637a7..ff723ee78737 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser_base.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/field_chooser/m_field_chooser_base.ts @@ -1,14 +1,14 @@ /* eslint-disable max-classes-per-file */ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import localizationMessage from '@js/common/core/localization/message'; +import ArrayStore from '@js/common/data/array_store'; import registerComponent from '@js/core/component_registrator'; import $ from '@js/core/renderer'; import { Deferred } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { each, map } from '@js/core/utils/iterator'; import { isDefined } from '@js/core/utils/type'; -import ArrayStore from '@js/data/array_store'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import localizationMessage from '@js/localization/message'; import Widget from '@js/ui/widget/ui.widget'; import columnStateMixin from '@ts/grids/grid_core/column_state_mixin/m_column_state_mixin'; import { diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/local_store/m_local_store.ts b/packages/devextreme/js/__internal/grids/pivot_grid/local_store/m_local_store.ts index 8bf174c771ab..174166bf6091 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/local_store/m_local_store.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/local_store/m_local_store.ts @@ -1,3 +1,9 @@ +import ArrayStore from '@js/common/data/array_store'; +import { CustomStore } from '@js/common/data/custom_store'; +import { DataSource } from '@js/common/data/data_source/data_source'; +import dataQuery from '@js/common/data/query'; +// eslint-disable-next-line import/extensions +import { aggregators } from '@js/common/data/utils'; import Class from '@js/core/class'; import { noop } from '@js/core/utils/common'; import { compileGetter, toComparable } from '@js/core/utils/data'; @@ -5,13 +11,6 @@ import dateSerialization from '@js/core/utils/date_serialization'; import { Deferred, when } from '@js/core/utils/deferred'; import { each } from '@js/core/utils/iterator'; import { isDefined, isNumeric, isString } from '@js/core/utils/type'; -import ArrayStore from '@js/data/array_store'; -import CustomStore from '@js/data/custom_store'; -import { DataSource } from '@js/data/data_source/data_source'; -import dataQuery from '@js/data/query'; -// eslint-disable-next-line import/extensions -// @ts-expect-error -import { aggregators } from '@js/data/utils'; import { discoverObjectFields, @@ -425,6 +424,7 @@ const LocalStore = Class.inherit((function () { if (dataSource.store() instanceof CustomStore && filter) { filter = processFilter(filter, fieldSelectors); + // @ts-expect-error return dataQuery(dataSource.items()).filter(filter).toArray(); } diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/m_widget.ts b/packages/devextreme/js/__internal/grids/pivot_grid/m_widget.ts index 3253b006ca7a..903711ff9f93 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/m_widget.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/m_widget.ts @@ -1,3 +1,7 @@ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import localizationMessage from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import { getPublicElement } from '@js/core/element'; import $ from '@js/core/renderer'; @@ -12,10 +16,6 @@ import { import { format as formatString } from '@js/core/utils/string'; import { isDefined } from '@js/core/utils/type'; import { getWindow, hasWindow } from '@js/core/utils/window'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; -import localizationMessage from '@js/localization/message'; import type { Properties } from '@js/ui/button'; import Button from '@js/ui/button'; import ContextMenu from '@js/ui/context_menu'; diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/m_widget_utils.ts b/packages/devextreme/js/__internal/grids/pivot_grid/m_widget_utils.ts index 697ddbd57e77..45ecb4607f9f 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/m_widget_utils.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/m_widget_utils.ts @@ -1,3 +1,6 @@ +import localizationDate from '@js/common/core/localization/date'; +import ArrayStore from '@js/common/data/array_store'; +import { DataSource } from '@js/common/data/data_source/data_source'; import domAdapter from '@js/core/dom_adapter'; import coreAjaxUtils from '@js/core/utils/ajax'; import callOnce from '@js/core/utils/call_once'; @@ -6,10 +9,7 @@ import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { each, map } from '@js/core/utils/iterator'; import { isDefined, isNumeric, type } from '@js/core/utils/type'; -import ArrayStore from '@js/data/array_store'; -import { DataSource } from '@js/data/data_source/data_source'; import formatHelper from '@js/format_helper'; -import localizationDate from '@js/localization/date'; import { CLASSES } from './const'; diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/remote_store/m_remote_store.ts b/packages/devextreme/js/__internal/grids/pivot_grid/remote_store/m_remote_store.ts index 6e480b6e7a35..2ad0119a8873 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/remote_store/m_remote_store.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/remote_store/m_remote_store.ts @@ -1,11 +1,11 @@ +import { DataSource } from '@js/common/data/data_source/data_source'; +import { normalizeLoadResult } from '@js/common/data/data_source/utils'; import Class from '@js/core/class'; import dateSerialization from '@js/core/utils/date_serialization'; import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { isDefined, isString } from '@js/core/utils/type'; -import { DataSource } from '@js/data/data_source/data_source'; -import { normalizeLoadResult } from '@js/data/data_source/utils'; import pivotGridUtils, { capitalizeFirstLetter, diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/sortable/m_sortable.ts b/packages/devextreme/js/__internal/grids/pivot_grid/sortable/m_sortable.ts index 9b2599eb8b60..b8d8acbac108 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/sortable/m_sortable.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/sortable/m_sortable.ts @@ -1,3 +1,13 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { + drop as dragEventDrop, + end as dragEventEnd, + enter as dragEventEnter, + leave as dragEventLeave, + move as dragEventMove, + start as dragEventStart, +} from '@js/common/core/events/drag'; +import { addNamespace } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import domAdapter from '@js/core/dom_adapter'; import DOMComponent from '@js/core/dom_component'; @@ -9,16 +19,6 @@ import { setWidth, } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { - drop as dragEventDrop, - end as dragEventEnd, - enter as dragEventEnter, - leave as dragEventLeave, - move as dragEventMove, - start as dragEventStart, -} from '@js/events/drag'; -import { addNamespace } from '@js/events/utils/index'; import swatchContainer from '@js/ui/widget/swatch_container'; const { getSwatchContainer } = swatchContainer; diff --git a/packages/devextreme/js/__internal/grids/pivot_grid/xmla_store/m_xmla_store.ts b/packages/devextreme/js/__internal/grids/pivot_grid/xmla_store/m_xmla_store.ts index 0c169ba4ca76..fffca92b9638 100644 --- a/packages/devextreme/js/__internal/grids/pivot_grid/xmla_store/m_xmla_store.ts +++ b/packages/devextreme/js/__internal/grids/pivot_grid/xmla_store/m_xmla_store.ts @@ -1,3 +1,5 @@ +import { getLanguageId } from '@js/common/core/localization/language_codes'; +import { errors } from '@js/common/data/errors'; import Class from '@js/core/class'; import $ from '@js/core/renderer'; import { noop } from '@js/core/utils/common'; @@ -9,9 +11,6 @@ import { isDefined, isFunction, isNumeric, isString, } from '@js/core/utils/type'; import { getWindow } from '@js/core/utils/window'; -// @ts-expect-error -import { errors } from '@js/data/errors'; -import { getLanguageId } from '@js/localization/language_codes'; import pivotGridUtils, { foreachTree, @@ -70,7 +69,7 @@ const XmlaStore = Class.inherit((function () { xml = undefined; } if (!xml || xml.getElementsByTagName('parsererror').length || xml.childNodes.length === 0) { - throw new errors.Error('E4023', text); + throw errors.Error('E4023', text); } } catch (e: any) { deferred.reject({ @@ -833,7 +832,7 @@ const XmlaStore = Class.inherit((function () { if (errorElement.length) { const description = errorElement.attr('Description'); - const error = new errors.Error('E4000', description); + const error = errors.Error('E4000', description); errors.log('E4000', description); return error; } diff --git a/packages/devextreme/js/__internal/grids/tree_list/data_source_adapter/m_data_source_adapter.ts b/packages/devextreme/js/__internal/grids/tree_list/data_source_adapter/m_data_source_adapter.ts index 68c1d7fef938..edb94858ebfa 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/data_source_adapter/m_data_source_adapter.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/data_source_adapter/m_data_source_adapter.ts @@ -1,13 +1,13 @@ +import ArrayStore from '@js/common/data/array_store'; +import { createObjectWithChanges } from '@js/common/data/array_utils'; +import query from '@js/common/data/query'; +import storeHelper from '@js/common/data/store_helper'; import { equalByValue } from '@js/core/utils/common'; import { compileGetter, compileSetter } from '@js/core/utils/data'; import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { isDefined, isFunction } from '@js/core/utils/type'; -import ArrayStore from '@js/data/array_store'; -import { createObjectWithChanges } from '@js/data/array_utils'; -import query from '@js/data/query'; -import storeHelper from '@js/data/store_helper'; import errors from '@js/ui/widget/ui.errors'; import DataSourceAdapter from '@ts/grids/grid_core/data_source_adapter/m_data_source_adapter'; import gridCoreUtils from '@ts/grids/grid_core/m_utils'; @@ -36,6 +36,7 @@ const getChildKeys = function (that, keys) { // @ts-expect-error const applySorting = (data: any[], sort: any): any => queryByOptions( + // @ts-expect-error query(data), { sort, @@ -436,6 +437,7 @@ class DataSourceAdapterTreeList extends DataSourceAdapter { this.loadFromStore(loadOptions, store).done((loadedData) => { if (loadedData.length) { if (needLocalFiltering) { + // @ts-expect-error loadedData = query(loadedData).filter(filter).toArray(); } this._loadParentsOrChildren(concatLoadedData(loadedData), options, needChildren).done(d.resolve).fail(d.reject); diff --git a/packages/devextreme/js/__internal/grids/tree_list/editing/m_editing.ts b/packages/devextreme/js/__internal/grids/tree_list/editing/m_editing.ts index 2bf1d2d645c0..3473089fbc3a 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/editing/m_editing.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/editing/m_editing.ts @@ -1,11 +1,11 @@ /* eslint-disable max-classes-per-file */ import '../module_not_extended/editor_factory'; +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { Deferred } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { isDefined } from '@js/core/utils/type'; -import messageLocalization from '@js/localization/message'; import errors from '@js/ui/widget/ui.errors'; import type { DataController } from '@ts/grids/grid_core/data_controller/m_data_controller'; import { dataControllerEditingExtenderMixin, editingModule } from '@ts/grids/grid_core/editing/m_editing'; diff --git a/packages/devextreme/js/__internal/grids/tree_list/rows/m_rows.ts b/packages/devextreme/js/__internal/grids/tree_list/rows/m_rows.ts index 359bad272b51..d6dee9e48511 100644 --- a/packages/devextreme/js/__internal/grids/tree_list/rows/m_rows.ts +++ b/packages/devextreme/js/__internal/grids/tree_list/rows/m_rows.ts @@ -1,7 +1,7 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { removeEvent } from '@js/common/core/events/remove'; import $ from '@js/core/renderer'; import { isDefined } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { removeEvent } from '@js/events/remove'; import { rowsModule, RowsView } from '@ts/grids/grid_core/views/m_rows_view'; import treeListCore from '../m_core'; diff --git a/packages/devextreme/js/__internal/m_draggable.ts b/packages/devextreme/js/__internal/m_draggable.ts index 0b9dddc299f6..effe2a324beb 100644 --- a/packages/devextreme/js/__internal/m_draggable.ts +++ b/packages/devextreme/js/__internal/m_draggable.ts @@ -1,5 +1,15 @@ -import positionUtils from '@js/animation/position'; -import { locate, move } from '@js/animation/translator'; +import positionUtils from '@js/common/core/animation/position'; +import { locate, move } from '@js/common/core/animation/translator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { + end as dragEventEnd, + enter as dragEventEnter, + leave as dragEventLeave, + move as dragEventMove, + start as dragEventStart, +} from '@js/common/core/events/drag'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace, needSkipEvent } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import domAdapter from '@js/core/dom_adapter'; import DOMComponent from '@js/core/dom_component'; @@ -22,16 +32,6 @@ import { quadToObject } from '@js/core/utils/string'; import { isFunction, isNumeric, isObject } from '@js/core/utils/type'; import { value as viewPort } from '@js/core/utils/view_port'; import { getWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import { - end as dragEventEnd, - enter as dragEventEnter, - leave as dragEventLeave, - move as dragEventMove, - start as dragEventStart, -} from '@js/events/drag'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace, needSkipEvent } from '@js/events/utils/index'; import Animator from './ui/scroll_view/m_animator'; diff --git a/packages/devextreme/js/__internal/m_sortable.ts b/packages/devextreme/js/__internal/m_sortable.ts index 781a83d89ebf..32c3ec3737a3 100644 --- a/packages/devextreme/js/__internal/m_sortable.ts +++ b/packages/devextreme/js/__internal/m_sortable.ts @@ -1,5 +1,6 @@ -import fx from '@js/animation/fx'; -import { resetPosition } from '@js/animation/translator'; +import { fx } from '@js/common/core/animation'; +import { resetPosition } from '@js/common/core/animation/translator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; import registerComponent from '@js/core/component_registrator'; import { getPublicElement } from '@js/core/element'; import $ from '@js/core/renderer'; @@ -10,7 +11,6 @@ import { getHeight, getOuterHeight, getOuterWidth, getWidth, } from '@js/core/utils/size'; import { getWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; import Draggable from '@ts/m_draggable'; import { isDefined } from '../core/utils/type'; diff --git a/packages/devextreme/js/__internal/pagination/common/base_pagination_props.ts b/packages/devextreme/js/__internal/pagination/common/base_pagination_props.ts index 7e2b48c1b369..bddc0fa54a79 100644 --- a/packages/devextreme/js/__internal/pagination/common/base_pagination_props.ts +++ b/packages/devextreme/js/__internal/pagination/common/base_pagination_props.ts @@ -2,7 +2,7 @@ import type { DisplayMode } from '@js/common'; import type { PageSize } from '@js/ui/pagination_types'; import { BaseWidgetDefaultProps, type BaseWidgetProps } from '@ts/core/r1/base_props'; -import messageLocalization from '../../../localization/message'; +import messageLocalization from '../../../common/core/localization/message'; import type { EventCallback } from '../../core/r1/event_callback'; export interface BasePaginationProps extends BaseWidgetProps { diff --git a/packages/devextreme/js/__internal/pagination/drop_down_editors/select_box.tsx b/packages/devextreme/js/__internal/pagination/drop_down_editors/select_box.tsx index bce6e0ee9111..788467c16cce 100644 --- a/packages/devextreme/js/__internal/pagination/drop_down_editors/select_box.tsx +++ b/packages/devextreme/js/__internal/pagination/drop_down_editors/select_box.tsx @@ -1,9 +1,8 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { BaseInfernoComponent } from '@devextreme/runtime/inferno'; +import type { DataSource, DataSourceOptions } from '../../../common/data'; import type Store from '../../../data/abstract_store'; -import type DataSource from '../../../data/data_source'; -import type { Options as DataSourceOptions } from '../../../data/data_source'; import LegacySelectBox from '../../../ui/select_box'; import { DomComponentWrapper } from '../../core/r1/dom_component_wrapper'; import type { EventCallback } from '../../core/r1/event_callback'; diff --git a/packages/devextreme/js/__internal/pagination/utils/compatibility_utils.ts b/packages/devextreme/js/__internal/pagination/utils/compatibility_utils.ts index 4881cc6d2d46..74328d9776ca 100644 --- a/packages/devextreme/js/__internal/pagination/utils/compatibility_utils.ts +++ b/packages/devextreme/js/__internal/pagination/utils/compatibility_utils.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ /* eslint-disable @typescript-eslint/no-unsafe-return */ -import messageLocalization from '@js/localization/message'; +import messageLocalization from '@js/common/core/localization/message'; import type { PaginationConfigContextValue } from '../common/pagination_config_context'; import { PaginationConfigContext } from '../common/pagination_config_context'; diff --git a/packages/devextreme/js/__internal/scheduler/appointment_popup/m_form.ts b/packages/devextreme/js/__internal/scheduler/appointment_popup/m_form.ts index a96877ded246..1e8803c7d47f 100644 --- a/packages/devextreme/js/__internal/scheduler/appointment_popup/m_form.ts +++ b/packages/devextreme/js/__internal/scheduler/appointment_popup/m_form.ts @@ -4,13 +4,13 @@ import '@js/ui/tag_box'; import '@js/ui/switch'; import '@js/ui/select_box'; +import messageLocalization from '@js/common/core/localization/message'; +import DataSource from '@js/common/data/data_source'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; import dateUtils from '@js/core/utils/date'; import dateSerialization from '@js/core/utils/date_serialization'; import { extend } from '@js/core/utils/extend'; -import DataSource from '@js/data/data_source'; -import messageLocalization from '@js/localization/message'; import Form from '@js/ui/form'; import { current, isFluent } from '@js/ui/themes'; import { ExpressionUtils } from '@ts/scheduler/m_expression_utils'; diff --git a/packages/devextreme/js/__internal/scheduler/appointment_popup/m_popup.ts b/packages/devextreme/js/__internal/scheduler/appointment_popup/m_popup.ts index 356c12fa726e..58211e07e350 100644 --- a/packages/devextreme/js/__internal/scheduler/appointment_popup/m_popup.ts +++ b/packages/devextreme/js/__internal/scheduler/appointment_popup/m_popup.ts @@ -1,9 +1,9 @@ +import { triggerResizeEvent } from '@js/common/core/events/visibility_change'; +import messageLocalization from '@js/common/core/localization/message'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; import dateUtils from '@js/core/utils/date'; import { Deferred, when } from '@js/core/utils/deferred'; -import { triggerResizeEvent } from '@js/events/visibility_change'; -import messageLocalization from '@js/localization/message'; import Popup from '@js/ui/popup/ui.popup'; import { ExpressionUtils } from '@ts/scheduler/m_expression_utils'; import { diff --git a/packages/devextreme/js/__internal/scheduler/appointments/data_provider/m_appointment_filter.ts b/packages/devextreme/js/__internal/scheduler/appointments/data_provider/m_appointment_filter.ts index f3cc15047a10..2593c049ee71 100644 --- a/packages/devextreme/js/__internal/scheduler/appointments/data_provider/m_appointment_filter.ts +++ b/packages/devextreme/js/__internal/scheduler/appointments/data_provider/m_appointment_filter.ts @@ -1,9 +1,9 @@ /* eslint-disable max-classes-per-file */ +import query from '@js/common/data/query'; import { wrapToArray } from '@js/core/utils/array'; import dateUtils from '@js/core/utils/date'; import { each, map } from '@js/core/utils/iterator'; import { isDefined, isFunction } from '@js/core/utils/type'; -import query from '@js/data/query'; import { dateUtilsTs } from '@ts/core/utils/date'; import { getAppointmentTakesAllDay, getDatesWithoutTime, hasResourceValue, isDateAndTimeView, @@ -348,14 +348,18 @@ export class AppointmentFilterBaseStrategy { filterPreparedItems(filterOptions, preparedItems) { const combinedFilter = this._createAppointmentFilter(filterOptions); + // @ts-expect-error return query(preparedItems) + // @ts-expect-error .filter(combinedFilter) .toArray(); } filterAllDayAppointments(preparedItems) { const combinedFilter = this._createAllDayAppointmentFilter(); + // @ts-expect-error return query(preparedItems) + // @ts-expect-error .filter(combinedFilter) .toArray() .map(({ rawAppointment }) => rawAppointment); @@ -452,7 +456,9 @@ export class AppointmentFilterVirtualStrategy extends AppointmentFilterBaseStrat combinedFilters.push(filter); }); + // @ts-expect-error return query(itemsToFilter) + // @ts-expect-error .filter(combinedFilters) .toArray(); } diff --git a/packages/devextreme/js/__internal/scheduler/appointments/m_appointment.ts b/packages/devextreme/js/__internal/scheduler/appointments/m_appointment.ts index 98e1ca14256c..b560186f4d6a 100644 --- a/packages/devextreme/js/__internal/scheduler/appointments/m_appointment.ts +++ b/packages/devextreme/js/__internal/scheduler/appointments/m_appointment.ts @@ -1,5 +1,10 @@ /* eslint-disable max-classes-per-file */ -import { move } from '@js/animation/translator'; +import { move } from '@js/common/core/animation/translator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import dateLocalization from '@js/common/core/localization/date'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import DOMComponent from '@js/core/dom_component'; import Guid from '@js/core/guid'; @@ -8,11 +13,6 @@ import $ from '@js/core/renderer'; import { Deferred } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { isDefined } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace } from '@js/events/utils/index'; -import dateLocalization from '@js/localization/date'; -import messageLocalization from '@js/localization/message'; import Resizable from '@js/ui/resizable'; import { hide, show } from '@ts/ui/tooltip/m_tooltip'; diff --git a/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_collection.ts b/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_collection.ts index cfb444240ae6..e32d32f4ced6 100644 --- a/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_collection.ts +++ b/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_collection.ts @@ -1,5 +1,8 @@ /* eslint-disable spellcheck/spell-checker */ -import { locate, move } from '@js/animation/translator'; +import { locate, move } from '@js/common/core/animation/translator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { name as dblclickEvent } from '@js/common/core/events/double_click'; +import { addNamespace, isFakeClickEvent } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import domAdapter from '@js/core/dom_adapter'; import { getPublicElement } from '@js/core/element'; @@ -19,9 +22,6 @@ import { setOuterHeight, setOuterWidth } from '@js/core/utils/size'; import { isDeferred, isDefined, isPlainObject, isString, } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { name as dblclickEvent } from '@js/events/double_click'; -import { addNamespace, isFakeClickEvent } from '@js/events/utils/index'; import CollectionWidget from '@js/ui/collection/ui.collection_widget.edit'; import { dateUtilsTs } from '@ts/core/utils/date'; diff --git a/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_layout.ts b/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_layout.ts index d57f55f56d4b..00d1e4700d78 100644 --- a/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_layout.ts +++ b/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_layout.ts @@ -1,6 +1,6 @@ +import messageLocalization from '@js/common/core/localization/message'; import domAdapter from '@js/core/dom_adapter'; import $ from '@js/core/renderer'; -import messageLocalization from '@js/localization/message'; import { APPOINTMENT_CONTENT_CLASSES } from '../m_classes'; diff --git a/packages/devextreme/js/__internal/scheduler/appointments/m_text_utils.ts b/packages/devextreme/js/__internal/scheduler/appointments/m_text_utils.ts index b9298006d4ed..066513962ec9 100644 --- a/packages/devextreme/js/__internal/scheduler/appointments/m_text_utils.ts +++ b/packages/devextreme/js/__internal/scheduler/appointments/m_text_utils.ts @@ -1,5 +1,5 @@ +import dateLocalization from '@js/common/core/localization/date'; import dateUtils from '@js/core/utils/date'; -import dateLocalization from '@js/localization/date'; export const createFormattedDateText = (options) => { const { diff --git a/packages/devextreme/js/__internal/scheduler/appointments/rendering_strategies/m_strategy_horizontal_month_line.ts b/packages/devextreme/js/__internal/scheduler/appointments/rendering_strategies/m_strategy_horizontal_month_line.ts index a39a230f7211..033968f99373 100644 --- a/packages/devextreme/js/__internal/scheduler/appointments/rendering_strategies/m_strategy_horizontal_month_line.ts +++ b/packages/devextreme/js/__internal/scheduler/appointments/rendering_strategies/m_strategy_horizontal_month_line.ts @@ -1,5 +1,5 @@ +import query from '@js/common/data/query'; import dateUtils from '@js/core/utils/date'; -import query from '@js/data/query'; import { sortAppointmentsByStartDate } from '../data_provider/m_utils'; import HorizontalAppointmentsStrategy from './m_strategy_horizontal'; @@ -65,6 +65,7 @@ class HorizontalMonthLineRenderingStrategy extends HorizontalAppointmentsStrateg let result = super._getSortedPositions(map); if (!skipSorting) { + // @ts-expect-error result = query(result).sortBy('top').thenBy('left').thenBy('cellPosition') .thenBy('i') .toArray(); diff --git a/packages/devextreme/js/__internal/scheduler/header/m_date_navigator.ts b/packages/devextreme/js/__internal/scheduler/header/m_date_navigator.ts index a97f263a1ff0..826640e86704 100644 --- a/packages/devextreme/js/__internal/scheduler/header/m_date_navigator.ts +++ b/packages/devextreme/js/__internal/scheduler/header/m_date_navigator.ts @@ -1,5 +1,5 @@ +import messageLocalization from '@js/common/core/localization/message'; import dateUtils from '@js/core/utils/date'; -import messageLocalization from '@js/localization/message'; import { isMaterialBased } from '@js/ui/themes'; const { trimTime } = dateUtils; diff --git a/packages/devextreme/js/__internal/scheduler/header/m_utils.ts b/packages/devextreme/js/__internal/scheduler/header/m_utils.ts index 11a2a6b0deb7..fef9f566e07d 100644 --- a/packages/devextreme/js/__internal/scheduler/header/m_utils.ts +++ b/packages/devextreme/js/__internal/scheduler/header/m_utils.ts @@ -1,9 +1,9 @@ +import dateLocalization from '@js/common/core/localization/date'; +import messageLocalization from '@js/common/core/localization/message'; import errors from '@js/core/errors'; import dateUtils from '@js/core/utils/date'; import { camelize } from '@js/core/utils/inflector'; import { isFunction, isObject } from '@js/core/utils/type'; -import dateLocalization from '@js/localization/date'; -import messageLocalization from '@js/localization/message'; import { VIEWS } from '../m_constants'; diff --git a/packages/devextreme/js/__internal/scheduler/m_compact_appointments_helper.ts b/packages/devextreme/js/__internal/scheduler/m_compact_appointments_helper.ts index 28b5cd402aec..d047f4c5b941 100644 --- a/packages/devextreme/js/__internal/scheduler/m_compact_appointments_helper.ts +++ b/packages/devextreme/js/__internal/scheduler/m_compact_appointments_helper.ts @@ -1,8 +1,8 @@ -import { locate, move } from '@js/animation/translator'; +import { locate, move } from '@js/common/core/animation/translator'; +import dateLocalization from '@js/common/core/localization/date'; +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { FunctionTemplate } from '@js/core/templates/function_template'; -import dateLocalization from '@js/localization/date'; -import messageLocalization from '@js/localization/message'; import Button from '@js/ui/button'; import { createAppointmentAdapter } from './m_appointment_adapter'; diff --git a/packages/devextreme/js/__internal/scheduler/m_recurrence_editor.ts b/packages/devextreme/js/__internal/scheduler/m_recurrence_editor.ts index c656bfbf4069..b08fc871d1ef 100644 --- a/packages/devextreme/js/__internal/scheduler/m_recurrence_editor.ts +++ b/packages/devextreme/js/__internal/scheduler/m_recurrence_editor.ts @@ -1,14 +1,14 @@ /* eslint-disable max-classes-per-file, spellcheck/spell-checker */ import '@js/ui/radio_group'; +import dateLocalization from '@js/common/core/localization/date'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import Guid from '@js/core/guid'; import $ from '@js/core/renderer'; import dateUtils from '@js/core/utils/date'; import { extend } from '@js/core/utils/extend'; import { isDefined } from '@js/core/utils/type'; -import dateLocalization from '@js/localization/date'; -import messageLocalization from '@js/localization/message'; import ButtonGroup from '@js/ui/button_group'; import DateBox from '@js/ui/date_box'; import Editor from '@js/ui/editor/editor'; diff --git a/packages/devextreme/js/__internal/scheduler/m_scheduler.ts b/packages/devextreme/js/__internal/scheduler/m_scheduler.ts index 6e02a87edf87..7d425480f2eb 100644 --- a/packages/devextreme/js/__internal/scheduler/m_scheduler.ts +++ b/packages/devextreme/js/__internal/scheduler/m_scheduler.ts @@ -1,3 +1,7 @@ +import { triggerResizeEvent } from '@js/common/core/events/visibility_change'; +import dateLocalization from '@js/common/core/localization/date'; +import messageLocalization from '@js/common/core/localization/message'; +import DataHelperMixin from '@js/common/data/data_helper'; import registerComponent from '@js/core/component_registrator'; import config from '@js/core/config'; import devices from '@js/core/devices'; @@ -26,10 +30,6 @@ import { isString, } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import DataHelperMixin from '@js/data_helper'; -import { triggerResizeEvent } from '@js/events/visibility_change'; -import dateLocalization from '@js/localization/date'; -import messageLocalization from '@js/localization/message'; import { custom as customDialog } from '@js/ui/dialog'; import type { AppointmentTooltipShowingEvent, ViewType } from '@js/ui/scheduler'; import { isMaterial, isMaterialBased } from '@js/ui/themes'; diff --git a/packages/devextreme/js/__internal/scheduler/r1/appointment_popup/config.ts b/packages/devextreme/js/__internal/scheduler/r1/appointment_popup/config.ts index c8bd33cec9a2..39d5b62a65f2 100644 --- a/packages/devextreme/js/__internal/scheduler/r1/appointment_popup/config.ts +++ b/packages/devextreme/js/__internal/scheduler/r1/appointment_popup/config.ts @@ -1,8 +1,8 @@ -import type { AnimationConfig } from '@js/animation/fx'; +import type { AnimationConfig } from '@js/common/core/animation'; +import messageLocalization from '@js/common/core/localization/message'; import devices from '@js/core/devices'; import { getWidth } from '@js/core/utils/size'; import { getWindow } from '@js/core/utils/window'; -import messageLocalization from '@js/localization/message'; import type { IToolbarButtonConfig } from './types'; diff --git a/packages/devextreme/js/__internal/scheduler/r1/components/base/all_day_panel_title.tsx b/packages/devextreme/js/__internal/scheduler/r1/components/base/all_day_panel_title.tsx index bdc5b4b08aaa..13a65b2279e5 100644 --- a/packages/devextreme/js/__internal/scheduler/r1/components/base/all_day_panel_title.tsx +++ b/packages/devextreme/js/__internal/scheduler/r1/components/base/all_day_panel_title.tsx @@ -1,6 +1,6 @@ import type { InfernoEffect } from '@devextreme/runtime/inferno'; import { createReRenderEffect, InfernoWrapperComponent } from '@devextreme/runtime/inferno'; -import messageLocalization from '@js/localization/message'; +import messageLocalization from '@js/common/core/localization/message'; export class AllDayPanelTitle extends InfernoWrapperComponent { createEffects(): InfernoEffect[] { diff --git a/packages/devextreme/js/__internal/scheduler/r1/utils/base.ts b/packages/devextreme/js/__internal/scheduler/r1/utils/base.ts index e6d62b3559bc..623b80ddeb20 100644 --- a/packages/devextreme/js/__internal/scheduler/r1/utils/base.ts +++ b/packages/devextreme/js/__internal/scheduler/r1/utils/base.ts @@ -1,7 +1,7 @@ +import dateLocalization from '@js/common/core/localization/date'; import { equalByValue } from '@js/core/utils/common'; import dateUtils from '@js/core/utils/date'; import { isDefined } from '@js/core/utils/type'; -import dateLocalization from '@js/localization/date'; import { dateUtilsTs } from '@ts/core/utils/date'; import { VERTICAL_GROUP_COUNT_CLASSES } from '../../m_classes'; diff --git a/packages/devextreme/js/__internal/scheduler/r1/utils/format_weekday.ts b/packages/devextreme/js/__internal/scheduler/r1/utils/format_weekday.ts index eabb46e6e8de..d70223d06c11 100644 --- a/packages/devextreme/js/__internal/scheduler/r1/utils/format_weekday.ts +++ b/packages/devextreme/js/__internal/scheduler/r1/utils/format_weekday.ts @@ -1,4 +1,4 @@ -import dateLocalization from '@js/localization/date'; +import dateLocalization from '@js/common/core/localization/date'; export const formatWeekday = (date: Date): string => dateLocalization .getDayNames('abbreviated')[date.getDay()]; diff --git a/packages/devextreme/js/__internal/scheduler/r1/utils/month.ts b/packages/devextreme/js/__internal/scheduler/r1/utils/month.ts index 564312f12709..3a6f01562b6f 100644 --- a/packages/devextreme/js/__internal/scheduler/r1/utils/month.ts +++ b/packages/devextreme/js/__internal/scheduler/r1/utils/month.ts @@ -1,5 +1,5 @@ +import dateLocalization from '@js/common/core/localization/date'; import dateUtils from '@js/core/utils/date'; -import dateLocalization from '@js/localization/date'; import type { CalculateCellIndex } from '../types'; import { diff --git a/packages/devextreme/js/__internal/scheduler/r1/utils/week.ts b/packages/devextreme/js/__internal/scheduler/r1/utils/week.ts index 9ccd7560fced..720780d027b0 100644 --- a/packages/devextreme/js/__internal/scheduler/r1/utils/week.ts +++ b/packages/devextreme/js/__internal/scheduler/r1/utils/week.ts @@ -1,5 +1,5 @@ +import dateLocalization from '@js/common/core/localization/date'; import dateUtils from '@js/core/utils/date'; -import dateLocalization from '@js/localization/date'; import type { CalculateStartViewDate } from '../types'; import { diff --git a/packages/devextreme/js/__internal/scheduler/resources/m_utils.ts b/packages/devextreme/js/__internal/scheduler/resources/m_utils.ts index a6950525075d..1fc8c59c2ca7 100644 --- a/packages/devextreme/js/__internal/scheduler/resources/m_utils.ts +++ b/packages/devextreme/js/__internal/scheduler/resources/m_utils.ts @@ -1,3 +1,5 @@ +import { DataSource } from '@js/common/data/data_source/data_source'; +import { normalizeDataSourceOptions } from '@js/common/data/data_source/utils'; import { wrapToArray } from '@js/core/utils/array'; import { equalByValue } from '@js/core/utils/common'; import { compileGetter, compileSetter } from '@js/core/utils/data'; @@ -6,8 +8,6 @@ import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { deepExtendArraySafe } from '@js/core/utils/object'; import { isDefined } from '@js/core/utils/type'; -import { DataSource } from '@js/data/data_source/data_source'; -import { normalizeDataSourceOptions } from '@js/data/data_source/utils'; import { current, isFluent } from '@js/ui/themes'; import { getGroupCount, hasResourceValue } from '@ts/scheduler/r1/utils/index'; diff --git a/packages/devextreme/js/__internal/scheduler/tooltip_strategies/m_desktop_tooltip_strategy.ts b/packages/devextreme/js/__internal/scheduler/tooltip_strategies/m_desktop_tooltip_strategy.ts index 4e52ba124577..74741d9548bf 100644 --- a/packages/devextreme/js/__internal/scheduler/tooltip_strategies/m_desktop_tooltip_strategy.ts +++ b/packages/devextreme/js/__internal/scheduler/tooltip_strategies/m_desktop_tooltip_strategy.ts @@ -1,4 +1,4 @@ -import messageLocalization from '@js/localization/message'; +import messageLocalization from '@js/common/core/localization/message'; import supportUtils from '@ts/core/utils/m_support'; import Tooltip from '@ts/ui/m_tooltip'; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_agenda.ts b/packages/devextreme/js/__internal/scheduler/workspaces/m_agenda.ts index 5f6877a181fd..831a3fcffc8a 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_agenda.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_agenda.ts @@ -1,3 +1,4 @@ +import dateLocalization from '@js/common/core/localization/date'; import registerComponent from '@js/core/component_registrator'; import domAdapter from '@js/core/dom_adapter'; import { getPublicElement } from '@js/core/element'; @@ -7,7 +8,6 @@ import dateUtils from '@js/core/utils/date'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { setHeight, setOuterHeight } from '@js/core/utils/size'; -import dateLocalization from '@js/localization/date'; import { agendaUtils, formatWeekday, getVerticalGroupCountClass } from '@ts/scheduler/r1/utils/index'; import { diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_virtual_scrolling.ts b/packages/devextreme/js/__internal/scheduler/workspaces/m_virtual_scrolling.ts index 0b80c1148f07..fe016b0bfdcb 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_virtual_scrolling.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_virtual_scrolling.ts @@ -1,9 +1,9 @@ /* eslint-disable max-classes-per-file */ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; import domAdapter from '@js/core/dom_adapter'; import { isDefined } from '@js/core/utils/type'; import { getWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; const DEFAULT_CELL_HEIGHT = 50; const MIN_CELL_WIDTH = 1; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts index 3c35e4f6b380..638f0589743d 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts @@ -1,4 +1,15 @@ -import { locate, resetPosition } from '@js/animation/translator'; +import { locate, resetPosition } from '@js/common/core/animation/translator'; +import { name as clickEventName } from '@js/common/core/events/click'; +import { name as contextMenuEventName } from '@js/common/core/events/contextmenu'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { + drop as dragEventDrop, + enter as dragEventEnter, + leave as dragEventLeave, +} from '@js/common/core/events/drag'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace, isMouseEvent } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import domAdapter from '@js/core/dom_adapter'; import { getPublicElement } from '@js/core/element'; import $ from '@js/core/renderer'; @@ -17,17 +28,6 @@ import { } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; import { getWindow, hasWindow } from '@js/core/utils/window'; -import { name as clickEventName } from '@js/events/click'; -import { name as contextMenuEventName } from '@js/events/contextmenu'; -import eventsEngine from '@js/events/core/events_engine'; -import { - drop as dragEventDrop, - enter as dragEventEnter, - leave as dragEventLeave, -} from '@js/events/drag'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace, isMouseEvent } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import Scrollable from '@js/ui/scroll_view/ui.scrollable'; import errors from '@js/ui/widget/ui.errors'; import { getMemoizeScrollTo } from '@ts/core/utils/scroll'; diff --git a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_month.ts b/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_month.ts index 20b5e5ad5137..64246160bc32 100644 --- a/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_month.ts +++ b/packages/devextreme/js/__internal/scheduler/workspaces/view_model/m_view_data_generator_month.ts @@ -1,5 +1,5 @@ +import dateLocalization from '@js/common/core/localization/date'; import dateUtils from '@js/core/utils/date'; -import dateLocalization from '@js/localization/date'; import { getToday, isFirstCellInMonthWithIntervalCount, monthUtils, setOptionHour, } from '@ts/scheduler/r1/utils/index'; diff --git a/packages/devextreme/js/__internal/ui/button/button.tsx b/packages/devextreme/js/__internal/ui/button/button.tsx index 4c6c01568c63..eca0ce7f4d69 100644 --- a/packages/devextreme/js/__internal/ui/button/button.tsx +++ b/packages/devextreme/js/__internal/ui/button/button.tsx @@ -2,12 +2,12 @@ /* eslint-disable @typescript-eslint/no-non-null-assertion */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ import { createReRenderEffect, InfernoEffect, InfernoWrapperComponent } from '@devextreme/runtime/inferno'; +import { click } from '@js/common/core/events/short'; +import messageLocalization from '@js/common/core/localization/message'; import devices from '@js/core/devices'; import { convertRulesToOptions, createDefaultOptionRules } from '@js/core/options/utils'; import { getImageSourceType } from '@js/core/utils/icon'; import { camelize } from '@js/core/utils/inflector'; -import { click } from '@js/events/short'; -import messageLocalization from '@js/localization/message'; import { current, isMaterial } from '@js/ui/themes'; import type { EffectReturn } from '@ts/core/r1/utils/effect_return'; import { getTemplate } from '@ts/core/r1/utils/index'; diff --git a/packages/devextreme/js/__internal/ui/calendar/m_calendar.base_view.ts b/packages/devextreme/js/__internal/ui/calendar/m_calendar.base_view.ts index af12441db9b4..89f9e58d8879 100644 --- a/packages/devextreme/js/__internal/ui/calendar/m_calendar.base_view.ts +++ b/packages/devextreme/js/__internal/ui/calendar/m_calendar.base_view.ts @@ -1,3 +1,9 @@ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { start as hoverStartEventName } from '@js/common/core/events/hover'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import dateLocalization from '@js/common/core/localization/date'; +import messageLocalization from '@js/common/core/localization/message'; import domAdapter from '@js/core/dom_adapter'; import { getPublicElement } from '@js/core/element'; import { data as elementData } from '@js/core/element_data'; @@ -6,12 +12,6 @@ import { noop } from '@js/core/utils/common'; import coreDateUtils from '@js/core/utils/date'; import dateSerialization from '@js/core/utils/date_serialization'; import { extend } from '@js/core/utils/extend'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { start as hoverStartEventName } from '@js/events/hover'; -import { addNamespace } from '@js/events/utils/index'; -import dateLocalization from '@js/localization/date'; -import messageLocalization from '@js/localization/message'; import Widget from '@js/ui/widget/ui.widget'; // @ts-expect-error diff --git a/packages/devextreme/js/__internal/ui/calendar/m_calendar.ts b/packages/devextreme/js/__internal/ui/calendar/m_calendar.ts index ee851870fc81..ef0b48f5f88c 100644 --- a/packages/devextreme/js/__internal/ui/calendar/m_calendar.ts +++ b/packages/devextreme/js/__internal/ui/calendar/m_calendar.ts @@ -1,5 +1,11 @@ -import fx from '@js/animation/fx'; -import { move } from '@js/animation/translator'; +import { fx } from '@js/common/core/animation'; +import { move } from '@js/common/core/animation/translator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import Swipeable from '@js/common/core/events/gesture/swipeable'; +import { end as hoverEndEventName } from '@js/common/core/events/hover'; +import { addNamespace, isCommandKeyPressed } from '@js/common/core/events/utils/index'; +import dateLocalization from '@js/common/core/localization/date'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import Guid from '@js/core/guid'; @@ -15,12 +21,6 @@ import { isDefined, isFunction, isNumeric, isString, } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import Swipeable from '@js/events/gesture/swipeable'; -import { end as hoverEndEventName } from '@js/events/hover'; -import { addNamespace, isCommandKeyPressed } from '@js/events/utils/index'; -import dateLocalization from '@js/localization/date'; -import messageLocalization from '@js/localization/message'; import Button from '@js/ui/button'; import Editor from '@js/ui/editor/editor'; import { isFluent } from '@js/ui/themes'; diff --git a/packages/devextreme/js/__internal/ui/calendar/m_calendar.views.ts b/packages/devextreme/js/__internal/ui/calendar/m_calendar.views.ts index 87026c6e198f..3a7cca47bd99 100644 --- a/packages/devextreme/js/__internal/ui/calendar/m_calendar.views.ts +++ b/packages/devextreme/js/__internal/ui/calendar/m_calendar.views.ts @@ -1,10 +1,10 @@ +import dateLocalization from '@js/common/core/localization/date'; import domAdapter from '@js/core/dom_adapter'; import $ from '@js/core/renderer'; import { noop } from '@js/core/utils/common'; import dateUtils from '@js/core/utils/date'; import dateSerialization from '@js/core/utils/date_serialization'; import { extend } from '@js/core/utils/extend'; -import dateLocalization from '@js/localization/date'; import BaseView from './m_calendar.base_view'; diff --git a/packages/devextreme/js/__internal/ui/chat/alertlist.ts b/packages/devextreme/js/__internal/ui/chat/alertlist.ts index 34fbcc8cccf1..e241c105b49e 100644 --- a/packages/devextreme/js/__internal/ui/chat/alertlist.ts +++ b/packages/devextreme/js/__internal/ui/chat/alertlist.ts @@ -1,5 +1,5 @@ +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; -import messageLocalization from '@js/localization/message'; import type { Alert, } from '@js/ui/chat'; diff --git a/packages/devextreme/js/__internal/ui/chat/avatar.ts b/packages/devextreme/js/__internal/ui/chat/avatar.ts index b794a3904ffe..6ad857a810c2 100644 --- a/packages/devextreme/js/__internal/ui/chat/avatar.ts +++ b/packages/devextreme/js/__internal/ui/chat/avatar.ts @@ -1,7 +1,7 @@ +import messageLocalization from '@js/common/core/localization/message'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import { isDefined } from '@js/core/utils/type'; -import messageLocalization from '@js/localization/message'; import type { WidgetOptions } from '@js/ui/widget/ui.widget'; import type { OptionChanged } from '@ts/core/widget/types'; import Widget from '@ts/core/widget/widget'; diff --git a/packages/devextreme/js/__internal/ui/chat/chat.ts b/packages/devextreme/js/__internal/ui/chat/chat.ts index e3db3e2a4ca0..d3c8aa0f114f 100644 --- a/packages/devextreme/js/__internal/ui/chat/chat.ts +++ b/packages/devextreme/js/__internal/ui/chat/chat.ts @@ -1,11 +1,11 @@ +import { Guid } from '@js/common'; +import messageLocalization from '@js/common/core/localization/message'; +import type { DataSourceOptions } from '@js/common/data'; +import DataHelperMixin from '@js/common/data/data_helper'; import registerComponent from '@js/core/component_registrator'; -import Guid from '@js/core/guid'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import { isDefined } from '@js/core/utils/type'; -import type { Options as DataSourceOptions } from '@js/data/data_source'; -import DataHelperMixin from '@js/data_helper'; -import messageLocalization from '@js/localization/message'; import type { Message, MessageEnteredEvent, diff --git a/packages/devextreme/js/__internal/ui/chat/messagebox.ts b/packages/devextreme/js/__internal/ui/chat/messagebox.ts index 6453cad0ec62..b2c236b368a3 100644 --- a/packages/devextreme/js/__internal/ui/chat/messagebox.ts +++ b/packages/devextreme/js/__internal/ui/chat/messagebox.ts @@ -1,6 +1,6 @@ +import type { NativeEventInfo } from '@js/common/core/events'; +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; -import type { NativeEventInfo } from '@js/events'; -import messageLocalization from '@js/localization/message'; import type { ClickEvent } from '@js/ui/button'; import Button from '@js/ui/button'; import type { Properties as DOMComponentProperties } from '@ts/core/widget/dom_component'; diff --git a/packages/devextreme/js/__internal/ui/chat/messagegroup.ts b/packages/devextreme/js/__internal/ui/chat/messagegroup.ts index d80ba2d5232d..f4b11e8491c8 100644 --- a/packages/devextreme/js/__internal/ui/chat/messagegroup.ts +++ b/packages/devextreme/js/__internal/ui/chat/messagegroup.ts @@ -1,10 +1,10 @@ +import type { Format } from '@js/common/core/localization'; +import dateLocalization from '@js/common/core/localization/date'; +import messageLocalization from '@js/common/core/localization/message'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import dateSerialization from '@js/core/utils/date_serialization'; import { isDate } from '@js/core/utils/type'; -import type { Format } from '@js/localization'; -import dateLocalization from '@js/localization/date'; -import messageLocalization from '@js/localization/message'; import type { Message } from '@js/ui/chat'; import type { WidgetOptions } from '@js/ui/widget/ui.widget'; import type { OptionChanged } from '@ts/core/widget/types'; diff --git a/packages/devextreme/js/__internal/ui/chat/messagelist.ts b/packages/devextreme/js/__internal/ui/chat/messagelist.ts index 61120ffc06ef..8651083b49a9 100644 --- a/packages/devextreme/js/__internal/ui/chat/messagelist.ts +++ b/packages/devextreme/js/__internal/ui/chat/messagelist.ts @@ -1,4 +1,7 @@ -import Guid from '@js/core/guid'; +import { Guid } from '@js/common'; +import type { Format } from '@js/common/core/localization'; +import dateLocalization from '@js/common/core/localization/date'; +import messageLocalization from '@js/common/core/localization/message'; import type { DeepPartial, } from '@js/core/index'; @@ -11,9 +14,6 @@ import dateSerialization from '@js/core/utils/date_serialization'; import { isElementInDom } from '@js/core/utils/dom'; import { getHeight } from '@js/core/utils/size'; import { isDate, isDefined } from '@js/core/utils/type'; -import type { Format } from '@js/localization'; -import dateLocalization from '@js/localization/date'; -import messageLocalization from '@js/localization/message'; import type { Message, User } from '@js/ui/chat'; import ScrollView from '@js/ui/scroll_view'; import type { WidgetOptions } from '@js/ui/widget/ui.widget'; diff --git a/packages/devextreme/js/__internal/ui/chat/typingindicator.ts b/packages/devextreme/js/__internal/ui/chat/typingindicator.ts index f577fc593706..8914f3510b0c 100644 --- a/packages/devextreme/js/__internal/ui/chat/typingindicator.ts +++ b/packages/devextreme/js/__internal/ui/chat/typingindicator.ts @@ -1,7 +1,7 @@ +import messageLocalization from '@js/common/core/localization/message'; import type { Properties as DOMComponentProperties } from '@js/core/dom_component'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; -import messageLocalization from '@js/localization/message'; import type { User } from '@js/ui/chat'; import DOMComponent from '@ts/core/widget/dom_component'; import type { OptionChanged } from '@ts/core/widget/types'; diff --git a/packages/devextreme/js/__internal/ui/collection/base.ts b/packages/devextreme/js/__internal/ui/collection/base.ts index deb3dd9d0f36..9928a0d14007 100644 --- a/packages/devextreme/js/__internal/ui/collection/base.ts +++ b/packages/devextreme/js/__internal/ui/collection/base.ts @@ -1,5 +1,5 @@ +import type { DataSource } from '@js/common/data'; import type { dxElementWrapper } from '@js/core/renderer'; -import type DataSource from '@js/data/data_source'; import type { CollectionWidgetOptions, ItemLike } from '@js/ui/collection/ui.collection_widget.base'; import CollectionWidget from '@js/ui/collection/ui.collection_widget.base'; diff --git a/packages/devextreme/js/__internal/ui/collection/m_collection_widget.base.ts b/packages/devextreme/js/__internal/ui/collection/m_collection_widget.base.ts index 0929f7b24f06..a5c410bd3806 100644 --- a/packages/devextreme/js/__internal/ui/collection/m_collection_widget.base.ts +++ b/packages/devextreme/js/__internal/ui/collection/m_collection_widget.base.ts @@ -1,3 +1,11 @@ +import { name as clickEventName } from '@js/common/core/events/click'; +import { name as contextMenuEventName } from '@js/common/core/events/contextmenu'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import holdEvent from '@js/common/core/events/hold'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace, isCommandKeyPressed } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; +import DataHelperMixin from '@js/common/data/data_helper'; import Action from '@js/core/action'; import domAdapter from '@js/core/dom_adapter'; import { getPublicElement } from '@js/core/element'; @@ -17,14 +25,6 @@ import { each } from '@js/core/utils/iterator'; import { getOuterHeight, getOuterWidth } from '@js/core/utils/size'; import { findTemplates } from '@js/core/utils/template_manager'; import { isDefined, isFunction, isPlainObject } from '@js/core/utils/type'; -import DataHelperMixin from '@js/data_helper'; -import { name as clickEventName } from '@js/events/click'; -import { name as contextMenuEventName } from '@js/events/contextmenu'; -import eventsEngine from '@js/events/core/events_engine'; -import holdEvent from '@js/events/hold'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace, isCommandKeyPressed } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import { focusable } from '@js/ui/widget/selectors'; import Widget from '@js/ui/widget/ui.widget'; diff --git a/packages/devextreme/js/__internal/ui/collection/m_collection_widget.edit.ts b/packages/devextreme/js/__internal/ui/collection/m_collection_widget.edit.ts index 20a164a29af9..2a6f79d24a2e 100644 --- a/packages/devextreme/js/__internal/ui/collection/m_collection_widget.edit.ts +++ b/packages/devextreme/js/__internal/ui/collection/m_collection_widget.edit.ts @@ -1,3 +1,6 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { DataSource } from '@js/common/data/data_source/data_source'; +import { normalizeLoadResult } from '@js/common/data/data_source/utils'; import $ from '@js/core/renderer'; import { noop } from '@js/core/utils/common'; import { compileGetter } from '@js/core/utils/data'; @@ -10,9 +13,6 @@ import { import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { isDefined } from '@js/core/utils/type'; -import { DataSource } from '@js/data/data_source/data_source'; -import { normalizeLoadResult } from '@js/data/data_source/utils'; -import eventsEngine from '@js/events/core/events_engine'; import errors from '@js/ui/widget/ui.errors'; import Selection from '@ts/ui/selection/m_selection'; diff --git a/packages/devextreme/js/__internal/ui/collection/m_collection_widget.live_update.ts b/packages/devextreme/js/__internal/ui/collection/m_collection_widget.live_update.ts index c25d64b03992..f34d4db5fd94 100644 --- a/packages/devextreme/js/__internal/ui/collection/m_collection_widget.live_update.ts +++ b/packages/devextreme/js/__internal/ui/collection/m_collection_widget.live_update.ts @@ -1,3 +1,5 @@ +import { indexByKey, insert, update } from '@js/common/data/array_utils'; +import { keysEqual } from '@js/common/data/utils'; import domAdapter from '@js/core/dom_adapter'; import $ from '@js/core/renderer'; import { findChanges } from '@js/core/utils/array_compare'; @@ -5,9 +7,6 @@ import { noop } from '@js/core/utils/common'; import { when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; -import { indexByKey, insert, update } from '@js/data/array_utils'; -// @ts-expect-error -import { keysEqual } from '@js/data/utils'; import CollectionWidget from './m_collection_widget.async'; diff --git a/packages/devextreme/js/__internal/ui/color_box/m_color_view.ts b/packages/devextreme/js/__internal/ui/color_box/m_color_view.ts index fa15351f6048..1968b94ee191 100644 --- a/packages/devextreme/js/__internal/ui/color_box/m_color_view.ts +++ b/packages/devextreme/js/__internal/ui/color_box/m_color_view.ts @@ -1,15 +1,15 @@ -import { locate, move } from '@js/animation/translator'; import Color from '@js/color'; +import { locate, move } from '@js/common/core/animation/translator'; +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { isCommandKeyPressed } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import Guid from '@js/core/guid'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { getHeight, getOuterHeight, getWidth } from '@js/core/utils/size'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { isCommandKeyPressed } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import Draggable from '@js/ui/draggable'; import Editor from '@js/ui/editor/editor'; import NumberBox from '@js/ui/number_box'; diff --git a/packages/devextreme/js/__internal/ui/context_menu/m_context_menu.ts b/packages/devextreme/js/__internal/ui/context_menu/m_context_menu.ts index db6054566a6b..30c11c7f6906 100644 --- a/packages/devextreme/js/__internal/ui/context_menu/m_context_menu.ts +++ b/packages/devextreme/js/__internal/ui/context_menu/m_context_menu.ts @@ -1,7 +1,11 @@ /* eslint-disable max-classes-per-file */ -import fx from '@js/animation/fx'; -import type { PositionConfig } from '@js/animation/position'; -import animationPosition from '@js/animation/position'; +import type { PositionConfig } from '@js/common/core/animation'; +import { fx } from '@js/common/core/animation'; +import animationPosition from '@js/common/core/animation/position'; +import { name as contextMenuEventName } from '@js/common/core/events/contextmenu'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import holdEvent from '@js/common/core/events/hold'; +import { addNamespace } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import domAdapter from '@js/core/dom_adapter'; @@ -19,10 +23,6 @@ import { isDefined, isFunction, isObject, isPlainObject, isRenderer, isWindow, } from '@js/core/utils/type'; import { getWindow, hasWindow } from '@js/core/utils/window'; -import { name as contextMenuEventName } from '@js/events/contextmenu'; -import eventsEngine from '@js/events/core/events_engine'; -import holdEvent from '@js/events/hold'; -import { addNamespace } from '@js/events/utils/index'; import type { Item } from '@js/ui/context_menu'; import type { Properties as OverlayProperties } from '@js/ui/overlay'; import type dxOverlay from '@js/ui/overlay'; @@ -716,7 +716,6 @@ class ContextMenu extends MenuBase { this._scrollToElement($item); const submenuPosition = this._getSubmenuPosition($item); - // @ts-expect-error animationPosition.setup($submenu, submenuPosition); }); } @@ -789,7 +788,6 @@ class ContextMenu extends MenuBase { fx.stop($submenu); } - // @ts-expect-error animationPosition.setup($submenu, submenuPosition); if (animation) { diff --git a/packages/devextreme/js/__internal/ui/date_box/m_date_box.base.ts b/packages/devextreme/js/__internal/ui/date_box/m_date_box.base.ts index b77ceedc7d34..af0d0c18a7e2 100644 --- a/packages/devextreme/js/__internal/ui/date_box/m_date_box.base.ts +++ b/packages/devextreme/js/__internal/ui/date_box/m_date_box.base.ts @@ -1,3 +1,5 @@ +import dateLocalization from '@js/common/core/localization/date'; +import messageLocalization from '@js/common/core/localization/message'; import config from '@js/core/config'; import devices from '@js/core/devices'; import browser from '@js/core/utils/browser'; @@ -9,8 +11,6 @@ import { each } from '@js/core/utils/iterator'; import { inputType } from '@js/core/utils/support'; import { isDate as isDateType, isNumeric, isString } from '@js/core/utils/type'; import { getWindow, hasWindow } from '@js/core/utils/window'; -import dateLocalization from '@js/localization/date'; -import messageLocalization from '@js/localization/message'; import DropDownEditor from '@ts/ui/drop_down_editor/m_drop_down_editor'; import Calendar from './m_date_box.strategy.calendar'; diff --git a/packages/devextreme/js/__internal/ui/date_box/m_date_box.mask.parts.ts b/packages/devextreme/js/__internal/ui/date_box/m_date_box.mask.parts.ts index f02403eab6ae..f22389d2aeec 100644 --- a/packages/devextreme/js/__internal/ui/date_box/m_date_box.mask.parts.ts +++ b/packages/devextreme/js/__internal/ui/date_box/m_date_box.mask.parts.ts @@ -1,7 +1,7 @@ +import { getPatternSetters } from '@js/common/core/localization/ldml/date.parser'; import { noop } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; import { fitIntoRange } from '@js/core/utils/math'; -import { getPatternSetters } from '@js/localization/ldml/date.parser'; const monthGetter = (date) => date.getMonth() + 1; diff --git a/packages/devextreme/js/__internal/ui/date_box/m_date_box.mask.ts b/packages/devextreme/js/__internal/ui/date_box/m_date_box.mask.ts index 3cc127de11ac..0d77af4f8eb6 100644 --- a/packages/devextreme/js/__internal/ui/date_box/m_date_box.mask.ts +++ b/packages/devextreme/js/__internal/ui/date_box/m_date_box.mask.ts @@ -1,3 +1,10 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace, isCommandKeyPressed, normalizeKeyName } from '@js/common/core/events/utils/index'; +import dateLocalization from '@js/common/core/localization/date'; +import defaultDateNames from '@js/common/core/localization/default_date_names'; +import { getFormat } from '@js/common/core/localization/ldml/date.format'; +import { getRegExpInfo } from '@js/common/core/localization/ldml/date.parser'; +import numberLocalization from '@js/common/core/localization/number'; import devices from '@js/core/devices'; import browser from '@js/core/utils/browser'; import { clipboardText } from '@js/core/utils/dom'; @@ -6,13 +13,6 @@ import { fitIntoRange, inRange, sign } from '@js/core/utils/math'; import { isDate, isDefined, isFunction, isString, } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace, isCommandKeyPressed, normalizeKeyName } from '@js/events/utils/index'; -import dateLocalization from '@js/localization/date'; -import defaultDateNames from '@js/localization/default_date_names'; -import { getFormat } from '@js/localization/ldml/date.format'; -import { getRegExpInfo } from '@js/localization/ldml/date.parser'; -import numberLocalization from '@js/localization/number'; import DateBoxBase from './m_date_box.base'; import { getDatePartIndexByPosition, renderDateParts } from './m_date_box.mask.parts'; diff --git a/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.calendar.ts b/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.calendar.ts index bec81621a3fc..f8262d92a7fc 100644 --- a/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.calendar.ts +++ b/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.calendar.ts @@ -1,9 +1,9 @@ +import messageLocalization from '@js/common/core/localization/message'; // @ts-expect-error import { splitPair } from '@js/core/utils/common'; import dateUtils from '@js/core/utils/date'; import { extend } from '@js/core/utils/extend'; import { isEmptyObject, isFunction } from '@js/core/utils/type'; -import messageLocalization from '@js/localization/message'; import Calendar from '@js/ui/calendar'; import { isMaterial } from '@js/ui/themes'; diff --git a/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.calendar_with_time.ts b/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.calendar_with_time.ts index 44daeef1e3bd..e8dde0f33e23 100644 --- a/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.calendar_with_time.ts +++ b/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.calendar_with_time.ts @@ -1,9 +1,9 @@ +import dateLocalization from '@js/common/core/localization/date'; import $ from '@js/core/renderer'; import dateUtils from '@js/core/utils/date'; import { extend } from '@js/core/utils/extend'; import { getWidth } from '@js/core/utils/size'; import { getWindow } from '@js/core/utils/window'; -import dateLocalization from '@js/localization/date'; import Box from '@js/ui/box'; import CalendarStrategy from './m_date_box.strategy.calendar'; diff --git a/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.date_view.ts b/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.date_view.ts index ce25b0f19ac6..bdaea2cfd82a 100644 --- a/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.date_view.ts +++ b/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.date_view.ts @@ -1,8 +1,8 @@ +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { inputType } from '@js/core/utils/support'; import { getWindow } from '@js/core/utils/window'; -import messageLocalization from '@js/localization/message'; import DateBoxStrategy from './m_date_box.strategy'; import dateUtils from './m_date_utils'; diff --git a/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.list.ts b/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.list.ts index c114e8f99fb0..9c3a104fa91b 100644 --- a/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.list.ts +++ b/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.list.ts @@ -1,12 +1,12 @@ import '@ts/ui/list/modules/m_selection'; +import dateLocalization from '@js/common/core/localization/date'; import { ensureDefined, noop } from '@js/core/utils/common'; import dateSerialization from '@js/core/utils/date_serialization'; import { extend } from '@js/core/utils/extend'; import { getHeight, getOuterHeight } from '@js/core/utils/size'; import { isDate } from '@js/core/utils/type'; import { getWindow } from '@js/core/utils/window'; -import dateLocalization from '@js/localization/date'; import List from '@js/ui/list_light'; import { getSizeValue } from '@ts/ui/drop_down_editor/m_utils'; diff --git a/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.ts b/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.ts index 2dc3574f0859..4928de858ac8 100644 --- a/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.ts +++ b/packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.ts @@ -1,8 +1,8 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import dateLocalization from '@js/common/core/localization/date'; import Class from '@js/core/class'; import $ from '@js/core/renderer'; import { noop } from '@js/core/utils/common'; -import eventsEngine from '@js/events/core/events_engine'; -import dateLocalization from '@js/localization/date'; const { abstract } = Class; diff --git a/packages/devextreme/js/__internal/ui/date_box/m_date_utils.ts b/packages/devextreme/js/__internal/ui/date_box/m_date_utils.ts index 3e2c68199587..28429841f8b0 100644 --- a/packages/devextreme/js/__internal/ui/date_box/m_date_utils.ts +++ b/packages/devextreme/js/__internal/ui/date_box/m_date_utils.ts @@ -1,8 +1,8 @@ +import dateLocalization from '@js/common/core/localization/date'; import $ from '@js/core/renderer'; import dateSerialization from '@js/core/utils/date_serialization'; import { each } from '@js/core/utils/iterator'; import { isDate } from '@js/core/utils/type'; -import dateLocalization from '@js/localization/date'; const DATE_COMPONENTS = ['year', 'day', 'month', 'day']; const TIME_COMPONENTS = ['hours', 'minutes', 'seconds', 'milliseconds']; diff --git a/packages/devextreme/js/__internal/ui/date_box/m_date_view.ts b/packages/devextreme/js/__internal/ui/date_box/m_date_view.ts index f67d639bb999..ed2217734bbe 100644 --- a/packages/devextreme/js/__internal/ui/date_box/m_date_view.ts +++ b/packages/devextreme/js/__internal/ui/date_box/m_date_view.ts @@ -1,9 +1,9 @@ +import dateLocalization from '@js/common/core/localization/date'; import registerComponent from '@js/core/component_registrator'; import $ from '@js/core/renderer'; import dateUtils from '@js/core/utils/date'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; -import dateLocalization from '@js/localization/date'; import Editor from '@js/ui/editor/editor'; import uiDateUtils from './m_date_utils'; diff --git a/packages/devextreme/js/__internal/ui/date_box/m_date_view_roller.ts b/packages/devextreme/js/__internal/ui/date_box/m_date_view_roller.ts index c14f5ee0b266..74ca62286777 100644 --- a/packages/devextreme/js/__internal/ui/date_box/m_date_view_roller.ts +++ b/packages/devextreme/js/__internal/ui/date_box/m_date_view_roller.ts @@ -1,14 +1,14 @@ -import fx from '@js/animation/fx'; -import { resetPosition } from '@js/animation/translator'; +import { fx } from '@js/common/core/animation'; +import { resetPosition } from '@js/common/core/animation/translator'; +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { getHeight } from '@js/core/utils/size'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; import { convertToLocation } from '@ts/ui/scroll_view/utils/convert_location'; import Scrollable from '../scroll_view/m_scrollable'; diff --git a/packages/devextreme/js/__internal/ui/date_box/m_time_view.ts b/packages/devextreme/js/__internal/ui/date_box/m_time_view.ts index 3f3205139499..c146f763a4ed 100644 --- a/packages/devextreme/js/__internal/ui/date_box/m_time_view.ts +++ b/packages/devextreme/js/__internal/ui/date_box/m_time_view.ts @@ -1,7 +1,7 @@ +import dateLocalization from '@js/common/core/localization/date'; import registerComponent from '@js/core/component_registrator'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; -import dateLocalization from '@js/localization/date'; import Box from '@js/ui/box'; import Editor from '@js/ui/editor/editor'; import NumberBox from '@js/ui/number_box'; diff --git a/packages/devextreme/js/__internal/ui/date_range_box/m_date_range_box.ts b/packages/devextreme/js/__internal/ui/date_range_box/m_date_range_box.ts index 5261da4a7cef..a9a104d12dd4 100644 --- a/packages/devextreme/js/__internal/ui/date_range_box/m_date_range_box.ts +++ b/packages/devextreme/js/__internal/ui/date_range_box/m_date_range_box.ts @@ -1,4 +1,7 @@ import type { Position } from '@js/common'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import config from '@js/core/config'; import devices from '@js/core/devices'; @@ -11,9 +14,6 @@ import { extend } from '@js/core/utils/extend'; import { getImageContainer } from '@js/core/utils/icon'; import { camelize } from '@js/core/utils/inflector'; import { each } from '@js/core/utils/iterator'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import type { Properties } from '@js/ui/date_range_box'; import Editor from '@js/ui/editor/editor'; import { current, isFluent, isMaterial } from '@js/ui/themes'; diff --git a/packages/devextreme/js/__internal/ui/date_range_box/m_multiselect_date_box.ts b/packages/devextreme/js/__internal/ui/date_range_box/m_multiselect_date_box.ts index ebaa709861c0..ef6369966465 100644 --- a/packages/devextreme/js/__internal/ui/date_range_box/m_multiselect_date_box.ts +++ b/packages/devextreme/js/__internal/ui/date_range_box/m_multiselect_date_box.ts @@ -1,8 +1,8 @@ // eslint-disable-next-line max-classes-per-file +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; import $ from '@js/core/renderer'; import { getWidth } from '@js/core/utils/size'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils'; // eslint-disable-next-line @typescript-eslint/consistent-type-imports import type { DateBoxBase, Properties } from '@js/ui/date_box'; import DateBox from '@js/ui/date_box'; diff --git a/packages/devextreme/js/__internal/ui/date_range_box/strategy/m_rangeCalendar.ts b/packages/devextreme/js/__internal/ui/date_range_box/strategy/m_rangeCalendar.ts index c8137ddf56da..e56696abe042 100644 --- a/packages/devextreme/js/__internal/ui/date_range_box/strategy/m_rangeCalendar.ts +++ b/packages/devextreme/js/__internal/ui/date_range_box/strategy/m_rangeCalendar.ts @@ -1,6 +1,6 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; import { extend } from '@js/core/utils/extend'; import { isFunction } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; import type Calendar from '@js/ui/calendar'; import type DateBox from '@js/ui/date_box'; diff --git a/packages/devextreme/js/__internal/ui/drawer/m_drawer.animation.ts b/packages/devextreme/js/__internal/ui/drawer/m_drawer.animation.ts index b4249c6bc0c0..bdd3d9e52b1b 100644 --- a/packages/devextreme/js/__internal/ui/drawer/m_drawer.animation.ts +++ b/packages/devextreme/js/__internal/ui/drawer/m_drawer.animation.ts @@ -1,4 +1,4 @@ -import fx from '@js/animation/fx'; +import { fx } from '@js/common/core/animation'; import { camelize } from '@js/core/utils/inflector'; export const animation = { diff --git a/packages/devextreme/js/__internal/ui/drawer/m_drawer.rendering.strategy.overlap.ts b/packages/devextreme/js/__internal/ui/drawer/m_drawer.rendering.strategy.overlap.ts index 5754cccc4dfc..ffa6c038f006 100644 --- a/packages/devextreme/js/__internal/ui/drawer/m_drawer.rendering.strategy.overlap.ts +++ b/packages/devextreme/js/__internal/ui/drawer/m_drawer.rendering.strategy.overlap.ts @@ -1,4 +1,4 @@ -import { move } from '@js/animation/translator'; +import { move } from '@js/common/core/animation/translator'; import $ from '@js/core/renderer'; import { ensureDefined } from '@js/core/utils/common'; import { camelize } from '@js/core/utils/inflector'; diff --git a/packages/devextreme/js/__internal/ui/drawer/m_drawer.rendering.strategy.push.ts b/packages/devextreme/js/__internal/ui/drawer/m_drawer.rendering.strategy.push.ts index 77520c1e1205..ac51bd026c4a 100644 --- a/packages/devextreme/js/__internal/ui/drawer/m_drawer.rendering.strategy.push.ts +++ b/packages/devextreme/js/__internal/ui/drawer/m_drawer.rendering.strategy.push.ts @@ -1,4 +1,4 @@ -import { move } from '@js/animation/translator'; +import { move } from '@js/common/core/animation/translator'; import $ from '@js/core/renderer'; import { animation } from './m_drawer.animation'; diff --git a/packages/devextreme/js/__internal/ui/drawer/m_drawer.ts b/packages/devextreme/js/__internal/ui/drawer/m_drawer.ts index f1ad55b444c1..1b3692e20630 100644 --- a/packages/devextreme/js/__internal/ui/drawer/m_drawer.ts +++ b/packages/devextreme/js/__internal/ui/drawer/m_drawer.ts @@ -1,4 +1,7 @@ -import fx from '@js/animation/fx'; +import { fx } from '@js/common/core/animation'; +import { name as CLICK_EVENT_NAME } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { triggerResizeEvent } from '@js/common/core/events/visibility_change'; import registerComponent from '@js/core/component_registrator'; import { getPublicElement } from '@js/core/element'; import $ from '@js/core/renderer'; @@ -8,9 +11,6 @@ import { extend } from '@js/core/utils/extend'; import { getBoundingRect } from '@js/core/utils/position'; import { isDefined, isFunction } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import { name as CLICK_EVENT_NAME } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { triggerResizeEvent } from '@js/events/visibility_change'; import Widget from '@js/ui/widget/ui.widget'; import { animation } from './m_drawer.animation'; diff --git a/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_button.ts b/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_button.ts index 6a85f9d55e71..577e44ea8826 100644 --- a/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_button.ts +++ b/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_button.ts @@ -1,7 +1,7 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; -import eventsEngine from '@js/events/core/events_engine'; -import messageLocalization from '@js/localization/message'; import Button from '@js/ui/button'; import TextEditorButton from '../text_box/texteditor_button_collection/m_button'; diff --git a/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_editor.ts b/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_editor.ts index b6d00e1c7216..36b252952a40 100644 --- a/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_editor.ts +++ b/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_editor.ts @@ -1,5 +1,9 @@ -import animationPosition from '@js/animation/position'; -import { locate, move } from '@js/animation/translator'; +import animationPosition from '@js/common/core/animation/position'; +import { locate, move } from '@js/common/core/animation/translator'; +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace, isCommandKeyPressed, normalizeKeyName } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import { getPublicElement } from '@js/core/element'; @@ -16,10 +20,6 @@ import { each } from '@js/core/utils/iterator'; import { getDefaultAlignment } from '@js/core/utils/position'; import { isDefined } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace, isCommandKeyPressed, normalizeKeyName } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import Popup from '@js/ui/popup/ui.popup'; import TextBox from '@js/ui/text_box'; import { focused } from '@js/ui/widget/selectors'; @@ -731,9 +731,7 @@ const DropDownEditor = TextBox.inherit({ let positionSide = 'bottom'; if (this._popup && this._popup.option('visible')) { - // @ts-expect-error const { top: myTop } = animationPosition.setup(this.$element()); - // @ts-expect-error const { top: popupTop } = animationPosition.setup(this._popup.$content()); positionSide = (myTop + this.option('popupPosition').offset.v) > popupTop ? 'bottom' : 'top'; diff --git a/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_list.ts b/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_list.ts index 2bc92c415f2b..13c7999b3a69 100644 --- a/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_list.ts +++ b/packages/devextreme/js/__internal/ui/drop_down_editor/m_drop_down_list.ts @@ -1,3 +1,7 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; +import dataQuery from '@js/common/data/query'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import Guid from '@js/core/guid'; @@ -15,10 +19,6 @@ import { each } from '@js/core/utils/iterator'; import { getOuterHeight } from '@js/core/utils/size'; import { isDefined, isObject, isWindow } from '@js/core/utils/type'; import { getWindow } from '@js/core/utils/window'; -import dataQuery from '@js/data/query'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import DataExpressionMixin from '@js/ui/editor/ui.data_expression'; import List from '@js/ui/list_light'; import errors from '@js/ui/widget/ui.errors'; diff --git a/packages/devextreme/js/__internal/ui/editor/m_data_expression.ts b/packages/devextreme/js/__internal/ui/editor/m_data_expression.ts index c61e64b46529..fae1c38874c6 100644 --- a/packages/devextreme/js/__internal/ui/editor/m_data_expression.ts +++ b/packages/devextreme/js/__internal/ui/editor/m_data_expression.ts @@ -1,3 +1,6 @@ +import ArrayStore from '@js/common/data/array_store'; +import DataHelperMixin from '@js/common/data/data_helper'; +import DataSource from '@js/common/data/data_source'; import { ensureDefined, noop } from '@js/core/utils/common'; import { compileGetter, @@ -9,9 +12,6 @@ import { isDefined, isFunction, isObject as isObjectType, isString, } from '@js/core/utils/type'; import variableWrapper from '@js/core/utils/variable_wrapper'; -import ArrayStore from '@js/data/array_store'; -import { DataSource } from '@js/data/data_source/data_source'; -import DataHelperMixin from '@js/data_helper'; const DataExpressionMixin = extend({}, DataHelperMixin, { diff --git a/packages/devextreme/js/__internal/ui/editor/m_editor.ts b/packages/devextreme/js/__internal/ui/editor/m_editor.ts index fc2201b1b3e3..ceb25826f671 100644 --- a/packages/devextreme/js/__internal/ui/editor/m_editor.ts +++ b/packages/devextreme/js/__internal/ui/editor/m_editor.ts @@ -1,3 +1,5 @@ +import EventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace, normalizeKeyName } from '@js/common/core/events/utils/index'; import { data } from '@js/core/element_data'; import Guid from '@js/core/guid'; import $ from '@js/core/renderer'; @@ -5,8 +7,6 @@ import Callbacks from '@js/core/utils/callbacks'; import { noop } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; import { hasWindow } from '@js/core/utils/window'; -import EventsEngine from '@js/events/core/events_engine'; -import { addNamespace, normalizeKeyName } from '@js/events/utils/index'; import ValidationEngine from '@js/ui/validation_engine'; import ValidationMessage from '@js/ui/validation_message'; import Widget from '@js/ui/widget/ui.widget'; diff --git a/packages/devextreme/js/__internal/ui/form/components/m_field_item.ts b/packages/devextreme/js/__internal/ui/form/components/m_field_item.ts index 8a30e848a70b..c54022e26604 100644 --- a/packages/devextreme/js/__internal/ui/form/components/m_field_item.ts +++ b/packages/devextreme/js/__internal/ui/form/components/m_field_item.ts @@ -1,9 +1,9 @@ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; import { getPublicElement } from '@js/core/element'; import $ from '@js/core/renderer'; import { captionize } from '@js/core/utils/inflector'; import { format } from '@js/core/utils/string'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; import { isMaterialBased } from '@js/ui/themes'; import Validator from '@js/ui/validator'; import errors from '@js/ui/widget/ui.errors'; diff --git a/packages/devextreme/js/__internal/ui/form/m_form.layout_manager.ts b/packages/devextreme/js/__internal/ui/form/m_form.layout_manager.ts index 591a96c1fc71..870f9bfe3735 100644 --- a/packages/devextreme/js/__internal/ui/form/m_form.layout_manager.ts +++ b/packages/devextreme/js/__internal/ui/form/m_form.layout_manager.ts @@ -4,6 +4,9 @@ import '@js/ui/check_box'; import '@js/ui/date_box'; import '@js/ui/button'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { removeEvent } from '@js/common/core/events/remove'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import $ from '@js/core/renderer'; import { normalizeIndexes } from '@js/core/utils/array'; @@ -17,9 +20,6 @@ import { import variableWrapper from '@js/core/utils/variable_wrapper'; // @ts-expect-error import { getCurrentScreenFactor, hasWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import { removeEvent } from '@js/events/remove'; -import messageLocalization from '@js/localization/message'; import ResponsiveBox from '@js/ui/responsive_box'; import Widget from '@js/ui/widget/ui.widget'; diff --git a/packages/devextreme/js/__internal/ui/form/m_form.ts b/packages/devextreme/js/__internal/ui/form/m_form.ts index 64e1f0f5463e..fde3b04ae54d 100644 --- a/packages/devextreme/js/__internal/ui/form/m_form.ts +++ b/packages/devextreme/js/__internal/ui/form/m_form.ts @@ -2,6 +2,9 @@ import './m_form.layout_manager'; import '@js/ui/validation_summary'; import '@js/ui/validation_group'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { triggerResizeEvent, triggerShownEvent } from '@js/common/core/events/visibility_change'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import config from '@js/core/config'; import { getPublicElement } from '@js/core/element'; @@ -17,9 +20,6 @@ import { } from '@js/core/utils/type'; // @ts-expect-error import { defaultScreenFactorFunc, getCurrentScreenFactor, hasWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import { triggerResizeEvent, triggerShownEvent } from '@js/events/visibility_change'; -import messageLocalization from '@js/localization/message'; import Editor from '@js/ui/editor/editor'; import Scrollable from '@js/ui/scroll_view/ui.scrollable'; import TabPanel from '@js/ui/tab_panel'; diff --git a/packages/devextreme/js/__internal/ui/hierarchical_collection/m_data_adapter.ts b/packages/devextreme/js/__internal/ui/hierarchical_collection/m_data_adapter.ts index 6825fae3427e..38db373c7b0e 100644 --- a/packages/devextreme/js/__internal/ui/hierarchical_collection/m_data_adapter.ts +++ b/packages/devextreme/js/__internal/ui/hierarchical_collection/m_data_adapter.ts @@ -1,10 +1,10 @@ +import query from '@js/common/data/query'; +import storeHelper from '@js/common/data/store_helper'; import Class from '@js/core/class'; import { noop } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { isDefined, isFunction } from '@js/core/utils/type'; -import query from '@js/data/query'; -import storeHelper from '@js/data/store_helper'; import TextBox from '@js/ui/text_box'; import errors from '@js/ui/widget/ui.errors'; import uiSearchBoxMixin from '@js/ui/widget/ui.search_box_mixin'; @@ -374,6 +374,7 @@ const DataAdapter = Class.inherit({ }, getChildrenNodes(parentKey) { + // @ts-expect-error return query(this._dataStructure, { langParams: this.options.langParams }).filter(['internalFields.parentKey', parentKey]).toArray(); }, @@ -479,6 +480,7 @@ const DataAdapter = Class.inherit({ dataStructure = dataStructure || this._initialDataStructure; + // @ts-expect-error return query(dataStructure, { langParams: this.options.langParams }).filter(criteria).toArray(); }, diff --git a/packages/devextreme/js/__internal/ui/html_editor/m_html_editor.ts b/packages/devextreme/js/__internal/ui/html_editor/m_html_editor.ts index bb54fda96c46..dee7738ecb12 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/m_html_editor.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/m_html_editor.ts @@ -1,5 +1,11 @@ import './converters/m_delta'; +// @ts-expect-error +import { Event as dxEvent } from '@js/common/core/events'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import scrollEvents from '@js/common/core/events/gesture/emitter.gesture.scroll'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import config from '@js/core/config'; import devices from '@js/core/devices'; @@ -16,12 +22,6 @@ import { import { Deferred } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { isDefined, isFunction } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import scrollEvents from '@js/events/gesture/emitter.gesture.scroll'; -// @ts-expect-error -import { Event as dxEvent } from '@js/events/index'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace } from '@js/events/utils/index'; import Editor from '@js/ui/editor/editor'; import { prepareScrollData } from '@ts/ui/text_box/m_utils.scroll'; diff --git a/packages/devextreme/js/__internal/ui/html_editor/modules/m_dropImage.ts b/packages/devextreme/js/__internal/ui/html_editor/modules/m_dropImage.ts index 6f8ceef66a34..eb734a59f814 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/modules/m_dropImage.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/modules/m_dropImage.ts @@ -1,8 +1,8 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; import browser from '@js/core/utils/browser'; import { each } from '@js/core/utils/iterator'; import { getWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; import Quill from 'devextreme-quill'; import BaseModule from './m_base'; diff --git a/packages/devextreme/js/__internal/ui/html_editor/modules/m_imageCursor.ts b/packages/devextreme/js/__internal/ui/html_editor/modules/m_imageCursor.ts index a8f042f84d32..e3ced1a7faa3 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/modules/m_imageCursor.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/modules/m_imageCursor.ts @@ -1,5 +1,5 @@ -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; import Quill from 'devextreme-quill'; import BaseModule from './m_base'; diff --git a/packages/devextreme/js/__internal/ui/html_editor/modules/m_imageUpload.ts b/packages/devextreme/js/__internal/ui/html_editor/modules/m_imageUpload.ts index 14b7814d9d4d..ede71155ee4d 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/modules/m_imageUpload.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/modules/m_imageUpload.ts @@ -1,8 +1,8 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { isDefined } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; import FileUploader from '@js/ui/file_uploader'; import Quill from 'devextreme-quill'; diff --git a/packages/devextreme/js/__internal/ui/html_editor/modules/m_mentions.ts b/packages/devextreme/js/__internal/ui/html_editor/modules/m_mentions.ts index a2499d886156..a388a9a09263 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/modules/m_mentions.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/modules/m_mentions.ts @@ -1,9 +1,9 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; import { getPublicElement } from '@js/core/element'; import $ from '@js/core/renderer'; import { compileGetter } from '@js/core/utils/data'; import { extend } from '@js/core/utils/extend'; import { isString } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; import type List from '@js/ui/list'; import type Popup from '@js/ui/popup'; import Quill from 'devextreme-quill'; diff --git a/packages/devextreme/js/__internal/ui/html_editor/modules/m_popup.ts b/packages/devextreme/js/__internal/ui/html_editor/modules/m_popup.ts index c9c1887b245d..3bd2b87f3245 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/modules/m_popup.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/modules/m_popup.ts @@ -1,8 +1,8 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { getHeight } from '@js/core/utils/size'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; import type ListType from '@js/ui/list'; import List from '@js/ui/list_light'; import Popup from '@js/ui/popup'; diff --git a/packages/devextreme/js/__internal/ui/html_editor/modules/m_resizing.ts b/packages/devextreme/js/__internal/ui/html_editor/modules/m_resizing.ts index 886c663b42d9..cde4c424f0f7 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/modules/m_resizing.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/modules/m_resizing.ts @@ -1,4 +1,7 @@ -import { move } from '@js/animation/translator'; +import { move } from '@js/common/core/animation/translator'; +import { name as ClickEvent } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace, normalizeKeyName } from '@js/common/core/events/utils/index'; import devices from '@js/core/devices'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; @@ -6,9 +9,6 @@ import { getBoundingRect } from '@js/core/utils/position'; import { getHeight, getOuterHeight, getOuterWidth, getWidth, } from '@js/core/utils/size'; -import { name as ClickEvent } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace, normalizeKeyName } from '@js/events/utils/index'; import Resizable from '@js/ui/resizable'; import Quill from 'devextreme-quill'; diff --git a/packages/devextreme/js/__internal/ui/html_editor/modules/m_tableContextMenu.ts b/packages/devextreme/js/__internal/ui/html_editor/modules/m_tableContextMenu.ts index d2311df2fff6..c777642b350d 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/modules/m_tableContextMenu.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/modules/m_tableContextMenu.ts @@ -1,11 +1,11 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import localizationMessage from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { camelize, titleize } from '@js/core/utils/inflector'; import { each } from '@js/core/utils/iterator'; import { isObject, isString } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; -import localizationMessage from '@js/localization/message'; import type { Item } from '@js/ui/context_menu'; import ContextMenu from '@js/ui/context_menu'; import Quill from 'devextreme-quill'; diff --git a/packages/devextreme/js/__internal/ui/html_editor/modules/m_tableResizing.ts b/packages/devextreme/js/__internal/ui/html_editor/modules/m_tableResizing.ts index b5661d37ac40..8b0896f416a5 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/modules/m_tableResizing.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/modules/m_tableResizing.ts @@ -1,4 +1,6 @@ -import { move } from '@js/animation/translator'; +import { move } from '@js/common/core/animation/translator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; @@ -8,8 +10,6 @@ import _windowResizeCallbacks from '@js/core/utils/resize_callbacks'; import { getHeight, getOuterHeight, getOuterWidth } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; import { getWindow, hasWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; import type { Properties } from '@js/ui/draggable'; import Draggable from '@js/ui/draggable'; diff --git a/packages/devextreme/js/__internal/ui/html_editor/modules/m_toolbar.ts b/packages/devextreme/js/__internal/ui/html_editor/modules/m_toolbar.ts index 078052d79ab9..5db29446d347 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/modules/m_toolbar.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/modules/m_toolbar.ts @@ -2,6 +2,9 @@ import '@js/ui/select_box'; import '@ts/ui/color_box/m_color_view'; import '@js/ui/number_box'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import localizationMessage from '@js/common/core/localization/message'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; @@ -10,9 +13,6 @@ import { each } from '@js/core/utils/iterator'; import { isDefined, isEmptyObject, isObject, isString, } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; -import localizationMessage from '@js/localization/message'; import type { Item } from '@js/ui/toolbar'; import Toolbar from '@js/ui/toolbar'; import errors from '@js/ui/widget/ui.errors'; diff --git a/packages/devextreme/js/__internal/ui/html_editor/ui/m_formDialog.ts b/packages/devextreme/js/__internal/ui/html_editor/ui/m_formDialog.ts index 432b67b44bf6..a0930e02d7de 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/ui/m_formDialog.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/ui/m_formDialog.ts @@ -1,3 +1,4 @@ +import localizationMessage from '@js/common/core/localization/message'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; import type { DeferredObj } from '@js/core/utils/deferred'; @@ -8,7 +9,6 @@ import { getCurrentScreenFactor, hasWindow, } from '@js/core/utils/window'; -import localizationMessage from '@js/localization/message'; import Form from '@js/ui/form'; import Popup from '@js/ui/popup'; import { isFluent, isMaterialBased } from '@js/ui/themes'; diff --git a/packages/devextreme/js/__internal/ui/html_editor/utils/m_image_uploader_helper.ts b/packages/devextreme/js/__internal/ui/html_editor/utils/m_image_uploader_helper.ts index 5020b1e2365c..0e4b344ece1c 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/utils/m_image_uploader_helper.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/utils/m_image_uploader_helper.ts @@ -1,11 +1,11 @@ /* eslint-disable max-classes-per-file */ +import localizationMessage from '@js/common/core/localization/message'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { map } from '@js/core/utils/iterator'; import { getHeight, getWidth } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; -import localizationMessage from '@js/localization/message'; import ButtonGroup from '@js/ui/button_group'; import FileUploader from '@js/ui/file_uploader'; import TextBox from '@js/ui/text_box'; diff --git a/packages/devextreme/js/__internal/ui/html_editor/utils/m_toolbar_helper.ts b/packages/devextreme/js/__internal/ui/html_editor/utils/m_toolbar_helper.ts index f107910b39a8..fd601a7300c9 100644 --- a/packages/devextreme/js/__internal/ui/html_editor/utils/m_toolbar_helper.ts +++ b/packages/devextreme/js/__internal/ui/html_editor/utils/m_toolbar_helper.ts @@ -1,10 +1,10 @@ +import localizationMessage from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { camelize } from '@js/core/utils/inflector'; import { each } from '@js/core/utils/iterator'; import { getOuterHeight, getOuterWidth, getWidth } from '@js/core/utils/size'; import { isBoolean, isDefined } from '@js/core/utils/type'; import { getWindow } from '@js/core/utils/window'; -import localizationMessage from '@js/localization/message'; import ButtonGroup from '@js/ui/button_group'; import ColorBox from '@js/ui/color_box'; import Form from '@js/ui/form'; diff --git a/packages/devextreme/js/__internal/ui/list/m_list.base.ts b/packages/devextreme/js/__internal/ui/list/m_list.base.ts index 42c7cdc16af6..e12df90ab1f8 100644 --- a/packages/devextreme/js/__internal/ui/list/m_list.base.ts +++ b/packages/devextreme/js/__internal/ui/list/m_list.base.ts @@ -1,4 +1,9 @@ -import fx from '@js/animation/fx'; +import { fx } from '@js/common/core/animation'; +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { end as swipeEventEnd } from '@js/common/core/events/swipe'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import devices from '@js/core/devices'; import { getPublicElement } from '@js/core/element'; import Guid from '@js/core/guid'; @@ -13,11 +18,6 @@ import { each } from '@js/core/utils/iterator'; import { getHeight, getOuterHeight, setHeight } from '@js/core/utils/size'; import { isDefined, isPlainObject } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { end as swipeEventEnd } from '@js/events/swipe'; -import { addNamespace } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import Button from '@js/ui/button'; import CollectionWidget from '@js/ui/collection/ui.collection_widget.live_update'; import ScrollView from '@js/ui/scroll_view'; diff --git a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.context.ts b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.context.ts index 48ac21a6214d..4844e6a695bf 100644 --- a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.context.ts +++ b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.context.ts @@ -1,6 +1,6 @@ +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { getOuterHeight, getOuterWidth } from '@js/core/utils/size'; -import messageLocalization from '@js/localization/message'; import Overlay from '@js/ui/overlay/ui.overlay'; import { ListBase } from './m_list.base'; diff --git a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.reorder.ts b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.reorder.ts index 979bf0e05366..927458f864b5 100644 --- a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.reorder.ts +++ b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.reorder.ts @@ -1,8 +1,8 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { isMouseEvent } from '@js/common/core/events/utils/index'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { getWidth, setWidth } from '@js/core/utils/size'; -import eventsEngine from '@js/events/core/events_engine'; -import { isMouseEvent } from '@js/events/utils/index'; import Sortable from '@js/ui/sortable'; import EditDecorator from './m_list.edit.decorator'; diff --git a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.selection.ts b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.selection.ts index 439109aaafe5..e0a5ff758ec2 100644 --- a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.selection.ts +++ b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.selection.ts @@ -1,10 +1,10 @@ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { Deferred, type DeferredObj } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import CheckBox from '@js/ui/check_box'; import RadioButton from '@js/ui/radio_group/radio_button'; import errors from '@js/ui/widget/ui.errors'; diff --git a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.swipe.ts b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.swipe.ts index 21211b6ce514..92034e437435 100644 --- a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.swipe.ts +++ b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.swipe.ts @@ -1,5 +1,5 @@ -import fx from '@js/animation/fx'; -import { move } from '@js/animation/translator'; +import { fx } from '@js/common/core/animation'; +import { move } from '@js/common/core/animation/translator'; import { Deferred } from '@js/core/utils/deferred'; import { getWidth } from '@js/core/utils/size'; diff --git a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.switchable.button.ts b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.switchable.button.ts index 73b27f305daa..dfe55b474bd0 100644 --- a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.switchable.button.ts +++ b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.switchable.button.ts @@ -1,7 +1,7 @@ -import fx from '@js/animation/fx'; +import { fx } from '@js/common/core/animation'; +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { getOuterWidth, getWidth } from '@js/core/utils/size'; -import messageLocalization from '@js/localization/message'; import Button from '@js/ui/button'; import { isMaterialBased } from '@js/ui/themes'; diff --git a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.switchable.slide.ts b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.switchable.slide.ts index 06bf94d30bf7..81878f22113c 100644 --- a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.switchable.slide.ts +++ b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.switchable.slide.ts @@ -1,13 +1,13 @@ -import fx from '@js/animation/fx'; -import { locate, move } from '@js/animation/translator'; +import { fx } from '@js/common/core/animation'; +import { locate, move } from '@js/common/core/animation/translator'; +import { name as clickEventName } from '@js/common/core/events/click'; +import { active } from '@js/common/core/events/core/emitter.feedback'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { noop } from '@js/core/utils/common'; import { getOuterWidth, setWidth } from '@js/core/utils/size'; -import { name as clickEventName } from '@js/events/click'; -import { active } from '@js/events/core/emitter.feedback'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import ActionSheet from '@js/ui/action_sheet'; import { isMaterialBased } from '@js/ui/themes'; diff --git a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.switchable.ts b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.switchable.ts index 320f64e8804d..c2a2c7cbe771 100644 --- a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.switchable.ts +++ b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.switchable.ts @@ -1,10 +1,10 @@ +import { active } from '@js/common/core/events/core/emitter.feedback'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace } from '@js/common/core/events/utils/index'; import $ from '@js/core/renderer'; import { noop } from '@js/core/utils/common'; import { getOuterHeight, setHeight } from '@js/core/utils/size'; -import { active } from '@js/events/core/emitter.feedback'; -import eventsEngine from '@js/events/core/events_engine'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace } from '@js/events/utils/index'; import EditDecorator from './m_list.edit.decorator'; diff --git a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.ts b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.ts index 6eede70a613f..cf883ae334c3 100644 --- a/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.ts +++ b/packages/devextreme/js/__internal/ui/list/m_list.edit.decorator.ts @@ -1,14 +1,14 @@ -import Class from '@js/core/class'; -import $ from '@js/core/renderer'; -import { noop } from '@js/core/utils/common'; -import { getWidth } from '@js/core/utils/size'; -import eventsEngine from '@js/events/core/events_engine'; +import eventsEngine from '@js/common/core/events/core/events_engine'; import { end as swipeEventEnd, start as swipeEventStart, swipe as swipeEventSwipe, -} from '@js/events/swipe'; -import { addNamespace } from '@js/events/utils/index'; +} from '@js/common/core/events/swipe'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import Class from '@js/core/class'; +import $ from '@js/core/renderer'; +import { noop } from '@js/core/utils/common'; +import { getWidth } from '@js/core/utils/size'; const LIST_EDIT_DECORATOR = 'dxListEditDecorator'; const SWIPE_START_EVENT_NAME = addNamespace(swipeEventStart, LIST_EDIT_DECORATOR); diff --git a/packages/devextreme/js/__internal/ui/list/m_list.edit.strategy.grouped.ts b/packages/devextreme/js/__internal/ui/list/m_list.edit.strategy.grouped.ts index a1804e5b7877..9dc94180c61f 100644 --- a/packages/devextreme/js/__internal/ui/list/m_list.edit.strategy.grouped.ts +++ b/packages/devextreme/js/__internal/ui/list/m_list.edit.strategy.grouped.ts @@ -1,8 +1,8 @@ +import query from '@js/common/data/query'; +import storeHelper from '@js/common/data/store_helper'; import $ from '@js/core/renderer'; import { each } from '@js/core/utils/iterator'; import { isNumeric } from '@js/core/utils/type'; -import query from '@js/data/query'; -import storeHelper from '@js/data/store_helper'; import EditStrategy from '@ts/ui/collection/m_collection_widget.edit.strategy.plain'; const LIST_ITEM_CLASS = 'dx-list-item'; diff --git a/packages/devextreme/js/__internal/ui/list/m_list.edit.ts b/packages/devextreme/js/__internal/ui/list/m_list.edit.ts index c464c048dcaf..5b8f8d09ec23 100644 --- a/packages/devextreme/js/__internal/ui/list/m_list.edit.ts +++ b/packages/devextreme/js/__internal/ui/list/m_list.edit.ts @@ -1,7 +1,7 @@ +import { isTouchEvent } from '@js/common/core/events/utils/index'; +import localizationMessage from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; -import { isTouchEvent } from '@js/events/utils/index'; -import localizationMessage from '@js/localization/message'; import { ListBase } from './m_list.base'; import EditProvider from './m_list.edit.provider'; diff --git a/packages/devextreme/js/__internal/ui/m_accordion.ts b/packages/devextreme/js/__internal/ui/m_accordion.ts index a1c1f08e94fb..9dff961f85a7 100644 --- a/packages/devextreme/js/__internal/ui/m_accordion.ts +++ b/packages/devextreme/js/__internal/ui/m_accordion.ts @@ -1,4 +1,7 @@ -import fx from '@js/animation/fx'; +import { fx } from '@js/common/core/animation'; +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import domAdapter from '@js/core/dom_adapter'; @@ -12,9 +15,6 @@ import { getImageContainer } from '@js/core/utils/icon'; import * as iteratorUtils from '@js/core/utils/iterator'; import { getHeight, getOuterHeight, setHeight } from '@js/core/utils/size'; import { isDefined, isPlainObject } from '@js/core/utils/type'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; import CollectionWidget from '@js/ui/collection/ui.collection_widget.live_update'; import { isMaterialBased } from '@js/ui/themes'; diff --git a/packages/devextreme/js/__internal/ui/m_action_sheet.ts b/packages/devextreme/js/__internal/ui/m_action_sheet.ts index bbe997297eac..754c9e6d72eb 100644 --- a/packages/devextreme/js/__internal/ui/m_action_sheet.ts +++ b/packages/devextreme/js/__internal/ui/m_action_sheet.ts @@ -1,3 +1,4 @@ +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import $ from '@js/core/renderer'; import { BindableTemplate } from '@js/core/templates/bindable_template'; @@ -5,7 +6,6 @@ import { noop } from '@js/core/utils/common'; import { Deferred } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { getWindow } from '@js/core/utils/window'; -import messageLocalization from '@js/localization/message'; import Button from '@js/ui/button'; import CollectionWidget from '@js/ui/collection/ui.collection_widget.edit'; import Popover from '@js/ui/popover/ui.popover'; diff --git a/packages/devextreme/js/__internal/ui/m_autocomplete.ts b/packages/devextreme/js/__internal/ui/m_autocomplete.ts index fde9e9388e2e..0d0b5e25b557 100644 --- a/packages/devextreme/js/__internal/ui/m_autocomplete.ts +++ b/packages/devextreme/js/__internal/ui/m_autocomplete.ts @@ -1,9 +1,9 @@ +import { isCommandKeyPressed } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import $ from '@js/core/renderer'; import { noop } from '@js/core/utils/common'; import { Deferred } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; -import { isCommandKeyPressed } from '@js/events/utils/index'; import DropDownList from '@js/ui/drop_down_editor/ui.drop_down_list'; const AUTOCOMPLETE_CLASS = 'dx-autocomplete'; diff --git a/packages/devextreme/js/__internal/ui/m_defer_rendering.ts b/packages/devextreme/js/__internal/ui/m_defer_rendering.ts index 1894a410a47d..75ac61edb085 100644 --- a/packages/devextreme/js/__internal/ui/m_defer_rendering.ts +++ b/packages/devextreme/js/__internal/ui/m_defer_rendering.ts @@ -1,4 +1,6 @@ -import { TransitionExecutor } from '@js/animation/transition_executor/transition_executor'; +import { TransitionExecutor } from '@js/common/core/animation/transition_executor/transition_executor'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { triggerShownEvent } from '@js/common/core/events/visibility_change'; import registerComponent from '@js/core/component_registrator'; import domAdapter from '@js/core/dom_adapter'; import $ from '@js/core/renderer'; @@ -17,8 +19,6 @@ import { each } from '@js/core/utils/iterator'; import { getBoundingRect } from '@js/core/utils/position'; import { isPromise } from '@js/core/utils/type'; import { getWindow, hasWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import { triggerShownEvent } from '@js/events/visibility_change'; import LoadIndicator from '@js/ui/load_indicator'; import Widget from '@js/ui/widget/ui.widget'; diff --git a/packages/devextreme/js/__internal/ui/m_dialog.ts b/packages/devextreme/js/__internal/ui/m_dialog.ts index 5bf591ec0c58..05a3ae4c94fe 100644 --- a/packages/devextreme/js/__internal/ui/m_dialog.ts +++ b/packages/devextreme/js/__internal/ui/m_dialog.ts @@ -1,3 +1,5 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import messageLocalization from '@js/common/core/localization/message'; import Action from '@js/core/action'; import config from '@js/core/config'; import devices from '@js/core/devices'; @@ -10,8 +12,6 @@ import { getHeight, getWidth } from '@js/core/utils/size'; import { isPlainObject } from '@js/core/utils/type'; import { value as getViewport } from '@js/core/utils/view_port'; import { getWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import messageLocalization from '@js/localization/message'; import Popup from '@js/ui/popup/ui.popup'; import { isFluent } from '@js/ui/themes'; import errors from '@js/ui/widget/ui.errors'; diff --git a/packages/devextreme/js/__internal/ui/m_drop_down_box.ts b/packages/devextreme/js/__internal/ui/m_drop_down_box.ts index cf6dbb96de22..dbf14e91dd60 100644 --- a/packages/devextreme/js/__internal/ui/m_drop_down_box.ts +++ b/packages/devextreme/js/__internal/ui/m_drop_down_box.ts @@ -1,3 +1,5 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { normalizeKeyName } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import domAdapter from '@js/core/dom_adapter'; @@ -9,8 +11,6 @@ import { Deferred, when } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { map } from '@js/core/utils/iterator'; import { isDefined, isObject } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { normalizeKeyName } from '@js/events/utils/index'; import DataExpressionMixin from '@js/ui/editor/ui.data_expression'; import { tabbable } from '@js/ui/widget/selectors'; import DropDownEditor from '@ts/ui/drop_down_editor/m_drop_down_editor'; diff --git a/packages/devextreme/js/__internal/ui/m_drop_down_button.ts b/packages/devextreme/js/__internal/ui/m_drop_down_button.ts index 0ea068ef0dc2..49ba7ec7a25a 100644 --- a/packages/devextreme/js/__internal/ui/m_drop_down_button.ts +++ b/packages/devextreme/js/__internal/ui/m_drop_down_button.ts @@ -1,3 +1,4 @@ +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import { getPublicElement } from '@js/core/element'; import Guid from '@js/core/guid'; @@ -10,7 +11,6 @@ import { extend } from '@js/core/utils/extend'; import { getImageContainer } from '@js/core/utils/icon'; import { isDefined, isObject, isPlainObject } from '@js/core/utils/type'; import DataController from '@js/data_controller'; -import messageLocalization from '@js/localization/message'; import ButtonGroup from '@js/ui/button_group'; import List from '@js/ui/list_light'; import Popup from '@js/ui/popup/ui.popup'; diff --git a/packages/devextreme/js/__internal/ui/m_file_uploader.ts b/packages/devextreme/js/__internal/ui/m_file_uploader.ts index a40626874bc1..9a18fdc2d69c 100644 --- a/packages/devextreme/js/__internal/ui/m_file_uploader.ts +++ b/packages/devextreme/js/__internal/ui/m_file_uploader.ts @@ -1,4 +1,8 @@ /* eslint-disable max-classes-per-file */ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace, isTouchEvent } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import domAdapter from '@js/core/dom_adapter'; @@ -14,10 +18,6 @@ import { each } from '@js/core/utils/iterator'; import { getOffset, getWidth } from '@js/core/utils/size'; import { isDefined, isFunction, isNumeric } from '@js/core/utils/type'; import { getWindow } from '@js/core/utils/window'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace, isTouchEvent } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import type { ButtonStyle, ButtonType } from '@js/ui/button'; import Button from '@js/ui/button'; import type { Properties as PublicProperties } from '@js/ui/file_uploader'; diff --git a/packages/devextreme/js/__internal/ui/m_gallery.ts b/packages/devextreme/js/__internal/ui/m_gallery.ts index 69f20a920198..da1f5b71aff6 100644 --- a/packages/devextreme/js/__internal/ui/m_gallery.ts +++ b/packages/devextreme/js/__internal/ui/m_gallery.ts @@ -1,5 +1,11 @@ -import fx from '@js/animation/fx'; -import { move } from '@js/animation/translator'; +import { fx } from '@js/common/core/animation'; +import { move } from '@js/common/core/animation/translator'; +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import Swipeable from '@js/common/core/events/gesture/swipeable'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import { triggerResizeEvent } from '@js/common/core/events/visibility_change'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import { getPublicElement } from '@js/core/element'; @@ -13,12 +19,6 @@ import { } from '@js/core/utils/size'; import { isDefined, isPlainObject } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import Swipeable from '@js/events/gesture/swipeable'; -import { addNamespace } from '@js/events/utils/index'; -import { triggerResizeEvent } from '@js/events/visibility_change'; -import messageLocalization from '@js/localization/message'; import CollectionWidget from '@js/ui/collection/ui.collection_widget.edit'; import Widget from '@js/ui/widget/ui.widget'; diff --git a/packages/devextreme/js/__internal/ui/m_load_indicator.ts b/packages/devextreme/js/__internal/ui/m_load_indicator.ts index 88377861eae6..5bc0b1c10e16 100644 --- a/packages/devextreme/js/__internal/ui/m_load_indicator.ts +++ b/packages/devextreme/js/__internal/ui/m_load_indicator.ts @@ -1,11 +1,12 @@ +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { getHeight, getWidth } from '@js/core/utils/size'; import { getNavigator } from '@js/core/utils/window'; -import messageLocalization from '@js/localization/message'; import type { Properties as PublicProps } from '@js/ui/load_indicator'; + // @ts-expect-error import { current, isGeneric, isMaterialBased } from '@js/ui/themes'; import Widget from '@ts/core/widget/widget'; diff --git a/packages/devextreme/js/__internal/ui/m_load_panel.ts b/packages/devextreme/js/__internal/ui/m_load_panel.ts index 814d508493e6..2af54f41313a 100644 --- a/packages/devextreme/js/__internal/ui/m_load_panel.ts +++ b/packages/devextreme/js/__internal/ui/m_load_panel.ts @@ -1,9 +1,9 @@ +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import $ from '@js/core/renderer'; import { noop } from '@js/core/utils/common'; import { Deferred } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; -import messageLocalization from '@js/localization/message'; import LoadIndicator from '@js/ui/load_indicator'; import Overlay from '@js/ui/overlay/ui.overlay'; import { isFluent, isMaterial } from '@js/ui/themes'; diff --git a/packages/devextreme/js/__internal/ui/m_lookup.ts b/packages/devextreme/js/__internal/ui/m_lookup.ts index 996b610c8ab8..d43b84eb0384 100644 --- a/packages/devextreme/js/__internal/ui/m_lookup.ts +++ b/packages/devextreme/js/__internal/ui/m_lookup.ts @@ -1,4 +1,6 @@ -import { locate, move, resetPosition } from '@js/animation/translator'; +import { locate, move, resetPosition } from '@js/common/core/animation/translator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import { getPublicElement } from '@js/core/element'; @@ -13,8 +15,6 @@ import { } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; import { getWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import messageLocalization from '@js/localization/message'; import DropDownList from '@js/ui/drop_down_editor/ui.drop_down_list'; import Popover from '@js/ui/popover/ui.popover'; import TextBox from '@js/ui/text_box'; diff --git a/packages/devextreme/js/__internal/ui/m_multi_view.ts b/packages/devextreme/js/__internal/ui/m_multi_view.ts index 1eebc72ad25f..7a8ad4f3ae99 100644 --- a/packages/devextreme/js/__internal/ui/m_multi_view.ts +++ b/packages/devextreme/js/__internal/ui/m_multi_view.ts @@ -1,4 +1,7 @@ -import { locate } from '@js/animation/translator'; +import { locate } from '@js/common/core/animation/translator'; +import Swipeable from '@js/common/core/events/gesture/swipeable'; +import { triggerResizeEvent } from '@js/common/core/events/visibility_change'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import { getPublicElement } from '@js/core/element'; @@ -9,9 +12,6 @@ import { extend } from '@js/core/utils/extend'; import { sign } from '@js/core/utils/math'; import { getWidth } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; -import Swipeable from '@js/events/gesture/swipeable'; -import { triggerResizeEvent } from '@js/events/visibility_change'; -import messageLocalization from '@js/localization/message'; import CollectionWidget from '@js/ui/collection/ui.collection_widget.live_update'; import { _translator, animation } from './multi_view/m_multi_view.animation'; diff --git a/packages/devextreme/js/__internal/ui/m_range_slider.ts b/packages/devextreme/js/__internal/ui/m_range_slider.ts index 8f0501990950..b9fd532e0ae4 100644 --- a/packages/devextreme/js/__internal/ui/m_range_slider.ts +++ b/packages/devextreme/js/__internal/ui/m_range_slider.ts @@ -1,12 +1,12 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { eventData } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import $ from '@js/core/renderer'; // @ts-expect-error import { applyServerDecimalSeparator } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; import { getWidth } from '@js/core/utils/size'; -import eventsEngine from '@js/events/core/events_engine'; -import { eventData } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import Slider from '@js/ui/slider'; import SliderHandle from './slider/m_slider_handle'; diff --git a/packages/devextreme/js/__internal/ui/m_select_box.ts b/packages/devextreme/js/__internal/ui/m_select_box.ts index 7d5db4b74df0..5e3afb659c10 100644 --- a/packages/devextreme/js/__internal/ui/m_select_box.ts +++ b/packages/devextreme/js/__internal/ui/m_select_box.ts @@ -1,5 +1,7 @@ import '@ts/ui/list/modules/m_selection'; +import { normalizeKeyName } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import domAdapter from '@js/core/dom_adapter'; import { getPublicElement } from '@js/core/element'; @@ -11,8 +13,6 @@ import { Deferred, fromPromise } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { isDefined, isPromise } from '@js/core/utils/type'; -import { normalizeKeyName } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import DropDownList from '@js/ui/drop_down_editor/ui.drop_down_list'; const DISABLED_STATE_SELECTOR = '.dx-state-disabled'; diff --git a/packages/devextreme/js/__internal/ui/m_switch.ts b/packages/devextreme/js/__internal/ui/m_switch.ts index 184442a4002f..d2de40a8152d 100644 --- a/packages/devextreme/js/__internal/ui/m_switch.ts +++ b/packages/devextreme/js/__internal/ui/m_switch.ts @@ -1,4 +1,10 @@ -import fx from '@js/animation/fx'; +import { fx } from '@js/common/core/animation'; +import { name as clickEventName } from '@js/common/core/events/click'; +import { lock } from '@js/common/core/events/core/emitter.feedback'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import Swipeable from '@js/common/core/events/gesture/swipeable'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; @@ -6,12 +12,6 @@ import { Deferred } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { getBoundingRect } from '@js/core/utils/position'; import { getOuterWidth } from '@js/core/utils/size'; -import { name as clickEventName } from '@js/events/click'; -import { lock } from '@js/events/core/emitter.feedback'; -import eventsEngine from '@js/events/core/events_engine'; -import Swipeable from '@js/events/gesture/swipeable'; -import { addNamespace } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import Editor from '@js/ui/editor/editor'; const SWITCH_CLASS = 'dx-switch'; diff --git a/packages/devextreme/js/__internal/ui/m_tag_box.ts b/packages/devextreme/js/__internal/ui/m_tag_box.ts index 00a424704b45..52c05ea7045a 100644 --- a/packages/devextreme/js/__internal/ui/m_tag_box.ts +++ b/packages/devextreme/js/__internal/ui/m_tag_box.ts @@ -1,3 +1,8 @@ +import { name as clickEvent } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace, isCommandKeyPressed, normalizeKeyName } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; +import { normalizeLoadResult } from '@js/common/data/data_source/utils'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import { getPublicElement } from '@js/core/element'; @@ -16,11 +21,6 @@ import { SelectionFilterCreator as FilterCreator } from '@js/core/utils/selectio import { getHeight, getOuterWidth } from '@js/core/utils/size'; import { isDefined, isObject, isString } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import { normalizeLoadResult } from '@js/data/data_source/utils'; -import { name as clickEvent } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace, isCommandKeyPressed, normalizeKeyName } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import SelectBox from '@js/ui/select_box'; import errors from '@js/ui/widget/ui.errors'; import caret from '@ts/ui/text_box/m_utils.caret'; diff --git a/packages/devextreme/js/__internal/ui/m_text_area.ts b/packages/devextreme/js/__internal/ui/m_text_area.ts index c44159027e0b..e96b7593b6eb 100644 --- a/packages/devextreme/js/__internal/ui/m_text_area.ts +++ b/packages/devextreme/js/__internal/ui/m_text_area.ts @@ -1,3 +1,7 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import scrollEvents from '@js/common/core/events/gesture/emitter.gesture.scroll'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace, eventData } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import $ from '@js/core/renderer'; import { ensureDefined, noop } from '@js/core/utils/common'; @@ -7,10 +11,6 @@ import { } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; import { getWindow, hasWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import scrollEvents from '@js/events/gesture/emitter.gesture.scroll'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace, eventData } from '@js/events/utils/index'; import TextBox from '@js/ui/text_box'; import { allowScroll, prepareScrollData } from '@ts/ui/text_box/m_utils.scroll'; diff --git a/packages/devextreme/js/__internal/ui/m_track_bar.ts b/packages/devextreme/js/__internal/ui/m_track_bar.ts index d27ad1547dce..2bd30976db84 100644 --- a/packages/devextreme/js/__internal/ui/m_track_bar.ts +++ b/packages/devextreme/js/__internal/ui/m_track_bar.ts @@ -1,4 +1,4 @@ -import fx from '@js/animation/fx'; +import { fx } from '@js/common/core/animation'; import registerComponent from '@js/core/component_registrator'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; diff --git a/packages/devextreme/js/__internal/ui/m_validation_engine.ts b/packages/devextreme/js/__internal/ui/m_validation_engine.ts index 2e16c4df9e42..35858d1ff3c2 100644 --- a/packages/devextreme/js/__internal/ui/m_validation_engine.ts +++ b/packages/devextreme/js/__internal/ui/m_validation_engine.ts @@ -1,4 +1,6 @@ /* eslint-disable max-classes-per-file */ +import messageLocalization from '@js/common/core/localization/message'; +import numberLocalization from '@js/common/core/localization/number'; import Class from '@js/core/class'; import errors from '@js/core/errors'; import { EventsStrategy } from '@js/core/events_strategy'; @@ -20,8 +22,6 @@ import { isPromise, isString, } from '@js/core/utils/type'; -import messageLocalization from '@js/localization/message'; -import numberLocalization from '@js/localization/number'; const EMAIL_VALIDATION_REGEX = /^[\d\w.+_-]+@[\d\w._-]+\.[\w]+$/i; diff --git a/packages/devextreme/js/__internal/ui/m_validation_summary.ts b/packages/devextreme/js/__internal/ui/m_validation_summary.ts index 1a112152a53f..d3c7ea85d50c 100644 --- a/packages/devextreme/js/__internal/ui/m_validation_summary.ts +++ b/packages/devextreme/js/__internal/ui/m_validation_summary.ts @@ -1,9 +1,9 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; import registerComponent from '@js/core/component_registrator'; // @ts-expect-error import { grep } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; import { each, map } from '@js/core/utils/iterator'; -import eventsEngine from '@js/events/core/events_engine'; import CollectionWidget from '@js/ui/collection/ui.collection_widget.edit'; import ValidationEngine from './m_validation_engine'; diff --git a/packages/devextreme/js/__internal/ui/map/m_map.ts b/packages/devextreme/js/__internal/ui/map/m_map.ts index 0978656a6b6b..1548b3613005 100644 --- a/packages/devextreme/js/__internal/ui/map/m_map.ts +++ b/packages/devextreme/js/__internal/ui/map/m_map.ts @@ -1,3 +1,6 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; @@ -9,9 +12,6 @@ import { extend } from '@js/core/utils/extend'; import { titleize } from '@js/core/utils/inflector'; import { each } from '@js/core/utils/iterator'; import { isNumeric } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace } from '@js/events/utils/index'; import errors from '@js/ui/widget/ui.errors'; import Widget from '@js/ui/widget/ui.widget'; diff --git a/packages/devextreme/js/__internal/ui/map/m_provider.google_static.ts b/packages/devextreme/js/__internal/ui/map/m_provider.google_static.ts index 6ba8b1315cd9..5a9d38c315d3 100644 --- a/packages/devextreme/js/__internal/ui/map/m_provider.google_static.ts +++ b/packages/devextreme/js/__internal/ui/map/m_provider.google_static.ts @@ -1,8 +1,8 @@ import Color from '@js/color'; +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; import { each } from '@js/core/utils/iterator'; import { getHeight, getWidth } from '@js/core/utils/size'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; import Provider from './m_provider'; diff --git a/packages/devextreme/js/__internal/ui/map/m_provider.ts b/packages/devextreme/js/__internal/ui/map/m_provider.ts index c77f1445d9a6..dd34bd4d1bbe 100644 --- a/packages/devextreme/js/__internal/ui/map/m_provider.ts +++ b/packages/devextreme/js/__internal/ui/map/m_provider.ts @@ -1,7 +1,7 @@ +import { addNamespace } from '@js/common/core/events/utils/index'; import Class from '@js/core/class'; import { map } from '@js/core/utils/iterator'; import { isNumeric, isPlainObject } from '@js/core/utils/type'; -import { addNamespace } from '@js/events/utils/index'; const { abstract } = Class; diff --git a/packages/devextreme/js/__internal/ui/menu/m_menu.ts b/packages/devextreme/js/__internal/ui/menu/m_menu.ts index 6c292099d296..8fb0b99009a9 100644 --- a/packages/devextreme/js/__internal/ui/menu/m_menu.ts +++ b/packages/devextreme/js/__internal/ui/menu/m_menu.ts @@ -1,4 +1,8 @@ -import type { PositionConfig } from '@js/animation/position'; +import type { PositionConfig } from '@js/common/core/animation'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { end as hoverEventEnd } from '@js/common/core/events/hover'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import { getPublicElement } from '@js/core/element'; import type { dxElementWrapper } from '@js/core/renderer'; @@ -8,10 +12,6 @@ import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { getOuterWidth } from '@js/core/utils/size'; import { isDefined, isObject, isPlainObject } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { end as hoverEventEnd } from '@js/events/hover'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace } from '@js/events/utils/index'; import Button from '@js/ui/button'; import type { Item } from '@js/ui/menu'; import type { Properties as OverlayProperties } from '@js/ui/overlay'; diff --git a/packages/devextreme/js/__internal/ui/menu/m_submenu.ts b/packages/devextreme/js/__internal/ui/menu/m_submenu.ts index 30ede2cb371e..96aaa27e3f9a 100644 --- a/packages/devextreme/js/__internal/ui/menu/m_submenu.ts +++ b/packages/devextreme/js/__internal/ui/menu/m_submenu.ts @@ -1,7 +1,7 @@ import '@js/ui/context_menu'; -import type { PositionConfig } from '@js/animation/position'; -import animationPosition from '@js/animation/position'; +import type { PositionConfig } from '@js/common/core/animation'; +import animationPosition from '@js/common/core/animation/position'; import { getPublicElement } from '@js/core/element'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; @@ -178,7 +178,6 @@ class Submenu extends ContextMenu { position.offset = '2.5 0'; position.at = position.my = 'right bottom'; } - // @ts-expect-error animationPosition.setup(this.$contentDelimiter, position); } diff --git a/packages/devextreme/js/__internal/ui/multi_view/m_multi_view.animation.ts b/packages/devextreme/js/__internal/ui/multi_view/m_multi_view.animation.ts index dd3f3ef4bdfb..efe04ac43cff 100644 --- a/packages/devextreme/js/__internal/ui/multi_view/m_multi_view.animation.ts +++ b/packages/devextreme/js/__internal/ui/multi_view/m_multi_view.animation.ts @@ -1,5 +1,5 @@ -import fx from '@js/animation/fx'; -import { move } from '@js/animation/translator'; +import { fx } from '@js/common/core/animation'; +import { move } from '@js/common/core/animation/translator'; import type { dxElementWrapper } from '@js/core/renderer'; // eslint-disable-next-line @typescript-eslint/naming-convention diff --git a/packages/devextreme/js/__internal/ui/number_box/m_number_box.base.ts b/packages/devextreme/js/__internal/ui/number_box/m_number_box.base.ts index 00f836ade6c6..89609c2545f6 100644 --- a/packages/devextreme/js/__internal/ui/number_box/m_number_box.base.ts +++ b/packages/devextreme/js/__internal/ui/number_box/m_number_box.base.ts @@ -1,3 +1,8 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { + addNamespace, getChar, isCommandKeyPressed, normalizeKeyName, +} from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import devices from '@js/core/devices'; import domAdapter from '@js/core/dom_adapter'; import $ from '@js/core/renderer'; @@ -11,11 +16,6 @@ import { Deferred } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { fitIntoRange, inRange } from '@js/core/utils/math'; import { isDefined } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { - addNamespace, getChar, isCommandKeyPressed, normalizeKeyName, -} from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import TextEditor from '@js/ui/text_box/ui.text_editor'; import SpinButtons from './m_number_box.spins'; diff --git a/packages/devextreme/js/__internal/ui/number_box/m_number_box.caret.ts b/packages/devextreme/js/__internal/ui/number_box/m_number_box.caret.ts index 3373be789bca..88760d7972ff 100644 --- a/packages/devextreme/js/__internal/ui/number_box/m_number_box.caret.ts +++ b/packages/devextreme/js/__internal/ui/number_box/m_number_box.caret.ts @@ -1,6 +1,6 @@ +import number from '@js/common/core/localization/number'; import { escapeRegExp } from '@js/core/utils/common'; import { fitIntoRange } from '@js/core/utils/math'; -import number from '@js/localization/number'; import { getNthOccurrence, getRealSeparatorIndex, splitByIndex } from './m_utils'; diff --git a/packages/devextreme/js/__internal/ui/number_box/m_number_box.mask.ts b/packages/devextreme/js/__internal/ui/number_box/m_number_box.mask.ts index c400b56d2b2a..b5220125bf00 100644 --- a/packages/devextreme/js/__internal/ui/number_box/m_number_box.mask.ts +++ b/packages/devextreme/js/__internal/ui/number_box/m_number_box.mask.ts @@ -1,3 +1,10 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { name as dxDblClickEvent } from '@js/common/core/events/double_click'; +import { + addNamespace, getChar, isCommandKeyPressed, normalizeKeyName, +} from '@js/common/core/events/utils/index'; +import { getFormat as getLDMLFormat } from '@js/common/core/localization/ldml/number'; +import number from '@js/common/core/localization/number'; import devices from '@js/core/devices'; import { ensureDefined, escapeRegExp } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; @@ -5,13 +12,6 @@ import { fitIntoRange, inRange } from '@js/core/utils/math'; import { isDefined, isFunction, isNumeric, isString, } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { name as dxDblClickEvent } from '@js/events/double_click'; -import { - addNamespace, getChar, isCommandKeyPressed, normalizeKeyName, -} from '@js/events/utils/index'; -import { getFormat as getLDMLFormat } from '@js/localization/ldml/number'; -import number from '@js/localization/number'; import NumberBoxBase from './m_number_box.base'; import { diff --git a/packages/devextreme/js/__internal/ui/number_box/m_number_box.spin.ts b/packages/devextreme/js/__internal/ui/number_box/m_number_box.spin.ts index e793737c9572..018093e1f112 100644 --- a/packages/devextreme/js/__internal/ui/number_box/m_number_box.spin.ts +++ b/packages/devextreme/js/__internal/ui/number_box/m_number_box.spin.ts @@ -1,12 +1,12 @@ +import { lock } from '@js/common/core/events/core/emitter.feedback'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import holdEvent from '@js/common/core/events/hold'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace } from '@js/common/core/events/utils/index'; import domAdapter from '@js/core/dom_adapter'; import $ from '@js/core/renderer'; import { Deferred } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; -import { lock } from '@js/events/core/emitter.feedback'; -import eventsEngine from '@js/events/core/events_engine'; -import holdEvent from '@js/events/hold'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace } from '@js/events/utils/index'; import Widget from '@js/ui/widget/ui.widget'; const SPIN_CLASS = 'dx-numberbox-spin'; diff --git a/packages/devextreme/js/__internal/ui/number_box/m_number_box.spins.ts b/packages/devextreme/js/__internal/ui/number_box/m_number_box.spins.ts index edd241e304b1..5a4b212f3087 100644 --- a/packages/devextreme/js/__internal/ui/number_box/m_number_box.spins.ts +++ b/packages/devextreme/js/__internal/ui/number_box/m_number_box.spins.ts @@ -1,8 +1,8 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import pointer from '@js/common/core/events/pointer'; +import { addNamespace } from '@js/common/core/events/utils/index'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; -import eventsEngine from '@js/events/core/events_engine'; -import pointer from '@js/events/pointer'; -import { addNamespace } from '@js/events/utils/index'; import TextEditorButton from '@ts/ui/text_box/texteditor_button_collection/m_button'; import SpinButton from './m_number_box.spin'; diff --git a/packages/devextreme/js/__internal/ui/overlay/m_overlay.ts b/packages/devextreme/js/__internal/ui/overlay/m_overlay.ts index fff3c3b4bad1..86535626c15b 100644 --- a/packages/devextreme/js/__internal/ui/overlay/m_overlay.ts +++ b/packages/devextreme/js/__internal/ui/overlay/m_overlay.ts @@ -1,4 +1,13 @@ -import fx from '@js/animation/fx'; +import { fx } from '@js/common/core/animation'; +import { hideCallback as hideTopOverlayCallback } from '@js/common/core/environment/hide_callback'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { + move as dragEventMove, +} from '@js/common/core/events/drag'; +import pointerEvents from '@js/common/core/events/pointer'; +import { keyboard } from '@js/common/core/events/short'; +import { addNamespace, isCommandKeyPressed, normalizeKeyName } from '@js/common/core/events/utils/index'; +import { triggerHidingEvent, triggerResizeEvent, triggerShownEvent } from '@js/common/core/events/visibility_change'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import domAdapter from '@js/core/dom_adapter'; @@ -17,15 +26,6 @@ import { isFunction, isObject, isPromise, isWindow, } from '@js/core/utils/type'; import { changeCallback } from '@js/core/utils/view_port'; -import eventsEngine from '@js/events/core/events_engine'; -import { - move as dragEventMove, -} from '@js/events/drag'; -import pointerEvents from '@js/events/pointer'; -import { keyboard } from '@js/events/short'; -import { addNamespace, isCommandKeyPressed, normalizeKeyName } from '@js/events/utils/index'; -import { triggerHidingEvent, triggerResizeEvent, triggerShownEvent } from '@js/events/visibility_change'; -import { hideCallback as hideTopOverlayCallback } from '@js/mobile/hide_callback'; import type OverlayInstance from '@js/ui/overlay'; import { tabbable } from '@js/ui/widget/selectors'; import uiErrors from '@js/ui/widget/ui.errors'; diff --git a/packages/devextreme/js/__internal/ui/overlay/m_overlay_position_controller.ts b/packages/devextreme/js/__internal/ui/overlay/m_overlay_position_controller.ts index c05b35db1bf7..d14bd3518c32 100644 --- a/packages/devextreme/js/__internal/ui/overlay/m_overlay_position_controller.ts +++ b/packages/devextreme/js/__internal/ui/overlay/m_overlay_position_controller.ts @@ -1,5 +1,5 @@ -import positionUtils from '@js/animation/position'; -import { locate, move, resetPosition } from '@js/animation/translator'; +import positionUtils from '@js/common/core/animation/position'; +import { locate, move, resetPosition } from '@js/common/core/animation/translator'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; @@ -162,7 +162,6 @@ class OverlayPositionController { positionWrapper() { if (this._$visualContainer) { - // @ts-expect-error positionUtils.setup(this._$wrapper, { my: 'top left', at: 'top left', of: this._$visualContainer }); } } @@ -188,7 +187,6 @@ class OverlayPositionController { this._$wrapper.css('overflow', 'hidden'); if (!this._props._skipContentPositioning) { - // @ts-expect-error const resultPosition = positionUtils.setup(this._$content, this._position); this._initialPosition = resultPosition; } diff --git a/packages/devextreme/js/__internal/ui/popover/m_popover.ts b/packages/devextreme/js/__internal/ui/popover/m_popover.ts index a44645739713..b250bf143193 100644 --- a/packages/devextreme/js/__internal/ui/popover/m_popover.ts +++ b/packages/devextreme/js/__internal/ui/popover/m_popover.ts @@ -1,5 +1,7 @@ -import positionUtils from '@js/animation/position'; -import { move } from '@js/animation/translator'; +import positionUtils from '@js/common/core/animation/position'; +import { move } from '@js/common/core/animation/translator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import domAdapter from '@js/core/dom_adapter'; import { getPublicElement } from '@js/core/element'; @@ -12,8 +14,6 @@ import { } from '@js/core/utils/size'; import { isObject, isString } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; import Popup from '@js/ui/popup/ui.popup'; import { isMaterial, isMaterialBased } from '@js/ui/themes'; import errors from '@js/ui/widget/ui.errors'; @@ -258,7 +258,6 @@ const Popover = Popup.inherit({ this._updateContentSize(shouldUpdateDimensions); const contentPosition = this._getContainerPosition(); - // @ts-expect-error const resultLocation = positionUtils.setup(this.$overlayContent(), contentPosition); const positionSide = this._getSideByLocation(resultLocation); @@ -288,7 +287,6 @@ const Popover = Popup.inherit({ if (!this.$content() || !shouldUpdateDimensions) { return; } - // @ts-expect-error const containerLocation = positionUtils.calculate(this.$overlayContent(), this._getContainerPosition()); if ((containerLocation.h.oversize > 0) && this._isHorizontalSide() && !containerLocation.h.fit) { @@ -343,13 +341,11 @@ const Popover = Popup.inherit({ const axis = this._isVerticalSide(side) ? 'left' : 'top'; const sizeProperty = this._isVerticalSide(side) ? 'width' : 'height'; const $target = $(this._positionController._position.of); - // @ts-expect-error - const targetOffset = positionUtils.offset($target) || { top: 0, left: 0 }; - // @ts-expect-error + const targetOffset = positionUtils.offset($target) ?? { top: 0, left: 0 }; const contentOffset = positionUtils.offset(this.$overlayContent()); const arrowSize = arrowRect[sizeProperty]; - const contentLocation = contentOffset[axis]; + const contentLocation = contentOffset?.[axis]; const contentSize = getBoundingRect(this.$overlayContent().get(0))[sizeProperty]; const targetLocation = targetOffset[axis]; const targetElement = $target.get(0); diff --git a/packages/devextreme/js/__internal/ui/popover/m_popover_position_controller.ts b/packages/devextreme/js/__internal/ui/popover/m_popover_position_controller.ts index 0d00d2866111..29aa705618c1 100644 --- a/packages/devextreme/js/__internal/ui/popover/m_popover_position_controller.ts +++ b/packages/devextreme/js/__internal/ui/popover/m_popover_position_controller.ts @@ -1,4 +1,4 @@ -import positionUtils from '@js/animation/position'; +import positionUtils from '@js/common/core/animation/position'; import type { dxElementWrapper } from '@js/core/renderer'; // @ts-expect-error import { pairToObject } from '@js/core/utils/common'; @@ -93,9 +93,7 @@ class PopoverPositionController extends OverlayPositionController { } _isPopoverInside(): boolean { - // @ts-expect-error const my = positionUtils.setup.normalizeAlign(this._position.my); - // @ts-expect-error const at = positionUtils.setup.normalizeAlign(this._position.at); return my.h === at.h && my.v === at.v; @@ -110,9 +108,7 @@ class PopoverPositionController extends OverlayPositionController { } _getDisplaySide(position) { - // @ts-expect-error const my = positionUtils.setup.normalizeAlign(position.my); - // @ts-expect-error const at = positionUtils.setup.normalizeAlign(position.at); const weightSign = WEIGHT_OF_SIDES[my.h] === WEIGHT_OF_SIDES[at.h] && WEIGHT_OF_SIDES[my.v] === WEIGHT_OF_SIDES[at.v] ? -1 : 1; diff --git a/packages/devextreme/js/__internal/ui/popup/m_popup.ts b/packages/devextreme/js/__internal/ui/popup/m_popup.ts index 7739ea48e868..fac7d0cc9259 100644 --- a/packages/devextreme/js/__internal/ui/popup/m_popup.ts +++ b/packages/devextreme/js/__internal/ui/popup/m_popup.ts @@ -1,5 +1,7 @@ import '@js/ui/toolbar/ui.toolbar.base'; +import { triggerResizeEvent } from '@js/common/core/events/visibility_change'; +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import { getPublicElement } from '@js/core/element'; @@ -24,8 +26,6 @@ import { } from '@js/core/utils/size'; import { isDefined, isObject } from '@js/core/utils/type'; import { compare as compareVersions } from '@js/core/utils/version'; -import { triggerResizeEvent } from '@js/events/visibility_change'; -import messageLocalization from '@js/localization/message'; import Button from '@js/ui/button'; import Overlay from '@js/ui/overlay/ui.overlay'; import type { ToolbarItem } from '@js/ui/popup'; diff --git a/packages/devextreme/js/__internal/ui/popup/m_popup_drag.ts b/packages/devextreme/js/__internal/ui/popup/m_popup_drag.ts index 73ce016aa3e8..d984d73c3d58 100644 --- a/packages/devextreme/js/__internal/ui/popup/m_popup_drag.ts +++ b/packages/devextreme/js/__internal/ui/popup/m_popup_drag.ts @@ -1,15 +1,15 @@ -import { locate, move } from '@js/animation/translator'; -import domAdapter from '@js/core/dom_adapter'; -import { fitIntoRange } from '@js/core/utils/math'; -import { getOffset, getOuterHeight, getOuterWidth } from '@js/core/utils/size'; -import { isWindow } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; +import { locate, move } from '@js/common/core/animation/translator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; import { end as dragEndEvent, move as dragMoveEvent, start as dragStartEvent, -} from '@js/events/drag'; -import { addNamespace } from '@js/events/utils/index'; +} from '@js/common/core/events/drag'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import domAdapter from '@js/core/dom_adapter'; +import { fitIntoRange } from '@js/core/utils/math'; +import { getOffset, getOuterHeight, getOuterWidth } from '@js/core/utils/size'; +import { isWindow } from '@js/core/utils/type'; const KEYBOARD_DRAG_STEP = 5; diff --git a/packages/devextreme/js/__internal/ui/popup/m_popup_position_controller.ts b/packages/devextreme/js/__internal/ui/popup/m_popup_position_controller.ts index 12334b4a5d47..1c0d46fbc48b 100644 --- a/packages/devextreme/js/__internal/ui/popup/m_popup_position_controller.ts +++ b/packages/devextreme/js/__internal/ui/popup/m_popup_position_controller.ts @@ -1,4 +1,4 @@ -import { move } from '@js/animation/translator'; +import { move } from '@js/common/core/animation/translator'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import { originalViewPort } from '@js/core/utils/view_port'; diff --git a/packages/devextreme/js/__internal/ui/radio_group/m_radio_button.ts b/packages/devextreme/js/__internal/ui/radio_group/m_radio_button.ts index 36ab609b7982..fd31c1302776 100644 --- a/packages/devextreme/js/__internal/ui/radio_group/m_radio_button.ts +++ b/packages/devextreme/js/__internal/ui/radio_group/m_radio_button.ts @@ -1,10 +1,10 @@ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; import Editor from '@js/ui/editor/editor'; const RADIO_BUTTON_CLASS = 'dx-radiobutton'; diff --git a/packages/devextreme/js/__internal/ui/resizable/m_resizable.ts b/packages/devextreme/js/__internal/ui/resizable/m_resizable.ts index d02ec6cb39c0..9a3507161565 100644 --- a/packages/devextreme/js/__internal/ui/resizable/m_resizable.ts +++ b/packages/devextreme/js/__internal/ui/resizable/m_resizable.ts @@ -1,4 +1,8 @@ -import { locate, move } from '@js/animation/translator'; +import { locate, move } from '@js/common/core/animation/translator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { end as dragEventEnd, move as dragEventMove, start as dragEventStart } from '@js/common/core/events/drag'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import { triggerResizeEvent } from '@js/common/core/events/visibility_change'; import registerComponent from '@js/core/component_registrator'; import DOMComponent from '@js/core/dom_component'; import $ from '@js/core/renderer'; @@ -12,10 +16,6 @@ import { } from '@js/core/utils/size'; import { isFunction, isPlainObject, isWindow } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import { end as dragEventEnd, move as dragEventMove, start as dragEventStart } from '@js/events/drag'; -import { addNamespace } from '@js/events/utils/index'; -import { triggerResizeEvent } from '@js/events/visibility_change'; const RESIZABLE = 'dxResizable'; const RESIZABLE_CLASS = 'dx-resizable'; diff --git a/packages/devextreme/js/__internal/ui/scroll_view/m_animator.ts b/packages/devextreme/js/__internal/ui/scroll_view/m_animator.ts index 65a014773612..7aff7918cecc 100644 --- a/packages/devextreme/js/__internal/ui/scroll_view/m_animator.ts +++ b/packages/devextreme/js/__internal/ui/scroll_view/m_animator.ts @@ -1,4 +1,4 @@ -import { cancelAnimationFrame, requestAnimationFrame } from '@js/animation/frame'; +import { cancelAnimationFrame, requestAnimationFrame } from '@js/common/core/animation/frame'; import Class from '@js/core/class'; import { noop } from '@js/core/utils/common'; diff --git a/packages/devextreme/js/__internal/ui/scroll_view/m_scroll_view.native.pull_down.ts b/packages/devextreme/js/__internal/ui/scroll_view/m_scroll_view.native.pull_down.ts index 4fa5508758b5..afc0d98a8c8f 100644 --- a/packages/devextreme/js/__internal/ui/scroll_view/m_scroll_view.native.pull_down.ts +++ b/packages/devextreme/js/__internal/ui/scroll_view/m_scroll_view.native.pull_down.ts @@ -1,4 +1,4 @@ -import { move } from '@js/animation/translator'; +import { move } from '@js/common/core/animation/translator'; import $ from '@js/core/renderer'; import Callbacks from '@js/core/utils/callbacks'; import { Deferred } from '@js/core/utils/deferred'; diff --git a/packages/devextreme/js/__internal/ui/scroll_view/m_scroll_view.native.swipe_down.ts b/packages/devextreme/js/__internal/ui/scroll_view/m_scroll_view.native.swipe_down.ts index 9e1e73395a88..1af57ac7f611 100644 --- a/packages/devextreme/js/__internal/ui/scroll_view/m_scroll_view.native.swipe_down.ts +++ b/packages/devextreme/js/__internal/ui/scroll_view/m_scroll_view.native.swipe_down.ts @@ -1,9 +1,9 @@ -import { move } from '@js/animation/translator'; +import { move } from '@js/common/core/animation/translator'; +import { eventData } from '@js/common/core/events/utils/index'; import $ from '@js/core/renderer'; import Callbacks from '@js/core/utils/callbacks'; import { Deferred } from '@js/core/utils/deferred'; import { getOuterHeight } from '@js/core/utils/size'; -import { eventData } from '@js/events/utils/index'; import LoadIndicator from '@js/ui/load_indicator'; import NativeStrategy from './m_scrollable.native'; diff --git a/packages/devextreme/js/__internal/ui/scroll_view/m_scroll_view.ts b/packages/devextreme/js/__internal/ui/scroll_view/m_scroll_view.ts index d00dff90bf24..57ad746d5bd0 100644 --- a/packages/devextreme/js/__internal/ui/scroll_view/m_scroll_view.ts +++ b/packages/devextreme/js/__internal/ui/scroll_view/m_scroll_view.ts @@ -1,3 +1,4 @@ +import messageLocalization from '@js/common/core/localization/message'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import { getPublicElement } from '@js/core/element'; @@ -5,7 +6,6 @@ import $ from '@js/core/renderer'; import { noop } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; import { hasWindow } from '@js/core/utils/window'; -import messageLocalization from '@js/localization/message'; import LoadIndicator from '@js/ui/load_indicator'; import LoadPanel from '@js/ui/load_panel'; import { isMaterialBased } from '@js/ui/themes'; diff --git a/packages/devextreme/js/__internal/ui/scroll_view/m_scrollable.native.ts b/packages/devextreme/js/__internal/ui/scroll_view/m_scrollable.native.ts index 429b15cf60ba..9699c39704f4 100644 --- a/packages/devextreme/js/__internal/ui/scroll_view/m_scrollable.native.ts +++ b/packages/devextreme/js/__internal/ui/scroll_view/m_scrollable.native.ts @@ -1,11 +1,11 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { isDxMouseWheelEvent } from '@js/common/core/events/utils/index'; import Class from '@js/core/class'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; import { noop } from '@js/core/utils/common'; import { each } from '@js/core/utils/iterator'; import { getHeight, getWidth } from '@js/core/utils/size'; -import eventsEngine from '@js/events/core/events_engine'; -import { isDxMouseWheelEvent } from '@js/events/utils/index'; import Scrollbar from './m_scrollbar'; diff --git a/packages/devextreme/js/__internal/ui/scroll_view/m_scrollable.simulated.ts b/packages/devextreme/js/__internal/ui/scroll_view/m_scrollable.simulated.ts index 46d3d27e2540..66309a045793 100644 --- a/packages/devextreme/js/__internal/ui/scroll_view/m_scrollable.simulated.ts +++ b/packages/devextreme/js/__internal/ui/scroll_view/m_scrollable.simulated.ts @@ -1,4 +1,11 @@ -import { locate, move, resetPosition } from '@js/animation/translator'; +import { locate, move, resetPosition } from '@js/common/core/animation/translator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { + addNamespace as addEventNamespace, + isCommandKeyPressed, + isDxMouseWheelEvent, + normalizeKeyName, +} from '@js/common/core/events/utils/index'; import Class from '@js/core/class'; import domAdapter from '@js/core/dom_adapter'; import $ from '@js/core/renderer'; @@ -19,13 +26,6 @@ import { getBoundingRect } from '@js/core/utils/position'; import { getHeight, getWidth } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; import { getWindow, hasWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import { - addNamespace as addEventNamespace, - isCommandKeyPressed, - isDxMouseWheelEvent, - normalizeKeyName, -} from '@js/events/utils/index'; import Animator from './m_animator'; import Scrollbar from './m_scrollbar'; diff --git a/packages/devextreme/js/__internal/ui/scroll_view/m_scrollable.ts b/packages/devextreme/js/__internal/ui/scroll_view/m_scrollable.ts index 89f68984aaaf..f781eebb4fc6 100644 --- a/packages/devextreme/js/__internal/ui/scroll_view/m_scrollable.ts +++ b/packages/devextreme/js/__internal/ui/scroll_view/m_scrollable.ts @@ -1,3 +1,6 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import scrollEvents from '@js/common/core/events/gesture/emitter.gesture.scroll'; +import { addNamespace } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import DOMComponent from '@js/core/dom_component'; @@ -12,9 +15,6 @@ import { } from '@js/core/utils/size'; import { isDefined, isPlainObject } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import scrollEvents from '@js/events/gesture/emitter.gesture.scroll'; -import { addNamespace } from '@js/events/utils/index'; import { getElementLocationInternal } from '@ts/ui/scroll_view/utils/get_element_location_internal'; import supportUtils from '../../core/utils/m_support'; diff --git a/packages/devextreme/js/__internal/ui/scroll_view/m_scrollbar.ts b/packages/devextreme/js/__internal/ui/scroll_view/m_scrollbar.ts index cdfec30b44c2..8c04a693e1bb 100644 --- a/packages/devextreme/js/__internal/ui/scroll_view/m_scrollbar.ts +++ b/packages/devextreme/js/__internal/ui/scroll_view/m_scrollbar.ts @@ -1,4 +1,7 @@ -import { move } from '@js/animation/translator'; +import { move } from '@js/common/core/animation/translator'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace } from '@js/common/core/events/utils/index'; import domAdapter from '@js/core/dom_adapter'; import $ from '@js/core/renderer'; // @ts-expect-error @@ -6,9 +9,6 @@ import { deferRenderer } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; import readyCallback from '@js/core/utils/ready_callbacks'; import { isPlainObject } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace } from '@js/events/utils/index'; import Widget from '@js/ui/widget/ui.widget'; const SCROLLBAR = 'dxScrollbar'; diff --git a/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.deferred.ts b/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.deferred.ts index 617e73cba900..45b1014aa0c6 100644 --- a/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.deferred.ts +++ b/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.deferred.ts @@ -1,7 +1,7 @@ +import dataQuery from '@js/common/data/query'; import type { DeferredObj } from '@js/core/utils/deferred'; import { Deferred } from '@js/core/utils/deferred'; import { isString } from '@js/core/utils/type'; -import dataQuery from '@js/data/query'; import errors from '@js/ui/widget/ui.errors'; import SelectionStrategy from './m_selection.strategy'; @@ -82,6 +82,7 @@ export default class DeferredStrategy extends SelectionStrategy { }, }, }; + // @ts-expect-error return !!dataQuery([itemData], queryParams).filter(selectionFilter).toArray().length; } diff --git a/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.standard.ts b/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.standard.ts index bafa1b45fa41..7f8ea7c23963 100644 --- a/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.standard.ts +++ b/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.standard.ts @@ -1,3 +1,4 @@ +import dataQuery from '@js/common/data/query'; import { getUniqueValues, removeDuplicates } from '@js/core/utils/array'; import { isKeysEqual } from '@js/core/utils/array_compare'; import { getKeyHash } from '@js/core/utils/common'; @@ -5,7 +6,6 @@ import type { DeferredObj } from '@js/core/utils/deferred'; import { Deferred, when } from '@js/core/utils/deferred'; import { SelectionFilterCreator } from '@js/core/utils/selection_filter'; import { isDefined, isObject } from '@js/core/utils/type'; -import dataQuery from '@js/data/query'; import errors from '@js/ui/widget/ui.errors'; import SelectionStrategy from './m_selection.strategy'; @@ -115,6 +115,7 @@ export default class StandardStrategy extends SelectionStrategy { if (isDeselect) { const { selectedItems } = this.options; deselectedItems = combinedFilter && keys.length !== selectedItems.length + // @ts-expect-error ? dataQuery(selectedItems).filter(combinedFilter).toArray() : selectedItems.slice(0); } diff --git a/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.ts b/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.ts index 3c8e23cfbeaf..8f9a2eed529f 100644 --- a/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.ts +++ b/packages/devextreme/js/__internal/ui/selection/m_selection.strategy.ts @@ -1,3 +1,4 @@ +import dataQuery from '@js/common/data/query'; import { equalByValue, getKeyHash, @@ -5,7 +6,6 @@ import { } from '@js/core/utils/common'; import { Deferred } from '@js/core/utils/deferred'; import { isObject, isPlainObject, isPromise } from '@js/core/utils/type'; -import dataQuery from '@js/data/query'; export default class SelectionStrategy { options: any; @@ -156,6 +156,7 @@ export default class SelectionStrategy { if (localFilter && !isSelectAll) { filteredItems = filteredItems.filter(localFilter); } else if (needLoadAllData) { + // @ts-expect-error filteredItems = dataQuery(filteredItems).filter(remoteFilter).toArray(); } @@ -196,6 +197,7 @@ export default class SelectionStrategy { let selectedItems = this.options.ignoreDisabledItems ? this.options.selectedItems : this.options.selectedItems.filter((item) => !item?.disabled); if (dataFilter) { + // @ts-expect-error selectedItems = dataQuery(selectedItems).filter(dataFilter).toArray(); } diff --git a/packages/devextreme/js/__internal/ui/slider/m_slider.ts b/packages/devextreme/js/__internal/ui/slider/m_slider.ts index 51f370d60ccc..cbd72f849fa1 100644 --- a/packages/devextreme/js/__internal/ui/slider/m_slider.ts +++ b/packages/devextreme/js/__internal/ui/slider/m_slider.ts @@ -1,3 +1,12 @@ +import { name as clickName } from '@js/common/core/events/click'; +import { lock } from '@js/common/core/events/core/emitter.feedback'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import Swipeable from '@js/common/core/events/gesture/swipeable'; +import pointerEvents from '@js/common/core/events/pointer'; +import { + addNamespace, eventData, isMouseEvent, isTouchEvent, +} from '@js/common/core/events/utils/index'; +import numberLocalization from '@js/common/core/localization/number'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; @@ -7,15 +16,6 @@ import { Deferred } from '@js/core/utils/deferred'; import { extend } from '@js/core/utils/extend'; import { getExponentLength, getRemainderByDivision, roundFloatPart } from '@js/core/utils/math'; import { getWidth, setWidth } from '@js/core/utils/size'; -import { name as clickName } from '@js/events/click'; -import { lock } from '@js/events/core/emitter.feedback'; -import eventsEngine from '@js/events/core/events_engine'; -import Swipeable from '@js/events/gesture/swipeable'; -import pointerEvents from '@js/events/pointer'; -import { - addNamespace, eventData, isMouseEvent, isTouchEvent, -} from '@js/events/utils/index'; -import numberLocalization from '@js/localization/number'; import { current as currentTheme, isMaterial } from '@js/ui/themes'; import { render } from '@js/ui/widget/utils.ink_ripple'; diff --git a/packages/devextreme/js/__internal/ui/slider/m_slider_tooltip.ts b/packages/devextreme/js/__internal/ui/slider/m_slider_tooltip.ts index d51d927804e9..784891de302f 100644 --- a/packages/devextreme/js/__internal/ui/slider/m_slider_tooltip.ts +++ b/packages/devextreme/js/__internal/ui/slider/m_slider_tooltip.ts @@ -1,5 +1,5 @@ +import numberLocalization from '@js/common/core/localization/number'; import { extend } from '@js/core/utils/extend'; -import numberLocalization from '@js/localization/number'; import Tooltip from '@js/ui/tooltip'; import { SliderTooltipPositionController } from './m_slider_tooltip_position_controller'; diff --git a/packages/devextreme/js/__internal/ui/slider/m_slider_tooltip_position_controller.ts b/packages/devextreme/js/__internal/ui/slider/m_slider_tooltip_position_controller.ts index a4b3eeb760fa..3189c9ec6f7c 100644 --- a/packages/devextreme/js/__internal/ui/slider/m_slider_tooltip_position_controller.ts +++ b/packages/devextreme/js/__internal/ui/slider/m_slider_tooltip_position_controller.ts @@ -1,5 +1,5 @@ -import positionUtils from '@js/animation/position'; -import { move } from '@js/animation/translator'; +import positionUtils from '@js/common/core/animation/position'; +import { move } from '@js/common/core/animation/translator'; import { extend } from '@js/core/utils/extend'; import { isString } from '@js/core/utils/type'; import { PopoverPositionController } from '@ts/ui/popover/m_popover_position_controller'; @@ -36,7 +36,6 @@ class SliderTooltipPositionController extends PopoverPositionController { } _fitIntoSlider() { - // @ts-expect-error const { collisionSide, oversize } = positionUtils.calculate(this._$content, this._position).h; const { left } = this._visualPosition; const isLeftSide = collisionSide === 'left'; diff --git a/packages/devextreme/js/__internal/ui/speed_dial_action/m_speed_dial_item.ts b/packages/devextreme/js/__internal/ui/speed_dial_action/m_speed_dial_item.ts index cc43aca58d0f..3a8b7dd7bbea 100644 --- a/packages/devextreme/js/__internal/ui/speed_dial_action/m_speed_dial_item.ts +++ b/packages/devextreme/js/__internal/ui/speed_dial_action/m_speed_dial_item.ts @@ -1,11 +1,11 @@ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { getImageContainer } from '@js/core/utils/icon'; import { isPlainObject } from '@js/core/utils/type'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; import Overlay from '@js/ui/overlay/ui.overlay'; import type { Properties as PublicProperties } from '@js/ui/speed_dial_action'; import { isMaterial } from '@js/ui/themes'; diff --git a/packages/devextreme/js/__internal/ui/speed_dial_action/m_speed_dial_main_item.ts b/packages/devextreme/js/__internal/ui/speed_dial_action/m_speed_dial_main_item.ts index 15c48196802b..0dda420c847e 100644 --- a/packages/devextreme/js/__internal/ui/speed_dial_action/m_speed_dial_main_item.ts +++ b/packages/devextreme/js/__internal/ui/speed_dial_action/m_speed_dial_main_item.ts @@ -1,9 +1,9 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; import config from '@js/core/config'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { getHeight } from '@js/core/utils/size'; -import eventsEngine from '@js/events/core/events_engine'; import { isCompact, isFluent, isMaterial } from '@js/ui/themes'; import swatchContainer from '@js/ui/widget/swatch_container'; import errors from '@js/ui/widget/ui.errors'; diff --git a/packages/devextreme/js/__internal/ui/splitter/resize_handle.ts b/packages/devextreme/js/__internal/ui/splitter/resize_handle.ts index 6eec1305cf50..9cc1873e1d54 100644 --- a/packages/devextreme/js/__internal/ui/splitter/resize_handle.ts +++ b/packages/devextreme/js/__internal/ui/splitter/resize_handle.ts @@ -1,14 +1,14 @@ import type { DragDirection } from '@js/common'; +import { name as CLICK_EVENT } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { name as DOUBLE_CLICK_EVENT } from '@js/common/core/events/double_click'; +import { end as dragEventEnd, move as dragEventMove, start as dragEventStart } from '@js/common/core/events/drag'; +import { addNamespace, isCommandKeyPressed } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import Guid from '@js/core/guid'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import type { DxEvent } from '@js/events'; -import { name as CLICK_EVENT } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { name as DOUBLE_CLICK_EVENT } from '@js/events/double_click'; -import { end as dragEventEnd, move as dragEventMove, start as dragEventStart } from '@js/events/drag'; -import { addNamespace, isCommandKeyPressed } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import type { ItemCollapsedEvent, ItemExpandedEvent, ResizeEndEvent, ResizeEvent, ResizeStartEvent, } from '@js/ui/splitter'; diff --git a/packages/devextreme/js/__internal/ui/splitter/splitter.ts b/packages/devextreme/js/__internal/ui/splitter/splitter.ts index 145ced8108a1..25feb83b1dbc 100644 --- a/packages/devextreme/js/__internal/ui/splitter/splitter.ts +++ b/packages/devextreme/js/__internal/ui/splitter/splitter.ts @@ -1,4 +1,5 @@ import type { Orientation } from '@js/common'; +import { lock } from '@js/common/core/events/core/emitter.feedback'; import registerComponent from '@js/core/component_registrator'; import domAdapter from '@js/core/dom_adapter'; import { getPublicElement } from '@js/core/element'; @@ -15,7 +16,6 @@ import { } from '@js/core/utils/size'; import { isDefined, isObject } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import { lock } from '@js/events/core/emitter.feedback'; import type { Item, ItemCollapsedEvent, diff --git a/packages/devextreme/js/__internal/ui/splitter/utils/layout.ts b/packages/devextreme/js/__internal/ui/splitter/utils/layout.ts index a0d846c8b177..27122e2004e5 100644 --- a/packages/devextreme/js/__internal/ui/splitter/utils/layout.ts +++ b/packages/devextreme/js/__internal/ui/splitter/utils/layout.ts @@ -1,4 +1,5 @@ import type { Orientation } from '@js/common'; +import { toFixed } from '@js/common/core/localization/utils'; import type { dxElementWrapper } from '@js/core/renderer'; import { getHeight, @@ -8,7 +9,6 @@ import { normalizeStyleProp, styleProp, } from '@js/core/utils/style'; import { isDefined, isNumeric, isString } from '@js/core/utils/type'; -import { toFixed } from '@js/localization/utils'; import type { Item } from '@js/ui/splitter'; import { compareNumbersWithPrecision, PRECISION } from './number_comparison'; diff --git a/packages/devextreme/js/__internal/ui/splitter/utils/layout_default.ts b/packages/devextreme/js/__internal/ui/splitter/utils/layout_default.ts index 798ee8a0d866..a7fa013f7288 100644 --- a/packages/devextreme/js/__internal/ui/splitter/utils/layout_default.ts +++ b/packages/devextreme/js/__internal/ui/splitter/utils/layout_default.ts @@ -1,5 +1,5 @@ +import { toFixed } from '@js/common/core/localization/utils'; import { isDefined } from '@js/core/utils/type'; -import { toFixed } from '@js/localization/utils'; import { findLastIndexOfVisibleItem, normalizePanelSize } from './layout'; import { compareNumbersWithPrecision, PRECISION } from './number_comparison'; diff --git a/packages/devextreme/js/__internal/ui/splitter/utils/number_comparison.ts b/packages/devextreme/js/__internal/ui/splitter/utils/number_comparison.ts index 670d3307dc62..0416630d991e 100644 --- a/packages/devextreme/js/__internal/ui/splitter/utils/number_comparison.ts +++ b/packages/devextreme/js/__internal/ui/splitter/utils/number_comparison.ts @@ -1,4 +1,4 @@ -import { toFixed } from '@js/localization/utils'; +import { toFixed } from '@js/common/core/localization/utils'; export const PRECISION = 10; diff --git a/packages/devextreme/js/__internal/ui/tabs/m_tabs.ts b/packages/devextreme/js/__internal/ui/tabs/m_tabs.ts index face35ffa494..deb4f7c1d79f 100644 --- a/packages/devextreme/js/__internal/ui/tabs/m_tabs.ts +++ b/packages/devextreme/js/__internal/ui/tabs/m_tabs.ts @@ -1,3 +1,7 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import holdEvent from '@js/common/core/events/hold'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import devices from '@js/core/devices'; import $ from '@js/core/renderer'; @@ -8,10 +12,6 @@ import { each } from '@js/core/utils/iterator'; import { getHeight, getOuterWidth, getWidth } from '@js/core/utils/size'; import { isDefined, isPlainObject } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; -import holdEvent from '@js/events/hold'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace } from '@js/events/utils/index'; import Button from '@js/ui/button'; // eslint-disable-next-line import/no-named-default import { default as CollectionWidget } from '@js/ui/collection/ui.collection_widget.live_update'; diff --git a/packages/devextreme/js/__internal/ui/text_box/m_text_box.ts b/packages/devextreme/js/__internal/ui/text_box/m_text_box.ts index 4f6251a9fb85..32bfec720511 100644 --- a/packages/devextreme/js/__internal/ui/text_box/m_text_box.ts +++ b/packages/devextreme/js/__internal/ui/text_box/m_text_box.ts @@ -1,9 +1,9 @@ +import { normalizeKeyName } from '@js/common/core/events/utils/index'; import registerComponent from '@js/core/component_registrator'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import { getOuterWidth, getWidth } from '@js/core/utils/size'; import { getWindow } from '@js/core/utils/window'; -import { normalizeKeyName } from '@js/events/utils/index'; import TextEditor from './m_text_editor'; diff --git a/packages/devextreme/js/__internal/ui/text_box/m_text_editor.base.ts b/packages/devextreme/js/__internal/ui/text_box/m_text_editor.base.ts index 71c712a49748..42e42501905f 100644 --- a/packages/devextreme/js/__internal/ui/text_box/m_text_editor.base.ts +++ b/packages/devextreme/js/__internal/ui/text_box/m_text_editor.base.ts @@ -1,3 +1,6 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace, normalizeKeyName } from '@js/common/core/events/utils/index'; import config from '@js/core/config'; import devices from '@js/core/devices'; import domAdapter from '@js/core/dom_adapter'; @@ -9,9 +12,6 @@ import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { getWidth } from '@js/core/utils/size'; import { isDefined } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace, normalizeKeyName } from '@js/events/utils/index'; import Editor from '@js/ui/editor/editor'; import LoadIndicator from '@js/ui/load_indicator'; import { current, isFluent, isMaterial } from '@js/ui/themes'; diff --git a/packages/devextreme/js/__internal/ui/text_box/m_text_editor.clear.ts b/packages/devextreme/js/__internal/ui/text_box/m_text_editor.clear.ts index 19640aaf9635..98a1b9268b4a 100644 --- a/packages/devextreme/js/__internal/ui/text_box/m_text_editor.clear.ts +++ b/packages/devextreme/js/__internal/ui/text_box/m_text_editor.clear.ts @@ -1,8 +1,8 @@ +import { name as click } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import pointer from '@js/common/core/events/pointer'; +import { addNamespace } from '@js/common/core/events/utils/index'; import $ from '@js/core/renderer'; -import { name as click } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import pointer from '@js/events/pointer'; -import { addNamespace } from '@js/events/utils/index'; import TextEditorButton from '@ts/ui/text_box/texteditor_button_collection/m_button'; const pointerDown = pointer.down; diff --git a/packages/devextreme/js/__internal/ui/text_box/m_text_editor.label.ts b/packages/devextreme/js/__internal/ui/text_box/m_text_editor.label.ts index 5aaed4429ea1..dfc4060b3a6b 100644 --- a/packages/devextreme/js/__internal/ui/text_box/m_text_editor.label.ts +++ b/packages/devextreme/js/__internal/ui/text_box/m_text_editor.label.ts @@ -1,13 +1,13 @@ +import { name as click } from '@js/common/core/events/click'; +import { active } from '@js/common/core/events/core/emitter.feedback'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { start as hoverStart } from '@js/common/core/events/hover'; +import { addNamespace } from '@js/common/core/events/utils/index'; import Guid from '@js/core/guid'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; import { getWidth } from '@js/core/utils/size'; import { getWindow } from '@js/core/utils/window'; -import { name as click } from '@js/events/click'; -import { active } from '@js/events/core/emitter.feedback'; -import eventsEngine from '@js/events/core/events_engine'; -import { start as hoverStart } from '@js/events/hover'; -import { addNamespace } from '@js/events/utils/index'; const TEXTEDITOR_LABEL_CLASS = 'dx-texteditor-label'; const TEXTEDITOR_WITH_LABEL_CLASS = 'dx-texteditor-with-label'; diff --git a/packages/devextreme/js/__internal/ui/text_box/m_text_editor.mask.strategy.ts b/packages/devextreme/js/__internal/ui/text_box/m_text_editor.mask.strategy.ts index 772fc3a57beb..4832d3a02585 100644 --- a/packages/devextreme/js/__internal/ui/text_box/m_text_editor.mask.strategy.ts +++ b/packages/devextreme/js/__internal/ui/text_box/m_text_editor.mask.strategy.ts @@ -1,7 +1,7 @@ +import EventsEngine from '@js/common/core/events/core/events_engine'; +import { addNamespace } from '@js/common/core/events/utils/index'; import browser from '@js/core/utils/browser'; import { clipboardText as getClipboardText } from '@js/core/utils/dom'; -import EventsEngine from '@js/events/core/events_engine'; -import { addNamespace } from '@js/events/utils/index'; const MASK_EVENT_NAMESPACE = 'dxMask'; const BLUR_EVENT = 'blur beforedeactivate'; diff --git a/packages/devextreme/js/__internal/ui/text_box/m_text_editor.mask.ts b/packages/devextreme/js/__internal/ui/text_box/m_text_editor.mask.ts index 3441f1c700b7..7d01c93a5bc4 100644 --- a/packages/devextreme/js/__internal/ui/text_box/m_text_editor.mask.ts +++ b/packages/devextreme/js/__internal/ui/text_box/m_text_editor.mask.ts @@ -1,15 +1,15 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { name as wheelEventName } from '@js/common/core/events/core/wheel'; +import { + addNamespace, createEvent, isCommandKeyPressed, normalizeKeyName, +} from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import $ from '@js/core/renderer'; import { noop } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; import { each } from '@js/core/utils/iterator'; import { isEmpty } from '@js/core/utils/string'; import { isDefined } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { name as wheelEventName } from '@js/events/core/wheel'; -import { - addNamespace, createEvent, isCommandKeyPressed, normalizeKeyName, -} from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import { focused } from '@js/ui/widget/selectors'; import TextEditorBase from './m_text_editor.base'; diff --git a/packages/devextreme/js/__internal/ui/text_box/m_utils.scroll.ts b/packages/devextreme/js/__internal/ui/text_box/m_utils.scroll.ts index 5ee6e307f364..3adde44c9925 100644 --- a/packages/devextreme/js/__internal/ui/text_box/m_utils.scroll.ts +++ b/packages/devextreme/js/__internal/ui/text_box/m_utils.scroll.ts @@ -1,5 +1,5 @@ +import { isDxMouseWheelEvent } from '@js/common/core/events/utils/index'; import $ from '@js/core/renderer'; -import { isDxMouseWheelEvent } from '@js/events/utils/index'; // @ts-expect-error const allowScroll = function (container, delta, shiftKey?: boolean) { diff --git a/packages/devextreme/js/__internal/ui/text_box/texteditor_button_collection/m_custom.ts b/packages/devextreme/js/__internal/ui/text_box/texteditor_button_collection/m_custom.ts index 75475fc6559c..e3b4b922030b 100644 --- a/packages/devextreme/js/__internal/ui/text_box/texteditor_button_collection/m_custom.ts +++ b/packages/devextreme/js/__internal/ui/text_box/texteditor_button_collection/m_custom.ts @@ -1,8 +1,8 @@ +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { end, start } from '@js/common/core/events/hover'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { end, start } from '@js/events/hover'; import Button from '@js/ui/button'; import TextEditorButton from './m_button'; diff --git a/packages/devextreme/js/__internal/ui/toast/m_toast.ts b/packages/devextreme/js/__internal/ui/toast/m_toast.ts index a6df10c0a7bd..c53cb40caeee 100644 --- a/packages/devextreme/js/__internal/ui/toast/m_toast.ts +++ b/packages/devextreme/js/__internal/ui/toast/m_toast.ts @@ -1,11 +1,11 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import pointerEvents from '@js/common/core/events/pointer'; import registerComponent from '@js/core/component_registrator'; import domAdapter from '@js/core/dom_adapter'; import $ from '@js/core/renderer'; import { extend } from '@js/core/utils/extend'; import readyCallbacks from '@js/core/utils/ready_callbacks'; import { isString } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import pointerEvents from '@js/events/pointer'; import Overlay from '@js/ui/overlay/ui.overlay'; import { isMaterialBased } from '@js/ui/themes'; diff --git a/packages/devextreme/js/__internal/ui/toolbar/m_toolbar.base.ts b/packages/devextreme/js/__internal/ui/toolbar/m_toolbar.base.ts index 36f7ef9bb329..77b2f91b7974 100644 --- a/packages/devextreme/js/__internal/ui/toolbar/m_toolbar.base.ts +++ b/packages/devextreme/js/__internal/ui/toolbar/m_toolbar.base.ts @@ -1,4 +1,4 @@ -import fx from '@js/animation/fx'; +import { fx } from '@js/common/core/animation'; import registerComponent from '@js/core/component_registrator'; import type { dxElementWrapper } from '@js/core/renderer'; import $ from '@js/core/renderer'; diff --git a/packages/devextreme/js/__internal/ui/tree_view/m_tree_view.base.ts b/packages/devextreme/js/__internal/ui/tree_view/m_tree_view.base.ts index eb1df50f5cec..bab507e26c34 100644 --- a/packages/devextreme/js/__internal/ui/tree_view/m_tree_view.base.ts +++ b/packages/devextreme/js/__internal/ui/tree_view/m_tree_view.base.ts @@ -1,4 +1,10 @@ -import fx from '@js/animation/fx'; +import { fx } from '@js/common/core/animation'; +import { name as clickEventName } from '@js/common/core/events/click'; +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { name as dblclickEvent } from '@js/common/core/events/double_click'; +import pointerEvents from '@js/common/core/events/pointer'; +import { addNamespace } from '@js/common/core/events/utils/index'; +import messageLocalization from '@js/common/core/localization/message'; import domAdapter from '@js/core/dom_adapter'; import { getPublicElement } from '@js/core/element'; import $ from '@js/core/renderer'; @@ -14,12 +20,6 @@ import { isDefined, isFunction, isPrimitive, isString, } from '@js/core/utils/type'; import { hasWindow } from '@js/core/utils/window'; -import { name as clickEventName } from '@js/events/click'; -import eventsEngine from '@js/events/core/events_engine'; -import { name as dblclickEvent } from '@js/events/double_click'; -import pointerEvents from '@js/events/pointer'; -import { addNamespace } from '@js/events/utils/index'; -import messageLocalization from '@js/localization/message'; import CheckBox from '@js/ui/check_box'; import HierarchicalCollectionWidget from '@js/ui/hierarchical_collection/ui.hierarchical_collection_widget'; import LoadIndicator from '@js/ui/load_indicator'; diff --git a/packages/devextreme/js/__internal/viz/chart_components/m_base_chart.ts b/packages/devextreme/js/__internal/viz/chart_components/m_base_chart.ts index fbc70a2bc258..5a6b1c8382d8 100644 --- a/packages/devextreme/js/__internal/viz/chart_components/m_base_chart.ts +++ b/packages/devextreme/js/__internal/viz/chart_components/m_base_chart.ts @@ -1,10 +1,10 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; +import { isPointerEvent, isTouchEvent } from '@js/common/core/events/utils/index'; // @ts-expect-error import { grep, noop } from '@js/core/utils/common'; import { extend } from '@js/core/utils/extend'; import { reverseEach as _reverseEach } from '@js/core/utils/iterator'; import { isDefined as _isDefined, isFunction } from '@js/core/utils/type'; -import eventsEngine from '@js/events/core/events_engine'; -import { isPointerEvent, isTouchEvent } from '@js/events/utils/index'; import { LayoutManager } from '@js/viz/chart_components/layout_manager'; import * as trackerModule from '@js/viz/chart_components/tracker'; import { ThemeManager } from '@js/viz/components/chart_theme_manager'; diff --git a/packages/devextreme/js/__internal/viz/core/m_base_widget.ts b/packages/devextreme/js/__internal/viz/core/m_base_widget.ts index bd9c5079613d..511302860a8e 100644 --- a/packages/devextreme/js/__internal/viz/core/m_base_widget.ts +++ b/packages/devextreme/js/__internal/viz/core/m_base_widget.ts @@ -1,3 +1,4 @@ +import eventsEngine from '@js/common/core/events/core/events_engine'; import devices from '@js/core/devices'; import domAdapter from '@js/core/dom_adapter'; import DOMComponent from '@js/core/dom_component'; @@ -11,7 +12,6 @@ import { isDefined, isFunction, isNumeric, isObject as _isObject, type, } from '@js/core/utils/type'; import { getWindow, hasWindow } from '@js/core/utils/window'; -import eventsEngine from '@js/events/core/events_engine'; import { BaseThemeManager } from '@js/viz/core/base_theme_manager'; import { createEventTrigger, diff --git a/packages/devextreme/js/animation/easing.js b/packages/devextreme/js/animation/easing.js index a44fbd765536..54e45db8835f 100644 --- a/packages/devextreme/js/animation/easing.js +++ b/packages/devextreme/js/animation/easing.js @@ -1,92 +1 @@ -import { isFunction } from '../core/utils/type'; - -const CSS_TRANSITION_EASING_REGEX = /cubic-bezier\((\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\)/; - -const TransitionTimingFuncMap = { - 'linear': 'cubic-bezier(0, 0, 1, 1)', - 'swing': 'cubic-bezier(0.445, 0.05, 0.55, 0.95)', - 'ease': 'cubic-bezier(0.25, 0.1, 0.25, 1)', - 'ease-in': 'cubic-bezier(0.42, 0, 1, 1)', - 'ease-out': 'cubic-bezier(0, 0, 0.58, 1)', - 'ease-in-out': 'cubic-bezier(0.42, 0, 0.58, 1)' -}; - -const polynomBezier = function(x1, y1, x2, y2) { - const Cx = 3 * x1; - const Bx = 3 * (x2 - x1) - Cx; - const Ax = 1 - Cx - Bx; - - const Cy = 3 * y1; - const By = 3 * (y2 - y1) - Cy; - const Ay = 1 - Cy - By; - - const bezierX = function(t) { - return t * (Cx + t * (Bx + t * Ax)); - }; - - const bezierY = function(t) { - return t * (Cy + t * (By + t * Ay)); - }; - - const derivativeX = function(t) { - return Cx + t * (2 * Bx + t * 3 * Ax); - }; - - const findXFor = function(t) { - let x = t; - let i = 0; - let z; - - while(i < 14) { - z = bezierX(x) - t; - if(Math.abs(z) < 1e-3) { - break; - } - - x = x - z / derivativeX(x); - i++; - } - - return x; - }; - - return function(t) { - return bezierY(findXFor(t)); - }; -}; - -let easing = {}; -export const convertTransitionTimingFuncToEasing = function(cssTransitionEasing) { - cssTransitionEasing = TransitionTimingFuncMap[cssTransitionEasing] || cssTransitionEasing; - - let coeffs = cssTransitionEasing.match(CSS_TRANSITION_EASING_REGEX); - let forceName; - - if(!coeffs) { - forceName = 'linear'; - coeffs = TransitionTimingFuncMap[forceName].match(CSS_TRANSITION_EASING_REGEX); - } - - coeffs = coeffs.slice(1, 5); - for(let i = 0; i < coeffs.length; i++) { - coeffs[i] = parseFloat(coeffs[i]); - } - - const easingName = forceName || 'cubicbezier_' + coeffs.join('_').replace(/\./g, 'p'); - - if(!isFunction(easing[easingName])) { - easing[easingName] = function(x, t, b, c, d) { - return c * polynomBezier(coeffs[0], coeffs[1], coeffs[2], coeffs[3])(t / d) + b; - }; - } - - return easingName; -}; - -export function setEasing(value) { - easing = value; -} - -export function getEasing(name) { - return easing[name]; -} +export * from '../common/core/animation/easing'; diff --git a/packages/devextreme/js/animation/frame.d.ts b/packages/devextreme/js/animation/frame.d.ts index b9bd4438793d..52f791ff914a 100644 --- a/packages/devextreme/js/animation/frame.d.ts +++ b/packages/devextreme/js/animation/frame.d.ts @@ -1,15 +1,4 @@ -/** - * @docid utils.cancelAnimationFrame - * @publicName cancelAnimationFrame(requestID) - * @namespace DevExpress.utils - * @public - */ -export function cancelAnimationFrame(requestID: number): void; - -/** - * @docid utils.requestAnimationFrame - * @publicName requestAnimationFrame(callback) - * @namespace DevExpress.utils - * @public - */ -export function requestAnimationFrame(callback: Function): number; +export { + cancelAnimationFrame, + requestAnimationFrame, +} from '../common/core/animation'; diff --git a/packages/devextreme/js/animation/frame.js b/packages/devextreme/js/animation/frame.js index 85c3847c9ec6..d2d9b93ca616 100644 --- a/packages/devextreme/js/animation/frame.js +++ b/packages/devextreme/js/animation/frame.js @@ -1,42 +1 @@ -import { hasWindow, getWindow } from '../core/utils/window'; -const window = hasWindow() ? getWindow() : {}; -import callOnce from '../core/utils/call_once'; - -const FRAME_ANIMATION_STEP_TIME = 1000 / 60; - -let request = function(callback) { - return setTimeout(callback, FRAME_ANIMATION_STEP_TIME); -}; - -let cancel = function(requestID) { - clearTimeout(requestID); -}; - -const setAnimationFrameMethods = callOnce(function() { - const nativeRequest = window.requestAnimationFrame || - window.webkitRequestAnimationFrame || - window.mozRequestAnimationFrame || - window.oRequestAnimationFrame || - window.msRequestAnimationFrame; - - const nativeCancel = window.cancelAnimationFrame || - window.webkitCancelAnimationFrame || - window.mozCancelAnimationFrame || - window.oCancelAnimationFrame || - window.msCancelAnimationFrame; - - if(nativeRequest && nativeCancel) { - request = nativeRequest; - cancel = nativeCancel; - } -}); - -export function requestAnimationFrame() { - setAnimationFrameMethods(); - return request.apply(window, arguments); -} - -export function cancelAnimationFrame() { - setAnimationFrameMethods(); - cancel.apply(window, arguments); -} +export { cancelAnimationFrame, requestAnimationFrame } from '../common/core/animation'; diff --git a/packages/devextreme/js/animation/fx.d.ts b/packages/devextreme/js/animation/fx.d.ts index d92b547687a8..e23f4c360e09 100644 --- a/packages/devextreme/js/animation/fx.d.ts +++ b/packages/devextreme/js/animation/fx.d.ts @@ -1,153 +1,15 @@ -import { DxElement } from '../core/element'; -import { DxPromise } from '../core/utils/deferred'; -import { PositionConfig } from './position'; +import { fx, AnimationConfig } from '../common/core/animation'; -import { - Direction, -} from '../common'; - -export type AnimationType = 'css' | 'fade' | 'fadeIn' | 'fadeOut' | 'pop' | 'slide' | 'slideIn' | 'slideOut'; - -/** - * @docid - * @public - * @type object - */ -export type AnimationState = string | number | { - /** - * @docid - * @public - */ - opacity: number; -} | { - /** - * @docid - * @public - */ - scale: number; -} | { - /** - * @docid - * @public - */ - position: PositionConfig; -} | { - /** - * @docid - * @public - */ - left: number; -} | { - /** - * @docid - * @public - */ - top: number; -}; - -/** - * @docid - * @namespace DevExpress - * @type object|number|string - * @public - */ -export type AnimationConfig = { - /** - * @docid - * @public - */ - complete?: (($element: DxElement, config: AnimationConfig) => void); - /** - * @docid - * @default 0 - * @public - */ - delay?: number; - /** - * @docid - * @default undefined - * @public - */ - direction?: Direction | undefined; - /** - * @docid - * @default 400 - * @public - */ - duration?: number; - /** - * @docid - * @default 'ease' - * @public - */ - easing?: string; - /** - * @docid - * @default {} - * @public - */ - from?: AnimationState; - /** - * @docid - * @default undefined - * @public - */ - staggerDelay?: number | undefined; - /** - * @docid - * @public - */ - start?: (($element: DxElement, config: AnimationConfig) => void); - /** - * @docid - * @default {} - * @public - */ - to?: AnimationState; - /** - * @docid - * @default 'custom' - * @public - */ - type?: AnimationType; -}; +export { + AnimationState, + AnimationConfig, + AnimationType, +} from '../common/core/animation'; /** * @public - * @deprecated Use the AnimationConfig type instead + * @deprecated Use the AnimationConfig type from common/core/animation instead */ export type animationConfig = AnimationConfig; -/** - * @public - * @docid - * @section utils - * @namespace DevExpress - */ -declare const fx: { - /** - * @docid - * @publicName animate(element, config) - * @return Promise - * @namespace DevExpress.fx - * @public - */ - animate(element: Element, config: AnimationConfig): DxPromise; - - /** - * @docid - * @publicName isAnimating(element) - * @namespace DevExpress.fx - * @public - */ - isAnimating(element: Element): boolean; - - /** - * @docid - * @publicName stop(element, jumpToEnd) - * @namespace DevExpress.fx - * @public - */ - stop(element: Element, jumpToEnd: boolean): void; -}; export default fx; diff --git a/packages/devextreme/js/animation/fx.js b/packages/devextreme/js/animation/fx.js index c6cc7f7898be..8cbfcfb4bd36 100644 --- a/packages/devextreme/js/animation/fx.js +++ b/packages/devextreme/js/animation/fx.js @@ -1,841 +1,3 @@ -import $ from '../core/renderer'; -import { getWindow } from '../core/utils/window'; -const window = getWindow(); -import eventsEngine from '../events/core/events_engine'; -import errors from '../core/errors'; -import { getPublicElement } from '../core/element'; -import { extend } from '../core/utils/extend'; -import { isFunction, isPlainObject } from '../core/utils/type'; -import { each, map } from '../core/utils/iterator'; -import { - getTranslateCss, - parseTranslate, - clearCache, - locate, - getTranslate -} from './translator'; -import { - convertTransitionTimingFuncToEasing, - getEasing -} from './easing'; -import { requestAnimationFrame, cancelAnimationFrame } from './frame'; -import supportUtils from '../__internal/core/utils/m_support'; -import positionUtils from './position'; -import { removeEvent } from '../events/remove'; -import { addNamespace } from '../events/utils/index'; -import { when, Deferred } from '../core/utils/deferred'; -const removeEventName = addNamespace(removeEvent, 'dxFX'); -import { noop } from '../core/utils/common'; - - -const RELATIVE_VALUE_REGEX = /^([+-])=(.*)/i; -const ANIM_DATA_KEY = 'dxAnimData'; -const ANIM_QUEUE_KEY = 'dxAnimQueue'; -const TRANSFORM_PROP = 'transform'; - -const TransitionAnimationStrategy = { - initAnimation: function($element, config) { - $element.css({ - 'transitionProperty': 'none' - }); - - if(typeof config.from === 'string') { - $element.addClass(config.from); - } else { - setProps($element, config.from); - } - - const that = this; - const deferred = new Deferred(); - const cleanupWhen = config.cleanupWhen; - - config.transitionAnimation = { - deferred: deferred, - finish: function() { - that._finishTransition($element); - if(cleanupWhen) { - when(deferred, cleanupWhen).always(function() { - that._cleanup($element, config); - }); - } else { - that._cleanup($element, config); - } - deferred.resolveWith($element, [config, $element]); - } - }; - - this._completeAnimationCallback($element, config) - .done(function() { - config.transitionAnimation.finish(); - }) - .fail(function() { - deferred.rejectWith($element, [config, $element]); - }); - - if(!config.duration) { - config.transitionAnimation.finish(); - } - - // NOTE: Hack for setting 'from' css by browser before run animation - // Do not move this hack to initAnimation since some css props can be changed in the 'start' callback (T231434) - // Unfortunately this can't be unit tested - // TODO: find better way if possible - $element.css('transform'); - }, - animate: function($element, config) { - this._startAnimation($element, config); - return config.transitionAnimation.deferred.promise(); - }, - - _completeAnimationCallback: function($element, config) { - const that = this; - const startTime = Date.now() + config.delay; - const deferred = new Deferred(); - const transitionEndFired = new Deferred(); - const simulatedTransitionEndFired = new Deferred(); - let simulatedEndEventTimer; - const transitionEndEventFullName = supportUtils.transitionEndEventName() + '.dxFX'; - - config.transitionAnimation.cleanup = function() { - clearTimeout(simulatedEndEventTimer); - clearTimeout(waitForJSCompleteTimer); - eventsEngine.off($element, transitionEndEventFullName); - eventsEngine.off($element, removeEventName); - }; - - eventsEngine.one($element, transitionEndEventFullName, function() { - // NOTE: prevent native transitionEnd event from previous animation in queue (Chrome) - if(Date.now() - startTime >= config.duration) { - transitionEndFired.reject(); - } - }); - eventsEngine.off($element, removeEventName); - eventsEngine.on($element, removeEventName, function() { - that.stop($element, config); - deferred.reject(); - }); - - const waitForJSCompleteTimer = setTimeout(function() { // Fix for a visual bug (T244514): do not setup the timer until all js code has finished working - simulatedEndEventTimer = setTimeout(function() { - simulatedTransitionEndFired.reject(); - }, config.duration + config.delay + fx._simulatedTransitionEndDelay /* T255863 */); - - when(transitionEndFired, simulatedTransitionEndFired).fail((function() { - deferred.resolve(); - }).bind(this)); - }); - - return deferred.promise(); - }, - - _startAnimation: function($element, config) { - $element.css({ - 'transitionProperty': 'all', - 'transitionDelay': config.delay + 'ms', - 'transitionDuration': config.duration + 'ms', - 'transitionTimingFunction': config.easing - }); - - if(typeof config.to === 'string') { - $element[0].className += ' ' + config.to; - // Do not uncomment: performance critical - // $element.addClass(config.to); - } else if(config.to) { - setProps($element, config.to); - } - }, - - _finishTransition: function($element) { - $element.css('transition', 'none'); - }, - - _cleanup: function($element, config) { - config.transitionAnimation.cleanup(); - - if(typeof config.from === 'string') { - $element.removeClass(config.from); - $element.removeClass(config.to); - } - }, - - stop: function($element, config, jumpToEnd) { - if(!config) { - return; - } - - if(jumpToEnd) { - config.transitionAnimation.finish(); - } else { - if(isPlainObject(config.to)) { - each(config.to, function(key) { - $element.css(key, $element.css(key)); - }); - } - this._finishTransition($element); - this._cleanup($element, config); - } - } -}; - -const FrameAnimationStrategy = { - initAnimation: function($element, config) { - setProps($element, config.from); - }, - animate: function($element, config) { - const deferred = new Deferred(); - const that = this; - - if(!config) { - return deferred.reject().promise(); - } - - each(config.to, function(prop) { - if(config.from[prop] === undefined) { - config.from[prop] = that._normalizeValue($element.css(prop)); - } - }); - - if(config.to[TRANSFORM_PROP]) { - config.from[TRANSFORM_PROP] = that._parseTransform(config.from[TRANSFORM_PROP]); - config.to[TRANSFORM_PROP] = that._parseTransform(config.to[TRANSFORM_PROP]); - } - - config.frameAnimation = { - to: config.to, - from: config.from, - currentValue: config.from, - easing: convertTransitionTimingFuncToEasing(config.easing), - duration: config.duration, - startTime: new Date().valueOf(), - finish: function() { - this.currentValue = this.to; - this.draw(); - cancelAnimationFrame(config.frameAnimation.animationFrameId); - deferred.resolve(); - }, - draw: function() { - if(config.draw) { - config.draw(this.currentValue); - return; - } - - const currentValue = extend({}, this.currentValue); - - if(currentValue[TRANSFORM_PROP]) { - currentValue[TRANSFORM_PROP] = map(currentValue[TRANSFORM_PROP], function(value, prop) { - if(prop === 'translate') { - return getTranslateCss(value); - } else if(prop === 'scale') { - return 'scale(' + value + ')'; - } else if(prop.substr(0, prop.length - 1) === 'rotate') { - return prop + '(' + value + 'deg)'; - } - }).join(' '); - } - - $element.css(currentValue); - } - }; - - if(config.delay) { - config.frameAnimation.startTime += config.delay; - config.frameAnimation.delayTimeout = setTimeout(function() { - that._startAnimation($element, config); - }, config.delay); - } else { - that._startAnimation($element, config); - } - return deferred.promise(); - }, - - _startAnimation: function($element, config) { - eventsEngine.off($element, removeEventName); - eventsEngine.on($element, removeEventName, function() { - if(config.frameAnimation) { - cancelAnimationFrame(config.frameAnimation.animationFrameId); - } - }); - - this._animationStep($element, config); - }, - - _parseTransform: function(transformString) { - const result = {}; - - each(transformString.match(/\w+\d*\w*\([^)]*\)\s*/g), function(i, part) { - const translateData = parseTranslate(part); - const scaleData = part.match(/scale\((.+?)\)/); - const rotateData = part.match(/(rotate.)\((.+)deg\)/); - - if(translateData) { - result.translate = translateData; - } - - if(scaleData && scaleData[1]) { - result.scale = parseFloat(scaleData[1]); - } - - if(rotateData && rotateData[1]) { - result[rotateData[1]] = parseFloat(rotateData[2]); - } - }); - - return result; - }, - - stop: function($element, config, jumpToEnd) { - const frameAnimation = config && config.frameAnimation; - - if(!frameAnimation) { - return; - } - - cancelAnimationFrame(frameAnimation.animationFrameId); - clearTimeout(frameAnimation.delayTimeout); - - if(jumpToEnd) { - frameAnimation.finish(); - } - - delete config.frameAnimation; - }, - - _animationStep: function($element, config) { - const frameAnimation = config && config.frameAnimation; - - if(!frameAnimation) { - return; - } - - const now = new Date().valueOf(); - - if(now >= frameAnimation.startTime + frameAnimation.duration) { - frameAnimation.finish(); - return; - } - - frameAnimation.currentValue = this._calcStepValue(frameAnimation, now - frameAnimation.startTime); - frameAnimation.draw(); - - const that = this; - frameAnimation.animationFrameId = requestAnimationFrame(function() { - that._animationStep($element, config); - }); - }, - - _calcStepValue: function(frameAnimation, currentDuration) { - const calcValueRecursively = function(from, to) { - const result = Array.isArray(to) ? [] : {}; - - const calcEasedValue = function(propName) { - const x = currentDuration / frameAnimation.duration; - const t = currentDuration; - const b = 1 * from[propName]; - const c = to[propName] - from[propName]; - const d = frameAnimation.duration; - - return getEasing(frameAnimation.easing)(x, t, b, c, d); - }; - - each(to, function(propName, endPropValue) { - if(typeof endPropValue === 'string' && parseFloat(endPropValue) === false) { - return true; - } - - result[propName] = typeof endPropValue === 'object' - ? calcValueRecursively(from[propName], endPropValue) - : calcEasedValue(propName); - }); - - return result; - }; - - return calcValueRecursively(frameAnimation.from, frameAnimation.to); - }, - - _normalizeValue: function(value) { - const numericValue = parseFloat(value); - - if(numericValue === false) { - return value; - } - - return numericValue; - } -}; - -const FallbackToNoAnimationStrategy = { - initAnimation: function() { - }, - animate: function() { - return new Deferred().resolve().promise(); - }, - stop: noop, - isSynchronous: true -}; - -const getAnimationStrategy = function(config) { - config = config || {}; - const animationStrategies = { - 'transition': supportUtils.transition() ? TransitionAnimationStrategy : FrameAnimationStrategy, - 'frame': FrameAnimationStrategy, - 'noAnimation': FallbackToNoAnimationStrategy - }; - let strategy = config.strategy || 'transition'; - - if(config.type === 'css' && !supportUtils.transition()) { - strategy = 'noAnimation'; - } - - return animationStrategies[strategy]; -}; - -const baseConfigValidator = function(config, animationType, validate, typeMessage) { - each(['from', 'to'], function() { - if(!validate(config[this])) { - throw errors.Error('E0010', animationType, this, typeMessage); - } - }); -}; - -const isObjectConfigValidator = function(config, animationType) { - return baseConfigValidator(config, animationType, function(target) { return isPlainObject(target); }, 'a plain object'); -}; - -const isStringConfigValidator = function(config, animationType) { - return baseConfigValidator(config, animationType, function(target) { return typeof target === 'string'; }, 'a string'); -}; - -const CustomAnimationConfigurator = { - setup: function() { - } -}; - -const CssAnimationConfigurator = { - validateConfig: function(config) { - isStringConfigValidator(config, 'css'); - }, - - setup: function() { - } -}; - -const positionAliases = { - 'top': { my: 'bottom center', at: 'top center' }, - 'bottom': { my: 'top center', at: 'bottom center' }, - 'right': { my: 'left center', at: 'right center' }, - 'left': { my: 'right center', at: 'left center' } -}; - -const SlideAnimationConfigurator = { - validateConfig: function(config) { - isObjectConfigValidator(config, 'slide'); - }, - - setup: function($element, config) { - const location = locate($element); - - if(config.type !== 'slide') { - const positioningConfig = (config.type === 'slideIn') ? config.from : config.to; - - positioningConfig.position = extend({ of: window }, positionAliases[config.direction]); - setupPosition($element, positioningConfig); - } - - this._setUpConfig(location, config.from); - this._setUpConfig(location, config.to); - - clearCache($element); - }, - - _setUpConfig: function(location, config) { - config.left = 'left' in config ? config.left : '+=0'; - config.top = 'top' in config ? config.top : '+=0'; - - this._initNewPosition(location, config); - }, - - _initNewPosition: function(location, config) { - const position = { - left: config.left, - top: config.top - }; - - delete config.left; - delete config.top; - - let relativeValue = this._getRelativeValue(position.left); - if(relativeValue !== undefined) { - position.left = relativeValue + location.left; - } else { - config.left = 0; - } - - relativeValue = this._getRelativeValue(position.top); - if(relativeValue !== undefined) { - position.top = relativeValue + location.top; - } else { - config.top = 0; - } - - config[TRANSFORM_PROP] = getTranslateCss({ x: position.left, y: position.top }); - }, - - _getRelativeValue: function(value) { - let relativeValue; - if(typeof value === 'string' && (relativeValue = RELATIVE_VALUE_REGEX.exec(value))) { - return parseInt(relativeValue[1] + '1') * relativeValue[2]; - } - } -}; - -const FadeAnimationConfigurator = { - setup: function($element, config) { - const from = config.from; - const to = config.to; - const defaultFromOpacity = config.type === 'fadeOut' ? 1 : 0; - const defaultToOpacity = config.type === 'fadeOut' ? 0 : 1; - let fromOpacity = isPlainObject(from) ? String(from.opacity ?? defaultFromOpacity) : String(from); - let toOpacity = isPlainObject(to) ? String(to.opacity ?? defaultToOpacity) : String(to); - - if(!config.skipElementInitialStyles) { - fromOpacity = $element.css('opacity'); - } - - switch(config.type) { - case 'fadeIn': - toOpacity = 1; - break; - case 'fadeOut': - toOpacity = 0; - break; - } - - config.from = { - visibility: 'visible', - opacity: fromOpacity - }; - - config.to = { - opacity: toOpacity - }; - } -}; - -const PopAnimationConfigurator = { - validateConfig: function(config) { - isObjectConfigValidator(config, 'pop'); - }, - - setup: function($element, config) { - const from = config.from; - const to = config.to; - const fromOpacity = 'opacity' in from ? from.opacity : $element.css('opacity'); - const toOpacity = 'opacity' in to ? to.opacity : 1; - const fromScale = 'scale' in from ? from.scale : 0; - const toScale = 'scale' in to ? to.scale : 1; - - config.from = { - opacity: fromOpacity - }; - - const translate = getTranslate($element); - - config.from[TRANSFORM_PROP] = this._getCssTransform(translate, fromScale); - - config.to = { - opacity: toOpacity - }; - config.to[TRANSFORM_PROP] = this._getCssTransform(translate, toScale); - }, - - _getCssTransform: function(translate, scale) { - return getTranslateCss(translate) + 'scale(' + scale + ')'; - } -}; - - -const animationConfigurators = { - 'custom': CustomAnimationConfigurator, - 'slide': SlideAnimationConfigurator, - 'slideIn': SlideAnimationConfigurator, - 'slideOut': SlideAnimationConfigurator, - 'fade': FadeAnimationConfigurator, - 'fadeIn': FadeAnimationConfigurator, - 'fadeOut': FadeAnimationConfigurator, - 'pop': PopAnimationConfigurator, - 'css': CssAnimationConfigurator -}; - -const getAnimationConfigurator = function(config) { - const result = animationConfigurators[config.type]; - if(!result) { - throw errors.Error('E0011', config.type); - } - - return result; -}; - - -const defaultJSConfig = { - type: 'custom', - from: {}, - to: {}, - duration: 400, - start: noop, - complete: noop, - easing: 'ease', - delay: 0 -}; -const defaultCssConfig = { - duration: 400, - easing: 'ease', - delay: 0 -}; - -function setupAnimationOnElement() { - const animation = this; - const $element = animation.element; - const config = animation.config; - - setupPosition($element, config.from); - setupPosition($element, config.to); - - animation.configurator.setup($element, config); - - $element.data(ANIM_DATA_KEY, animation); - - if(fx.off) { - config.duration = 0; - config.delay = 0; - } - - animation.strategy.initAnimation($element, config); - - if(config.start) { - const element = getPublicElement($element); - config.start.apply(this, [element, config]); - } -} - -const onElementAnimationComplete = function(animation) { - const $element = animation.element; - const config = animation.config; - - $element.removeData(ANIM_DATA_KEY); - if(config.complete) { - const element = getPublicElement($element); - config.complete.apply(this, [element, config]); - } - animation.deferred.resolveWith(this, [$element, config]); -}; - -const startAnimationOnElement = function() { - const animation = this; - const $element = animation.element; - const config = animation.config; - - animation.isStarted = true; - return animation.strategy.animate($element, config) - .done(function() { - onElementAnimationComplete(animation); - }) - .fail(function() { - animation.deferred.rejectWith(this, [$element, config]); - }); -}; - -const stopAnimationOnElement = function(jumpToEnd) { - const animation = this; - const $element = animation.element; - const config = animation.config; - - clearTimeout(animation.startTimeout); - - if(!animation.isStarted) { - animation.start(); - } - - animation.strategy.stop($element, config, jumpToEnd); -}; - -const scopedRemoveEvent = addNamespace(removeEvent, 'dxFXStartAnimation'); - -const subscribeToRemoveEvent = function(animation) { - eventsEngine.off(animation.element, scopedRemoveEvent); - eventsEngine.on(animation.element, scopedRemoveEvent, function() { - fx.stop(animation.element); - }); - - animation.deferred.always(function() { - eventsEngine.off(animation.element, scopedRemoveEvent); - }); -}; - -const createAnimation = function(element, initialConfig) { - const defaultConfig = initialConfig.type === 'css' ? defaultCssConfig : defaultJSConfig; - const config = extend(true, {}, defaultConfig, initialConfig); - const configurator = getAnimationConfigurator(config); - const strategy = getAnimationStrategy(config); - const animation = { - element: $(element), - config: config, - configurator: configurator, - strategy: strategy, - isSynchronous: strategy.isSynchronous, - setup: setupAnimationOnElement, - start: startAnimationOnElement, - stop: stopAnimationOnElement, - deferred: new Deferred() - }; - - if(isFunction(configurator.validateConfig)) { - configurator.validateConfig(config); - } - - subscribeToRemoveEvent(animation); - - return animation; -}; - -const animate = function(element, config) { - const $element = $(element); - - if(!$element.length) { - return new Deferred().resolve().promise(); - } - - const animation = createAnimation($element, config); - - pushInAnimationQueue($element, animation); - return animation.deferred.promise(); -}; - -function pushInAnimationQueue($element, animation) { - const queueData = getAnimQueueData($element); - writeAnimQueueData($element, queueData); - queueData.push(animation); - - if(!isAnimating($element)) { - shiftFromAnimationQueue($element, queueData); - } -} - -function getAnimQueueData($element) { - return $element.data(ANIM_QUEUE_KEY) || []; -} - -function writeAnimQueueData($element, queueData) { - $element.data(ANIM_QUEUE_KEY, queueData); -} - -const destroyAnimQueueData = function($element) { - $element.removeData(ANIM_QUEUE_KEY); -}; - -function isAnimating($element) { - return !!$element.data(ANIM_DATA_KEY); -} - -function shiftFromAnimationQueue($element, queueData) { - queueData = getAnimQueueData($element); - if(!queueData.length) { - return; - } - - const animation = queueData.shift(); - if(queueData.length === 0) { - destroyAnimQueueData($element); - } - - executeAnimation(animation).done(function() { - if(!isAnimating($element)) { - shiftFromAnimationQueue($element); - } - }); -} - -function executeAnimation(animation) { - animation.setup(); - if(fx.off || animation.isSynchronous) { - animation.start(); - } else { - animation.startTimeout = setTimeout(function() { - animation.start(); - }); - } - - return animation.deferred.promise(); -} - -function setupPosition($element, config) { - if(!config || !config.position) { - return; - } - - const win = $(window); - let left = 0; - let top = 0; - const position = positionUtils.calculate($element, config.position); - const offset = $element.offset(); - const currentPosition = $element.position(); - - if(currentPosition.top > offset.top) { - top = win.scrollTop(); - } - - if(currentPosition.left > offset.left) { - left = win.scrollLeft(); - } - - extend(config, { - left: position.h.location - offset.left + currentPosition.left - left, - top: position.v.location - offset.top + currentPosition.top - top - }); - - delete config.position; -} - -function setProps($element, props) { - each(props, function(key, value) { - try { - $element.css(key, isFunction(value) ? value() : value); - } catch(e) { } - }); -} - -const stop = function(element, jumpToEnd) { - const $element = $(element); - const queueData = getAnimQueueData($element); - - // TODO: think about complete all animation in queue - each(queueData, function(_, animation) { - animation.config.delay = 0; - animation.config.duration = 0; - animation.isSynchronous = true; - }); - - if(!isAnimating($element)) { - shiftFromAnimationQueue($element, queueData); - } - const animation = $element.data(ANIM_DATA_KEY); - - if(animation) { - animation.stop(jumpToEnd); - } - - $element.removeData(ANIM_DATA_KEY); - destroyAnimQueueData($element); -}; - -const fx = { - off: false, - animationTypes: animationConfigurators, - animate: animate, - createAnimation: createAnimation, - isAnimating: isAnimating, - stop: stop, - _simulatedTransitionEndDelay: 100 -}; +import { fx } from '../common/core/animation'; export default fx; diff --git a/packages/devextreme/js/animation/position.d.ts b/packages/devextreme/js/animation/position.d.ts index bdc714237b6d..f318b2db2287 100644 --- a/packages/devextreme/js/animation/position.d.ts +++ b/packages/devextreme/js/animation/position.d.ts @@ -1,115 +1,14 @@ -import { - UserDefinedElement, -} from '../core/element'; +import { PositionConfig } from '../common/core/animation'; -import { - HorizontalAlignment, - PositionAlignment, - VerticalAlignment, -} from '../common'; - -/** @public */ -export type CollisionResolution = 'fit' | 'flip' | 'flipfit' | 'none'; -/** @public */ -export type CollisionResolutionCombination = 'fit' | 'fit flip' | 'fit flipfit' | 'fit none' | 'flip' | 'flip fit' | 'flip none' | 'flipfit' | 'flipfit fit' | 'flipfit none' | 'none' | 'none fit' | 'none flip' | 'none flipfit'; - -/** - * @docid - * @namespace DevExpress - * @type object - * @public - */ -export interface PositionConfig { - /** - * @docid - * @public - */ - at?: PositionAlignment | { - /** - * @docid - */ - x?: HorizontalAlignment; - /** - * @docid - */ - y?: VerticalAlignment; - }; - /** - * @docid - * @public - */ - boundary?: string | UserDefinedElement | Window; - /** - * @docid - * @public - */ - boundaryOffset?: string | { - /** - * @docid - * @default 0 - */ - x?: number; - /** - * @docid - * @default 0 - */ - y?: number; - }; - /** - * @docid - * @public - */ - collision?: CollisionResolutionCombination | { - /** - * @docid - * @default 'none' - */ - x?: CollisionResolution; - /** - * @docid - * @default 'none' - */ - y?: CollisionResolution; - }; - /** - * @docid - * @public - */ - my?: PositionAlignment | { - /** - * @docid - */ - x?: HorizontalAlignment; - /** - * @docid - */ - y?: VerticalAlignment; - }; - /** - * @docid - * @public - */ - of?: string | UserDefinedElement | Window; - /** - * @docid - * @public - */ - offset?: string | { - /** - * @docid - * @default 0 - */ - x?: number; - /** - * @docid - * @default 0 - */ - y?: number; - }; -} +export { + CollisionResolution, + CollisionResolutionCombination, + PositionConfig, +} from '../common/core/animation'; /** * @public - * @deprecated Use the PositionConfig type instead + * @deprecated Use the PositionConfig type from common/core/animation instead + * @namespace DevExpress.animation */ export interface positionConfig extends PositionConfig { } diff --git a/packages/devextreme/js/animation/position.js b/packages/devextreme/js/animation/position.js index a0de691c56d0..758cb60114b5 100644 --- a/packages/devextreme/js/animation/position.js +++ b/packages/devextreme/js/animation/position.js @@ -1,435 +1 @@ -import { getOuterWidth, getOuterHeight, getWidth, getHeight } from '../core/utils/size'; -import $ from '../core/renderer'; - -import { splitPair, pairToObject } from '../core/utils/common'; -import { each } from '../core/utils/iterator'; -import { getWindow } from '../core/utils/window'; -const window = getWindow(); -import domAdapter from '../core/dom_adapter'; -import { isWindow, isDefined } from '../core/utils/type'; -import { extend } from '../core/utils/extend'; -import { getBoundingRect } from '../core/utils/position'; -import browser from '../core/utils/browser'; -import { resetPosition, move } from './translator'; -import { touch } from '../core/utils/support'; -import devices from '../core/devices'; -import { setStyle } from '../core/utils/style'; - -const horzRe = /left|right/; -const vertRe = /top|bottom/; -const collisionRe = /fit|flip|none/; -const scaleRe = /scale\(.+?\)/; -const IS_SAFARI = browser.safari; - -const normalizeAlign = function(raw) { - const result = { - h: 'center', - v: 'center' - }; - - const pair = splitPair(raw); - - if(pair) { - each(pair, function() { - const w = String(this).toLowerCase(); - if(horzRe.test(w)) { - result.h = w; - } else if(vertRe.test(w)) { - result.v = w; - } - }); - } - - return result; -}; - -const normalizeOffset = function(raw, preventRound) { - return pairToObject(raw, preventRound); -}; - -const normalizeCollision = function(raw) { - const pair = splitPair(raw); - let h = String(pair && pair[0]).toLowerCase(); - let v = String(pair && pair[1]).toLowerCase(); - - if(!collisionRe.test(h)) { - h = 'none'; - } - if(!collisionRe.test(v)) { - v = h; - } - - return { h: h, v: v }; -}; - -const getAlignFactor = function(align) { - switch(align) { - case 'center': - return 0.5; - case 'right': - case 'bottom': - return 1; - default: - return 0; - } -}; - -const inverseAlign = function(align) { - switch(align) { - case 'left': - return 'right'; - case 'right': - return 'left'; - case 'top': - return 'bottom'; - case 'bottom': - return 'top'; - default: - return align; - } -}; - -const calculateOversize = function(data, bounds) { - let oversize = 0; - - if(data.myLocation < bounds.min) { - oversize += bounds.min - data.myLocation; - } - - if(data.myLocation > bounds.max) { - oversize += data.myLocation - bounds.max; - } - - return oversize; -}; - -const collisionSide = function(direction, data, bounds) { - if(data.myLocation < bounds.min) { - return direction === 'h' ? 'left' : 'top'; - } - if(data.myLocation > bounds.max) { - return direction === 'h' ? 'right' : 'bottom'; - } - return 'none'; -}; - -// TODO: rename? -const initMyLocation = function(data) { - data.myLocation = data.atLocation - + getAlignFactor(data.atAlign) * data.atSize - - getAlignFactor(data.myAlign) * data.mySize - + data.offset; -}; - -const collisionResolvers = { - - 'fit': function(data, bounds) { - let result = false; - if(data.myLocation > bounds.max) { - data.myLocation = bounds.max; - result = true; - } - if(data.myLocation < bounds.min) { - data.myLocation = bounds.min; - result = true; - } - - data.fit = result; - }, - - 'flip': function(data, bounds) { - data.flip = false; - - if(data.myAlign === 'center' && data.atAlign === 'center') { - return; - } - - if(data.myLocation < bounds.min || data.myLocation > bounds.max) { - const inverseData = extend({}, data, { - myAlign: inverseAlign(data.myAlign), - atAlign: inverseAlign(data.atAlign), - offset: -data.offset - }); - - initMyLocation(inverseData); - inverseData.oversize = calculateOversize(inverseData, bounds); - - if((inverseData.myLocation >= bounds.min && inverseData.myLocation <= bounds.max) || data.oversize > inverseData.oversize) { - data.myLocation = inverseData.myLocation; - data.oversize = inverseData.oversize; - data.flip = true; - } - } - }, - - 'flipfit': function(data, bounds) { - this.flip(data, bounds); - this.fit(data, bounds); - }, - - 'none': function(data) { - data.oversize = 0; - } -}; - -let scrollbarWidth; - -const calculateScrollbarWidth = function() { - const $scrollDiv = $('
').css({ - width: 100, - height: 100, - overflow: 'scroll', - position: 'absolute', - top: -9999 - }).appendTo($('body')); - const result = $scrollDiv.get(0).offsetWidth - $scrollDiv.get(0).clientWidth; - - $scrollDiv.remove(); - - scrollbarWidth = result; -}; - -const defaultPositionResult = { - h: { - location: 0, - flip: false, - fit: false, - oversize: 0 - }, - v: { - location: 0, - flip: false, - fit: false, - oversize: 0 - } -}; - -const calculatePosition = function(what, options) { - const $what = $(what); - const currentOffset = $what.offset(); - const result = extend(true, {}, defaultPositionResult, { - h: { location: currentOffset.left }, - v: { location: currentOffset.top } - }); - - if(!options) { - return result; - } - - const my = normalizeAlign(options.my); - const at = normalizeAlign(options.at); - let of = ($(options.of).length && options.of) || window; - const offset = normalizeOffset(options.offset, options.precise); - const collision = normalizeCollision(options.collision); - const boundary = options.boundary; - const boundaryOffset = normalizeOffset(options.boundaryOffset, options.precise); - - const h = { - mySize: getOuterWidth($what), - myAlign: my.h, - atAlign: at.h, - offset: offset.h, - collision: collision.h, - boundaryOffset: boundaryOffset.h - }; - - const v = { - mySize: getOuterHeight($what), - myAlign: my.v, - atAlign: at.v, - offset: offset.v, - collision: collision.v, - boundaryOffset: boundaryOffset.v - }; - - if(of.preventDefault) { - h.atLocation = of.pageX; - v.atLocation = of.pageY; - h.atSize = 0; - v.atSize = 0; - } else { - of = $(of); - if(isWindow(of[0])) { - h.atLocation = of.scrollLeft(); - v.atLocation = of.scrollTop(); - if(devices.real().deviceType === 'phone' && of[0].visualViewport) { - h.atLocation = Math.max(h.atLocation, of[0].visualViewport.offsetLeft); - v.atLocation = Math.max(v.atLocation, of[0].visualViewport.offsetTop); - h.atSize = of[0].visualViewport.width; - v.atSize = of[0].visualViewport.height; - } else { - h.atSize = of[0].innerWidth > of[0].outerWidth ? of[0].innerWidth : getWidth(of); - v.atSize = of[0].innerHeight > of[0].outerHeight || IS_SAFARI ? of[0].innerHeight : getHeight(of); - } - } else if(of[0].nodeType === 9) { - h.atLocation = 0; - v.atLocation = 0; - h.atSize = getWidth(of); - v.atSize = getHeight(of); - } else { - const ofRect = getBoundingRect(of.get(0)); - const o = getOffsetWithoutScale(of); - h.atLocation = o.left; - v.atLocation = o.top; - h.atSize = Math.max(ofRect.width, getOuterWidth(of)); - v.atSize = Math.max(ofRect.height, getOuterHeight(of)); - } - } - - initMyLocation(h); - initMyLocation(v); - - const bounds = (function() { - const win = $(window); - const windowWidth = getWidth(win); - const windowHeight = getHeight(win); - let left = win.scrollLeft(); - let top = win.scrollTop(); - const documentElement = domAdapter.getDocumentElement(); - const hZoomLevel = touch ? documentElement.clientWidth / windowWidth : 1; - const vZoomLevel = touch ? documentElement.clientHeight / windowHeight : 1; - - if(scrollbarWidth === undefined) { - calculateScrollbarWidth(); - } - - let boundaryWidth = windowWidth; - let boundaryHeight = windowHeight; - - if(boundary && !isWindow(boundary)) { - const $boundary = $(boundary); - const boundaryPosition = $boundary.offset(); - - left = boundaryPosition.left; - top = boundaryPosition.top; - - boundaryWidth = getWidth($boundary); - boundaryHeight = getHeight($boundary); - } - - return { - h: { - min: left + h.boundaryOffset, - max: left + boundaryWidth / hZoomLevel - h.mySize - h.boundaryOffset - }, - v: { - min: top + v.boundaryOffset, - max: top + boundaryHeight / vZoomLevel - v.mySize - v.boundaryOffset - } - }; - })(); - - h.oversize = calculateOversize(h, bounds.h); - v.oversize = calculateOversize(v, bounds.v); - - h.collisionSide = collisionSide('h', h, bounds.h); - v.collisionSide = collisionSide('v', v, bounds.v); - - if(collisionResolvers[h.collision]) { - collisionResolvers[h.collision](h, bounds.h); - } - - if(collisionResolvers[v.collision]) { - collisionResolvers[v.collision](v, bounds.v); - } - - const preciser = function(number) { - return options.precise ? number : Math.round(number); - }; - - extend(true, result, { - h: { location: preciser(h.myLocation), oversize: preciser(h.oversize), fit: h.fit, flip: h.flip, collisionSide: h.collisionSide }, - v: { location: preciser(v.myLocation), oversize: preciser(v.oversize), fit: v.fit, flip: v.flip, collisionSide: v.collisionSide }, - precise: options.precise - }); - - return result; -}; -// NOTE: Setting the 'element.style' requires creating attributeNode when both of the conditions met: -// - a form contains an input with the name property set to "style"; -// - a form contains a dx-validator (or other popup widget). -// T941581 -const setScaleProperty = function(element, scale, styleAttr, isEmpty) { - const stylePropIsValid = isDefined(element.style) && !domAdapter.isNode(element.style); - const newStyleValue = isEmpty ? styleAttr.replace(scale, '') : styleAttr; - - if(stylePropIsValid) { - setStyle(element, newStyleValue, false); - } else { - const styleAttributeNode = domAdapter.createAttribute('style'); - styleAttributeNode.value = newStyleValue; - element.setAttributeNode(styleAttributeNode); - } -}; - -const getOffsetWithoutScale = function($startElement, $currentElement = $startElement) { - const currentElement = $currentElement.get(0); - if(!currentElement) { - return $startElement.offset(); - } - - const style = currentElement.getAttribute?.('style') || ''; - const scale = style.match(scaleRe)?.[0]; - let offset; - - if(scale) { - setScaleProperty(currentElement, scale, style, true); - offset = getOffsetWithoutScale($startElement, $currentElement.parent()); - setScaleProperty(currentElement, scale, style, false); - } else { - offset = getOffsetWithoutScale($startElement, $currentElement.parent()); - } - - return offset; -}; - -const position = function(what, options) { - const $what = $(what); - - if(!options) { - return $what.offset(); - } - - resetPosition($what, true); - - - const offset = getOffsetWithoutScale($what); - const targetPosition = (options.h && options.v) ? options : calculatePosition($what, options); - - const preciser = function(number) { - return options.precise ? number : Math.round(number); - }; - - move($what, { - left: targetPosition.h.location - preciser(offset.left), - top: targetPosition.v.location - preciser(offset.top) - }); - - return targetPosition; -}; - -const offset = function(element) { - element = $(element).get(0); - if(isWindow(element)) { - return null; - } else if(element && 'pageY' in element && 'pageX' in element) { - return { top: element.pageY, left: element.pageX }; - } - - return $(element).offset(); -}; - -if(!position.inverseAlign) { - position.inverseAlign = inverseAlign; -} - -if(!position.normalizeAlign) { - position.normalizeAlign = normalizeAlign; -} - -export default { - calculateScrollbarWidth: calculateScrollbarWidth, - calculate: calculatePosition, - setup: position, - offset: offset -}; +export { default } from '../common/core/animation/position'; diff --git a/packages/devextreme/js/animation/presets.d.ts b/packages/devextreme/js/animation/presets.d.ts index bed84b56a128..e6b56dc14e3f 100644 --- a/packages/devextreme/js/animation/presets.d.ts +++ b/packages/devextreme/js/animation/presets.d.ts @@ -1,59 +1,3 @@ -import { - Device, -} from '../core/devices'; - -import { - AnimationConfig, -} from './fx'; - -/** - * @docid - * @namespace DevExpress - * @public - */ -declare const animationPresets: { - /** - * @docid - * @publicName applyChanges() - * @public - */ - applyChanges(): void; - /** - * @docid - * @publicName clear() - * @public - */ - clear(): void; - /** - * @docid - * @publicName clear(name) - * @public - */ - clear(name: string): void; - /** - * @docid - * @publicName getPreset(name) - * @public - */ - getPreset(name: string): AnimationConfig; - /** - * @docid - * @publicName registerDefaultPresets() - * @public - */ - registerDefaultPresets(): void; - /** - * @docid - * @publicName registerPreset(name, config) - * @public - */ - registerPreset(name: string, config: { animation: AnimationConfig; device?: Device }): void; - /** - * @docid - * @publicName resetToDefaults() - * @public - */ - resetToDefaults(): void; -}; +import { animationPresets } from '../common/core/animation'; export default animationPresets; diff --git a/packages/devextreme/js/animation/presets.js b/packages/devextreme/js/animation/presets.js index a195940b0309..e6b56dc14e3f 100644 --- a/packages/devextreme/js/animation/presets.js +++ b/packages/devextreme/js/animation/presets.js @@ -1,3 +1,3 @@ -import { presets } from './presets/presets'; +import { animationPresets } from '../common/core/animation'; -export default presets; +export default animationPresets; diff --git a/packages/devextreme/js/animation/presets/presets.js b/packages/devextreme/js/animation/presets/presets.js index 7775d572ff57..e10fcb85aa86 100644 --- a/packages/devextreme/js/animation/presets/presets.js +++ b/packages/devextreme/js/animation/presets/presets.js @@ -1,395 +1 @@ -import { getWidth } from '../../core/utils/size'; -import { Component } from '../../core/component'; -import { each } from '../../core/utils/iterator'; -import { extend } from '../../core/utils/extend'; -import devices from '../../core/devices'; -import fx from '../fx'; - -const directionPostfixes = { - forward: ' dx-forward', - backward: ' dx-backward', - none: ' dx-no-direction', - undefined: ' dx-no-direction' -}; - -const optionPrefix = 'preset_'; - -const AnimationPresetCollection = Component.inherit({ - ctor: function() { - this.callBase.apply(this, arguments); - this._registeredPresets = []; - this.resetToDefaults(); - }, - - _getDefaultOptions: function() { - return extend(this.callBase(), { - defaultAnimationDuration: 400, - defaultAnimationDelay: 0, - defaultStaggerAnimationDuration: 300, - defaultStaggerAnimationDelay: 40, - defaultStaggerAnimationStartDelay: 500 // hack for better animations on ipad mini - }); - }, - - _defaultOptionsRules: function() { - return this.callBase().concat([ - { - device: function(device) { - return device.phone; - }, - options: { - defaultStaggerAnimationDuration: 350, - defaultStaggerAnimationDelay: 50, - defaultStaggerAnimationStartDelay: 0 - } - }, - { // T254756 - device: function() { - return devices.current().android || devices.real.android; - }, - options: { - defaultAnimationDelay: 100 - } - } - ]); - }, - - _getPresetOptionName: function(animationName) { - return optionPrefix + animationName; - }, - - // T257755 - _createAndroidSlideAnimationConfig: function(throughOpacity, widthMultiplier) { - const that = this; - - const createBaseConfig = function(configModifier) { - return { - type: 'slide', - delay: configModifier.delay === undefined ? that.option('defaultAnimationDelay') : configModifier.delay, - duration: configModifier.duration === undefined ? that.option('defaultAnimationDuration') : configModifier.duration - }; - }; - - return { - enter: function($element, configModifier) { - const width = getWidth($element.parent()) * widthMultiplier; - const direction = configModifier.direction; - const config = createBaseConfig(configModifier); - - config.to = { - left: 0, - opacity: 1 - }; - - if(direction === 'forward') { - config.from = { - left: width, - opacity: throughOpacity - }; - } else if(direction === 'backward') { - config.from = { - left: -width, - opacity: throughOpacity - }; - } else { - config.from = { - left: 0, - opacity: 0 - }; - } - - return fx.createAnimation($element, config); - }, - leave: function($element, configModifier) { - const width = getWidth($element.parent()) * widthMultiplier; - const direction = configModifier.direction; - const config = createBaseConfig(configModifier); - - config.from = { - left: 0, - opacity: 1 - }; - - if(direction === 'forward') { - config.to = { - left: -width, - opacity: throughOpacity - }; - } else if(direction === 'backward') { - config.to = { - left: width, - opacity: throughOpacity - }; - } else { - config.to = { - left: 0, - opacity: 0 - }; - } - - return fx.createAnimation($element, config); - } - }; - }, - - _createOpenDoorConfig: function() { - const that = this; - - const createBaseConfig = function(configModifier) { - return { - type: 'css', - extraCssClasses: 'dx-opendoor-animation', - delay: configModifier.delay === undefined ? that.option('defaultAnimationDelay') : configModifier.delay, - duration: configModifier.duration === undefined ? that.option('defaultAnimationDuration') : configModifier.duration - }; - }; - - return { - enter: function($element, configModifier) { - const direction = configModifier.direction; - const config = createBaseConfig(configModifier); - - config.delay = direction === 'none' ? config.delay : config.duration; - config.from = 'dx-enter dx-opendoor-animation' + directionPostfixes[direction]; - config.to = 'dx-enter-active'; - - return fx.createAnimation($element, config); - }, - leave: function($element, configModifier) { - const direction = configModifier.direction; - const config = createBaseConfig(configModifier); - - config.from = 'dx-leave dx-opendoor-animation' + directionPostfixes[direction]; - config.to = 'dx-leave-active'; - - return fx.createAnimation($element, config); - } - }; - }, - - _createWinPopConfig: function() { - const that = this; - const baseConfig = { - type: 'css', - extraCssClasses: 'dx-win-pop-animation', - duration: that.option('defaultAnimationDuration') - }; - - return { - enter: function($element, configModifier) { - const config = baseConfig; - const direction = configModifier.direction; - - config.delay = direction === 'none' ? that.option('defaultAnimationDelay') : that.option('defaultAnimationDuration') / 2; - config.from = 'dx-enter dx-win-pop-animation' + directionPostfixes[direction]; - config.to = 'dx-enter-active'; - - return fx.createAnimation($element, config); - }, - leave: function($element, configModifier) { - const config = baseConfig; - const direction = configModifier.direction; - - config.delay = that.option('defaultAnimationDelay'); - config.from = 'dx-leave dx-win-pop-animation' + directionPostfixes[direction]; - config.to = 'dx-leave-active'; - - return fx.createAnimation($element, config); - } - }; - }, - - resetToDefaults: function() { - this.clear(); - this.registerDefaultPresets(); - this.applyChanges(); - }, - - clear: function(name) { - const that = this; - const newRegisteredPresets = []; - - each(this._registeredPresets, function(index, preset) { - if(!name || name === preset.name) { - that.option(that._getPresetOptionName(preset.name), undefined); - } else { - newRegisteredPresets.push(preset); - } - }); - this._registeredPresets = newRegisteredPresets; - this.applyChanges(); - }, - - registerPreset: function(name, config) { - this._registeredPresets.push({ - name: name, - config: config - }); - }, - - applyChanges: function() { - const that = this; - const customRules = []; - - each(this._registeredPresets, function(index, preset) { - const rule = { - device: preset.config.device, - options: {} - }; - - rule.options[that._getPresetOptionName(preset.name)] = preset.config.animation; - customRules.push(rule); - }); - - this._setOptionsByDevice(customRules); - }, - - getPreset: function(name) { - let result = name; - - while(typeof result === 'string') { - result = this.option(this._getPresetOptionName(result)); - } - - return result; - }, - - registerDefaultPresets: function() { - this.registerPreset('pop', { - animation: { - extraCssClasses: 'dx-android-pop-animation', - delay: this.option('defaultAnimationDelay'), - duration: this.option('defaultAnimationDuration') - } - }); - this.registerPreset('openDoor', { - animation: this._createOpenDoorConfig() - }); - this.registerPreset('win-pop', { - animation: this._createWinPopConfig() - }); - this.registerPreset('fade', { - animation: { - extraCssClasses: 'dx-fade-animation', - delay: this.option('defaultAnimationDelay'), - duration: this.option('defaultAnimationDuration') - } - }); - this.registerPreset('slide', { - device: function() { - return devices.current().android || devices.real.android; - }, - animation: this._createAndroidSlideAnimationConfig(1, 1) - }); - this.registerPreset('slide', { - device: function() { - return !devices.current().android && !devices.real.android; - }, - animation: { - extraCssClasses: 'dx-slide-animation', - delay: this.option('defaultAnimationDelay'), - duration: this.option('defaultAnimationDuration') - } - }); - this.registerPreset('ios7-slide', { - animation: { - extraCssClasses: 'dx-ios7-slide-animation', - delay: this.option('defaultAnimationDelay'), - duration: this.option('defaultAnimationDuration') - } - }); - this.registerPreset('overflow', { - animation: { - extraCssClasses: 'dx-overflow-animation', - delay: this.option('defaultAnimationDelay'), - duration: this.option('defaultAnimationDuration') - } - }); - this.registerPreset('ios7-toolbar', { - device: function() { - return !devices.current().android && !devices.real.android; - }, - animation: { - extraCssClasses: 'dx-ios7-toolbar-animation', - delay: this.option('defaultAnimationDelay'), - duration: this.option('defaultAnimationDuration') - } - }); - this.registerPreset('ios7-toolbar', { - device: function() { - return devices.current().android || devices.real.android; - }, - animation: this._createAndroidSlideAnimationConfig(0, 0.4) - }); - this.registerPreset('stagger-fade', { - animation: { - extraCssClasses: 'dx-fade-animation', - staggerDelay: this.option('defaultStaggerAnimationDelay'), - duration: this.option('defaultStaggerAnimationDuration'), - delay: this.option('defaultStaggerAnimationStartDelay') - } - }); - this.registerPreset('stagger-slide', { - animation: { - extraCssClasses: 'dx-slide-animation', - staggerDelay: this.option('defaultStaggerAnimationDelay'), - duration: this.option('defaultStaggerAnimationDuration'), - delay: this.option('defaultStaggerAnimationStartDelay') - } - }); - this.registerPreset('stagger-fade-slide', { - animation: { - extraCssClasses: 'dx-fade-slide-animation', - staggerDelay: this.option('defaultStaggerAnimationDelay'), - duration: this.option('defaultStaggerAnimationDuration'), - delay: this.option('defaultStaggerAnimationStartDelay') - } - }); - this.registerPreset('stagger-drop', { - animation: { - extraCssClasses: 'dx-drop-animation', - staggerDelay: this.option('defaultStaggerAnimationDelay'), - duration: this.option('defaultStaggerAnimationDuration'), - delay: this.option('defaultStaggerAnimationStartDelay') - } - }); - this.registerPreset('stagger-fade-drop', { - animation: { - extraCssClasses: 'dx-fade-drop-animation', - staggerDelay: this.option('defaultStaggerAnimationDelay'), - duration: this.option('defaultStaggerAnimationDuration'), - delay: this.option('defaultStaggerAnimationStartDelay') - } - }); - this.registerPreset('stagger-fade-rise', { - animation: { - extraCssClasses: 'dx-fade-rise-animation', - staggerDelay: this.option('defaultStaggerAnimationDelay'), - duration: this.option('defaultStaggerAnimationDuration'), - delay: this.option('defaultStaggerAnimationStartDelay') - } - }); - this.registerPreset('stagger-3d-drop', { - animation: { - extraCssClasses: 'dx-3d-drop-animation', - staggerDelay: this.option('defaultStaggerAnimationDelay'), - duration: this.option('defaultStaggerAnimationDuration'), - delay: this.option('defaultStaggerAnimationStartDelay') - } - }); - this.registerPreset('stagger-fade-zoom', { - animation: { - extraCssClasses: 'dx-fade-zoom-animation', - staggerDelay: this.option('defaultStaggerAnimationDelay'), - duration: this.option('defaultStaggerAnimationDuration'), - delay: this.option('defaultStaggerAnimationStartDelay') - } - }); - } -}); - -const animationPresets = new AnimationPresetCollection(); -export { - animationPresets as presets, - AnimationPresetCollection as PresetCollection -}; +export * from '../../common/core/animation/presets/presets'; diff --git a/packages/devextreme/js/animation/transition_executor.d.ts b/packages/devextreme/js/animation/transition_executor.d.ts index ebfe785da8d4..231dbc1b3789 100644 --- a/packages/devextreme/js/animation/transition_executor.d.ts +++ b/packages/devextreme/js/animation/transition_executor.d.ts @@ -1,52 +1,3 @@ -import { - UserDefinedElementsArray, -} from '../core/element'; +import { TransitionExecutor } from '../common/core/animation'; -import { - DxPromise, -} from '../core/utils/deferred'; - -import { - AnimationConfig, -} from './fx'; - -/** - * @docid - * @namespace DevExpress - * @public - */ -export default class TransitionExecutor { - /** - * @docid - * @publicName enter(elements, animation) - * @param1 elements:jQuery - * @public - */ - enter(elements: UserDefinedElementsArray, animation: AnimationConfig | string): void; - /** - * @docid - * @publicName leave(elements, animation) - * @param1 elements:jQuery - * @public - */ - leave(elements: UserDefinedElementsArray, animation: AnimationConfig | string): void; - /** - * @docid - * @publicName reset() - * @public - */ - reset(): void; - /** - * @docid - * @publicName start() - * @return Promise - * @public - */ - start(): DxPromise; - /** - * @docid - * @publicName stop() - * @public - */ - stop(): void; -} +export default TransitionExecutor; diff --git a/packages/devextreme/js/animation/transition_executor.js b/packages/devextreme/js/animation/transition_executor.js index 62e969cd574c..231dbc1b3789 100644 --- a/packages/devextreme/js/animation/transition_executor.js +++ b/packages/devextreme/js/animation/transition_executor.js @@ -1,2 +1,3 @@ -import { TransitionExecutor } from './transition_executor/transition_executor'; +import { TransitionExecutor } from '../common/core/animation'; + export default TransitionExecutor; diff --git a/packages/devextreme/js/animation/transition_executor/transition_executor.js b/packages/devextreme/js/animation/transition_executor/transition_executor.js index c52563030251..78b6f32c532a 100644 --- a/packages/devextreme/js/animation/transition_executor/transition_executor.js +++ b/packages/devextreme/js/animation/transition_executor/transition_executor.js @@ -1,178 +1 @@ -import $ from '../../core/renderer'; -import Class from '../../core/class'; -import { extend } from '../../core/utils/extend'; -import commonUtils from '../../__internal/core/utils/m_common'; -import { isFunction, isPlainObject } from '../../core/utils/type'; -import { map } from '../../core/utils/iterator'; -import fx from '../fx'; -import { presets } from '../presets/presets'; -import { when, Deferred } from '../../core/utils/deferred'; - -const directionPostfixes = { - forward: ' dx-forward', - backward: ' dx-backward', - none: ' dx-no-direction', - undefined: ' dx-no-direction' -}; -const DX_ANIMATING_CLASS = 'dx-animating'; - -export const TransitionExecutor = Class.inherit({ - ctor: function() { - this._accumulatedDelays = { - enter: 0, - leave: 0 - }; - this._animations = []; - this.reset(); - }, - - _createAnimations: function($elements, initialConfig, configModifier, type) { - $elements = $($elements); - const that = this; - const result = []; - - configModifier = configModifier || {}; - const animationConfig = this._prepareElementAnimationConfig(initialConfig, configModifier, type); - - if(animationConfig) { - $elements.each(function() { - const animation = that._createAnimation($(this), animationConfig, configModifier); - if(animation) { - animation.element.addClass(DX_ANIMATING_CLASS); - animation.setup(); - result.push(animation); - } - }); - } - - return result; - }, - - _prepareElementAnimationConfig: function(config, configModifier, type) { - let result; - - if(typeof config === 'string') { - const presetName = config; - config = presets.getPreset(presetName); - } - - if(!config) { - result = undefined; - } else if(isFunction(config[type])) { - result = config[type]; - } else { - result = extend({ - skipElementInitialStyles: true, - cleanupWhen: this._completePromise - }, config, configModifier); - - if(!result.type || result.type === 'css') { - const cssClass = 'dx-' + type; - const extraCssClasses = (result.extraCssClasses ? ' ' + result.extraCssClasses : '') + directionPostfixes[result.direction]; - - result.type = 'css'; - result.from = (result.from || cssClass) + extraCssClasses; - result.to = result.to || (cssClass + '-active'); - } - - result.staggerDelay = result.staggerDelay || 0; - result.delay = result.delay || 0; - - if(result.staggerDelay) { - result.delay += this._accumulatedDelays[type]; - this._accumulatedDelays[type] += result.staggerDelay; - } - - } - return result; - }, - - _createAnimation: function($element, animationConfig, configModifier) { - let result; - - if(isPlainObject(animationConfig)) { - result = fx.createAnimation($element, animationConfig); - } else if(isFunction(animationConfig)) { - result = animationConfig($element, configModifier); - } - - return result; - }, - - _startAnimations: function() { - const animations = this._animations; - - for(let i = 0; i < animations.length; i++) { - animations[i].start(); - } - }, - - _stopAnimations: function(jumpToEnd) { - const animations = this._animations; - - for(let i = 0; i < animations.length; i++) { - animations[i].stop(jumpToEnd); - } - }, - - _clearAnimations: function() { - const animations = this._animations; - - for(let i = 0; i < animations.length; i++) { - animations[i].element.removeClass(DX_ANIMATING_CLASS); - } - - this._animations.length = 0; - }, - - reset: function() { - this._accumulatedDelays.enter = 0; - this._accumulatedDelays.leave = 0; - this._clearAnimations(); - this._completeDeferred = new Deferred(); - this._completePromise = this._completeDeferred.promise(); - }, - enter: function($elements, animationConfig, configModifier) { - const animations = this._createAnimations($elements, animationConfig, configModifier, 'enter'); - this._animations.push.apply(this._animations, animations); - }, - leave: function($elements, animationConfig, configModifier) { - const animations = this._createAnimations($elements, animationConfig, configModifier, 'leave'); - this._animations.push.apply(this._animations, animations); - }, - start: function() { - const that = this; - let result; - - if(!this._animations.length) { - that.reset(); - result = new Deferred().resolve().promise(); - } else { - const animationDeferreds = map(this._animations, function(animation) { - const result = new Deferred(); - - animation.deferred.always(function() { - result.resolve(); - }); - - return result.promise(); - }); - - result = when.apply($, animationDeferreds) - .always(function() { - that._completeDeferred.resolve(); - that.reset(); - }); - - commonUtils.executeAsync(function() { - that._startAnimations(); - }); - } - - return result; - }, - stop: function(jumpToEnd) { - this._stopAnimations(jumpToEnd); - } - -}); +export * from '../../common/core/animation/transition_executor/transition_executor'; diff --git a/packages/devextreme/js/animation/translator.js b/packages/devextreme/js/animation/translator.js index d07d84115ffc..e13fcd349c62 100644 --- a/packages/devextreme/js/animation/translator.js +++ b/packages/devextreme/js/animation/translator.js @@ -1,145 +1 @@ -import $ from '../core/renderer'; -import { data as elementData, removeData } from '../core/element_data'; -import { type } from '../core/utils/type'; - -const TRANSLATOR_DATA_KEY = 'dxTranslator'; -const TRANSFORM_MATRIX_REGEX = /matrix(3d)?\((.+?)\)/; -const TRANSLATE_REGEX = /translate(?:3d)?\((.+?)\)/; - -export const locate = function($element) { - $element = $($element); - - const translate = getTranslate($element); - - return { - left: translate.x, - top: translate.y - }; -}; -function isPercentValue(value) { - return type(value) === 'string' && value[value.length - 1] === '%'; -} - -function cacheTranslate($element, translate) { - if($element.length) { - elementData($element.get(0), TRANSLATOR_DATA_KEY, translate); - } -} - -export const clearCache = function($element) { - if($element.length) { - removeData($element.get(0), TRANSLATOR_DATA_KEY); - } -}; - -export const getTranslateCss = function(translate) { - translate.x = translate.x || 0; - translate.y = translate.y || 0; - - const xValueString = isPercentValue(translate.x) ? translate.x : translate.x + 'px'; - const yValueString = isPercentValue(translate.y) ? translate.y : translate.y + 'px'; - - return 'translate(' + xValueString + ', ' + yValueString + ')'; -}; - -export const getTranslate = function($element) { - let result = $element.length ? elementData($element.get(0), TRANSLATOR_DATA_KEY) : null; - - if(!result) { - const transformValue = $element.css('transform') || getTranslateCss({ x: 0, y: 0 }); - let matrix = transformValue.match(TRANSFORM_MATRIX_REGEX); - const is3D = matrix && matrix[1]; - - if(matrix) { - matrix = matrix[2].split(','); - if(is3D === '3d') { - matrix = matrix.slice(12, 15); - } else { - matrix.push(0); - matrix = matrix.slice(4, 7); - } - } else { - matrix = [0, 0, 0]; - } - - result = { - x: parseFloat(matrix[0]), - y: parseFloat(matrix[1]), - z: parseFloat(matrix[2]) - }; - - cacheTranslate($element, result); - } - - return result; -}; - -export const move = function($element, position) { - $element = $($element); - - const left = position.left; - const top = position.top; - let translate; - - if(left === undefined) { - translate = getTranslate($element); - translate.y = top || 0; - } else if(top === undefined) { - translate = getTranslate($element); - translate.x = left || 0; - } else { - translate = { x: left || 0, y: top || 0, z: 0 }; - cacheTranslate($element, translate); - } - - $element.css({ - transform: getTranslateCss(translate) - }); - - if(isPercentValue(left) || isPercentValue(top)) { - clearCache($element); - } -}; - -export const resetPosition = function($element, finishTransition) { - $element = $($element); - - let originalTransition; - const stylesConfig = { - left: 0, - top: 0, - transform: 'none', - }; - - if(finishTransition) { - originalTransition = $element.css('transition'); - stylesConfig.transition = 'none'; - } - - $element.css(stylesConfig); - - clearCache($element); - - if(finishTransition) { - $element.get(0).offsetHeight; - $element.css('transition', originalTransition); - } -}; - -export const parseTranslate = function(translateString) { - let result = translateString.match(TRANSLATE_REGEX); - - if(!result || !result[1]) { - return; - } - - result = result[1].split(','); - - result = { - x: parseFloat(result[0]), - y: parseFloat(result[1]), - z: parseFloat(result[2]) - }; - - return result; -}; +export * from '../common/core/animation/translator'; diff --git a/packages/devextreme/js/bundles/modules/core.js b/packages/devextreme/js/bundles/modules/core.js index 6af1b7be42b0..d50aaaefd35b 100644 --- a/packages/devextreme/js/bundles/modules/core.js +++ b/packages/devextreme/js/bundles/modules/core.js @@ -12,8 +12,8 @@ if(DevExpress._DEVEXTREME_BUNDLE_INITIALIZED) { DevExpress._DEVEXTREME_BUNDLE_INITIALIZED = true; DevExpress.clientExporter = require('../../exporter'); -DevExpress.excelExporter = require('../../excel_exporter'); -DevExpress.pdfExporter = require('../../pdf_exporter'); +DevExpress.excelExporter = require('../../common/export/excel'); +DevExpress.pdfExporter = require('../../common/export/pdf'); DevExpress.VERSION = require('../../core/version').version; DevExpress.assertDevExtremeVersion = require('../../core/version_check').assertDevExtremeVersion; @@ -24,12 +24,12 @@ DevExpress.DOMComponent = require('../../core/dom_component'); DevExpress.Component = require('../../core/component').Component; DevExpress.registerComponent = require('../../core/component_registrator'); -DevExpress.devices = require('../../core/devices'); +DevExpress.devices = require('../../common/core/environment').devices; DevExpress.trial = require('../../core/trial_panel'); DevExpress.Color = require('../../color'); -const animationFrame = require('../../animation/frame'); +const animationFrame = require('../../common/core/animation/frame'); /** * @name utils @@ -40,14 +40,14 @@ DevExpress.utils = {}; DevExpress.utils.requestAnimationFrame = animationFrame.requestAnimationFrame; DevExpress.utils.cancelAnimationFrame = animationFrame.cancelAnimationFrame; -DevExpress.utils.initMobileViewport = require('../../mobile/init_mobile_viewport/init_mobile_viewport').initMobileViewport; +DevExpress.utils.initMobileViewport = require('../../common/core/environment').initMobileViewport; -DevExpress.utils.getTimeZones = require('../../time_zone_utils').getTimeZones; +DevExpress.utils.getTimeZones = require('../../common/core/environment').getTimeZones; // TODO: MODULARITY: Remove this DevExpress.utils.extendFromObject = require('../../core/utils/extend').extendFromObject; -DevExpress.utils.triggerShownEvent = require('../../events/visibility_change').triggerShownEvent; -DevExpress.utils.triggerHidingEvent = require('../../events/visibility_change').triggerHidingEvent; +DevExpress.utils.triggerShownEvent = require('../../common/core/events/visibility_change').triggerShownEvent; +DevExpress.utils.triggerHidingEvent = require('../../common/core/events/visibility_change').triggerHidingEvent; DevExpress.utils.resetActiveElement = require('../../core/utils/dom').resetActiveElement; DevExpress.utils.findBestMatches = require('../../core/utils/common').findBestMatches; DevExpress.createQueue = require('../../core/utils/queue').create; @@ -66,23 +66,23 @@ DevExpress.utils.ajax = require('../../core/utils/ajax'); DevExpress.viewPort = require('../../core/utils/view_port').value; -DevExpress.hideTopOverlay = require('../../mobile/hide_top_overlay'); +DevExpress.hideTopOverlay = require('../../common/core/environment').hideTopOverlay; DevExpress.formatHelper = require('../../format_helper'); -DevExpress.config = require('../../core/config'); +DevExpress.config = require('../../common').config; -DevExpress.animationPresets = require('../../animation/presets/presets').presets; -DevExpress.fx = require('../../animation/fx'); -DevExpress.TransitionExecutor = require('../../animation/transition_executor/transition_executor').TransitionExecutor; -DevExpress.AnimationPresetCollection = require('../../animation/presets/presets').PresetCollection; +DevExpress.animationPresets = require('../../common/core/animation/presets/presets').presets; +DevExpress.fx = require('../../common/core/animation').fx; +DevExpress.TransitionExecutor = require('../../common/core/animation/transition_executor/transition_executor').TransitionExecutor; +DevExpress.AnimationPresetCollection = require('../../common/core/animation/presets/presets').PresetCollection; -DevExpress.events = require('../../events'); +DevExpress.events = require('../../common/core/events'); -DevExpress.events.click = require('../../events/click'); -DevExpress.events.utils = require('../../events/utils'); -DevExpress.events.GestureEmitter = require('../../events/gesture/emitter.gesture'); +DevExpress.events.click = require('../../common/core/events/click'); +DevExpress.events.utils = require('../../common/core/events/utils/index'); +DevExpress.events.GestureEmitter = require('../../common/core/events/gesture/emitter.gesture'); -DevExpress.localization = require('../../localization'); +DevExpress.localization = require('../../common/core/localization'); DevExpress.templateRendered = require('../../core/templates/template_base').renderedCallbacks; DevExpress.setTemplateEngine = require('../../core/templates/template_engine_registry').setTemplateEngine; diff --git a/packages/devextreme/js/bundles/modules/core.legacy.js b/packages/devextreme/js/bundles/modules/core.legacy.js new file mode 100644 index 000000000000..456e1705f9aa --- /dev/null +++ b/packages/devextreme/js/bundles/modules/core.legacy.js @@ -0,0 +1,27 @@ +/* eslint-disable import/no-commonjs */ +require('../../excel_exporter'); +require('../../pdf_exporter'); +require('../../mobile/hide_top_overlay'); +require('../../mobile/init_mobile_viewport'); +require('../../file_management/custom_provider'); +require('../../file_management/error'); +require('../../file_management/file_system_item'); +require('../../file_management/object_provider'); +require('../../file_management/provider_base'); +require('../../file_management/remote_provider'); +require('../../events/index'); +require('../../time_zone_utils'); +require('../../core/config'); +require('../../core/devices'); +require('../../core/set_template_engine'); +require('../../core/templates/template'); +require('../../animation/frame'); +require('../../animation/fx'); +require('../../animation/presets'); +require('../../animation/transition_executor'); + +require('../../localization/globalize/core'); +require('../../localization/globalize/message'); +require('../../localization/globalize/number'); +require('../../localization/globalize/date'); +require('../../localization/globalize/currency'); diff --git a/packages/devextreme/js/bundles/modules/data.js b/packages/devextreme/js/bundles/modules/data.js index a1b15cd9d629..b96f6a467ec4 100644 --- a/packages/devextreme/js/bundles/modules/data.js +++ b/packages/devextreme/js/bundles/modules/data.js @@ -6,34 +6,34 @@ module.exports = DevExpress.data = DevExpress.data || {}; Object.defineProperty(DevExpress.data, 'errorHandler', { get: function() { - return require('../../data/errors').errorHandler; + return require('../../common/data').errorHandler; }, set: function(value) { errors.log('W0003', 'DevExpress.data', 'errorHandler', '21.1', 'Use the \'setErrorHandler\' method instead'); - require('../../data/errors').setErrorHandler(value); + require('../../common/data/errors').setErrorHandler(value); } }); // TODO: try remove (plugins failed without this) Object.defineProperty(DevExpress.data, '_errorHandler', { get: function() { - return require('../../data/errors').handleError; + return require('../../common/data/errors').handleError; }, set: function(value) { errors.log('W0003', 'DevExpress.data', '_errorHandler', '21.1', 'Use the \'setErrorHandler\' method instead'); - require('../../data/errors').setErrorHandler(value); + require('../../common/data/errors').setErrorHandler(value); } }); -DevExpress.data.setErrorHandler = require('../../data/errors').setErrorHandler; -DevExpress.data.DataSource = require('../../data/data_source'); -DevExpress.data.query = require('../../data/query'); +DevExpress.data.setErrorHandler = require('../../common/data/errors').setErrorHandler; +DevExpress.data.DataSource = require('../../common/data/data_source'); +DevExpress.data.query = require('../../common/data/query'); DevExpress.data.Store = require('../../data/abstract_store'); -DevExpress.data.ArrayStore = require('../../data/array_store'); -DevExpress.data.CustomStore = require('../../data/custom_store'); -DevExpress.data.LocalStore = require('../../data/local_store'); -DevExpress.data.base64_encode = require('../../data/utils').base64_encode; -DevExpress.data.applyChanges = require('../../data/apply_changes'); +DevExpress.data.ArrayStore = require('../../common/data/array_store'); +DevExpress.data.CustomStore = require('../../common/data/custom_store').CustomStore; +DevExpress.data.LocalStore = require('../../common/data/local_store'); +DevExpress.data.base64_encode = require('../../common/data/utils').base64_encode; +DevExpress.data.applyChanges = require('../../common/data/apply_changes'); DevExpress.data.Guid = require('../../core/guid'); @@ -41,12 +41,12 @@ DevExpress.data.utils = {}; DevExpress.data.utils.compileGetter = require('../../core/utils/data').compileGetter; DevExpress.data.utils.compileSetter = require('../../core/utils/data').compileSetter; -DevExpress.EndpointSelector = require('../../data/endpoint_selector'); +DevExpress.EndpointSelector = require('../../common/data/endpoint_selector'); -DevExpress.data.queryImpl = require('../../data/query_implementation').queryImpl; -DevExpress.data.queryAdapters = require('../../data/query_adapters'); +DevExpress.data.queryImpl = require('../../common/data/query_implementation').queryImpl; +DevExpress.data.queryAdapters = require('../../common/data/query_adapters'); -const dataUtils = require('../../data/utils'); +const dataUtils = require('../../common/data/utils'); DevExpress.data.utils.normalizeBinaryCriterion = dataUtils.normalizeBinaryCriterion; DevExpress.data.utils.normalizeSortingInfo = dataUtils.normalizeSortingInfo; @@ -59,7 +59,7 @@ DevExpress.data.utils.processRequestResultLock = dataUtils.processRequestResultL DevExpress.data.utils.toComparable = require('../../core/utils/data').toComparable; -DevExpress.data.utils.multiLevelGroup = require('../../data/store_helper').multiLevelGroup; -DevExpress.data.utils.arrangeSortingInfo = require('../../data/store_helper').arrangeSortingInfo; +DevExpress.data.utils.multiLevelGroup = require('../../common/data/store_helper').multiLevelGroup; +DevExpress.data.utils.arrangeSortingInfo = require('../../common/data/store_helper').arrangeSortingInfo; -DevExpress.data.utils.normalizeDataSourceOptions = require('../../data/data_source/utils').normalizeDataSourceOptions; +DevExpress.data.utils.normalizeDataSourceOptions = require('../../common/data/data_source/utils').normalizeDataSourceOptions; diff --git a/packages/devextreme/js/bundles/modules/data.legacy.js b/packages/devextreme/js/bundles/modules/data.legacy.js new file mode 100644 index 000000000000..383b6263db96 --- /dev/null +++ b/packages/devextreme/js/bundles/modules/data.legacy.js @@ -0,0 +1,14 @@ +/* eslint-disable import/no-commonjs */ +require('../../data/errors'); +require('../../data/data_source'); +require('../../data/query'); +require('../../data/abstract_store'); +require('../../data/array_store'); +require('../../data/custom_store'); +require('../../data/local_store'); +require('../../data/utils'); +require('../../data/apply_changes'); +require('../../core/guid'); +require('../../core/utils/data'); +require('../../data/endpoint_selector'); +require('../../data/utils'); diff --git a/packages/devextreme/js/bundles/modules/data.odata.js b/packages/devextreme/js/bundles/modules/data.odata.js index d8c83c7cf918..72ae54bc7b18 100644 --- a/packages/devextreme/js/bundles/modules/data.odata.js +++ b/packages/devextreme/js/bundles/modules/data.odata.js @@ -2,16 +2,16 @@ /* eslint-disable import/no-commonjs */ require('./data'); -DevExpress.data.ODataStore = require('../../data/odata/store'); -DevExpress.data.ODataContext = require('../../data/odata/context'); +DevExpress.data.ODataStore = require('../../common/data/odata/store'); +DevExpress.data.ODataContext = require('../../common/data/odata/context'); DevExpress.data.utils = DevExpress.data.utils || {}; DevExpress.data.utils.odata = {}; -DevExpress.data.utils.odata.keyConverters = require('../../data/odata/utils').keyConverters; -DevExpress.data.EdmLiteral = require('../../data/odata/utils').EdmLiteral; +DevExpress.data.utils.odata.keyConverters = require('../../common/data/odata/utils').keyConverters; +DevExpress.data.EdmLiteral = require('../../common/data/odata/utils').EdmLiteral; -const ODataUtilsModule = require('../../data/odata/utils'); +const ODataUtilsModule = require('../../common/data/odata/utils'); DevExpress.data.utils.odata.serializePropName = ODataUtilsModule.serializePropName; DevExpress.data.utils.odata.serializeValue = ODataUtilsModule.serializeValue; DevExpress.data.utils.odata.serializeKey = ODataUtilsModule.serializeKey; @@ -22,4 +22,4 @@ DevExpress.data.OData__internals = ODataUtilsModule.OData__internals; ///#ENDDEBUG DevExpress.data.queryAdapters = DevExpress.data.queryAdapters || {}; -DevExpress.data.queryAdapters.odata = require('../../data/odata/query_adapter').odata; +DevExpress.data.queryAdapters.odata = require('../../common/data/odata/query_adapter').odata; diff --git a/packages/devextreme/js/bundles/modules/data.odata.legacy.js b/packages/devextreme/js/bundles/modules/data.odata.legacy.js new file mode 100644 index 000000000000..fb8f1be0f52d --- /dev/null +++ b/packages/devextreme/js/bundles/modules/data.odata.legacy.js @@ -0,0 +1,6 @@ +/* eslint-disable import/no-commonjs */ +require('./data'); + +require('../../data/odata/store'); +require('../../data/odata/context'); +require('../../data/odata/utils'); diff --git a/packages/devextreme/js/bundles/modules/parts/core.js b/packages/devextreme/js/bundles/modules/parts/core.js index fa8f8003c335..42cf4ea853d3 100644 --- a/packages/devextreme/js/bundles/modules/parts/core.js +++ b/packages/devextreme/js/bundles/modules/parts/core.js @@ -3,29 +3,30 @@ /* Core (dx.module-core.js) */ /* eslint-disable import/no-commonjs */ const DevExpress = require('../../../bundles/modules/core'); +require('../../../bundles/modules/core.legacy'); /* Integrations (dx.module-core.js) */ require('../../../integration/jquery'); require('../../../integration/knockout'); -require('../../../localization/globalize/core'); -require('../../../localization/globalize/message'); -require('../../../localization/globalize/number'); -require('../../../localization/globalize/date'); -require('../../../localization/globalize/currency'); +require('../../../common/core/localization/globalize/core'); +require('../../../common/core/localization/globalize/message'); +require('../../../common/core/localization/globalize/number'); +require('../../../common/core/localization/globalize/date'); +require('../../../common/core/localization/globalize/currency'); /* Events (dx.module-core.js) */ -require('../../../events/click'); -require('../../../events/contextmenu'); -require('../../../events/double_click'); -require('../../../events/drag'); -require('../../../events/hold'); -require('../../../events/hover'); -require('../../../events/pointer'); -require('../../../events/swipe'); -require('../../../events/transform'); +require('../../../common/core/events/click'); +require('../../../common/core/events/contextmenu'); +require('../../../common/core/events/double_click'); +require('../../../common/core/events/drag'); +require('../../../common/core/events/hold'); +require('../../../common/core/events/hover'); +require('../../../common/core/events/pointer'); +require('../../../common/core/events/swipe'); +require('../../../common/core/events/transform'); /// BUNDLER_PARTS_END module.exports = DevExpress; diff --git a/packages/devextreme/js/bundles/modules/parts/data.js b/packages/devextreme/js/bundles/modules/parts/data.js index 76699046df9e..28eb725c9fdf 100644 --- a/packages/devextreme/js/bundles/modules/parts/data.js +++ b/packages/devextreme/js/bundles/modules/parts/data.js @@ -5,8 +5,10 @@ const DevExpress = require('./core'); /* Data (dx.module-core.js) */ const data = DevExpress.data = require('../../../bundles/modules/data'); +require('../../../bundles/modules/data.legacy'); data.odata = require('../../../bundles/modules/data.odata'); +require('../../../bundles/modules/data.odata.legacy'); /// BUNDLER_PARTS_END module.exports = data; diff --git a/packages/devextreme/js/common.d.ts b/packages/devextreme/js/common.d.ts index cbacea24eb7c..3410b323816b 100644 --- a/packages/devextreme/js/common.d.ts +++ b/packages/devextreme/js/common.d.ts @@ -1,13 +1,21 @@ -import { PositionConfig } from './animation/position'; +import { PositionConfig } from './common/core/animation'; import type { OmitInternal, } from './core'; -import { FloatingActionButtonDirection } from './core/config'; + +import { + Device, +} from './common/core/environment'; + +import { + DeepPartial, +} from './core'; import type dxDraggable from './ui/draggable'; import type dxScrollable from './ui/scroll_view/ui.scrollable'; import type dxSortable from './ui/sortable'; import type { Properties as ButtonProperties } from './ui/button'; +import { UserDefinedElement } from './core/element'; /** * @public @@ -847,44 +855,66 @@ export type DisplayMode = 'adaptive' | 'compact' | 'full'; /** * @docid - * @hidden - * @namespace DevExpress.common + * @namespace DevExpress.data + * @public */ -export type PagerBase = { - /** - * @docid - * @public - * @default "adaptive" - */ - displayMode?: DisplayMode; - /** - * @docid - * @public - * @default "Page {0} of {1} ({2} items)" - */ - infoText?: string; - /** - * @docid - * @public - * @default false - */ - showInfo?: boolean; +export class Guid { + constructor(); + constructor(value: string); /** * @docid + * @publicName toString() * @public - * @default false - */ - showNavigationButtons?: boolean; - /** - * @docid - * @public - * @default false */ - showPageSizeSelector?: boolean; + toString(): string; /** * @docid + * @publicName valueOf() * @public - * @default "Page Navigation" */ - label?: string; + valueOf(): string; +} + +/** +* @docid +* @public +*/ +export type DefaultOptionsRule = { + device?: Device | Device[] | ((device: Device) => boolean); + options: DeepPartial; }; + +/** @public */ +export type FloatingActionButtonDirection = 'auto' | 'up' | 'down'; + +/** + * @docid + * @publicName config() + * @namespace DevExpress + * @public + */ +export function config(): GlobalConfig; + +/** + * @docid + * @publicName config(config) + * @namespace DevExpress + * @public + */ +// eslint-disable-next-line @typescript-eslint/no-shadow +export function config(config: GlobalConfig): void; + +/** + * @docid + * @section Common + * @public + */ +export type template = string | Function | UserDefinedElement; + +/** + * @docid + * @publicName setTemplateEngine(options) + * @namespace DevExpress + * @public + */ +export function setTemplateEngine(templateEngineOptions: { compile?: Function; render?: Function }): void; diff --git a/packages/devextreme/js/common.js b/packages/devextreme/js/common.js new file mode 100644 index 000000000000..7110b0df4ba5 --- /dev/null +++ b/packages/devextreme/js/common.js @@ -0,0 +1,9 @@ +import config from './common/config'; +import Guid from './common/guid'; +import setTemplateEngine from './common/set_template_engine'; + +export { + config, + Guid, + setTemplateEngine, +}; diff --git a/packages/devextreme/js/common/config.js b/packages/devextreme/js/common/config.js new file mode 100644 index 000000000000..107fa638ede5 --- /dev/null +++ b/packages/devextreme/js/common/config.js @@ -0,0 +1,7 @@ +/** + * @name GlobalConfig.useJQuery + * @type boolean + * @hidden + */ +import configMethod from '../__internal/core/m_config'; +export default configMethod; diff --git a/packages/devextreme/js/common/core/animation.d.ts b/packages/devextreme/js/common/core/animation.d.ts new file mode 100644 index 000000000000..244183143bbc --- /dev/null +++ b/packages/devextreme/js/common/core/animation.d.ts @@ -0,0 +1,368 @@ +import { DxElement, UserDefinedElementsArray, UserDefinedElement } from '../../core/element'; +import { Device } from './environment'; + +import { + HorizontalAlignment, + PositionAlignment, + VerticalAlignment, + Direction, +} from '../../common'; + +import { + DxPromise, +} from '../../core/utils/deferred'; + +export type AnimationType = 'css' | 'fade' | 'fadeIn' | 'fadeOut' | 'pop' | 'slide' | 'slideIn' | 'slideOut'; + +/** + * @docid utils.cancelAnimationFrame + * @publicName cancelAnimationFrame(requestID) + * @namespace DevExpress.common.core.animation + * @public + */ +export function cancelAnimationFrame(requestID: number): void; + +/** + * @docid utils.requestAnimationFrame + * @publicName requestAnimationFrame(callback) + * @namespace DevExpress.common.core.animation + * @public + */ +export function requestAnimationFrame(callback: Function): number; + +/** + * @docid + * @public + * @type object + * @namespace DevExpress.common.core.animation + */ +export type AnimationState = string | number | { + /** + * @docid + * @public + */ + opacity: number; +} | { + /** + * @docid + * @public + */ + scale: number; +} | { + /** + * @docid + * @public + */ + position: PositionConfig; +} | { + /** + * @docid + * @public + */ + left: number; +} | { + /** + * @docid + * @public + */ + top: number; +}; + +/** + * @docid + * @namespace DevExpress.common.core.animation + * @type object|number|string + * @public + */ +export type AnimationConfig = { + /** + * @docid + * @public + */ + complete?: (($element: DxElement, config: AnimationConfig) => void); + /** + * @docid + * @default 0 + * @public + */ + delay?: number; + /** + * @docid + * @default undefined + * @public + */ + direction?: Direction | undefined; + /** + * @docid + * @default 400 + * @public + */ + duration?: number; + /** + * @docid + * @default 'ease' + * @public + */ + easing?: string; + /** + * @docid + * @default {} + * @public + */ + from?: AnimationState; + /** + * @docid + * @default undefined + * @public + */ + staggerDelay?: number | undefined; + /** + * @docid + * @public + */ + start?: (($element: DxElement, config: AnimationConfig) => void); + /** + * @docid + * @default {} + * @public + */ + to?: AnimationState; + /** + * @docid + * @default 'custom' + * @public + */ + type?: AnimationType; +}; + +/** + * @public + * @docid + * @section utils + * @namespace DevExpress.common.core.animation + */ +// eslint-disable-next-line @typescript-eslint/init-declarations +export const fx: { + /** + * @docid + * @publicName animate(element, config) + * @return Promise + * @namespace DevExpress.fx + * @public + */ + animate(element: Element, config: AnimationConfig): DxPromise; + + /** + * @docid + * @publicName isAnimating(element) + * @namespace DevExpress.fx + * @public + */ + isAnimating(element: Element): boolean; + + /** + * @docid + * @publicName stop(element, jumpToEnd) + * @namespace DevExpress.fx + * @public + */ + stop(element: Element, jumpToEnd: boolean): void; +}; + +/** + * @public + * @namespace DevExpress.common.core.animation + */ +export type CollisionResolution = 'fit' | 'flip' | 'flipfit' | 'none'; +/** + * @public + * @namespace DevExpress.common.core.animation + */ +export type CollisionResolutionCombination = 'fit' | 'fit flip' | 'fit flipfit' | 'fit none' | 'flip' | 'flip fit' | 'flip none' | 'flipfit' | 'flipfit fit' | 'flipfit none' | 'none' | 'none fit' | 'none flip' | 'none flipfit'; + +/** + * @docid + * @namespace DevExpress.common.core.animation + * @type object + * @public + */ +export type PositionConfig = { + /** + * @docid + * @public + */ + at?: PositionAlignment | { + /** + * @docid + */ + x?: HorizontalAlignment; + /** + * @docid + */ + y?: VerticalAlignment; + }; + /** + * @docid + * @public + */ + boundary?: string | UserDefinedElement | Window; + /** + * @docid + * @public + */ + boundaryOffset?: string | { + /** + * @docid + * @default 0 + */ + x?: number; + /** + * @docid + * @default 0 + */ + y?: number; + }; + /** + * @docid + * @public + */ + collision?: CollisionResolutionCombination | { + /** + * @docid + * @default 'none' + */ + x?: CollisionResolution; + /** + * @docid + * @default 'none' + */ + y?: CollisionResolution; + }; + /** + * @docid + * @public + */ + my?: PositionAlignment | { + /** + * @docid + */ + x?: HorizontalAlignment; + /** + * @docid + */ + y?: VerticalAlignment; + }; + /** + * @docid + * @public + */ + of?: string | UserDefinedElement | Window; + /** + * @docid + * @public + */ + offset?: string | { + /** + * @docid + * @default 0 + */ + x?: number; + /** + * @docid + * @default 0 + */ + y?: number; + }; +}; + +/** + * @docid + * @namespace DevExpress.common.core.animation + * @public + */ +// eslint-disable-next-line @typescript-eslint/init-declarations +export const animationPresets: { + /** + * @docid + * @publicName applyChanges() + * @public + */ + applyChanges(): void; + /** + * @docid + * @publicName clear() + * @public + */ + clear(): void; + /** + * @docid + * @publicName clear(name) + * @public + */ + clear(name: string): void; + /** + * @docid + * @publicName getPreset(name) + * @public + */ + getPreset(name: string): AnimationConfig; + /** + * @docid + * @publicName registerDefaultPresets() + * @public + */ + registerDefaultPresets(): void; + /** + * @docid + * @publicName registerPreset(name, config) + * @public + */ + registerPreset(name: string, config: { animation: AnimationConfig; device?: Device }): void; + /** + * @docid + * @publicName resetToDefaults() + * @public + */ + resetToDefaults(): void; +}; + +/** + * @docid + * @namespace DevExpress.common.core.animation + * @public + */ +export class TransitionExecutor { + /** + * @docid + * @publicName enter(elements, animation) + * @param1 elements:jQuery + * @public + */ + enter(elements: UserDefinedElementsArray, animation: AnimationConfig | string): void; + /** + * @docid + * @publicName leave(elements, animation) + * @param1 elements:jQuery + * @public + */ + leave(elements: UserDefinedElementsArray, animation: AnimationConfig | string): void; + /** + * @docid + * @publicName reset() + * @public + */ + reset(): void; + /** + * @docid + * @publicName start() + * @return Promise + * @public + */ + start(): DxPromise; + /** + * @docid + * @publicName stop() + * @public + */ + stop(): void; +} diff --git a/packages/devextreme/js/common/core/animation.js b/packages/devextreme/js/common/core/animation.js new file mode 100644 index 000000000000..d759e10cf8f6 --- /dev/null +++ b/packages/devextreme/js/common/core/animation.js @@ -0,0 +1,12 @@ +import { requestAnimationFrame, cancelAnimationFrame } from './animation/frame'; +import fx from './animation/fx'; +import animationPresets from './animation/presets'; +import TransitionExecutor from './animation/transition_executor'; + +export { + requestAnimationFrame, + cancelAnimationFrame, + fx, + animationPresets, + TransitionExecutor, +}; diff --git a/packages/devextreme/js/common/core/animation/easing.js b/packages/devextreme/js/common/core/animation/easing.js new file mode 100644 index 000000000000..8c3e7fc7ff88 --- /dev/null +++ b/packages/devextreme/js/common/core/animation/easing.js @@ -0,0 +1,92 @@ +import { isFunction } from '../../../core/utils/type'; + +const CSS_TRANSITION_EASING_REGEX = /cubic-bezier\((\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\)/; + +const TransitionTimingFuncMap = { + 'linear': 'cubic-bezier(0, 0, 1, 1)', + 'swing': 'cubic-bezier(0.445, 0.05, 0.55, 0.95)', + 'ease': 'cubic-bezier(0.25, 0.1, 0.25, 1)', + 'ease-in': 'cubic-bezier(0.42, 0, 1, 1)', + 'ease-out': 'cubic-bezier(0, 0, 0.58, 1)', + 'ease-in-out': 'cubic-bezier(0.42, 0, 0.58, 1)' +}; + +const polynomBezier = function(x1, y1, x2, y2) { + const Cx = 3 * x1; + const Bx = 3 * (x2 - x1) - Cx; + const Ax = 1 - Cx - Bx; + + const Cy = 3 * y1; + const By = 3 * (y2 - y1) - Cy; + const Ay = 1 - Cy - By; + + const bezierX = function(t) { + return t * (Cx + t * (Bx + t * Ax)); + }; + + const bezierY = function(t) { + return t * (Cy + t * (By + t * Ay)); + }; + + const derivativeX = function(t) { + return Cx + t * (2 * Bx + t * 3 * Ax); + }; + + const findXFor = function(t) { + let x = t; + let i = 0; + let z; + + while(i < 14) { + z = bezierX(x) - t; + if(Math.abs(z) < 1e-3) { + break; + } + + x = x - z / derivativeX(x); + i++; + } + + return x; + }; + + return function(t) { + return bezierY(findXFor(t)); + }; +}; + +let easing = {}; +export const convertTransitionTimingFuncToEasing = function(cssTransitionEasing) { + cssTransitionEasing = TransitionTimingFuncMap[cssTransitionEasing] || cssTransitionEasing; + + let coeffs = cssTransitionEasing.match(CSS_TRANSITION_EASING_REGEX); + let forceName; + + if(!coeffs) { + forceName = 'linear'; + coeffs = TransitionTimingFuncMap[forceName].match(CSS_TRANSITION_EASING_REGEX); + } + + coeffs = coeffs.slice(1, 5); + for(let i = 0; i < coeffs.length; i++) { + coeffs[i] = parseFloat(coeffs[i]); + } + + const easingName = forceName || 'cubicbezier_' + coeffs.join('_').replace(/\./g, 'p'); + + if(!isFunction(easing[easingName])) { + easing[easingName] = function(x, t, b, c, d) { + return c * polynomBezier(coeffs[0], coeffs[1], coeffs[2], coeffs[3])(t / d) + b; + }; + } + + return easingName; +}; + +export function setEasing(value) { + easing = value; +} + +export function getEasing(name) { + return easing[name]; +} diff --git a/packages/devextreme/js/common/core/animation/frame.js b/packages/devextreme/js/common/core/animation/frame.js new file mode 100644 index 000000000000..c1142d2775e2 --- /dev/null +++ b/packages/devextreme/js/common/core/animation/frame.js @@ -0,0 +1,42 @@ +import { hasWindow, getWindow } from '../../../core/utils/window'; +const window = hasWindow() ? getWindow() : {}; +import callOnce from '../../../core/utils/call_once'; + +const FRAME_ANIMATION_STEP_TIME = 1000 / 60; + +let request = function(callback) { + return setTimeout(callback, FRAME_ANIMATION_STEP_TIME); +}; + +let cancel = function(requestID) { + clearTimeout(requestID); +}; + +const setAnimationFrameMethods = callOnce(function() { + const nativeRequest = window.requestAnimationFrame || + window.webkitRequestAnimationFrame || + window.mozRequestAnimationFrame || + window.oRequestAnimationFrame || + window.msRequestAnimationFrame; + + const nativeCancel = window.cancelAnimationFrame || + window.webkitCancelAnimationFrame || + window.mozCancelAnimationFrame || + window.oCancelAnimationFrame || + window.msCancelAnimationFrame; + + if(nativeRequest && nativeCancel) { + request = nativeRequest; + cancel = nativeCancel; + } +}); + +export function requestAnimationFrame() { + setAnimationFrameMethods(); + return request.apply(window, arguments); +} + +export function cancelAnimationFrame() { + setAnimationFrameMethods(); + cancel.apply(window, arguments); +} diff --git a/packages/devextreme/js/common/core/animation/fx.js b/packages/devextreme/js/common/core/animation/fx.js new file mode 100644 index 000000000000..6eaac35fca2c --- /dev/null +++ b/packages/devextreme/js/common/core/animation/fx.js @@ -0,0 +1,841 @@ +import $ from '../../../core/renderer'; +import { getWindow } from '../../../core/utils/window'; +const window = getWindow(); +import eventsEngine from '../events/core/events_engine'; +import errors from '../../../core/errors'; +import { getPublicElement } from '../../../core/element'; +import { extend } from '../../../core/utils/extend'; +import { isFunction, isPlainObject } from '../../../core/utils/type'; +import { each, map } from '../../../core/utils/iterator'; +import { + getTranslateCss, + parseTranslate, + clearCache, + locate, + getTranslate +} from './translator'; +import { + convertTransitionTimingFuncToEasing, + getEasing +} from './easing'; +import { requestAnimationFrame, cancelAnimationFrame } from './frame'; +import supportUtils from '../../../__internal/core/utils/m_support'; +import positionUtils from './position'; +import { removeEvent } from '../events/remove'; +import { addNamespace } from '../events/utils/index'; +import { when, Deferred } from '../../../core/utils/deferred'; +const removeEventName = addNamespace(removeEvent, 'dxFX'); +import { noop } from '../../../core/utils/common'; + + +const RELATIVE_VALUE_REGEX = /^([+-])=(.*)/i; +const ANIM_DATA_KEY = 'dxAnimData'; +const ANIM_QUEUE_KEY = 'dxAnimQueue'; +const TRANSFORM_PROP = 'transform'; + +const TransitionAnimationStrategy = { + initAnimation: function($element, config) { + $element.css({ + 'transitionProperty': 'none' + }); + + if(typeof config.from === 'string') { + $element.addClass(config.from); + } else { + setProps($element, config.from); + } + + const that = this; + const deferred = new Deferred(); + const cleanupWhen = config.cleanupWhen; + + config.transitionAnimation = { + deferred: deferred, + finish: function() { + that._finishTransition($element); + if(cleanupWhen) { + when(deferred, cleanupWhen).always(function() { + that._cleanup($element, config); + }); + } else { + that._cleanup($element, config); + } + deferred.resolveWith($element, [config, $element]); + } + }; + + this._completeAnimationCallback($element, config) + .done(function() { + config.transitionAnimation.finish(); + }) + .fail(function() { + deferred.rejectWith($element, [config, $element]); + }); + + if(!config.duration) { + config.transitionAnimation.finish(); + } + + // NOTE: Hack for setting 'from' css by browser before run animation + // Do not move this hack to initAnimation since some css props can be changed in the 'start' callback (T231434) + // Unfortunately this can't be unit tested + // TODO: find better way if possible + $element.css('transform'); + }, + animate: function($element, config) { + this._startAnimation($element, config); + return config.transitionAnimation.deferred.promise(); + }, + + _completeAnimationCallback: function($element, config) { + const that = this; + const startTime = Date.now() + config.delay; + const deferred = new Deferred(); + const transitionEndFired = new Deferred(); + const simulatedTransitionEndFired = new Deferred(); + let simulatedEndEventTimer; + const transitionEndEventFullName = supportUtils.transitionEndEventName() + '.dxFX'; + + config.transitionAnimation.cleanup = function() { + clearTimeout(simulatedEndEventTimer); + clearTimeout(waitForJSCompleteTimer); + eventsEngine.off($element, transitionEndEventFullName); + eventsEngine.off($element, removeEventName); + }; + + eventsEngine.one($element, transitionEndEventFullName, function() { + // NOTE: prevent native transitionEnd event from previous animation in queue (Chrome) + if(Date.now() - startTime >= config.duration) { + transitionEndFired.reject(); + } + }); + eventsEngine.off($element, removeEventName); + eventsEngine.on($element, removeEventName, function() { + that.stop($element, config); + deferred.reject(); + }); + + const waitForJSCompleteTimer = setTimeout(function() { // Fix for a visual bug (T244514): do not setup the timer until all js code has finished working + simulatedEndEventTimer = setTimeout(function() { + simulatedTransitionEndFired.reject(); + }, config.duration + config.delay + fx._simulatedTransitionEndDelay /* T255863 */); + + when(transitionEndFired, simulatedTransitionEndFired).fail((function() { + deferred.resolve(); + }).bind(this)); + }); + + return deferred.promise(); + }, + + _startAnimation: function($element, config) { + $element.css({ + 'transitionProperty': 'all', + 'transitionDelay': config.delay + 'ms', + 'transitionDuration': config.duration + 'ms', + 'transitionTimingFunction': config.easing + }); + + if(typeof config.to === 'string') { + $element[0].className += ' ' + config.to; + // Do not uncomment: performance critical + // $element.addClass(config.to); + } else if(config.to) { + setProps($element, config.to); + } + }, + + _finishTransition: function($element) { + $element.css('transition', 'none'); + }, + + _cleanup: function($element, config) { + config.transitionAnimation.cleanup(); + + if(typeof config.from === 'string') { + $element.removeClass(config.from); + $element.removeClass(config.to); + } + }, + + stop: function($element, config, jumpToEnd) { + if(!config) { + return; + } + + if(jumpToEnd) { + config.transitionAnimation.finish(); + } else { + if(isPlainObject(config.to)) { + each(config.to, function(key) { + $element.css(key, $element.css(key)); + }); + } + this._finishTransition($element); + this._cleanup($element, config); + } + } +}; + +const FrameAnimationStrategy = { + initAnimation: function($element, config) { + setProps($element, config.from); + }, + animate: function($element, config) { + const deferred = new Deferred(); + const that = this; + + if(!config) { + return deferred.reject().promise(); + } + + each(config.to, function(prop) { + if(config.from[prop] === undefined) { + config.from[prop] = that._normalizeValue($element.css(prop)); + } + }); + + if(config.to[TRANSFORM_PROP]) { + config.from[TRANSFORM_PROP] = that._parseTransform(config.from[TRANSFORM_PROP]); + config.to[TRANSFORM_PROP] = that._parseTransform(config.to[TRANSFORM_PROP]); + } + + config.frameAnimation = { + to: config.to, + from: config.from, + currentValue: config.from, + easing: convertTransitionTimingFuncToEasing(config.easing), + duration: config.duration, + startTime: new Date().valueOf(), + finish: function() { + this.currentValue = this.to; + this.draw(); + cancelAnimationFrame(config.frameAnimation.animationFrameId); + deferred.resolve(); + }, + draw: function() { + if(config.draw) { + config.draw(this.currentValue); + return; + } + + const currentValue = extend({}, this.currentValue); + + if(currentValue[TRANSFORM_PROP]) { + currentValue[TRANSFORM_PROP] = map(currentValue[TRANSFORM_PROP], function(value, prop) { + if(prop === 'translate') { + return getTranslateCss(value); + } else if(prop === 'scale') { + return 'scale(' + value + ')'; + } else if(prop.substr(0, prop.length - 1) === 'rotate') { + return prop + '(' + value + 'deg)'; + } + }).join(' '); + } + + $element.css(currentValue); + } + }; + + if(config.delay) { + config.frameAnimation.startTime += config.delay; + config.frameAnimation.delayTimeout = setTimeout(function() { + that._startAnimation($element, config); + }, config.delay); + } else { + that._startAnimation($element, config); + } + return deferred.promise(); + }, + + _startAnimation: function($element, config) { + eventsEngine.off($element, removeEventName); + eventsEngine.on($element, removeEventName, function() { + if(config.frameAnimation) { + cancelAnimationFrame(config.frameAnimation.animationFrameId); + } + }); + + this._animationStep($element, config); + }, + + _parseTransform: function(transformString) { + const result = {}; + + each(transformString.match(/\w+\d*\w*\([^)]*\)\s*/g), function(i, part) { + const translateData = parseTranslate(part); + const scaleData = part.match(/scale\((.+?)\)/); + const rotateData = part.match(/(rotate.)\((.+)deg\)/); + + if(translateData) { + result.translate = translateData; + } + + if(scaleData && scaleData[1]) { + result.scale = parseFloat(scaleData[1]); + } + + if(rotateData && rotateData[1]) { + result[rotateData[1]] = parseFloat(rotateData[2]); + } + }); + + return result; + }, + + stop: function($element, config, jumpToEnd) { + const frameAnimation = config && config.frameAnimation; + + if(!frameAnimation) { + return; + } + + cancelAnimationFrame(frameAnimation.animationFrameId); + clearTimeout(frameAnimation.delayTimeout); + + if(jumpToEnd) { + frameAnimation.finish(); + } + + delete config.frameAnimation; + }, + + _animationStep: function($element, config) { + const frameAnimation = config && config.frameAnimation; + + if(!frameAnimation) { + return; + } + + const now = new Date().valueOf(); + + if(now >= frameAnimation.startTime + frameAnimation.duration) { + frameAnimation.finish(); + return; + } + + frameAnimation.currentValue = this._calcStepValue(frameAnimation, now - frameAnimation.startTime); + frameAnimation.draw(); + + const that = this; + frameAnimation.animationFrameId = requestAnimationFrame(function() { + that._animationStep($element, config); + }); + }, + + _calcStepValue: function(frameAnimation, currentDuration) { + const calcValueRecursively = function(from, to) { + const result = Array.isArray(to) ? [] : {}; + + const calcEasedValue = function(propName) { + const x = currentDuration / frameAnimation.duration; + const t = currentDuration; + const b = 1 * from[propName]; + const c = to[propName] - from[propName]; + const d = frameAnimation.duration; + + return getEasing(frameAnimation.easing)(x, t, b, c, d); + }; + + each(to, function(propName, endPropValue) { + if(typeof endPropValue === 'string' && parseFloat(endPropValue) === false) { + return true; + } + + result[propName] = typeof endPropValue === 'object' + ? calcValueRecursively(from[propName], endPropValue) + : calcEasedValue(propName); + }); + + return result; + }; + + return calcValueRecursively(frameAnimation.from, frameAnimation.to); + }, + + _normalizeValue: function(value) { + const numericValue = parseFloat(value); + + if(numericValue === false) { + return value; + } + + return numericValue; + } +}; + +const FallbackToNoAnimationStrategy = { + initAnimation: function() { + }, + animate: function() { + return new Deferred().resolve().promise(); + }, + stop: noop, + isSynchronous: true +}; + +const getAnimationStrategy = function(config) { + config = config || {}; + const animationStrategies = { + 'transition': supportUtils.transition() ? TransitionAnimationStrategy : FrameAnimationStrategy, + 'frame': FrameAnimationStrategy, + 'noAnimation': FallbackToNoAnimationStrategy + }; + let strategy = config.strategy || 'transition'; + + if(config.type === 'css' && !supportUtils.transition()) { + strategy = 'noAnimation'; + } + + return animationStrategies[strategy]; +}; + +const baseConfigValidator = function(config, animationType, validate, typeMessage) { + each(['from', 'to'], function() { + if(!validate(config[this])) { + throw errors.Error('E0010', animationType, this, typeMessage); + } + }); +}; + +const isObjectConfigValidator = function(config, animationType) { + return baseConfigValidator(config, animationType, function(target) { return isPlainObject(target); }, 'a plain object'); +}; + +const isStringConfigValidator = function(config, animationType) { + return baseConfigValidator(config, animationType, function(target) { return typeof target === 'string'; }, 'a string'); +}; + +const CustomAnimationConfigurator = { + setup: function() { + } +}; + +const CssAnimationConfigurator = { + validateConfig: function(config) { + isStringConfigValidator(config, 'css'); + }, + + setup: function() { + } +}; + +const positionAliases = { + 'top': { my: 'bottom center', at: 'top center' }, + 'bottom': { my: 'top center', at: 'bottom center' }, + 'right': { my: 'left center', at: 'right center' }, + 'left': { my: 'right center', at: 'left center' } +}; + +const SlideAnimationConfigurator = { + validateConfig: function(config) { + isObjectConfigValidator(config, 'slide'); + }, + + setup: function($element, config) { + const location = locate($element); + + if(config.type !== 'slide') { + const positioningConfig = (config.type === 'slideIn') ? config.from : config.to; + + positioningConfig.position = extend({ of: window }, positionAliases[config.direction]); + setupPosition($element, positioningConfig); + } + + this._setUpConfig(location, config.from); + this._setUpConfig(location, config.to); + + clearCache($element); + }, + + _setUpConfig: function(location, config) { + config.left = 'left' in config ? config.left : '+=0'; + config.top = 'top' in config ? config.top : '+=0'; + + this._initNewPosition(location, config); + }, + + _initNewPosition: function(location, config) { + const position = { + left: config.left, + top: config.top + }; + + delete config.left; + delete config.top; + + let relativeValue = this._getRelativeValue(position.left); + if(relativeValue !== undefined) { + position.left = relativeValue + location.left; + } else { + config.left = 0; + } + + relativeValue = this._getRelativeValue(position.top); + if(relativeValue !== undefined) { + position.top = relativeValue + location.top; + } else { + config.top = 0; + } + + config[TRANSFORM_PROP] = getTranslateCss({ x: position.left, y: position.top }); + }, + + _getRelativeValue: function(value) { + let relativeValue; + if(typeof value === 'string' && (relativeValue = RELATIVE_VALUE_REGEX.exec(value))) { + return parseInt(relativeValue[1] + '1') * relativeValue[2]; + } + } +}; + +const FadeAnimationConfigurator = { + setup: function($element, config) { + const from = config.from; + const to = config.to; + const defaultFromOpacity = config.type === 'fadeOut' ? 1 : 0; + const defaultToOpacity = config.type === 'fadeOut' ? 0 : 1; + let fromOpacity = isPlainObject(from) ? String(from.opacity ?? defaultFromOpacity) : String(from); + let toOpacity = isPlainObject(to) ? String(to.opacity ?? defaultToOpacity) : String(to); + + if(!config.skipElementInitialStyles) { + fromOpacity = $element.css('opacity'); + } + + switch(config.type) { + case 'fadeIn': + toOpacity = 1; + break; + case 'fadeOut': + toOpacity = 0; + break; + } + + config.from = { + visibility: 'visible', + opacity: fromOpacity + }; + + config.to = { + opacity: toOpacity + }; + } +}; + +const PopAnimationConfigurator = { + validateConfig: function(config) { + isObjectConfigValidator(config, 'pop'); + }, + + setup: function($element, config) { + const from = config.from; + const to = config.to; + const fromOpacity = 'opacity' in from ? from.opacity : $element.css('opacity'); + const toOpacity = 'opacity' in to ? to.opacity : 1; + const fromScale = 'scale' in from ? from.scale : 0; + const toScale = 'scale' in to ? to.scale : 1; + + config.from = { + opacity: fromOpacity + }; + + const translate = getTranslate($element); + + config.from[TRANSFORM_PROP] = this._getCssTransform(translate, fromScale); + + config.to = { + opacity: toOpacity + }; + config.to[TRANSFORM_PROP] = this._getCssTransform(translate, toScale); + }, + + _getCssTransform: function(translate, scale) { + return getTranslateCss(translate) + 'scale(' + scale + ')'; + } +}; + + +const animationConfigurators = { + 'custom': CustomAnimationConfigurator, + 'slide': SlideAnimationConfigurator, + 'slideIn': SlideAnimationConfigurator, + 'slideOut': SlideAnimationConfigurator, + 'fade': FadeAnimationConfigurator, + 'fadeIn': FadeAnimationConfigurator, + 'fadeOut': FadeAnimationConfigurator, + 'pop': PopAnimationConfigurator, + 'css': CssAnimationConfigurator +}; + +const getAnimationConfigurator = function(config) { + const result = animationConfigurators[config.type]; + if(!result) { + throw errors.Error('E0011', config.type); + } + + return result; +}; + + +const defaultJSConfig = { + type: 'custom', + from: {}, + to: {}, + duration: 400, + start: noop, + complete: noop, + easing: 'ease', + delay: 0 +}; +const defaultCssConfig = { + duration: 400, + easing: 'ease', + delay: 0 +}; + +function setupAnimationOnElement() { + const animation = this; + const $element = animation.element; + const config = animation.config; + + setupPosition($element, config.from); + setupPosition($element, config.to); + + animation.configurator.setup($element, config); + + $element.data(ANIM_DATA_KEY, animation); + + if(fx.off) { + config.duration = 0; + config.delay = 0; + } + + animation.strategy.initAnimation($element, config); + + if(config.start) { + const element = getPublicElement($element); + config.start.apply(this, [element, config]); + } +} + +const onElementAnimationComplete = function(animation) { + const $element = animation.element; + const config = animation.config; + + $element.removeData(ANIM_DATA_KEY); + if(config.complete) { + const element = getPublicElement($element); + config.complete.apply(this, [element, config]); + } + animation.deferred.resolveWith(this, [$element, config]); +}; + +const startAnimationOnElement = function() { + const animation = this; + const $element = animation.element; + const config = animation.config; + + animation.isStarted = true; + return animation.strategy.animate($element, config) + .done(function() { + onElementAnimationComplete(animation); + }) + .fail(function() { + animation.deferred.rejectWith(this, [$element, config]); + }); +}; + +const stopAnimationOnElement = function(jumpToEnd) { + const animation = this; + const $element = animation.element; + const config = animation.config; + + clearTimeout(animation.startTimeout); + + if(!animation.isStarted) { + animation.start(); + } + + animation.strategy.stop($element, config, jumpToEnd); +}; + +const scopedRemoveEvent = addNamespace(removeEvent, 'dxFXStartAnimation'); + +const subscribeToRemoveEvent = function(animation) { + eventsEngine.off(animation.element, scopedRemoveEvent); + eventsEngine.on(animation.element, scopedRemoveEvent, function() { + fx.stop(animation.element); + }); + + animation.deferred.always(function() { + eventsEngine.off(animation.element, scopedRemoveEvent); + }); +}; + +const createAnimation = function(element, initialConfig) { + const defaultConfig = initialConfig.type === 'css' ? defaultCssConfig : defaultJSConfig; + const config = extend(true, {}, defaultConfig, initialConfig); + const configurator = getAnimationConfigurator(config); + const strategy = getAnimationStrategy(config); + const animation = { + element: $(element), + config: config, + configurator: configurator, + strategy: strategy, + isSynchronous: strategy.isSynchronous, + setup: setupAnimationOnElement, + start: startAnimationOnElement, + stop: stopAnimationOnElement, + deferred: new Deferred() + }; + + if(isFunction(configurator.validateConfig)) { + configurator.validateConfig(config); + } + + subscribeToRemoveEvent(animation); + + return animation; +}; + +const animate = function(element, config) { + const $element = $(element); + + if(!$element.length) { + return new Deferred().resolve().promise(); + } + + const animation = createAnimation($element, config); + + pushInAnimationQueue($element, animation); + return animation.deferred.promise(); +}; + +function pushInAnimationQueue($element, animation) { + const queueData = getAnimQueueData($element); + writeAnimQueueData($element, queueData); + queueData.push(animation); + + if(!isAnimating($element)) { + shiftFromAnimationQueue($element, queueData); + } +} + +function getAnimQueueData($element) { + return $element.data(ANIM_QUEUE_KEY) || []; +} + +function writeAnimQueueData($element, queueData) { + $element.data(ANIM_QUEUE_KEY, queueData); +} + +const destroyAnimQueueData = function($element) { + $element.removeData(ANIM_QUEUE_KEY); +}; + +function isAnimating($element) { + return !!$element.data(ANIM_DATA_KEY); +} + +function shiftFromAnimationQueue($element, queueData) { + queueData = getAnimQueueData($element); + if(!queueData.length) { + return; + } + + const animation = queueData.shift(); + if(queueData.length === 0) { + destroyAnimQueueData($element); + } + + executeAnimation(animation).done(function() { + if(!isAnimating($element)) { + shiftFromAnimationQueue($element); + } + }); +} + +function executeAnimation(animation) { + animation.setup(); + if(fx.off || animation.isSynchronous) { + animation.start(); + } else { + animation.startTimeout = setTimeout(function() { + animation.start(); + }); + } + + return animation.deferred.promise(); +} + +function setupPosition($element, config) { + if(!config || !config.position) { + return; + } + + const win = $(window); + let left = 0; + let top = 0; + const position = positionUtils.calculate($element, config.position); + const offset = $element.offset(); + const currentPosition = $element.position(); + + if(currentPosition.top > offset.top) { + top = win.scrollTop(); + } + + if(currentPosition.left > offset.left) { + left = win.scrollLeft(); + } + + extend(config, { + left: position.h.location - offset.left + currentPosition.left - left, + top: position.v.location - offset.top + currentPosition.top - top + }); + + delete config.position; +} + +function setProps($element, props) { + each(props, function(key, value) { + try { + $element.css(key, isFunction(value) ? value() : value); + } catch(e) { } + }); +} + +const stop = function(element, jumpToEnd) { + const $element = $(element); + const queueData = getAnimQueueData($element); + + // TODO: think about complete all animation in queue + each(queueData, function(_, animation) { + animation.config.delay = 0; + animation.config.duration = 0; + animation.isSynchronous = true; + }); + + if(!isAnimating($element)) { + shiftFromAnimationQueue($element, queueData); + } + const animation = $element.data(ANIM_DATA_KEY); + + if(animation) { + animation.stop(jumpToEnd); + } + + $element.removeData(ANIM_DATA_KEY); + destroyAnimQueueData($element); +}; + +const fx = { + off: false, + animationTypes: animationConfigurators, + animate: animate, + createAnimation: createAnimation, + isAnimating: isAnimating, + stop: stop, + _simulatedTransitionEndDelay: 100 +}; + +export default fx; diff --git a/packages/devextreme/js/common/core/animation/position.js b/packages/devextreme/js/common/core/animation/position.js new file mode 100644 index 000000000000..23f9edc549d4 --- /dev/null +++ b/packages/devextreme/js/common/core/animation/position.js @@ -0,0 +1,435 @@ +import { getOuterWidth, getOuterHeight, getWidth, getHeight } from '../../../core/utils/size'; +import $ from '../../../core/renderer'; + +import { splitPair, pairToObject } from '../../../core/utils/common'; +import { each } from '../../../core/utils/iterator'; +import { getWindow } from '../../../core/utils/window'; +const window = getWindow(); +import domAdapter from '../../../core/dom_adapter'; +import { isWindow, isDefined } from '../../../core/utils/type'; +import { extend } from '../../../core/utils/extend'; +import { getBoundingRect } from '../../../core/utils/position'; +import browser from '../../../core/utils/browser'; +import { resetPosition, move } from './translator'; +import { touch } from '../../../core/utils/support'; +import devices from '../../../core/devices'; +import { setStyle } from '../../../core/utils/style'; + +const horzRe = /left|right/; +const vertRe = /top|bottom/; +const collisionRe = /fit|flip|none/; +const scaleRe = /scale\(.+?\)/; +const IS_SAFARI = browser.safari; + +const normalizeAlign = function(raw) { + const result = { + h: 'center', + v: 'center' + }; + + const pair = splitPair(raw); + + if(pair) { + each(pair, function() { + const w = String(this).toLowerCase(); + if(horzRe.test(w)) { + result.h = w; + } else if(vertRe.test(w)) { + result.v = w; + } + }); + } + + return result; +}; + +const normalizeOffset = function(raw, preventRound) { + return pairToObject(raw, preventRound); +}; + +const normalizeCollision = function(raw) { + const pair = splitPair(raw); + let h = String(pair && pair[0]).toLowerCase(); + let v = String(pair && pair[1]).toLowerCase(); + + if(!collisionRe.test(h)) { + h = 'none'; + } + if(!collisionRe.test(v)) { + v = h; + } + + return { h: h, v: v }; +}; + +const getAlignFactor = function(align) { + switch(align) { + case 'center': + return 0.5; + case 'right': + case 'bottom': + return 1; + default: + return 0; + } +}; + +const inverseAlign = function(align) { + switch(align) { + case 'left': + return 'right'; + case 'right': + return 'left'; + case 'top': + return 'bottom'; + case 'bottom': + return 'top'; + default: + return align; + } +}; + +const calculateOversize = function(data, bounds) { + let oversize = 0; + + if(data.myLocation < bounds.min) { + oversize += bounds.min - data.myLocation; + } + + if(data.myLocation > bounds.max) { + oversize += data.myLocation - bounds.max; + } + + return oversize; +}; + +const collisionSide = function(direction, data, bounds) { + if(data.myLocation < bounds.min) { + return direction === 'h' ? 'left' : 'top'; + } + if(data.myLocation > bounds.max) { + return direction === 'h' ? 'right' : 'bottom'; + } + return 'none'; +}; + +// TODO: rename? +const initMyLocation = function(data) { + data.myLocation = data.atLocation + + getAlignFactor(data.atAlign) * data.atSize + - getAlignFactor(data.myAlign) * data.mySize + + data.offset; +}; + +const collisionResolvers = { + + 'fit': function(data, bounds) { + let result = false; + if(data.myLocation > bounds.max) { + data.myLocation = bounds.max; + result = true; + } + if(data.myLocation < bounds.min) { + data.myLocation = bounds.min; + result = true; + } + + data.fit = result; + }, + + 'flip': function(data, bounds) { + data.flip = false; + + if(data.myAlign === 'center' && data.atAlign === 'center') { + return; + } + + if(data.myLocation < bounds.min || data.myLocation > bounds.max) { + const inverseData = extend({}, data, { + myAlign: inverseAlign(data.myAlign), + atAlign: inverseAlign(data.atAlign), + offset: -data.offset + }); + + initMyLocation(inverseData); + inverseData.oversize = calculateOversize(inverseData, bounds); + + if((inverseData.myLocation >= bounds.min && inverseData.myLocation <= bounds.max) || data.oversize > inverseData.oversize) { + data.myLocation = inverseData.myLocation; + data.oversize = inverseData.oversize; + data.flip = true; + } + } + }, + + 'flipfit': function(data, bounds) { + this.flip(data, bounds); + this.fit(data, bounds); + }, + + 'none': function(data) { + data.oversize = 0; + } +}; + +let scrollbarWidth; + +const calculateScrollbarWidth = function() { + const $scrollDiv = $('
').css({ + width: 100, + height: 100, + overflow: 'scroll', + position: 'absolute', + top: -9999 + }).appendTo($('body')); + const result = $scrollDiv.get(0).offsetWidth - $scrollDiv.get(0).clientWidth; + + $scrollDiv.remove(); + + scrollbarWidth = result; +}; + +const defaultPositionResult = { + h: { + location: 0, + flip: false, + fit: false, + oversize: 0 + }, + v: { + location: 0, + flip: false, + fit: false, + oversize: 0 + } +}; + +const calculatePosition = function(what, options) { + const $what = $(what); + const currentOffset = $what.offset(); + const result = extend(true, {}, defaultPositionResult, { + h: { location: currentOffset.left }, + v: { location: currentOffset.top } + }); + + if(!options) { + return result; + } + + const my = normalizeAlign(options.my); + const at = normalizeAlign(options.at); + let of = ($(options.of).length && options.of) || window; + const offset = normalizeOffset(options.offset, options.precise); + const collision = normalizeCollision(options.collision); + const boundary = options.boundary; + const boundaryOffset = normalizeOffset(options.boundaryOffset, options.precise); + + const h = { + mySize: getOuterWidth($what), + myAlign: my.h, + atAlign: at.h, + offset: offset.h, + collision: collision.h, + boundaryOffset: boundaryOffset.h + }; + + const v = { + mySize: getOuterHeight($what), + myAlign: my.v, + atAlign: at.v, + offset: offset.v, + collision: collision.v, + boundaryOffset: boundaryOffset.v + }; + + if(of.preventDefault) { + h.atLocation = of.pageX; + v.atLocation = of.pageY; + h.atSize = 0; + v.atSize = 0; + } else { + of = $(of); + if(isWindow(of[0])) { + h.atLocation = of.scrollLeft(); + v.atLocation = of.scrollTop(); + if(devices.real().deviceType === 'phone' && of[0].visualViewport) { + h.atLocation = Math.max(h.atLocation, of[0].visualViewport.offsetLeft); + v.atLocation = Math.max(v.atLocation, of[0].visualViewport.offsetTop); + h.atSize = of[0].visualViewport.width; + v.atSize = of[0].visualViewport.height; + } else { + h.atSize = of[0].innerWidth > of[0].outerWidth ? of[0].innerWidth : getWidth(of); + v.atSize = of[0].innerHeight > of[0].outerHeight || IS_SAFARI ? of[0].innerHeight : getHeight(of); + } + } else if(of[0].nodeType === 9) { + h.atLocation = 0; + v.atLocation = 0; + h.atSize = getWidth(of); + v.atSize = getHeight(of); + } else { + const ofRect = getBoundingRect(of.get(0)); + const o = getOffsetWithoutScale(of); + h.atLocation = o.left; + v.atLocation = o.top; + h.atSize = Math.max(ofRect.width, getOuterWidth(of)); + v.atSize = Math.max(ofRect.height, getOuterHeight(of)); + } + } + + initMyLocation(h); + initMyLocation(v); + + const bounds = (function() { + const win = $(window); + const windowWidth = getWidth(win); + const windowHeight = getHeight(win); + let left = win.scrollLeft(); + let top = win.scrollTop(); + const documentElement = domAdapter.getDocumentElement(); + const hZoomLevel = touch ? documentElement.clientWidth / windowWidth : 1; + const vZoomLevel = touch ? documentElement.clientHeight / windowHeight : 1; + + if(scrollbarWidth === undefined) { + calculateScrollbarWidth(); + } + + let boundaryWidth = windowWidth; + let boundaryHeight = windowHeight; + + if(boundary && !isWindow(boundary)) { + const $boundary = $(boundary); + const boundaryPosition = $boundary.offset(); + + left = boundaryPosition.left; + top = boundaryPosition.top; + + boundaryWidth = getWidth($boundary); + boundaryHeight = getHeight($boundary); + } + + return { + h: { + min: left + h.boundaryOffset, + max: left + boundaryWidth / hZoomLevel - h.mySize - h.boundaryOffset + }, + v: { + min: top + v.boundaryOffset, + max: top + boundaryHeight / vZoomLevel - v.mySize - v.boundaryOffset + } + }; + })(); + + h.oversize = calculateOversize(h, bounds.h); + v.oversize = calculateOversize(v, bounds.v); + + h.collisionSide = collisionSide('h', h, bounds.h); + v.collisionSide = collisionSide('v', v, bounds.v); + + if(collisionResolvers[h.collision]) { + collisionResolvers[h.collision](h, bounds.h); + } + + if(collisionResolvers[v.collision]) { + collisionResolvers[v.collision](v, bounds.v); + } + + const preciser = function(number) { + return options.precise ? number : Math.round(number); + }; + + extend(true, result, { + h: { location: preciser(h.myLocation), oversize: preciser(h.oversize), fit: h.fit, flip: h.flip, collisionSide: h.collisionSide }, + v: { location: preciser(v.myLocation), oversize: preciser(v.oversize), fit: v.fit, flip: v.flip, collisionSide: v.collisionSide }, + precise: options.precise + }); + + return result; +}; +// NOTE: Setting the 'element.style' requires creating attributeNode when both of the conditions met: +// - a form contains an input with the name property set to "style"; +// - a form contains a dx-validator (or other popup widget). +// T941581 +const setScaleProperty = function(element, scale, styleAttr, isEmpty) { + const stylePropIsValid = isDefined(element.style) && !domAdapter.isNode(element.style); + const newStyleValue = isEmpty ? styleAttr.replace(scale, '') : styleAttr; + + if(stylePropIsValid) { + setStyle(element, newStyleValue, false); + } else { + const styleAttributeNode = domAdapter.createAttribute('style'); + styleAttributeNode.value = newStyleValue; + element.setAttributeNode(styleAttributeNode); + } +}; + +const getOffsetWithoutScale = function($startElement, $currentElement = $startElement) { + const currentElement = $currentElement.get(0); + if(!currentElement) { + return $startElement.offset(); + } + + const style = currentElement.getAttribute?.('style') || ''; + const scale = style.match(scaleRe)?.[0]; + let offset; + + if(scale) { + setScaleProperty(currentElement, scale, style, true); + offset = getOffsetWithoutScale($startElement, $currentElement.parent()); + setScaleProperty(currentElement, scale, style, false); + } else { + offset = getOffsetWithoutScale($startElement, $currentElement.parent()); + } + + return offset; +}; + +const position = function(what, options) { + const $what = $(what); + + if(!options) { + return $what.offset(); + } + + resetPosition($what, true); + + + const offset = getOffsetWithoutScale($what); + const targetPosition = (options.h && options.v) ? options : calculatePosition($what, options); + + const preciser = function(number) { + return options.precise ? number : Math.round(number); + }; + + move($what, { + left: targetPosition.h.location - preciser(offset.left), + top: targetPosition.v.location - preciser(offset.top) + }); + + return targetPosition; +}; + +const offset = function(element) { + element = $(element).get(0); + if(isWindow(element)) { + return null; + } else if(element && 'pageY' in element && 'pageX' in element) { + return { top: element.pageY, left: element.pageX }; + } + + return $(element).offset(); +}; + +if(!position.inverseAlign) { + position.inverseAlign = inverseAlign; +} + +if(!position.normalizeAlign) { + position.normalizeAlign = normalizeAlign; +} + +export default { + calculateScrollbarWidth: calculateScrollbarWidth, + calculate: calculatePosition, + setup: position, + offset: offset +}; diff --git a/packages/devextreme/js/common/core/animation/presets.js b/packages/devextreme/js/common/core/animation/presets.js new file mode 100644 index 000000000000..a195940b0309 --- /dev/null +++ b/packages/devextreme/js/common/core/animation/presets.js @@ -0,0 +1,3 @@ +import { presets } from './presets/presets'; + +export default presets; diff --git a/packages/devextreme/js/common/core/animation/presets/presets.js b/packages/devextreme/js/common/core/animation/presets/presets.js new file mode 100644 index 000000000000..3b6f2bf23508 --- /dev/null +++ b/packages/devextreme/js/common/core/animation/presets/presets.js @@ -0,0 +1,395 @@ +import { getWidth } from '../../../../core/utils/size'; +import { Component } from '../../../../core/component'; +import { each } from '../../../../core/utils/iterator'; +import { extend } from '../../../../core/utils/extend'; +import devices from '../../environment/devices'; +import fx from '../fx'; + +const directionPostfixes = { + forward: ' dx-forward', + backward: ' dx-backward', + none: ' dx-no-direction', + undefined: ' dx-no-direction' +}; + +const optionPrefix = 'preset_'; + +const AnimationPresetCollection = Component.inherit({ + ctor: function() { + this.callBase.apply(this, arguments); + this._registeredPresets = []; + this.resetToDefaults(); + }, + + _getDefaultOptions: function() { + return extend(this.callBase(), { + defaultAnimationDuration: 400, + defaultAnimationDelay: 0, + defaultStaggerAnimationDuration: 300, + defaultStaggerAnimationDelay: 40, + defaultStaggerAnimationStartDelay: 500 // hack for better animations on ipad mini + }); + }, + + _defaultOptionsRules: function() { + return this.callBase().concat([ + { + device: function(device) { + return device.phone; + }, + options: { + defaultStaggerAnimationDuration: 350, + defaultStaggerAnimationDelay: 50, + defaultStaggerAnimationStartDelay: 0 + } + }, + { // T254756 + device: function() { + return devices.current().android || devices.real.android; + }, + options: { + defaultAnimationDelay: 100 + } + } + ]); + }, + + _getPresetOptionName: function(animationName) { + return optionPrefix + animationName; + }, + + // T257755 + _createAndroidSlideAnimationConfig: function(throughOpacity, widthMultiplier) { + const that = this; + + const createBaseConfig = function(configModifier) { + return { + type: 'slide', + delay: configModifier.delay === undefined ? that.option('defaultAnimationDelay') : configModifier.delay, + duration: configModifier.duration === undefined ? that.option('defaultAnimationDuration') : configModifier.duration + }; + }; + + return { + enter: function($element, configModifier) { + const width = getWidth($element.parent()) * widthMultiplier; + const direction = configModifier.direction; + const config = createBaseConfig(configModifier); + + config.to = { + left: 0, + opacity: 1 + }; + + if(direction === 'forward') { + config.from = { + left: width, + opacity: throughOpacity + }; + } else if(direction === 'backward') { + config.from = { + left: -width, + opacity: throughOpacity + }; + } else { + config.from = { + left: 0, + opacity: 0 + }; + } + + return fx.createAnimation($element, config); + }, + leave: function($element, configModifier) { + const width = getWidth($element.parent()) * widthMultiplier; + const direction = configModifier.direction; + const config = createBaseConfig(configModifier); + + config.from = { + left: 0, + opacity: 1 + }; + + if(direction === 'forward') { + config.to = { + left: -width, + opacity: throughOpacity + }; + } else if(direction === 'backward') { + config.to = { + left: width, + opacity: throughOpacity + }; + } else { + config.to = { + left: 0, + opacity: 0 + }; + } + + return fx.createAnimation($element, config); + } + }; + }, + + _createOpenDoorConfig: function() { + const that = this; + + const createBaseConfig = function(configModifier) { + return { + type: 'css', + extraCssClasses: 'dx-opendoor-animation', + delay: configModifier.delay === undefined ? that.option('defaultAnimationDelay') : configModifier.delay, + duration: configModifier.duration === undefined ? that.option('defaultAnimationDuration') : configModifier.duration + }; + }; + + return { + enter: function($element, configModifier) { + const direction = configModifier.direction; + const config = createBaseConfig(configModifier); + + config.delay = direction === 'none' ? config.delay : config.duration; + config.from = 'dx-enter dx-opendoor-animation' + directionPostfixes[direction]; + config.to = 'dx-enter-active'; + + return fx.createAnimation($element, config); + }, + leave: function($element, configModifier) { + const direction = configModifier.direction; + const config = createBaseConfig(configModifier); + + config.from = 'dx-leave dx-opendoor-animation' + directionPostfixes[direction]; + config.to = 'dx-leave-active'; + + return fx.createAnimation($element, config); + } + }; + }, + + _createWinPopConfig: function() { + const that = this; + const baseConfig = { + type: 'css', + extraCssClasses: 'dx-win-pop-animation', + duration: that.option('defaultAnimationDuration') + }; + + return { + enter: function($element, configModifier) { + const config = baseConfig; + const direction = configModifier.direction; + + config.delay = direction === 'none' ? that.option('defaultAnimationDelay') : that.option('defaultAnimationDuration') / 2; + config.from = 'dx-enter dx-win-pop-animation' + directionPostfixes[direction]; + config.to = 'dx-enter-active'; + + return fx.createAnimation($element, config); + }, + leave: function($element, configModifier) { + const config = baseConfig; + const direction = configModifier.direction; + + config.delay = that.option('defaultAnimationDelay'); + config.from = 'dx-leave dx-win-pop-animation' + directionPostfixes[direction]; + config.to = 'dx-leave-active'; + + return fx.createAnimation($element, config); + } + }; + }, + + resetToDefaults: function() { + this.clear(); + this.registerDefaultPresets(); + this.applyChanges(); + }, + + clear: function(name) { + const that = this; + const newRegisteredPresets = []; + + each(this._registeredPresets, function(index, preset) { + if(!name || name === preset.name) { + that.option(that._getPresetOptionName(preset.name), undefined); + } else { + newRegisteredPresets.push(preset); + } + }); + this._registeredPresets = newRegisteredPresets; + this.applyChanges(); + }, + + registerPreset: function(name, config) { + this._registeredPresets.push({ + name: name, + config: config + }); + }, + + applyChanges: function() { + const that = this; + const customRules = []; + + each(this._registeredPresets, function(index, preset) { + const rule = { + device: preset.config.device, + options: {} + }; + + rule.options[that._getPresetOptionName(preset.name)] = preset.config.animation; + customRules.push(rule); + }); + + this._setOptionsByDevice(customRules); + }, + + getPreset: function(name) { + let result = name; + + while(typeof result === 'string') { + result = this.option(this._getPresetOptionName(result)); + } + + return result; + }, + + registerDefaultPresets: function() { + this.registerPreset('pop', { + animation: { + extraCssClasses: 'dx-android-pop-animation', + delay: this.option('defaultAnimationDelay'), + duration: this.option('defaultAnimationDuration') + } + }); + this.registerPreset('openDoor', { + animation: this._createOpenDoorConfig() + }); + this.registerPreset('win-pop', { + animation: this._createWinPopConfig() + }); + this.registerPreset('fade', { + animation: { + extraCssClasses: 'dx-fade-animation', + delay: this.option('defaultAnimationDelay'), + duration: this.option('defaultAnimationDuration') + } + }); + this.registerPreset('slide', { + device: function() { + return devices.current().android || devices.real.android; + }, + animation: this._createAndroidSlideAnimationConfig(1, 1) + }); + this.registerPreset('slide', { + device: function() { + return !devices.current().android && !devices.real.android; + }, + animation: { + extraCssClasses: 'dx-slide-animation', + delay: this.option('defaultAnimationDelay'), + duration: this.option('defaultAnimationDuration') + } + }); + this.registerPreset('ios7-slide', { + animation: { + extraCssClasses: 'dx-ios7-slide-animation', + delay: this.option('defaultAnimationDelay'), + duration: this.option('defaultAnimationDuration') + } + }); + this.registerPreset('overflow', { + animation: { + extraCssClasses: 'dx-overflow-animation', + delay: this.option('defaultAnimationDelay'), + duration: this.option('defaultAnimationDuration') + } + }); + this.registerPreset('ios7-toolbar', { + device: function() { + return !devices.current().android && !devices.real.android; + }, + animation: { + extraCssClasses: 'dx-ios7-toolbar-animation', + delay: this.option('defaultAnimationDelay'), + duration: this.option('defaultAnimationDuration') + } + }); + this.registerPreset('ios7-toolbar', { + device: function() { + return devices.current().android || devices.real.android; + }, + animation: this._createAndroidSlideAnimationConfig(0, 0.4) + }); + this.registerPreset('stagger-fade', { + animation: { + extraCssClasses: 'dx-fade-animation', + staggerDelay: this.option('defaultStaggerAnimationDelay'), + duration: this.option('defaultStaggerAnimationDuration'), + delay: this.option('defaultStaggerAnimationStartDelay') + } + }); + this.registerPreset('stagger-slide', { + animation: { + extraCssClasses: 'dx-slide-animation', + staggerDelay: this.option('defaultStaggerAnimationDelay'), + duration: this.option('defaultStaggerAnimationDuration'), + delay: this.option('defaultStaggerAnimationStartDelay') + } + }); + this.registerPreset('stagger-fade-slide', { + animation: { + extraCssClasses: 'dx-fade-slide-animation', + staggerDelay: this.option('defaultStaggerAnimationDelay'), + duration: this.option('defaultStaggerAnimationDuration'), + delay: this.option('defaultStaggerAnimationStartDelay') + } + }); + this.registerPreset('stagger-drop', { + animation: { + extraCssClasses: 'dx-drop-animation', + staggerDelay: this.option('defaultStaggerAnimationDelay'), + duration: this.option('defaultStaggerAnimationDuration'), + delay: this.option('defaultStaggerAnimationStartDelay') + } + }); + this.registerPreset('stagger-fade-drop', { + animation: { + extraCssClasses: 'dx-fade-drop-animation', + staggerDelay: this.option('defaultStaggerAnimationDelay'), + duration: this.option('defaultStaggerAnimationDuration'), + delay: this.option('defaultStaggerAnimationStartDelay') + } + }); + this.registerPreset('stagger-fade-rise', { + animation: { + extraCssClasses: 'dx-fade-rise-animation', + staggerDelay: this.option('defaultStaggerAnimationDelay'), + duration: this.option('defaultStaggerAnimationDuration'), + delay: this.option('defaultStaggerAnimationStartDelay') + } + }); + this.registerPreset('stagger-3d-drop', { + animation: { + extraCssClasses: 'dx-3d-drop-animation', + staggerDelay: this.option('defaultStaggerAnimationDelay'), + duration: this.option('defaultStaggerAnimationDuration'), + delay: this.option('defaultStaggerAnimationStartDelay') + } + }); + this.registerPreset('stagger-fade-zoom', { + animation: { + extraCssClasses: 'dx-fade-zoom-animation', + staggerDelay: this.option('defaultStaggerAnimationDelay'), + duration: this.option('defaultStaggerAnimationDuration'), + delay: this.option('defaultStaggerAnimationStartDelay') + } + }); + } +}); + +const animationPresets = new AnimationPresetCollection(); +export { + animationPresets as presets, + AnimationPresetCollection as PresetCollection +}; diff --git a/packages/devextreme/js/common/core/animation/transition_executor.js b/packages/devextreme/js/common/core/animation/transition_executor.js new file mode 100644 index 000000000000..2e874294f9a9 --- /dev/null +++ b/packages/devextreme/js/common/core/animation/transition_executor.js @@ -0,0 +1,3 @@ +import { TransitionExecutor } from './transition_executor/transition_executor'; + +export default TransitionExecutor; diff --git a/packages/devextreme/js/common/core/animation/transition_executor/transition_executor.js b/packages/devextreme/js/common/core/animation/transition_executor/transition_executor.js new file mode 100644 index 000000000000..abbd1ad22452 --- /dev/null +++ b/packages/devextreme/js/common/core/animation/transition_executor/transition_executor.js @@ -0,0 +1,178 @@ +import $ from '../../../../core/renderer'; +import Class from '../../../../core/class'; +import { extend } from '../../../../core/utils/extend'; +import commonUtils from '../../../../__internal/core/utils/m_common'; +import { isFunction, isPlainObject } from '../../../../core/utils/type'; +import { map } from '../../../../core/utils/iterator'; +import fx from '../fx'; +import { presets } from '../presets/presets'; +import { when, Deferred } from '../../../../core/utils/deferred'; + +const directionPostfixes = { + forward: ' dx-forward', + backward: ' dx-backward', + none: ' dx-no-direction', + undefined: ' dx-no-direction' +}; +const DX_ANIMATING_CLASS = 'dx-animating'; + +export const TransitionExecutor = Class.inherit({ + ctor: function() { + this._accumulatedDelays = { + enter: 0, + leave: 0 + }; + this._animations = []; + this.reset(); + }, + + _createAnimations: function($elements, initialConfig, configModifier, type) { + $elements = $($elements); + const that = this; + const result = []; + + configModifier = configModifier || {}; + const animationConfig = this._prepareElementAnimationConfig(initialConfig, configModifier, type); + + if(animationConfig) { + $elements.each(function() { + const animation = that._createAnimation($(this), animationConfig, configModifier); + if(animation) { + animation.element.addClass(DX_ANIMATING_CLASS); + animation.setup(); + result.push(animation); + } + }); + } + + return result; + }, + + _prepareElementAnimationConfig: function(config, configModifier, type) { + let result; + + if(typeof config === 'string') { + const presetName = config; + config = presets.getPreset(presetName); + } + + if(!config) { + result = undefined; + } else if(isFunction(config[type])) { + result = config[type]; + } else { + result = extend({ + skipElementInitialStyles: true, + cleanupWhen: this._completePromise + }, config, configModifier); + + if(!result.type || result.type === 'css') { + const cssClass = 'dx-' + type; + const extraCssClasses = (result.extraCssClasses ? ' ' + result.extraCssClasses : '') + directionPostfixes[result.direction]; + + result.type = 'css'; + result.from = (result.from || cssClass) + extraCssClasses; + result.to = result.to || (cssClass + '-active'); + } + + result.staggerDelay = result.staggerDelay || 0; + result.delay = result.delay || 0; + + if(result.staggerDelay) { + result.delay += this._accumulatedDelays[type]; + this._accumulatedDelays[type] += result.staggerDelay; + } + + } + return result; + }, + + _createAnimation: function($element, animationConfig, configModifier) { + let result; + + if(isPlainObject(animationConfig)) { + result = fx.createAnimation($element, animationConfig); + } else if(isFunction(animationConfig)) { + result = animationConfig($element, configModifier); + } + + return result; + }, + + _startAnimations: function() { + const animations = this._animations; + + for(let i = 0; i < animations.length; i++) { + animations[i].start(); + } + }, + + _stopAnimations: function(jumpToEnd) { + const animations = this._animations; + + for(let i = 0; i < animations.length; i++) { + animations[i].stop(jumpToEnd); + } + }, + + _clearAnimations: function() { + const animations = this._animations; + + for(let i = 0; i < animations.length; i++) { + animations[i].element.removeClass(DX_ANIMATING_CLASS); + } + + this._animations.length = 0; + }, + + reset: function() { + this._accumulatedDelays.enter = 0; + this._accumulatedDelays.leave = 0; + this._clearAnimations(); + this._completeDeferred = new Deferred(); + this._completePromise = this._completeDeferred.promise(); + }, + enter: function($elements, animationConfig, configModifier) { + const animations = this._createAnimations($elements, animationConfig, configModifier, 'enter'); + this._animations.push.apply(this._animations, animations); + }, + leave: function($elements, animationConfig, configModifier) { + const animations = this._createAnimations($elements, animationConfig, configModifier, 'leave'); + this._animations.push.apply(this._animations, animations); + }, + start: function() { + const that = this; + let result; + + if(!this._animations.length) { + that.reset(); + result = new Deferred().resolve().promise(); + } else { + const animationDeferreds = map(this._animations, function(animation) { + const result = new Deferred(); + + animation.deferred.always(function() { + result.resolve(); + }); + + return result.promise(); + }); + + result = when.apply($, animationDeferreds) + .always(function() { + that._completeDeferred.resolve(); + that.reset(); + }); + + commonUtils.executeAsync(function() { + that._startAnimations(); + }); + } + + return result; + }, + stop: function(jumpToEnd) { + this._stopAnimations(jumpToEnd); + } + +}); diff --git a/packages/devextreme/js/common/core/animation/translator.js b/packages/devextreme/js/common/core/animation/translator.js new file mode 100644 index 000000000000..6f3cce60d091 --- /dev/null +++ b/packages/devextreme/js/common/core/animation/translator.js @@ -0,0 +1,145 @@ +import $ from '../../../core/renderer'; +import { data as elementData, removeData } from '../../../core/element_data'; +import { type } from '../../../core/utils/type'; + +const TRANSLATOR_DATA_KEY = 'dxTranslator'; +const TRANSFORM_MATRIX_REGEX = /matrix(3d)?\((.+?)\)/; +const TRANSLATE_REGEX = /translate(?:3d)?\((.+?)\)/; + +export const locate = function($element) { + $element = $($element); + + const translate = getTranslate($element); + + return { + left: translate.x, + top: translate.y + }; +}; +function isPercentValue(value) { + return type(value) === 'string' && value[value.length - 1] === '%'; +} + +function cacheTranslate($element, translate) { + if($element.length) { + elementData($element.get(0), TRANSLATOR_DATA_KEY, translate); + } +} + +export const clearCache = function($element) { + if($element.length) { + removeData($element.get(0), TRANSLATOR_DATA_KEY); + } +}; + +export const getTranslateCss = function(translate) { + translate.x = translate.x || 0; + translate.y = translate.y || 0; + + const xValueString = isPercentValue(translate.x) ? translate.x : translate.x + 'px'; + const yValueString = isPercentValue(translate.y) ? translate.y : translate.y + 'px'; + + return 'translate(' + xValueString + ', ' + yValueString + ')'; +}; + +export const getTranslate = function($element) { + let result = $element.length ? elementData($element.get(0), TRANSLATOR_DATA_KEY) : null; + + if(!result) { + const transformValue = $element.css('transform') || getTranslateCss({ x: 0, y: 0 }); + let matrix = transformValue.match(TRANSFORM_MATRIX_REGEX); + const is3D = matrix && matrix[1]; + + if(matrix) { + matrix = matrix[2].split(','); + if(is3D === '3d') { + matrix = matrix.slice(12, 15); + } else { + matrix.push(0); + matrix = matrix.slice(4, 7); + } + } else { + matrix = [0, 0, 0]; + } + + result = { + x: parseFloat(matrix[0]), + y: parseFloat(matrix[1]), + z: parseFloat(matrix[2]) + }; + + cacheTranslate($element, result); + } + + return result; +}; + +export const move = function($element, position) { + $element = $($element); + + const left = position.left; + const top = position.top; + let translate; + + if(left === undefined) { + translate = getTranslate($element); + translate.y = top || 0; + } else if(top === undefined) { + translate = getTranslate($element); + translate.x = left || 0; + } else { + translate = { x: left || 0, y: top || 0, z: 0 }; + cacheTranslate($element, translate); + } + + $element.css({ + transform: getTranslateCss(translate) + }); + + if(isPercentValue(left) || isPercentValue(top)) { + clearCache($element); + } +}; + +export const resetPosition = function($element, finishTransition) { + $element = $($element); + + let originalTransition; + const stylesConfig = { + left: 0, + top: 0, + transform: 'none', + }; + + if(finishTransition) { + originalTransition = $element.css('transition'); + stylesConfig.transition = 'none'; + } + + $element.css(stylesConfig); + + clearCache($element); + + if(finishTransition) { + $element.get(0).offsetHeight; + $element.css('transition', originalTransition); + } +}; + +export const parseTranslate = function(translateString) { + let result = translateString.match(TRANSLATE_REGEX); + + if(!result || !result[1]) { + return; + } + + result = result[1].split(','); + + result = { + x: parseFloat(result[0]), + y: parseFloat(result[1]), + z: parseFloat(result[2]) + }; + + return result; +}; diff --git a/packages/devextreme/js/common/core/environment.d.ts b/packages/devextreme/js/common/core/environment.d.ts new file mode 100644 index 000000000000..f07c872dbcb4 --- /dev/null +++ b/packages/devextreme/js/common/core/environment.d.ts @@ -0,0 +1,101 @@ +/** + * @public + * @docid + * @section commonObjectStructures + * @namespace DevExpress.common.core.environment + */ +export type Device = { + /** + * @docid + * @public + */ + android?: boolean; + /** + * @docid + * @public + */ + deviceType?: 'phone' | 'tablet' | 'desktop'; + /** + * @docid + * @public + */ + generic?: boolean; + /** + * @docid + * @public + */ + grade?: 'A' | 'B' | 'C'; + /** + * @docid + * @public + */ + ios?: boolean; + /** + * @docid + * @public + */ + phone?: boolean; + /** + * @docid + * @public + */ + platform?: 'android' | 'ios' | 'generic'; + /** + * @docid + * @public + */ + tablet?: boolean; + /** + * @docid + * @public + */ + version?: Array; +}; + +type EventName = 'orientationChanged'; + +/** + * @docid + * @publicName hideTopOverlay() + * @namespace DevExpress.common.core.environment + * @public + */ +export function hideTopOverlay(): boolean; + +/** + * @docid utils.initMobileViewport + * @publicName initMobileViewport(options) + * @namespace DevExpress.common.core.environment + * @public + */ +export function initMobileViewport(options: { allowZoom?: boolean; allowPan?: boolean; allowSelection?: boolean }): void; + +/** + * @docid + * @public + * @namespace DevExpress.common.core.environment + */ +export type SchedulerTimeZone = { + /** + * @docid + */ + id: string; + /** + * @docid + */ + offset: number; + /** + * @docid + */ + title: string; +}; + +/** +* @docid utils.getTimeZones +* @publicName getTimeZones(date) +* @param1 date:Date|undefined +* @namespace DevExpress.common.core.environment +* @static +* @public +*/ +export function getTimeZones(date?: Date): Array; diff --git a/packages/devextreme/js/common/core/environment.js b/packages/devextreme/js/common/core/environment.js new file mode 100644 index 000000000000..06bf67894425 --- /dev/null +++ b/packages/devextreme/js/common/core/environment.js @@ -0,0 +1,11 @@ +import devices from './environment/devices'; +import hideTopOverlay from './environment/hide_top_overlay'; +import initMobileViewport from './environment/init_mobile_viewport'; +import { getTimeZones } from './environment/time_zone_utils'; + +export { + devices, + hideTopOverlay, + initMobileViewport, + getTimeZones, +}; diff --git a/packages/devextreme/js/common/core/environment/devices.js b/packages/devextreme/js/common/core/environment/devices.js new file mode 100644 index 000000000000..5e7fa24382e6 --- /dev/null +++ b/packages/devextreme/js/common/core/environment/devices.js @@ -0,0 +1,8 @@ +/** + * @name DevicesObject.ctor + * @publicName ctor(options) + * @param1 options:object + * @param1_field1 window:Window + * @hidden + */ +export { default } from '../../../__internal/core/m_devices'; diff --git a/packages/devextreme/js/common/core/environment/hide_callback.js b/packages/devextreme/js/common/core/environment/hide_callback.js new file mode 100644 index 000000000000..6f0aa83cef20 --- /dev/null +++ b/packages/devextreme/js/common/core/environment/hide_callback.js @@ -0,0 +1,33 @@ +export const hideCallback = (function() { + let callbacks = []; + return { + add: function(callback) { + if(!callbacks.includes(callback)) { + callbacks.push(callback); + } + }, + remove: function(callback) { + const indexOfCallback = callbacks.indexOf(callback); + if(indexOfCallback !== -1) { + callbacks.splice(indexOfCallback, 1); + } + }, + fire: function() { + const callback = callbacks.pop(); + const result = !!callback; + if(result) { + callback(); + } + return result; + }, + hasCallback: function() { + return callbacks.length > 0; + } + ///#DEBUG + // eslint-disable-next-line comma-style + , reset: function() { + callbacks = []; + } + ///#ENDDEBUG + }; +})(); diff --git a/packages/devextreme/js/common/core/environment/hide_top_overlay.js b/packages/devextreme/js/common/core/environment/hide_top_overlay.js new file mode 100644 index 000000000000..40b4767a5021 --- /dev/null +++ b/packages/devextreme/js/common/core/environment/hide_top_overlay.js @@ -0,0 +1,5 @@ +import { hideCallback } from './hide_callback'; + +export default function() { + return hideCallback.fire(); +} diff --git a/packages/devextreme/js/common/core/environment/init_mobile_viewport.js b/packages/devextreme/js/common/core/environment/init_mobile_viewport.js new file mode 100644 index 000000000000..dcbf6087aa1b --- /dev/null +++ b/packages/devextreme/js/common/core/environment/init_mobile_viewport.js @@ -0,0 +1,3 @@ +import { initMobileViewport } from './init_mobile_viewport/init_mobile_viewport'; + +export default initMobileViewport; diff --git a/packages/devextreme/js/common/core/environment/init_mobile_viewport/init_mobile_viewport.js b/packages/devextreme/js/common/core/environment/init_mobile_viewport/init_mobile_viewport.js new file mode 100644 index 000000000000..d337bd7dcc8a --- /dev/null +++ b/packages/devextreme/js/common/core/environment/init_mobile_viewport/init_mobile_viewport.js @@ -0,0 +1,95 @@ +import { getWidth, setWidth } from '../../../../core/utils/size'; +import $ from '../../../../core/renderer'; +import { getWindow } from '../../../../core/utils/window'; +const window = getWindow(); +import eventsEngine from '../../events/core/events_engine'; +import { extend } from '../../../../core/utils/extend'; +import resizeCallbacks from '../../../../core/utils/resize_callbacks'; +import { styleProp } from '../../../../core/utils/style'; + +import devices from '../../../../__internal/core/m_devices'; +import domAdapter from '../../../../__internal/core/m_dom_adapter'; +import supportUtils from '../../../../__internal/core/utils/m_support'; + +export const initMobileViewport = function(options) { + options = extend({}, options); + let realDevice = devices.real(); + const allowZoom = options.allowZoom; + const allowPan = options.allowPan; + const allowSelection = ('allowSelection' in options) ? options.allowSelection : realDevice.platform === 'generic'; + + const metaSelector = 'meta[name=viewport]'; + if(!$(metaSelector).length) { + $('').attr('name', 'viewport').appendTo('head'); + } + + const metaVerbs = ['width=device-width']; + const msTouchVerbs = []; + + if(allowZoom) { + msTouchVerbs.push('pinch-zoom'); + } else { + metaVerbs.push('initial-scale=1.0', 'maximum-scale=1.0, user-scalable=no'); + } + + if(allowPan) { + msTouchVerbs.push('pan-x', 'pan-y'); + } + + if(!allowPan && !allowZoom) { + $('html, body').css({ + 'msContentZooming': 'none', + 'msUserSelect': 'none', + 'overflow': 'hidden' + }); + } else { + $('html').css('msOverflowStyle', '-ms-autohiding-scrollbar'); + } + + if(!allowSelection && supportUtils.supportProp('userSelect')) { + $('.dx-viewport').css(styleProp('userSelect'), 'none'); + } + + $(metaSelector).attr('content', metaVerbs.join()); + $('html').css('msTouchAction', msTouchVerbs.join(' ') || 'none'); + + realDevice = devices.real(); + + if(supportUtils.touch) { + eventsEngine.off(domAdapter.getDocument(), '.dxInitMobileViewport'); + eventsEngine.on(domAdapter.getDocument(), 'dxpointermove.dxInitMobileViewport', function(e) { + const count = e.pointers.length; + const isTouchEvent = e.pointerType === 'touch'; + const zoomDisabled = !allowZoom && count > 1; + const panDisabled = !allowPan && count === 1 && !e.isScrollingEvent; + + if(isTouchEvent && (zoomDisabled || panDisabled)) { + e.preventDefault(); + } + }); + } + + if(realDevice.ios) { + const isPhoneGap = (domAdapter.getLocation().protocol === 'file:'); + + if(!isPhoneGap) { + // NOTE: fix app size after device rotation in Safari when keyboard was shown + resizeCallbacks.add(function() { + const windowWidth = getWidth(window); + setWidth($('body'), windowWidth); + }); + } + } + + if(realDevice.android) { + resizeCallbacks.add(function() { + setTimeout(function() { + const activeElement = domAdapter.getActiveElement(); + + activeElement.scrollIntoViewIfNeeded ? + activeElement.scrollIntoViewIfNeeded() : + activeElement.scrollIntoView(false); + }); + }); + } +}; diff --git a/packages/devextreme/js/common/core/environment/time_zone_utils.js b/packages/devextreme/js/common/core/environment/time_zone_utils.js new file mode 100644 index 000000000000..4bbab0e11a5e --- /dev/null +++ b/packages/devextreme/js/common/core/environment/time_zone_utils.js @@ -0,0 +1,3 @@ +import timeZoneUtils from '../../../__internal/scheduler/m_utils_time_zone'; + +export const getTimeZones = timeZoneUtils.getTimeZones; diff --git a/packages/devextreme/js/common/core/events.d.ts b/packages/devextreme/js/common/core/events.d.ts new file mode 100644 index 000000000000..25cc577bb730 --- /dev/null +++ b/packages/devextreme/js/common/core/events.d.ts @@ -0,0 +1,255 @@ +import { DxElement } from '../../core/element'; +import { + DxEvent, + EventObject as EventObjectInternal, +} from '../../events/events.types'; + +/** + * @section commonObjectStructures + * @public + * @namespace DevExpress.common.core.events + */ +export type EventObject = EventObjectInternal; + +/** + * @docid + * @public + * @namespace DevExpress.common.core.events + */ +export type InitializedEventInfo = { + /** + * @docid + * @type this + */ + readonly component?: TComponent; + /** @docid */ + readonly element?: DxElement; +}; + +/** + * @docid + * @public + * @namespace DevExpress.common.core.events + */ +export type EventInfo = { + /** + * @docid + * @type this + */ + readonly component: TComponent; + /** @docid */ + readonly element: DxElement; + /** + * @docid + * @hidden + */ + readonly model?: any; +}; + +/** + * @docid + * @public + * @namespace DevExpress.common.core.events + */ +export type NativeEventInfo = { + /** + * @docid + * @type this + */ + readonly component: TComponent; + /** @docid */ + readonly element: DxElement; + /** + * @docid + * @hidden + */ + readonly model?: any; + /** + * @docid + * @type event + */ + readonly event?: DxEvent; +}; + +/** + * @docid + * @public + * @namespace DevExpress.common.core.events + */ +export type ChangedOptionInfo = { + /** @docid */ + readonly name: string; + /** @docid */ + readonly fullName: string; + /** @docid */ + readonly value?: any; + /** @docid */ + readonly previousValue?: any; +}; + +/** + * @docid + * @public + * @namespace DevExpress.common.core.events + */ +export type ItemInfo = { + /** + * @docid + * @type object + */ + readonly itemData?: TItemData; + /** @docid */ + readonly itemElement: DxElement; + /** @docid */ + readonly itemIndex: number; +}; + +/** + * @docid + * @public + * @namespace DevExpress.common.core.events + */ +export type Cancelable = { + /** @docid */ + cancel?: boolean; +}; + +/** + * @docid + * @public + * @namespace DevExpress.common.core.events + */ +export type AsyncCancelable = { + /** + * @docid + * @type boolean|Promise + */ + cancel: boolean | PromiseLike; +}; + +/** + * @docid eventsMethods.off + * @publicName off(element) + * @namespace DevExpress.common.core.events + * @public + */ +export function off(element: Element | Array): void; + +/** + * @docid eventsMethods.off + * @publicName off(element, eventName) + * @namespace DevExpress.common.core.events + * @public + */ +export function off(element: Element | Array, eventName: string): void; + +/** + * @docid eventsMethods.off + * @publicName off(element, eventName, handler) + * @namespace DevExpress.common.core.events + * @public + */ +export function off(element: Element | Array, eventName: string, handler: Function): void; + +/** + * @docid eventsMethods.off + * @publicName off(element, eventName, selector) + * @namespace DevExpress.common.core.events + * @public + */ +export function off(element: Element | Array, eventName: string, selector: string): void; + +/** + * @docid eventsMethods.off + * @publicName off(element, eventName, selector, handler) + * @namespace DevExpress.common.core.events + * @public + */ +export function off(element: Element | Array, eventName: string, selector: string, handler: Function): void; + +/** + * @docid eventsMethods.on + * @publicName on(element, eventName, data, handler) + * @namespace DevExpress.common.core.events + * @param3 data:object + * @public + */ +export function on(element: Element | Array, eventName: string, data: any, handler: Function): void; + +/** + * @docid eventsMethods.on + * @publicName on(element, eventName, handler) + * @namespace DevExpress.common.core.events + * @public + */ +export function on(element: Element | Array, eventName: string, handler: Function): void; + +/** + * @docid eventsMethods.on + * @publicName on(element, eventName, selector, data, handler) + * @namespace DevExpress.common.core.events + * @param4 data:object + * @public + */ +export function on(element: Element | Array, eventName: string, selector: string, data: any, handler: Function): void; + +/** + * @docid eventsMethods.on + * @publicName on(element, eventName, selector, handler) + * @namespace DevExpress.common.core.events + * @public + */ +export function on(element: Element | Array, eventName: string, selector: string, handler: Function): void; + +/** + * @docid eventsMethods.one + * @publicName one(element, eventName, data, handler) + * @namespace DevExpress.common.core.events + * @param3 data:object + * @public + */ +export function one(element: Element | Array, eventName: string, data: any, handler: Function): void; + +/** + * @docid eventsMethods.one + * @publicName one(element, eventName, handler) + * @namespace DevExpress.common.core.events + * @public + */ +export function one(element: Element | Array, eventName: string, handler: Function): void; + +/** + * @docid eventsMethods.one + * @publicName one(element, eventName, selector, data, handler) + * @namespace DevExpress.common.core.events + * @param4 data:object + * @public + */ +export function one(element: Element | Array, eventName: string, selector: string, data: any, handler: Function): void; + +/** + * @docid eventsMethods.one + * @publicName one(element, eventName, selector, handler) + * @namespace DevExpress.common.core.events + * @public + */ +export function one(element: Element | Array, eventName: string, selector: string, handler: Function): void; + +/** + * @docid eventsMethods.trigger + * @publicName trigger(element, event) + * @namespace DevExpress.common.core.events + * @param2 event:string|event + * @public + */ +export function trigger(element: Element | Array, event: string | DxEvent): void; + +/** + * @docid eventsMethods.trigger + * @publicName trigger(element, event, extraParameters) + * @namespace DevExpress.common.core.events + * @param2 event:string|event + * @param3 extraParameters:object + * @public + */ +export function trigger(element: Element | Array, event: string | DxEvent, extraParameters: any): void; diff --git a/packages/devextreme/js/common/core/events.js b/packages/devextreme/js/common/core/events.js new file mode 100644 index 000000000000..c28aa6b6dc60 --- /dev/null +++ b/packages/devextreme/js/common/core/events.js @@ -0,0 +1,25 @@ +import eventsEngine from './events/core/events_engine'; + +/** +* @name events +*/ + + +export const on = eventsEngine.on; + +export const one = eventsEngine.one; +export const off = eventsEngine.off; +export const trigger = eventsEngine.trigger; + +/** +* @name events.Event +* @type function +* @param1 source:string|event +* @param2 config:object +* @return event +* @module events +* @export Event +* @hidden +*/ + +export const Event = eventsEngine.Event; diff --git a/packages/devextreme/js/common/core/events/click.d.ts b/packages/devextreme/js/common/core/events/click.d.ts new file mode 100644 index 000000000000..6e7c4e0d9c89 --- /dev/null +++ b/packages/devextreme/js/common/core/events/click.d.ts @@ -0,0 +1 @@ +export const name = 'dxclick'; diff --git a/packages/devextreme/js/common/core/events/click.js b/packages/devextreme/js/common/core/events/click.js new file mode 100644 index 000000000000..e8f6d2b71543 --- /dev/null +++ b/packages/devextreme/js/common/core/events/click.js @@ -0,0 +1,8 @@ +/** + * @name UI Events.dxclick + * @type eventType + * @type_function_param1 event:event + * @module events/click +*/ + +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 new file mode 100644 index 000000000000..fbc7d931c96a --- /dev/null +++ b/packages/devextreme/js/common/core/events/contextmenu.js @@ -0,0 +1,8 @@ +/** + * @name UI Events.dxcontextmenu + * @type eventType + * @type_function_param1 event:event + * @module events/contextmenu +*/ + +export * from '../../../__internal/events/m_contextmenu'; diff --git a/packages/devextreme/js/events/core.js b/packages/devextreme/js/common/core/events/core.js similarity index 100% rename from packages/devextreme/js/events/core.js rename to packages/devextreme/js/common/core/events/core.js diff --git a/packages/devextreme/js/common/core/events/core/emitter.feedback.js b/packages/devextreme/js/common/core/events/core/emitter.feedback.js new file mode 100644 index 000000000000..f9bd36072953 --- /dev/null +++ b/packages/devextreme/js/common/core/events/core/emitter.feedback.js @@ -0,0 +1 @@ +export * from '../../../../__internal/events/core/m_emitter.feedback'; diff --git a/packages/devextreme/js/common/core/events/core/emitter.js b/packages/devextreme/js/common/core/events/core/emitter.js new file mode 100644 index 000000000000..16a98780423c --- /dev/null +++ b/packages/devextreme/js/common/core/events/core/emitter.js @@ -0,0 +1 @@ +export { default } from '../../../../__internal/events/core/m_emitter'; diff --git a/packages/devextreme/js/common/core/events/core/emitter_registrator.js b/packages/devextreme/js/common/core/events/core/emitter_registrator.js new file mode 100644 index 000000000000..a58da303773d --- /dev/null +++ b/packages/devextreme/js/common/core/events/core/emitter_registrator.js @@ -0,0 +1 @@ +export { default } from '../../../../__internal/events/core/m_emitter_registrator'; diff --git a/packages/devextreme/js/common/core/events/core/event_registrator.js b/packages/devextreme/js/common/core/events/core/event_registrator.js new file mode 100644 index 000000000000..79d9f9c3afee --- /dev/null +++ b/packages/devextreme/js/common/core/events/core/event_registrator.js @@ -0,0 +1 @@ +export { default } from '../../../../__internal/events/core/m_event_registrator'; diff --git a/packages/devextreme/js/common/core/events/core/event_registrator_callbacks.js b/packages/devextreme/js/common/core/events/core/event_registrator_callbacks.js new file mode 100644 index 000000000000..186b84d66c72 --- /dev/null +++ b/packages/devextreme/js/common/core/events/core/event_registrator_callbacks.js @@ -0,0 +1,3 @@ +import MemorizedCallbacks from '../../../../core/memorized_callbacks'; + +export default new MemorizedCallbacks(); diff --git a/packages/devextreme/js/common/core/events/core/events_engine.d.ts b/packages/devextreme/js/common/core/events/core/events_engine.d.ts new file mode 100644 index 000000000000..6fa6b862e6d5 --- /dev/null +++ b/packages/devextreme/js/common/core/events/core/events_engine.d.ts @@ -0,0 +1,11 @@ +type EventsEngineType = { + on(element: any, eventName: any, handler: any, options?: any): void; + off(element: any, eventName?: any, handler?: any): void; + one(element: any, eventName: any, handler: any, options?: any): void; + set(eventEngine: any): void; + triggerHandler(element: any, opts: Record): void; +}; + +declare const eventsEngine: EventsEngineType; +export function set(eventEngine: any): void; +export default eventsEngine; diff --git a/packages/devextreme/js/common/core/events/core/events_engine.js b/packages/devextreme/js/common/core/events/core/events_engine.js new file mode 100644 index 000000000000..a054da76531c --- /dev/null +++ b/packages/devextreme/js/common/core/events/core/events_engine.js @@ -0,0 +1 @@ +export { default } from '../../../../__internal/events/core/m_events_engine'; diff --git a/packages/devextreme/js/common/core/events/core/hook_touch_props.js b/packages/devextreme/js/common/core/events/core/hook_touch_props.js new file mode 100644 index 000000000000..38903edf8c54 --- /dev/null +++ b/packages/devextreme/js/common/core/events/core/hook_touch_props.js @@ -0,0 +1 @@ +export { default } from '../../../../__internal/events/core/m_hook_touch_props'; diff --git a/packages/devextreme/js/common/core/events/core/keyboard_processor.js b/packages/devextreme/js/common/core/events/core/keyboard_processor.js new file mode 100644 index 000000000000..bcb1a25c2576 --- /dev/null +++ b/packages/devextreme/js/common/core/events/core/keyboard_processor.js @@ -0,0 +1 @@ +export { default } from '../../../../__internal/events/core/m_keyboard_processor'; diff --git a/packages/devextreme/js/common/core/events/core/wheel.js b/packages/devextreme/js/common/core/events/core/wheel.js new file mode 100644 index 000000000000..0c94207e4c62 --- /dev/null +++ b/packages/devextreme/js/common/core/events/core/wheel.js @@ -0,0 +1 @@ +export * from '../../../../__internal/events/core/m_wheel'; diff --git a/packages/devextreme/js/common/core/events/dblclick.js b/packages/devextreme/js/common/core/events/dblclick.js new file mode 100644 index 000000000000..756e4fe2e74c --- /dev/null +++ b/packages/devextreme/js/common/core/events/dblclick.js @@ -0,0 +1,11 @@ +/** + * @name UI Events.dxdblclick + * @type eventType + * @type_function_param1 event:event + * @module events/dblclick +*/ + +// 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. +import * as dblclick from './double_click'; + +export default dblclick; diff --git a/packages/devextreme/js/events/double_click.js b/packages/devextreme/js/common/core/events/double_click.js similarity index 59% rename from packages/devextreme/js/events/double_click.js rename to packages/devextreme/js/common/core/events/double_click.js index 3e0cf4edb96e..6b14a60f2ffb 100644 --- a/packages/devextreme/js/events/double_click.js +++ b/packages/devextreme/js/common/core/events/double_click.js @@ -1,4 +1,4 @@ -import { name, dblClick } from '../__internal/events/m_dblclick'; +import { name, dblClick } from '../../../__internal/events/m_dblclick'; import registerEvent from './core/event_registrator'; registerEvent(name, dblClick); diff --git a/packages/devextreme/js/common/core/events/drag.js b/packages/devextreme/js/common/core/events/drag.js new file mode 100644 index 000000000000..9a3b67fda0ea --- /dev/null +++ b/packages/devextreme/js/common/core/events/drag.js @@ -0,0 +1,45 @@ +/** +* @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 +*/ +/** +* @name UI Events.dxdragleave +* @type eventType +* @type_function_param1 event:event +* @type_function_param1_field1 draggingElement:Element +* @module events/drag +*/ +/** + * @name UI Events.dxdragstart + * @type eventType + * @type_function_param1 event:event + * @type_function_param1_field1 cancel:boolean + * @module events/drag +*/ +/** + * @name UI Events.dxdrag + * @type eventType + * @type_function_param1 event:event + * @type_function_param1_field1 offset:number + * @type_function_param1_field2 cancel:boolean + * @module events/drag +*/ +/** + * @name UI Events.dxdragend + * @type eventType + * @type_function_param1 event:event + * @type_function_param1_field1 offset:number + * @type_function_param1_field2 cancel:boolean + * @module events/drag +*/ +export * from '../../../__internal/events/m_drag'; diff --git a/packages/devextreme/js/common/core/events/gesture/emitter.gesture.js b/packages/devextreme/js/common/core/events/gesture/emitter.gesture.js new file mode 100644 index 000000000000..289513d8018d --- /dev/null +++ b/packages/devextreme/js/common/core/events/gesture/emitter.gesture.js @@ -0,0 +1 @@ +export { default } from '../../../../__internal/events/gesture/m_emitter.gesture'; diff --git a/packages/devextreme/js/common/core/events/gesture/emitter.gesture.scroll.js b/packages/devextreme/js/common/core/events/gesture/emitter.gesture.scroll.js new file mode 100644 index 000000000000..dccab6bcd841 --- /dev/null +++ b/packages/devextreme/js/common/core/events/gesture/emitter.gesture.scroll.js @@ -0,0 +1 @@ +export { default } from '../../../../__internal/events/gesture/m_emitter.gesture.scroll'; diff --git a/packages/devextreme/js/common/core/events/gesture/swipeable.js b/packages/devextreme/js/common/core/events/gesture/swipeable.js new file mode 100644 index 000000000000..7ad8476f5ecb --- /dev/null +++ b/packages/devextreme/js/common/core/events/gesture/swipeable.js @@ -0,0 +1 @@ +export { default } from '../../../../__internal/events/gesture/m_swipeable'; diff --git a/packages/devextreme/js/common/core/events/hold.js b/packages/devextreme/js/common/core/events/hold.js new file mode 100644 index 000000000000..f3370e430a6c --- /dev/null +++ b/packages/devextreme/js/common/core/events/hold.js @@ -0,0 +1,8 @@ +/** + * @name UI Events.dxhold + * @type eventType + * @type_function_param1 event:event + * @module events/hold +*/ + +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 new file mode 100644 index 000000000000..54da4e40155a --- /dev/null +++ b/packages/devextreme/js/common/core/events/hover.js @@ -0,0 +1,15 @@ +/** + * @name UI Events.dxhoverstart + * @type eventType + * @type_function_param1 event:event + * @module events/hover +*/ + +/** + * @name UI Events.dxhoverend + * @type eventType + * @type_function_param1 event:event + * @module events/hover +*/ + +export * from '../../../__internal/events/m_hover'; diff --git a/packages/devextreme/js/common/core/events/pointer.d.ts b/packages/devextreme/js/common/core/events/pointer.d.ts new file mode 100644 index 000000000000..ff3746f47ef4 --- /dev/null +++ b/packages/devextreme/js/common/core/events/pointer.d.ts @@ -0,0 +1,12 @@ +type Pointer = { + down: 'dxpointerdown'; + up: 'dxpointerup'; + move: 'dxpointermove'; + cancel: 'dxpointercancel'; + enter: 'dxpointerenter'; + leave: 'dxpointerleave'; + over: 'dxpointerover'; + out: 'dxpointerout'; +}; +declare const pointer: Pointer; +export default pointer; diff --git a/packages/devextreme/js/common/core/events/pointer.js b/packages/devextreme/js/common/core/events/pointer.js new file mode 100644 index 000000000000..6293482e3f40 --- /dev/null +++ b/packages/devextreme/js/common/core/events/pointer.js @@ -0,0 +1,58 @@ +/** + * @name UI Events.dxpointerdown + * @type eventType + * @type_function_param1 event:event + * @type_function_param1_field1 pointerType:string + * @module events/pointer +*/ +/** + * @name UI Events.dxpointermove + * @type eventType + * @type_function_param1 event:event + * @type_function_param1_field1 pointerType:string + * @module events/pointer +*/ +/** + * @name UI Events.dxpointerup + * @type eventType + * @type_function_param1 event:event + * @type_function_param1_field1 pointerType:string + * @module events/pointer +*/ +/** + * @name UI Events.dxpointercancel + * @type eventType + * @type_function_param1 event:event + * @type_function_param1_field1 pointerType:string + * @module events/pointer +*/ +/** + * @name UI Events.dxpointerover + * @type eventType + * @type_function_param1 event:event + * @type_function_param1_field1 pointerType:string + * @module events/pointer +*/ +/** + * @name UI Events.dxpointerout + * @type eventType + * @type_function_param1 event:event + * @type_function_param1_field1 pointerType:string + * @module events/pointer +*/ +/** + * @name UI Events.dxpointerenter + * @type eventType + * @type_function_param1 event:event + * @type_function_param1_field1 pointerType:string + * @module events/pointer +*/ +/** + * @name UI Events.dxpointerleave + * @type eventType + * @type_function_param1 event:event + * @type_function_param1_field1 pointerType:string + * @module events/pointer +*/ + +export { default } from '../../../__internal/events/m_pointer'; diff --git a/packages/devextreme/js/common/core/events/pointer/base.js b/packages/devextreme/js/common/core/events/pointer/base.js new file mode 100644 index 000000000000..5d381e0b1bd7 --- /dev/null +++ b/packages/devextreme/js/common/core/events/pointer/base.js @@ -0,0 +1 @@ +export { default } from '../../../../__internal/events/pointer/m_base'; diff --git a/packages/devextreme/js/common/core/events/pointer/mouse.js b/packages/devextreme/js/common/core/events/pointer/mouse.js new file mode 100644 index 000000000000..ea5914c7618d --- /dev/null +++ b/packages/devextreme/js/common/core/events/pointer/mouse.js @@ -0,0 +1 @@ +export { default } from '../../../../__internal/events/pointer/m_mouse'; diff --git a/packages/devextreme/js/common/core/events/pointer/mouse_and_touch.js b/packages/devextreme/js/common/core/events/pointer/mouse_and_touch.js new file mode 100644 index 000000000000..1b08169cfa1b --- /dev/null +++ b/packages/devextreme/js/common/core/events/pointer/mouse_and_touch.js @@ -0,0 +1 @@ +export { default } from '../../../../__internal/events/pointer/m_mouse_and_touch'; diff --git a/packages/devextreme/js/common/core/events/pointer/observer.js b/packages/devextreme/js/common/core/events/pointer/observer.js new file mode 100644 index 000000000000..23d7d02347de --- /dev/null +++ b/packages/devextreme/js/common/core/events/pointer/observer.js @@ -0,0 +1 @@ +export { default } from '../../../../__internal/events/pointer/m_observer'; diff --git a/packages/devextreme/js/common/core/events/pointer/touch.js b/packages/devextreme/js/common/core/events/pointer/touch.js new file mode 100644 index 000000000000..340b3fea5bbf --- /dev/null +++ b/packages/devextreme/js/common/core/events/pointer/touch.js @@ -0,0 +1 @@ +export { default } from '../../../../__internal/events/pointer/m_touch'; diff --git a/packages/devextreme/js/common/core/events/remove.js b/packages/devextreme/js/common/core/events/remove.js new file mode 100644 index 000000000000..8c8d8ad142d9 --- /dev/null +++ b/packages/devextreme/js/common/core/events/remove.js @@ -0,0 +1,8 @@ +/** + * @name UI Events.dxremove + * @type eventType + * @type_function_param1 event:event + * @module events/remove +*/ + +export * from '../../../__internal/events/m_remove'; diff --git a/packages/devextreme/js/common/core/events/short.js b/packages/devextreme/js/common/core/events/short.js new file mode 100644 index 000000000000..0520fdf01641 --- /dev/null +++ b/packages/devextreme/js/common/core/events/short.js @@ -0,0 +1 @@ +export * from '../../../__internal/events/m_short'; diff --git a/packages/devextreme/js/common/core/events/swipe.js b/packages/devextreme/js/common/core/events/swipe.js new file mode 100644 index 000000000000..a65c8d786508 --- /dev/null +++ b/packages/devextreme/js/common/core/events/swipe.js @@ -0,0 +1,25 @@ +/** + * @name UI Events.dxswipestart + * @type eventType + * @type_function_param1 event:event + * @type_function_param1_field1 cancel:boolean + * @module events/swipe +*/ +/** + * @name UI Events.dxswipe + * @type eventType + * @type_function_param1 event:event + * @type_function_param1_field1 offset:number + * @type_function_param1_field2 cancel:boolean + * @module events/swipe +*/ +/** + * @name UI Events.dxswipeend + * @type eventType + * @type_function_param1 event:event + * @type_function_param1_field1 offset:number + * @type_function_param1_field2 targetOffset:number + * @module events/swipe +*/ + +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 new file mode 100644 index 000000000000..a93e6d82b40b --- /dev/null +++ b/packages/devextreme/js/common/core/events/transform.js @@ -0,0 +1,133 @@ +import { exportNames } from '../../../__internal/events/m_transform'; + +/** + * @name UI Events.dxtransformstart + * @type eventType + * @type_function_param1 event:event + * @type_function_param1_field1 cancel:boolean + * @module events/transform +*/ +/** + * @name UI Events.dxtransform + * @type eventType + * @type_function_param1 event:event + * @type_function_param1_field1 scale:number + * @type_function_param1_field2 deltaScale:number + * @type_function_param1_field3 rotation:number + * @type_function_param1_field4 deltaRotation:number + * @type_function_param1_field5 translation:object + * @type_function_param1_field6 deltaTranslation:object + * @type_function_param1_field7 cancel:boolean + * @module events/transform +*/ +/** + * @name UI Events.dxtransformend + * @type eventType + * @type_function_param1 event:event + * @type_function_param1_field1 scale:number + * @type_function_param1_field2 deltaScale:number + * @type_function_param1_field3 rotation:number + * @type_function_param1_field4 deltaRotation:number + * @type_function_param1_field5 translation:object + * @type_function_param1_field6 deltaTranslation:object + * @type_function_param1_field7 cancel:boolean + * @module events/transform +*/ + +/** + * @name UI Events.dxtranslatestart + * @type eventType + * @type_function_param1 event:event + * @type_function_param1_field1 cancel:boolean + * @module events/transform +*/ +/** + * @name UI Events.dxtranslate + * @type eventType + * @type_function_param1 event:event + * @type_function_param1_field1 translation:object + * @type_function_param1_field2 deltaTranslation:object + * @type_function_param1_field3 cancel:boolean + * @module events/transform +*/ +/** + * @name UI Events.dxtranslateend + * @type eventType + * @type_function_param1 event:event + * @type_function_param1_field1 translation:object + * @type_function_param1_field2 deltaTranslation:object + * @type_function_param1_field3 cancel:boolean + * @module events/transform +*/ + +/** +* @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 + * @type_function_param1 event:event + * @type_function_param1_field1 scale:number + * @type_function_param1_field2 deltaScale:number + * @type_function_param1_field3 cancel:boolean + * @module events/transform +*/ +/** + * @name UI Events.dxpinchend + * @type eventType + * @type_function_param1 event:event + * @type_function_param1_field1 scale:number + * @type_function_param1_field2 deltaScale:number + * @type_function_param1_field3 cancel:boolean + * @module events/transform +*/ + +/** + * @name UI Events.dxrotatestart + * @type eventType + * @type_function_param1 event:event + * @type_function_param1_field1 cancel:boolean + * @module events/transform +*/ +/** + * @name UI Events.dxrotate + * @type eventType + * @type_function_param1 event:event + * @type_function_param1_field1 rotation:number + * @type_function_param1_field2 deltaRotation:number + * @type_function_param1_field3 cancel:boolean + * @module events/transform +*/ +/** + * @name UI Events.dxrotateend + * @type eventType + * @type_function_param1 event:event + * @type_function_param1_field1 rotation:number + * @type_function_param1_field2 deltaRotation:number + * @type_function_param1_field3 cancel:boolean + * @module events/transform +*/ + +/* eslint-disable spellcheck/spell-checker */ +export const { + transformstart, + transform, + transformend, + translatestart, + translate, + translateend, + zoomstart, + zoom, + zoomend, + pinchstart, + pinch, + pinchend, + rotatestart, + rotate, + rotateend, +} = exportNames; + diff --git a/packages/devextreme/js/common/core/events/utils/add_namespace.js b/packages/devextreme/js/common/core/events/utils/add_namespace.js new file mode 100644 index 000000000000..3adbbc2f4233 --- /dev/null +++ b/packages/devextreme/js/common/core/events/utils/add_namespace.js @@ -0,0 +1 @@ +export { default } from '../../../../__internal/events/utils/m_add_namespace'; diff --git a/packages/devextreme/js/common/core/events/utils/event_nodes_disposing.js b/packages/devextreme/js/common/core/events/utils/event_nodes_disposing.js new file mode 100644 index 000000000000..fee24fce3ef6 --- /dev/null +++ b/packages/devextreme/js/common/core/events/utils/event_nodes_disposing.js @@ -0,0 +1 @@ +export * from '../../../../__internal/events/utils/m_event_nodes_disposing'; diff --git a/packages/devextreme/js/common/core/events/utils/event_target.js b/packages/devextreme/js/common/core/events/utils/event_target.js new file mode 100644 index 000000000000..f384e1acc1a7 --- /dev/null +++ b/packages/devextreme/js/common/core/events/utils/event_target.js @@ -0,0 +1 @@ +export * from '../../../../__internal/events/utils/m_event_target'; diff --git a/packages/devextreme/js/common/core/events/utils/index.d.ts b/packages/devextreme/js/common/core/events/utils/index.d.ts new file mode 100644 index 000000000000..52301813f8ce --- /dev/null +++ b/packages/devextreme/js/common/core/events/utils/index.d.ts @@ -0,0 +1,21 @@ +type eventTypes = 'dx' | 'other' | 'pointer' | 'mouse' | 'dxmousewheel' | 'touch' | 'keyboard'; +export function eventSource(arg: { type: string }): eventTypes; +export function isPointerEvent(arg: { type: string }): boolean; +export function isMouseEvent(arg: { type: string }): boolean; +export function isDxMouseWheelEvent(arg: { type: string }): boolean; +export function isTouchEvent(arg: { type: string }): boolean; +export function isKeyboardEvent(arg: { type: string }): boolean; +export function isFakeClickEvent(arg: { screenX: number; offsetX: number; pageX: number }): boolean; +export function eventData(arg: { pageX: number; pageY: number; timeStamp: number }): { x: number; y: number; time: number }; +export function eventDelta(from: number, to: number): { x: number; y: number; time: number }; +export function hasTouches(e: { type: string; pointers?: ArrayLike; originalEvent: { touches?: ArrayLike } }): number; +export function forceSkipEvents(): boolean; +export function stopEventsSkipping(): boolean; +export function needSkipEvent(e: { target?: any; type: string }): boolean; +export function setEventFixMethod(func: any): void; +export function createEvent(originalEvent: any, args?: any): any; +export function fireEvent(arg: { originalEvent: any; delegateTarget?: any; type?: any; target?: any }): any; +export function normalizeKeyName(arg: { key?: string; which?: string | number }): string | undefined; +export function getChar(arg: { key?: string; which: string | number }): string; +export function addNamespace(eventNames: Array | string, namespace: string): string; +export function isCommandKeyPressed(arg: { ctrlKey: boolean; metaKey: boolean }): boolean; diff --git a/packages/devextreme/js/common/core/events/utils/index.js b/packages/devextreme/js/common/core/events/utils/index.js new file mode 100644 index 000000000000..a486606d05b0 --- /dev/null +++ b/packages/devextreme/js/common/core/events/utils/index.js @@ -0,0 +1 @@ +export * from '../../../../__internal/events/utils/index'; diff --git a/packages/devextreme/js/common/core/events/visibility_change.js b/packages/devextreme/js/common/core/events/visibility_change.js new file mode 100644 index 000000000000..93ea077c6d9a --- /dev/null +++ b/packages/devextreme/js/common/core/events/visibility_change.js @@ -0,0 +1,7 @@ +import VisibilityChangeModule from '../../../__internal/events/m_visibility_change'; + +export const triggerShownEvent = VisibilityChangeModule.triggerShownEvent; +export const triggerHidingEvent = VisibilityChangeModule.triggerHidingEvent; +export const triggerResizeEvent = VisibilityChangeModule.triggerResizeEvent; + +export default VisibilityChangeModule; diff --git a/packages/devextreme/js/common/core/localization.d.ts b/packages/devextreme/js/common/core/localization.d.ts new file mode 100644 index 000000000000..cc9d92092845 --- /dev/null +++ b/packages/devextreme/js/common/core/localization.d.ts @@ -0,0 +1,135 @@ +import { Format as FormatType } from '../../common'; + +/** + * @docid localization.formatDate + * @publicName formatDate(value, format) + * @static + * @namespace DevExpress.common.core.localization + * @public + */ +export function formatDate(value: Date, format: Format): string; + +/** + * @docid localization.formatMessage + * @publicName formatMessage(key, value) + * @param2 value:string|Array + * @static + * @namespace DevExpress.common.core.localization + * @public + */ +export function formatMessage(key: string, ...values: Array): string; + +/** + * @docid localization.formatNumber + * @publicName formatNumber(value, format) + * @static + * @namespace DevExpress.common.core.localization + * @public + */ +export function formatNumber(value: number, format: Format): string; + +/** + * @docid localization.loadMessages + * @publicName loadMessages(messages) + * @param1 messages:object + * @static + * @namespace DevExpress.common.core.localization + * @public + */ +export function loadMessages(messages: any): void; + +/** + * @docid localization.locale + * @publicName locale() + * @static + * @namespace DevExpress.common.core.localization + * @public + */ +export function locale(): string; + +/** + * @docid localization.locale + * @publicName locale(locale) + * @static + * @namespace DevExpress.common.core.localization + * @public + */ +// eslint-disable-next-line @typescript-eslint/no-shadow +export function locale(locale: string): void; + +/** + * @docid localization.parseDate + * @publicName parseDate(text, format) + * @static + * @namespace DevExpress.common.core.localization + * @public + */ +export function parseDate(text: string, format: Format): Date; + +/** + * @docid localization.parseNumber + * @publicName parseNumber(text, format) + * @static + * @namespace DevExpress.common.core.localization + * @public + */ +export function parseNumber(text: string, format: Format): number; + +type ExternalFormat = + Intl.DateTimeFormatOptions | + Intl.NumberFormatOptions; + +type PredefinedFormat = FormatType; + +/** + * @docid + * @type Object|Enums.Format|string|function + * @default undefined + * @section Common + * @namespace DevExpress.common.core.localization + * @public + */ +export type Format = + FormatObject | + PredefinedFormat | + string | + ((value: number | Date) => string) | + ((value: Date) => string) | + ((value: number) => string) | + ExternalFormat | undefined; + +export interface FormatObject { + /** + * @docid Format.currency + * @public + */ + currency?: string; + /** + * @docid Format.useCurrencyAccountingStyle + * @type boolean + * @default true + * @public + */ + useCurrencyAccountingStyle?: boolean; + /** + * @docid Format.formatter + * @public + */ + formatter?: ((value: number | Date) => string); + /** + * @docid Format.parser + * @public + */ + parser?: ((value: string) => number | Date); + /** + * @docid Format.precision + * @public + */ + precision?: number; + /** + * @docid Format.type + * @public + * @type Enums.Format|string + */ + type?: PredefinedFormat | string; +} diff --git a/packages/devextreme/js/common/core/localization.js b/packages/devextreme/js/common/core/localization.js new file mode 100644 index 000000000000..e865a740c75f --- /dev/null +++ b/packages/devextreme/js/common/core/localization.js @@ -0,0 +1,32 @@ +import core from './localization/core'; +import message from './localization/message'; +import number from './localization/number'; +import date from './localization/date'; +import './localization/currency'; + +/** + * @name localization + */ + +export const locale = core.locale.bind(core); + +export const loadMessages = message.load.bind(message); +export const formatMessage = message.format.bind(message); +export const formatNumber = number.format.bind(number); +export const parseNumber = number.parse.bind(number); +export const formatDate = date.format.bind(date); +export const parseDate = date.parse.bind(date); +export { + message, + number, + date +}; + +export function disableIntl() { + if(number.engine() === 'intl') { + number.resetInjection(); + } + if(date.engine() === 'intl') { + date.resetInjection(); + } +} diff --git a/packages/devextreme/js/common/core/localization/core.js b/packages/devextreme/js/common/core/localization/core.js new file mode 100644 index 000000000000..7887125559e6 --- /dev/null +++ b/packages/devextreme/js/common/core/localization/core.js @@ -0,0 +1,41 @@ +import dependencyInjector from '../../../core/utils/dependency_injector'; +import parentLocales from './cldr-data/parent_locales'; +import getParentLocale from './parentLocale'; + +const DEFAULT_LOCALE = 'en'; + +export default dependencyInjector({ + locale: (() => { + let currentLocale = DEFAULT_LOCALE; + + return locale => { + if(!locale) { + return currentLocale; + } + + currentLocale = locale; + }; + })(), + + getValueByClosestLocale: function(getter) { + let locale = this.locale(); + let value = getter(locale); + let isRootLocale; + + while(!value && !isRootLocale) { + locale = getParentLocale(parentLocales, locale); + + if(locale) { + value = getter(locale); + } else { + isRootLocale = true; + } + } + + if(value === undefined && locale !== DEFAULT_LOCALE) { + return getter(DEFAULT_LOCALE); + } + + return value; + } +}); diff --git a/packages/devextreme/js/common/core/localization/currency.js b/packages/devextreme/js/common/core/localization/currency.js new file mode 100644 index 000000000000..9e3cc67301cf --- /dev/null +++ b/packages/devextreme/js/common/core/localization/currency.js @@ -0,0 +1,24 @@ +import { extend } from '../../../core/utils/extend'; + +export default { + _formatNumberCore: function(value, format, formatConfig) { + if(format === 'currency') { + formatConfig.precision = formatConfig.precision || 0; + + let result = this.format(value, extend({}, formatConfig, { type: 'fixedpoint' })); + const currencyPart = this.getCurrencySymbol().symbol.replace(/\$/g, '$$$$'); + + result = result.replace(/^(\D*)(\d.*)/, '$1' + currencyPart + '$2'); + + return result; + } + + return this.callBase.apply(this, arguments); + }, + getCurrencySymbol: function() { + return { symbol: '$' }; + }, + getOpenXmlCurrencyFormat: function() { + return '$#,##0{0}_);\\($#,##0{0}\\)'; + } +}; diff --git a/packages/devextreme/js/common/core/localization/date.d.ts b/packages/devextreme/js/common/core/localization/date.d.ts new file mode 100644 index 000000000000..8668641dfbc3 --- /dev/null +++ b/packages/devextreme/js/common/core/localization/date.d.ts @@ -0,0 +1,12 @@ +import { Format as LocalizationFormat } from '../localization'; + +type Format = 'abbreviated' | 'short' | 'narrow'; + +interface DateLocalization { + firstDayOfWeekIndex(): number; + format(date?: Date, format?: LocalizationFormat): string | Date | undefined; + getDayNames(format?: Format): string[]; + getMonthNames(format?: Format): string[]; +} +declare const dateLocalization: DateLocalization; +export default dateLocalization; diff --git a/packages/devextreme/js/common/core/localization/date.js b/packages/devextreme/js/common/core/localization/date.js new file mode 100644 index 000000000000..4b5a29ed137c --- /dev/null +++ b/packages/devextreme/js/common/core/localization/date.js @@ -0,0 +1,196 @@ +import dependencyInjector from '../../../core/utils/dependency_injector'; +import { isString } from '../../../core/utils/type'; +import { each } from '../../../core/utils/iterator'; +import errors from '../../../core/errors'; +import { getFormatter as getLDMLDateFormatter } from './ldml/date.formatter'; +import { getFormat as getLDMLDateFormat } from './ldml/date.format'; +import { getParser as getLDMLDateParser } from './ldml/date.parser'; +import defaultDateNames from './default_date_names'; +import firstDayOfWeekData from './cldr-data/first_day_of_week_data'; +import localizationCore from './core'; +import numberLocalization from './number'; +import intlDateLocalization from './intl/date'; + +const DEFAULT_DAY_OF_WEEK_INDEX = 0; +const hasIntl = typeof Intl !== 'undefined'; + +const FORMATS_TO_PATTERN_MAP = { + 'shortdate': 'M/d/y', + 'shorttime': 'h:mm a', + 'longdate': 'EEEE, MMMM d, y', + 'longtime': 'h:mm:ss a', + 'monthandday': 'MMMM d', + 'monthandyear': 'MMMM y', + 'quarterandyear': 'QQQ y', + 'day': 'd', + 'year': 'y', + 'shortdateshorttime': 'M/d/y, h:mm a', + 'longdatelongtime': 'EEEE, MMMM d, y, h:mm:ss a', + 'month': 'LLLL', + 'shortyear': 'yy', + 'dayofweek': 'EEEE', + 'quarter': 'QQQ', + 'hour': 'HH', + 'minute': 'mm', + 'second': 'ss', + 'millisecond': 'SSS', + 'datetime-local': 'yyyy-MM-ddTHH\':\'mm\':\'ss' +}; + +const possiblePartPatterns = { + year: ['y', 'yy', 'yyyy'], + day: ['d', 'dd'], + month: ['M', 'MM', 'MMM', 'MMMM'], + hours: ['H', 'HH', 'h', 'hh', 'ah'], + minutes: ['m', 'mm'], + seconds: ['s', 'ss'], + milliseconds: ['S', 'SS', 'SSS'] +}; + +const dateLocalization = dependencyInjector({ + engine: function() { + return 'base'; + }, + _getPatternByFormat: function(format) { + return FORMATS_TO_PATTERN_MAP[format.toLowerCase()]; + }, + _expandPattern: function(pattern) { + return this._getPatternByFormat(pattern) || pattern; + }, + formatUsesMonthName: function(format) { + return this._expandPattern(format).indexOf('MMMM') !== -1; + }, + + formatUsesDayName: function(format) { + return this._expandPattern(format).indexOf('EEEE') !== -1; + }, + getFormatParts: function(format) { + const pattern = this._getPatternByFormat(format) || format; + const result = []; + + each(pattern.split(/\W+/), (_, formatPart) => { + each(possiblePartPatterns, (partName, possiblePatterns) => { + if(possiblePatterns.includes(formatPart)) { + result.push(partName); + } + }); + }); + + return result; + }, + getMonthNames: function(format) { + return defaultDateNames.getMonthNames(format); + }, + getDayNames: function(format) { + return defaultDateNames.getDayNames(format); + }, + getQuarterNames: function(format) { + return defaultDateNames.getQuarterNames(format); + }, + getPeriodNames: function(format) { + return defaultDateNames.getPeriodNames(format); + }, + getTimeSeparator: function() { + return ':'; + }, + + is24HourFormat: function(format) { + const amTime = new Date(2017, 0, 20, 11, 0, 0, 0); + const pmTime = new Date(2017, 0, 20, 23, 0, 0, 0); + const amTimeFormatted = this.format(amTime, format); + const pmTimeFormatted = this.format(pmTime, format); + + for(let i = 0; i < amTimeFormatted.length; i++) { + if(amTimeFormatted[i] !== pmTimeFormatted[i]) { + return !isNaN(parseInt(amTimeFormatted[i])); + } + } + }, + + format: function(date, format) { + if(!date) { + return; + } + + if(!format) { + return date; + } + + let formatter; + + if(typeof (format) === 'function') { + formatter = format; + } else if(format.formatter) { + formatter = format.formatter; + } else { + format = format.type || format; + if(isString(format)) { + format = FORMATS_TO_PATTERN_MAP[format.toLowerCase()] || format; + return numberLocalization.convertDigits(getLDMLDateFormatter(format, this)(date)); + } + } + + if(!formatter) { + // TODO: log warning or error + return; + } + + return formatter(date); + }, + + parse: function(text, format) { + const that = this; + let ldmlFormat; + let formatter; + + if(!text) { + return; + } + + if(!format) { + return this.parse(text, 'shortdate'); + } + + if(format.parser) { + return format.parser(text); + } + + if(typeof format === 'string' && !FORMATS_TO_PATTERN_MAP[format.toLowerCase()]) { + ldmlFormat = format; + } else { + formatter = value => { + const text = that.format(value, format); + return numberLocalization.convertDigits(text, true); + }; + try { + ldmlFormat = getLDMLDateFormat(formatter); + } catch(e) {} + } + + if(ldmlFormat) { + text = numberLocalization.convertDigits(text, true); + return getLDMLDateParser(ldmlFormat, this)(text); + } + + errors.log('W0012'); + const result = new Date(text); + + if(!result || isNaN(result.getTime())) { + return; + } + + return result; + }, + + firstDayOfWeekIndex: function() { + const index = localizationCore.getValueByClosestLocale((locale) => firstDayOfWeekData[locale]); + + return index === undefined ? DEFAULT_DAY_OF_WEEK_INDEX : index; + } +}); + +if(hasIntl) { + dateLocalization.inject(intlDateLocalization); +} + +export default dateLocalization; diff --git a/packages/devextreme/js/common/core/localization/default_date_names.js b/packages/devextreme/js/common/core/localization/default_date_names.js new file mode 100644 index 000000000000..8d45246eb399 --- /dev/null +++ b/packages/devextreme/js/common/core/localization/default_date_names.js @@ -0,0 +1,34 @@ +import { map } from '../../../core/utils/iterator'; + +const MONTHS = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']; +const DAYS = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; +const PERIODS = ['AM', 'PM']; +const QUARTERS = ['Q1', 'Q2', 'Q3', 'Q4']; + +// TODO: optimize +const cutCaptions = (captions, format) => { + const lengthByFormat = { + abbreviated: 3, + short: 2, + narrow: 1 + }; + + return map(captions, caption => { + return caption.substr(0, lengthByFormat[format]); + }); +}; + +export default { + getMonthNames: function(format) { + return cutCaptions(MONTHS, format); + }, + getDayNames: function(format) { + return cutCaptions(DAYS, format); + }, + getQuarterNames: function(format) { + return QUARTERS; + }, + getPeriodNames: function(format) { + return PERIODS; + } +}; diff --git a/packages/devextreme/js/common/core/localization/globalize/core.js b/packages/devextreme/js/common/core/localization/globalize/core.js new file mode 100644 index 000000000000..8c72e992e59a --- /dev/null +++ b/packages/devextreme/js/common/core/localization/globalize/core.js @@ -0,0 +1,22 @@ +// eslint-disable-next-line no-restricted-imports +import Globalize from 'globalize'; +import coreLocalization from '../core'; +import { enCldr } from '../cldr-data/en'; +import { supplementalCldr } from '../cldr-data/supplemental'; + + +if(Globalize && Globalize.load) { + if(!Globalize.locale()) { + Globalize.load(enCldr, supplementalCldr); + Globalize.locale('en'); + } + + coreLocalization.inject({ + locale: function(locale) { + if(!locale) { + return Globalize.locale().locale; + } + Globalize.locale(locale); + } + }); +} diff --git a/packages/devextreme/js/common/core/localization/globalize/currency.js b/packages/devextreme/js/common/core/localization/globalize/currency.js new file mode 100644 index 000000000000..dbeae744cb6c --- /dev/null +++ b/packages/devextreme/js/common/core/localization/globalize/currency.js @@ -0,0 +1,95 @@ +import openXmlCurrencyFormat from '../open_xml_currency_format'; +import './core'; +import './number'; +import '../currency'; +// eslint-disable-next-line no-restricted-imports, import/no-unresolved +import 'globalize/currency'; +// eslint-disable-next-line no-restricted-imports +import Globalize from 'globalize'; +import { config } from '../../../../common'; +import numberLocalization from '../number'; + +const CURRENCY_STYLES = ['symbol', 'accounting']; + +if(Globalize && Globalize.formatCurrency) { + + if(Globalize.locale().locale === 'en') { + Globalize.locale('en'); + } + + const formattersCache = {}; + + const getFormatter = (currency, format) => { + let formatter; + let formatCacheKey; + + if(typeof format === 'object') { + formatCacheKey = Globalize.locale().locale + ':' + currency + ':' + JSON.stringify(format); + } else { + formatCacheKey = Globalize.locale().locale + ':' + currency + ':' + format; + } + formatter = formattersCache[formatCacheKey]; + if(!formatter) { + formatter = formattersCache[formatCacheKey] = Globalize.currencyFormatter(currency, format); + } + + return formatter; + }; + + const globalizeCurrencyLocalization = { + _formatNumberCore: function(value, format, formatConfig) { + if(format === 'currency') { + const currency = formatConfig && formatConfig.currency || config().defaultCurrency; + return getFormatter(currency, this._normalizeFormatConfig(format, formatConfig, value))(value); + } + + return this.callBase.apply(this, arguments); + }, + _normalizeFormatConfig: function(format, formatConfig, value) { + const normalizedConfig = this.callBase(format, formatConfig, value); + + if(format === 'currency') { + const useAccountingStyle = formatConfig.useCurrencyAccountingStyle ?? config().defaultUseCurrencyAccountingStyle; + normalizedConfig.style = CURRENCY_STYLES[+useAccountingStyle]; + } + + return normalizedConfig; + }, + format: function(value, format) { + if(typeof value !== 'number') { + return value; + } + + format = this._normalizeFormat(format); + + if(format) { + if(format.currency === 'default') { + format.currency = config().defaultCurrency; + } + + if(format.type === 'currency') { + return this._formatNumber(value, this._parseNumberFormatString('currency'), format); + } else if(!format.type && format.currency) { + return getFormatter(format.currency, format)(value); + } + } + + return this.callBase.apply(this, arguments); + }, + getCurrencySymbol: function(currency) { + if(!currency) { + currency = config().defaultCurrency; + } + + return Globalize.cldr.main('numbers/currencies/' + currency); + }, + getOpenXmlCurrencyFormat: function(currency) { + const currencySymbol = this.getCurrencySymbol(currency).symbol; + const accountingFormat = Globalize.cldr.main('numbers/currencyFormats-numberSystem-latn').accounting; + + return openXmlCurrencyFormat(currencySymbol, accountingFormat); + } + }; + + numberLocalization.inject(globalizeCurrencyLocalization); +} diff --git a/packages/devextreme/js/common/core/localization/globalize/date.js b/packages/devextreme/js/common/core/localization/globalize/date.js new file mode 100644 index 000000000000..24f3e4eb5b05 --- /dev/null +++ b/packages/devextreme/js/common/core/localization/globalize/date.js @@ -0,0 +1,245 @@ +import './core'; +import './number'; +// eslint-disable-next-line no-restricted-imports, import/no-unresolved +import 'globalize/date'; + +const ACCEPTABLE_JSON_FORMAT_PROPERTIES = ['skeleton', 'date', 'time', 'datetime', 'raw']; +const RTL_MARKS_REGEX = /[\u200E\u200F]/g; + +// eslint-disable-next-line no-restricted-imports +import Globalize from 'globalize'; +import dateLocalization from '../date'; +import { isObject } from '../../../../core/utils/type'; +import * as iteratorUtils from '../../../../core/utils/iterator'; + +if(Globalize && Globalize.formatDate) { + + if(Globalize.locale().locale === 'en') { + Globalize.locale('en'); + } + + const formattersCache = {}; + + const FORMATS_TO_GLOBALIZE_MAP = { + 'shortdate': { + path: 'dateTimeFormats/availableFormats/yMd' + }, + 'shorttime': { + path: 'timeFormats/short' + }, + 'longdate': { + path: 'dateFormats/full' + }, + 'longtime': { + path: 'timeFormats/medium' + }, + 'monthandday': { + path: 'dateTimeFormats/availableFormats/MMMMd' + }, + 'monthandyear': { + path: 'dateTimeFormats/availableFormats/yMMMM' + }, + 'quarterandyear': { + path: 'dateTimeFormats/availableFormats/yQQQ' + }, + 'day': { + path: 'dateTimeFormats/availableFormats/d' + }, + 'year': { + path: 'dateTimeFormats/availableFormats/y' + }, + 'shortdateshorttime': { + path: 'dateTimeFormats/short', + parts: ['shorttime', 'shortdate'] + }, + 'longdatelongtime': { + path: 'dateTimeFormats/medium', + parts: ['longtime', 'longdate'] + }, + 'month': { + pattern: 'LLLL' + }, + 'shortyear': { + pattern: 'yy' + }, + 'dayofweek': { + pattern: 'EEEE' + }, + 'quarter': { + pattern: 'QQQ' + }, + 'millisecond': { + pattern: 'SSS' + }, + 'hour': { + pattern: 'HH' + }, + 'minute': { + pattern: 'mm' + }, + 'second': { + pattern: 'ss' + } + }; + + const globalizeDateLocalization = { + engine: function() { + return 'globalize'; + }, + + _getPatternByFormat: function(format) { + const that = this; + const lowerFormat = format.toLowerCase(); + const globalizeFormat = FORMATS_TO_GLOBALIZE_MAP[lowerFormat]; + + if(lowerFormat === 'datetime-local') { + return 'yyyy-MM-ddTHH\':\'mm\':\'ss'; + } + + if(!globalizeFormat) { + return; + } + + let result = globalizeFormat.path && that._getFormatStringByPath(globalizeFormat.path) || globalizeFormat.pattern; + + if(globalizeFormat.parts) { + iteratorUtils.each(globalizeFormat.parts, (index, part) => { + result = result.replace('{' + index + '}', that._getPatternByFormat(part)); + }); + } + return result; + }, + + _getFormatStringByPath: function(path) { + return Globalize.locale().main('dates/calendars/gregorian/' + path); + }, + + getPeriodNames: function(format, type) { + format = format || 'wide'; + type = type === 'format' ? type : 'stand-alone'; + + const json = Globalize.locale().main(`dates/calendars/gregorian/dayPeriods/${type}/${format}`); + return [json['am'], json['pm']]; + }, + + getMonthNames: function(format, type) { + const months = Globalize.locale().main('dates/calendars/gregorian/months/' + (type === 'format' ? type : 'stand-alone') + '/' + (format || 'wide')); + + return iteratorUtils.map(months, month => { return month; }); + }, + + getDayNames: function(format) { + const days = Globalize.locale().main('dates/calendars/gregorian/days/stand-alone/' + (format || 'wide')); + + return iteratorUtils.map(days, day => { return day; }); + }, + + getTimeSeparator: function() { + return Globalize.locale().main('numbers/symbols-numberSystem-latn/timeSeparator'); + }, + + removeRtlMarks(text) { + return text.replace(RTL_MARKS_REGEX, ''); + }, + + format: function(date, format) { + if(!date) { + return; + } + + if(!format) { + return date; + } + + let formatter; + let formatCacheKey; + + if(typeof (format) === 'function') { + return format(date); + } + + if(format.formatter) { + return format.formatter(date); + } + + format = format.type || format; + + if(typeof format === 'string') { + formatCacheKey = Globalize.locale().locale + ':' + format; + formatter = formattersCache[formatCacheKey]; + if(!formatter) { + format = { + raw: this._getPatternByFormat(format) || format + }; + + formatter = formattersCache[formatCacheKey] = Globalize.dateFormatter(format); + } + } else { + if(!this._isAcceptableFormat(format)) { + return; + } + + formatter = Globalize.dateFormatter(format); + } + + return this.removeRtlMarks(formatter(date)); + }, + + parse: function(text, format) { + if(!text) { + return; + } + + if(!format || typeof (format) === 'function' || isObject(format) && !this._isAcceptableFormat(format)) { + if(format) { + const parsedValue = this.callBase(text, format); + if(parsedValue) { + return parsedValue; + } + } + + return Globalize.parseDate(text); + } + + if(format.parser) { + return format.parser(text); + } + + if(typeof format === 'string') { + format = { + raw: this._getPatternByFormat(format) || format + }; + } + + const parsedDate = Globalize.parseDate(text, format); + return parsedDate ? parsedDate : this.callBase(text, format); + }, + + _isAcceptableFormat: function(format) { + if(format.parser) { + return true; + } + + for(let i = 0; i < ACCEPTABLE_JSON_FORMAT_PROPERTIES.length; i++) { + if(Object.prototype.hasOwnProperty.call(format, ACCEPTABLE_JSON_FORMAT_PROPERTIES[i])) { + return true; + } + } + }, + + firstDayOfWeekIndex: function() { + const firstDay = Globalize.locale().supplemental.weekData.firstDay(); + + return this._getDayKeys().indexOf(firstDay); + }, + + _getDayKeys: function() { + const days = Globalize.locale().main('dates/calendars/gregorian/days/format/short'); + + return iteratorUtils.map(days, (day, key) => { return key; }); + } + }; + + dateLocalization.resetInjection(); + dateLocalization.inject(globalizeDateLocalization); +} diff --git a/packages/devextreme/js/common/core/localization/globalize/message.js b/packages/devextreme/js/common/core/localization/globalize/message.js new file mode 100644 index 000000000000..4b894ef8ef3f --- /dev/null +++ b/packages/devextreme/js/common/core/localization/globalize/message.js @@ -0,0 +1,83 @@ +import './core'; + +// eslint-disable-next-line no-restricted-imports +import Globalize from 'globalize'; +import messageLocalization from '../message'; +import coreLocalization from '../core'; + +// eslint-disable-next-line no-restricted-imports, import/no-unresolved +import 'globalize/message'; + +if(Globalize && Globalize.formatMessage) { + + const DEFAULT_LOCALE = 'en'; + + const originalLoadMessages = Globalize.loadMessages; + + Globalize.loadMessages = messages => { + messageLocalization.load(messages); + }; + + const globalizeMessageLocalization = { + engine: function() { + return 'globalize'; + }, + + ctor: function() { + this.load(this._dictionary); + }, + + load: function(messages) { + this.callBase(messages); + originalLoadMessages(messages); + }, + + getMessagesByLocales: function() { + return Globalize.cldr.get('globalize-messages'); + }, + + getFormatter: function(key, locale) { + const currentLocale = locale || coreLocalization.locale(); + let formatter = this._getFormatterBase(key, locale); + + if(!formatter) { + formatter = this._formatterByGlobalize(key, locale); + } + + if(!formatter && currentLocale !== DEFAULT_LOCALE) { + formatter = this.getFormatter(key, DEFAULT_LOCALE); + } + + return formatter; + }, + + _formatterByGlobalize: function(key, locale) { + const currentGlobalize = !locale || locale === coreLocalization.locale() ? Globalize : new Globalize(locale); + let result; + + if(this._messageLoaded(key, locale)) { + result = currentGlobalize.messageFormatter(key); + } + + return result; + }, + + _messageLoaded: function(key, locale) { + const currentCldr = locale ? new Globalize(locale).cldr : Globalize.locale(); + const value = currentCldr.get(['globalize-messages/{bundle}', key]); + + return !!value; + }, + + _loadSingle: function(key, value, locale) { + const data = {}; + + data[locale] = {}; + data[locale][key] = value; + + this.load(data); + } + }; + + messageLocalization.inject(globalizeMessageLocalization); +} diff --git a/packages/devextreme/js/common/core/localization/globalize/number.js b/packages/devextreme/js/common/core/localization/globalize/number.js new file mode 100644 index 000000000000..568d9599cb8b --- /dev/null +++ b/packages/devextreme/js/common/core/localization/globalize/number.js @@ -0,0 +1,126 @@ +import './core'; +// eslint-disable-next-line no-restricted-imports +import Globalize from 'globalize'; +import numberLocalization from '../number'; +import errors from '../../../../core/errors'; + +// eslint-disable-next-line no-restricted-imports, import/no-unresolved +import 'globalize/number'; +const MAX_FRACTION_DIGITS = 20; + +if(Globalize && Globalize.formatNumber) { + if(Globalize.locale().locale === 'en') { + Globalize.locale('en'); + } + + const formattersCache = {}; + + const getFormatter = format => { + let formatter; + let formatCacheKey; + + if(typeof format === 'object') { + formatCacheKey = Globalize.locale().locale + ':' + JSON.stringify(format); + } else { + formatCacheKey = Globalize.locale().locale + ':' + format; + } + formatter = formattersCache[formatCacheKey]; + if(!formatter) { + formatter = formattersCache[formatCacheKey] = Globalize.numberFormatter(format); + } + + return formatter; + }; + + const globalizeNumberLocalization = { + engine: function() { + return 'globalize'; + }, + + _formatNumberCore: function(value, format, formatConfig) { + if(format === 'exponential') { + return this.callBase.apply(this, arguments); + } + + return getFormatter(this._normalizeFormatConfig(format, formatConfig, value))(value); + }, + _normalizeFormatConfig: function(format, formatConfig, value) { + let config; + + if(format === 'decimal') { + config = { + minimumIntegerDigits: formatConfig.precision || 1, + useGrouping: false, + minimumFractionDigits: 0, + maximumFractionDigits: MAX_FRACTION_DIGITS, + round: value < 0 ? 'ceil' : 'floor' + }; + } else { + config = this._getPrecisionConfig(formatConfig.precision); + } + if(format === 'percent') { + config.style = 'percent'; + } + + return config; + }, + + _getPrecisionConfig: function(precision) { + let config; + + if(precision === null) { + config = { + minimumFractionDigits: 0, + maximumFractionDigits: MAX_FRACTION_DIGITS + }; + } else { + config = { + minimumFractionDigits: precision || 0, + maximumFractionDigits: precision || 0 + }; + } + + return config; + }, + + format: function(value, format) { + if(typeof value !== 'number') { + return value; + } + + format = this._normalizeFormat(format); + + if(!format || typeof (format) !== 'function' && !format.type && !format.formatter) { + return getFormatter(format)(value); + } + + return this.callBase.apply(this, arguments); + }, + + parse: function(text, format) { + if(!text) { + return; + } + + if(format && (format.parser || typeof format === 'string')) { + return this.callBase.apply(this, arguments); + } + + if(format) { + // Current parser functionality provided as-is and is independent of the most of capabilities of formatter. + errors.log('W0011'); + } + + let result = Globalize.parseNumber(text); + + if(isNaN(result)) { + result = this.callBase.apply(this, arguments); + } + + return result; + } + }; + + numberLocalization.resetInjection(); + numberLocalization.inject(globalizeNumberLocalization); +} diff --git a/packages/devextreme/js/common/core/localization/intl/date.js b/packages/devextreme/js/common/core/localization/intl/date.js new file mode 100644 index 000000000000..d1bed9a81c3a --- /dev/null +++ b/packages/devextreme/js/common/core/localization/intl/date.js @@ -0,0 +1,347 @@ +/* globals Intl */ +import { extend } from '../../../../core/utils/extend'; +import localizationCoreUtils from '../core'; + +const SYMBOLS_TO_REMOVE_REGEX = /[\u200E\u200F]/g; +const NARROW_NO_BREAK_SPACE_REGEX = /[\u202F]/g; + +const getIntlFormatter = format => { + return date => { + // NOTE: Intl in some browsers formates dates with timezone offset which was at the moment for this date. + // But the method "new Date" creates date using current offset. So, we decided to format dates in the UTC timezone. + if(!format.timeZoneName) { + const year = date.getFullYear(); + // NOTE: new Date(99,0,1) will return 1999 year, but 99 expected + const recognizableAsTwentyCentury = String(year).length < 3; + const safeYearShift = 400; + const temporaryYearValue = recognizableAsTwentyCentury ? year + safeYearShift : year; + const utcDate = new Date(Date.UTC(temporaryYearValue, date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds(), date.getMilliseconds())); + if(recognizableAsTwentyCentury) { + utcDate.setFullYear(year); + } + const utcFormat = extend({ timeZone: 'UTC' }, format); + + return formatDateTime(utcDate, utcFormat); + } + + return formatDateTime(date, format); + }; +}; + +const formattersCache = {}; +const getFormatter = format => { + const key = localizationCoreUtils.locale() + '/' + JSON.stringify(format); + if(!formattersCache[key]) { + formattersCache[key] = (new Intl.DateTimeFormat(localizationCoreUtils.locale(), format)).format; + } + + return formattersCache[key]; +}; + +function formatDateTime(date, format) { + return getFormatter(format)(date) + .replace(SYMBOLS_TO_REMOVE_REGEX, '') + .replace(NARROW_NO_BREAK_SPACE_REGEX, ' '); +} + +const formatNumber = number => { + return (new Intl.NumberFormat(localizationCoreUtils.locale())).format(number); +}; + +const getAlternativeNumeralsMap = (() => { + const numeralsMapCache = {}; + + return locale => { + if(!(locale in numeralsMapCache)) { + if(formatNumber(0) === '0') { + numeralsMapCache[locale] = false; + return false; + } + numeralsMapCache[locale] = {}; + for(let i = 0; i < 10; ++i) { + numeralsMapCache[locale][formatNumber(i)] = i; + } + } + + return numeralsMapCache[locale]; + }; +})(); + +const normalizeNumerals = dateString => { + const alternativeNumeralsMap = getAlternativeNumeralsMap(localizationCoreUtils.locale()); + + if(!alternativeNumeralsMap) { + return dateString; + } + + return dateString.split('').map(sign => { + return sign in alternativeNumeralsMap ? String(alternativeNumeralsMap[sign]) : sign; + }).join(''); +}; + +const removeLeadingZeroes = str => { + return str.replace(/(\D)0+(\d)/g, '$1$2'); +}; +const dateStringEquals = (actual, expected) => { + return removeLeadingZeroes(actual) === removeLeadingZeroes(expected); +}; + +const normalizeMonth = text => { + return text.replace('d\u2019', 'de '); // NOTE: For "ca" locale +}; + +const intlFormats = { + 'day': { day: 'numeric' }, + 'date': { year: 'numeric', month: 'long', day: 'numeric' }, + 'dayofweek': { weekday: 'long' }, + 'longdate': { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' }, + 'longdatelongtime': { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric', second: 'numeric' }, + 'longtime': { hour: 'numeric', minute: 'numeric', second: 'numeric' }, + 'month': { month: 'long' }, + 'monthandday': { month: 'long', day: 'numeric' }, + 'monthandyear': { year: 'numeric', month: 'long' }, + 'shortdate': {}, + 'shorttime': { hour: 'numeric', minute: 'numeric' }, + 'shortyear': { year: '2-digit' }, + 'year': { year: 'numeric' } +}; + +Object.defineProperty(intlFormats, 'shortdateshorttime', { + get: function() { + const defaultOptions = Intl.DateTimeFormat(localizationCoreUtils.locale()).resolvedOptions(); + + return { year: defaultOptions.year, month: defaultOptions.month, day: defaultOptions.day, hour: 'numeric', minute: 'numeric' }; + } +}); + +const getIntlFormat = format => { + return typeof format === 'string' && intlFormats[format.toLowerCase()]; +}; + +const monthNameStrategies = { + standalone: function(monthIndex, monthFormat) { + const date = new Date(1999, monthIndex, 13, 1); + const dateString = getIntlFormatter({ month: monthFormat })(date); + + return dateString; + }, + format: function(monthIndex, monthFormat) { + const date = new Date(0, monthIndex, 13, 1); + const dateString = normalizeMonth(getIntlFormatter({ day: 'numeric', month: monthFormat })(date)); + const parts = dateString.split(' ').filter(part => { + return part.indexOf('13') < 0; + }); + + if(parts.length === 1) { + return parts[0]; + } else if(parts.length === 2) { + return parts[0].length > parts[1].length ? parts[0] : parts[1]; // NOTE: For "lt" locale + } + + return monthNameStrategies.standalone(monthIndex, monthFormat); + } +}; + +export default { + engine: function() { + return 'intl'; + }, + getMonthNames: function(format, type) { + const intlFormats = { + wide: 'long', + abbreviated: 'short', + narrow: 'narrow' + }; + + const monthFormat = intlFormats[format || 'wide']; + + type = type === 'format' ? type : 'standalone'; + + return Array.apply(null, new Array(12)).map((_, monthIndex) => { + return monthNameStrategies[type](monthIndex, monthFormat); + }); + }, + + getDayNames: function(format) { + const intlFormats = { + wide: 'long', + abbreviated: 'short', + short: 'narrow', + narrow: 'narrow' + }; + + const getIntlDayNames = format => { + return Array.apply(null, new Array(7)).map((_, dayIndex) => { + return getIntlFormatter({ weekday: format })(new Date(0, 0, dayIndex)); + }); + }; + + const result = getIntlDayNames(intlFormats[format || 'wide']); + + return result; + }, + + getPeriodNames: function() { + const hour12Formatter = getIntlFormatter({ hour: 'numeric', hour12: true }); + + return [ 1, 13 ].map(hours => { + const hourNumberText = formatNumber(1); // NOTE: For "bn" locale + const timeParts = hour12Formatter(new Date(0, 0, 1, hours)).split(hourNumberText); + + if(timeParts.length !== 2) { + return ''; + } + + const biggerPart = timeParts[0].length > timeParts[1].length ? timeParts[0] : timeParts[1]; + + return biggerPart.trim(); + }); + }, + + format: function(date, format) { + if(!date) { + return; + } + + if(!format) { + return date; + } + + // TODO: refactor (extract code form base) + if(typeof (format) !== 'function' && !format.formatter) { + format = format.type || format; + } + const intlFormat = getIntlFormat(format); + + if(intlFormat) { + return getIntlFormatter(intlFormat)(date); + } + + const formatType = typeof format; + if(format.formatter || formatType === 'function' || formatType === 'string') { + return this.callBase.apply(this, arguments); + } + + return getIntlFormatter(format)(date); + }, + + parse: function(dateString, format) { + let formatter; + + if(format && !format.parser && typeof dateString === 'string') { + dateString = normalizeMonth(dateString); + formatter = (date) => { + return normalizeMonth(this.format(date, format)); + }; + } + return this.callBase(dateString, formatter || format); + }, + + _parseDateBySimpleFormat: function(dateString, format) { + dateString = normalizeNumerals(dateString); + + const formatParts = this.getFormatParts(format); + const dateParts = dateString + .split(/\D+/) + .filter(part => { return part.length > 0; }); + + if(formatParts.length !== dateParts.length) { + return; + } + + const dateArgs = this._generateDateArgs(formatParts, dateParts); + + const constructDate = (dateArgs, ampmShift) => { + const hoursShift = ampmShift ? 12 : 0; + return new Date(dateArgs.year, dateArgs.month, dateArgs.day, (dateArgs.hours + hoursShift) % 24, dateArgs.minutes, dateArgs.seconds); + }; + const constructValidDate = ampmShift => { + const parsedDate = constructDate(dateArgs, ampmShift); + if(dateStringEquals(normalizeNumerals(this.format(parsedDate, format)), dateString)) { + return parsedDate; + } + }; + + return constructValidDate(false) || constructValidDate(true); + }, + + _generateDateArgs: function(formatParts, dateParts) { + const currentDate = new Date(); + const dateArgs = { + year: currentDate.getFullYear(), + month: currentDate.getMonth(), + day: currentDate.getDate(), + hours: 0, + minutes: 0, + seconds: 0 + }; + + formatParts.forEach((formatPart, index) => { + const datePart = dateParts[index]; + let parsed = parseInt(datePart, 10); + + if(formatPart === 'month') { + parsed = parsed - 1; + } + + dateArgs[formatPart] = parsed; + }); + + return dateArgs; + }, + + formatUsesMonthName: function(format) { + if(typeof format === 'object' && !(format.type || format.format)) { + return format.month === 'long'; + } + + return this.callBase.apply(this, arguments); + }, + + formatUsesDayName: function(format) { + if(typeof format === 'object' && !(format.type || format.format)) { + return format.weekday === 'long'; + } + + return this.callBase.apply(this, arguments); + }, + getTimeSeparator: function() { + const formatOptions = { + hour: 'numeric', + minute: 'numeric', + hour12: false + }; + return normalizeNumerals(formatDateTime(new Date(2001, 1, 1, 11, 11), formatOptions)).replace(/\d/g, ''); + }, + + getFormatParts: function(format) { + if(typeof format === 'string') { + return this.callBase(format); + } + const intlFormat = extend({}, intlFormats[format.toLowerCase()]); + const date = new Date(2001, 2, 4, 5, 6, 7); + let formattedDate = getIntlFormatter(intlFormat)(date); + + formattedDate = normalizeNumerals(formattedDate); + + const formatParts = [ + { name: 'year', value: 1 }, + { name: 'month', value: 3 }, + { name: 'day', value: 4 }, + { name: 'hours', value: 5 }, + { name: 'minutes', value: 6 }, + { name: 'seconds', value: 7 } + ]; + + return formatParts + .map(part => { + return { + name: part.name, + index: formattedDate.indexOf(part.value) + }; + }) + .filter(part => { return part.index > -1; }) + .sort((a, b) => { return a.index - b.index; }) + .map(part => { return part.name; }); + } +}; diff --git a/packages/devextreme/js/common/core/localization/intl/number.js b/packages/devextreme/js/common/core/localization/intl/number.js new file mode 100644 index 000000000000..55012d3da52b --- /dev/null +++ b/packages/devextreme/js/common/core/localization/intl/number.js @@ -0,0 +1,129 @@ +/* globals Intl */ +import { config as dxConfig } from '../../../../common'; +import localizationCoreUtils from '../core'; +import openXmlCurrencyFormat from '../open_xml_currency_format'; +import accountingFormats from '../cldr-data/accounting_formats'; + +const CURRENCY_STYLES = ['standard', 'accounting']; +const MAX_FRACTION_DIGITS = 20; + +const detectCurrencySymbolRegex = /([^\s0]+)?(\s*)0*[.,]*0*(\s*)([^\s0]+)?/; +const formattersCache = {}; +const getFormatter = format => { + const key = localizationCoreUtils.locale() + '/' + JSON.stringify(format); + if(!formattersCache[key]) { + formattersCache[key] = (new Intl.NumberFormat(localizationCoreUtils.locale(), format)).format; + } + + return formattersCache[key]; +}; +const getCurrencyFormatter = currency => { + return (new Intl.NumberFormat(localizationCoreUtils.locale(), { style: 'currency', currency: currency })); +}; + +export default { + engine: function() { + return 'intl'; + }, + _formatNumberCore: function(value, format, formatConfig) { + if(format === 'exponential') { + return this.callBase.apply(this, arguments); + } + + return getFormatter(this._normalizeFormatConfig(format, formatConfig, value))(value); + }, + _normalizeFormatConfig: function(format, formatConfig, value) { + let config; + + if(format === 'decimal') { + const fractionDigits = String(value).split('.')[1]; + config = { + minimumIntegerDigits: formatConfig.precision || undefined, + useGrouping: false, + maximumFractionDigits: fractionDigits && fractionDigits.length, + round: value < 0 ? 'ceil' : 'floor' + }; + } else { + config = this._getPrecisionConfig(formatConfig.precision); + } + + if(format === 'percent') { + config.style = 'percent'; + } else if(format === 'currency') { + const useAccountingStyle = formatConfig.useCurrencyAccountingStyle ?? dxConfig().defaultUseCurrencyAccountingStyle; + config.style = 'currency'; + config.currency = formatConfig.currency || dxConfig().defaultCurrency; + config.currencySign = CURRENCY_STYLES[+useAccountingStyle]; + } + + return config; + }, + _getPrecisionConfig: function(precision) { + let config; + + if(precision === null) { + config = { + minimumFractionDigits: 0, + maximumFractionDigits: MAX_FRACTION_DIGITS + }; + } else { + config = { + minimumFractionDigits: precision || 0, + maximumFractionDigits: precision || 0 + }; + } + + return config; + }, + format: function(value, format) { + if('number' !== typeof value) { + return value; + } + + format = this._normalizeFormat(format); + + if(format.currency === 'default') { + format.currency = dxConfig().defaultCurrency; + } + + if(!format || 'function' !== typeof format && !format.type && !format.formatter) { + return getFormatter(format)(value); + } + + return this.callBase.apply(this, arguments); + }, + _getCurrencySymbolInfo: function(currency) { + const formatter = getCurrencyFormatter(currency); + return this._extractCurrencySymbolInfo(formatter.format(0)); + }, + _extractCurrencySymbolInfo: function(currencyValueString) { + const match = detectCurrencySymbolRegex.exec(currencyValueString) || []; + const position = match[1] ? 'before' : 'after'; + const symbol = match[1] || match[4] || ''; + const delimiter = match[2] || match[3] || ''; + + return { + position: position, + symbol: symbol, + delimiter: delimiter + }; + }, + + getCurrencySymbol: function(currency) { + if(!currency) { + currency = dxConfig().defaultCurrency; + } + + const symbolInfo = this._getCurrencySymbolInfo(currency); + return { + 'symbol': symbolInfo.symbol + }; + }, + getOpenXmlCurrencyFormat: function(currency) { + const targetCurrency = currency || dxConfig().defaultCurrency; + const currencySymbol = this._getCurrencySymbolInfo(targetCurrency).symbol; + const closestAccountingFormat = localizationCoreUtils.getValueByClosestLocale(locale => accountingFormats[locale]); + + return openXmlCurrencyFormat(currencySymbol, closestAccountingFormat); + } +}; diff --git a/packages/devextreme/js/common/core/localization/language_codes.js b/packages/devextreme/js/common/core/localization/language_codes.js new file mode 100644 index 000000000000..5092ff4f338b --- /dev/null +++ b/packages/devextreme/js/common/core/localization/language_codes.js @@ -0,0 +1,358 @@ +import localizationCoreUtils from './core'; +const LANGUAGE_CODES = { + 'ar': 1, + 'bg': 2, + 'ca': 3, + 'zh-Hans': 4, + 'cs': 5, + 'da': 6, + 'de': 7, + 'el': 8, + 'en': 9, + 'es': 10, + 'fi': 11, + 'fr': 12, + 'he': 13, + 'hu': 14, + 'is': 15, + 'it': 16, + 'ja': 17, + 'ko': 18, + 'nl': 19, + 'no': 20, + 'pl': 21, + 'pt': 22, + 'rm': 23, + 'ro': 24, + 'ru': 25, + 'hr': 26, + 'sk': 27, + 'sq': 28, + 'sv': 29, + 'th': 30, + 'tr': 31, + 'ur': 32, + 'id': 33, + 'uk': 34, + 'be': 35, + 'sl': 36, + 'et': 37, + 'lv': 38, + 'lt': 39, + 'tg': 40, + 'fa': 41, + 'vi': 42, + 'hy': 43, + 'az': 44, + 'eu': 45, + 'hsb': 46, + 'mk': 47, + 'tn': 50, + 'xh': 52, + 'zu': 53, + 'af': 54, + 'ka': 55, + 'fo': 56, + 'hi': 57, + 'mt': 58, + 'se': 59, + 'ga': 60, + 'ms': 62, + 'kk': 63, + 'ky': 64, + 'sw': 65, + 'tk': 66, + 'uz': 67, + 'tt': 68, + 'bn': 69, + 'pa': 70, + 'gu': 71, + 'or': 72, + 'ta': 73, + 'te': 74, + 'kn': 75, + 'ml': 76, + 'as': 77, + 'mr': 78, + 'sa': 79, + 'mn': 80, + 'bo': 81, + 'cy': 82, + 'km': 83, + 'lo': 84, + 'gl': 86, + 'kok': 87, + 'syr': 90, + 'si': 91, + 'iu': 93, + 'am': 94, + 'tzm': 95, + 'ne': 97, + 'fy': 98, + 'ps': 99, + 'fil': 100, + 'dv': 101, + 'ha': 104, + 'yo': 106, + 'quz': 107, + 'nso': 108, + 'ba': 109, + 'lb': 110, + 'kl': 111, + 'ig': 112, + 'ii': 120, + 'arn': 122, + 'moh': 124, + 'br': 126, + 'ug': 128, + 'mi': 129, + 'oc': 130, + 'co': 131, + 'gsw': 132, + 'sah': 133, + 'qut': 134, + 'rw': 135, + 'wo': 136, + 'prs': 140, + 'gd': 145, + 'ar-SA': 1025, + 'bg-BG': 1026, + 'ca-ES': 1027, + 'zh-TW': 1028, + 'cs-CZ': 1029, + 'da-DK': 1030, + 'de-DE': 1031, + 'el-GR': 1032, + 'en-US': 1033, + 'fi-FI': 1035, + 'fr-FR': 1036, + 'he-IL': 1037, + 'hu-HU': 1038, + 'is-IS': 1039, + 'it-IT': 1040, + 'ja-JP': 1041, + 'ko-KR': 1042, + 'nl-NL': 1043, + 'nb-NO': 1044, + 'pl-PL': 1045, + 'pt-BR': 1046, + 'rm-CH': 1047, + 'ro-RO': 1048, + 'ru-RU': 1049, + 'hr-HR': 1050, + 'sk-SK': 1051, + 'sq-AL': 1052, + 'sv-SE': 1053, + 'th-TH': 1054, + 'tr-TR': 1055, + 'ur-PK': 1056, + 'id-ID': 1057, + 'uk-UA': 1058, + 'be-BY': 1059, + 'sl-SI': 1060, + 'et-EE': 1061, + 'lv-LV': 1062, + 'lt-LT': 1063, + 'tg-Cyrl-TJ': 1064, + 'fa-IR': 1065, + 'vi-VN': 1066, + 'hy-AM': 1067, + 'az-Latn-AZ': 1068, + 'eu-ES': 1069, + 'hsb-DE': 1070, + 'mk-MK': 1071, + 'tn-ZA': 1074, + 'xh-ZA': 1076, + 'zu-ZA': 1077, + 'af-ZA': 1078, + 'ka-GE': 1079, + 'fo-FO': 1080, + 'hi-IN': 1081, + 'mt-MT': 1082, + 'se-NO': 1083, + 'ms-MY': 1086, + 'kk-KZ': 1087, + 'ky-KG': 1088, + 'sw-KE': 1089, + 'tk-TM': 1090, + 'uz-Latn-UZ': 1091, + 'tt-RU': 1092, + 'bn-IN': 1093, + 'pa-IN': 1094, + 'gu-IN': 1095, + 'or-IN': 1096, + 'ta-IN': 1097, + 'te-IN': 1098, + 'kn-IN': 1099, + 'ml-IN': 1100, + 'as-IN': 1101, + 'mr-IN': 1102, + 'sa-IN': 1103, + 'mn-MN': 1104, + 'bo-CN': 1105, + 'cy-GB': 1106, + 'km-KH': 1107, + 'lo-LA': 1108, + 'gl-ES': 1110, + 'kok-IN': 1111, + 'syr-SY': 1114, + 'si-LK': 1115, + 'iu-Cans-CA': 1117, + 'am-ET': 1118, + 'ne-NP': 1121, + 'fy-NL': 1122, + 'ps-AF': 1123, + 'fil-PH': 1124, + 'dv-MV': 1125, + 'ha-Latn-NG': 1128, + 'yo-NG': 1130, + 'quz-BO': 1131, + 'nso-ZA': 1132, + 'ba-RU': 1133, + 'lb-LU': 1134, + 'kl-GL': 1135, + 'ig-NG': 1136, + 'ii-CN': 1144, + 'arn-CL': 1146, + 'moh-CA': 1148, + 'br-FR': 1150, + 'ug-CN': 1152, + 'mi-NZ': 1153, + 'oc-FR': 1154, + 'co-FR': 1155, + 'gsw-FR': 1156, + 'sah-RU': 1157, + 'qut-GT': 1158, + 'rw-RW': 1159, + 'wo-SN': 1160, + 'prs-AF': 1164, + 'gd-GB': 1169, + 'ar-IQ': 2049, + 'zh-CN': 2052, + 'de-CH': 2055, + 'en-GB': 2057, + 'es-MX': 2058, + 'fr-BE': 2060, + 'it-CH': 2064, + 'nl-BE': 2067, + 'nn-NO': 2068, + 'pt-PT': 2070, + 'sr-Latn-CS': 2074, + 'sv-FI': 2077, + 'az-Cyrl-AZ': 2092, + 'dsb-DE': 2094, + 'se-SE': 2107, + 'ga-IE': 2108, + 'ms-BN': 2110, + 'uz-Cyrl-UZ': 2115, + 'bn-BD': 2117, + 'mn-Mong-CN': 2128, + 'iu-Latn-CA': 2141, + 'tzm-Latn-DZ': 2143, + 'quz-EC': 2155, + 'ar-EG': 3073, + 'zh-HK': 3076, + 'de-AT': 3079, + 'en-AU': 3081, + 'es-ES': 3082, + 'fr-CA': 3084, + 'sr-Cyrl-CS': 3098, + 'se-FI': 3131, + 'quz-PE': 3179, + 'ar-LY': 4097, + 'zh-SG': 4100, + 'de-LU': 4103, + 'en-CA': 4105, + 'es-GT': 4106, + 'fr-CH': 4108, + 'hr-BA': 4122, + 'smj-NO': 4155, + 'ar-DZ': 5121, + 'zh-MO': 5124, + 'de-LI': 5127, + 'en-NZ': 5129, + 'es-CR': 5130, + 'fr-LU': 5132, + 'bs-Latn-BA': 5146, + 'smj-SE': 5179, + 'ar-MA': 6145, + 'en-IE': 6153, + 'es-PA': 6154, + 'fr-MC': 6156, + 'sr-Latn-BA': 6170, + 'sma-NO': 6203, + 'ar-TN': 7169, + 'en-ZA': 7177, + 'es-DO': 7178, + 'sr-Cyrl-BA': 7194, + 'sma-SE': 7227, + 'ar-OM': 8193, + 'en-JM': 8201, + 'es-VE': 8202, + 'bs-Cyrl-BA': 8218, + 'sms-FI': 8251, + 'ar-YE': 9217, + 'en-029': 9225, + 'es-CO': 9226, + 'sr-Latn-RS': 9242, + 'smn-FI': 9275, + 'ar-SY': 10241, + 'en-BZ': 10249, + 'es-PE': 10250, + 'sr-Cyrl-RS': 10266, + 'ar-JO': 11265, + 'en-TT': 11273, + 'es-AR': 11274, + 'sr-Latn-ME': 11290, + 'ar-LB': 12289, + 'en-ZW': 12297, + 'es-EC': 12298, + 'sr-Cyrl-ME': 12314, + 'ar-KW': 13313, + 'en-PH': 13321, + 'es-CL': 13322, + 'ar-AE': 14337, + 'es-UY': 14346, + 'ar-BH': 15361, + 'es-PY': 15370, + 'ar-QA': 16385, + 'en-IN': 16393, + 'es-BO': 16394, + 'en-MY': 17417, + 'es-SV': 17418, + 'en-SG': 18441, + 'es-HN': 18442, + 'es-NI': 19466, + 'es-PR': 20490, + 'es-US': 21514, + 'bs-Cyrl': 25626, + 'bs-Latn': 26650, + 'sr-Cyrl': 27674, + 'sr-Latn': 28698, + 'smn': 28731, + 'az-Cyrl': 29740, + 'sms': 29755, + 'zh': 30724, + 'nn': 30740, + 'bs': 30746, + 'az-Latn': 30764, + 'sma': 30779, + 'uz-Cyrl': 30787, + 'mn-Cyrl': 30800, + 'iu-Cans': 30813, + 'zh-Hant': 31748, + 'nb': 31764, + 'sr': 31770, + 'tg-Cyrl': 31784, + 'dsb': 31790, + 'smj': 31803, + 'uz-Latn': 31811, + 'mn-Mong': 31824, + 'iu-Latn': 31837, + 'tzm-Latn': 31839, + 'ha-Latn': 31848 +}; + +export function getLanguageId() { + return LANGUAGE_CODES[localizationCoreUtils.locale()]; +} diff --git a/packages/devextreme/js/common/core/localization/ldml/date.format.js b/packages/devextreme/js/common/core/localization/ldml/date.format.js new file mode 100644 index 000000000000..e3b9b860bd72 --- /dev/null +++ b/packages/devextreme/js/common/core/localization/ldml/date.format.js @@ -0,0 +1,203 @@ +import numberLocalization from '../number'; + +const ARABIC_COMMA = '\u060C'; +const FORMAT_SEPARATORS = ' .,:;/\\<>()-[]' + ARABIC_COMMA; +const AM_PM_PATTERN = '. m.'; + +const checkDigit = function(char) { + const code = char && numberLocalization.convertDigits(char, false).charCodeAt(0); + const zeroCode = numberLocalization.convertDigits('0', false).charCodeAt(0); + + return zeroCode <= code && code < zeroCode + 10; +}; + +const checkPatternContinue = function(text, patterns, index, isDigit) { + const char = text[index]; + const nextChar = text[index + 1]; + + if(!isDigit) { + if(char === '.' || (char === ' ' && text.slice(index - 1, index + 3) === AM_PM_PATTERN)) { + return true; + } + if(char === '-' && !checkDigit(nextChar)) { + return true; + } + } + const isDigitChanged = isDigit && patterns.some(pattern => text[index] !== pattern[index]); + return FORMAT_SEPARATORS.indexOf(char) < 0 && (isDigit === checkDigit(char) && (!isDigit || isDigitChanged)); +}; + +const getPatternStartIndex = function(defaultPattern, index) { + if(!checkDigit(defaultPattern[index])) { + while(index > 0 + && !checkDigit(defaultPattern[index - 1]) + && (defaultPattern[index - 1] === '.' + || FORMAT_SEPARATORS.indexOf(defaultPattern[index - 1]) < 0)) { + index--; + } + } + return index; +}; + +const getDifference = function(defaultPattern, patterns, processedIndexes, isDigit) { + let i = 0; + const result = []; + + const patternsFilter = function(pattern) { + return defaultPattern[i] !== pattern[i] && (isDigit === undefined || checkDigit(defaultPattern[i]) === isDigit); + }; + + if(!Array.isArray(patterns)) { + patterns = [patterns]; + } + + for(i = 0; i < defaultPattern.length; i++) { + if(processedIndexes.indexOf(i) < 0 && patterns.filter(patternsFilter).length) { + i = getPatternStartIndex(defaultPattern, i); + do { + isDigit = checkDigit(defaultPattern[i]); + if(!result.length && !isDigit && checkDigit(patterns[0][i])) { + break; + } + result.push(i); + processedIndexes.unshift(i); + i++; + } while(defaultPattern[i] && checkPatternContinue(defaultPattern, patterns, i, isDigit)); + break; + } + } + + if(result.length === 1 && (defaultPattern[processedIndexes[0] - 1] === '0' || defaultPattern[processedIndexes[0] - 1] === '٠')) { + processedIndexes.unshift(processedIndexes[0] - 1); + } + + return result; +}; + +const replaceCharsCore = function(pattern, indexes, char, patternPositions) { + const baseCharIndex = indexes[0]; + const patternIndex = baseCharIndex < patternPositions.length ? patternPositions[baseCharIndex] : baseCharIndex; + + indexes.forEach(function(_, index) { + pattern = pattern.substr(0, patternIndex + index) + (char.length > 1 ? char[index] : char) + pattern.substr(patternIndex + index + 1); + }); + + if(indexes.length === 1) { + pattern = pattern.replace('0' + char, char + char); + pattern = pattern.replace('٠' + char, char + char); + } + + return pattern; +}; + +const replaceChars = function(pattern, indexes, char, patternPositions) { + let i; + let index; + let patternIndex; + + if(!checkDigit(pattern[indexes[0]] || '0')) { + const letterCount = Math.max(indexes.length <= 3 ? 3 : 4, char.length); + + while(indexes.length > letterCount) { + index = indexes.pop(); + patternIndex = patternPositions[index]; + + patternPositions[index] = -1; + for(i = index + 1; i < patternPositions.length; i++) { + patternPositions[i]--; + } + pattern = pattern.substr(0, patternIndex) + pattern.substr(patternIndex + 1); + } + + index = indexes[indexes.length - 1] + 1, + patternIndex = index < patternPositions.length ? patternPositions[index] : index; + + while(indexes.length < letterCount) { + + indexes.push(indexes[indexes.length - 1] + 1); + for(i = index; i < patternPositions.length; i++) { + patternPositions[i]++; + } + pattern = pattern.substr(0, patternIndex) + ' ' + pattern.substr(patternIndex); + } + } + + pattern = replaceCharsCore(pattern, indexes, char, patternPositions); + + return pattern; +}; + +const formatValue = function(value, formatter) { + if(Array.isArray(value)) { + return value.map(function(value) { + return (formatter(value) || '').toString(); + }); + } + return (formatter(value) || '').toString(); +}; + +const ESCAPE_CHARS_REGEXP = /[a-zA-Z]/g; + +const escapeChars = function(pattern, defaultPattern, processedIndexes, patternPositions) { + const escapeIndexes = defaultPattern.split('').map(function(char, index) { + if(processedIndexes.indexOf(index) < 0 && (char.match(ESCAPE_CHARS_REGEXP) || char === '\'')) { + return patternPositions[index]; + } + return -1; + }); + + pattern = pattern.split('').map(function(char, index) { + let result = char; + const isCurrentCharEscaped = escapeIndexes.indexOf(index) >= 0; + const isPrevCharEscaped = index > 0 && escapeIndexes.indexOf(index - 1) >= 0; + const isNextCharEscaped = escapeIndexes.indexOf(index + 1) >= 0; + + if(isCurrentCharEscaped) { + if(!isPrevCharEscaped) { + result = '\'' + result; + } + if(!isNextCharEscaped) { + result = result + '\''; + } + } + + return result; + }).join(''); + + return pattern; +}; + +export const getFormat = function(formatter) { + const processedIndexes = []; + const defaultPattern = formatValue(new Date(2009, 8, 8, 6, 5, 4), formatter); + const patternPositions = defaultPattern.split('').map(function(_, index) { return index; }); + let result = defaultPattern; + const replacedPatterns = {}; + const datePatterns = [ + { date: new Date(2009, 8, 8, 6, 5, 4, 111), pattern: 'S' }, + { date: new Date(2009, 8, 8, 6, 5, 2), pattern: 's' }, + { date: new Date(2009, 8, 8, 6, 2, 4), pattern: 'm' }, + { date: new Date(2009, 8, 8, 18, 5, 4), pattern: 'H', isDigit: true }, + { date: new Date(2009, 8, 8, 2, 5, 4), pattern: 'h', isDigit: true }, + { date: new Date(2009, 8, 8, 18, 5, 4), pattern: 'a', isDigit: false }, + { date: new Date(2009, 8, 1, 6, 5, 4), pattern: 'd' }, + { date: [new Date(2009, 8, 2, 6, 5, 4), new Date(2009, 8, 3, 6, 5, 4), new Date(2009, 8, 4, 6, 5, 4)], pattern: 'E' }, + { date: new Date(2009, 9, 6, 6, 5, 4), pattern: 'M' }, + { date: new Date(1998, 8, 8, 6, 5, 4), pattern: 'y' }]; + + if(!result) return; + + datePatterns.forEach(function(test) { + const diff = getDifference(defaultPattern, formatValue(test.date, formatter), processedIndexes, test.isDigit); + const pattern = test.pattern === 'M' && !replacedPatterns['d'] ? 'L' : test.pattern; + + result = replaceChars(result, diff, pattern, patternPositions); + replacedPatterns[pattern] = diff.length; + }); + + result = escapeChars(result, defaultPattern, processedIndexes, patternPositions); + + if(processedIndexes.length) { + return result; + } +}; diff --git a/packages/devextreme/js/common/core/localization/ldml/date.formatter.js b/packages/devextreme/js/common/core/localization/ldml/date.formatter.js new file mode 100644 index 000000000000..13f36b7df0af --- /dev/null +++ b/packages/devextreme/js/common/core/localization/ldml/date.formatter.js @@ -0,0 +1,140 @@ +function leftPad(text, length) { + while(text.length < length) { + text = '0' + text; + } + return text; +} + +const FORMAT_TYPES = { + '3': 'abbreviated', + '4': 'wide', + '5': 'narrow' +}; + +const LDML_FORMATTERS = { + y: function(date, count, useUtc) { + let year = date[useUtc ? 'getUTCFullYear' : 'getFullYear'](); + if(count === 2) { + year = year % 100; + } + return leftPad(year.toString(), count); + }, + M: function(date, count, useUtc, dateParts) { + const month = date[useUtc ? 'getUTCMonth' : 'getMonth'](); + const formatType = FORMAT_TYPES[count]; + if(formatType) { + return dateParts.getMonthNames(formatType, 'format')[month]; + } + return leftPad((month + 1).toString(), Math.min(count, 2)); + }, + L: function(date, count, useUtc, dateParts) { + const month = date[useUtc ? 'getUTCMonth' : 'getMonth'](); + const formatType = FORMAT_TYPES[count]; + if(formatType) { + return dateParts.getMonthNames(formatType, 'standalone')[month]; + } + return leftPad((month + 1).toString(), Math.min(count, 2)); + }, + Q: function(date, count, useUtc, dateParts) { + const month = date[useUtc ? 'getUTCMonth' : 'getMonth'](); + const quarter = Math.floor(month / 3); + const formatType = FORMAT_TYPES[count]; + if(formatType) { + return dateParts.getQuarterNames(formatType)[quarter]; + } + return leftPad((quarter + 1).toString(), Math.min(count, 2)); + }, + E: function(date, count, useUtc, dateParts) { + const day = date[useUtc ? 'getUTCDay' : 'getDay'](); + const formatType = FORMAT_TYPES[count < 3 ? 3 : count]; + return dateParts.getDayNames(formatType)[day]; + }, + a: function(date, count, useUtc, dateParts) { + const hours = date[useUtc ? 'getUTCHours' : 'getHours'](); + const period = hours < 12 ? 0 : 1; + const formatType = FORMAT_TYPES[count]; + return dateParts.getPeriodNames(formatType)[period]; + }, + d: function(date, count, useUtc) { + return leftPad(date[useUtc ? 'getUTCDate' : 'getDate']().toString(), Math.min(count, 2)); + }, + H: function(date, count, useUtc) { + return leftPad(date[useUtc ? 'getUTCHours' : 'getHours']().toString(), Math.min(count, 2)); + }, + h: function(date, count, useUtc) { + const hours = date[useUtc ? 'getUTCHours' : 'getHours'](); + return leftPad((hours % 12 || 12).toString(), Math.min(count, 2)); + }, + m: function(date, count, useUtc) { + return leftPad(date[useUtc ? 'getUTCMinutes' : 'getMinutes']().toString(), Math.min(count, 2)); + }, + s: function(date, count, useUtc) { + return leftPad(date[useUtc ? 'getUTCSeconds' : 'getSeconds']().toString(), Math.min(count, 2)); + }, + S: function(date, count, useUtc) { + return leftPad(date[useUtc ? 'getUTCMilliseconds' : 'getMilliseconds']().toString(), 3).substr(0, count); + }, + x: function(date, count, useUtc) { + const timezoneOffset = useUtc ? 0 : date.getTimezoneOffset(); + const signPart = timezoneOffset > 0 ? '-' : '+'; + const timezoneOffsetAbs = Math.abs(timezoneOffset); + const hours = Math.floor(timezoneOffsetAbs / 60); + const minutes = timezoneOffsetAbs % 60; + const hoursPart = leftPad(hours.toString(), 2); + const minutesPart = leftPad(minutes.toString(), 2); + + return signPart + hoursPart + (count >= 3 ? ':' : '') + (count > 1 || minutes ? minutesPart : ''); + }, + X: function(date, count, useUtc) { + if(useUtc || !date.getTimezoneOffset()) { + return 'Z'; + } + return LDML_FORMATTERS.x(date, count, useUtc); + }, + Z: function(date, count, useUtc) { + return LDML_FORMATTERS.X(date, count >= 5 ? 3 : 2, useUtc); + } +}; + +export const getFormatter = function(format, dateParts) { + return function(date) { + let charIndex; + let formatter; + let char; + let charCount = 0; + const separator = '\''; + let isEscaping = false; + let isCurrentCharEqualsNext; + let result = ''; + + if(!date) return null; + + if(!format) return date; + + const useUtc = format[format.length - 1] === 'Z' || format.slice(-3) === '\'Z\''; + + for(charIndex = 0; charIndex < format.length; charIndex++) { + char = format[charIndex]; + formatter = LDML_FORMATTERS[char]; + isCurrentCharEqualsNext = char === format[charIndex + 1]; + charCount++; + + if(!isCurrentCharEqualsNext) { + if(formatter && !isEscaping) { + result += formatter(date, charCount, useUtc, dateParts); + } + charCount = 0; + } + + if(char === separator && !isCurrentCharEqualsNext) { + isEscaping = !isEscaping; + } else if(isEscaping || !formatter) { + result += char; + } + if(char === separator && isCurrentCharEqualsNext) { + charIndex++; + } + } + return result; + }; +}; diff --git a/packages/devextreme/js/common/core/localization/ldml/date.parser.js b/packages/devextreme/js/common/core/localization/ldml/date.parser.js new file mode 100644 index 000000000000..96197a9ee6d5 --- /dev/null +++ b/packages/devextreme/js/common/core/localization/ldml/date.parser.js @@ -0,0 +1,355 @@ +import { escapeRegExp } from '../../../../core/utils/common'; +import { logger } from '../../../../core/utils/console'; + +const FORMAT_TYPES = { + '3': 'abbreviated', + '4': 'wide', + '5': 'narrow' +}; + +const monthRegExpGenerator = function(count, dateParts) { + if(count > 2) { + return Object.keys(FORMAT_TYPES).map(function(count) { + return ['format', 'standalone'].map(function(type) { + return dateParts.getMonthNames(FORMAT_TYPES[count], type).join('|'); + }).join('|'); + }).join('|'); + } + return count === 2 ? '1[012]|0?[1-9]' : '0??[1-9]|1[012]'; +}; + +const PATTERN_REGEXPS = { + ':': function(count, dateParts) { + const countSuffix = count > 1 ? `{${count}}` : ''; + let timeSeparator = escapeRegExp(dateParts.getTimeSeparator()); + timeSeparator !== ':' && (timeSeparator = `${timeSeparator}|:`); + return `${timeSeparator}${countSuffix}`; + }, + y: function(count) { + return count === 2 ? `[0-9]{${count}}` : '[0-9]+?'; + }, + M: monthRegExpGenerator, + L: monthRegExpGenerator, + Q: function(count, dateParts) { + if(count > 2) { + return dateParts.getQuarterNames(FORMAT_TYPES[count], 'format').join('|'); + } + return '0?[1-4]'; + }, + E: function(count, dateParts) { + return '\\D*'; + }, + a: function(count, dateParts) { + return dateParts.getPeriodNames(FORMAT_TYPES[count < 3 ? 3 : count], 'format').join('|'); + }, + d: function(count) { + return count === 2 ? '3[01]|[12][0-9]|0?[1-9]' : '0??[1-9]|[12][0-9]|3[01]'; + }, + H: function(count) { + return count === 2 ? '2[0-3]|1[0-9]|0?[0-9]' : '0??[0-9]|1[0-9]|2[0-3]'; + }, + h: function(count) { + return count === 2 ? '1[012]|0?[1-9]' : '0??[1-9]|1[012]'; + }, + m: function(count) { + return count === 2 ? '[1-5][0-9]|0?[0-9]' : '0??[0-9]|[1-5][0-9]'; + }, + s: function(count) { + return count === 2 ? '[1-5][0-9]|0?[0-9]' : '0??[0-9]|[1-5][0-9]'; + }, + S: function(count) { + return `[0-9]{1,${count}}`; + }, + w: function(count) { + return count === 2 ? '[1-5][0-9]|0?[0-9]' : '0??[0-9]|[1-5][0-9]'; + }, + x: function(count) { + return count === 3 ? '[+-](?:2[0-3]|[01][0-9]):(?:[0-5][0-9])|Z' : '[+-](?:2[0-3]|[01][0-9])(?:[0-5][0-9])|Z'; + } +}; + +const parseNumber = Number; + +const caseInsensitiveIndexOf = function(array, value) { + return array.map((item) => item.toLowerCase()).indexOf(value.toLowerCase()); +}; + +const monthPatternParser = function(text, count, dateParts) { + if(count > 2) { + return ['format', 'standalone'].map(function(type) { + return Object.keys(FORMAT_TYPES).map(function(count) { + const monthNames = dateParts.getMonthNames(FORMAT_TYPES[count], type); + return caseInsensitiveIndexOf(monthNames, text); + }); + }).reduce(function(a, b) { + return a.concat(b); + }).filter(function(index) { + return index >= 0; + })[0]; + } + return parseNumber(text) - 1; +}; + +const PATTERN_PARSERS = { + y: function(text, count) { + const year = parseNumber(text); + if(count === 2) { + return year < 30 ? 2000 + year : 1900 + year; + } + return year; + }, + M: monthPatternParser, + L: monthPatternParser, + Q: function(text, count, dateParts) { + if(count > 2) { + return dateParts.getQuarterNames(FORMAT_TYPES[count], 'format').indexOf(text); + } + return parseNumber(text) - 1; + }, + E: function(text, count, dateParts) { + const dayNames = dateParts.getDayNames(FORMAT_TYPES[count < 3 ? 3 : count], 'format'); + return caseInsensitiveIndexOf(dayNames, text); + }, + a: function(text, count, dateParts) { + const periodNames = dateParts.getPeriodNames(FORMAT_TYPES[count < 3 ? 3 : count], 'format'); + return caseInsensitiveIndexOf(periodNames, text); + }, + d: parseNumber, + H: parseNumber, + h: parseNumber, + m: parseNumber, + s: parseNumber, + S: function(text, count) { + count = Math.max(count, 3); + text = text.slice(0, 3); + while(count < 3) { + text = text + '0'; + count++; + } + return parseNumber(text); + } +}; + +const ORDERED_PATTERNS = ['y', 'M', 'd', 'h', 'm', 's', 'S']; +const PATTERN_SETTERS = { + y: 'setFullYear', + M: 'setMonth', + L: 'setMonth', + a: function(date, value, datePartValues) { + let hours = date.getHours(); + + const hourPartValue = datePartValues['h']; + if(hourPartValue !== undefined && hourPartValue !== hours) { + hours--; + } + + if(!value && hours === 12) { + hours = 0; + } else if(value && hours !== 12) { + hours += 12; + } + + date.setHours(hours); + }, + d: 'setDate', + H: 'setHours', + h: 'setHours', + m: 'setMinutes', + s: 'setSeconds', + S: 'setMilliseconds' +}; + +const getSameCharCount = function(text, index) { + const char = text[index]; + if(!char) { + return 0; + } + let count = 0; + + do { + index++; + count++; + } while(text[index] === char); + + return count; +}; + +const createPattern = function(char, count) { + let result = ''; + for(let i = 0; i < count; i++) { + result += char; + } + return result; +}; + +export const getRegExpInfo = function(format, dateParts) { + let regexpText = ''; + let stubText = ''; + let isEscaping; + const patterns = []; + + const addPreviousStub = function() { + if(stubText) { + patterns.push(`'${stubText}'`); + regexpText += `${escapeRegExp(stubText)})`; + stubText = ''; + } + }; + + for(let i = 0; i < format.length; i++) { + const char = format[i]; + const isEscapeChar = char === '\''; + const regexpPart = PATTERN_REGEXPS[char]; + + if(isEscapeChar) { + isEscaping = !isEscaping; + if(format[i - 1] !== '\'') { + continue; + } + } + + if(regexpPart && !isEscaping) { + const count = getSameCharCount(format, i); + const pattern = createPattern(char, count); + + addPreviousStub(); + patterns.push(pattern); + + regexpText += `(${regexpPart(count, dateParts)})`; + i += count - 1; + } else { + if(!stubText) { + regexpText += '('; + } + stubText += char; + } + } + + addPreviousStub(); + if(!isPossibleForParsingFormat(patterns)) { + logger.warn(`The following format may be parsed incorrectly: ${format}.`); + } + + return { + patterns: patterns, + regexp: new RegExp(`^${regexpText}$`, 'i') + }; +}; + +const digitFieldSymbols = ['d', 'H', 'h', 'm', 's', 'w', 'M', 'L', 'Q']; +export const isPossibleForParsingFormat = function(patterns) { + const isDigitPattern = (pattern) => { + if(!pattern) { + return false; + } + const char = pattern[0]; + return ['y', 'S'].includes(char) || digitFieldSymbols.includes(char) && pattern.length < 3; + }; + + const isAmbiguousDigitPattern = (pattern) => { + return pattern[0] !== 'S' && pattern.length !== 2; + }; + + let possibleForParsing = true; + let ambiguousDigitPatternsCount = 0; + return patterns.every((pattern, index, patterns) => { + if(isDigitPattern(pattern)) { + if(isAmbiguousDigitPattern(pattern)) { + possibleForParsing = (++ambiguousDigitPatternsCount) < 2; + } + if(!isDigitPattern(patterns[index + 1])) { + ambiguousDigitPatternsCount = 0; + } + } + return possibleForParsing; + }); +}; + +export const getPatternSetters = function() { + return PATTERN_SETTERS; +}; + +const setPatternPart = function(date, pattern, text, dateParts, datePartValues) { + const patternChar = pattern[0]; + const partSetter = PATTERN_SETTERS[patternChar]; + const partParser = PATTERN_PARSERS[patternChar]; + + if(partSetter && partParser) { + const value = partParser(text, pattern.length, dateParts); + datePartValues[pattern] = value; + if(date[partSetter]) { + date[partSetter](value); + } else { + partSetter(date, value, datePartValues); + } + } +}; + +const setPatternPartFromNow = function(date, pattern, now) { + const setterName = PATTERN_SETTERS[pattern]; + const getterName = 'g' + setterName.substr(1); + const value = now[getterName](); + date[setterName](value); +}; + +const getShortPatterns = function(fullPatterns) { + return fullPatterns.map(function(pattern) { + if(pattern[0] === '\'') { + return ''; + } else { + return pattern[0] === 'H' ? 'h' : pattern[0]; + } + }); +}; + +const getMaxOrderedPatternIndex = function(patterns) { + const indexes = patterns.map(function(pattern) { + return ORDERED_PATTERNS.indexOf(pattern); + }); + + return Math.max.apply(Math, indexes); +}; + +const getOrderedFormatPatterns = function(formatPatterns) { + const otherPatterns = formatPatterns.filter(function(pattern) { + return ORDERED_PATTERNS.indexOf(pattern) < 0; + }); + + return ORDERED_PATTERNS.concat(otherPatterns); +}; + +export const getParser = function(format, dateParts) { + const regExpInfo = getRegExpInfo(format, dateParts); + + return function(text) { + const regExpResult = regExpInfo.regexp.exec(text); + + if(regExpResult) { + const now = new Date(); + const date = new Date(now.getFullYear(), 0, 1); + const formatPatterns = getShortPatterns(regExpInfo.patterns); + const maxPatternIndex = getMaxOrderedPatternIndex(formatPatterns); + const orderedFormatPatterns = getOrderedFormatPatterns(formatPatterns); + const datePartValues = { }; + + orderedFormatPatterns.forEach(function(pattern, index) { + if(!pattern || (index < ORDERED_PATTERNS.length && index > maxPatternIndex)) { + return; + } + + const patternIndex = formatPatterns.indexOf(pattern); + if(patternIndex >= 0) { + const regExpPattern = regExpInfo.patterns[patternIndex]; + const regExpText = regExpResult[patternIndex + 1]; + setPatternPart(date, regExpPattern, regExpText, dateParts, datePartValues); + } else { + setPatternPartFromNow(date, pattern, now); + } + }); + + return date; + } + + return null; + }; +}; diff --git a/packages/devextreme/js/common/core/localization/ldml/number.js b/packages/devextreme/js/common/core/localization/ldml/number.js new file mode 100644 index 000000000000..628a8713d3a0 --- /dev/null +++ b/packages/devextreme/js/common/core/localization/ldml/number.js @@ -0,0 +1,230 @@ +import { fitIntoRange, multiplyInExponentialForm } from '../../../../core/utils/math'; +import { toFixed } from '../utils'; + +const DEFAULT_CONFIG = { thousandsSeparator: ',', decimalSeparator: '.' }; +const ESCAPING_CHAR = '\''; +const MAXIMUM_NUMBER_LENGTH = 15; +const PERCENT_EXPONENT_SHIFT = 2; // '1e2' + +function getGroupSizes(formatString) { + return formatString.split(',').slice(1).map(function(str) { + let singleQuotesLeft = 0; + return str.split('').filter(function(char, index) { + singleQuotesLeft += char === '\''; + + const isDigit = char === '#' || char === '0'; + const isInStub = singleQuotesLeft % 2; + return isDigit && !isInStub; + }).length; + }); +} + +function getSignParts(format) { + const signParts = format.split(';'); + + if(signParts.length === 1) { + signParts.push('-' + signParts[0]); + } + + return signParts; +} + +function reverseString(str) { + return str.toString().split('').reverse().join(''); +} + +function isPercentFormat(format) { + return format.indexOf('%') !== -1 && !format.match(/'[^']*%[^']*'/g); +} + +function removeStubs(str) { + return str.replace(/'.+'/g, ''); +} + +function getNonRequiredDigitCount(floatFormat) { + if(!floatFormat) return 0; + const format = removeStubs(floatFormat); + return format.length - format.replace(/[#]/g, '').length; +} + +function getRequiredDigitCount(floatFormat) { + if(!floatFormat) return 0; + const format = removeStubs(floatFormat); + return format.length - format.replace(/[0]/g, '').length; +} + +function normalizeValueString(valuePart, minDigitCount, maxDigitCount) { + if(!valuePart) return ''; + + if(valuePart.length > maxDigitCount) { + valuePart = valuePart.substr(0, maxDigitCount); + } + + while(valuePart.length > minDigitCount && valuePart.slice(-1) === '0') { + valuePart = valuePart.substr(0, valuePart.length - 1); + } + + while(valuePart.length < minDigitCount) { + valuePart += '0'; + } + + return valuePart; +} + +function applyGroups(valueString, groupSizes, thousandsSeparator) { + if(!groupSizes.length) return valueString; + + const groups = []; + let index = 0; + + while(valueString) { + const groupSize = groupSizes[index]; + if(!groupSize) { + break; + } + groups.push(valueString.slice(0, groupSize)); + valueString = valueString.slice(groupSize); + if(index < groupSizes.length - 1) { + index++; + } + } + return groups.join(thousandsSeparator); +} + +function formatNumberPart(format, valueString) { + return format.split(ESCAPING_CHAR).map(function(formatPart, escapeIndex) { + const isEscape = escapeIndex % 2; + if(!formatPart && isEscape) { + return ESCAPING_CHAR; + } + return isEscape ? formatPart : formatPart.replace(/[,#0]+/, valueString); + }).join(''); +} + +function getFloatPointIndex(format) { + let isEscape = false; + + for(let index = 0; index < format.length; index++) { + if(format[index] === '\'') { + isEscape = !isEscape; + } + if(format[index] === '.' && !isEscape) { + return index; + } + } + + return format.length; +} + +export function getFormatter(format, config) { + config = config || DEFAULT_CONFIG; + + return function(value) { + if(typeof value !== 'number' || isNaN(value)) return ''; + + const signFormatParts = getSignParts(format); + const isPositiveZero = 1 / value === Infinity; + const isPositive = value > 0 || isPositiveZero; + const numberFormat = signFormatParts[isPositive ? 0 : 1]; + + const floatPointIndex = getFloatPointIndex(numberFormat); + const floatFormatParts = [numberFormat.substr(0, floatPointIndex), numberFormat.substr(floatPointIndex + 1)]; + const minFloatPrecision = getRequiredDigitCount(floatFormatParts[1]); + const maxFloatPrecision = minFloatPrecision + getNonRequiredDigitCount(floatFormatParts[1]); + + if(isPercentFormat(numberFormat)) { + value = multiplyInExponentialForm(value, PERCENT_EXPONENT_SHIFT); + } + + if(!isPositive) { + value = -value; + } + + const minIntegerPrecision = getRequiredDigitCount(floatFormatParts[0]); + const maxIntegerPrecision = getNonRequiredDigitCount(floatFormatParts[0]) || config.unlimitedIntegerDigits ? undefined : minIntegerPrecision; + const integerLength = Math.floor(value).toString().length; + const floatPrecision = fitIntoRange(maxFloatPrecision, 0, MAXIMUM_NUMBER_LENGTH - integerLength); + const groupSizes = getGroupSizes(floatFormatParts[0]).reverse(); + + const valueParts = toFixed(value, floatPrecision < 0 ? 0 : floatPrecision).split('.'); + + let valueIntegerPart = normalizeValueString(reverseString(valueParts[0]), minIntegerPrecision, maxIntegerPrecision); + const valueFloatPart = normalizeValueString(valueParts[1], minFloatPrecision, maxFloatPrecision); + + valueIntegerPart = applyGroups(valueIntegerPart, groupSizes, config.thousandsSeparator); + + const integerString = reverseString(formatNumberPart(reverseString(floatFormatParts[0]), valueIntegerPart)); + const floatString = maxFloatPrecision ? formatNumberPart(floatFormatParts[1], valueFloatPart) : ''; + + const result = integerString + (floatString.match(/\d/) ? config.decimalSeparator : '') + floatString; + + return result; + }; +} + +function parseValue(text, isPercent, isNegative) { + const value = (isPercent ? 0.01 : 1) * parseFloat(text) || 0; + + return isNegative ? -value : value; +} + +function prepareValueText(valueText, formatter, isPercent, isIntegerPart) { + let nextValueText = valueText; + let char; + let text; + let nextText; + + do { + if(nextText) { + char = text.length === nextText.length ? '0' : '1'; + valueText = isIntegerPart ? char + valueText : valueText + char; + } + text = nextText || formatter(parseValue(nextValueText, isPercent)); + nextValueText = isIntegerPart ? '1' + nextValueText : nextValueText + '1'; + nextText = formatter(parseValue(nextValueText, isPercent)); + } while(text !== nextText && (isIntegerPart ? text.length === nextText.length : text.length <= nextText.length)); + + if(isIntegerPart && nextText.length > text.length) { + const hasGroups = formatter(12345).indexOf('12345') === -1; + do { + valueText = '1' + valueText; + } while(hasGroups && parseValue(valueText, isPercent) < 100000); + } + + return valueText; +} + +function getFormatByValueText(valueText, formatter, isPercent, isNegative) { + let format = formatter(parseValue(valueText, isPercent, isNegative)); + const valueTextParts = valueText.split('.'); + const valueTextWithModifiedFloat = valueTextParts[0] + '.3' + valueTextParts[1].slice(1); + const valueWithModifiedFloat = parseValue(valueTextWithModifiedFloat, isPercent, isNegative); + const decimalSeparatorIndex = formatter(valueWithModifiedFloat).indexOf('3') - 1; + + format = format.replace(/(\d)\D(\d)/g, '$1,$2'); + + if(decimalSeparatorIndex >= 0) { + format = format.slice(0, decimalSeparatorIndex) + '.' + format.slice(decimalSeparatorIndex + 1); + } + + format = format.replace(/1+/, '1').replace(/1/g, '#'); + + if(!isPercent) { + format = format.replace(/%/g, '\'%\''); + } + + return format; +} + +export function getFormat(formatter) { + let valueText = '.'; + const isPercent = formatter(1).indexOf('100') >= 0; + + valueText = prepareValueText(valueText, formatter, isPercent, true); + valueText = prepareValueText(valueText, formatter, isPercent, false); + + const positiveFormat = getFormatByValueText(valueText, formatter, isPercent, false); + const negativeFormat = getFormatByValueText(valueText, formatter, isPercent, true); + + return negativeFormat === '-' + positiveFormat ? positiveFormat : positiveFormat + ';' + negativeFormat; +} diff --git a/packages/devextreme/js/common/core/localization/message.d.ts b/packages/devextreme/js/common/core/localization/message.d.ts new file mode 100644 index 000000000000..35fd53c0e3ca --- /dev/null +++ b/packages/devextreme/js/common/core/localization/message.d.ts @@ -0,0 +1,6 @@ +type messageLocalizationType = { + getFormatter(name: string): () => string; + format(name: string): string; +}; +declare const messageLocalization: messageLocalizationType; +export default messageLocalization; diff --git a/packages/devextreme/js/common/core/localization/message.js b/packages/devextreme/js/common/core/localization/message.js new file mode 100644 index 000000000000..d0772abe30c0 --- /dev/null +++ b/packages/devextreme/js/common/core/localization/message.js @@ -0,0 +1,92 @@ +import dependencyInjector from '../../../core/utils/dependency_injector'; +import { extend } from '../../../core/utils/extend'; +import { format as stringFormat } from '../../../core/utils/string'; +import { humanize } from '../../../core/utils/inflector'; +import coreLocalization from './core'; +import { defaultMessages } from './default_messages'; + +const baseDictionary = extend(true, {}, defaultMessages); + +const getDataByLocale = (localeData, locale) => { + return localeData[locale] + || (locale?.toLowerCase && Object.entries(localeData).find( + ([key,]) => key.toLowerCase() === locale.toLowerCase())?.[1]) + || {}; +}; + +const newMessages = {}; + +const messageLocalization = dependencyInjector({ + engine: function() { + return 'base'; + }, + + _dictionary: baseDictionary, + + load: function(messages) { + extend(true, this._dictionary, messages); + }, + + _localizablePrefix: '@', + + setup: function(localizablePrefix) { + this._localizablePrefix = localizablePrefix; + }, + + localizeString: function(text) { + const that = this; + const regex = new RegExp('(^|[^a-zA-Z_0-9' + that._localizablePrefix + '-]+)(' + that._localizablePrefix + '{1,2})([a-zA-Z_0-9-]+)', 'g'); + const escapeString = that._localizablePrefix + that._localizablePrefix; + + return text.replace(regex, (str, prefix, escape, localizationKey) => { + const defaultResult = that._localizablePrefix + localizationKey; + let result; + + if(escape !== escapeString) { + result = that.format(localizationKey); + } + + if(!result) { + newMessages[localizationKey] = humanize(localizationKey); + } + + return prefix + (result || defaultResult); + }); + }, + + getMessagesByLocales: function() { + return this._dictionary; + }, + + getDictionary: function(onlyNew) { + if(onlyNew) { + return newMessages; + } + return extend({}, newMessages, this.getMessagesByLocales()[coreLocalization.locale()]); + }, + + getFormatter: function(key) { + return this._getFormatterBase(key) || this._getFormatterBase(key, 'en'); + }, + + _getFormatterBase: function(key, locale) { + const message = coreLocalization.getValueByClosestLocale((locale) => getDataByLocale(this._dictionary, locale)[key]); + + if(message) { + return function() { + const args = arguments.length === 1 && Array.isArray(arguments[0]) ? arguments[0].slice(0) : Array.prototype.slice.call(arguments, 0); + args.unshift(message); + return stringFormat.apply(this, args); + }; + } + }, + + format: function(key) { + const formatter = this.getFormatter(key); + const values = Array.prototype.slice.call(arguments, 1); + + return formatter && formatter.apply(this, values) || ''; + } +}); + +export default messageLocalization; diff --git a/packages/devextreme/js/common/core/localization/number.js b/packages/devextreme/js/common/core/localization/number.js new file mode 100644 index 000000000000..e9db126e1347 --- /dev/null +++ b/packages/devextreme/js/common/core/localization/number.js @@ -0,0 +1,382 @@ +import dependencyInjector from '../../../core/utils/dependency_injector'; +import { escapeRegExp } from '../../../core/utils/common'; +import { each } from '../../../core/utils/iterator'; +import { isPlainObject } from '../../../core/utils/type'; +import { getFormatter } from './ldml/number'; +import config from '../../../core/config'; +import errors from '../../../core/errors'; +import { toFixed } from './utils'; +import currencyLocalization from './currency'; +import intlNumberLocalization from './intl/number'; + +const hasIntl = typeof Intl !== 'undefined'; +const MAX_LARGE_NUMBER_POWER = 4; +const DECIMAL_BASE = 10; + +const NUMERIC_FORMATS = ['currency', 'fixedpoint', 'exponential', 'percent', 'decimal']; + +const LargeNumberFormatPostfixes = { + 1: 'K', // kilo + 2: 'M', // mega + 3: 'B', // billions + 4: 'T' // tera +}; + +const LargeNumberFormatPowers = { + 'largenumber': 'auto', + 'thousands': 1, + 'millions': 2, + 'billions': 3, + 'trillions': 4 +}; + +const numberLocalization = dependencyInjector({ + engine: function() { + return 'base'; + }, + numericFormats: NUMERIC_FORMATS, + + defaultLargeNumberFormatPostfixes: LargeNumberFormatPostfixes, + + _parseNumberFormatString: function(formatType) { + const formatObject = {}; + + if(!formatType || typeof formatType !== 'string') return; + + const formatList = formatType.toLowerCase().split(' '); + each(formatList, (index, value) => { + if(NUMERIC_FORMATS.includes(value)) { + formatObject.formatType = value; + } else if(value in LargeNumberFormatPowers) { + formatObject.power = LargeNumberFormatPowers[value]; + } + }); + + if(formatObject.power && !formatObject.formatType) { + formatObject.formatType = 'fixedpoint'; + } + + if(formatObject.formatType) { + return formatObject; + } + }, + + _calculateNumberPower: function(value, base, minPower, maxPower) { + let number = Math.abs(value); + let power = 0; + + if(number > 1) { + while(number && number >= base && (maxPower === undefined || power < maxPower)) { + power++; + number = number / base; + } + } else if(number > 0 && number < 1) { + while(number < 1 && (minPower === undefined || power > minPower)) { + power--; + number = number * base; + } + } + + return power; + }, + _getNumberByPower: function(number, power, base) { + let result = number; + + while(power > 0) { + result = result / base; + power--; + } + + while(power < 0) { + result = result * base; + power++; + } + + return result; + }, + _formatNumber: function(value, formatObject, formatConfig) { + if(formatObject.power === 'auto') { + formatObject.power = this._calculateNumberPower(value, 1000, 0, MAX_LARGE_NUMBER_POWER); + } + + if(formatObject.power) { + value = this._getNumberByPower(value, formatObject.power, 1000); + } + + const powerPostfix = this.defaultLargeNumberFormatPostfixes[formatObject.power] || ''; + + let result = this._formatNumberCore(value, formatObject.formatType, formatConfig); + + result = result.replace(/(\d|.$)(\D*)$/, '$1' + powerPostfix + '$2'); + + return result; + }, + + _formatNumberExponential: function(value, formatConfig) { + let power = this._calculateNumberPower(value, DECIMAL_BASE); + let number = this._getNumberByPower(value, power, DECIMAL_BASE); + + if(formatConfig.precision === undefined) { + formatConfig.precision = 1; + } + + if(number.toFixed(formatConfig.precision || 0) >= DECIMAL_BASE) { + power++; + number = number / DECIMAL_BASE; + } + + const powString = (power >= 0 ? '+' : '') + power.toString(); + + return this._formatNumberCore(number, 'fixedpoint', formatConfig) + 'E' + powString; + }, + + _addZeroes: function(value, precision) { + const multiplier = Math.pow(10, precision); + const sign = value < 0 ? '-' : ''; + + value = ((Math.abs(value) * multiplier) >>> 0) / multiplier; + + let result = value.toString(); + while(result.length < precision) { + result = '0' + result; + } + + return sign + result; + }, + + _addGroupSeparators: function(value) { + const parts = value.toString().split('.'); + + return parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, config().thousandsSeparator) + (parts[1] ? config().decimalSeparator + parts[1] : ''); + }, + + _formatNumberCore: function(value, format, formatConfig) { + if(format === 'exponential') { + return this._formatNumberExponential(value, formatConfig); + } + + if(format !== 'decimal' && formatConfig.precision !== null) { + formatConfig.precision = formatConfig.precision || 0; + } + + if(format === 'percent') { + value = value * 100; + } + + if(formatConfig.precision !== undefined) { + if(format === 'decimal') { + value = this._addZeroes(value, formatConfig.precision); + } else { + value = formatConfig.precision === null ? value.toPrecision() : toFixed(value, formatConfig.precision); + } + } + + if(format !== 'decimal') { + value = this._addGroupSeparators(value); + } else { + value = value.toString().replace('.', config().decimalSeparator); + } + + if(format === 'percent') { + value += '%'; + } + + return value; + }, + + _normalizeFormat: function(format) { + if(!format) { + return {}; + } + + if(typeof (format) === 'function') { + return format; + } + + if(!isPlainObject(format)) { + format = { + type: format + }; + } + + return format; + }, + + _getSeparators: function() { + return { + decimalSeparator: this.getDecimalSeparator(), + thousandsSeparator: this.getThousandsSeparator() + }; + }, + + getThousandsSeparator: function() { + return this.format(10000, 'fixedPoint')[2]; + }, + + getDecimalSeparator: function() { + return this.format(1.2, { type: 'fixedPoint', precision: 1 })[1]; + }, + + convertDigits: function(value, toStandard) { + const digits = this.format(90, 'decimal'); + + if(typeof value !== 'string' || digits[1] === '0') { + return value; + } + + const fromFirstDigit = toStandard ? digits[1] : '0'; + const toFirstDigit = toStandard ? '0' : digits[1]; + const fromLastDigit = toStandard ? digits[0] : '9'; + const regExp = new RegExp('[' + fromFirstDigit + '-' + fromLastDigit + ']', 'g'); + + return value.replace(regExp, char => { + return String.fromCharCode(char.charCodeAt(0) + (toFirstDigit.charCodeAt(0) - fromFirstDigit.charCodeAt(0))); + }); + }, + + getNegativeEtalonRegExp: function(format) { + const separators = this._getSeparators(); + const digitalRegExp = new RegExp('[0-9' + escapeRegExp(separators.decimalSeparator + separators.thousandsSeparator) + ']+', 'g'); + const specialCharacters = ['\\', '(', ')', '[', ']', '*', '+', '$', '^', '?', '|', '{', '}']; + + let negativeEtalon = this.format(-1, format).replace(digitalRegExp, '1'); + specialCharacters.forEach(char => { + negativeEtalon = negativeEtalon.replace(new RegExp(`\\${char}`, 'g'), `\\${char}`); + }); + + negativeEtalon = negativeEtalon.replace(/ /g, '\\s'); + negativeEtalon = negativeEtalon.replace(/1/g, '.*'); + return new RegExp(negativeEtalon, 'g'); + }, + + getSign: function(text, format) { + if(!format) { + if(text.replace(/[^0-9-]/g, '').charAt(0) === '-') { + return -1; + } + return 1; + } + + const negativeEtalon = this.getNegativeEtalonRegExp(format); + return text.match(negativeEtalon) ? -1 : 1; + }, + + format: function(value, format) { + if(typeof value !== 'number') { + return value; + } + + if(typeof format === 'number') { + return value; + } + + format = format && format.formatter || format; + + if(typeof format === 'function') { + return format(value); + } + + format = this._normalizeFormat(format); + + if(!format.type) { + format.type = 'decimal'; + } + + const numberConfig = this._parseNumberFormatString(format.type); + + if(!numberConfig) { + const formatterConfig = this._getSeparators(); + formatterConfig.unlimitedIntegerDigits = format.unlimitedIntegerDigits; + return this.convertDigits(getFormatter(format.type, formatterConfig)(value)); + } + + return this._formatNumber(value, numberConfig, format); + }, + + parse: function(text, format) { + if(!text) { + return; + } + + if(format && format.parser) { + return format.parser(text); + } + + text = this.convertDigits(text, true); + + if(format && typeof format !== 'string') { + // Current parser functionality provided as-is and is independent of the most of capabilities of formatter. + errors.log('W0011'); + } + + const decimalSeparator = this.getDecimalSeparator(); + const regExp = new RegExp('[^0-9' + escapeRegExp(decimalSeparator) + ']', 'g'); + const cleanedText = text + .replace(regExp, '') + .replace(decimalSeparator, '.') + .replace(/\.$/g, ''); + + if(cleanedText === '.' || cleanedText === '') { + return null; + } + + if(this._calcSignificantDigits(cleanedText) > 15) { + return NaN; + } + + let parsed = (+cleanedText) * this.getSign(text, format); + + format = this._normalizeFormat(format); + const formatConfig = this._parseNumberFormatString(format.type); + + let power = formatConfig?.power; + + if(power) { + if(power === 'auto') { + const match = text.match(/\d(K|M|B|T)/); + if(match) { + power = Object.keys(LargeNumberFormatPostfixes).find(power => { + return LargeNumberFormatPostfixes[power] === match[1]; + }); + } + } + parsed = parsed * Math.pow(10, (3 * power)); + } + + if(formatConfig?.formatType === 'percent') { + parsed /= 100; + } + + return parsed; + }, + + _calcSignificantDigits: function(text) { + const [ integer, fractional ] = text.split('.'); + const calcDigitsAfterLeadingZeros = digits => { + let index = -1; + for(let i = 0; i < digits.length; i++) { + if(digits[i] !== '0') { + index = i; + break; + } + } + return index > -1 ? digits.length - index : 0; + }; + let result = 0; + if(integer) { + result += calcDigitsAfterLeadingZeros(integer.split('')); + } + if(fractional) { + result += calcDigitsAfterLeadingZeros(fractional.split('').reverse()); + } + return result; + } +}); + +numberLocalization.inject(currencyLocalization); + +if(hasIntl) { + numberLocalization.inject(intlNumberLocalization); +} + +export default numberLocalization; diff --git a/packages/devextreme/js/common/core/localization/open_xml_currency_format.js b/packages/devextreme/js/common/core/localization/open_xml_currency_format.js new file mode 100644 index 000000000000..b04dfe28d8bd --- /dev/null +++ b/packages/devextreme/js/common/core/localization/open_xml_currency_format.js @@ -0,0 +1,37 @@ +export default (currencySymbol, accountingFormat) => { + if(!accountingFormat) { + return; + } + + let encodedCurrencySymbol = currencySymbol; + if(typeof currencySymbol === 'string') { + encodedCurrencySymbol = ''; + for(let i = 0; i < currencySymbol.length; i++) { + if(currencySymbol[i] !== '$') { + encodedCurrencySymbol += '\\'; + } + encodedCurrencySymbol += currencySymbol[i]; + } + } + + const encodeSymbols = { + '.00': '{0}', + '\'': '\\\'', + '\\(': '\\(', + '\\)': '\\)', + ' ': '\\ ', + '"': '"', + '\\¤': encodedCurrencySymbol + }; + + const result = accountingFormat.split(';'); + for(let i = 0; i < result.length; i++) { + for(const symbol in encodeSymbols) { + if(Object.prototype.hasOwnProperty.call(encodeSymbols, symbol)) { + result[i] = result[i].replace(new RegExp(symbol, 'g'), encodeSymbols[symbol]); + } + } + } + + return result.length === 2 ? result[0] + '_);' + result[1] : result[0]; +}; diff --git a/packages/devextreme/js/common/core/localization/parentLocale.js b/packages/devextreme/js/common/core/localization/parentLocale.js new file mode 100644 index 000000000000..58862f431f31 --- /dev/null +++ b/packages/devextreme/js/common/core/localization/parentLocale.js @@ -0,0 +1,12 @@ +/* eslint-disable import/no-commonjs */ +const PARENT_LOCALE_SEPARATOR = '-'; + +export default (parentLocales, locale) => { + const parentLocale = parentLocales[locale]; + + if(parentLocale) { + return parentLocale !== 'root' && parentLocale; + } + + return locale.substr(0, locale.lastIndexOf(PARENT_LOCALE_SEPARATOR)); +}; diff --git a/packages/devextreme/js/common/core/localization/utils.js b/packages/devextreme/js/common/core/localization/utils.js new file mode 100644 index 000000000000..3deba5d56cc6 --- /dev/null +++ b/packages/devextreme/js/common/core/localization/utils.js @@ -0,0 +1,23 @@ +import { sign, multiplyInExponentialForm } from '../../../core/utils/math'; + +const DECIMAL_BASE = 10; + +function roundByAbs(value) { + const valueSign = sign(value); + + return valueSign * Math.round(Math.abs(value)); +} + +function adjustValue(value, precision) { + const precisionMultiplier = Math.pow(DECIMAL_BASE, precision); + const intermediateValue = multiplyInExponentialForm(value, precision); + + return roundByAbs(intermediateValue) / precisionMultiplier; +} + +export function toFixed(value, precision) { + const valuePrecision = precision || 0; + const adjustedValue = valuePrecision > 0 ? adjustValue(...arguments) : value; + + return (adjustedValue).toFixed(valuePrecision); +} diff --git a/packages/devextreme/js/common/data.d.ts b/packages/devextreme/js/common/data.d.ts new file mode 100644 index 000000000000..92644d033f79 --- /dev/null +++ b/packages/devextreme/js/common/data.d.ts @@ -0,0 +1,1340 @@ +/* eslint-disable max-classes-per-file */ +import { DxExtendedPromise, DxPromise } from '../core/utils/deferred'; +import AbstractStore, { AbstractStoreOptions } from '../data/abstract_store'; + +import type { + Store as StoreBase, + StoreOptions as StoreOptionsBase, +} from '../data/store'; + +import type { + SearchOperation as SearchOperationInternal, + GroupingInterval as GroupingIntervalInternal, + SortDescriptor as SortDescriptorInternal, + GroupDescriptor as GroupDescriptorInternal, + SelectDescriptor as SelectDescriptorInternal, + FilterDescriptor as FilterDescriptorInternal, + SummaryDescriptor as SummaryDescriptorInternal, + LoadOptions as LoadOptionsInternal, +} from './data.types'; + +/** + * @namespace DevExpress.common.data + * @public + */ +export type SearchOperation = SearchOperationInternal; + +/** + * @namespace DevExpress.common.data + * @public + */ +export type GroupingInterval = GroupingIntervalInternal; + +/** + * @docid + * @public + * @type object + * @skip + * @namespace DevExpress.common.data + */ +export type SortDescriptor = SortDescriptorInternal; + +/** + * @docid + * @public + * @type object + * @skip + * @namespace DevExpress.common.data + */ +export type GroupDescriptor = GroupDescriptorInternal; + +/** + * @docid + * @public + * @type object + * @skip + * @namespace DevExpress.common.data + */ +export type SelectDescriptor = SelectDescriptorInternal; + +/** + * @docid + * @public + * @type object + * @namespace DevExpress.common.data + */ +export type FilterDescriptor = FilterDescriptorInternal; + +/** + * @public + * @docid + * @type object + * @namespace DevExpress.common.data + */ +export type LoadOptions = LoadOptionsInternal; + +/** + * @docid + * @public + * @type object + * @namespace DevExpress.common.data + */ +export type SummaryDescriptor = SummaryDescriptorInternal; + +/** + * @docid Utils.applyChanges + * @publicName applyChanges(data, changes, options) + * @param3 options?:any + * @namespace DevExpress.common.data + * @public + */ +export function applyChanges(data: Array, changes: Array, options?: { keyExpr?: string | Array; immutable?: boolean }): Array; + +/** + * @docid + * @namespace DevExpress.common.data + * @public + * @type object + * @inherits StoreOptions + */ +export type ArrayStoreOptions< + TItem = any, + TKey = any, +> = AbstractStoreOptions & { + /** + * @docid + * @public + */ + data?: Array; +}; + +/** + * @docid + * @namespace DevExpress.common.data + * @public + * @options ArrayStoreOptions + */ +export class ArrayStore< + TItem = any, + TKey = any, +> extends AbstractStore { + constructor(options?: ArrayStoreOptions); + /** + * @docid + * @publicName byKey(key) + * @param1 key:object|string|number + * @return Promise + * @public + */ + byKey(key: TKey): DxPromise; + /** + * @docid + * @publicName clear() + * @public + */ + clear(): void; + /** + * @docid + * @publicName createQuery() + * @return object + * @public + */ + createQuery(): Query; +} + +/** + * @docid + * @public + * @namespace DevExpress.common.data + */ +export type GroupItem< + TItem = any, +> = { + /** @docid */ + key: any | string | number; + /** + * @docid + * @type Array|Array|null + */ + items: Array | Array> | null; + /** @docid */ + count?: number; + /** @docid */ + summary?: Array; +}; + +type LoadResultArray = Array | Array>; + +/** + * @docid + * @public + * @namespace DevExpress.common.data + */ +export type LoadResultObject = { + /** + * @docid + * @type Array|Array + */ + data: Array | Array>; + /** @docid */ + totalCount?: number; + /** @docid */ + summary?: Array; + /** @docid */ + groupCount?: number; + }; + +/** + * @docid + * @public + * @type object + * @namespace DevExpress.common.data + */ +export type LoadResult< + TItem = any, +> = + | Object + | LoadResultArray + | LoadResultObject; + +/** + * @docid + * @public + * @namespace DevExpress.common.data + */ +export function isLoadResultObject(res: LoadResult): res is LoadResultObject; + +/** + * @docid + * @public + * @namespace DevExpress.common.data + */ +export function isGroupItemsArray(res: LoadResult): res is Array>; + +/** + * @docid + * @public + * @namespace DevExpress.common.data + */ +export function isItemsArray(res: LoadResult): res is Array; + +type LoadFunctionResult = T | DxPromise | PromiseLike; + +/** + * @docid + * @public + * @type object + * @deprecated Use LoadResult instead + * @namespace DevExpress.common.data + */ +export type ResolvedData = LoadResult; + +/** + * @docid + * @public + * @namespace DevExpress.common.data + * @type object + */ +export type CustomStoreOptions< + TItem = any, + TKey = any, +> = StoreOptionsBase & { + /** + * @docid + * @public + * @type_function_param1 key:object|string|number + * @type_function_param2 extraOptions:LoadOptions + * @type_function_return Promise + */ + byKey?: ((key: TKey, extraOptions?: LoadOptions) => PromiseLike); + /** + * @docid + * @default true + * @public + */ + cacheRawData?: boolean; + /** + * @docid + * @type_function_param1 values:object + * @type_function_return Promise + * @public + */ + insert?: ((values: TItem) => PromiseLike); + /** + * @docid + * @type_function_param1 options:LoadOptions + * @type_function_return LoadResult|Promise + * @public + */ + load: (options: LoadOptions) => LoadFunctionResult>; + /** + * @docid + * @default 'processed' + * @public + */ + loadMode?: 'processed' | 'raw'; + /** + * @docid + * @type_function_param1 result:LoadResult + * @type_function_param2 loadOptions:LoadOptions + * @action + * @public + */ + onLoaded?: ((result: LoadResult, loadOptions: LoadOptions) => void); + /** + * @docid + * @type_function_param1 key:object|string|number + * @type_function_return Promise + * @public + */ + remove?: ((key: TKey) => PromiseLike); + /** + * @docid + * @type_function_param1_field filter:object + * @type_function_param1_field group:object + * @type_function_return Promise + * @public + */ + totalCount?: ((loadOptions: { filter?: FilterDescriptor | Array; group?: GroupDescriptor | Array> }) => PromiseLike); + /** + * @docid + * @type_function_param1 key:object|string|number + * @type_function_param2 values:object + * @type_function_return Promise + * @public + */ + update?: ((key: TKey, values: TItem) => PromiseLike); + /** + * @docid + * @default undefined + * @public + */ + useDefaultSearch?: boolean | undefined; +}; + +/** + * @docid + * @inherits Store + * @public + * @options CustomStoreOptions + * @namespace DevExpress.common.data + */ +export class CustomStore< + TItem = any, + TKey = any, +> extends StoreBase { + constructor(options?: CustomStoreOptions); + /** + * @docid + * @publicName byKey(key, extraOptions) + * @param1 key:object|string|number + * @param2 extraOptions:LoadOptions + * @return Promise + * @public + */ + byKey(key: TKey, extraOptions?: LoadOptions): DxPromise; + /** + * @docid + * @publicName clearRawDataCache() + * @public + */ + clearRawDataCache(): void; + /** + * @docid + * @publicName load() + * @return Promise + * @public + */ + load(): DxExtendedPromise>; + /** + * @docid + * @publicName load(options) + * @param1 options:LoadOptions + * @return Promise + * @public + */ + load(options: LoadOptions): DxExtendedPromise>; +} + +type DataSourceEventName = 'changed' | 'loadError' | 'loadingChanged'; + +/** + * @namespace DevExpress.common.data + * @docid + * @public + * @type object + */ +export type DataSourceOptions< + TStoreItem = any, + TMappedItem = TStoreItem, + TItem = TMappedItem, + TKey = any, +> = { + /** + * @docid + * @public + */ + customQueryParams?: any; + /** + * @docid + * @public + */ + expand?: Array | string; + /** + * @docid + * @type Filter expression + * @public + */ + filter?: FilterDescriptor | Array; + /** + * @docid + * @type Group expression + * @public + */ + group?: GroupDescriptor | Array>; + /** + * @docid + * @public + */ + // eslint-disable-next-line spellcheck/spell-checker + langParams?: LangParams; + /** + * @docid + * @type_function_param1 dataItem:object + * @type_function_return object + * @public + */ + map?: ((dataItem: TStoreItem) => TMappedItem); + /** + * @docid + * @type_function_param1_field changes:Array + * @action + * @public + */ + onChanged?: ((e: { readonly changes?: Array }) => void); + /** + * @docid + * @action + * @public + */ + onLoadError?: ((error: { readonly message?: string }) => void); + /** + * @docid + * @action + * @public + */ + onLoadingChanged?: ((isLoading: boolean) => void); + /** + * @docid + * @default 20 + * @public + */ + pageSize?: number; + /** + * @docid + * @default undefined + * @public + */ + paginate?: boolean | undefined; + /** + * @docid + * @type_function_param1 data:Array + * @type_function_return Array + * @public + */ + postProcess?: ((data: Array) => Array); + /** + * @docid + * @default undefined + * @public + */ + pushAggregationTimeout?: number | undefined; + /** + * @docid + * @public + */ + requireTotalCount?: boolean; + /** + * @docid + * @default false + * @public + */ + reshapeOnPush?: boolean; + /** + * @docid + * @type getter|Array + * @public + */ + searchExpr?: string | Function | Array; + /** + * @docid + * @default "contains" + * @public + */ + searchOperation?: SearchOperation; + /** + * @docid + * @default null + * @public + */ + searchValue?: any; + /** + * @docid + * @type Select expression + * @public + */ + select?: SelectDescriptor; + /** + * @docid + * @type Sort expression + * @public + */ + sort?: SortDescriptor | Array>; + /** + * @docid + * @public + * @type Store|StoreOptions|Array + */ + store?: Array | Store | StoreOptions; +}; + +/** + * @docid + * @public + * @options DataSourceOptions + * @namespace DevExpress.common.data + */ +export class DataSource< + TItem = any, + TKey = any, +> { + constructor(data: Array); + constructor(options: CustomStoreOptions | DataSourceOptions); + constructor(store: Store); + constructor(url: string); + /** + * @docid + * @publicName cancel(operationId) + * @public + */ + cancel(operationId: number): boolean; + /** + * @docid + * @publicName dispose() + * @public + */ + dispose(): void; + /** + * @docid + * @publicName filter() + * @return object + * @public + */ + filter(): FilterDescriptor | Array; + /** + * @docid + * @publicName filter(filterExpr) + * @param1 filterExpr:object + * @public + */ + filter(filterExpr: FilterDescriptor | Array): void; + /** + * @docid + * @publicName group() + * @return object + * @public + */ + group(): GroupDescriptor | Array>; + /** + * @docid + * @publicName group(groupExpr) + * @param1 groupExpr:object + * @public + */ + group(groupExpr: GroupDescriptor | Array>): void; + /** + * @docid + * @publicName isLastPage() + * @public + */ + isLastPage(): boolean; + /** + * @docid + * @publicName isLoaded() + * @public + */ + isLoaded(): boolean; + /** + * @docid + * @publicName isLoading() + * @public + */ + isLoading(): boolean; + /** + * @docid + * @publicName items() + * @public + */ + items(): Array; + /** + * @docid + * @publicName key() + * @public + */ + key(): string | Array; + /** + * @docid + * @publicName load() + * @return Promise + * @public + */ + load(): DxExtendedPromise; + /** + * @docid + * @publicName loadOptions() + * @return object + * @public + */ + loadOptions(): LoadOptions; + /** + * @docid + * @publicName off(eventName) + * @param1 eventName:string + * @return this + * @public + */ + off(eventName: DataSourceEventName): this; + /** + * @docid + * @publicName off(eventName, eventHandler) + * @param1 eventName:string + * @return this + * @public + */ + off(eventName: DataSourceEventName, eventHandler: Function): this; + /** + * @docid + * @publicName on(eventName, eventHandler) + * @param1 eventName:string + * @return this + * @public + */ + on(eventName: DataSourceEventName, eventHandler: Function): this; + /** + * @docid + * @publicName on(events) + * @param1 events:object + * @return this + * @public + */ + on(events: { [key in DataSourceEventName]?: Function }): this; + /** + * @docid + * @publicName pageIndex() + * @return numeric + * @public + */ + pageIndex(): number; + /** + * @docid + * @publicName pageIndex(newIndex) + * @param1 newIndex:numeric + * @public + */ + pageIndex(newIndex: number): void; + /** + * @docid + * @publicName pageSize() + * @return numeric + * @public + */ + pageSize(): number; + /** + * @docid + * @publicName pageSize(value) + * @param1 value:numeric + * @public + */ + pageSize(value: number): void; + /** + * @docid + * @publicName paginate() + * @public + */ + paginate(): boolean; + /** + * @docid + * @publicName paginate(value) + * @public + */ + paginate(value: boolean): void; + /** + * @docid + * @publicName reload() + * @return Promise + * @public + */ + reload(): DxExtendedPromise; + /** + * @docid + * @publicName requireTotalCount() + * @public + */ + requireTotalCount(): boolean; + /** + * @docid + * @publicName requireTotalCount(value) + * @public + */ + requireTotalCount(value: boolean): void; + /** + * @docid + * @publicName searchExpr() + * @return getter|Array + * @public + */ + searchExpr(): string & Function & Array; + /** + * @docid + * @publicName searchExpr(expr) + * @param1 expr:getter|Array + * @public + */ + searchExpr(expr: string | Function | Array): void; + /** + * @docid + * @publicName searchOperation() + * @public + */ + searchOperation(): string; + /** + * @docid + * @publicName searchOperation(op) + * @public + */ + searchOperation(op: string): void; + /** + * @docid + * @publicName searchValue() + * @public + */ + searchValue(): any; + /** + * @docid + * @publicName searchValue(value) + * @public + */ + searchValue(value: any): void; + /** + * @docid + * @publicName select() + * @return any + * @public + */ + select(): SelectDescriptor; + /** + * @docid + * @publicName select(expr) + * @param1 expr:any + * @public + */ + select(expr: SelectDescriptor): void; + /** + * @docid + * @publicName sort() + * @return any + * @public + */ + sort(): SortDescriptor | Array>; + /** + * @docid + * @publicName sort(sortExpr) + * @param1 sortExpr:any + * @public + */ + sort(sortExpr: SortDescriptor | Array>): void; + /** + * @docid + * @publicName store() + * @return object + * @public + */ + store(): Store; + /** + * @docid + * @publicName totalCount() + * @return numeric + * @public + */ + totalCount(): number; +} + +/** + * @docid + * @public + * @namespace DevExpress.common.data + */ +export type LangParams = { + /** + * @docid + * @public + */ + locale: string; + /** + * @docid + * @public + * @type object + */ + collatorOptions?: Intl.CollatorOptions; +}; + +/** +* @public +* @namespace DevExpress.data.utils +*/ +export type Store = + CustomStore | + ArrayStore | + LocalStore | + ODataStore; + +/** +* @public +* @namespace DevExpress.data.utils +* @type object +*/ +export type StoreOptions = + CustomStoreOptions | + ArrayStoreOptions & { type: 'array' } | + LocalStoreOptions & { type: 'local' } | + ODataStoreOptions & { type: 'odata' }; + +/** + * @docid + * @namespace DevExpress.common.data + * @public + */ +export class EndpointSelector { + constructor(options: any); + /** + * @docid + * @publicName urlFor(key) + * @public + */ + urlFor(key: string): string; +} + +/** + * @docid Utils.errorHandler + * @type function(e) + * @namespace DevExpress.common.data + * @deprecated Utils.setErrorHandler + * @public + */ +export function errorHandler(e: Error): void; + +/** + * @docid Utils.setErrorHandler + * @type function(handler) + * @namespace DevExpress.common.data + * @public + */ +export function setErrorHandler(handler: (e: Error) => void): void; + +/** + * @docid + * @public + * @namespace DevExpress.common.data + */ +export type LocalStoreOptions< + TItem = any, + TKey = any, +> = ArrayStoreOptions & { + /** + * @docid + * @default 10000 + * @public + */ + flushInterval?: number; + /** + * @docid + * @default false + * @public + */ + immediate?: boolean; + /** + * @docid + * @public + */ + name?: string; +}; + +/** + * @docid + * @inherits ArrayStore + * @public + * @options LocalStoreOptions + * @namespace DevExpress.common.data + */ +export class LocalStore< + TItem = any, + TKey = any, +> extends ArrayStore { + constructor(options?: LocalStoreOptions); + /** + * @docid + * @publicName clear() + * @public + */ + clear(): void; +} + +/** + * @docid + * @type object + * @public + * @namespace DevExpress.common.data + */ +export type Query = { + /** + * @docid + * @publicName aggregate(seed, step, finalize) + * @param1 seed:object + * @return Promise + * @public + */ + aggregate(seed: any, step: Function, finalize: Function): DxPromise; + /** + * @docid + * @publicName aggregate(step) + * @return Promise + * @public + */ + aggregate(step: Function): DxPromise; + /** + * @docid + * @publicName avg() + * @return Promise + * @public + */ + avg(): DxPromise; + /** + * @docid + * @publicName avg(getter) + * @param1 getter:object + * @return Promise + * @public + */ + avg(getter: any): DxPromise; + /** + * @docid + * @publicName count() + * @return Promise + * @public + */ + count(): DxPromise; + /** + * @docid + * @publicName enumerate() + * @return Promise + * @public + */ + enumerate(): DxPromise; + /** + * @docid + * @publicName filter(criteria) + * @public + */ + filter(criteria: Array): Query; + /** + * @docid + * @publicName filter(predicate) + * @public + */ + filter(predicate: Function): Query; + /** + * @docid + * @publicName groupBy(getter) + * @param1 getter:object + * @public + */ + groupBy(getter: any): Query; + /** + * @docid + * @publicName max() + * @return Promise + * @public + */ + max(): DxPromise; + /** + * @docid + * @publicName max(getter) + * @param1 getter:object + * @return Promise + * @public + */ + max(getter: any): DxPromise; + /** + * @docid + * @publicName min() + * @return Promise + * @public + */ + min(): DxPromise; + /** + * @docid + * @publicName min(getter) + * @param1 getter:object + * @return Promise + * @public + */ + min(getter: any): DxPromise; + /** + * @docid + * @publicName select(getter) + * @param1 getter:object|Array + * @public + */ + select(...getters: any[]): Query; + /** + * @docid + * @publicName slice(skip, take) + * @param2 take:number|undefined + * @public + */ + slice(skip: number, take?: number): Query; + /** + * @docid + * @publicName sortBy(getter) + * @param1 getter:object + * @public + */ + sortBy(getter: any): Query; + /** + * @docid + * @publicName sortBy(getter, desc) + * @param1 getter:object + * @public + */ + sortBy(getter: any, desc: boolean): Query; + /** + * @docid + * @publicName sum() + * @return Promise + * @public + */ + sum(): DxPromise; + /** + * @docid + * @publicName sum(getter) + * @param1 getter:object + * @return Promise + * @public + */ + sum(getter: any): DxPromise; + /** + * @docid + * @publicName thenBy(getter) + * @param1 getter:object + * @public + */ + thenBy(getter: any): Query; + /** + * @docid + * @publicName thenBy(getter, desc) + * @param1 getter:object + * @public + */ + thenBy(getter: any, desc: boolean): Query; + /** + * @docid + * @publicName toArray() + * @public + */ + toArray(): Array; +}; + +/** + * @docid Utils.query + * @publicName query(array, queryOptions) + * @param2 queryOptions:object + * @namespace DevExpress.common.data + * @public + */ +export function query(array: Array, queryOptions?: any): Query; + +/** + * @docid Utils.query + * @publicName query(url, queryOptions) + * @param2 queryOptions:object + * @namespace DevExpress.common.data + * @public + */ +export function query(url: string, queryOptions: any): Query; + +/** + * @docid Utils.base64_encode + * @publicName base64_encode(input) + * @namespace DevExpress.common.data + * @public + */ +export function base64_encode(input: string | Array): string; + +/** + * @docid Utils.compileGetter + * @publicName compileGetter(expr) + * @namespace DevExpress.common.data + * @public + */ +export function compileGetter(expr: string | Array): Function; + +/** + * @docid Utils.compileSetter + * @publicName compileSetter(expr) + * @namespace DevExpress.common.data + * @public + */ +export function compileSetter(expr: string | Array): Function; + +export interface ODataRequestOptions { + accepts: any; + async: boolean; + contentType: string | boolean; + data: any; + dataType: string; + headers: any; + jsonp?: boolean; + method: string; + timeout: number; + url: string; + xhrFields: any; +} + +export type HttpMethod = 'GET' | 'POST' | 'PATCH' | 'MERGE'; + +/** + * @docid + * @public + * @namespace DevExpress.common.data + * @type object + */ +export type ODataContextOptions = { + /** + * @docid + * @type_function_param1_field params:object + * @type_function_param1_field payload:object + * @type_function_param1_field headers:object + * @public + */ + beforeSend?: ((options: { url: string; async: boolean; method: string; timeout: number; params: any; payload: any; headers: any }) => void); + /** + * @docid + * @public + */ + deserializeDates?: boolean; + /** + * @docid + * @public + */ + entities?: any; + /** + * @docid + * @type_function_param1 e:Error + * @type_function_param1_field errorDetails:object + * @type_function_param1_field requestOptions:object + * @public + */ + errorHandler?: ((e: { httpStatus: number; errorDetails: any; requestOptions: ODataRequestOptions }) => void); + /** + * @docid + * @public + */ + filterToLower?: boolean; + /** + * @docid + * @default false + * @public + */ + jsonp?: boolean; + /** + * @docid + * @public + */ + url?: string; + /** + * @docid + * @default 4 + * @acceptValues 2|3|4 + * @public + */ + version?: number; + /** + * @docid + * @default false + * @public + */ + withCredentials?: boolean; +}; + +/** + * @docid + * @public + * @options ODataContextOptions + * @namespace DevExpress.common.data + */ +export class ODataContext { + constructor(options?: ODataContextOptions); + /** + * @docid + * @publicName get(operationName, params) + * @param2 params:object + * @return Promise + * @public + */ + get(operationName: string, params: any): DxPromise; + /** + * @docid + * @publicName invoke(operationName, params, httpMethod) + * @param2 params:object + * @param3 httpMethod:string + * @return Promise + * @public + */ + invoke(operationName: string, params: any, httpMethod: HttpMethod): DxPromise; + /** + * @docid + * @publicName objectLink(entityAlias, key) + * @param2 key:object|string|number + * @return object + * @public + */ + objectLink(entityAlias: string, key: any | string | number): any; +} + +/** + * @docid + * @public + * @namespace DevExpress.common.data + * @type object + */ +export type ODataStoreOptions< + TItem = any, + TKey = any, +> = AbstractStoreOptions & { + /** + * @docid + * @type_function_param1_field params:object + * @type_function_param1_field payload:object + * @type_function_param1_field headers:object + * @public + */ + beforeSend?: ((options: { url: string; async: boolean; method: string; timeout: number; params: any; payload: any; headers: any }) => void); + /** + * @docid + * @public + */ + deserializeDates?: boolean; + /** + * @docid + * @type_function_param1 e:Error + * @type_function_param1_field errorDetails:object + * @type_function_param1_field requestOptions:object + * @public + */ + errorHandler?: ((e: { httpStatus: number; errorDetails: any; requestOptions: ODataRequestOptions }) => void); + /** + * @docid + * @default {} + * @public + */ + fieldTypes?: any; + /** + * @docid + * @public + */ + filterToLower?: boolean; + /** + * @docid + * @default false + * @public + */ + jsonp?: boolean; + /** + * @docid + * @type string|object + * @acceptValues "String"|"Int32"|"Int64"|"Guid"|"Boolean"|"Single"|"Decimal" + * @public + */ + keyType?: 'String' | 'Int32' | 'Int64' | 'Guid' | 'Boolean' | 'Single' | 'Decimal' | any; + /** + * @docid + * @public + */ + url?: string; + /** + * @docid + * @default 4 + * @acceptValues 2|3|4 + * @public + */ + version?: number; + /** + * @docid + * @default false + * @public + */ + withCredentials?: boolean; +}; + +/** + * @docid + * @inherits Store + * @public + * @options ODataStoreOptions + * @namespace DevExpress.common.data + */ +export class ODataStore< + TItem = any, + TKey = any, +> extends AbstractStore { + constructor(options?: ODataStoreOptions); + /** + * @docid + * @publicName byKey(key, extraOptions) + * @param1 key:object|string|number + * @return Promise + * @public + */ + byKey(key: TKey, extraOptions?: { expand?: string | Array; select?: string | Array }): DxPromise; + /** + * @docid + * @publicName createQuery(loadOptions) + * @return object + * @public + */ + createQuery(loadOptions?: { expand?: string | Array; requireTotalCount?: boolean; customQueryParams?: any }): Query; +} + +/** + * @docid + * @namespace DevExpress.common.data + * @public + */ +export class EdmLiteral { + constructor(value: string); + /** + * @docid + * @publicName valueOf() + * @public + */ + valueOf(): string; +} + +/** + * @const Utils.keyConverters + * @publicName odata.keyConverters + * @namespace DevExpress.common.data + * @public + */ +// eslint-disable-next-line vars-on-top, import/no-mutable-exports, no-var, @typescript-eslint/init-declarations, @typescript-eslint/no-explicit-any +export var keyConverters: any; diff --git a/packages/devextreme/js/common/data.js b/packages/devextreme/js/common/data.js new file mode 100644 index 000000000000..8c5cd19312a2 --- /dev/null +++ b/packages/devextreme/js/common/data.js @@ -0,0 +1,36 @@ +import applyChanges from './data/apply_changes'; +import ArrayStore from './data/array_store'; +import { CustomStore, isGroupItemsArray, isItemsArray, isLoadResultObject } from './data/custom_store'; +import DataSource from './data/data_source'; +import EndpointSelector from './data/endpoint_selector'; +import { errorHandler, setErrorHandler } from './data/errors'; +import LocalStore from './data/local_store'; +import query from './data/query'; +import { base64_encode, compileGetter, compileSetter } from './data/utils'; +import DataHelperMixin from './data/data_helper'; +import ODataContext from './data/odata/context'; +import ODataStore from './data/odata/store'; +import { EdmLiteral, keyConverters } from './data/odata/utils'; + +export { + applyChanges, + ArrayStore, + CustomStore, + isGroupItemsArray, + isItemsArray, + isLoadResultObject, + DataSource, + EndpointSelector, + errorHandler, + setErrorHandler, + LocalStore, + query, + base64_encode, + compileGetter, + compileSetter, + DataHelperMixin, + ODataContext, + ODataStore, + EdmLiteral, + keyConverters, +}; diff --git a/packages/devextreme/js/common/data.types.d.ts b/packages/devextreme/js/common/data.types.d.ts new file mode 100644 index 000000000000..3dcdfb98be1a --- /dev/null +++ b/packages/devextreme/js/common/data.types.d.ts @@ -0,0 +1,153 @@ +import { + KeySelector, + OrderingDescriptor, + SelectionDescriptor, +} from '../data/data.types'; + +/** + * @namespace DevExpress.data + */ +export type SearchOperation = '=' | '<>' | '>' | '>=' | '<' | '<=' | 'startswith' | 'endswith' | 'contains' | 'notcontains'; + +/** + * @namespace DevExpress.data + */ +export type GroupingInterval = 'year' | 'quarter' | 'month' | 'day' | 'dayOfWeek' | 'hour' | 'minute' | 'second'; + +/** + * @namespace DevExpress.data + */ +export type SortDescriptor = KeySelector | OrderingDescriptor; + +/** + * @namespace DevExpress.data + */ +export type GroupDescriptor = KeySelector | (OrderingDescriptor & { + groupInterval?: number | GroupingInterval; + isExpanded?: boolean; +}); + +/** + * @namespace DevExpress.data + */ +export type SelectDescriptor = string | Array | ((source: T) => any); + +/** + * @namespace DevExpress.data + */ +export type FilterDescriptor = any; + +/** + * @namespace DevExpress.data + */ +export type SummaryDescriptor = KeySelector | SelectionDescriptor & { + summaryType?: 'sum' | 'avg' | 'min' | 'max' | 'count'; +}; + +/** + * @namespace DevExpress.data + */ +export interface LoadOptions { + /** + * @docid + * @public + */ + customQueryParams?: any; + /** + * @docid + * @public + */ + startDate?: Date; + /** + * @docid + * @public + */ + endDate?: Date; + /** + * @docid + * @public + */ + expand?: Array; + /** + * @docid + * @public + * @type object + */ + filter?: FilterDescriptor | Array; + /** + * @docid + * @public + * @type object + */ + group?: GroupDescriptor | Array>; + /** + * @docid + * @public + * @type SummaryDescriptor | Array + */ + groupSummary?: SummaryDescriptor | Array>; + /** + * @docid + * @public + */ + parentIds?: Array; + /** + * @docid + * @public + */ + requireGroupCount?: boolean; + /** + * @docid + * @public + */ + requireTotalCount?: boolean; + /** + * @docid + * @type getter|Array + * @public + */ + searchExpr?: string | Function | Array; + /** + * @docid + * @public + */ + searchOperation?: SearchOperation; + /** + * @docid + * @public + */ + searchValue?: any; + /** + * @docid + * @public + * @type object + */ + select?: SelectDescriptor; + /** + * @docid + * @public + */ + skip?: number; + /** + * @docid + * @public + * @type object + */ + sort?: SortDescriptor | Array>; + /** + * @docid + * @public + */ + take?: number; + /** + * @docid + * @public + * @type SummaryDescriptor | Array + */ + totalSummary?: SummaryDescriptor | Array>; + /** + * @docid + * @public + */ + userData?: any; +} diff --git a/packages/devextreme/js/common/data/abstract_store.js b/packages/devextreme/js/common/data/abstract_store.js new file mode 100644 index 000000000000..a5d02c408838 --- /dev/null +++ b/packages/devextreme/js/common/data/abstract_store.js @@ -0,0 +1 @@ +export { default } from '../../__internal/data/m_abstract_store'; diff --git a/packages/devextreme/js/common/data/apply_changes.js b/packages/devextreme/js/common/data/apply_changes.js new file mode 100644 index 000000000000..b853ad713ae0 --- /dev/null +++ b/packages/devextreme/js/common/data/apply_changes.js @@ -0,0 +1,3 @@ +import { applyChanges } from './array_utils'; + +export default applyChanges; diff --git a/packages/devextreme/js/common/data/array_query.js b/packages/devextreme/js/common/data/array_query.js new file mode 100644 index 000000000000..a3877e9bbd98 --- /dev/null +++ b/packages/devextreme/js/common/data/array_query.js @@ -0,0 +1 @@ +export { default } from '../../__internal/data/m_array_query'; diff --git a/packages/devextreme/js/common/data/array_store.js b/packages/devextreme/js/common/data/array_store.js new file mode 100644 index 000000000000..0715f4b3927f --- /dev/null +++ b/packages/devextreme/js/common/data/array_store.js @@ -0,0 +1 @@ +export { default } from '../../__internal/data/m_array_store'; diff --git a/packages/devextreme/js/common/data/array_utils.js b/packages/devextreme/js/common/data/array_utils.js new file mode 100644 index 000000000000..74993adf03d4 --- /dev/null +++ b/packages/devextreme/js/common/data/array_utils.js @@ -0,0 +1 @@ +export * from '../../__internal/data/m_array_utils'; diff --git a/packages/devextreme/js/common/data/custom-store.d.ts b/packages/devextreme/js/common/data/custom-store.d.ts index a10801a29fc5..c352ead2c6ae 100644 --- a/packages/devextreme/js/common/data/custom-store.d.ts +++ b/packages/devextreme/js/common/data/custom-store.d.ts @@ -1,69 +1,8 @@ -/** - * @docid - * @public - */ -export type GroupItem< - TItem = any, -> = { - /** @docid */ - key: any | string | number; - /** - * @docid - * @type Array|Array|null - */ - items: Array | Array> | null; - /** @docid */ - count?: number; - /** @docid */ - summary?: Array; -}; - -type LoadResultArray = Array | Array>; - -/** - * @docid - * @public - */ -export type LoadResultObject = { - /** - * @docid - * @type Array|Array - */ - data: Array | Array>; - /** @docid */ - totalCount?: number; - /** @docid */ - summary?: Array; - /** @docid */ - groupCount?: number; - }; - -/** - * @docid - * @public - * @type object - */ -export type LoadResult< - TItem = any, -> = - | Object - | LoadResultArray - | LoadResultObject; - -/** - * @docid - * @public - */ -export function isLoadResultObject(res: LoadResult): res is LoadResultObject; - -/** - * @docid - * @public - */ -export function isGroupItemsArray(res: LoadResult): res is Array>; - -/** - * @docid - * @public - */ -export function isItemsArray(res: LoadResult): res is Array; +export { + GroupItem, + LoadResultObject, + LoadResult, + isLoadResultObject, + isGroupItemsArray, + isItemsArray, +} from '../data'; diff --git a/packages/devextreme/js/common/data/custom-store.js b/packages/devextreme/js/common/data/custom-store.js index 095a86a5b60b..8537994ae794 100644 --- a/packages/devextreme/js/common/data/custom-store.js +++ b/packages/devextreme/js/common/data/custom-store.js @@ -1,18 +1,5 @@ -function isGroupItem(item) { - if(item === undefined || item === null || typeof item !== 'object') { - return false; - } - return 'key' in item && 'items' in item; -} - -export function isLoadResultObject(res) { - return !Array.isArray(res) && 'data' in res; -} - -export function isGroupItemsArray(res) { - return Array.isArray(res) && !!res.length && isGroupItem(res[0]); -} - -export function isItemsArray(res) { - return Array.isArray(res) && !isGroupItem(res[0]); -} +export { + isLoadResultObject, + isGroupItemsArray, + isItemsArray, +} from './custom_store'; diff --git a/packages/devextreme/js/common/data/custom_store.js b/packages/devextreme/js/common/data/custom_store.js new file mode 100644 index 000000000000..7e530635fab3 --- /dev/null +++ b/packages/devextreme/js/common/data/custom_store.js @@ -0,0 +1,27 @@ +import CustomStore from '../../__internal/data/m_custom_store'; + +function isGroupItem(item) { + if(item === undefined || item === null || typeof item !== 'object') { + return false; + } + return 'key' in item && 'items' in item; +} + +function isLoadResultObject(res) { + return !Array.isArray(res) && 'data' in res; +} + +function isGroupItemsArray(res) { + return Array.isArray(res) && !!res.length && isGroupItem(res[0]); +} + +function isItemsArray(res) { + return Array.isArray(res) && !isGroupItem(res[0]); +} + +export { + CustomStore, + isLoadResultObject, + isGroupItemsArray, + isItemsArray, +}; diff --git a/packages/devextreme/js/common/data/data_helper.js b/packages/devextreme/js/common/data/data_helper.js new file mode 100644 index 000000000000..998956583371 --- /dev/null +++ b/packages/devextreme/js/common/data/data_helper.js @@ -0,0 +1,166 @@ + +import { DataSource } from './data_source/data_source'; +import { extend } from '../../core/utils/extend'; +import { normalizeDataSourceOptions } from './data_source/utils'; +import DataController from '../../__internal/ui/collection/m_data_controller'; + +const DATA_SOURCE_OPTIONS_METHOD = '_dataSourceOptions'; +const DATA_SOURCE_CHANGED_METHOD = '_dataSourceChangedHandler'; +const DATA_SOURCE_LOAD_ERROR_METHOD = '_dataSourceLoadErrorHandler'; +const DATA_SOURCE_LOADING_CHANGED_METHOD = '_dataSourceLoadingChangedHandler'; +const DATA_SOURCE_FROM_URL_LOAD_MODE_METHOD = '_dataSourceFromUrlLoadMode'; +const SPECIFIC_DATA_SOURCE_OPTION = '_getSpecificDataSourceOption'; +const NORMALIZE_DATA_SOURCE = '_normalizeDataSource'; + + +const DataHelperMixin = { + + postCtor: function() { + this.on('disposing', function() { + this._disposeDataSource(); + }.bind(this)); + }, + + _refreshDataSource: function() { + this._initDataSource(); + this._loadDataSource(); + }, + + _initDataSource: function() { + let dataSourceOptions = (SPECIFIC_DATA_SOURCE_OPTION in this) ? this[SPECIFIC_DATA_SOURCE_OPTION]() : this.option('dataSource'); + let widgetDataSourceOptions; + let dataSourceType; + + this._disposeDataSource(); + + if(dataSourceOptions) { + if(dataSourceOptions instanceof DataSource) { + this._isSharedDataSource = true; + this._dataSource = dataSourceOptions; + } else { + widgetDataSourceOptions = (DATA_SOURCE_OPTIONS_METHOD in this) ? this[DATA_SOURCE_OPTIONS_METHOD]() : {}; + dataSourceType = this._dataSourceType ? this._dataSourceType() : DataSource; + + dataSourceOptions = normalizeDataSourceOptions(dataSourceOptions, { + fromUrlLoadMode: (DATA_SOURCE_FROM_URL_LOAD_MODE_METHOD in this) && this[DATA_SOURCE_FROM_URL_LOAD_MODE_METHOD]() + }); + + this._dataSource = new dataSourceType(extend(true, {}, widgetDataSourceOptions, dataSourceOptions)); + } + + if(NORMALIZE_DATA_SOURCE in this) { + this._dataSource = this[NORMALIZE_DATA_SOURCE](this._dataSource); + } + + this._addDataSourceHandlers(); + this._initDataController(); + } + }, + + _initDataController: function() { + const dataController = this.option?.('_dataController'); + const dataSource = this._dataSource; + + if(dataController) { + this._dataController = dataController; + } else { + this._dataController = new DataController(dataSource); + } + }, + + _addDataSourceHandlers: function() { + if(DATA_SOURCE_CHANGED_METHOD in this) { + this._addDataSourceChangeHandler(); + } + + if(DATA_SOURCE_LOAD_ERROR_METHOD in this) { + this._addDataSourceLoadErrorHandler(); + } + + if(DATA_SOURCE_LOADING_CHANGED_METHOD in this) { + this._addDataSourceLoadingChangedHandler(); + } + + this._addReadyWatcher(); + }, + + _addReadyWatcher: function() { + this.readyWatcher = (function(isLoading) { + this._ready && this._ready(!isLoading); + }).bind(this); + this._dataSource.on('loadingChanged', this.readyWatcher); + }, + + _addDataSourceChangeHandler: function() { + const dataSource = this._dataSource; + this._proxiedDataSourceChangedHandler = (function(e) { + this[DATA_SOURCE_CHANGED_METHOD](dataSource.items(), e); + }).bind(this); + dataSource.on('changed', this._proxiedDataSourceChangedHandler); + }, + + _addDataSourceLoadErrorHandler: function() { + this._proxiedDataSourceLoadErrorHandler = this[DATA_SOURCE_LOAD_ERROR_METHOD].bind(this); + this._dataSource.on('loadError', this._proxiedDataSourceLoadErrorHandler); + }, + + _addDataSourceLoadingChangedHandler: function() { + this._proxiedDataSourceLoadingChangedHandler = this[DATA_SOURCE_LOADING_CHANGED_METHOD].bind(this); + this._dataSource.on('loadingChanged', this._proxiedDataSourceLoadingChangedHandler); + }, + + _loadDataSource: function() { + const dataSource = this._dataSource; + if(dataSource) { + if(dataSource.isLoaded()) { + this._proxiedDataSourceChangedHandler && this._proxiedDataSourceChangedHandler(); + } else { + dataSource.load(); + } + } + }, + + _loadSingle: function(key, value) { + key = key === 'this' ? this._dataSource.key() || 'this' : key; + return this._dataSource.loadSingle(key, value); + }, + + _isLastPage: function() { + return !this._dataSource || this._dataSource.isLastPage() || !this._dataSource._pageSize; + }, + + _isDataSourceLoading: function() { + return this._dataSource && this._dataSource.isLoading(); + }, + + _disposeDataSource: function() { + if(this._dataSource) { + if(this._isSharedDataSource) { + delete this._isSharedDataSource; + + this._proxiedDataSourceChangedHandler && this._dataSource.off('changed', this._proxiedDataSourceChangedHandler); + this._proxiedDataSourceLoadErrorHandler && this._dataSource.off('loadError', this._proxiedDataSourceLoadErrorHandler); + this._proxiedDataSourceLoadingChangedHandler && this._dataSource.off('loadingChanged', this._proxiedDataSourceLoadingChangedHandler); + + if(this._dataSource._eventsStrategy) { + this._dataSource._eventsStrategy.off('loadingChanged', this.readyWatcher); + } + } else { + this._dataSource.dispose(); + } + + delete this._dataSource; + + delete this._proxiedDataSourceChangedHandler; + delete this._proxiedDataSourceLoadErrorHandler; + delete this._proxiedDataSourceLoadingChangedHandler; + } + }, + + getDataSource: function() { + return this._dataSource || null; + } + +}; + +export default DataHelperMixin; diff --git a/packages/devextreme/js/common/data/data_source.js b/packages/devextreme/js/common/data/data_source.js new file mode 100644 index 000000000000..56ca945f1932 --- /dev/null +++ b/packages/devextreme/js/common/data/data_source.js @@ -0,0 +1,2 @@ +import { DataSource } from './data_source/data_source'; +export default DataSource; diff --git a/packages/devextreme/js/common/data/data_source/data_source.js b/packages/devextreme/js/common/data/data_source/data_source.js new file mode 100644 index 000000000000..806ca4198f06 --- /dev/null +++ b/packages/devextreme/js/common/data/data_source/data_source.js @@ -0,0 +1,29 @@ +/** + * @name DataSource.ctor + * @publicName ctor(url) + * @param1 url:string + * @hidden + */ +/** + * @name DataSource.ctor + * @publicName ctor(data) + * @param1 data:Array + * @hidden + */ +/** + * @name DataSource.ctor + * @publicName ctor(store) + * @param1 store:Store + * @hidden + */ +/** + * @name DataSource.ctor + * @publicName ctor(options) + * @param1 options:CustomStoreOptions|DataSourceOptions + * @hidden + */ +/** + * @name DataSourceOptions.store.type + * @type Enums.StoreType + */ +export * from '../../../__internal/data/data_source/m_data_source'; diff --git a/packages/devextreme/js/common/data/data_source/operation_manager.js b/packages/devextreme/js/common/data/data_source/operation_manager.js new file mode 100644 index 000000000000..059f55b8e65f --- /dev/null +++ b/packages/devextreme/js/common/data/data_source/operation_manager.js @@ -0,0 +1 @@ +export { default } from '../../../__internal/data/data_source/m_operation_manager'; diff --git a/packages/devextreme/js/common/data/data_source/utils.js b/packages/devextreme/js/common/data/data_source/utils.js new file mode 100644 index 000000000000..8b2686832ca6 --- /dev/null +++ b/packages/devextreme/js/common/data/data_source/utils.js @@ -0,0 +1 @@ +export * from '../../../__internal/data/data_source/m_utils'; diff --git a/packages/devextreme/js/common/data/endpoint_selector.js b/packages/devextreme/js/common/data/endpoint_selector.js new file mode 100644 index 000000000000..e613c011c0ce --- /dev/null +++ b/packages/devextreme/js/common/data/endpoint_selector.js @@ -0,0 +1,7 @@ +/** + * @name EndpointSelector.ctor + * @publicName ctor(options) + * @param1 options:Object + * @hidden +*/ +export { default } from '../../__internal/data/m_endpoint_selector'; diff --git a/packages/devextreme/js/common/data/errors.js b/packages/devextreme/js/common/data/errors.js new file mode 100644 index 000000000000..f2ad9f675151 --- /dev/null +++ b/packages/devextreme/js/common/data/errors.js @@ -0,0 +1,91 @@ +/** +* @docid +* @name ErrorsData +*/ + +/** +* @name ErrorsData.E4000 +*/ +/** + * @name ErrorsData.E4001 +*/ +/** +* @name ErrorsData.E4002 +*/ +/** +* @name ErrorsData.E4003 +*/ +/** +* @name ErrorsData.E4004 +*/ +/** +* @name ErrorsData.E4005 +*/ +/** +* @name ErrorsData.E4006 +*/ +/** +* @name ErrorsData.E4007 +*/ +/** +* @name ErrorsData.E4008 +*/ +/** +* @name ErrorsData.E4009 +*/ +/** +* @name ErrorsData.E4010 +*/ +/** +* @name ErrorsData.E4011 +*/ +/** +* @name ErrorsData.E4012 +*/ +/** +* @name ErrorsData.E4013 +*/ +/** +* @name ErrorsData.E4014 +*/ +/** +* @name ErrorsData.E4015 +*/ +/** +* @name ErrorsData.E4016 +*/ +/** +* @name ErrorsData.E4017 +*/ +/** +* @name ErrorsData.E4018 +*/ +/** +* @name ErrorsData.E4019 +*/ +/** +* @name ErrorsData.E4020 +*/ +/** +* @name ErrorsData.E4021 +*/ +/** +* @name ErrorsData.E4022 +*/ +/** +* @name ErrorsData.E4023 +*/ +/** +* @name ErrorsData.E4024 +*/ +/** +* @name ErrorsData.W4000 +*/ +/** +* @name ErrorsData.W4001 +*/ +/** +* @name ErrorsData.W4002 +*/ + +export * from '../../__internal/data/m_errors'; diff --git a/packages/devextreme/js/common/data/local_store.js b/packages/devextreme/js/common/data/local_store.js new file mode 100644 index 000000000000..2b903d32d98b --- /dev/null +++ b/packages/devextreme/js/common/data/local_store.js @@ -0,0 +1 @@ +export { default } from '../../__internal/data/m_local_store'; diff --git a/packages/devextreme/js/common/data/odata/context.js b/packages/devextreme/js/common/data/odata/context.js new file mode 100644 index 000000000000..e6d45490192c --- /dev/null +++ b/packages/devextreme/js/common/data/odata/context.js @@ -0,0 +1 @@ +export { default } from '../../../__internal/data/odata/m_context'; diff --git a/packages/devextreme/js/common/data/odata/query_adapter.js b/packages/devextreme/js/common/data/odata/query_adapter.js new file mode 100644 index 000000000000..a56104665e6c --- /dev/null +++ b/packages/devextreme/js/common/data/odata/query_adapter.js @@ -0,0 +1 @@ +export * from '../../../__internal/data/odata/m_query_adapter'; diff --git a/packages/devextreme/js/common/data/odata/request_dispatcher.js b/packages/devextreme/js/common/data/odata/request_dispatcher.js new file mode 100644 index 000000000000..13fc3dc1b4c6 --- /dev/null +++ b/packages/devextreme/js/common/data/odata/request_dispatcher.js @@ -0,0 +1 @@ +export { default } from '../../../__internal/data/odata/m_request_dispatcher'; diff --git a/packages/devextreme/js/common/data/odata/store.js b/packages/devextreme/js/common/data/odata/store.js new file mode 100644 index 000000000000..75362c160631 --- /dev/null +++ b/packages/devextreme/js/common/data/odata/store.js @@ -0,0 +1 @@ +export { default } from '../../../__internal/data/odata/m_store'; diff --git a/packages/devextreme/js/common/data/odata/utils.js b/packages/devextreme/js/common/data/odata/utils.js new file mode 100644 index 000000000000..dd6b652bf0b2 --- /dev/null +++ b/packages/devextreme/js/common/data/odata/utils.js @@ -0,0 +1,6 @@ +/** + * @name EdmLiteral.ctor + * @publicName ctor(value) + * @param1 value:string + */ +export * from '../../../__internal/data/odata/m_utils'; diff --git a/packages/devextreme/js/common/data/query.js b/packages/devextreme/js/common/data/query.js new file mode 100644 index 000000000000..b1e2c444e038 --- /dev/null +++ b/packages/devextreme/js/common/data/query.js @@ -0,0 +1 @@ +export { default } from '../../__internal/data/m_query'; diff --git a/packages/devextreme/js/common/data/query_adapters.js b/packages/devextreme/js/common/data/query_adapters.js new file mode 100644 index 000000000000..ff8b4c56321a --- /dev/null +++ b/packages/devextreme/js/common/data/query_adapters.js @@ -0,0 +1 @@ +export default {}; diff --git a/packages/devextreme/js/common/data/query_implementation.js b/packages/devextreme/js/common/data/query_implementation.js new file mode 100644 index 000000000000..43c2572d92f7 --- /dev/null +++ b/packages/devextreme/js/common/data/query_implementation.js @@ -0,0 +1,7 @@ +import arrayQueryImpl from './array_query'; +import remoteQueryImpl from './remote_query'; + +export const queryImpl = { + array: arrayQueryImpl, + remote: remoteQueryImpl +}; diff --git a/packages/devextreme/js/common/data/remote_query.js b/packages/devextreme/js/common/data/remote_query.js new file mode 100644 index 000000000000..592ebfe65d2c --- /dev/null +++ b/packages/devextreme/js/common/data/remote_query.js @@ -0,0 +1 @@ +export { default } from '../../__internal/data/m_remote_query'; diff --git a/packages/devextreme/js/common/data/store_helper.js b/packages/devextreme/js/common/data/store_helper.js new file mode 100644 index 000000000000..bb0fca23c7d1 --- /dev/null +++ b/packages/devextreme/js/common/data/store_helper.js @@ -0,0 +1 @@ +export { default } from '../../__internal/data/m_store_helper'; diff --git a/packages/devextreme/js/common/data/utils.js b/packages/devextreme/js/common/data/utils.js new file mode 100644 index 000000000000..a59212919375 --- /dev/null +++ b/packages/devextreme/js/common/data/utils.js @@ -0,0 +1,11 @@ +import { compileGetter, compileSetter } from '../../core/utils/data'; + +/** +* @name Utils +*/ +export * from '../../__internal/data/m_utils'; + +export { + compileGetter, + compileSetter +}; diff --git a/packages/devextreme/js/common/export/excel.d.ts b/packages/devextreme/js/common/export/excel.d.ts new file mode 100644 index 000000000000..9f3700adf226 --- /dev/null +++ b/packages/devextreme/js/common/export/excel.d.ts @@ -0,0 +1,137 @@ +import { DxPromise } from '../../core/utils/deferred'; +import dxPivotGrid from '../../ui/pivot_grid'; +import dxDataGrid from '../../ui/data_grid'; + +import { + CellRange, + ExcelDataGridCell, + ExcelExportBaseOptions, + ExcelPivotGridCell, +} from '../../excel_exporter.types'; + +/** + * @public + * @namespace DevExpress.common.Export.excel + */ +export type DataGridCell = ExcelDataGridCell; + +/** + * @public + * @namespace DevExpress.common.Export.excel + */ +export type PivotGridCell = ExcelPivotGridCell; + +/** + * @docid ExcelExportDataGridProps + * @public + * @namespace DevExpress.common.Export.excel + * @inherits ExcelExportBaseOptions + * @type object + */ +export type DataGridExportOptions = ExcelExportBaseOptions & { + /** + * @docid ExcelExportDataGridProps.component + * @default undefined + * @public + */ + component?: dxDataGrid | undefined; + /** + * @docid ExcelExportDataGridProps.selectedRowsOnly + * @default false + * @public + */ + selectedRowsOnly?: boolean; + /** + * @docid ExcelExportDataGridProps.autoFilterEnabled + * @default false + * @public + */ + autoFilterEnabled?: boolean; + /** + * @docid ExcelExportDataGridProps.customizeCell + * @type_function_param1_field gridCell:ExcelDataGridCell + * @type_function_param1_field excelCell:Object + * @public + */ + customizeCell?: ((options: { gridCell?: DataGridCell; excelCell?: any }) => void); +}; + +/** + * @docid + * @public + * @namespace DevExpress.common.Export.excel + * @inherits ExcelExportBaseOptions + * @type object + */ +export type PivotGridExportOptions = ExcelExportBaseOptions & { + /** + * @docid + * @default undefined + * @public + */ + component?: dxPivotGrid | undefined; + /** + * @docid + * @default true + * @public + */ + mergeRowFieldValues?: boolean; + /** + * @docid + * @default true + * @public + */ + mergeColumnFieldValues?: boolean; + /** + * @docid + * @default false + * @public + */ + exportFilterFieldHeaders?: boolean; + /** + * @docid + * @default false + * @public + */ + exportDataFieldHeaders?: boolean; + /** + * @docid + * @default false + * @public + */ + exportColumnFieldHeaders?: boolean; + /** + * @docid + * @default false + * @public + */ + exportRowFieldHeaders?: boolean; + /** + * @docid + * @type_function_param1_field pivotCell:ExcelPivotGridCell + * @type_function_param1_field excelCell:Object + * @public + */ + customizeCell?: ((options: { pivotCell?: PivotGridCell; excelCell?: any }) => void); +}; + +/** + * @docid excelExporter.exportDataGrid + * @publicName exportDataGrid(options) + * @param1 options:ExcelExportDataGridProps + * @return Promise + * @namespace DevExpress.common.Export.excel + * @static + * @public + */ +export function exportDataGrid(options: DataGridExportOptions): DxPromise; + +/** + * @docid excelExporter.exportPivotGrid + * @publicName exportPivotGrid(options) + * @return Promise + * @namespace DevExpress.common.Export.excel + * @static + * @public + */ +export function exportPivotGrid(options: PivotGridExportOptions): DxPromise; diff --git a/packages/devextreme/js/common/export/excel.js b/packages/devextreme/js/common/export/excel.js new file mode 100644 index 000000000000..c4ebeb180080 --- /dev/null +++ b/packages/devextreme/js/common/export/excel.js @@ -0,0 +1,22 @@ +import { exportDataGrid } from '../../exporter/exceljs/export_data_grid'; +import { exportPivotGrid } from '../../exporter/exceljs/export_pivot_grid'; + +/** +* @name excelExporter +* @section utils +*/ + +/** + * @name ExcelDataGridCell + * @type object + */ + +/** + * @name ExcelPivotGridCell + * @inherits dxPivotGridPivotGridCell + */ + +export { + exportDataGrid, + exportPivotGrid +}; diff --git a/packages/devextreme/js/common/export/pdf.d.ts b/packages/devextreme/js/common/export/pdf.d.ts new file mode 100644 index 000000000000..1598355d9835 --- /dev/null +++ b/packages/devextreme/js/common/export/pdf.d.ts @@ -0,0 +1,373 @@ +import { DxPromise } from '../../core/utils/deferred'; +import { PdfDataGridCell } from '../../pdf_exporter.types'; +import dxDataGrid from '../../ui/data_grid'; +import dxGantt, { + GanttPdfExportMode, + GanttPdfExportDateRange, +} from '../../ui/gantt'; +import { ExportLoadPanel } from '../../exporter/export_load_panel'; + +/** + * @docid + * @public + * @namespace DevExpress.common.Export.pdf + */ +export type GanttExportFont = { + /** + * @docid + * @default undefined + * @public + */ + fontObject: object | undefined; + /** + * @docid + * @default undefined + * @public + */ + name: string | undefined; + /** + * @docid + * @default 'normal' + * @acceptValues "bold" | "normal" | "italic" + * @public + */ + style?: string; + /** + * @docid + * @default undefined + * @acceptValues "normal" | "bold" | 400 | 700 + * @public + */ + weight?: string | number | undefined; +}; + +/** + * @docid + * @public + * @namespace DevExpress.common.Export.pdf + * @type object + */ +export type GanttExportOptions = { + /** + * @docid + * @type_function_param1 options:object + * @public + */ + createDocumentMethod?: ((options: any) => object); + /** + * @docid + * @default undefined + * @public + */ + jsPDFDocument?: object | undefined; + /** + * @docid + * @default undefined + * @public + */ + component?: dxGantt | undefined; + /** + * @docid + * @default undefined + * @public + */ + format?: string | object | undefined; + /** + * @docid + * @default true + * @public + */ + landscape?: boolean; + /** + * @docid + * @default undefined + * @public + */ + fileName?: string | undefined; + /** + * @docid + * @default undefined + * @public + */ + margins?: object | undefined; + /** + * @docid + * @default 'all' + * @public + */ + exportMode?: GanttPdfExportMode; + /** + * @docid + * @public + */ + dateRange?: GanttPdfExportDateRange | object; + /** + * @docid + * @public + */ + font?: GanttExportFont; +}; + +/** + * @docid PdfExportDataGridProps + * @public + * @namespace DevExpress.common.Export.pdf + * @type object + */ +export type DataGridExportOptions = { + /** + * @docid PdfExportDataGridProps.jsPDFDocument + * @default undefined + * @public + */ + jsPDFDocument?: object | undefined; + /** + * @docid PdfExportDataGridProps.component + * @default undefined + * @public + */ + component?: dxDataGrid | undefined; + /** + * @docid PdfExportDataGridProps.topLeft + * @public + */ + topLeft?: { + /** + * @docid PdfExportDataGridProps.topLeft.x + * @default 0 + * @public + */ + x?: number; + /** + * @docid PdfExportDataGridProps.topLeft.y + * @default 0 + * @public + */ + y?: number; + }; + /** + * @docid PdfExportDataGridProps.columnWidths + * @default undefined + * @public + */ + columnWidths?: Array | undefined; + /** + * @docid PdfExportDataGridProps.indent + * @default 0 + * @public + */ + indent?: number; + /** + * @docid PdfExportDataGridProps.margin + * @public + */ + margin?: { + /** + * @docid PdfExportDataGridProps.margin.top + * @public + */ + top?: number; + /** + * @docid PdfExportDataGridProps.margin.left + * @public + */ + left?: number; + /** + * @docid PdfExportDataGridProps.margin.right + * @public + */ + right?: number; + /** + * @docid PdfExportDataGridProps.margin.bottom + * @public + */ + bottom?: number; + }; + /** + * @docid PdfExportDataGridProps.repeatHeaders + * @default true + * @public + */ + repeatHeaders?: boolean; + /** + * @docid PdfExportDataGridProps.selectedRowsOnly + * @default false + * @public + */ + selectedRowsOnly?: boolean; + /** + * @docid PdfExportDataGridProps.customDrawCell + * @type_function_param1_field gridCell:PdfDataGridCell + * @type_function_param1_field pdfCell:PdfCell + * @type_function_param1_field doc:object + * @public + */ + customDrawCell?: ((options: { gridCell?: DataGridCell; pdfCell?: Cell; doc?: any; rect?: { x: number; y: number; h: number; w: number }; cancel?: boolean }) => void); + /** + * @docid PdfExportDataGridProps.customizeCell + * @type_function_param1_field gridCell:PdfDataGridCell + * @type_function_param1_field pdfCell:PdfCell + * @public + */ + customizeCell?: ((options: { gridCell?: DataGridCell; pdfCell?: Cell }) => void); + /** + * @docid PdfExportDataGridProps.onRowExporting + * @type_function_param1_field rowCells:Array + * @public + */ + onRowExporting?: ((options: { rowCells?: Array; rowHeight?: number }) => void); + /** + * @docid PdfExportDataGridProps.loadPanel + * @public + */ + loadPanel?: ExportLoadPanel; +}; + +/** + * @public + * @namespace DevExpress.common.Export.pdf + */ +export type DataGridCell = PdfDataGridCell; + +/** + * @public + * @docid PdfCell + * @namespace DevExpress.common.Export.pdf + */ +export type Cell = { + /** + * @docid PdfCell.backgroundColor + * @default '#FFFFFF' + * @public + */ + backgroundColor?: string; + /** + * @docid PdfCell.borderColor + * @default '#979797' + * @public + */ + borderColor?: string; + /** + * @docid PdfCell.borderWidth + * @default 0.5 + * @public + */ + borderWidth?: number; + /** + * @docid PdfCell.drawLeftBorder + * @public + */ + drawLeftBorder?: boolean; + /** + * @docid PdfCell.drawTopBorder + * @public + */ + drawTopBorder?: boolean; + /** + * @docid PdfCell.drawRightBorder + * @public + */ + drawRightBorder?: boolean; + /** + * @docid PdfCell.drawBottomBorder + * @public + */ + drawBottomBorder?: boolean; + /** + * @docid PdfCell.font + * @public + */ + font?: { + /** + * @docid PdfCell.font.size + * @default 10 + * @public + */ + size?: number; + /** + * @docid PdfCell.font.name + * @public + */ + name?: string; + /** + * @docid PdfCell.font.style + * @default 'normal' + * @public + */ + style?: 'normal' | 'bold' | 'italic'; + }; + /** + * @docid PdfCell.horizontalAlign + * @public + */ + horizontalAlign?: 'left' | 'center' | 'right'; + /** + * @docid PdfCell.padding + * @public + */ + padding?: { + /** + * @docid PdfCell.padding.top + * @public + */ + top?: number; + /** + * @docid PdfCell.padding.left + * @public + */ + left?: number; + /** + * @docid PdfCell.padding.right + * @public + */ + right?: number; + /** + * @docid PdfCell.padding.bottom + * @public + */ + bottom?: number; + }; + /** + * @docid PdfCell.text + * @public + */ + text?: string; + /** + * @docid PdfCell.textColor + * @default '#000000' + * @public + */ + textColor?: string; + /** + * @docid PdfCell.verticalAlign + * @default 'middle' + * @public + */ + verticalAlign?: 'top' | 'middle' | 'bottom'; + /** + * @docid PdfCell.wordWrapEnabled + * @public + */ + wordWrapEnabled?: boolean; +}; + +/** + * @docid pdfExporter.exportDataGrid + * @publicName exportDataGrid(options) + * @param1 options: PdfExportDataGridProps + * @return Promise + * @namespace DevExpress.common.Export.pdf + * @static + * @public + */ +export function exportDataGrid(options: DataGridExportOptions): DxPromise; + +/** + * @docid pdfExporter.exportGantt + * @publicName exportGantt(options) + * @return Promise + * @namespace DevExpress.common.Export.pdf + * @static + * @public + */ +export function exportGantt(options: GanttExportOptions): DxPromise; diff --git a/packages/devextreme/js/common/export/pdf.js b/packages/devextreme/js/common/export/pdf.js new file mode 100644 index 000000000000..efb7c84c2bcd --- /dev/null +++ b/packages/devextreme/js/common/export/pdf.js @@ -0,0 +1,18 @@ +import { exportDataGrid } from '../../exporter/jspdf/export_data_grid'; +import { exportDataGrid as exportDataGridWithAutoTable } from '../../exporter/jspdf/autotable/export_data_grid'; +import { exportGantt } from '../../exporter/jspdf/export_gantt'; + +/** + * @name PdfDataGridCell + * @inherits ExcelDataGridCell + */ + +/** +* @name pdfExporter +* @section utils +*/ +export { + exportDataGrid, + exportDataGridWithAutoTable, + exportGantt +}; diff --git a/packages/devextreme/js/common/grids.d.ts b/packages/devextreme/js/common/grids.d.ts index ee1ae422450f..a698df0baa24 100644 --- a/packages/devextreme/js/common/grids.d.ts +++ b/packages/devextreme/js/common/grids.d.ts @@ -13,7 +13,7 @@ import { Sortable, SortOrder, ValidationRule, - PagerBase, + template, } from '../common'; import { @@ -27,27 +27,25 @@ import { } from '../core/element'; import { - DxPromise, -} from '../core/utils/deferred'; - -import { - template, -} from '../core/templates/template'; + DataSource, + DataSourceOptions, +} from './data'; -import DataSource, { - Options as DataSourceOptions, - DataSourceLike, -} from '../data/data_source'; +import { DataSourceLike } from '../data/data_source'; import { Cancelable, EventInfo, NativeEventInfo, -} from '../events/index'; +} from './core/events'; + +import { + DxPromise, +} from '../core/utils/deferred'; import { Format, -} from '../localization'; +} from './core/localization'; import { FilterLookupDataSource, @@ -70,7 +68,8 @@ import { import { WidgetOptions, } from '../ui/widget/ui.widget'; -import { PositionConfig } from '../animation/position'; +import { PositionConfig } from './core/animation'; +import { PagerBase } from '../ui/pagination'; /** * @docid diff --git a/packages/devextreme/js/common/guid.js b/packages/devextreme/js/common/guid.js new file mode 100644 index 000000000000..2a2ab6ecb7c7 --- /dev/null +++ b/packages/devextreme/js/common/guid.js @@ -0,0 +1,11 @@ +/** + * @name Guid.ctor + * @publicName ctor() + */ +/** + * @name Guid.ctor + * @publicName ctor(value) + * @param1 value:string + */ +import { Guid } from '../__internal/core/m_guid'; +export default Guid; diff --git a/packages/devextreme/js/common/set_template_engine.js b/packages/devextreme/js/common/set_template_engine.js new file mode 100644 index 000000000000..de327c598a08 --- /dev/null +++ b/packages/devextreme/js/common/set_template_engine.js @@ -0,0 +1,3 @@ +import { setTemplateEngine } from '../__internal/core/m_set_template_engine'; + +export default setTemplateEngine; diff --git a/packages/devextreme/js/core/config.d.ts b/packages/devextreme/js/core/config.d.ts index 51490ed48a42..abd2dd13228e 100644 --- a/packages/devextreme/js/core/config.d.ts +++ b/packages/devextreme/js/core/config.d.ts @@ -1,29 +1,16 @@ -import { GlobalConfig } from '../common'; +import { + config, + GlobalConfig, +} from '../common'; -/** @public */ -export type FloatingActionButtonDirection = 'auto' | 'up' | 'down'; +export { + FloatingActionButtonDirection, +} from '../common'; /** - * @docid - * @publicName config() * @namespace DevExpress - * @public + * @deprecated Use GlobalConfig from /common instead */ -declare function config(): GlobalConfig; - -/** - * @docid - * @publicName config(config) - * @namespace DevExpress - * @public - */ -// eslint-disable-next-line @typescript-eslint/no-shadow -declare function config(config: GlobalConfig): void; - -/** -* @namespace DevExpress -* @deprecated Use GlobalConfig instead -*/ export type globalConfig = GlobalConfig; export default config; diff --git a/packages/devextreme/js/core/config.js b/packages/devextreme/js/core/config.js index 107fa638ede5..17d8c0fbf2b9 100644 --- a/packages/devextreme/js/core/config.js +++ b/packages/devextreme/js/core/config.js @@ -1,7 +1,3 @@ -/** - * @name GlobalConfig.useJQuery - * @type boolean - * @hidden - */ -import configMethod from '../__internal/core/m_config'; -export default configMethod; +import { config } from '../common'; + +export default config; diff --git a/packages/devextreme/js/core/devices.d.ts b/packages/devextreme/js/core/devices.d.ts index 4ec5b6781d3e..dc86d685f44d 100644 --- a/packages/devextreme/js/core/devices.d.ts +++ b/packages/devextreme/js/core/devices.d.ts @@ -1,134 +1,84 @@ -/** - * @public - * @docid - * @section commonObjectStructures - * @namespace DevExpress - */ -export type Device = { - /** - * @docid - * @public - */ - android?: boolean; - /** - * @docid - * @public - */ - deviceType?: 'phone' | 'tablet' | 'desktop'; - /** - * @docid - * @public - */ - generic?: boolean; - /** - * @docid - * @public - */ - grade?: 'A' | 'B' | 'C'; - /** - * @docid - * @public - */ - ios?: boolean; - /** - * @docid - * @public - */ - phone?: boolean; - /** - * @docid - * @public - */ - platform?: 'android' | 'ios' | 'generic'; - /** - * @docid - * @public - */ - tablet?: boolean; - /** - * @docid - * @public - */ - version?: Array; -}; +import { Device, EventName } from '../common/core/environment'; -type EventName = 'orientationChanged'; +export { + Device, +} from '../common/core/environment'; /** - * @docid - * @publicName devices - * @section Utils - * @namespace DevExpress - * @public - */ +* @docid +* @publicName devices +* @section Utils +* @public +*/ declare class DevicesObject { - constructor(options?: { window?: Window }); - /** - * @docid - * @publicName current() - * @public - */ - current(): Device; - /** - * @docid - * @publicName current(deviceName) - * @public - */ - current(deviceName: string | Device): void; - /** - * @docid - * @publicName off(eventName) - * @param1 eventName:string - * @return this - * @public - */ - off(eventName: EventName): this; - /** - * @docid - * @publicName off(eventName, eventHandler) - * @param1 eventName:string - * @return this - * @public - */ - off(eventName: EventName, eventHandler: Function): this; - /** - * @docid - * @publicName on(eventName, eventHandler) - * @param1 eventName:string - * @return this - * @public - */ - on(eventName: EventName, eventHandler: Function): this; - /** - * @docid - * @publicName on(events) - * @param1 events:object - * @return this - * @public - */ - on(events: { [key in EventName]?: Function }): this; - /** - * @docid - * @publicName orientation() - * @return String - * @public - */ - orientation(): 'portrait' | 'landscape' | undefined; - /** - * @docid - * @publicName real() - * @public - */ - real(): Device; - isSimulator(): boolean; + constructor(options?: { window?: Window }); + /** + * @docid + * @publicName current() + * @public + */ + current(): Device; + /** + * @docid + * @publicName current(deviceName) + * @public + */ + current(deviceName: string | Device): void; + /** + * @docid + * @publicName off(eventName) + * @param1 eventName:string + * @return this + * @public + */ + off(eventName: EventName): this; + /** + * @docid + * @publicName off(eventName, eventHandler) + * @param1 eventName:string + * @return this + * @public + */ + off(eventName: EventName, eventHandler: Function): this; + /** + * @docid + * @publicName on(eventName, eventHandler) + * @param1 eventName:string + * @return this + * @public + */ + on(eventName: EventName, eventHandler: Function): this; + /** + * @docid + * @publicName on(events) + * @param1 events:object + * @return this + * @public + */ + on(events: { [key in EventName]?: Function }): this; + /** + * @docid + * @publicName orientation() + * @return String + * @public + */ + orientation(): 'portrait' | 'landscape' | undefined; + /** + * @docid + * @publicName real() + * @public + */ + real(): Device; + isSimulator(): boolean; } /** - * @const devices - * @namespace DevExpress - * @hidden - * @public - */ - +* @const devices +* @namespace DevExpress.common.core.environment +* @hidden +* @public +*/ +// eslint-disable-next-line @typescript-eslint/init-declarations declare const devices: DevicesObject; + export default devices; diff --git a/packages/devextreme/js/core/devices.js b/packages/devextreme/js/core/devices.js index 3dec987c04a6..e069c4e5fb31 100644 --- a/packages/devextreme/js/core/devices.js +++ b/packages/devextreme/js/core/devices.js @@ -1,8 +1,3 @@ -/** - * @name DevicesObject.ctor - * @publicName ctor(options) - * @param1 options:object - * @param1_field1 window:Window - * @hidden - */ -export { default } from '../__internal/core/m_devices'; +import { devices } from '../common/core/environment'; + +export default devices; diff --git a/packages/devextreme/js/core/dom_component.d.ts b/packages/devextreme/js/core/dom_component.d.ts index 7a52aa01534b..1edb6eda8ec6 100644 --- a/packages/devextreme/js/core/dom_component.d.ts +++ b/packages/devextreme/js/core/dom_component.d.ts @@ -12,7 +12,7 @@ import { ChangedOptionInfo, EventInfo, InitializedEventInfo, -} from '../events/index'; +} from '../common/core/events'; import { TemplateManager } from './template_manager'; import { FunctionTemplate } from './templates/function_template'; diff --git a/packages/devextreme/js/core/guid.d.ts b/packages/devextreme/js/core/guid.d.ts index b84c5497c208..80747a9917bb 100644 --- a/packages/devextreme/js/core/guid.d.ts +++ b/packages/devextreme/js/core/guid.d.ts @@ -1,21 +1,3 @@ -/** - * @docid - * @namespace DevExpress.data - * @public - */ -export default class Guid { - constructor(); - constructor(value: string); - /** - * @docid - * @publicName toString() - * @public - */ - toString(): string; - /** - * @docid - * @publicName valueOf() - * @public - */ - valueOf(): string; -} +import { Guid } from '../common'; + +export default Guid; diff --git a/packages/devextreme/js/core/guid.js b/packages/devextreme/js/core/guid.js index 2a2ab6ecb7c7..80747a9917bb 100644 --- a/packages/devextreme/js/core/guid.js +++ b/packages/devextreme/js/core/guid.js @@ -1,11 +1,3 @@ -/** - * @name Guid.ctor - * @publicName ctor() - */ -/** - * @name Guid.ctor - * @publicName ctor(value) - * @param1 value:string - */ -import { Guid } from '../__internal/core/m_guid'; +import { Guid } from '../common'; + export default Guid; diff --git a/packages/devextreme/js/core/options.d.ts b/packages/devextreme/js/core/options.d.ts index 3a2aca745d3d..5411ad197048 100644 --- a/packages/devextreme/js/core/options.d.ts +++ b/packages/devextreme/js/core/options.d.ts @@ -1,16 +1,3 @@ -import { - Device, -} from './devices'; - -import { - DeepPartial, -} from './index'; - -/** - * @docid - * @public - */ -export type DefaultOptionsRule = { - device?: Device | Device[] | ((device: Device) => boolean); - options: DeepPartial; -}; +export { + DefaultOptionsRule, +} from '../common'; diff --git a/packages/devextreme/js/core/options/utils.d.ts b/packages/devextreme/js/core/options/utils.d.ts index cd098f2fc766..327a1e004535 100644 --- a/packages/devextreme/js/core/options/utils.d.ts +++ b/packages/devextreme/js/core/options/utils.d.ts @@ -1,6 +1,6 @@ import { Device, -} from '../devices'; +} from '../../common/core/environment'; import { DefaultOptionsRule, diff --git a/packages/devextreme/js/core/set_template_engine.d.ts b/packages/devextreme/js/core/set_template_engine.d.ts index e0ff4f7dc9a7..c8bd6303ec02 100644 --- a/packages/devextreme/js/core/set_template_engine.d.ts +++ b/packages/devextreme/js/core/set_template_engine.d.ts @@ -1,9 +1,3 @@ -/** - * @docid - * @publicName setTemplateEngine(options) - * @namespace DevExpress - * @public - */ -declare function setTemplateEngine(templateEngineOptions: { compile?: Function; render?: Function }): void; +import { setTemplateEngine } from '../common'; export default setTemplateEngine; diff --git a/packages/devextreme/js/core/set_template_engine.js b/packages/devextreme/js/core/set_template_engine.js index 31aeacde2545..c7d3a1ad5914 100644 --- a/packages/devextreme/js/core/set_template_engine.js +++ b/packages/devextreme/js/core/set_template_engine.js @@ -1,2 +1 @@ -import { setTemplateEngine } from '../__internal/core/m_set_template_engine'; -export default setTemplateEngine; +export { setTemplateEngine as default } from '../common'; diff --git a/packages/devextreme/js/core/templates/template.d.ts b/packages/devextreme/js/core/templates/template.d.ts index 47bc5899f2ce..b4417396b48c 100644 --- a/packages/devextreme/js/core/templates/template.d.ts +++ b/packages/devextreme/js/core/templates/template.d.ts @@ -1,6 +1,6 @@ -import { - UserDefinedElement, -} from '../element'; +export type { + template, +} from '../../common'; /** * @docid @@ -26,10 +26,3 @@ export type dxTemplate = Template; export class Template { constructor(options?: dxTemplateOptions); } - -/** - * @docid - * @section Common - * @public - */ -export type template = string | Function | UserDefinedElement; diff --git a/packages/devextreme/js/core/utils/deferred.d.ts b/packages/devextreme/js/core/utils/deferred.d.ts index a760280cc482..e91b922abc04 100644 --- a/packages/devextreme/js/core/utils/deferred.d.ts +++ b/packages/devextreme/js/core/utils/deferred.d.ts @@ -2,7 +2,7 @@ interface Callback { // eslint-disable-next-line @typescript-eslint/prefer-function-type (value: T, ...args: T[]): void; } -declare class DeferredObj { +export class DeferredObj { constructor(); state(): 'pending' | 'rejected' | 'resolved'; always(alwaysCallback?: Callback): DeferredObj; @@ -24,6 +24,7 @@ export function Deferred(): DeferredObj; // eslint-disable-next-line @typescript-eslint/no-empty-interface, @typescript-eslint/no-unused-vars export interface PromiseType { } + /** * @docid * @type Promise diff --git a/packages/devextreme/js/data/abstract_store.d.ts b/packages/devextreme/js/data/abstract_store.d.ts index 98fe86b7122e..6219e4e33846 100644 --- a/packages/devextreme/js/data/abstract_store.d.ts +++ b/packages/devextreme/js/data/abstract_store.d.ts @@ -2,12 +2,10 @@ import { DxExtendedPromise, } from '../core/utils/deferred'; import { - Store as BaseStore, - Options as BaseStoreOptions, + Store as StoreBase, + StoreOptions as StoreOptionsBase, } from './store'; -import { - LoadOptions, -} from './index'; +import { LoadOptions } from '../common/data'; export type Options< TItem = any, @@ -15,12 +13,12 @@ export type Options< > = AbstractStoreOptions; /** - * @namespace DevExpress.data + * @namespace DevExpress.common.data */ -interface AbstractStoreOptions< +export interface AbstractStoreOptions< TItem = any, TKey = any, - > extends BaseStoreOptions { + > extends StoreOptionsBase { /** * @docid StoreOptions.onLoaded * @type_function_param2 loadOptions:LoadOptions @@ -31,12 +29,12 @@ interface AbstractStoreOptions< } /** - * @namespace DevExpress.data + * @namespace DevExpress.common.data */ export default class AbstractStore< TItem = any, TKey = any, - > extends BaseStore { + > extends StoreBase { constructor(options?: Options); /** * @docid Store.load() @@ -56,13 +54,13 @@ export default class AbstractStore< } /** - * @namespace DevExpress.data - * @deprecated Use Options from data/store instead + * @namespace DevExpress.common.data + * @deprecated Use StoreOptions from common/data instead */ -export type StoreOptions = BaseStoreOptions; +export type StoreOptions = StoreOptionsBase; /** - * @namespace DevExpress.data - * @deprecated Use Store from data/store instead + * @namespace DevExpress.common.data + * @deprecated Use Store from common/data instead */ -export type Store = BaseStore; +export type Store = StoreBase; diff --git a/packages/devextreme/js/data/abstract_store.js b/packages/devextreme/js/data/abstract_store.js index 28ec4a10a01a..1209bbeb82c1 100644 --- a/packages/devextreme/js/data/abstract_store.js +++ b/packages/devextreme/js/data/abstract_store.js @@ -1 +1 @@ -export { default } from '../__internal/data/m_abstract_store'; +export { default } from '../common/data/abstract_store'; diff --git a/packages/devextreme/js/data/apply_changes.d.ts b/packages/devextreme/js/data/apply_changes.d.ts index 8073ae0becbb..29a114fa0de0 100644 --- a/packages/devextreme/js/data/apply_changes.d.ts +++ b/packages/devextreme/js/data/apply_changes.d.ts @@ -1,10 +1,3 @@ -/** - * @docid Utils.applyChanges - * @publicName applyChanges(data, changes, options) - * @param3 options?:any - * @namespace DevExpress.data - * @public - */ -declare function applyChanges(data: Array, changes: Array, options?: { keyExpr?: string | Array; immutable?: boolean }): Array; +import { applyChanges } from '../common/data'; export default applyChanges; diff --git a/packages/devextreme/js/data/apply_changes.js b/packages/devextreme/js/data/apply_changes.js index b853ad713ae0..29a114fa0de0 100644 --- a/packages/devextreme/js/data/apply_changes.js +++ b/packages/devextreme/js/data/apply_changes.js @@ -1,3 +1,3 @@ -import { applyChanges } from './array_utils'; +import { applyChanges } from '../common/data'; export default applyChanges; diff --git a/packages/devextreme/js/data/array_query.js b/packages/devextreme/js/data/array_query.js index eb370819807a..3a3bd486101a 100644 --- a/packages/devextreme/js/data/array_query.js +++ b/packages/devextreme/js/data/array_query.js @@ -1 +1 @@ -export { default } from '../__internal/data/m_array_query'; +export { default } from '../common/data/array_query'; diff --git a/packages/devextreme/js/data/array_store.d.ts b/packages/devextreme/js/data/array_store.d.ts index 60a69bff9384..b1276b1174f4 100644 --- a/packages/devextreme/js/data/array_store.d.ts +++ b/packages/devextreme/js/data/array_store.d.ts @@ -1,61 +1,17 @@ -import Store, { - Options as StoreOptions, -} from './abstract_store'; -import { Query } from './query'; -import { DxPromise } from '../core/utils/deferred'; +import { ArrayStore, ArrayStoreOptions } from '../common/data'; -/** @public */ -export type Options< - TItem = any, - TKey = any, -> = ArrayStoreOptions; - -/** - * @docid - * @namespace DevExpress.data - * @deprecated Use Options instead - */ -export interface ArrayStoreOptions< - TItem = any, - TKey = any, -> extends StoreOptions { - /** - * @docid - * @public - */ - data?: Array; -} +export { + ArrayStoreOptions, +} from '../common/data'; /** - * @docid - * @inherits Store * @public - * @options ArrayStoreOptions + * @deprecated Use ArrayStoreOptions from /common/data instead + * @namespace DevExpress.data.ArrayStore */ -export default class ArrayStore< +export type Options< TItem = any, TKey = any, -> extends Store { - constructor(options?: Options); - /** - * @docid - * @publicName byKey(key) - * @param1 key:object|string|number - * @return Promise - * @public - */ - byKey(key: TKey): DxPromise; - /** - * @docid - * @publicName clear() - * @public - */ - clear(): void; - /** - * @docid - * @publicName createQuery() - * @return object - * @public - */ - createQuery(): Query; -} +> = ArrayStoreOptions; + +export default ArrayStore; diff --git a/packages/devextreme/js/data/array_store.js b/packages/devextreme/js/data/array_store.js index a6a9ab189189..aad197a240d5 100644 --- a/packages/devextreme/js/data/array_store.js +++ b/packages/devextreme/js/data/array_store.js @@ -1 +1,3 @@ -export { default } from '../__internal/data/m_array_store'; +import ArrayStore from '../common/data/array_store'; + +export default ArrayStore; diff --git a/packages/devextreme/js/data/array_utils.js b/packages/devextreme/js/data/array_utils.js index 7d6bc9402225..6f49d08f0ee5 100644 --- a/packages/devextreme/js/data/array_utils.js +++ b/packages/devextreme/js/data/array_utils.js @@ -1 +1,2 @@ -export * from '../__internal/data/m_array_utils'; +// eslint-disable-next-line import/export +export * from '../common/data/array_utils'; diff --git a/packages/devextreme/js/data/custom_store.d.ts b/packages/devextreme/js/data/custom_store.d.ts index 222d495a08d8..383a4679e75e 100644 --- a/packages/devextreme/js/data/custom_store.d.ts +++ b/packages/devextreme/js/data/custom_store.d.ts @@ -1,151 +1,19 @@ -import { FilterDescriptor, GroupDescriptor, LoadOptions } from './index'; -import { Store, Options as StoreOptions } from './store'; -import { DxExtendedPromise, DxPromise } from '../core/utils/deferred'; -import { GroupItem as CustomStoreGroupItem, LoadResult } from '../common/data/custom-store'; +import { CustomStore, CustomStoreOptions } from '../common/data'; -/** @public */ -export type Options< - TItem = any, - TKey = any, -> = CustomStoreOptions; - -/** - * @public - * @deprecated Use GroupItem from common/data/custom-store instead - */ -export type GroupItem = CustomStoreGroupItem; +export { + GroupItem, + ResolvedData, + CustomStoreOptions, +} from '../common/data'; /** - * @docid * @public - * @type object - * @deprecated Use LoadResult instead + * @deprecated Use CustomStoreOptions from /common/data instead + * @namespace DevExpress.data.CustomStore */ -export type ResolvedData = LoadResult; - -type LoadFunctionResult = T | DxPromise | PromiseLike; - -/** - * @docid - * @namespace DevExpress.data - * @deprecated Use Options instead - */ -export interface CustomStoreOptions< +export type Options< TItem = any, TKey = any, -> extends StoreOptions { - /** - * @docid - * @public - * @type_function_param1 key:object|string|number - * @type_function_param2 extraOptions:LoadOptions - * @type_function_return Promise - */ - byKey?: ((key: TKey, extraOptions?: LoadOptions) => PromiseLike); - /** - * @docid - * @default true - * @public - */ - cacheRawData?: boolean; - /** - * @docid - * @type_function_param1 values:object - * @type_function_return Promise - * @public - */ - insert?: ((values: TItem) => PromiseLike); - /** - * @docid - * @type_function_param1 options:LoadOptions - * @type_function_return LoadResult|Promise - * @public - */ - load: (options: LoadOptions) => LoadFunctionResult>; - /** - * @docid - * @default 'processed' - * @public - */ - loadMode?: 'processed' | 'raw'; - /** - * @docid - * @type_function_param1 result:LoadResult - * @type_function_param2 loadOptions:LoadOptions - * @action - * @public - */ - onLoaded?: ((result: LoadResult, loadOptions: LoadOptions) => void); - /** - * @docid - * @type_function_param1 key:object|string|number - * @type_function_return Promise - * @public - */ - remove?: ((key: TKey) => PromiseLike); - /** - * @docid - * @type_function_param1_field filter:object - * @type_function_param1_field group:object - * @type_function_return Promise - * @public - */ - totalCount?: ((loadOptions: { filter?: FilterDescriptor | Array; group?: GroupDescriptor | Array> }) => PromiseLike); - /** - * @docid - * @type_function_param1 key:object|string|number - * @type_function_param2 values:object - * @type_function_return Promise - * @public - */ - update?: ((key: TKey, values: TItem) => PromiseLike); - /** - * @docid - * @default undefined - * @public - */ - useDefaultSearch?: boolean | undefined; -} +> = CustomStoreOptions; -/** - * @docid - * @inherits Store - * @public - * @options CustomStoreOptions - */ -export default class CustomStore< - TItem = any, - TKey = any, -> extends Store { - constructor(options?: Options); - /** - * @docid - * @publicName byKey(key, extraOptions) - * @param1 key:object|string|number - * @param2 extraOptions:LoadOptions - * @return Promise - * @public - */ - byKey(key: TKey, extraOptions?: LoadOptions): DxPromise; - /** - * @docid - * @publicName clearRawDataCache() - * @public - */ - clearRawDataCache(): void; - /** - * @docid - * @publicName load() - * @return Promise - * @public - */ - load(): DxExtendedPromise>; - /** - * @docid - * @publicName load(options) - * @param1 options:LoadOptions - * @return Promise - * @public - */ - load(options: LoadOptions): DxExtendedPromise>; -} +export default CustomStore; diff --git a/packages/devextreme/js/data/custom_store.js b/packages/devextreme/js/data/custom_store.js index ce6176339591..d2c2125517d3 100644 --- a/packages/devextreme/js/data/custom_store.js +++ b/packages/devextreme/js/data/custom_store.js @@ -1 +1,3 @@ -export { default } from '../__internal/data/m_custom_store'; +import { CustomStore } from '../common/data/custom_store'; + +export default CustomStore; diff --git a/packages/devextreme/js/data/data.types.d.ts b/packages/devextreme/js/data/data.types.d.ts new file mode 100644 index 000000000000..526b0109ff4c --- /dev/null +++ b/packages/devextreme/js/data/data.types.d.ts @@ -0,0 +1,9 @@ +export type KeySelector = string | ((source: T) => string | number | Date | Object); + +export type SelectionDescriptor = { + selector: KeySelector; +}; + +export type OrderingDescriptor = SelectionDescriptor & { + desc?: boolean; +}; diff --git a/packages/devextreme/js/data/data_source.d.ts b/packages/devextreme/js/data/data_source.d.ts index efc983e6fb13..3adcca7fb4b5 100644 --- a/packages/devextreme/js/data/data_source.d.ts +++ b/packages/devextreme/js/data/data_source.d.ts @@ -1,17 +1,18 @@ import { - FilterDescriptor, - GroupDescriptor, LangParams, - LoadOptions, - SearchOperation, - SelectDescriptor, - SortDescriptor, - Store, - StoreOptions, -} from './index'; -import { DxExtendedPromise } from '../core/utils/deferred'; -import { Options as CustomStoreOptions } from './custom_store'; + DataSource, + DataSourceOptions, + FilterDescriptor, + GroupDescriptor, + SearchOperation, + SelectDescriptor, + SortDescriptor, + Store, + StoreOptions, +} from '../common/data'; -/** @public */ +export { + DataSourceOptions, +} from '../common/data'; export type Options< TStoreItem = any, TMappedItem = TStoreItem, @@ -19,414 +20,6 @@ export type Options< TKey = any, > = DataSourceOptions; -/** - * @namespace DevExpress.data - * @deprecated Use Options instead - * @docid - */ -export interface DataSourceOptions< - TStoreItem = any, - TMappedItem = TStoreItem, - TItem = TMappedItem, - TKey = any, -> { - /** - * @docid - * @public - */ - customQueryParams?: any; - /** - * @docid - * @public - */ - expand?: Array | string; - /** - * @docid - * @type Filter expression - * @public - */ - filter?: FilterDescriptor | Array; - /** - * @docid - * @type Group expression - * @public - */ - group?: GroupDescriptor | Array>; - /** - * @docid - * @public - */ - // eslint-disable-next-line spellcheck/spell-checker - langParams?: LangParams; - /** - * @docid - * @type_function_param1 dataItem:object - * @type_function_return object - * @public - */ - map?: ((dataItem: TStoreItem) => TMappedItem); - /** - * @docid - * @type_function_param1_field changes:Array - * @action - * @public - */ - onChanged?: ((e: { readonly changes?: Array }) => void); - /** - * @docid - * @action - * @public - */ - onLoadError?: ((error: { readonly message?: string }) => void); - /** - * @docid - * @action - * @public - */ - onLoadingChanged?: ((isLoading: boolean) => void); - /** - * @docid - * @default 20 - * @public - */ - pageSize?: number; - /** - * @docid - * @default undefined - * @public - */ - paginate?: boolean | undefined; - /** - * @docid - * @type_function_param1 data:Array - * @type_function_return Array - * @public - */ - postProcess?: ((data: Array) => Array); - /** - * @docid - * @default undefined - * @public - */ - pushAggregationTimeout?: number | undefined; - /** - * @docid - * @public - */ - requireTotalCount?: boolean; - /** - * @docid - * @default false - * @public - */ - reshapeOnPush?: boolean; - /** - * @docid - * @type getter|Array - * @public - */ - searchExpr?: string | Function | Array; - /** - * @docid - * @default "contains" - * @public - */ - searchOperation?: SearchOperation; - /** - * @docid - * @default null - * @public - */ - searchValue?: any; - /** - * @docid - * @type Select expression - * @public - */ - select?: SelectDescriptor; - /** - * @docid - * @type Sort expression - * @public - */ - sort?: SortDescriptor | Array>; - /** - * @docid - * @public - * @type Store|StoreOptions|Array - */ - store?: Array | Store | StoreOptions; -} -/** - * @docid - * @public - * @options DataSourceOptions - */ -export default class DataSource< - TItem = any, - TKey = any, -> { - constructor(data: Array); - constructor(options: CustomStoreOptions | Options); - constructor(store: Store); - constructor(url: string); - /** - * @docid - * @publicName cancel(operationId) - * @public - */ - cancel(operationId: number): boolean; - /** - * @docid - * @publicName dispose() - * @public - */ - dispose(): void; - /** - * @docid - * @publicName filter() - * @return object - * @public - */ - filter(): FilterDescriptor | Array; - /** - * @docid - * @publicName filter(filterExpr) - * @param1 filterExpr:object - * @public - */ - filter(filterExpr: FilterDescriptor | Array): void; - /** - * @docid - * @publicName group() - * @return object - * @public - */ - group(): GroupDescriptor | Array>; - /** - * @docid - * @publicName group(groupExpr) - * @param1 groupExpr:object - * @public - */ - group(groupExpr: GroupDescriptor | Array>): void; - /** - * @docid - * @publicName isLastPage() - * @public - */ - isLastPage(): boolean; - /** - * @docid - * @publicName isLoaded() - * @public - */ - isLoaded(): boolean; - /** - * @docid - * @publicName isLoading() - * @public - */ - isLoading(): boolean; - /** - * @docid - * @publicName items() - * @public - */ - items(): Array; - /** - * @docid - * @publicName key() - * @public - */ - key(): string | Array; - /** - * @docid - * @publicName load() - * @return Promise - * @public - */ - load(): DxExtendedPromise; - /** - * @docid - * @publicName loadOptions() - * @return object - * @public - */ - loadOptions(): LoadOptions; - /** - * @docid - * @publicName off(eventName) - * @param1 eventName:string - * @return this - * @public - */ - off(eventName: EventName): this; - /** - * @docid - * @publicName off(eventName, eventHandler) - * @param1 eventName:string - * @return this - * @public - */ - off(eventName: EventName, eventHandler: Function): this; - /** - * @docid - * @publicName on(eventName, eventHandler) - * @param1 eventName:string - * @return this - * @public - */ - on(eventName: EventName, eventHandler: Function): this; - /** - * @docid - * @publicName on(events) - * @param1 events:object - * @return this - * @public - */ - on(events: { [key in EventName]?: Function }): this; - /** - * @docid - * @publicName pageIndex() - * @return numeric - * @public - */ - pageIndex(): number; - /** - * @docid - * @publicName pageIndex(newIndex) - * @param1 newIndex:numeric - * @public - */ - pageIndex(newIndex: number): void; - /** - * @docid - * @publicName pageSize() - * @return numeric - * @public - */ - pageSize(): number; - /** - * @docid - * @publicName pageSize(value) - * @param1 value:numeric - * @public - */ - pageSize(value: number): void; - /** - * @docid - * @publicName paginate() - * @public - */ - paginate(): boolean; - /** - * @docid - * @publicName paginate(value) - * @public - */ - paginate(value: boolean): void; - /** - * @docid - * @publicName reload() - * @return Promise - * @public - */ - reload(): DxExtendedPromise; - /** - * @docid - * @publicName requireTotalCount() - * @public - */ - requireTotalCount(): boolean; - /** - * @docid - * @publicName requireTotalCount(value) - * @public - */ - requireTotalCount(value: boolean): void; - /** - * @docid - * @publicName searchExpr() - * @return getter|Array - * @public - */ - searchExpr(): string & Function & Array; - /** - * @docid - * @publicName searchExpr(expr) - * @param1 expr:getter|Array - * @public - */ - searchExpr(expr: string | Function | Array): void; - /** - * @docid - * @publicName searchOperation() - * @public - */ - searchOperation(): string; - /** - * @docid - * @publicName searchOperation(op) - * @public - */ - searchOperation(op: string): void; - /** - * @docid - * @publicName searchValue() - * @public - */ - searchValue(): any; - /** - * @docid - * @publicName searchValue(value) - * @public - */ - searchValue(value: any): void; - /** - * @docid - * @publicName select() - * @return any - * @public - */ - select(): SelectDescriptor; - /** - * @docid - * @publicName select(expr) - * @param1 expr:any - * @public - */ - select(expr: SelectDescriptor): void; - /** - * @docid - * @publicName sort() - * @return any - * @public - */ - sort(): SortDescriptor | Array>; - /** - * @docid - * @publicName sort(sortExpr) - * @param1 sortExpr:any - * @public - */ - sort(sortExpr: SortDescriptor | Array>): void; - /** - * @docid - * @publicName store() - * @return object - * @public - */ - store(): Store; - /** - * @docid - * @publicName totalCount() - * @return numeric - * @public - */ - totalCount(): number; -} - /** * @docid * @type Store|DataSource|DataSourceOptions|string|Array|null @@ -438,7 +31,7 @@ export type DataSourceLike = DataSourceOptionsStub | DataSource; -interface DataSourceOptionsStub< +export interface DataSourceOptionsStub< TStoreItem = any, TMappedItem = TStoreItem, TItem = TMappedItem, @@ -465,4 +58,4 @@ interface DataSourceOptionsStub< store?: Array | Store | StoreOptions; } -type EventName = 'changed' | 'loadError' | 'loadingChanged'; +export default DataSource; diff --git a/packages/devextreme/js/data/data_source.js b/packages/devextreme/js/data/data_source.js index fcf080056c7a..74cc596eadc0 100644 --- a/packages/devextreme/js/data/data_source.js +++ b/packages/devextreme/js/data/data_source.js @@ -1,3 +1,3 @@ +import DataSource from '../common/data/data_source'; -import { DataSource } from './data_source/data_source'; export default DataSource; diff --git a/packages/devextreme/js/data/data_source/data_source.js b/packages/devextreme/js/data/data_source/data_source.js index f8d6c50bce74..b39c14b54ead 100644 --- a/packages/devextreme/js/data/data_source/data_source.js +++ b/packages/devextreme/js/data/data_source/data_source.js @@ -1,29 +1,2 @@ -/** - * @name DataSource.ctor - * @publicName ctor(url) - * @param1 url:string - * @hidden - */ -/** - * @name DataSource.ctor - * @publicName ctor(data) - * @param1 data:Array - * @hidden - */ -/** - * @name DataSource.ctor - * @publicName ctor(store) - * @param1 store:Store - * @hidden - */ -/** - * @name DataSource.ctor - * @publicName ctor(options) - * @param1 options:CustomStoreOptions|DataSourceOptions - * @hidden - */ -/** - * @name DataSourceOptions.store.type - * @type Enums.StoreType - */ -export * from '../../__internal/data/data_source/m_data_source'; +// eslint-disable-next-line import/export +export * from '../../common/data/data_source/data_source'; diff --git a/packages/devextreme/js/data/data_source/operation_manager.js b/packages/devextreme/js/data/data_source/operation_manager.js index 42f6097f70a8..f51c8b2e9cfc 100644 --- a/packages/devextreme/js/data/data_source/operation_manager.js +++ b/packages/devextreme/js/data/data_source/operation_manager.js @@ -1 +1 @@ -export { default } from '../../__internal/data/data_source/m_operation_manager'; +export { default } from '../../common/data/data_source/operation_manager'; diff --git a/packages/devextreme/js/data/data_source/utils.js b/packages/devextreme/js/data/data_source/utils.js index 030e499772d0..4c9af8892acd 100644 --- a/packages/devextreme/js/data/data_source/utils.js +++ b/packages/devextreme/js/data/data_source/utils.js @@ -1 +1,2 @@ -export * from '../../__internal/data/data_source/m_utils'; +// eslint-disable-next-line import/export +export * from '../../common/data/data_source/utils'; diff --git a/packages/devextreme/js/data/endpoint_selector.d.ts b/packages/devextreme/js/data/endpoint_selector.d.ts index 19c601d6eec4..868960c2ae4a 100644 --- a/packages/devextreme/js/data/endpoint_selector.d.ts +++ b/packages/devextreme/js/data/endpoint_selector.d.ts @@ -1,14 +1,3 @@ -/** - * @docid - * @namespace DevExpress - * @public - */ -export default class EndpointSelector { - constructor(options: any); - /** - * @docid - * @publicName urlFor(key) - * @public - */ - urlFor(key: string): string; -} +import { EndpointSelector } from '../common/data'; + +export default EndpointSelector; diff --git a/packages/devextreme/js/data/endpoint_selector.js b/packages/devextreme/js/data/endpoint_selector.js index 278737be119a..809f8730695c 100644 --- a/packages/devextreme/js/data/endpoint_selector.js +++ b/packages/devextreme/js/data/endpoint_selector.js @@ -1,7 +1,3 @@ -/** - * @name EndpointSelector.ctor - * @publicName ctor(options) - * @param1 options:Object - * @hidden -*/ -export { default } from '../__internal/data/m_endpoint_selector'; +import EndpointSelector from '../common/data/endpoint_selector'; + +export default EndpointSelector; diff --git a/packages/devextreme/js/data/errors.d.ts b/packages/devextreme/js/data/errors.d.ts index a51ecdc208e5..df232810705e 100644 --- a/packages/devextreme/js/data/errors.d.ts +++ b/packages/devextreme/js/data/errors.d.ts @@ -1,16 +1,4 @@ -/** - * @docid Utils.errorHandler - * @type function(e) - * @namespace DevExpress.data - * @deprecated Utils.setErrorHandler - * @public - */ -export function errorHandler(e: Error): void; - -/** - * @docid Utils.setErrorHandler - * @type function(handler) - * @namespace DevExpress.data - * @public - */ -export function setErrorHandler(handler: (e: Error) => void): void; +export { + setErrorHandler, + errorHandler, +} from '../common/data'; diff --git a/packages/devextreme/js/data/errors.js b/packages/devextreme/js/data/errors.js index 73263e080700..bde57eb9729f 100644 --- a/packages/devextreme/js/data/errors.js +++ b/packages/devextreme/js/data/errors.js @@ -1,91 +1,2 @@ -/** -* @docid -* @name ErrorsData -*/ - -/** -* @name ErrorsData.E4000 -*/ -/** - * @name ErrorsData.E4001 -*/ -/** -* @name ErrorsData.E4002 -*/ -/** -* @name ErrorsData.E4003 -*/ -/** -* @name ErrorsData.E4004 -*/ -/** -* @name ErrorsData.E4005 -*/ -/** -* @name ErrorsData.E4006 -*/ -/** -* @name ErrorsData.E4007 -*/ -/** -* @name ErrorsData.E4008 -*/ -/** -* @name ErrorsData.E4009 -*/ -/** -* @name ErrorsData.E4010 -*/ -/** -* @name ErrorsData.E4011 -*/ -/** -* @name ErrorsData.E4012 -*/ -/** -* @name ErrorsData.E4013 -*/ -/** -* @name ErrorsData.E4014 -*/ -/** -* @name ErrorsData.E4015 -*/ -/** -* @name ErrorsData.E4016 -*/ -/** -* @name ErrorsData.E4017 -*/ -/** -* @name ErrorsData.E4018 -*/ -/** -* @name ErrorsData.E4019 -*/ -/** -* @name ErrorsData.E4020 -*/ -/** -* @name ErrorsData.E4021 -*/ -/** -* @name ErrorsData.E4022 -*/ -/** -* @name ErrorsData.E4023 -*/ -/** -* @name ErrorsData.E4024 -*/ -/** -* @name ErrorsData.W4000 -*/ -/** -* @name ErrorsData.W4001 -*/ -/** -* @name ErrorsData.W4002 -*/ - -export * from '../__internal/data/m_errors'; +export { setErrorHandler } from '../common/data'; +export { errorHandler } from '../common/data/errors'; diff --git a/packages/devextreme/js/data/index.d.ts b/packages/devextreme/js/data/index.d.ts index 22ddfbea28bb..bc3e599575d0 100644 --- a/packages/devextreme/js/data/index.d.ts +++ b/packages/devextreme/js/data/index.d.ts @@ -1,213 +1,13 @@ -import CustomStore, { Options as CustomStoreOptions } from './custom_store'; -import ArrayStore, { Options as ArrayStoreOptions } from './array_store'; -import LocalStore, { Options as LocalStoreOptions } from './local_store'; -import ODataStore, { Options as ODataStoreOptions } from './odata/store'; - -/** - * @public - */ -export type SearchOperation = '=' | '<>' | '>' | '>=' | '<' | '<=' | 'startswith' | 'endswith' | 'contains' | 'notcontains'; - -type KeySelector = string | ((source: T) => string | number | Date | Object); - -type SelectionDescriptor = { - selector: KeySelector; -}; - -type OrderingDescriptor = SelectionDescriptor & { - desc?: boolean; -}; - -/** - * @public - */ -export type GroupingInterval = 'year' | 'quarter' | 'month' | 'day' | 'dayOfWeek' | 'hour' | 'minute' | 'second'; - -/** - * @docid - * @public - * @type object - * @skip - */ -export type GroupDescriptor = KeySelector | (OrderingDescriptor & { - groupInterval?: number | GroupingInterval; - isExpanded?: boolean; -}); - -/** - * @docid - * @public - * @type object - * @skip - */ -export type SortDescriptor = KeySelector | OrderingDescriptor; - -/** - * @docid - * @public - * @type object - * @skip - */ -export type SelectDescriptor = string | Array | ((source: T) => any); -/** - * @docid - * @public - */ -export type FilterDescriptor = any; -/** - * @docid - * @public - */ -export type LangParams = { - /** - * @docid - * @public - */ - locale: string; - /** - * @docid - * @public - * @type object - */ - collatorOptions?: Intl.CollatorOptions; -}; - /** - * @docid - * @public - * @type object - */ -export type SummaryDescriptor = KeySelector | SelectionDescriptor & { - summaryType?: 'sum' | 'avg' | 'min' | 'max' | 'count'; -}; - -/** - * @public - * @docid - * @namespace DevExpress.data - * @type object - */ -export interface LoadOptions { - /** - * @docid - * @public - */ - customQueryParams?: any; - /** - * @docid - * @public - */ - startDate?: Date; - /** - * @docid - * @public - */ - endDate?: Date; - /** - * @docid - * @public - */ - expand?: Array; - /** - * @docid - * @public - * @type object - */ - filter?: FilterDescriptor | Array; - /** - * @docid - * @public - * @type object - */ - group?: GroupDescriptor | Array>; - /** - * @docid - * @public - * @type SummaryDescriptor | Array - */ - groupSummary?: SummaryDescriptor | Array>; - /** - * @docid - * @public - */ - parentIds?: Array; - /** - * @docid - * @public - */ - requireGroupCount?: boolean; - /** - * @docid - * @public - */ - requireTotalCount?: boolean; - /** - * @docid - * @type getter|Array - * @public - */ - searchExpr?: string | Function | Array; - /** - * @docid - * @public - */ - searchOperation?: SearchOperation; - /** - * @docid - * @public - */ - searchValue?: any; - /** - * @docid - * @public - * @type object - */ - select?: SelectDescriptor; - /** - * @docid - * @public - */ - skip?: number; - /** - * @docid - * @public - * @type object - */ - sort?: SortDescriptor | Array>; - /** - * @docid - * @public - */ - take?: number; - /** - * @docid - * @public - * @type SummaryDescriptor | Array - */ - totalSummary?: SummaryDescriptor | Array>; - /** - * @docid - * @public - */ - userData?: any; -} - -/** - * @public - * @namespace DevExpress.data.utils - */ -export type Store = - CustomStore | - ArrayStore | - LocalStore | - ODataStore; - -/** - * @public - * @namespace DevExpress.data.utils - * @type object - */ -export type StoreOptions = - CustomStoreOptions | - ArrayStoreOptions & { type: 'array' } | - LocalStoreOptions & { type: 'local' } | - ODataStoreOptions & { type: 'odata' }; +export { + SearchOperation, + GroupingInterval, + GroupDescriptor, + SortDescriptor, + SelectDescriptor, + FilterDescriptor, + LangParams, + SummaryDescriptor, + LoadOptions, + Store, + StoreOptions, +} from '../common/data'; diff --git a/packages/devextreme/js/data/load_options.d.ts b/packages/devextreme/js/data/load_options.d.ts index 27306760f118..4c6cad2fbdf0 100644 --- a/packages/devextreme/js/data/load_options.d.ts +++ b/packages/devextreme/js/data/load_options.d.ts @@ -1,4 +1,4 @@ -import { LoadOptions as BaseLoadOptions } from './index'; +import { LoadOptions as BaseLoadOptions } from '../common/data'; -/** @deprecated Use LoadOptions from 'devextreme/data' instead */ +/** @deprecated Use LoadOptions from common/data instead */ export interface LoadOptions extends BaseLoadOptions { } diff --git a/packages/devextreme/js/data/local_store.d.ts b/packages/devextreme/js/data/local_store.d.ts index 930258b98fba..7c5183f29251 100644 --- a/packages/devextreme/js/data/local_store.d.ts +++ b/packages/devextreme/js/data/local_store.d.ts @@ -1,56 +1,20 @@ -import ArrayStore, { - ArrayStoreOptions, -} from './array_store'; +import { + LocalStoreOptions, + LocalStore, +} from '../common/data'; -/** @public */ -export type Options< - TItem = any, - TKey = any, -> = LocalStoreOptions; +export { + LocalStoreOptions, +} from '../common/data'; -/** - * @docid - * @namespace DevExpress.data - * @deprecated Use Options instead - */ -export interface LocalStoreOptions< - TItem = any, - TKey = any, -> extends ArrayStoreOptions { - /** - * @docid - * @default 10000 - * @public - */ - flushInterval?: number; - /** - * @docid - * @default false - * @public - */ - immediate?: boolean; - /** - * @docid - * @public - */ - name?: string; -} +export default LocalStore; /** - * @docid - * @inherits ArrayStore - * @public - * @options LocalStoreOptions - */ -export default class LocalStore< - TItem = any, - TKey = any, -> extends ArrayStore { - constructor(options?: Options); - /** - * @docid - * @publicName clear() - * @public - */ - clear(): void; -} +* @public +* @deprecated Use LocalStoreOptions from /common/data instead +* @namespace DevExpress.data.LocalStore +*/ +export type Options< + TItem = any, + TKey = any, +> = LocalStoreOptions; diff --git a/packages/devextreme/js/data/local_store.js b/packages/devextreme/js/data/local_store.js index 4788d4b71d29..d920b16d129c 100644 --- a/packages/devextreme/js/data/local_store.js +++ b/packages/devextreme/js/data/local_store.js @@ -1 +1,3 @@ -export { default } from '../__internal/data/m_local_store'; +import LocalStore from '../common/data/local_store'; + +export default LocalStore; diff --git a/packages/devextreme/js/data/odata/context.d.ts b/packages/devextreme/js/data/odata/context.d.ts index 08ac14b0028c..9d0280eb4d55 100644 --- a/packages/devextreme/js/data/odata/context.d.ts +++ b/packages/devextreme/js/data/odata/context.d.ts @@ -1,115 +1,8 @@ -import { - DxPromise, -} from '../../core/utils/deferred'; +import { ODataContext } from '../../common/data'; -export interface ODataRequestOptions { - accepts: any; - async: boolean; - contentType: string | boolean; - data: any; - dataType: string; - headers: any; - jsonp?: boolean; - method: string; - timeout: number; - url: string; - xhrFields: any; -} +export { + ODataContextOptions, + ODataRequestOptions, +} from '../../common/data'; -/** - * @docid - * @namespace DevExpress.data - * @type object - */ -export interface ODataContextOptions { - /** - * @docid - * @type_function_param1_field params:object - * @type_function_param1_field payload:object - * @type_function_param1_field headers:object - * @public - */ - beforeSend?: ((options: { url: string; async: boolean; method: string; timeout: number; params: any; payload: any; headers: any }) => void); - /** - * @docid - * @public - */ - deserializeDates?: boolean; - /** - * @docid - * @public - */ - entities?: any; - /** - * @docid - * @type_function_param1 e:Error - * @type_function_param1_field errorDetails:object - * @type_function_param1_field requestOptions:object - * @public - */ - errorHandler?: ((e: { httpStatus: number; errorDetails: any; requestOptions: ODataRequestOptions }) => void); - /** - * @docid - * @public - */ - filterToLower?: boolean; - /** - * @docid - * @default false - * @public - */ - jsonp?: boolean; - /** - * @docid - * @public - */ - url?: string; - /** - * @docid - * @default 4 - * @acceptValues 2|3|4 - * @public - */ - version?: number; - /** - * @docid - * @default false - * @public - */ - withCredentials?: boolean; -} -/** - * @docid - * @public - * @options ODataContextOptions - */ -export default class ODataContext { - constructor(options?: ODataContextOptions); - /** - * @docid - * @publicName get(operationName, params) - * @param2 params:object - * @return Promise - * @public - */ - get(operationName: string, params: any): DxPromise; - /** - * @docid - * @publicName invoke(operationName, params, httpMethod) - * @param2 params:object - * @param3 httpMethod:string - * @return Promise - * @public - */ - invoke(operationName: string, params: any, httpMethod: HttpMethod): DxPromise; - /** - * @docid - * @publicName objectLink(entityAlias, key) - * @param2 key:object|string|number - * @return object - * @public - */ - objectLink(entityAlias: string, key: any | string | number): any; -} - -type HttpMethod = 'GET' | 'POST' | 'PATCH' | 'MERGE'; +export default ODataContext; diff --git a/packages/devextreme/js/data/odata/context.js b/packages/devextreme/js/data/odata/context.js index e3621d0b626c..5d6088e9f5c2 100644 --- a/packages/devextreme/js/data/odata/context.js +++ b/packages/devextreme/js/data/odata/context.js @@ -1 +1,3 @@ -export { default } from '../../__internal/data/odata/m_context'; +import ODataContext from '../../common/data/odata/context'; + +export default ODataContext; diff --git a/packages/devextreme/js/data/odata/query_adapter.js b/packages/devextreme/js/data/odata/query_adapter.js index 4b6486934b8c..be00098f4228 100644 --- a/packages/devextreme/js/data/odata/query_adapter.js +++ b/packages/devextreme/js/data/odata/query_adapter.js @@ -1 +1,2 @@ -export * from '../../__internal/data/odata/m_query_adapter'; +// eslint-disable-next-line import/export +export * from '../../common/data/odata/query_adapter'; diff --git a/packages/devextreme/js/data/odata/request_dispatcher.js b/packages/devextreme/js/data/odata/request_dispatcher.js index 0aba5a72cb0f..59e1d8001370 100644 --- a/packages/devextreme/js/data/odata/request_dispatcher.js +++ b/packages/devextreme/js/data/odata/request_dispatcher.js @@ -1 +1 @@ -export { default } from '../../__internal/data/odata/m_request_dispatcher'; +export { default } from '../../common/data/odata/request_dispatcher'; diff --git a/packages/devextreme/js/data/odata/store.d.ts b/packages/devextreme/js/data/odata/store.d.ts index 1d493c231314..09dd1949248f 100644 --- a/packages/devextreme/js/data/odata/store.d.ts +++ b/packages/devextreme/js/data/odata/store.d.ts @@ -1,112 +1,16 @@ -import { DxPromise } from '../../core/utils/deferred'; -import Store, { Options as StoreOptions } from '../abstract_store'; -import { Query } from '../query'; -import { ODataRequestOptions } from './context'; +import { ODataStoreOptions, ODataStore } from '../../common/data'; -/** @public */ +/** + * @public + * @namespace DevExpress.data.ODataStore + */ export type Options< TItem = any, TKey = any, > = ODataStoreOptions; -/** - * @docid - * @namespace DevExpress.data - * @deprecated Use Options instead - */ -export interface ODataStoreOptions< - TItem = any, - TKey = any, -> extends StoreOptions { - /** - * @docid - * @type_function_param1_field params:object - * @type_function_param1_field payload:object - * @type_function_param1_field headers:object - * @public - */ - beforeSend?: ((options: { url: string; async: boolean; method: string; timeout: number; params: any; payload: any; headers: any }) => void); - /** - * @docid - * @public - */ - deserializeDates?: boolean; - /** - * @docid - * @type_function_param1 e:Error - * @type_function_param1_field errorDetails:object - * @type_function_param1_field requestOptions:object - * @public - */ - errorHandler?: ((e: { httpStatus: number; errorDetails: any; requestOptions: ODataRequestOptions }) => void); - /** - * @docid - * @default {} - * @public - */ - fieldTypes?: any; - /** - * @docid - * @public - */ - filterToLower?: boolean; - /** - * @docid - * @default false - * @public - */ - jsonp?: boolean; - /** - * @docid - * @type string|object - * @acceptValues "String"|"Int32"|"Int64"|"Guid"|"Boolean"|"Single"|"Decimal" - * @public - */ - keyType?: 'String' | 'Int32' | 'Int64' | 'Guid' | 'Boolean' | 'Single' | 'Decimal' | any; - /** - * @docid - * @public - */ - url?: string; - /** - * @docid - * @default 4 - * @acceptValues 2|3|4 - * @public - */ - version?: number; - /** - * @docid - * @default false - * @public - */ - withCredentials?: boolean; -} +export { + ODataStoreOptions, +}; -/** - * @docid - * @inherits Store - * @public - * @options ODataStoreOptions - */ -export default class ODataStore< - TItem = any, - TKey = any, -> extends Store { - constructor(options?: Options); - /** - * @docid - * @publicName byKey(key, extraOptions) - * @param1 key:object|string|number - * @return Promise - * @public - */ - byKey(key: TKey, extraOptions?: { expand?: string | Array; select?: string | Array }): DxPromise; - /** - * @docid - * @publicName createQuery(loadOptions) - * @return object - * @public - */ - createQuery(loadOptions?: { expand?: string | Array; requireTotalCount?: boolean; customQueryParams?: any }): Query; -} +export default ODataStore; diff --git a/packages/devextreme/js/data/odata/store.js b/packages/devextreme/js/data/odata/store.js index 8168fdb0262c..ddf8b216739f 100644 --- a/packages/devextreme/js/data/odata/store.js +++ b/packages/devextreme/js/data/odata/store.js @@ -1 +1,3 @@ -export { default } from '../../__internal/data/odata/m_store'; +import ODataStore from '../../common/data/odata/store'; + +export default ODataStore; diff --git a/packages/devextreme/js/data/odata/utils.d.ts b/packages/devextreme/js/data/odata/utils.d.ts index 17b6810f4510..816523238d44 100644 --- a/packages/devextreme/js/data/odata/utils.d.ts +++ b/packages/devextreme/js/data/odata/utils.d.ts @@ -1,23 +1,4 @@ -/** - * @docid - * @namespace DevExpress.data - * @public - */ -export class EdmLiteral { - constructor(value: string); - /** - * @docid - * @publicName valueOf() - * @public - */ - valueOf(): string; -} - -/** - * @const Utils.keyConverters - * @publicName odata.keyConverters - * @namespace DevExpress.data.utils.odata - * @public - */ -// eslint-disable-next-line vars-on-top, import/no-mutable-exports, no-var, @typescript-eslint/init-declarations, @typescript-eslint/no-explicit-any -export var keyConverters: any; +export { + EdmLiteral, + keyConverters, +} from '../../common/data'; diff --git a/packages/devextreme/js/data/odata/utils.js b/packages/devextreme/js/data/odata/utils.js index c1c0081a98d0..d8c0d3296dd3 100644 --- a/packages/devextreme/js/data/odata/utils.js +++ b/packages/devextreme/js/data/odata/utils.js @@ -1,6 +1,2 @@ -/** - * @name EdmLiteral.ctor - * @publicName ctor(value) - * @param1 value:string - */ -export * from '../../__internal/data/odata/m_utils'; +// eslint-disable-next-line import/export +export * from '../../common/data/odata/utils'; diff --git a/packages/devextreme/js/data/query.d.ts b/packages/devextreme/js/data/query.d.ts index 5c009faf1be0..234d42c6d11c 100644 --- a/packages/devextreme/js/data/query.d.ts +++ b/packages/devextreme/js/data/query.d.ts @@ -1,187 +1,7 @@ -import { - DxPromise, -} from '../core/utils/deferred'; +import { query } from '../common/data'; -/** - * @docid - * @type object - * @public - */ -export interface Query { - /** - * @docid - * @publicName aggregate(seed, step, finalize) - * @param1 seed:object - * @return Promise - * @public - */ - aggregate(seed: any, step: Function, finalize: Function): DxPromise; - /** - * @docid - * @publicName aggregate(step) - * @return Promise - * @public - */ - aggregate(step: Function): DxPromise; - /** - * @docid - * @publicName avg() - * @return Promise - * @public - */ - avg(): DxPromise; - /** - * @docid - * @publicName avg(getter) - * @param1 getter:object - * @return Promise - * @public - */ - avg(getter: any): DxPromise; - /** - * @docid - * @publicName count() - * @return Promise - * @public - */ - count(): DxPromise; - /** - * @docid - * @publicName enumerate() - * @return Promise - * @public - */ - enumerate(): DxPromise; - /** - * @docid - * @publicName filter(criteria) - * @public - */ - filter(criteria: Array): Query; - /** - * @docid - * @publicName filter(predicate) - * @public - */ - filter(predicate: Function): Query; - /** - * @docid - * @publicName groupBy(getter) - * @param1 getter:object - * @public - */ - groupBy(getter: any): Query; - /** - * @docid - * @publicName max() - * @return Promise - * @public - */ - max(): DxPromise; - /** - * @docid - * @publicName max(getter) - * @param1 getter:object - * @return Promise - * @public - */ - max(getter: any): DxPromise; - /** - * @docid - * @publicName min() - * @return Promise - * @public - */ - min(): DxPromise; - /** - * @docid - * @publicName min(getter) - * @param1 getter:object - * @return Promise - * @public - */ - min(getter: any): DxPromise; - /** - * @docid - * @publicName select(getter) - * @param1 getter:object|Array - * @public - */ - select(...getters: any[]): Query; - /** - * @docid - * @publicName slice(skip, take) - * @param2 take:number|undefined - * @public - */ - slice(skip: number, take?: number): Query; - /** - * @docid - * @publicName sortBy(getter) - * @param1 getter:object - * @public - */ - sortBy(getter: any): Query; - /** - * @docid - * @publicName sortBy(getter, desc) - * @param1 getter:object - * @public - */ - sortBy(getter: any, desc: boolean): Query; - /** - * @docid - * @publicName sum() - * @return Promise - * @public - */ - sum(): DxPromise; - /** - * @docid - * @publicName sum(getter) - * @param1 getter:object - * @return Promise - * @public - */ - sum(getter: any): DxPromise; - /** - * @docid - * @publicName thenBy(getter) - * @param1 getter:object - * @public - */ - thenBy(getter: any): Query; - /** - * @docid - * @publicName thenBy(getter, desc) - * @param1 getter:object - * @public - */ - thenBy(getter: any, desc: boolean): Query; - /** - * @docid - * @publicName toArray() - * @public - */ - toArray(): Array; -} - -/** - * @docid Utils.query - * @publicName query(array, queryOptions) - * @param2 queryOptions:object - * @namespace DevExpress.data - * @public - */ -declare function query(array: Array, queryOptions?: any): Query; - -/** - * @docid Utils.query - * @publicName query(url, queryOptions) - * @param2 queryOptions:object - * @namespace DevExpress.data - * @public - */ -declare function query(url: string, queryOptions: any): Query; +export { + Query, +} from '../common/data'; export default query; diff --git a/packages/devextreme/js/data/query.js b/packages/devextreme/js/data/query.js index 9daad5afb660..919279dbfc6b 100644 --- a/packages/devextreme/js/data/query.js +++ b/packages/devextreme/js/data/query.js @@ -1 +1,3 @@ -export { default } from '../__internal/data/m_query'; +import { query } from '../common/data'; + +export default query; diff --git a/packages/devextreme/js/data/query_adapters.js b/packages/devextreme/js/data/query_adapters.js index ff8b4c56321a..5d3c271d855e 100644 --- a/packages/devextreme/js/data/query_adapters.js +++ b/packages/devextreme/js/data/query_adapters.js @@ -1 +1 @@ -export default {}; +export { default } from '../common/data/query_adapters'; diff --git a/packages/devextreme/js/data/query_implementation.js b/packages/devextreme/js/data/query_implementation.js index 43c2572d92f7..463414a1f8ed 100644 --- a/packages/devextreme/js/data/query_implementation.js +++ b/packages/devextreme/js/data/query_implementation.js @@ -1,7 +1 @@ -import arrayQueryImpl from './array_query'; -import remoteQueryImpl from './remote_query'; - -export const queryImpl = { - array: arrayQueryImpl, - remote: remoteQueryImpl -}; +export * from '../common/data/query_implementation'; diff --git a/packages/devextreme/js/data/remote_query.js b/packages/devextreme/js/data/remote_query.js index b147929d99c5..ee9082488b2e 100644 --- a/packages/devextreme/js/data/remote_query.js +++ b/packages/devextreme/js/data/remote_query.js @@ -1 +1 @@ -export { default } from '../__internal/data/m_remote_query'; +export { default } from '../common/data/remote_query'; diff --git a/packages/devextreme/js/data/store.d.ts b/packages/devextreme/js/data/store.d.ts index b3800fb57a41..69688449b727 100644 --- a/packages/devextreme/js/data/store.d.ts +++ b/packages/devextreme/js/data/store.d.ts @@ -1,20 +1,13 @@ -import { - DxPromise, - DxExtendedPromise, -} from '../core/utils/deferred'; -import { DeepPartial } from '../core/index'; -import { - FilterDescriptor, - GroupDescriptor, - LoadOptions, -} from './index'; +import { DxPromise, DxExtendedPromise } from '../core/utils/deferred'; +import { DeepPartial } from '../core'; +import { FilterDescriptor, GroupDescriptor, LoadOptions } from '../common/data'; /** * @docid StoreOptions - * @namespace DevExpress.data.Store + * @namespace DevExpress.common.data * @hidden */ -export type Options< +export type StoreOptions< TItem = any, TKey = any, > = { @@ -100,19 +93,19 @@ export type Options< onUpdating?: ((key: TKey, values: TItem) => void); }; -type EventName = 'loaded' | 'loading' | 'inserted' | 'inserting' | 'updated' | 'updating' | 'push' | 'removed' | 'removing' | 'modified' | 'modifying'; +type StoreEventName = 'loaded' | 'loading' | 'inserted' | 'inserting' | 'updated' | 'updating' | 'push' | 'removed' | 'removing' | 'modified' | 'modifying'; /** * @docid Store - * @namespace DevExpress.data + * @namespace DevExpress.common.data * @hidden - * @options Options + * @options StoreOptions */ export class Store< TItem = any, TKey = any, > { - constructor(options?: Options); + constructor(options?: StoreOptions); /** * @docid * @publicName insert(values) @@ -142,7 +135,7 @@ export class Store< * @return this * @public */ - off(eventName: EventName): this; + off(eventName: StoreEventName): this; /** * @docid * @publicName off(eventName, eventHandler) @@ -150,7 +143,7 @@ export class Store< * @return this * @public */ - off(eventName: EventName, eventHandler: Function): this; + off(eventName: StoreEventName, eventHandler: Function): this; /** * @docid * @publicName on(eventName, eventHandler) @@ -158,7 +151,7 @@ export class Store< * @return this * @public */ - on(eventName: EventName, eventHandler: Function): this; + on(eventName: StoreEventName, eventHandler: Function): this; /** * @docid * @publicName on(events) @@ -166,7 +159,7 @@ export class Store< * @return this * @public */ - on(events: { [key in EventName]?: Function }): this; + on(events: { [key in StoreEventName]?: Function }): this; /** * @docid * @publicName push(changes) diff --git a/packages/devextreme/js/data/store_helper.js b/packages/devextreme/js/data/store_helper.js index b52b1c493c83..5c3ed3a97758 100644 --- a/packages/devextreme/js/data/store_helper.js +++ b/packages/devextreme/js/data/store_helper.js @@ -1 +1 @@ -export { default } from '../__internal/data/m_store_helper'; +export { default } from '../common/data/store_helper'; diff --git a/packages/devextreme/js/data/utils.d.ts b/packages/devextreme/js/data/utils.d.ts index c32257ed8259..9239caa554e8 100644 --- a/packages/devextreme/js/data/utils.d.ts +++ b/packages/devextreme/js/data/utils.d.ts @@ -1,7 +1,3 @@ -/** - * @docid Utils.base64_encode - * @publicName base64_encode(input) - * @namespace DevExpress.data - * @public - */ -export function base64_encode(input: string | Array): string; +export { + base64_encode, +} from '../common/data'; diff --git a/packages/devextreme/js/data/utils.js b/packages/devextreme/js/data/utils.js index f056b6c0caa8..09f625a3571f 100644 --- a/packages/devextreme/js/data/utils.js +++ b/packages/devextreme/js/data/utils.js @@ -1,4 +1 @@ -/** -* @name Utils -*/ -export * from '../__internal/data/m_utils'; +export * from '../common/data/utils'; diff --git a/packages/devextreme/js/data_helper.d.ts b/packages/devextreme/js/data_helper.d.ts index ba00d91f5bc7..6c6cebe4f675 100644 --- a/packages/devextreme/js/data_helper.d.ts +++ b/packages/devextreme/js/data_helper.d.ts @@ -1,14 +1,14 @@ -import DataSource from './data/data_source'; +import { DataSource } from './common/data'; /** * @docid * @hidden */ -export default class DataHelperMixin { - /** - * @docid - * @publicName getDataSource() - * @public - */ - getDataSource(): DataSource; +export class DataHelperMixin { + /** + * @docid + * @publicName getDataSource() + * @public + */ + getDataSource(): DataSource; } diff --git a/packages/devextreme/js/data_helper.js b/packages/devextreme/js/data_helper.js index 7bff404fea60..6af09beb52ca 100644 --- a/packages/devextreme/js/data_helper.js +++ b/packages/devextreme/js/data_helper.js @@ -1,166 +1,3 @@ - -import { DataSource } from './data/data_source/data_source'; -import { extend } from './core/utils/extend'; -import { normalizeDataSourceOptions } from './data/data_source/utils'; -import DataController from './__internal/ui/collection/m_data_controller'; - -const DATA_SOURCE_OPTIONS_METHOD = '_dataSourceOptions'; -const DATA_SOURCE_CHANGED_METHOD = '_dataSourceChangedHandler'; -const DATA_SOURCE_LOAD_ERROR_METHOD = '_dataSourceLoadErrorHandler'; -const DATA_SOURCE_LOADING_CHANGED_METHOD = '_dataSourceLoadingChangedHandler'; -const DATA_SOURCE_FROM_URL_LOAD_MODE_METHOD = '_dataSourceFromUrlLoadMode'; -const SPECIFIC_DATA_SOURCE_OPTION = '_getSpecificDataSourceOption'; -const NORMALIZE_DATA_SOURCE = '_normalizeDataSource'; - - -const DataHelperMixin = { - - postCtor: function() { - this.on('disposing', function() { - this._disposeDataSource(); - }.bind(this)); - }, - - _refreshDataSource: function() { - this._initDataSource(); - this._loadDataSource(); - }, - - _initDataSource: function() { - let dataSourceOptions = (SPECIFIC_DATA_SOURCE_OPTION in this) ? this[SPECIFIC_DATA_SOURCE_OPTION]() : this.option('dataSource'); - let widgetDataSourceOptions; - let dataSourceType; - - this._disposeDataSource(); - - if(dataSourceOptions) { - if(dataSourceOptions instanceof DataSource) { - this._isSharedDataSource = true; - this._dataSource = dataSourceOptions; - } else { - widgetDataSourceOptions = (DATA_SOURCE_OPTIONS_METHOD in this) ? this[DATA_SOURCE_OPTIONS_METHOD]() : {}; - dataSourceType = this._dataSourceType ? this._dataSourceType() : DataSource; - - dataSourceOptions = normalizeDataSourceOptions(dataSourceOptions, { - fromUrlLoadMode: (DATA_SOURCE_FROM_URL_LOAD_MODE_METHOD in this) && this[DATA_SOURCE_FROM_URL_LOAD_MODE_METHOD]() - }); - - this._dataSource = new dataSourceType(extend(true, {}, widgetDataSourceOptions, dataSourceOptions)); - } - - if(NORMALIZE_DATA_SOURCE in this) { - this._dataSource = this[NORMALIZE_DATA_SOURCE](this._dataSource); - } - - this._addDataSourceHandlers(); - this._initDataController(); - } - }, - - _initDataController: function() { - const dataController = this.option?.('_dataController'); - const dataSource = this._dataSource; - - if(dataController) { - this._dataController = dataController; - } else { - this._dataController = new DataController(dataSource); - } - }, - - _addDataSourceHandlers: function() { - if(DATA_SOURCE_CHANGED_METHOD in this) { - this._addDataSourceChangeHandler(); - } - - if(DATA_SOURCE_LOAD_ERROR_METHOD in this) { - this._addDataSourceLoadErrorHandler(); - } - - if(DATA_SOURCE_LOADING_CHANGED_METHOD in this) { - this._addDataSourceLoadingChangedHandler(); - } - - this._addReadyWatcher(); - }, - - _addReadyWatcher: function() { - this.readyWatcher = (function(isLoading) { - this._ready && this._ready(!isLoading); - }).bind(this); - this._dataSource.on('loadingChanged', this.readyWatcher); - }, - - _addDataSourceChangeHandler: function() { - const dataSource = this._dataSource; - this._proxiedDataSourceChangedHandler = (function(e) { - this[DATA_SOURCE_CHANGED_METHOD](dataSource.items(), e); - }).bind(this); - dataSource.on('changed', this._proxiedDataSourceChangedHandler); - }, - - _addDataSourceLoadErrorHandler: function() { - this._proxiedDataSourceLoadErrorHandler = this[DATA_SOURCE_LOAD_ERROR_METHOD].bind(this); - this._dataSource.on('loadError', this._proxiedDataSourceLoadErrorHandler); - }, - - _addDataSourceLoadingChangedHandler: function() { - this._proxiedDataSourceLoadingChangedHandler = this[DATA_SOURCE_LOADING_CHANGED_METHOD].bind(this); - this._dataSource.on('loadingChanged', this._proxiedDataSourceLoadingChangedHandler); - }, - - _loadDataSource: function() { - const dataSource = this._dataSource; - if(dataSource) { - if(dataSource.isLoaded()) { - this._proxiedDataSourceChangedHandler && this._proxiedDataSourceChangedHandler(); - } else { - dataSource.load(); - } - } - }, - - _loadSingle: function(key, value) { - key = key === 'this' ? this._dataSource.key() || 'this' : key; - return this._dataSource.loadSingle(key, value); - }, - - _isLastPage: function() { - return !this._dataSource || this._dataSource.isLastPage() || !this._dataSource._pageSize; - }, - - _isDataSourceLoading: function() { - return this._dataSource && this._dataSource.isLoading(); - }, - - _disposeDataSource: function() { - if(this._dataSource) { - if(this._isSharedDataSource) { - delete this._isSharedDataSource; - - this._proxiedDataSourceChangedHandler && this._dataSource.off('changed', this._proxiedDataSourceChangedHandler); - this._proxiedDataSourceLoadErrorHandler && this._dataSource.off('loadError', this._proxiedDataSourceLoadErrorHandler); - this._proxiedDataSourceLoadingChangedHandler && this._dataSource.off('loadingChanged', this._proxiedDataSourceLoadingChangedHandler); - - if(this._dataSource._eventsStrategy) { - this._dataSource._eventsStrategy.off('loadingChanged', this.readyWatcher); - } - } else { - this._dataSource.dispose(); - } - - delete this._dataSource; - - delete this._proxiedDataSourceChangedHandler; - delete this._proxiedDataSourceLoadErrorHandler; - delete this._proxiedDataSourceLoadingChangedHandler; - } - }, - - getDataSource: function() { - return this._dataSource || null; - } - -}; +import { DataHelperMixin } from './common/data'; export default DataHelperMixin; diff --git a/packages/devextreme/js/events/click.d.ts b/packages/devextreme/js/events/click.d.ts index 6e7c4e0d9c89..7eb8c2a8f967 100644 --- a/packages/devextreme/js/events/click.d.ts +++ b/packages/devextreme/js/events/click.d.ts @@ -1 +1 @@ -export const name = 'dxclick'; +export * from '../common/core/events/click'; diff --git a/packages/devextreme/js/events/click.js b/packages/devextreme/js/events/click.js index b11d13e812b5..232b5a3f9e64 100644 --- a/packages/devextreme/js/events/click.js +++ b/packages/devextreme/js/events/click.js @@ -1,8 +1,2 @@ -/** - * @name UI Events.dxclick - * @type eventType - * @type_function_param1 event:event - * @module events/click -*/ - -export * from '../__internal/events/m_click'; +// eslint-disable-next-line import/export +export * from '../common/core/events/click'; diff --git a/packages/devextreme/js/events/contextmenu.js b/packages/devextreme/js/events/contextmenu.js index d8c4c5830d05..fb3c6c1cc4d7 100644 --- a/packages/devextreme/js/events/contextmenu.js +++ b/packages/devextreme/js/events/contextmenu.js @@ -1,8 +1,2 @@ -/** - * @name UI Events.dxcontextmenu - * @type eventType - * @type_function_param1 event:event - * @module events/contextmenu -*/ - -export * from '../__internal/events/m_contextmenu'; +// eslint-disable-next-line import/export +export * from '../common/core/events/contextmenu'; diff --git a/packages/devextreme/js/events/core/emitter.feedback.js b/packages/devextreme/js/events/core/emitter.feedback.js index f086130e30a5..7222cecfb63e 100644 --- a/packages/devextreme/js/events/core/emitter.feedback.js +++ b/packages/devextreme/js/events/core/emitter.feedback.js @@ -1 +1,2 @@ -export * from '../../__internal/events/core/m_emitter.feedback'; +// eslint-disable-next-line import/export +export * from '../../common/core/events/core/emitter.feedback'; diff --git a/packages/devextreme/js/events/core/emitter.js b/packages/devextreme/js/events/core/emitter.js index 223a042f3077..8a9e22b716db 100644 --- a/packages/devextreme/js/events/core/emitter.js +++ b/packages/devextreme/js/events/core/emitter.js @@ -1 +1 @@ -export { default } from '../../__internal/events/core/m_emitter'; +export { default } from '../../common/core/events/core/emitter'; diff --git a/packages/devextreme/js/events/core/emitter_registrator.js b/packages/devextreme/js/events/core/emitter_registrator.js index c9f061241a98..60fb7641a5e2 100644 --- a/packages/devextreme/js/events/core/emitter_registrator.js +++ b/packages/devextreme/js/events/core/emitter_registrator.js @@ -1 +1 @@ -export { default } from '../../__internal/events/core/m_emitter_registrator'; +export { default } from '../../common/core/events/core/emitter_registrator'; diff --git a/packages/devextreme/js/events/core/event_registrator.js b/packages/devextreme/js/events/core/event_registrator.js index 4de26caede8d..9f55b0025bc6 100644 --- a/packages/devextreme/js/events/core/event_registrator.js +++ b/packages/devextreme/js/events/core/event_registrator.js @@ -1 +1 @@ -export { default } from '../../__internal/events/core/m_event_registrator'; +export { default } from '../../common/core/events/core/event_registrator'; diff --git a/packages/devextreme/js/events/core/event_registrator_callbacks.js b/packages/devextreme/js/events/core/event_registrator_callbacks.js index fc0c626b1575..8a94216970c4 100644 --- a/packages/devextreme/js/events/core/event_registrator_callbacks.js +++ b/packages/devextreme/js/events/core/event_registrator_callbacks.js @@ -1,3 +1 @@ -import MemorizedCallbacks from '../../core/memorized_callbacks'; - -export default new MemorizedCallbacks(); +export { default } from '../../common/core/events/core/event_registrator_callbacks'; diff --git a/packages/devextreme/js/events/core/events_engine.d.ts b/packages/devextreme/js/events/core/events_engine.d.ts index a5f7cd4fadd5..6f5bb96560b9 100644 --- a/packages/devextreme/js/events/core/events_engine.d.ts +++ b/packages/devextreme/js/events/core/events_engine.d.ts @@ -1,11 +1,3 @@ -type EventsEngineType = { - on(element: any, eventName: any, handler: any, options?: any): void; - off(element: any, eventName?: any, handler?: any): void; - one(element: any, eventName: any, handler: any, options?: any): void; - set(eventEngine: any): void; - triggerHandler(element: any, opts: Record): void; -}; +import eventsEngine from '../../common/core/events/core/events_engine'; -declare const eventsEngine: EventsEngineType; -export declare function set(eventEngine: any): void; export default eventsEngine; diff --git a/packages/devextreme/js/events/core/events_engine.js b/packages/devextreme/js/events/core/events_engine.js index a8e5d0c5e304..5f7a0678dd19 100644 --- a/packages/devextreme/js/events/core/events_engine.js +++ b/packages/devextreme/js/events/core/events_engine.js @@ -1 +1 @@ -export { default } from '../../__internal/events/core/m_events_engine'; +export { default } from '../../common/core/events/core/events_engine'; diff --git a/packages/devextreme/js/events/core/hook_touch_props.js b/packages/devextreme/js/events/core/hook_touch_props.js index 96daa6e79e09..db29c499a42a 100644 --- a/packages/devextreme/js/events/core/hook_touch_props.js +++ b/packages/devextreme/js/events/core/hook_touch_props.js @@ -1 +1 @@ -export { default } from '../../__internal/events/core/m_hook_touch_props'; +export { default } from '../../common/core/events/core/hook_touch_props'; diff --git a/packages/devextreme/js/events/core/keyboard_processor.js b/packages/devextreme/js/events/core/keyboard_processor.js index d7e367d4c144..16083e23bf77 100644 --- a/packages/devextreme/js/events/core/keyboard_processor.js +++ b/packages/devextreme/js/events/core/keyboard_processor.js @@ -1 +1 @@ -export { default } from '../../__internal/events/core/m_keyboard_processor'; +export { default } from '../../common/core/events/core/keyboard_processor'; diff --git a/packages/devextreme/js/events/core/wheel.js b/packages/devextreme/js/events/core/wheel.js index c9d2e35c81d2..64e570572c81 100644 --- a/packages/devextreme/js/events/core/wheel.js +++ b/packages/devextreme/js/events/core/wheel.js @@ -1 +1,2 @@ -export * from '../../__internal/events/core/m_wheel'; +// eslint-disable-next-line import/export +export * from '../../common/core/events/core/wheel'; diff --git a/packages/devextreme/js/events/dblclick.js b/packages/devextreme/js/events/dblclick.js index 756e4fe2e74c..9fe4d45f9fe4 100644 --- a/packages/devextreme/js/events/dblclick.js +++ b/packages/devextreme/js/events/dblclick.js @@ -1,11 +1 @@ -/** - * @name UI Events.dxdblclick - * @type eventType - * @type_function_param1 event:event - * @module events/dblclick -*/ - -// 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. -import * as dblclick from './double_click'; - -export default dblclick; +export { default } from '../common/core/events/dblclick'; diff --git a/packages/devextreme/js/events/drag.js b/packages/devextreme/js/events/drag.js index c03bdb173853..ede612a06212 100644 --- a/packages/devextreme/js/events/drag.js +++ b/packages/devextreme/js/events/drag.js @@ -1,45 +1,2 @@ -/** -* @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 -*/ -/** -* @name UI Events.dxdragleave -* @type eventType -* @type_function_param1 event:event -* @type_function_param1_field1 draggingElement:Element -* @module events/drag -*/ -/** - * @name UI Events.dxdragstart - * @type eventType - * @type_function_param1 event:event - * @type_function_param1_field1 cancel:boolean - * @module events/drag -*/ -/** - * @name UI Events.dxdrag - * @type eventType - * @type_function_param1 event:event - * @type_function_param1_field1 offset:number - * @type_function_param1_field2 cancel:boolean - * @module events/drag -*/ -/** - * @name UI Events.dxdragend - * @type eventType - * @type_function_param1 event:event - * @type_function_param1_field1 offset:number - * @type_function_param1_field2 cancel:boolean - * @module events/drag -*/ -export * from '../__internal/events/m_drag'; +// eslint-disable-next-line import/export +export * from '../common/core/events/drag'; diff --git a/packages/devextreme/js/events/events.types.d.ts b/packages/devextreme/js/events/events.types.d.ts new file mode 100644 index 000000000000..fb26232efc89 --- /dev/null +++ b/packages/devextreme/js/events/events.types.d.ts @@ -0,0 +1,114 @@ +/** + * @namespace DevExpress.events + */ +export type EventObject = { + /** + * @docid + * @public + */ + currentTarget: Element; + + /** + * @docid + * @public + */ + data: any; + + /** + * @docid + * @public + */ + delegateTarget: Element; + + /** + * @docid + * @public + */ + target: Element; + /** + * @docid + * @publicName isDefaultPrevented() + * @public + */ + isDefaultPrevented(): boolean; + /** + * @docid + * @publicName isImmediatePropagationStopped() + * @public + */ + isImmediatePropagationStopped(): boolean; + /** + * @docid + * @publicName isPropagationStopped() + * @public + */ + isPropagationStopped(): boolean; + /** + * @docid + * @publicName preventDefault() + * @public + */ + preventDefault(): void; + /** + * @docid + * @publicName stopImmediatePropagation() + * @public + */ + stopImmediatePropagation(): void; + /** + * @docid + * @publicName stopPropagation() + * @public + */ + stopPropagation(): void; +}; + +/** + * @docid + * @publicName handler(event, extraParameters) + * @param2 extraParameters:object + * @hidden + */ +export function eventsHandler(event: DxEvent, extraParameters: any): boolean; + +/* eslint-disable @typescript-eslint/no-empty-interface */ +export interface EventExtension { } +export interface EventType { } +/* eslint-enable @typescript-eslint/no-empty-interface */ + +/** + * @docid + * @type EventObject|jQuery.Event + * + */ +export type DxEvent = {} extends EventType ? (EventObject & TNativeEvent) : EventType; + +/** @deprecated EventObject */ +export type dxEvent = EventObject; + +/** + * @docid + * @type EventObject|jQuery.Event + * @hidden + * @deprecated DxEvent + */ +export type event = DxEvent; + +/** + * @docid eventsMethods.triggerHandler + * @publicName triggerHandler(element, event) + * @namespace DevExpress.events + * @param2 event:string|event + * @hidden + */ +export function triggerHandler(element: Element | Array, event: string | DxEvent): void; + +/** + * @docid eventsMethods.triggerHandler + * @publicName triggerHandler(element, event, extraParameters) + * @namespace DevExpress.events + * @param2 event:string|event + * @param3 extraParameters:object + * @hidden + */ +export function triggerHandler(element: Element | Array, event: string | DxEvent, extraParameters: any): void; diff --git a/packages/devextreme/js/events/events.types.js b/packages/devextreme/js/events/events.types.js new file mode 100644 index 000000000000..9d88b0cfa4df --- /dev/null +++ b/packages/devextreme/js/events/events.types.js @@ -0,0 +1,3 @@ +import eventsEngine from '../common/core/events/core/events_engine'; + +export const triggerHandler = eventsEngine.triggerHandler; diff --git a/packages/devextreme/js/events/gesture/emitter.gesture.js b/packages/devextreme/js/events/gesture/emitter.gesture.js index bacdf0ee957e..0b6ac6a22d78 100644 --- a/packages/devextreme/js/events/gesture/emitter.gesture.js +++ b/packages/devextreme/js/events/gesture/emitter.gesture.js @@ -1 +1 @@ -export { default } from '../../__internal/events/gesture/m_emitter.gesture'; +export { default } from '../../common/core/events/gesture/emitter.gesture'; diff --git a/packages/devextreme/js/events/gesture/emitter.gesture.scroll.js b/packages/devextreme/js/events/gesture/emitter.gesture.scroll.js index d3ae4e160f92..662d02c88ec8 100644 --- a/packages/devextreme/js/events/gesture/emitter.gesture.scroll.js +++ b/packages/devextreme/js/events/gesture/emitter.gesture.scroll.js @@ -1 +1 @@ -export { default } from '../../__internal/events/gesture/m_emitter.gesture.scroll'; +export { default } from '../../common/core/events/gesture/emitter.gesture.scroll'; diff --git a/packages/devextreme/js/events/gesture/swipeable.js b/packages/devextreme/js/events/gesture/swipeable.js index e6d44d8d75e9..9ee98c5d3795 100644 --- a/packages/devextreme/js/events/gesture/swipeable.js +++ b/packages/devextreme/js/events/gesture/swipeable.js @@ -1 +1 @@ -export { default } from '../../__internal/events/gesture/m_swipeable'; +export { default } from '../../common/core/events/gesture/swipeable'; diff --git a/packages/devextreme/js/events/hold.js b/packages/devextreme/js/events/hold.js index 2174679ed7e7..2a8370a0e564 100644 --- a/packages/devextreme/js/events/hold.js +++ b/packages/devextreme/js/events/hold.js @@ -1,8 +1 @@ -/** - * @name UI Events.dxhold - * @type eventType - * @type_function_param1 event:event - * @module events/hold -*/ - -export { default } from '../__internal/events/m_hold'; +export { default } from '../common/core/events/hold'; diff --git a/packages/devextreme/js/events/hover.js b/packages/devextreme/js/events/hover.js index e603188362d0..c84517b6ef3a 100644 --- a/packages/devextreme/js/events/hover.js +++ b/packages/devextreme/js/events/hover.js @@ -1,15 +1,2 @@ -/** - * @name UI Events.dxhoverstart - * @type eventType - * @type_function_param1 event:event - * @module events/hover -*/ - -/** - * @name UI Events.dxhoverend - * @type eventType - * @type_function_param1 event:event - * @module events/hover -*/ - -export * from '../__internal/events/m_hover'; +// eslint-disable-next-line import/export +export * from '../common/core/events/hover'; diff --git a/packages/devextreme/js/events/index.d.ts b/packages/devextreme/js/events/index.d.ts index 999a80e69b94..ac9674be8739 100644 --- a/packages/devextreme/js/events/index.d.ts +++ b/packages/devextreme/js/events/index.d.ts @@ -1,354 +1,23 @@ -import { - DxElement, -} from '../core/element'; - -/* eslint-disable @typescript-eslint/no-empty-interface */ -export interface EventExtension { } -export interface EventType { } -/* eslint-enable @typescript-eslint/no-empty-interface */ -/** - * @docid - * @type EventObject|jQuery.Event - */ -export type DxEvent = {} extends EventType ? (EventObject & TNativeEvent) : EventType; - -/** - * @docid - * @public - */ -export interface InitializedEventInfo { - /** - * @docid - * @type this - */ - readonly component?: TComponent; - /** @docid */ - readonly element?: DxElement; -} - -/** - * @docid - * @public - */ -export interface EventInfo { - /** - * @docid - * @type this - */ - readonly component: TComponent; - /** @docid */ - readonly element: DxElement; - /** - * @docid - * @hidden - */ - readonly model?: any; -} - -/** - * @docid - * @public - */ -export interface NativeEventInfo { - /** - * @docid - * @type this - */ - readonly component: TComponent; - /** @docid */ - readonly element: DxElement; - /** - * @docid - * @hidden - */ - readonly model?: any; - /** - * @docid - * @type event - */ - readonly event?: DxEvent; -} - -/** - * @docid - * @public - */ -export interface ChangedOptionInfo { - /** @docid */ - readonly name: string; - /** @docid */ - readonly fullName: string; - /** @docid */ - readonly value?: any; - /** @docid */ - readonly previousValue?: any; -} - -/** - * @docid - * @public - */ -export interface ItemInfo { - /** - * @docid - * @type object - */ - readonly itemData?: TItemData; - /** @docid */ - readonly itemElement: DxElement; - /** @docid */ - readonly itemIndex: number; -} - -/** - * @docid - * @public - */ -export interface Cancelable { - /** @docid */ - cancel?: boolean; -} - -/** - * @docid - * @public - */ -export type AsyncCancelable = { - /** - * @docid - * @type boolean|Promise - */ - cancel: boolean | PromiseLike; -}; - -/** @deprecated EventObject */ -export type dxEvent = EventObject; - -/** - * @docid - * @section commonObjectStructures - * @public - */ -export type EventObject = { - /** - * @docid - * @public - */ - currentTarget: Element; - - /** - * @docid - * @public - */ - data: any; - - /** - * @docid - * @public - */ - delegateTarget: Element; - - /** - * @docid - * @public - */ - target: Element; - /** - * @docid - * @publicName isDefaultPrevented() - * @public - */ - isDefaultPrevented(): boolean; - /** - * @docid - * @publicName isImmediatePropagationStopped() - * @public - */ - isImmediatePropagationStopped(): boolean; - /** - * @docid - * @publicName isPropagationStopped() - * @public - */ - isPropagationStopped(): boolean; - /** - * @docid - * @publicName preventDefault() - * @public - */ - preventDefault(): void; - /** - * @docid - * @publicName stopImmediatePropagation() - * @public - */ - stopImmediatePropagation(): void; - /** - * @docid - * @publicName stopPropagation() - * @public - */ - stopPropagation(): void; -}; - -/** - * @docid - * @type EventObject|jQuery.Event - * @hidden - * @deprecated DxEvent - */ -export type event = DxEvent; - -/** - * @docid - * @publicName handler(event, extraParameters) - * @param2 extraParameters:object - * @hidden - */ -export function eventsHandler(event: DxEvent, extraParameters: any): boolean; - -/** - * @docid eventsMethods.off - * @publicName off(element) - * @namespace DevExpress.events - * @public - */ -export function off(element: Element | Array): void; - -/** - * @docid eventsMethods.off - * @publicName off(element, eventName) - * @namespace DevExpress.events - * @public - */ -export function off(element: Element | Array, eventName: string): void; - -/** - * @docid eventsMethods.off - * @publicName off(element, eventName, handler) - * @namespace DevExpress.events - * @public - */ -export function off(element: Element | Array, eventName: string, handler: Function): void; - -/** - * @docid eventsMethods.off - * @publicName off(element, eventName, selector) - * @namespace DevExpress.events - * @public - */ -export function off(element: Element | Array, eventName: string, selector: string): void; - -/** - * @docid eventsMethods.off - * @publicName off(element, eventName, selector, handler) - * @namespace DevExpress.events - * @public - */ -export function off(element: Element | Array, eventName: string, selector: string, handler: Function): void; - -/** - * @docid eventsMethods.on - * @publicName on(element, eventName, data, handler) - * @namespace DevExpress.events - * @param3 data:object - * @public - */ -export function on(element: Element | Array, eventName: string, data: any, handler: Function): void; - -/** - * @docid eventsMethods.on - * @publicName on(element, eventName, handler) - * @namespace DevExpress.events - * @public - */ -export function on(element: Element | Array, eventName: string, handler: Function): void; - -/** - * @docid eventsMethods.on - * @publicName on(element, eventName, selector, data, handler) - * @namespace DevExpress.events - * @param4 data:object - * @public - */ -export function on(element: Element | Array, eventName: string, selector: string, data: any, handler: Function): void; - -/** - * @docid eventsMethods.on - * @publicName on(element, eventName, selector, handler) - * @namespace DevExpress.events - * @public - */ -export function on(element: Element | Array, eventName: string, selector: string, handler: Function): void; - -/** - * @docid eventsMethods.one - * @publicName one(element, eventName, data, handler) - * @namespace DevExpress.events - * @param3 data:object - * @public - */ -export function one(element: Element | Array, eventName: string, data: any, handler: Function): void; - -/** - * @docid eventsMethods.one - * @publicName one(element, eventName, handler) - * @namespace DevExpress.events - * @public - */ -export function one(element: Element | Array, eventName: string, handler: Function): void; - -/** - * @docid eventsMethods.one - * @publicName one(element, eventName, selector, data, handler) - * @namespace DevExpress.events - * @param4 data:object - * @public - */ -export function one(element: Element | Array, eventName: string, selector: string, data: any, handler: Function): void; - -/** - * @docid eventsMethods.one - * @publicName one(element, eventName, selector, handler) - * @namespace DevExpress.events - * @public - */ -export function one(element: Element | Array, eventName: string, selector: string, handler: Function): void; - -/** - * @docid eventsMethods.trigger - * @publicName trigger(element, event) - * @namespace DevExpress.events - * @param2 event:string|event - * @public - */ -export function trigger(element: Element | Array, event: string | DxEvent): void; - -/** - * @docid eventsMethods.trigger - * @publicName trigger(element, event, extraParameters) - * @namespace DevExpress.events - * @param2 event:string|event - * @param3 extraParameters:object - * @public - */ -export function trigger(element: Element | Array, event: string | DxEvent, extraParameters: any): void; - -/** - * @docid eventsMethods.triggerHandler - * @publicName triggerHandler(element, event) - * @namespace DevExpress.events - * @param2 event:string|event - * @hidden - */ -export function triggerHandler(element: Element | Array, event: string | DxEvent): void; - -/** - * @docid eventsMethods.triggerHandler - * @publicName triggerHandler(element, event, extraParameters) - * @namespace DevExpress.events - * @param2 event:string|event - * @param3 extraParameters:object - * @hidden - */ -export function triggerHandler(element: Element | Array, event: string | DxEvent, extraParameters: any): void; +export { + InitializedEventInfo, + EventInfo, + NativeEventInfo, + ChangedOptionInfo, + ItemInfo, + Cancelable, + AsyncCancelable, + off, + on, + one, + trigger, +} from '../common/core/events'; + +export { + eventsHandler, + triggerHandler, + EventExtension, + EventType, + DxEvent, + dxEvent, + event, +} from './events.types'; diff --git a/packages/devextreme/js/events/index.js b/packages/devextreme/js/events/index.js index 23db4967fe9f..f81cb7d08b50 100644 --- a/packages/devextreme/js/events/index.js +++ b/packages/devextreme/js/events/index.js @@ -1,26 +1,10 @@ -import eventsEngine from './core/events_engine'; - -/** -* @name events -*/ - - -export const on = eventsEngine.on; - -export const one = eventsEngine.one; -export const off = eventsEngine.off; -export const trigger = eventsEngine.trigger; -export const triggerHandler = eventsEngine.triggerHandler; - -/** -* @name events.Event -* @type function -* @param1 source:string|event -* @param2 config:object -* @return event -* @module events -* @export Event -* @hidden -*/ - -export const Event = eventsEngine.Event; +export { + on, + one, + off, + trigger, +} from '../common/core/events'; + +export { + triggerHandler, +} from './events.types'; diff --git a/packages/devextreme/js/events/pointer.d.ts b/packages/devextreme/js/events/pointer.d.ts index ff3746f47ef4..4057ef57d0d2 100644 --- a/packages/devextreme/js/events/pointer.d.ts +++ b/packages/devextreme/js/events/pointer.d.ts @@ -1,12 +1,3 @@ -type Pointer = { - down: 'dxpointerdown'; - up: 'dxpointerup'; - move: 'dxpointermove'; - cancel: 'dxpointercancel'; - enter: 'dxpointerenter'; - leave: 'dxpointerleave'; - over: 'dxpointerover'; - out: 'dxpointerout'; -}; -declare const pointer: Pointer; +import pointer from '../common/core/events/pointer'; + export default pointer; diff --git a/packages/devextreme/js/events/pointer.js b/packages/devextreme/js/events/pointer.js index 76b7978e98d7..73285dd2411c 100644 --- a/packages/devextreme/js/events/pointer.js +++ b/packages/devextreme/js/events/pointer.js @@ -1,58 +1 @@ -/** - * @name UI Events.dxpointerdown - * @type eventType - * @type_function_param1 event:event - * @type_function_param1_field1 pointerType:string - * @module events/pointer -*/ -/** - * @name UI Events.dxpointermove - * @type eventType - * @type_function_param1 event:event - * @type_function_param1_field1 pointerType:string - * @module events/pointer -*/ -/** - * @name UI Events.dxpointerup - * @type eventType - * @type_function_param1 event:event - * @type_function_param1_field1 pointerType:string - * @module events/pointer -*/ -/** - * @name UI Events.dxpointercancel - * @type eventType - * @type_function_param1 event:event - * @type_function_param1_field1 pointerType:string - * @module events/pointer -*/ -/** - * @name UI Events.dxpointerover - * @type eventType - * @type_function_param1 event:event - * @type_function_param1_field1 pointerType:string - * @module events/pointer -*/ -/** - * @name UI Events.dxpointerout - * @type eventType - * @type_function_param1 event:event - * @type_function_param1_field1 pointerType:string - * @module events/pointer -*/ -/** - * @name UI Events.dxpointerenter - * @type eventType - * @type_function_param1 event:event - * @type_function_param1_field1 pointerType:string - * @module events/pointer -*/ -/** - * @name UI Events.dxpointerleave - * @type eventType - * @type_function_param1 event:event - * @type_function_param1_field1 pointerType:string - * @module events/pointer -*/ - -export { default } from '../__internal/events/m_pointer'; +export { default } from '../common/core/events/pointer'; diff --git a/packages/devextreme/js/events/pointer/base.js b/packages/devextreme/js/events/pointer/base.js index 305dab9967e0..b2420f981c1a 100644 --- a/packages/devextreme/js/events/pointer/base.js +++ b/packages/devextreme/js/events/pointer/base.js @@ -1 +1 @@ -export { default } from '../../__internal/events/pointer/m_base'; +export { default } from '../../common/core/events/pointer/base'; diff --git a/packages/devextreme/js/events/pointer/mouse.js b/packages/devextreme/js/events/pointer/mouse.js index aaded4766988..331959ee952c 100644 --- a/packages/devextreme/js/events/pointer/mouse.js +++ b/packages/devextreme/js/events/pointer/mouse.js @@ -1 +1 @@ -export { default } from '../../__internal/events/pointer/m_mouse'; +export { default } from '../../common/core/events/pointer/mouse'; diff --git a/packages/devextreme/js/events/pointer/mouse_and_touch.js b/packages/devextreme/js/events/pointer/mouse_and_touch.js index dde0522c0306..5a40a106d5ed 100644 --- a/packages/devextreme/js/events/pointer/mouse_and_touch.js +++ b/packages/devextreme/js/events/pointer/mouse_and_touch.js @@ -1 +1 @@ -export { default } from '../../__internal/events/pointer/m_mouse_and_touch'; +export { default } from '../../common/core/events/pointer/mouse_and_touch'; diff --git a/packages/devextreme/js/events/pointer/observer.js b/packages/devextreme/js/events/pointer/observer.js index 6b5fefe472db..772d450e3b31 100644 --- a/packages/devextreme/js/events/pointer/observer.js +++ b/packages/devextreme/js/events/pointer/observer.js @@ -1 +1 @@ -export { default } from '../../__internal/events/pointer/m_observer'; +export { default } from '../../common/core/events/pointer/observer'; diff --git a/packages/devextreme/js/events/pointer/touch.js b/packages/devextreme/js/events/pointer/touch.js index f41aa71ccc75..69ec4b54593f 100644 --- a/packages/devextreme/js/events/pointer/touch.js +++ b/packages/devextreme/js/events/pointer/touch.js @@ -1 +1 @@ -export { default } from '../../__internal/events/pointer/m_touch'; +export { default } from '../../common/core/events/pointer/touch'; diff --git a/packages/devextreme/js/events/remove.js b/packages/devextreme/js/events/remove.js index b475e099cbec..73805f00f550 100644 --- a/packages/devextreme/js/events/remove.js +++ b/packages/devextreme/js/events/remove.js @@ -1,8 +1,2 @@ -/** - * @name UI Events.dxremove - * @type eventType - * @type_function_param1 event:event - * @module events/remove -*/ - -export * from '../__internal/events/m_remove'; +// eslint-disable-next-line import/export +export * from '../common/core/events/remove'; diff --git a/packages/devextreme/js/events/short.js b/packages/devextreme/js/events/short.js index 70e38ebf6b7b..c6f4098122a5 100644 --- a/packages/devextreme/js/events/short.js +++ b/packages/devextreme/js/events/short.js @@ -1 +1,2 @@ -export * from '../__internal/events/m_short'; +// eslint-disable-next-line import/export +export * from '../common/core/events/short'; diff --git a/packages/devextreme/js/events/swipe.js b/packages/devextreme/js/events/swipe.js index 31e61bbd529e..5f9190213213 100644 --- a/packages/devextreme/js/events/swipe.js +++ b/packages/devextreme/js/events/swipe.js @@ -1,25 +1,2 @@ -/** - * @name UI Events.dxswipestart - * @type eventType - * @type_function_param1 event:event - * @type_function_param1_field1 cancel:boolean - * @module events/swipe -*/ -/** - * @name UI Events.dxswipe - * @type eventType - * @type_function_param1 event:event - * @type_function_param1_field1 offset:number - * @type_function_param1_field2 cancel:boolean - * @module events/swipe -*/ -/** - * @name UI Events.dxswipeend - * @type eventType - * @type_function_param1 event:event - * @type_function_param1_field1 offset:number - * @type_function_param1_field2 targetOffset:number - * @module events/swipe -*/ - -export * from '../__internal/events/m_swipe'; +// eslint-disable-next-line import/export +export * from '../common/core/events/swipe'; diff --git a/packages/devextreme/js/events/transform.js b/packages/devextreme/js/events/transform.js index db22a4cec363..4151a15a32a7 100644 --- a/packages/devextreme/js/events/transform.js +++ b/packages/devextreme/js/events/transform.js @@ -1,133 +1 @@ -import { exportNames } from '../__internal/events/m_transform'; - -/** - * @name UI Events.dxtransformstart - * @type eventType - * @type_function_param1 event:event - * @type_function_param1_field1 cancel:boolean - * @module events/transform -*/ -/** - * @name UI Events.dxtransform - * @type eventType - * @type_function_param1 event:event - * @type_function_param1_field1 scale:number - * @type_function_param1_field2 deltaScale:number - * @type_function_param1_field3 rotation:number - * @type_function_param1_field4 deltaRotation:number - * @type_function_param1_field5 translation:object - * @type_function_param1_field6 deltaTranslation:object - * @type_function_param1_field7 cancel:boolean - * @module events/transform -*/ -/** - * @name UI Events.dxtransformend - * @type eventType - * @type_function_param1 event:event - * @type_function_param1_field1 scale:number - * @type_function_param1_field2 deltaScale:number - * @type_function_param1_field3 rotation:number - * @type_function_param1_field4 deltaRotation:number - * @type_function_param1_field5 translation:object - * @type_function_param1_field6 deltaTranslation:object - * @type_function_param1_field7 cancel:boolean - * @module events/transform -*/ - -/** - * @name UI Events.dxtranslatestart - * @type eventType - * @type_function_param1 event:event - * @type_function_param1_field1 cancel:boolean - * @module events/transform -*/ -/** - * @name UI Events.dxtranslate - * @type eventType - * @type_function_param1 event:event - * @type_function_param1_field1 translation:object - * @type_function_param1_field2 deltaTranslation:object - * @type_function_param1_field3 cancel:boolean - * @module events/transform -*/ -/** - * @name UI Events.dxtranslateend - * @type eventType - * @type_function_param1 event:event - * @type_function_param1_field1 translation:object - * @type_function_param1_field2 deltaTranslation:object - * @type_function_param1_field3 cancel:boolean - * @module events/transform -*/ - -/** -* @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 - * @type_function_param1 event:event - * @type_function_param1_field1 scale:number - * @type_function_param1_field2 deltaScale:number - * @type_function_param1_field3 cancel:boolean - * @module events/transform -*/ -/** - * @name UI Events.dxpinchend - * @type eventType - * @type_function_param1 event:event - * @type_function_param1_field1 scale:number - * @type_function_param1_field2 deltaScale:number - * @type_function_param1_field3 cancel:boolean - * @module events/transform -*/ - -/** - * @name UI Events.dxrotatestart - * @type eventType - * @type_function_param1 event:event - * @type_function_param1_field1 cancel:boolean - * @module events/transform -*/ -/** - * @name UI Events.dxrotate - * @type eventType - * @type_function_param1 event:event - * @type_function_param1_field1 rotation:number - * @type_function_param1_field2 deltaRotation:number - * @type_function_param1_field3 cancel:boolean - * @module events/transform -*/ -/** - * @name UI Events.dxrotateend - * @type eventType - * @type_function_param1 event:event - * @type_function_param1_field1 rotation:number - * @type_function_param1_field2 deltaRotation:number - * @type_function_param1_field3 cancel:boolean - * @module events/transform -*/ - -/* eslint-disable spellcheck/spell-checker */ -export const { - transformstart, - transform, - transformend, - translatestart, - translate, - translateend, - zoomstart, - zoom, - zoomend, - pinchstart, - pinch, - pinchend, - rotatestart, - rotate, - rotateend, -} = exportNames; - +export * from '../common/core/events/transform'; diff --git a/packages/devextreme/js/events/utils/add_namespace.js b/packages/devextreme/js/events/utils/add_namespace.js index ffa6a046fa06..07bd7287f751 100644 --- a/packages/devextreme/js/events/utils/add_namespace.js +++ b/packages/devextreme/js/events/utils/add_namespace.js @@ -1 +1 @@ -export { default } from '../../__internal/events/utils/m_add_namespace'; +export { default } from '../../common/core/events/utils/add_namespace'; diff --git a/packages/devextreme/js/events/utils/event_nodes_disposing.js b/packages/devextreme/js/events/utils/event_nodes_disposing.js index 0dd3c94270d2..701ca9fe50c6 100644 --- a/packages/devextreme/js/events/utils/event_nodes_disposing.js +++ b/packages/devextreme/js/events/utils/event_nodes_disposing.js @@ -1 +1,2 @@ -export * from '../../__internal/events/utils/m_event_nodes_disposing'; +// eslint-disable-next-line import/export +export * from '../../common/core/events/utils/event_nodes_disposing'; diff --git a/packages/devextreme/js/events/utils/event_target.js b/packages/devextreme/js/events/utils/event_target.js index 6b0f3d4dd2a0..a0db0d988c6d 100644 --- a/packages/devextreme/js/events/utils/event_target.js +++ b/packages/devextreme/js/events/utils/event_target.js @@ -1 +1,2 @@ -export * from '../../__internal/events/utils/m_event_target'; +// eslint-disable-next-line import/export +export * from '../../common/core/events/utils/event_target'; diff --git a/packages/devextreme/js/events/utils/index.d.ts b/packages/devextreme/js/events/utils/index.d.ts index 52301813f8ce..a2e98a0280bc 100644 --- a/packages/devextreme/js/events/utils/index.d.ts +++ b/packages/devextreme/js/events/utils/index.d.ts @@ -1,21 +1 @@ -type eventTypes = 'dx' | 'other' | 'pointer' | 'mouse' | 'dxmousewheel' | 'touch' | 'keyboard'; -export function eventSource(arg: { type: string }): eventTypes; -export function isPointerEvent(arg: { type: string }): boolean; -export function isMouseEvent(arg: { type: string }): boolean; -export function isDxMouseWheelEvent(arg: { type: string }): boolean; -export function isTouchEvent(arg: { type: string }): boolean; -export function isKeyboardEvent(arg: { type: string }): boolean; -export function isFakeClickEvent(arg: { screenX: number; offsetX: number; pageX: number }): boolean; -export function eventData(arg: { pageX: number; pageY: number; timeStamp: number }): { x: number; y: number; time: number }; -export function eventDelta(from: number, to: number): { x: number; y: number; time: number }; -export function hasTouches(e: { type: string; pointers?: ArrayLike; originalEvent: { touches?: ArrayLike } }): number; -export function forceSkipEvents(): boolean; -export function stopEventsSkipping(): boolean; -export function needSkipEvent(e: { target?: any; type: string }): boolean; -export function setEventFixMethod(func: any): void; -export function createEvent(originalEvent: any, args?: any): any; -export function fireEvent(arg: { originalEvent: any; delegateTarget?: any; type?: any; target?: any }): any; -export function normalizeKeyName(arg: { key?: string; which?: string | number }): string | undefined; -export function getChar(arg: { key?: string; which: string | number }): string; -export function addNamespace(eventNames: Array | string, namespace: string): string; -export function isCommandKeyPressed(arg: { ctrlKey: boolean; metaKey: boolean }): boolean; +export * from '../../common/core/events/utils/index'; diff --git a/packages/devextreme/js/events/utils/index.js b/packages/devextreme/js/events/utils/index.js index 4e21a47cee31..baa00e2a92c2 100644 --- a/packages/devextreme/js/events/utils/index.js +++ b/packages/devextreme/js/events/utils/index.js @@ -1 +1,2 @@ -export * from '../../__internal/events/utils/index'; +// eslint-disable-next-line import/export +export * from '../../common/core/events/utils/index'; diff --git a/packages/devextreme/js/events/visibility_change.js b/packages/devextreme/js/events/visibility_change.js index eae6f20c886a..e7981021de1d 100644 --- a/packages/devextreme/js/events/visibility_change.js +++ b/packages/devextreme/js/events/visibility_change.js @@ -1,7 +1 @@ -import VisibilityChangeModule from '../__internal/events/m_visibility_change'; - -export const triggerShownEvent = VisibilityChangeModule.triggerShownEvent; -export const triggerHidingEvent = VisibilityChangeModule.triggerHidingEvent; -export const triggerResizeEvent = VisibilityChangeModule.triggerResizeEvent; - -export default VisibilityChangeModule; +export { default } from '../common/core/events/visibility_change'; diff --git a/packages/devextreme/js/excel_exporter.d.ts b/packages/devextreme/js/excel_exporter.d.ts index c4cddd182240..b6974f3910c8 100644 --- a/packages/devextreme/js/excel_exporter.d.ts +++ b/packages/devextreme/js/excel_exporter.d.ts @@ -1,279 +1,16 @@ -import { DxPromise } from './core/utils/deferred'; -import dxDataGrid, { Column } from './ui/data_grid'; -import dxPivotGrid, { Cell } from './ui/pivot_grid'; -import { ExportLoadPanel } from './exporter/export_load_panel'; - -/** - * @public - * @namespace DevExpress.excelExporter - */ -export type DataGridCell = ExcelDataGridCell; - -/** - * @namespace DevExpress.excelExporter - * @deprecated Use DataGridCell instead - */ -export interface ExcelDataGridCell { - /** - * @docid - * @public - * @type dxDataGridColumn - */ - column?: Column; - /** - * @docid - * @public - */ - data?: any; - /** - * @docid - * @public - */ - groupIndex?: number; - /** - * @docid - * @public - */ - groupSummaryItems?: Array<{ - /** - * @docid - */ - name?: string; - /** - * @docid - */ - value?: any; - }>; - /** - * @docid - * @public - */ - rowType?: string; - /** - * @docid - * @public - */ - totalSummaryItemName?: string; - /** - * @docid - * @public - */ - value?: any; -} - -/** - * @public - * @namespace DevExpress.excelExporter - */ -export type PivotGridCell = ExcelPivotGridCell; - -/** - * @namespace DevExpress.excelExporter - * @deprecated Use PivotGridCell instead - */ -export interface ExcelPivotGridCell extends Cell { - /** - * @docid - * @public - */ - area?: 'column' | 'row' | 'data'; - /** - * @docid - * @public - */ - rowIndex?: number; - /** - * @docid - * @public - */ - columnIndex?: number; - /** - * @docid - * @public - */ - headerType?: 'column' | 'row' | 'data' | 'filter'; -} - -/** - * @docid - * @namespace DevExpress.excelExporter - * @type object - */ -export interface CellAddress { - /** - * @docid - * @public - */ - row?: number; - /** - * @docid - * @public - */ - column?: number; -} - -/** - * @docid - * @namespace DevExpress.excelExporter - * @type object - */ -export interface CellRange { - /** - * @docid - * @public - */ - from?: CellAddress; - /** - * @docid - * @public - */ - to?: CellAddress; -} - -/** - * @docid - * @namespace DevExpress.excelExporter - * @hidden - */ -export interface ExcelExportBaseProps { - /** - * @docid - * @default undefined - * @public - */ - worksheet?: object | undefined; - /** - * @docid - * @default { row: 1, column: 1 } - * @public - */ - topLeftCell?: CellAddress | string; - /** - * @docid - * @default true - * @public - */ - keepColumnWidths?: boolean; - /** - * @docid - * @public - */ - loadPanel?: ExportLoadPanel; - /** - * @docid - * @default false - * @public - */ - encodeExecutableContent?: boolean; -} - -/** - * @docid - * @public - * @namespace DevExpress.excelExporter - * @inherits ExcelExportBaseProps - */ -export interface ExcelExportDataGridProps extends ExcelExportBaseProps { - /** - * @docid - * @default undefined - * @public - */ - component?: dxDataGrid | undefined; - /** - * @docid - * @default false - * @public - */ - selectedRowsOnly?: boolean; - /** - * @docid - * @default false - * @public - */ - autoFilterEnabled?: boolean; - /** - * @docid - * @type_function_param1_field gridCell:ExcelDataGridCell - * @type_function_param1_field excelCell:Object - * @public - */ - customizeCell?: ((options: { gridCell?: DataGridCell; excelCell?: any }) => void); -} - -/** - * @docid - * @namespace DevExpress.excelExporter - * @inherits ExcelExportBaseProps - */ -export interface ExcelExportPivotGridProps extends ExcelExportBaseProps { - /** - * @docid - * @default undefined - * @public - */ - component?: dxPivotGrid | undefined; - /** - * @docid - * @default true - * @public - */ - mergeRowFieldValues?: boolean; - /** - * @docid - * @default true - * @public - */ - mergeColumnFieldValues?: boolean; - /** - * @docid - * @default false - * @public - */ - exportFilterFieldHeaders?: boolean; - /** - * @docid - * @default false - * @public - */ - exportDataFieldHeaders?: boolean; - /** - * @docid - * @default false - * @public - */ - exportColumnFieldHeaders?: boolean; - /** - * @docid - * @default false - * @public - */ - exportRowFieldHeaders?: boolean; - /** - * @docid - * @type_function_param1_field pivotCell:ExcelPivotGridCell - * @type_function_param1_field excelCell:Object - * @public - */ - customizeCell?: ((options: { pivotCell?: PivotGridCell; excelCell?: any }) => void); -} - -/** - * @docid excelExporter.exportDataGrid - * @publicName exportDataGrid(options) - * @return Promise - * @namespace DevExpress.excelExporter - * @static - * @public - */ -export function exportDataGrid(options: ExcelExportDataGridProps): DxPromise; - -/** - * @docid excelExporter.exportPivotGrid - * @publicName exportPivotGrid(options) - * @return Promise - * @namespace DevExpress.excelExporter - * @static - * @public - */ -export function exportPivotGrid(options: ExcelExportPivotGridProps): DxPromise; +export { + DataGridCell, + PivotGridCell, + DataGridExportOptions as ExcelExportDataGridProps, + PivotGridExportOptions as ExcelExportPivotGridProps, + exportDataGrid, + exportPivotGrid, +} from './common/export/excel'; + +export { + ExcelExportBaseOptions as ExcelExportBaseProps, + ExcelPivotGridCell, + CellAddress, + CellRange, + ExcelDataGridCell, +} from './excel_exporter.types'; diff --git a/packages/devextreme/js/excel_exporter.js b/packages/devextreme/js/excel_exporter.js index 811a52494b39..48ace077fbad 100644 --- a/packages/devextreme/js/excel_exporter.js +++ b/packages/devextreme/js/excel_exporter.js @@ -1,22 +1 @@ -import { exportDataGrid } from './exporter/exceljs/export_data_grid'; -import { exportPivotGrid } from './exporter/exceljs/export_pivot_grid'; - -/** -* @name excelExporter -* @section utils -*/ - -/** - * @name ExcelDataGridCell - * @type object - */ - -/** - * @name ExcelPivotGridCell - * @inherits dxPivotGridPivotGridCell - */ - -export { - exportDataGrid, - exportPivotGrid -}; +export { exportDataGrid, exportPivotGrid } from './common/export/excel'; diff --git a/packages/devextreme/js/excel_exporter.types.d.ts b/packages/devextreme/js/excel_exporter.types.d.ts new file mode 100644 index 000000000000..b1f6e46e3993 --- /dev/null +++ b/packages/devextreme/js/excel_exporter.types.d.ts @@ -0,0 +1,156 @@ +import { ExportLoadPanel } from './exporter/export_load_panel'; +import { Cell } from './ui/pivot_grid'; +import { Column } from './ui/data_grid'; + +/** + * @docid + * @namespace DevExpress.excelExporter + * @type object + * @hidden + */ +export interface ExcelExportBaseOptions { + /** + * @docid + * @default undefined + * @public + */ + worksheet?: object | undefined; + /** + * @docid + * @default { row: 1, column: 1 } + * @public + */ + topLeftCell?: CellAddress | string; + /** + * @docid + * @default true + * @public + */ + keepColumnWidths?: boolean; + /** + * @docid + * @public + */ + loadPanel?: ExportLoadPanel; + /** + * @docid + * @default false + * @public + */ + encodeExecutableContent?: boolean; +} + +/** + * @namespace DevExpress.excelExporter + * @deprecated Use PivotGridCell instead + */ +export interface ExcelPivotGridCell extends Cell { + /** + * @docid + * @public + */ + area?: 'column' | 'row' | 'data'; + /** + * @docid + * @public + */ + rowIndex?: number; + /** + * @docid + * @public + */ + columnIndex?: number; + /** + * @docid + * @public + */ + headerType?: 'column' | 'row' | 'data' | 'filter'; +} + +/** + * @docid + * @namespace DevExpress.excelExporter + * @type object + */ +export interface CellAddress { + /** + * @docid + * @public + */ + row?: number; + /** + * @docid + * @public + */ + column?: number; +} + +/** +* @docid +* @namespace DevExpress.excelExporter +* @type object +*/ +export interface CellRange { + /** + * @docid + * @public + */ + from?: CellAddress; + /** + * @docid + * @public + */ + to?: CellAddress; +} + +/** + * @namespace DevExpress.excelExporter + * @deprecated Use DataGridCell instead + */ +export interface ExcelDataGridCell { + /** + * @docid + * @public + * @type dxDataGridColumn + */ + column?: Column; + /** + * @docid + * @public + */ + data?: any; + /** + * @docid + * @public + */ + groupIndex?: number; + /** + * @docid + * @public + */ + groupSummaryItems?: Array<{ + /** + * @docid + */ + name?: string; + /** + * @docid + */ + value?: any; + }>; + /** + * @docid + * @public + */ + rowType?: string; + /** + * @docid + * @public + */ + totalSummaryItemName?: string; + /** + * @docid + * @public + */ + value?: any; +} diff --git a/packages/devextreme/js/exporter/common/export_load_panel.js b/packages/devextreme/js/exporter/common/export_load_panel.js index 8d303b1943b6..1f045f5d30a5 100644 --- a/packages/devextreme/js/exporter/common/export_load_panel.js +++ b/packages/devextreme/js/exporter/common/export_load_panel.js @@ -1,6 +1,6 @@ import $ from '../../core/renderer'; import { extend } from '../../core/utils/extend'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import { isDefined } from '../../core/utils/type'; import LoadPanel from '../../ui/load_panel'; import gridUtils from '../../__internal/grids/grid_core/m_utils'; diff --git a/packages/devextreme/js/exporter/exceljs/export_format.js b/packages/devextreme/js/exporter/exceljs/export_format.js index 1286c1454c15..3389898b69f6 100644 --- a/packages/devextreme/js/exporter/exceljs/export_format.js +++ b/packages/devextreme/js/exporter/exceljs/export_format.js @@ -1,11 +1,11 @@ import { format as stringFormat } from '../../core/utils/string'; -import numberFormatter from '../../localization/number'; -import dateLocalization from '../../localization/date'; +import numberFormatter from '../../common/core/localization/number'; +import dateLocalization from '../../common/core/localization/date'; import { isDefined, isString, isObject, isNumeric } from '../../core/utils/type'; -import { getFormat } from '../../localization/ldml/date.format'; -import { getLanguageId } from '../../localization/language_codes'; +import { getFormat } from '../../common/core/localization/ldml/date.format'; +import { getLanguageId } from '../../common/core/localization/language_codes'; import { extend } from '../../core/utils/extend'; -import '../../localization/currency'; +import '../../common/core/localization/currency'; const ARABIC_ZERO_CODE = 1632; const DEFINED_NUMBER_FORMTATS = { diff --git a/packages/devextreme/js/exporter/export_load_panel.d.ts b/packages/devextreme/js/exporter/export_load_panel.d.ts index fbe88f9161db..d6ef042f215a 100644 --- a/packages/devextreme/js/exporter/export_load_panel.d.ts +++ b/packages/devextreme/js/exporter/export_load_panel.d.ts @@ -4,49 +4,49 @@ * @namespace DevExpress */ export interface ExportLoadPanel { - /** - * @docid - * @default true - */ - enabled?: boolean; - /** - * @docid - * @default "Exporting..." - */ - text?: string; - /** - * @docid - * @default 200 - */ - width?: number; - /** - * @docid - * @default 90 - */ - height?: number; - /** - * @docid - * @default true - */ - showIndicator?: boolean; - /** - * @docid - * @default "" - */ - indicatorSrc?: string; - /** - * @docid - * @default true - */ - showPane?: boolean; - /** - * @docid - * @default false - */ - shading?: boolean; - /** - * @docid - * @default '' - */ - shadingColor?: string; + /** + * @docid + * @default true + */ + enabled?: boolean; + /** + * @docid + * @default "Exporting..." + */ + text?: string; + /** + * @docid + * @default 200 + */ + width?: number; + /** + * @docid + * @default 90 + */ + height?: number; + /** + * @docid + * @default true + */ + showIndicator?: boolean; + /** + * @docid + * @default "" + */ + indicatorSrc?: string; + /** + * @docid + * @default true + */ + showPane?: boolean; + /** + * @docid + * @default false + */ + shading?: boolean; + /** + * @docid + * @default '' + */ + shadingColor?: string; } diff --git a/packages/devextreme/js/exporter/jspdf/autotable/export.js b/packages/devextreme/js/exporter/jspdf/autotable/export.js index 99da73c8c40f..8de1697c21cc 100644 --- a/packages/devextreme/js/exporter/jspdf/autotable/export.js +++ b/packages/devextreme/js/exporter/jspdf/autotable/export.js @@ -1,8 +1,8 @@ import { isDate, isDefined, isObject, isFunction, isNumeric } from '../../../core/utils/type'; import { extend } from '../../../core/utils/extend'; -import dateLocalization from '../../../localization/date'; -import numberLocalization from '../../../localization/number'; -import messageLocalization from '../../../localization/message'; +import dateLocalization from '../../../common/core/localization/date'; +import numberLocalization from '../../../common/core/localization/number'; +import messageLocalization from '../../../common/core/localization/message'; import { ExportLoadPanel } from '../../common/export_load_panel'; import { hasWindow } from '../../../core/utils/window'; diff --git a/packages/devextreme/js/exporter/jspdf/common/export.js b/packages/devextreme/js/exporter/jspdf/common/export.js index ccd774e6b600..b87e90605629 100644 --- a/packages/devextreme/js/exporter/jspdf/common/export.js +++ b/packages/devextreme/js/exporter/jspdf/common/export.js @@ -7,7 +7,7 @@ import { generateRowsInfo, getBaseTableStyle } from './rows_generator'; import { splitByPages } from './rows_splitting'; import { drawCellsContent, drawCellsLines, drawGridLines, getDocumentStyles, setDocumentStyles, addNewPage } from './draw_utils'; import { applyRtl, applyWordWrap, toPdfUnit } from './pdf_utils'; -import messageLocalization from '../../../localization/message'; +import messageLocalization from '../../../common/core/localization/message'; import { ExportLoadPanel } from '../../common/export_load_panel'; import { hasWindow } from '../../../core/utils/window'; diff --git a/packages/devextreme/js/exporter/jspdf/common/rows_generator.js b/packages/devextreme/js/exporter/jspdf/common/rows_generator.js index 3aac4c886ec6..47f487d48d45 100644 --- a/packages/devextreme/js/exporter/jspdf/common/rows_generator.js +++ b/packages/devextreme/js/exporter/jspdf/common/rows_generator.js @@ -1,6 +1,6 @@ import { isDate, isDefined, isNumeric } from '../../../core/utils/type'; -import dateLocalization from '../../../localization/date'; -import numberLocalization from '../../../localization/number'; +import dateLocalization from '../../../common/core/localization/date'; +import numberLocalization from '../../../common/core/localization/number'; import { toPdfUnit } from './pdf_utils'; const defaultStyles = { diff --git a/packages/devextreme/js/file_management/object_provider.js b/packages/devextreme/js/file_management/object_provider.js index a05ae10457b3..33e103ba22f6 100644 --- a/packages/devextreme/js/file_management/object_provider.js +++ b/packages/devextreme/js/file_management/object_provider.js @@ -1,8 +1,8 @@ import { ensureDefined } from '../core/utils/common'; import { compileGetter, compileSetter } from '../core/utils/data'; -import Guid from '../core/guid'; +import { Guid } from '../common'; import { isFunction } from '../core/utils/type'; -import { errors } from '../data/errors'; +import { errors } from '../common/data/errors'; import { Deferred } from '../core/utils/deferred'; import { getWindow } from '../core/utils/window'; import { fileSaver } from '../exporter/file_saver'; diff --git a/packages/devextreme/js/file_management/remote_provider.js b/packages/devextreme/js/file_management/remote_provider.js index c1c657ce5c7b..c04d740ede91 100644 --- a/packages/devextreme/js/file_management/remote_provider.js +++ b/packages/devextreme/js/file_management/remote_provider.js @@ -1,11 +1,11 @@ import $ from '../core/renderer'; import ajax from '../core/utils/ajax'; import { ensureDefined, noop } from '../core/utils/common'; -import Guid from '../core/guid'; +import { Guid } from '../common'; import { getWindow } from '../core/utils/window'; import { each } from '../core/utils/iterator'; import { Deferred } from '../core/utils/deferred'; -import eventsEngine from '../events/core/events_engine'; +import eventsEngine from '../common/core/events/core/events_engine'; import FileSystemProviderBase from './provider_base'; import { compileGetter } from '../core/utils/data'; diff --git a/packages/devextreme/js/format_helper.d.ts b/packages/devextreme/js/format_helper.d.ts index ed4f1c706830..b92812b5e6cb 100644 --- a/packages/devextreme/js/format_helper.d.ts +++ b/packages/devextreme/js/format_helper.d.ts @@ -1,6 +1,6 @@ import { Format, -} from './localization'; +} from './common/core/localization'; export interface FormatHelper { format( diff --git a/packages/devextreme/js/format_helper.js b/packages/devextreme/js/format_helper.js index f194972695c0..de05bc7ec2a0 100644 --- a/packages/devextreme/js/format_helper.js +++ b/packages/devextreme/js/format_helper.js @@ -7,11 +7,11 @@ import { isPlainObject } from './core/utils/type'; import dateUtils from './core/utils/date'; -import numberLocalization from './localization/number'; -import dateLocalization from './localization/date'; +import numberLocalization from './common/core/localization/number'; +import dateLocalization from './common/core/localization/date'; import dependencyInjector from './core/utils/dependency_injector'; -import './localization/currency'; +import './common/core/localization/currency'; export default dependencyInjector({ format: function(value, format) { diff --git a/packages/devextreme/js/integration/jquery.d.ts b/packages/devextreme/js/integration/jquery.d.ts index ccb50918ffb6..adfc6a505e17 100644 --- a/packages/devextreme/js/integration/jquery.d.ts +++ b/packages/devextreme/js/integration/jquery.d.ts @@ -92,7 +92,7 @@ declare module '../core/utils/deferred' { interface PromiseType extends JQueryPromise { } } -declare module '../events/index' { +declare module '../common/core/events' { interface EventType extends JQueryEventObject { cancel?: boolean; } diff --git a/packages/devextreme/js/integration/jquery/easing.js b/packages/devextreme/js/integration/jquery/easing.js index 8c26bcbb08cf..a569caf2a777 100644 --- a/packages/devextreme/js/integration/jquery/easing.js +++ b/packages/devextreme/js/integration/jquery/easing.js @@ -1,6 +1,6 @@ // eslint-disable-next-line no-restricted-imports import jQuery from 'jquery'; -import { setEasing } from '../../animation/easing'; +import { setEasing } from '../../common/core/animation/easing'; if(jQuery) { setEasing(jQuery.easing); diff --git a/packages/devextreme/js/integration/jquery/events.js b/packages/devextreme/js/integration/jquery/events.js index 1c1368d4fe39..15bd55198735 100644 --- a/packages/devextreme/js/integration/jquery/events.js +++ b/packages/devextreme/js/integration/jquery/events.js @@ -1,8 +1,8 @@ // eslint-disable-next-line no-restricted-imports import jQuery from 'jquery'; -import eventsEngine from '../../events/core/events_engine'; +import eventsEngine from '../../common/core/events/core/events_engine'; import useJQueryFn from './use_jquery'; -import registerEventCallbacks from '../../events/core/event_registrator_callbacks'; +import registerEventCallbacks from '../../common/core/events/core/event_registrator_callbacks'; import domAdapter from '../../core/dom_adapter'; const useJQuery = useJQueryFn(); diff --git a/packages/devextreme/js/integration/jquery/hooks.js b/packages/devextreme/js/integration/jquery/hooks.js index 156ab55a7be0..0b2d0a6a5deb 100644 --- a/packages/devextreme/js/integration/jquery/hooks.js +++ b/packages/devextreme/js/integration/jquery/hooks.js @@ -5,9 +5,9 @@ const useJQuery = useJQueryFn(); import { compare as compareVersion } from '../../core/utils/version'; import { each } from '../../core/utils/iterator'; import { isNumeric } from '../../core/utils/type'; -import { setEventFixMethod } from '../../events/utils/index'; -import registerEvent from '../../events/core/event_registrator'; -import hookTouchProps from '../../events/core/hook_touch_props'; +import { setEventFixMethod } from '../../common/core/events/utils/index'; +import registerEvent from '../../common/core/events/core/event_registrator'; +import hookTouchProps from '../../common/core/events/core/hook_touch_props'; if(useJQuery) { if(compareVersion(jQuery.fn.jquery, [3]) < 0) { diff --git a/packages/devextreme/js/integration/knockout/event_registrator.js b/packages/devextreme/js/integration/knockout/event_registrator.js index 81f23cb31023..38be731ab78b 100644 --- a/packages/devextreme/js/integration/knockout/event_registrator.js +++ b/packages/devextreme/js/integration/knockout/event_registrator.js @@ -1,10 +1,10 @@ import $ from '../../core/renderer'; -import eventsEngine from '../../events/core/events_engine'; +import eventsEngine from '../../common/core/events/core/events_engine'; // eslint-disable-next-line no-restricted-imports import ko from 'knockout'; import { isPlainObject } from '../../core/utils/type'; -import eventRegistratorCallbacks from '../../events/core/event_registrator_callbacks'; -import { addNamespace } from '../../events/utils/index'; +import eventRegistratorCallbacks from '../../common/core/events/core/event_registrator_callbacks'; +import { addNamespace } from '../../common/core/events/utils/index'; if(ko) { eventRegistratorCallbacks.add(function(name) { diff --git a/packages/devextreme/js/localization.d.ts b/packages/devextreme/js/localization.d.ts index 52d0f5343287..22611cfef47a 100644 --- a/packages/devextreme/js/localization.d.ts +++ b/packages/devextreme/js/localization.d.ts @@ -1,131 +1,11 @@ -import { Format as PredefinedFormat } from './common'; - -/** - * @docid localization.formatDate - * @publicName formatDate(value, format) - * @static - * @namespace DevExpress.localization - * @public - */ -export function formatDate(value: Date, format: Format): string; - -/** - * @docid localization.formatMessage - * @publicName formatMessage(key, value) - * @param2 value:string|Array - * @static - * @namespace DevExpress.localization - * @public - */ -export function formatMessage(key: string, ...values: Array): string; - -/** - * @docid localization.formatNumber - * @publicName formatNumber(value, format) - * @static - * @namespace DevExpress.localization - * @public - */ -export function formatNumber(value: number, format: Format): string; - -/** - * @docid localization.loadMessages - * @publicName loadMessages(messages) - * @param1 messages:object - * @static - * @namespace DevExpress.localization - * @public - */ -export function loadMessages(messages: any): void; - -/** - * @docid localization.locale - * @publicName locale() - * @static - * @namespace DevExpress.localization - * @public - */ -export function locale(): string; - -/** - * @docid localization.locale - * @publicName locale(locale) - * @static - * @namespace DevExpress.localization - * @public - */ -// eslint-disable-next-line @typescript-eslint/no-shadow -export function locale(locale: string): void; - -/** - * @docid localization.parseDate - * @publicName parseDate(text, format) - * @static - * @namespace DevExpress.localization - * @public - */ -export function parseDate(text: string, format: Format): Date; - -/** - * @docid localization.parseNumber - * @publicName parseNumber(text, format) - * @static - * @namespace DevExpress.localization - * @public - */ -export function parseNumber(text: string, format: Format): number; - -export interface FormatObject { - /** - * @docid Format.currency - * @public - */ - currency?: string; - /** - * @docid Format.useCurrencyAccountingStyle - * @type boolean - * @default true - * @public - */ - useCurrencyAccountingStyle?: boolean; - /** - * @docid Format.formatter - * @public - */ - formatter?: ((value: number | Date) => string); - /** - * @docid Format.parser - * @public - */ - parser?: ((value: string) => number | Date); - /** - * @docid Format.precision - * @public - */ - precision?: number; - /** - * @docid Format.type - * @public - */ - type?: PredefinedFormat | string; -} -type ExternalFormat = - Intl.DateTimeFormatOptions | - Intl.NumberFormatOptions; - -/** - * @docid - * @type Object|Enums.Format|string|function - * @default undefined - * @section Common - * @namespace DevExpress.ui - * @public - */ -export type Format = - FormatObject | - PredefinedFormat | - string | - ((value: number | Date) => string) | - ((value: Date) => string) | - ((value: number) => string) | - ExternalFormat | undefined; +export { + formatDate, + formatMessage, + formatNumber, + loadMessages, + locale, + parseDate, + parseNumber, + Format, + FormatObject, +} from './common/core/localization'; diff --git a/packages/devextreme/js/localization.js b/packages/devextreme/js/localization.js index e865a740c75f..f184d26ec496 100644 --- a/packages/devextreme/js/localization.js +++ b/packages/devextreme/js/localization.js @@ -1,32 +1,9 @@ -import core from './localization/core'; -import message from './localization/message'; -import number from './localization/number'; -import date from './localization/date'; -import './localization/currency'; - -/** - * @name localization - */ - -export const locale = core.locale.bind(core); - -export const loadMessages = message.load.bind(message); -export const formatMessage = message.format.bind(message); -export const formatNumber = number.format.bind(number); -export const parseNumber = number.parse.bind(number); -export const formatDate = date.format.bind(date); -export const parseDate = date.parse.bind(date); export { - message, - number, - date -}; - -export function disableIntl() { - if(number.engine() === 'intl') { - number.resetInjection(); - } - if(date.engine() === 'intl') { - date.resetInjection(); - } -} + formatDate, + formatMessage, + formatNumber, + loadMessages, + locale, + parseDate, + parseNumber, +} from './common/core/localization'; diff --git a/packages/devextreme/js/localization/cldr-data/accounting_formats.js b/packages/devextreme/js/localization/cldr-data/accounting_formats.js new file mode 100644 index 000000000000..502fbf909982 --- /dev/null +++ b/packages/devextreme/js/localization/cldr-data/accounting_formats.js @@ -0,0 +1 @@ +export { default } from '../../common/core/localization/cldr-data/accounting_formats'; diff --git a/packages/devextreme/js/localization/cldr-data/en.js b/packages/devextreme/js/localization/cldr-data/en.js new file mode 100644 index 000000000000..25761bdcf17e --- /dev/null +++ b/packages/devextreme/js/localization/cldr-data/en.js @@ -0,0 +1 @@ +export * from '../../common/core/localization/cldr-data/en'; diff --git a/packages/devextreme/js/localization/cldr-data/first_day_of_week_data.js b/packages/devextreme/js/localization/cldr-data/first_day_of_week_data.js new file mode 100644 index 000000000000..fb228eef00ce --- /dev/null +++ b/packages/devextreme/js/localization/cldr-data/first_day_of_week_data.js @@ -0,0 +1 @@ +export { default } from '../../common/core/localization/cldr-data/first_day_of_week_data'; diff --git a/packages/devextreme/js/localization/cldr-data/parent_locales.js b/packages/devextreme/js/localization/cldr-data/parent_locales.js new file mode 100644 index 000000000000..982805ef3b35 --- /dev/null +++ b/packages/devextreme/js/localization/cldr-data/parent_locales.js @@ -0,0 +1 @@ +export { default } from '../../common/core/localization/cldr-data/parent_locales'; diff --git a/packages/devextreme/js/localization/cldr-data/supplemental.js b/packages/devextreme/js/localization/cldr-data/supplemental.js new file mode 100644 index 000000000000..1616663d6ec0 --- /dev/null +++ b/packages/devextreme/js/localization/cldr-data/supplemental.js @@ -0,0 +1 @@ +export * from '../../common/core/localization/cldr-data/supplemental'; diff --git a/packages/devextreme/js/localization/core.js b/packages/devextreme/js/localization/core.js index 0d096f183a46..f4ca0e360c16 100644 --- a/packages/devextreme/js/localization/core.js +++ b/packages/devextreme/js/localization/core.js @@ -1,41 +1 @@ -import dependencyInjector from '../core/utils/dependency_injector'; -import parentLocales from './cldr-data/parent_locales'; -import getParentLocale from './parentLocale'; - -const DEFAULT_LOCALE = 'en'; - -export default dependencyInjector({ - locale: (() => { - let currentLocale = DEFAULT_LOCALE; - - return locale => { - if(!locale) { - return currentLocale; - } - - currentLocale = locale; - }; - })(), - - getValueByClosestLocale: function(getter) { - let locale = this.locale(); - let value = getter(locale); - let isRootLocale; - - while(!value && !isRootLocale) { - locale = getParentLocale(parentLocales, locale); - - if(locale) { - value = getter(locale); - } else { - isRootLocale = true; - } - } - - if(value === undefined && locale !== DEFAULT_LOCALE) { - return getter(DEFAULT_LOCALE); - } - - return value; - } -}); +export { default } from '../common/core/localization/core'; diff --git a/packages/devextreme/js/localization/currency.js b/packages/devextreme/js/localization/currency.js index b469b714666c..90cea440ba04 100644 --- a/packages/devextreme/js/localization/currency.js +++ b/packages/devextreme/js/localization/currency.js @@ -1,24 +1 @@ -import { extend } from '../core/utils/extend'; - -export default { - _formatNumberCore: function(value, format, formatConfig) { - if(format === 'currency') { - formatConfig.precision = formatConfig.precision || 0; - - let result = this.format(value, extend({}, formatConfig, { type: 'fixedpoint' })); - const currencyPart = this.getCurrencySymbol().symbol.replace(/\$/g, '$$$$'); - - result = result.replace(/^(\D*)(\d.*)/, '$1' + currencyPart + '$2'); - - return result; - } - - return this.callBase.apply(this, arguments); - }, - getCurrencySymbol: function() { - return { symbol: '$' }; - }, - getOpenXmlCurrencyFormat: function() { - return '$#,##0{0}_);\\($#,##0{0}\\)'; - } -}; +export { default } from '../common/core/localization/currency'; diff --git a/packages/devextreme/js/localization/date.d.ts b/packages/devextreme/js/localization/date.d.ts index 8668641dfbc3..b92a9f7ecf06 100644 --- a/packages/devextreme/js/localization/date.d.ts +++ b/packages/devextreme/js/localization/date.d.ts @@ -1,12 +1,3 @@ -import { Format as LocalizationFormat } from '../localization'; +import dateLocalization from '../common/core/localization/date'; -type Format = 'abbreviated' | 'short' | 'narrow'; - -interface DateLocalization { - firstDayOfWeekIndex(): number; - format(date?: Date, format?: LocalizationFormat): string | Date | undefined; - getDayNames(format?: Format): string[]; - getMonthNames(format?: Format): string[]; -} -declare const dateLocalization: DateLocalization; export default dateLocalization; diff --git a/packages/devextreme/js/localization/date.js b/packages/devextreme/js/localization/date.js index abc316d12dd4..5cc12eb0c415 100644 --- a/packages/devextreme/js/localization/date.js +++ b/packages/devextreme/js/localization/date.js @@ -1,196 +1 @@ -import dependencyInjector from '../core/utils/dependency_injector'; -import { isString } from '../core/utils/type'; -import { each } from '../core/utils/iterator'; -import errors from '../core/errors'; -import { getFormatter as getLDMLDateFormatter } from './ldml/date.formatter'; -import { getFormat as getLDMLDateFormat } from './ldml/date.format'; -import { getParser as getLDMLDateParser } from './ldml/date.parser'; -import defaultDateNames from './default_date_names'; -import firstDayOfWeekData from './cldr-data/first_day_of_week_data'; -import localizationCore from './core'; -import numberLocalization from './number'; -import intlDateLocalization from './intl/date'; - -const DEFAULT_DAY_OF_WEEK_INDEX = 0; -const hasIntl = typeof Intl !== 'undefined'; - -const FORMATS_TO_PATTERN_MAP = { - 'shortdate': 'M/d/y', - 'shorttime': 'h:mm a', - 'longdate': 'EEEE, MMMM d, y', - 'longtime': 'h:mm:ss a', - 'monthandday': 'MMMM d', - 'monthandyear': 'MMMM y', - 'quarterandyear': 'QQQ y', - 'day': 'd', - 'year': 'y', - 'shortdateshorttime': 'M/d/y, h:mm a', - 'longdatelongtime': 'EEEE, MMMM d, y, h:mm:ss a', - 'month': 'LLLL', - 'shortyear': 'yy', - 'dayofweek': 'EEEE', - 'quarter': 'QQQ', - 'hour': 'HH', - 'minute': 'mm', - 'second': 'ss', - 'millisecond': 'SSS', - 'datetime-local': 'yyyy-MM-ddTHH\':\'mm\':\'ss' -}; - -const possiblePartPatterns = { - year: ['y', 'yy', 'yyyy'], - day: ['d', 'dd'], - month: ['M', 'MM', 'MMM', 'MMMM'], - hours: ['H', 'HH', 'h', 'hh', 'ah'], - minutes: ['m', 'mm'], - seconds: ['s', 'ss'], - milliseconds: ['S', 'SS', 'SSS'] -}; - -const dateLocalization = dependencyInjector({ - engine: function() { - return 'base'; - }, - _getPatternByFormat: function(format) { - return FORMATS_TO_PATTERN_MAP[format.toLowerCase()]; - }, - _expandPattern: function(pattern) { - return this._getPatternByFormat(pattern) || pattern; - }, - formatUsesMonthName: function(format) { - return this._expandPattern(format).indexOf('MMMM') !== -1; - }, - - formatUsesDayName: function(format) { - return this._expandPattern(format).indexOf('EEEE') !== -1; - }, - getFormatParts: function(format) { - const pattern = this._getPatternByFormat(format) || format; - const result = []; - - each(pattern.split(/\W+/), (_, formatPart) => { - each(possiblePartPatterns, (partName, possiblePatterns) => { - if(possiblePatterns.includes(formatPart)) { - result.push(partName); - } - }); - }); - - return result; - }, - getMonthNames: function(format) { - return defaultDateNames.getMonthNames(format); - }, - getDayNames: function(format) { - return defaultDateNames.getDayNames(format); - }, - getQuarterNames: function(format) { - return defaultDateNames.getQuarterNames(format); - }, - getPeriodNames: function(format) { - return defaultDateNames.getPeriodNames(format); - }, - getTimeSeparator: function() { - return ':'; - }, - - is24HourFormat: function(format) { - const amTime = new Date(2017, 0, 20, 11, 0, 0, 0); - const pmTime = new Date(2017, 0, 20, 23, 0, 0, 0); - const amTimeFormatted = this.format(amTime, format); - const pmTimeFormatted = this.format(pmTime, format); - - for(let i = 0; i < amTimeFormatted.length; i++) { - if(amTimeFormatted[i] !== pmTimeFormatted[i]) { - return !isNaN(parseInt(amTimeFormatted[i])); - } - } - }, - - format: function(date, format) { - if(!date) { - return; - } - - if(!format) { - return date; - } - - let formatter; - - if(typeof (format) === 'function') { - formatter = format; - } else if(format.formatter) { - formatter = format.formatter; - } else { - format = format.type || format; - if(isString(format)) { - format = FORMATS_TO_PATTERN_MAP[format.toLowerCase()] || format; - return numberLocalization.convertDigits(getLDMLDateFormatter(format, this)(date)); - } - } - - if(!formatter) { - // TODO: log warning or error - return; - } - - return formatter(date); - }, - - parse: function(text, format) { - const that = this; - let ldmlFormat; - let formatter; - - if(!text) { - return; - } - - if(!format) { - return this.parse(text, 'shortdate'); - } - - if(format.parser) { - return format.parser(text); - } - - if(typeof format === 'string' && !FORMATS_TO_PATTERN_MAP[format.toLowerCase()]) { - ldmlFormat = format; - } else { - formatter = value => { - const text = that.format(value, format); - return numberLocalization.convertDigits(text, true); - }; - try { - ldmlFormat = getLDMLDateFormat(formatter); - } catch(e) {} - } - - if(ldmlFormat) { - text = numberLocalization.convertDigits(text, true); - return getLDMLDateParser(ldmlFormat, this)(text); - } - - errors.log('W0012'); - const result = new Date(text); - - if(!result || isNaN(result.getTime())) { - return; - } - - return result; - }, - - firstDayOfWeekIndex: function() { - const index = localizationCore.getValueByClosestLocale((locale) => firstDayOfWeekData[locale]); - - return index === undefined ? DEFAULT_DAY_OF_WEEK_INDEX : index; - } -}); - -if(hasIntl) { - dateLocalization.inject(intlDateLocalization); -} - -export default dateLocalization; +export { default } from '../common/core/localization/date'; diff --git a/packages/devextreme/js/localization/default_date_names.js b/packages/devextreme/js/localization/default_date_names.js index 85bbdaf91fee..05d9032599fb 100644 --- a/packages/devextreme/js/localization/default_date_names.js +++ b/packages/devextreme/js/localization/default_date_names.js @@ -1,34 +1 @@ -import { map } from '../core/utils/iterator'; - -const MONTHS = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']; -const DAYS = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; -const PERIODS = ['AM', 'PM']; -const QUARTERS = ['Q1', 'Q2', 'Q3', 'Q4']; - -// TODO: optimize -const cutCaptions = (captions, format) => { - const lengthByFormat = { - abbreviated: 3, - short: 2, - narrow: 1 - }; - - return map(captions, caption => { - return caption.substr(0, lengthByFormat[format]); - }); -}; - -export default { - getMonthNames: function(format) { - return cutCaptions(MONTHS, format); - }, - getDayNames: function(format) { - return cutCaptions(DAYS, format); - }, - getQuarterNames: function(format) { - return QUARTERS; - }, - getPeriodNames: function(format) { - return PERIODS; - } -}; +export { default } from '../common/core/localization/default_date_names'; diff --git a/packages/devextreme/js/localization/default_messages.js b/packages/devextreme/js/localization/default_messages.js new file mode 100644 index 000000000000..c329409454d1 --- /dev/null +++ b/packages/devextreme/js/localization/default_messages.js @@ -0,0 +1 @@ +export * from '../common/core/localization/default_messages'; diff --git a/packages/devextreme/js/localization/globalize/core.js b/packages/devextreme/js/localization/globalize/core.js index 8c72e992e59a..fc36b71d45a6 100644 --- a/packages/devextreme/js/localization/globalize/core.js +++ b/packages/devextreme/js/localization/globalize/core.js @@ -1,22 +1 @@ -// eslint-disable-next-line no-restricted-imports -import Globalize from 'globalize'; -import coreLocalization from '../core'; -import { enCldr } from '../cldr-data/en'; -import { supplementalCldr } from '../cldr-data/supplemental'; - - -if(Globalize && Globalize.load) { - if(!Globalize.locale()) { - Globalize.load(enCldr, supplementalCldr); - Globalize.locale('en'); - } - - coreLocalization.inject({ - locale: function(locale) { - if(!locale) { - return Globalize.locale().locale; - } - Globalize.locale(locale); - } - }); -} +import '../../common/core/localization/globalize/core'; diff --git a/packages/devextreme/js/localization/globalize/currency.js b/packages/devextreme/js/localization/globalize/currency.js index 37b3a818c73d..bf9568470ff3 100644 --- a/packages/devextreme/js/localization/globalize/currency.js +++ b/packages/devextreme/js/localization/globalize/currency.js @@ -1,95 +1 @@ -import openXmlCurrencyFormat from '../open_xml_currency_format'; -import './core'; -import './number'; -import '../currency'; -// eslint-disable-next-line no-restricted-imports, import/no-unresolved -import 'globalize/currency'; -// eslint-disable-next-line no-restricted-imports -import Globalize from 'globalize'; -import config from '../../core/config'; -import numberLocalization from '../number'; - -const CURRENCY_STYLES = ['symbol', 'accounting']; - -if(Globalize && Globalize.formatCurrency) { - - if(Globalize.locale().locale === 'en') { - Globalize.locale('en'); - } - - const formattersCache = {}; - - const getFormatter = (currency, format) => { - let formatter; - let formatCacheKey; - - if(typeof format === 'object') { - formatCacheKey = Globalize.locale().locale + ':' + currency + ':' + JSON.stringify(format); - } else { - formatCacheKey = Globalize.locale().locale + ':' + currency + ':' + format; - } - formatter = formattersCache[formatCacheKey]; - if(!formatter) { - formatter = formattersCache[formatCacheKey] = Globalize.currencyFormatter(currency, format); - } - - return formatter; - }; - - const globalizeCurrencyLocalization = { - _formatNumberCore: function(value, format, formatConfig) { - if(format === 'currency') { - const currency = formatConfig && formatConfig.currency || config().defaultCurrency; - return getFormatter(currency, this._normalizeFormatConfig(format, formatConfig, value))(value); - } - - return this.callBase.apply(this, arguments); - }, - _normalizeFormatConfig: function(format, formatConfig, value) { - const normalizedConfig = this.callBase(format, formatConfig, value); - - if(format === 'currency') { - const useAccountingStyle = formatConfig.useCurrencyAccountingStyle ?? config().defaultUseCurrencyAccountingStyle; - normalizedConfig.style = CURRENCY_STYLES[+useAccountingStyle]; - } - - return normalizedConfig; - }, - format: function(value, format) { - if(typeof value !== 'number') { - return value; - } - - format = this._normalizeFormat(format); - - if(format) { - if(format.currency === 'default') { - format.currency = config().defaultCurrency; - } - - if(format.type === 'currency') { - return this._formatNumber(value, this._parseNumberFormatString('currency'), format); - } else if(!format.type && format.currency) { - return getFormatter(format.currency, format)(value); - } - } - - return this.callBase.apply(this, arguments); - }, - getCurrencySymbol: function(currency) { - if(!currency) { - currency = config().defaultCurrency; - } - - return Globalize.cldr.main('numbers/currencies/' + currency); - }, - getOpenXmlCurrencyFormat: function(currency) { - const currencySymbol = this.getCurrencySymbol(currency).symbol; - const accountingFormat = Globalize.cldr.main('numbers/currencyFormats-numberSystem-latn').accounting; - - return openXmlCurrencyFormat(currencySymbol, accountingFormat); - } - }; - - numberLocalization.inject(globalizeCurrencyLocalization); -} +import '../../common/core/localization/globalize/currency'; diff --git a/packages/devextreme/js/localization/globalize/date.js b/packages/devextreme/js/localization/globalize/date.js index dddeb7827dbb..5c7855d46282 100644 --- a/packages/devextreme/js/localization/globalize/date.js +++ b/packages/devextreme/js/localization/globalize/date.js @@ -1,245 +1 @@ -import './core'; -import './number'; -// eslint-disable-next-line no-restricted-imports, import/no-unresolved -import 'globalize/date'; - -const ACCEPTABLE_JSON_FORMAT_PROPERTIES = ['skeleton', 'date', 'time', 'datetime', 'raw']; -const RTL_MARKS_REGEX = /[\u200E\u200F]/g; - -// eslint-disable-next-line no-restricted-imports -import Globalize from 'globalize'; -import dateLocalization from '../date'; -import { isObject } from '../../core/utils/type'; -import * as iteratorUtils from '../../core/utils/iterator'; - -if(Globalize && Globalize.formatDate) { - - if(Globalize.locale().locale === 'en') { - Globalize.locale('en'); - } - - const formattersCache = {}; - - const FORMATS_TO_GLOBALIZE_MAP = { - 'shortdate': { - path: 'dateTimeFormats/availableFormats/yMd' - }, - 'shorttime': { - path: 'timeFormats/short' - }, - 'longdate': { - path: 'dateFormats/full' - }, - 'longtime': { - path: 'timeFormats/medium' - }, - 'monthandday': { - path: 'dateTimeFormats/availableFormats/MMMMd' - }, - 'monthandyear': { - path: 'dateTimeFormats/availableFormats/yMMMM' - }, - 'quarterandyear': { - path: 'dateTimeFormats/availableFormats/yQQQ' - }, - 'day': { - path: 'dateTimeFormats/availableFormats/d' - }, - 'year': { - path: 'dateTimeFormats/availableFormats/y' - }, - 'shortdateshorttime': { - path: 'dateTimeFormats/short', - parts: ['shorttime', 'shortdate'] - }, - 'longdatelongtime': { - path: 'dateTimeFormats/medium', - parts: ['longtime', 'longdate'] - }, - 'month': { - pattern: 'LLLL' - }, - 'shortyear': { - pattern: 'yy' - }, - 'dayofweek': { - pattern: 'EEEE' - }, - 'quarter': { - pattern: 'QQQ' - }, - 'millisecond': { - pattern: 'SSS' - }, - 'hour': { - pattern: 'HH' - }, - 'minute': { - pattern: 'mm' - }, - 'second': { - pattern: 'ss' - } - }; - - const globalizeDateLocalization = { - engine: function() { - return 'globalize'; - }, - - _getPatternByFormat: function(format) { - const that = this; - const lowerFormat = format.toLowerCase(); - const globalizeFormat = FORMATS_TO_GLOBALIZE_MAP[lowerFormat]; - - if(lowerFormat === 'datetime-local') { - return 'yyyy-MM-ddTHH\':\'mm\':\'ss'; - } - - if(!globalizeFormat) { - return; - } - - let result = globalizeFormat.path && that._getFormatStringByPath(globalizeFormat.path) || globalizeFormat.pattern; - - if(globalizeFormat.parts) { - iteratorUtils.each(globalizeFormat.parts, (index, part) => { - result = result.replace('{' + index + '}', that._getPatternByFormat(part)); - }); - } - return result; - }, - - _getFormatStringByPath: function(path) { - return Globalize.locale().main('dates/calendars/gregorian/' + path); - }, - - getPeriodNames: function(format, type) { - format = format || 'wide'; - type = type === 'format' ? type : 'stand-alone'; - - const json = Globalize.locale().main(`dates/calendars/gregorian/dayPeriods/${type}/${format}`); - return [json['am'], json['pm']]; - }, - - getMonthNames: function(format, type) { - const months = Globalize.locale().main('dates/calendars/gregorian/months/' + (type === 'format' ? type : 'stand-alone') + '/' + (format || 'wide')); - - return iteratorUtils.map(months, month => { return month; }); - }, - - getDayNames: function(format) { - const days = Globalize.locale().main('dates/calendars/gregorian/days/stand-alone/' + (format || 'wide')); - - return iteratorUtils.map(days, day => { return day; }); - }, - - getTimeSeparator: function() { - return Globalize.locale().main('numbers/symbols-numberSystem-latn/timeSeparator'); - }, - - removeRtlMarks(text) { - return text.replace(RTL_MARKS_REGEX, ''); - }, - - format: function(date, format) { - if(!date) { - return; - } - - if(!format) { - return date; - } - - let formatter; - let formatCacheKey; - - if(typeof (format) === 'function') { - return format(date); - } - - if(format.formatter) { - return format.formatter(date); - } - - format = format.type || format; - - if(typeof format === 'string') { - formatCacheKey = Globalize.locale().locale + ':' + format; - formatter = formattersCache[formatCacheKey]; - if(!formatter) { - format = { - raw: this._getPatternByFormat(format) || format - }; - - formatter = formattersCache[formatCacheKey] = Globalize.dateFormatter(format); - } - } else { - if(!this._isAcceptableFormat(format)) { - return; - } - - formatter = Globalize.dateFormatter(format); - } - - return this.removeRtlMarks(formatter(date)); - }, - - parse: function(text, format) { - if(!text) { - return; - } - - if(!format || typeof (format) === 'function' || isObject(format) && !this._isAcceptableFormat(format)) { - if(format) { - const parsedValue = this.callBase(text, format); - if(parsedValue) { - return parsedValue; - } - } - - return Globalize.parseDate(text); - } - - if(format.parser) { - return format.parser(text); - } - - if(typeof format === 'string') { - format = { - raw: this._getPatternByFormat(format) || format - }; - } - - const parsedDate = Globalize.parseDate(text, format); - return parsedDate ? parsedDate : this.callBase(text, format); - }, - - _isAcceptableFormat: function(format) { - if(format.parser) { - return true; - } - - for(let i = 0; i < ACCEPTABLE_JSON_FORMAT_PROPERTIES.length; i++) { - if(Object.prototype.hasOwnProperty.call(format, ACCEPTABLE_JSON_FORMAT_PROPERTIES[i])) { - return true; - } - } - }, - - firstDayOfWeekIndex: function() { - const firstDay = Globalize.locale().supplemental.weekData.firstDay(); - - return this._getDayKeys().indexOf(firstDay); - }, - - _getDayKeys: function() { - const days = Globalize.locale().main('dates/calendars/gregorian/days/format/short'); - - return iteratorUtils.map(days, (day, key) => { return key; }); - } - }; - - dateLocalization.resetInjection(); - dateLocalization.inject(globalizeDateLocalization); -} +import '../../common/core/localization/globalize/date'; diff --git a/packages/devextreme/js/localization/globalize/message.js b/packages/devextreme/js/localization/globalize/message.js index 4b894ef8ef3f..19b1d397369e 100644 --- a/packages/devextreme/js/localization/globalize/message.js +++ b/packages/devextreme/js/localization/globalize/message.js @@ -1,83 +1 @@ -import './core'; - -// eslint-disable-next-line no-restricted-imports -import Globalize from 'globalize'; -import messageLocalization from '../message'; -import coreLocalization from '../core'; - -// eslint-disable-next-line no-restricted-imports, import/no-unresolved -import 'globalize/message'; - -if(Globalize && Globalize.formatMessage) { - - const DEFAULT_LOCALE = 'en'; - - const originalLoadMessages = Globalize.loadMessages; - - Globalize.loadMessages = messages => { - messageLocalization.load(messages); - }; - - const globalizeMessageLocalization = { - engine: function() { - return 'globalize'; - }, - - ctor: function() { - this.load(this._dictionary); - }, - - load: function(messages) { - this.callBase(messages); - originalLoadMessages(messages); - }, - - getMessagesByLocales: function() { - return Globalize.cldr.get('globalize-messages'); - }, - - getFormatter: function(key, locale) { - const currentLocale = locale || coreLocalization.locale(); - let formatter = this._getFormatterBase(key, locale); - - if(!formatter) { - formatter = this._formatterByGlobalize(key, locale); - } - - if(!formatter && currentLocale !== DEFAULT_LOCALE) { - formatter = this.getFormatter(key, DEFAULT_LOCALE); - } - - return formatter; - }, - - _formatterByGlobalize: function(key, locale) { - const currentGlobalize = !locale || locale === coreLocalization.locale() ? Globalize : new Globalize(locale); - let result; - - if(this._messageLoaded(key, locale)) { - result = currentGlobalize.messageFormatter(key); - } - - return result; - }, - - _messageLoaded: function(key, locale) { - const currentCldr = locale ? new Globalize(locale).cldr : Globalize.locale(); - const value = currentCldr.get(['globalize-messages/{bundle}', key]); - - return !!value; - }, - - _loadSingle: function(key, value, locale) { - const data = {}; - - data[locale] = {}; - data[locale][key] = value; - - this.load(data); - } - }; - - messageLocalization.inject(globalizeMessageLocalization); -} +import '../../common/core/localization/globalize/message'; diff --git a/packages/devextreme/js/localization/globalize/number.js b/packages/devextreme/js/localization/globalize/number.js index 4a3cdda578d8..67e44eca5ca9 100644 --- a/packages/devextreme/js/localization/globalize/number.js +++ b/packages/devextreme/js/localization/globalize/number.js @@ -1,126 +1 @@ -import './core'; -// eslint-disable-next-line no-restricted-imports -import Globalize from 'globalize'; -import numberLocalization from '../number'; -import errors from '../../core/errors'; - -// eslint-disable-next-line no-restricted-imports, import/no-unresolved -import 'globalize/number'; -const MAX_FRACTION_DIGITS = 20; - -if(Globalize && Globalize.formatNumber) { - if(Globalize.locale().locale === 'en') { - Globalize.locale('en'); - } - - const formattersCache = {}; - - const getFormatter = format => { - let formatter; - let formatCacheKey; - - if(typeof format === 'object') { - formatCacheKey = Globalize.locale().locale + ':' + JSON.stringify(format); - } else { - formatCacheKey = Globalize.locale().locale + ':' + format; - } - formatter = formattersCache[formatCacheKey]; - if(!formatter) { - formatter = formattersCache[formatCacheKey] = Globalize.numberFormatter(format); - } - - return formatter; - }; - - const globalizeNumberLocalization = { - engine: function() { - return 'globalize'; - }, - - _formatNumberCore: function(value, format, formatConfig) { - if(format === 'exponential') { - return this.callBase.apply(this, arguments); - } - - return getFormatter(this._normalizeFormatConfig(format, formatConfig, value))(value); - }, - _normalizeFormatConfig: function(format, formatConfig, value) { - let config; - - if(format === 'decimal') { - config = { - minimumIntegerDigits: formatConfig.precision || 1, - useGrouping: false, - minimumFractionDigits: 0, - maximumFractionDigits: MAX_FRACTION_DIGITS, - round: value < 0 ? 'ceil' : 'floor' - }; - } else { - config = this._getPrecisionConfig(formatConfig.precision); - } - if(format === 'percent') { - config.style = 'percent'; - } - - return config; - }, - - _getPrecisionConfig: function(precision) { - let config; - - if(precision === null) { - config = { - minimumFractionDigits: 0, - maximumFractionDigits: MAX_FRACTION_DIGITS - }; - } else { - config = { - minimumFractionDigits: precision || 0, - maximumFractionDigits: precision || 0 - }; - } - - return config; - }, - - format: function(value, format) { - if(typeof value !== 'number') { - return value; - } - - format = this._normalizeFormat(format); - - if(!format || typeof (format) !== 'function' && !format.type && !format.formatter) { - return getFormatter(format)(value); - } - - return this.callBase.apply(this, arguments); - }, - - parse: function(text, format) { - if(!text) { - return; - } - - if(format && (format.parser || typeof format === 'string')) { - return this.callBase.apply(this, arguments); - } - - if(format) { - // Current parser functionality provided as-is and is independent of the most of capabilities of formatter. - errors.log('W0011'); - } - - let result = Globalize.parseNumber(text); - - if(isNaN(result)) { - result = this.callBase.apply(this, arguments); - } - - return result; - } - }; - - numberLocalization.resetInjection(); - numberLocalization.inject(globalizeNumberLocalization); -} +import '../../common/core/localization/globalize/number'; diff --git a/packages/devextreme/js/localization/intl/date.js b/packages/devextreme/js/localization/intl/date.js index c75851db4d23..df469a3a6666 100644 --- a/packages/devextreme/js/localization/intl/date.js +++ b/packages/devextreme/js/localization/intl/date.js @@ -1,347 +1 @@ -/* globals Intl */ -import { extend } from '../../core/utils/extend'; -import localizationCoreUtils from '../core'; - -const SYMBOLS_TO_REMOVE_REGEX = /[\u200E\u200F]/g; -const NARROW_NO_BREAK_SPACE_REGEX = /[\u202F]/g; - -const getIntlFormatter = format => { - return date => { - // NOTE: Intl in some browsers formates dates with timezone offset which was at the moment for this date. - // But the method "new Date" creates date using current offset. So, we decided to format dates in the UTC timezone. - if(!format.timeZoneName) { - const year = date.getFullYear(); - // NOTE: new Date(99,0,1) will return 1999 year, but 99 expected - const recognizableAsTwentyCentury = String(year).length < 3; - const safeYearShift = 400; - const temporaryYearValue = recognizableAsTwentyCentury ? year + safeYearShift : year; - const utcDate = new Date(Date.UTC(temporaryYearValue, date.getMonth(), date.getDate(), date.getHours(), date.getMinutes(), date.getSeconds(), date.getMilliseconds())); - if(recognizableAsTwentyCentury) { - utcDate.setFullYear(year); - } - const utcFormat = extend({ timeZone: 'UTC' }, format); - - return formatDateTime(utcDate, utcFormat); - } - - return formatDateTime(date, format); - }; -}; - -const formattersCache = {}; -const getFormatter = format => { - const key = localizationCoreUtils.locale() + '/' + JSON.stringify(format); - if(!formattersCache[key]) { - formattersCache[key] = (new Intl.DateTimeFormat(localizationCoreUtils.locale(), format)).format; - } - - return formattersCache[key]; -}; - -function formatDateTime(date, format) { - return getFormatter(format)(date) - .replace(SYMBOLS_TO_REMOVE_REGEX, '') - .replace(NARROW_NO_BREAK_SPACE_REGEX, ' '); -} - -const formatNumber = number => { - return (new Intl.NumberFormat(localizationCoreUtils.locale())).format(number); -}; - -const getAlternativeNumeralsMap = (() => { - const numeralsMapCache = {}; - - return locale => { - if(!(locale in numeralsMapCache)) { - if(formatNumber(0) === '0') { - numeralsMapCache[locale] = false; - return false; - } - numeralsMapCache[locale] = {}; - for(let i = 0; i < 10; ++i) { - numeralsMapCache[locale][formatNumber(i)] = i; - } - } - - return numeralsMapCache[locale]; - }; -})(); - -const normalizeNumerals = dateString => { - const alternativeNumeralsMap = getAlternativeNumeralsMap(localizationCoreUtils.locale()); - - if(!alternativeNumeralsMap) { - return dateString; - } - - return dateString.split('').map(sign => { - return sign in alternativeNumeralsMap ? String(alternativeNumeralsMap[sign]) : sign; - }).join(''); -}; - -const removeLeadingZeroes = str => { - return str.replace(/(\D)0+(\d)/g, '$1$2'); -}; -const dateStringEquals = (actual, expected) => { - return removeLeadingZeroes(actual) === removeLeadingZeroes(expected); -}; - -const normalizeMonth = text => { - return text.replace('d\u2019', 'de '); // NOTE: For "ca" locale -}; - -const intlFormats = { - 'day': { day: 'numeric' }, - 'date': { year: 'numeric', month: 'long', day: 'numeric' }, - 'dayofweek': { weekday: 'long' }, - 'longdate': { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' }, - 'longdatelongtime': { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric', second: 'numeric' }, - 'longtime': { hour: 'numeric', minute: 'numeric', second: 'numeric' }, - 'month': { month: 'long' }, - 'monthandday': { month: 'long', day: 'numeric' }, - 'monthandyear': { year: 'numeric', month: 'long' }, - 'shortdate': {}, - 'shorttime': { hour: 'numeric', minute: 'numeric' }, - 'shortyear': { year: '2-digit' }, - 'year': { year: 'numeric' } -}; - -Object.defineProperty(intlFormats, 'shortdateshorttime', { - get: function() { - const defaultOptions = Intl.DateTimeFormat(localizationCoreUtils.locale()).resolvedOptions(); - - return { year: defaultOptions.year, month: defaultOptions.month, day: defaultOptions.day, hour: 'numeric', minute: 'numeric' }; - } -}); - -const getIntlFormat = format => { - return typeof format === 'string' && intlFormats[format.toLowerCase()]; -}; - -const monthNameStrategies = { - standalone: function(monthIndex, monthFormat) { - const date = new Date(1999, monthIndex, 13, 1); - const dateString = getIntlFormatter({ month: monthFormat })(date); - - return dateString; - }, - format: function(monthIndex, monthFormat) { - const date = new Date(0, monthIndex, 13, 1); - const dateString = normalizeMonth(getIntlFormatter({ day: 'numeric', month: monthFormat })(date)); - const parts = dateString.split(' ').filter(part => { - return part.indexOf('13') < 0; - }); - - if(parts.length === 1) { - return parts[0]; - } else if(parts.length === 2) { - return parts[0].length > parts[1].length ? parts[0] : parts[1]; // NOTE: For "lt" locale - } - - return monthNameStrategies.standalone(monthIndex, monthFormat); - } -}; - -export default { - engine: function() { - return 'intl'; - }, - getMonthNames: function(format, type) { - const intlFormats = { - wide: 'long', - abbreviated: 'short', - narrow: 'narrow' - }; - - const monthFormat = intlFormats[format || 'wide']; - - type = type === 'format' ? type : 'standalone'; - - return Array.apply(null, new Array(12)).map((_, monthIndex) => { - return monthNameStrategies[type](monthIndex, monthFormat); - }); - }, - - getDayNames: function(format) { - const intlFormats = { - wide: 'long', - abbreviated: 'short', - short: 'narrow', - narrow: 'narrow' - }; - - const getIntlDayNames = format => { - return Array.apply(null, new Array(7)).map((_, dayIndex) => { - return getIntlFormatter({ weekday: format })(new Date(0, 0, dayIndex)); - }); - }; - - const result = getIntlDayNames(intlFormats[format || 'wide']); - - return result; - }, - - getPeriodNames: function() { - const hour12Formatter = getIntlFormatter({ hour: 'numeric', hour12: true }); - - return [ 1, 13 ].map(hours => { - const hourNumberText = formatNumber(1); // NOTE: For "bn" locale - const timeParts = hour12Formatter(new Date(0, 0, 1, hours)).split(hourNumberText); - - if(timeParts.length !== 2) { - return ''; - } - - const biggerPart = timeParts[0].length > timeParts[1].length ? timeParts[0] : timeParts[1]; - - return biggerPart.trim(); - }); - }, - - format: function(date, format) { - if(!date) { - return; - } - - if(!format) { - return date; - } - - // TODO: refactor (extract code form base) - if(typeof (format) !== 'function' && !format.formatter) { - format = format.type || format; - } - const intlFormat = getIntlFormat(format); - - if(intlFormat) { - return getIntlFormatter(intlFormat)(date); - } - - const formatType = typeof format; - if(format.formatter || formatType === 'function' || formatType === 'string') { - return this.callBase.apply(this, arguments); - } - - return getIntlFormatter(format)(date); - }, - - parse: function(dateString, format) { - let formatter; - - if(format && !format.parser && typeof dateString === 'string') { - dateString = normalizeMonth(dateString); - formatter = (date) => { - return normalizeMonth(this.format(date, format)); - }; - } - return this.callBase(dateString, formatter || format); - }, - - _parseDateBySimpleFormat: function(dateString, format) { - dateString = normalizeNumerals(dateString); - - const formatParts = this.getFormatParts(format); - const dateParts = dateString - .split(/\D+/) - .filter(part => { return part.length > 0; }); - - if(formatParts.length !== dateParts.length) { - return; - } - - const dateArgs = this._generateDateArgs(formatParts, dateParts); - - const constructDate = (dateArgs, ampmShift) => { - const hoursShift = ampmShift ? 12 : 0; - return new Date(dateArgs.year, dateArgs.month, dateArgs.day, (dateArgs.hours + hoursShift) % 24, dateArgs.minutes, dateArgs.seconds); - }; - const constructValidDate = ampmShift => { - const parsedDate = constructDate(dateArgs, ampmShift); - if(dateStringEquals(normalizeNumerals(this.format(parsedDate, format)), dateString)) { - return parsedDate; - } - }; - - return constructValidDate(false) || constructValidDate(true); - }, - - _generateDateArgs: function(formatParts, dateParts) { - const currentDate = new Date(); - const dateArgs = { - year: currentDate.getFullYear(), - month: currentDate.getMonth(), - day: currentDate.getDate(), - hours: 0, - minutes: 0, - seconds: 0 - }; - - formatParts.forEach((formatPart, index) => { - const datePart = dateParts[index]; - let parsed = parseInt(datePart, 10); - - if(formatPart === 'month') { - parsed = parsed - 1; - } - - dateArgs[formatPart] = parsed; - }); - - return dateArgs; - }, - - formatUsesMonthName: function(format) { - if(typeof format === 'object' && !(format.type || format.format)) { - return format.month === 'long'; - } - - return this.callBase.apply(this, arguments); - }, - - formatUsesDayName: function(format) { - if(typeof format === 'object' && !(format.type || format.format)) { - return format.weekday === 'long'; - } - - return this.callBase.apply(this, arguments); - }, - getTimeSeparator: function() { - const formatOptions = { - hour: 'numeric', - minute: 'numeric', - hour12: false - }; - return normalizeNumerals(formatDateTime(new Date(2001, 1, 1, 11, 11), formatOptions)).replace(/\d/g, ''); - }, - - getFormatParts: function(format) { - if(typeof format === 'string') { - return this.callBase(format); - } - const intlFormat = extend({}, intlFormats[format.toLowerCase()]); - const date = new Date(2001, 2, 4, 5, 6, 7); - let formattedDate = getIntlFormatter(intlFormat)(date); - - formattedDate = normalizeNumerals(formattedDate); - - const formatParts = [ - { name: 'year', value: 1 }, - { name: 'month', value: 3 }, - { name: 'day', value: 4 }, - { name: 'hours', value: 5 }, - { name: 'minutes', value: 6 }, - { name: 'seconds', value: 7 } - ]; - - return formatParts - .map(part => { - return { - name: part.name, - index: formattedDate.indexOf(part.value) - }; - }) - .filter(part => { return part.index > -1; }) - .sort((a, b) => { return a.index - b.index; }) - .map(part => { return part.name; }); - } -}; +export { default } from '../../common/core/localization/intl/date'; diff --git a/packages/devextreme/js/localization/intl/number.js b/packages/devextreme/js/localization/intl/number.js index 15c172fd1e78..3dcc11b5cc0b 100644 --- a/packages/devextreme/js/localization/intl/number.js +++ b/packages/devextreme/js/localization/intl/number.js @@ -1,129 +1 @@ -/* globals Intl */ -import dxConfig from '../../core/config'; -import localizationCoreUtils from '../core'; -import openXmlCurrencyFormat from '../open_xml_currency_format'; -import accountingFormats from '../cldr-data/accounting_formats'; - -const CURRENCY_STYLES = ['standard', 'accounting']; -const MAX_FRACTION_DIGITS = 20; - -const detectCurrencySymbolRegex = /([^\s0]+)?(\s*)0*[.,]*0*(\s*)([^\s0]+)?/; -const formattersCache = {}; -const getFormatter = format => { - const key = localizationCoreUtils.locale() + '/' + JSON.stringify(format); - if(!formattersCache[key]) { - formattersCache[key] = (new Intl.NumberFormat(localizationCoreUtils.locale(), format)).format; - } - - return formattersCache[key]; -}; -const getCurrencyFormatter = currency => { - return (new Intl.NumberFormat(localizationCoreUtils.locale(), { style: 'currency', currency: currency })); -}; - -export default { - engine: function() { - return 'intl'; - }, - _formatNumberCore: function(value, format, formatConfig) { - if(format === 'exponential') { - return this.callBase.apply(this, arguments); - } - - return getFormatter(this._normalizeFormatConfig(format, formatConfig, value))(value); - }, - _normalizeFormatConfig: function(format, formatConfig, value) { - let config; - - if(format === 'decimal') { - const fractionDigits = String(value).split('.')[1]; - config = { - minimumIntegerDigits: formatConfig.precision || undefined, - useGrouping: false, - maximumFractionDigits: fractionDigits && fractionDigits.length, - round: value < 0 ? 'ceil' : 'floor' - }; - } else { - config = this._getPrecisionConfig(formatConfig.precision); - } - - if(format === 'percent') { - config.style = 'percent'; - } else if(format === 'currency') { - const useAccountingStyle = formatConfig.useCurrencyAccountingStyle ?? dxConfig().defaultUseCurrencyAccountingStyle; - config.style = 'currency'; - config.currency = formatConfig.currency || dxConfig().defaultCurrency; - config.currencySign = CURRENCY_STYLES[+useAccountingStyle]; - } - - return config; - }, - _getPrecisionConfig: function(precision) { - let config; - - if(precision === null) { - config = { - minimumFractionDigits: 0, - maximumFractionDigits: MAX_FRACTION_DIGITS - }; - } else { - config = { - minimumFractionDigits: precision || 0, - maximumFractionDigits: precision || 0 - }; - } - - return config; - }, - format: function(value, format) { - if('number' !== typeof value) { - return value; - } - - format = this._normalizeFormat(format); - - if(format.currency === 'default') { - format.currency = dxConfig().defaultCurrency; - } - - if(!format || 'function' !== typeof format && !format.type && !format.formatter) { - return getFormatter(format)(value); - } - - return this.callBase.apply(this, arguments); - }, - _getCurrencySymbolInfo: function(currency) { - const formatter = getCurrencyFormatter(currency); - return this._extractCurrencySymbolInfo(formatter.format(0)); - }, - _extractCurrencySymbolInfo: function(currencyValueString) { - const match = detectCurrencySymbolRegex.exec(currencyValueString) || []; - const position = match[1] ? 'before' : 'after'; - const symbol = match[1] || match[4] || ''; - const delimiter = match[2] || match[3] || ''; - - return { - position: position, - symbol: symbol, - delimiter: delimiter - }; - }, - - getCurrencySymbol: function(currency) { - if(!currency) { - currency = dxConfig().defaultCurrency; - } - - const symbolInfo = this._getCurrencySymbolInfo(currency); - return { - 'symbol': symbolInfo.symbol - }; - }, - getOpenXmlCurrencyFormat: function(currency) { - const targetCurrency = currency || dxConfig().defaultCurrency; - const currencySymbol = this._getCurrencySymbolInfo(targetCurrency).symbol; - const closestAccountingFormat = localizationCoreUtils.getValueByClosestLocale(locale => accountingFormats[locale]); - - return openXmlCurrencyFormat(currencySymbol, closestAccountingFormat); - } -}; +export { default } from '../../common/core/localization/intl/number'; diff --git a/packages/devextreme/js/localization/language_codes.js b/packages/devextreme/js/localization/language_codes.js index 5092ff4f338b..799164fd8b8f 100644 --- a/packages/devextreme/js/localization/language_codes.js +++ b/packages/devextreme/js/localization/language_codes.js @@ -1,358 +1 @@ -import localizationCoreUtils from './core'; -const LANGUAGE_CODES = { - 'ar': 1, - 'bg': 2, - 'ca': 3, - 'zh-Hans': 4, - 'cs': 5, - 'da': 6, - 'de': 7, - 'el': 8, - 'en': 9, - 'es': 10, - 'fi': 11, - 'fr': 12, - 'he': 13, - 'hu': 14, - 'is': 15, - 'it': 16, - 'ja': 17, - 'ko': 18, - 'nl': 19, - 'no': 20, - 'pl': 21, - 'pt': 22, - 'rm': 23, - 'ro': 24, - 'ru': 25, - 'hr': 26, - 'sk': 27, - 'sq': 28, - 'sv': 29, - 'th': 30, - 'tr': 31, - 'ur': 32, - 'id': 33, - 'uk': 34, - 'be': 35, - 'sl': 36, - 'et': 37, - 'lv': 38, - 'lt': 39, - 'tg': 40, - 'fa': 41, - 'vi': 42, - 'hy': 43, - 'az': 44, - 'eu': 45, - 'hsb': 46, - 'mk': 47, - 'tn': 50, - 'xh': 52, - 'zu': 53, - 'af': 54, - 'ka': 55, - 'fo': 56, - 'hi': 57, - 'mt': 58, - 'se': 59, - 'ga': 60, - 'ms': 62, - 'kk': 63, - 'ky': 64, - 'sw': 65, - 'tk': 66, - 'uz': 67, - 'tt': 68, - 'bn': 69, - 'pa': 70, - 'gu': 71, - 'or': 72, - 'ta': 73, - 'te': 74, - 'kn': 75, - 'ml': 76, - 'as': 77, - 'mr': 78, - 'sa': 79, - 'mn': 80, - 'bo': 81, - 'cy': 82, - 'km': 83, - 'lo': 84, - 'gl': 86, - 'kok': 87, - 'syr': 90, - 'si': 91, - 'iu': 93, - 'am': 94, - 'tzm': 95, - 'ne': 97, - 'fy': 98, - 'ps': 99, - 'fil': 100, - 'dv': 101, - 'ha': 104, - 'yo': 106, - 'quz': 107, - 'nso': 108, - 'ba': 109, - 'lb': 110, - 'kl': 111, - 'ig': 112, - 'ii': 120, - 'arn': 122, - 'moh': 124, - 'br': 126, - 'ug': 128, - 'mi': 129, - 'oc': 130, - 'co': 131, - 'gsw': 132, - 'sah': 133, - 'qut': 134, - 'rw': 135, - 'wo': 136, - 'prs': 140, - 'gd': 145, - 'ar-SA': 1025, - 'bg-BG': 1026, - 'ca-ES': 1027, - 'zh-TW': 1028, - 'cs-CZ': 1029, - 'da-DK': 1030, - 'de-DE': 1031, - 'el-GR': 1032, - 'en-US': 1033, - 'fi-FI': 1035, - 'fr-FR': 1036, - 'he-IL': 1037, - 'hu-HU': 1038, - 'is-IS': 1039, - 'it-IT': 1040, - 'ja-JP': 1041, - 'ko-KR': 1042, - 'nl-NL': 1043, - 'nb-NO': 1044, - 'pl-PL': 1045, - 'pt-BR': 1046, - 'rm-CH': 1047, - 'ro-RO': 1048, - 'ru-RU': 1049, - 'hr-HR': 1050, - 'sk-SK': 1051, - 'sq-AL': 1052, - 'sv-SE': 1053, - 'th-TH': 1054, - 'tr-TR': 1055, - 'ur-PK': 1056, - 'id-ID': 1057, - 'uk-UA': 1058, - 'be-BY': 1059, - 'sl-SI': 1060, - 'et-EE': 1061, - 'lv-LV': 1062, - 'lt-LT': 1063, - 'tg-Cyrl-TJ': 1064, - 'fa-IR': 1065, - 'vi-VN': 1066, - 'hy-AM': 1067, - 'az-Latn-AZ': 1068, - 'eu-ES': 1069, - 'hsb-DE': 1070, - 'mk-MK': 1071, - 'tn-ZA': 1074, - 'xh-ZA': 1076, - 'zu-ZA': 1077, - 'af-ZA': 1078, - 'ka-GE': 1079, - 'fo-FO': 1080, - 'hi-IN': 1081, - 'mt-MT': 1082, - 'se-NO': 1083, - 'ms-MY': 1086, - 'kk-KZ': 1087, - 'ky-KG': 1088, - 'sw-KE': 1089, - 'tk-TM': 1090, - 'uz-Latn-UZ': 1091, - 'tt-RU': 1092, - 'bn-IN': 1093, - 'pa-IN': 1094, - 'gu-IN': 1095, - 'or-IN': 1096, - 'ta-IN': 1097, - 'te-IN': 1098, - 'kn-IN': 1099, - 'ml-IN': 1100, - 'as-IN': 1101, - 'mr-IN': 1102, - 'sa-IN': 1103, - 'mn-MN': 1104, - 'bo-CN': 1105, - 'cy-GB': 1106, - 'km-KH': 1107, - 'lo-LA': 1108, - 'gl-ES': 1110, - 'kok-IN': 1111, - 'syr-SY': 1114, - 'si-LK': 1115, - 'iu-Cans-CA': 1117, - 'am-ET': 1118, - 'ne-NP': 1121, - 'fy-NL': 1122, - 'ps-AF': 1123, - 'fil-PH': 1124, - 'dv-MV': 1125, - 'ha-Latn-NG': 1128, - 'yo-NG': 1130, - 'quz-BO': 1131, - 'nso-ZA': 1132, - 'ba-RU': 1133, - 'lb-LU': 1134, - 'kl-GL': 1135, - 'ig-NG': 1136, - 'ii-CN': 1144, - 'arn-CL': 1146, - 'moh-CA': 1148, - 'br-FR': 1150, - 'ug-CN': 1152, - 'mi-NZ': 1153, - 'oc-FR': 1154, - 'co-FR': 1155, - 'gsw-FR': 1156, - 'sah-RU': 1157, - 'qut-GT': 1158, - 'rw-RW': 1159, - 'wo-SN': 1160, - 'prs-AF': 1164, - 'gd-GB': 1169, - 'ar-IQ': 2049, - 'zh-CN': 2052, - 'de-CH': 2055, - 'en-GB': 2057, - 'es-MX': 2058, - 'fr-BE': 2060, - 'it-CH': 2064, - 'nl-BE': 2067, - 'nn-NO': 2068, - 'pt-PT': 2070, - 'sr-Latn-CS': 2074, - 'sv-FI': 2077, - 'az-Cyrl-AZ': 2092, - 'dsb-DE': 2094, - 'se-SE': 2107, - 'ga-IE': 2108, - 'ms-BN': 2110, - 'uz-Cyrl-UZ': 2115, - 'bn-BD': 2117, - 'mn-Mong-CN': 2128, - 'iu-Latn-CA': 2141, - 'tzm-Latn-DZ': 2143, - 'quz-EC': 2155, - 'ar-EG': 3073, - 'zh-HK': 3076, - 'de-AT': 3079, - 'en-AU': 3081, - 'es-ES': 3082, - 'fr-CA': 3084, - 'sr-Cyrl-CS': 3098, - 'se-FI': 3131, - 'quz-PE': 3179, - 'ar-LY': 4097, - 'zh-SG': 4100, - 'de-LU': 4103, - 'en-CA': 4105, - 'es-GT': 4106, - 'fr-CH': 4108, - 'hr-BA': 4122, - 'smj-NO': 4155, - 'ar-DZ': 5121, - 'zh-MO': 5124, - 'de-LI': 5127, - 'en-NZ': 5129, - 'es-CR': 5130, - 'fr-LU': 5132, - 'bs-Latn-BA': 5146, - 'smj-SE': 5179, - 'ar-MA': 6145, - 'en-IE': 6153, - 'es-PA': 6154, - 'fr-MC': 6156, - 'sr-Latn-BA': 6170, - 'sma-NO': 6203, - 'ar-TN': 7169, - 'en-ZA': 7177, - 'es-DO': 7178, - 'sr-Cyrl-BA': 7194, - 'sma-SE': 7227, - 'ar-OM': 8193, - 'en-JM': 8201, - 'es-VE': 8202, - 'bs-Cyrl-BA': 8218, - 'sms-FI': 8251, - 'ar-YE': 9217, - 'en-029': 9225, - 'es-CO': 9226, - 'sr-Latn-RS': 9242, - 'smn-FI': 9275, - 'ar-SY': 10241, - 'en-BZ': 10249, - 'es-PE': 10250, - 'sr-Cyrl-RS': 10266, - 'ar-JO': 11265, - 'en-TT': 11273, - 'es-AR': 11274, - 'sr-Latn-ME': 11290, - 'ar-LB': 12289, - 'en-ZW': 12297, - 'es-EC': 12298, - 'sr-Cyrl-ME': 12314, - 'ar-KW': 13313, - 'en-PH': 13321, - 'es-CL': 13322, - 'ar-AE': 14337, - 'es-UY': 14346, - 'ar-BH': 15361, - 'es-PY': 15370, - 'ar-QA': 16385, - 'en-IN': 16393, - 'es-BO': 16394, - 'en-MY': 17417, - 'es-SV': 17418, - 'en-SG': 18441, - 'es-HN': 18442, - 'es-NI': 19466, - 'es-PR': 20490, - 'es-US': 21514, - 'bs-Cyrl': 25626, - 'bs-Latn': 26650, - 'sr-Cyrl': 27674, - 'sr-Latn': 28698, - 'smn': 28731, - 'az-Cyrl': 29740, - 'sms': 29755, - 'zh': 30724, - 'nn': 30740, - 'bs': 30746, - 'az-Latn': 30764, - 'sma': 30779, - 'uz-Cyrl': 30787, - 'mn-Cyrl': 30800, - 'iu-Cans': 30813, - 'zh-Hant': 31748, - 'nb': 31764, - 'sr': 31770, - 'tg-Cyrl': 31784, - 'dsb': 31790, - 'smj': 31803, - 'uz-Latn': 31811, - 'mn-Mong': 31824, - 'iu-Latn': 31837, - 'tzm-Latn': 31839, - 'ha-Latn': 31848 -}; - -export function getLanguageId() { - return LANGUAGE_CODES[localizationCoreUtils.locale()]; -} +export * from '../common/core/localization/language_codes'; diff --git a/packages/devextreme/js/localization/ldml/date.format.js b/packages/devextreme/js/localization/ldml/date.format.js index e3b9b860bd72..4739335d94c7 100644 --- a/packages/devextreme/js/localization/ldml/date.format.js +++ b/packages/devextreme/js/localization/ldml/date.format.js @@ -1,203 +1 @@ -import numberLocalization from '../number'; - -const ARABIC_COMMA = '\u060C'; -const FORMAT_SEPARATORS = ' .,:;/\\<>()-[]' + ARABIC_COMMA; -const AM_PM_PATTERN = '. m.'; - -const checkDigit = function(char) { - const code = char && numberLocalization.convertDigits(char, false).charCodeAt(0); - const zeroCode = numberLocalization.convertDigits('0', false).charCodeAt(0); - - return zeroCode <= code && code < zeroCode + 10; -}; - -const checkPatternContinue = function(text, patterns, index, isDigit) { - const char = text[index]; - const nextChar = text[index + 1]; - - if(!isDigit) { - if(char === '.' || (char === ' ' && text.slice(index - 1, index + 3) === AM_PM_PATTERN)) { - return true; - } - if(char === '-' && !checkDigit(nextChar)) { - return true; - } - } - const isDigitChanged = isDigit && patterns.some(pattern => text[index] !== pattern[index]); - return FORMAT_SEPARATORS.indexOf(char) < 0 && (isDigit === checkDigit(char) && (!isDigit || isDigitChanged)); -}; - -const getPatternStartIndex = function(defaultPattern, index) { - if(!checkDigit(defaultPattern[index])) { - while(index > 0 - && !checkDigit(defaultPattern[index - 1]) - && (defaultPattern[index - 1] === '.' - || FORMAT_SEPARATORS.indexOf(defaultPattern[index - 1]) < 0)) { - index--; - } - } - return index; -}; - -const getDifference = function(defaultPattern, patterns, processedIndexes, isDigit) { - let i = 0; - const result = []; - - const patternsFilter = function(pattern) { - return defaultPattern[i] !== pattern[i] && (isDigit === undefined || checkDigit(defaultPattern[i]) === isDigit); - }; - - if(!Array.isArray(patterns)) { - patterns = [patterns]; - } - - for(i = 0; i < defaultPattern.length; i++) { - if(processedIndexes.indexOf(i) < 0 && patterns.filter(patternsFilter).length) { - i = getPatternStartIndex(defaultPattern, i); - do { - isDigit = checkDigit(defaultPattern[i]); - if(!result.length && !isDigit && checkDigit(patterns[0][i])) { - break; - } - result.push(i); - processedIndexes.unshift(i); - i++; - } while(defaultPattern[i] && checkPatternContinue(defaultPattern, patterns, i, isDigit)); - break; - } - } - - if(result.length === 1 && (defaultPattern[processedIndexes[0] - 1] === '0' || defaultPattern[processedIndexes[0] - 1] === '٠')) { - processedIndexes.unshift(processedIndexes[0] - 1); - } - - return result; -}; - -const replaceCharsCore = function(pattern, indexes, char, patternPositions) { - const baseCharIndex = indexes[0]; - const patternIndex = baseCharIndex < patternPositions.length ? patternPositions[baseCharIndex] : baseCharIndex; - - indexes.forEach(function(_, index) { - pattern = pattern.substr(0, patternIndex + index) + (char.length > 1 ? char[index] : char) + pattern.substr(patternIndex + index + 1); - }); - - if(indexes.length === 1) { - pattern = pattern.replace('0' + char, char + char); - pattern = pattern.replace('٠' + char, char + char); - } - - return pattern; -}; - -const replaceChars = function(pattern, indexes, char, patternPositions) { - let i; - let index; - let patternIndex; - - if(!checkDigit(pattern[indexes[0]] || '0')) { - const letterCount = Math.max(indexes.length <= 3 ? 3 : 4, char.length); - - while(indexes.length > letterCount) { - index = indexes.pop(); - patternIndex = patternPositions[index]; - - patternPositions[index] = -1; - for(i = index + 1; i < patternPositions.length; i++) { - patternPositions[i]--; - } - pattern = pattern.substr(0, patternIndex) + pattern.substr(patternIndex + 1); - } - - index = indexes[indexes.length - 1] + 1, - patternIndex = index < patternPositions.length ? patternPositions[index] : index; - - while(indexes.length < letterCount) { - - indexes.push(indexes[indexes.length - 1] + 1); - for(i = index; i < patternPositions.length; i++) { - patternPositions[i]++; - } - pattern = pattern.substr(0, patternIndex) + ' ' + pattern.substr(patternIndex); - } - } - - pattern = replaceCharsCore(pattern, indexes, char, patternPositions); - - return pattern; -}; - -const formatValue = function(value, formatter) { - if(Array.isArray(value)) { - return value.map(function(value) { - return (formatter(value) || '').toString(); - }); - } - return (formatter(value) || '').toString(); -}; - -const ESCAPE_CHARS_REGEXP = /[a-zA-Z]/g; - -const escapeChars = function(pattern, defaultPattern, processedIndexes, patternPositions) { - const escapeIndexes = defaultPattern.split('').map(function(char, index) { - if(processedIndexes.indexOf(index) < 0 && (char.match(ESCAPE_CHARS_REGEXP) || char === '\'')) { - return patternPositions[index]; - } - return -1; - }); - - pattern = pattern.split('').map(function(char, index) { - let result = char; - const isCurrentCharEscaped = escapeIndexes.indexOf(index) >= 0; - const isPrevCharEscaped = index > 0 && escapeIndexes.indexOf(index - 1) >= 0; - const isNextCharEscaped = escapeIndexes.indexOf(index + 1) >= 0; - - if(isCurrentCharEscaped) { - if(!isPrevCharEscaped) { - result = '\'' + result; - } - if(!isNextCharEscaped) { - result = result + '\''; - } - } - - return result; - }).join(''); - - return pattern; -}; - -export const getFormat = function(formatter) { - const processedIndexes = []; - const defaultPattern = formatValue(new Date(2009, 8, 8, 6, 5, 4), formatter); - const patternPositions = defaultPattern.split('').map(function(_, index) { return index; }); - let result = defaultPattern; - const replacedPatterns = {}; - const datePatterns = [ - { date: new Date(2009, 8, 8, 6, 5, 4, 111), pattern: 'S' }, - { date: new Date(2009, 8, 8, 6, 5, 2), pattern: 's' }, - { date: new Date(2009, 8, 8, 6, 2, 4), pattern: 'm' }, - { date: new Date(2009, 8, 8, 18, 5, 4), pattern: 'H', isDigit: true }, - { date: new Date(2009, 8, 8, 2, 5, 4), pattern: 'h', isDigit: true }, - { date: new Date(2009, 8, 8, 18, 5, 4), pattern: 'a', isDigit: false }, - { date: new Date(2009, 8, 1, 6, 5, 4), pattern: 'd' }, - { date: [new Date(2009, 8, 2, 6, 5, 4), new Date(2009, 8, 3, 6, 5, 4), new Date(2009, 8, 4, 6, 5, 4)], pattern: 'E' }, - { date: new Date(2009, 9, 6, 6, 5, 4), pattern: 'M' }, - { date: new Date(1998, 8, 8, 6, 5, 4), pattern: 'y' }]; - - if(!result) return; - - datePatterns.forEach(function(test) { - const diff = getDifference(defaultPattern, formatValue(test.date, formatter), processedIndexes, test.isDigit); - const pattern = test.pattern === 'M' && !replacedPatterns['d'] ? 'L' : test.pattern; - - result = replaceChars(result, diff, pattern, patternPositions); - replacedPatterns[pattern] = diff.length; - }); - - result = escapeChars(result, defaultPattern, processedIndexes, patternPositions); - - if(processedIndexes.length) { - return result; - } -}; +export * from '../../common/core/localization/ldml/date.format'; diff --git a/packages/devextreme/js/localization/ldml/date.formatter.js b/packages/devextreme/js/localization/ldml/date.formatter.js index 13f36b7df0af..e34f5e0ad185 100644 --- a/packages/devextreme/js/localization/ldml/date.formatter.js +++ b/packages/devextreme/js/localization/ldml/date.formatter.js @@ -1,140 +1 @@ -function leftPad(text, length) { - while(text.length < length) { - text = '0' + text; - } - return text; -} - -const FORMAT_TYPES = { - '3': 'abbreviated', - '4': 'wide', - '5': 'narrow' -}; - -const LDML_FORMATTERS = { - y: function(date, count, useUtc) { - let year = date[useUtc ? 'getUTCFullYear' : 'getFullYear'](); - if(count === 2) { - year = year % 100; - } - return leftPad(year.toString(), count); - }, - M: function(date, count, useUtc, dateParts) { - const month = date[useUtc ? 'getUTCMonth' : 'getMonth'](); - const formatType = FORMAT_TYPES[count]; - if(formatType) { - return dateParts.getMonthNames(formatType, 'format')[month]; - } - return leftPad((month + 1).toString(), Math.min(count, 2)); - }, - L: function(date, count, useUtc, dateParts) { - const month = date[useUtc ? 'getUTCMonth' : 'getMonth'](); - const formatType = FORMAT_TYPES[count]; - if(formatType) { - return dateParts.getMonthNames(formatType, 'standalone')[month]; - } - return leftPad((month + 1).toString(), Math.min(count, 2)); - }, - Q: function(date, count, useUtc, dateParts) { - const month = date[useUtc ? 'getUTCMonth' : 'getMonth'](); - const quarter = Math.floor(month / 3); - const formatType = FORMAT_TYPES[count]; - if(formatType) { - return dateParts.getQuarterNames(formatType)[quarter]; - } - return leftPad((quarter + 1).toString(), Math.min(count, 2)); - }, - E: function(date, count, useUtc, dateParts) { - const day = date[useUtc ? 'getUTCDay' : 'getDay'](); - const formatType = FORMAT_TYPES[count < 3 ? 3 : count]; - return dateParts.getDayNames(formatType)[day]; - }, - a: function(date, count, useUtc, dateParts) { - const hours = date[useUtc ? 'getUTCHours' : 'getHours'](); - const period = hours < 12 ? 0 : 1; - const formatType = FORMAT_TYPES[count]; - return dateParts.getPeriodNames(formatType)[period]; - }, - d: function(date, count, useUtc) { - return leftPad(date[useUtc ? 'getUTCDate' : 'getDate']().toString(), Math.min(count, 2)); - }, - H: function(date, count, useUtc) { - return leftPad(date[useUtc ? 'getUTCHours' : 'getHours']().toString(), Math.min(count, 2)); - }, - h: function(date, count, useUtc) { - const hours = date[useUtc ? 'getUTCHours' : 'getHours'](); - return leftPad((hours % 12 || 12).toString(), Math.min(count, 2)); - }, - m: function(date, count, useUtc) { - return leftPad(date[useUtc ? 'getUTCMinutes' : 'getMinutes']().toString(), Math.min(count, 2)); - }, - s: function(date, count, useUtc) { - return leftPad(date[useUtc ? 'getUTCSeconds' : 'getSeconds']().toString(), Math.min(count, 2)); - }, - S: function(date, count, useUtc) { - return leftPad(date[useUtc ? 'getUTCMilliseconds' : 'getMilliseconds']().toString(), 3).substr(0, count); - }, - x: function(date, count, useUtc) { - const timezoneOffset = useUtc ? 0 : date.getTimezoneOffset(); - const signPart = timezoneOffset > 0 ? '-' : '+'; - const timezoneOffsetAbs = Math.abs(timezoneOffset); - const hours = Math.floor(timezoneOffsetAbs / 60); - const minutes = timezoneOffsetAbs % 60; - const hoursPart = leftPad(hours.toString(), 2); - const minutesPart = leftPad(minutes.toString(), 2); - - return signPart + hoursPart + (count >= 3 ? ':' : '') + (count > 1 || minutes ? minutesPart : ''); - }, - X: function(date, count, useUtc) { - if(useUtc || !date.getTimezoneOffset()) { - return 'Z'; - } - return LDML_FORMATTERS.x(date, count, useUtc); - }, - Z: function(date, count, useUtc) { - return LDML_FORMATTERS.X(date, count >= 5 ? 3 : 2, useUtc); - } -}; - -export const getFormatter = function(format, dateParts) { - return function(date) { - let charIndex; - let formatter; - let char; - let charCount = 0; - const separator = '\''; - let isEscaping = false; - let isCurrentCharEqualsNext; - let result = ''; - - if(!date) return null; - - if(!format) return date; - - const useUtc = format[format.length - 1] === 'Z' || format.slice(-3) === '\'Z\''; - - for(charIndex = 0; charIndex < format.length; charIndex++) { - char = format[charIndex]; - formatter = LDML_FORMATTERS[char]; - isCurrentCharEqualsNext = char === format[charIndex + 1]; - charCount++; - - if(!isCurrentCharEqualsNext) { - if(formatter && !isEscaping) { - result += formatter(date, charCount, useUtc, dateParts); - } - charCount = 0; - } - - if(char === separator && !isCurrentCharEqualsNext) { - isEscaping = !isEscaping; - } else if(isEscaping || !formatter) { - result += char; - } - if(char === separator && isCurrentCharEqualsNext) { - charIndex++; - } - } - return result; - }; -}; +export * from '../../common/core/localization/ldml/date.formatter'; diff --git a/packages/devextreme/js/localization/ldml/date.parser.js b/packages/devextreme/js/localization/ldml/date.parser.js index b9ad3b6f3ca7..4177f5289380 100644 --- a/packages/devextreme/js/localization/ldml/date.parser.js +++ b/packages/devextreme/js/localization/ldml/date.parser.js @@ -1,355 +1 @@ -import { escapeRegExp } from '../../core/utils/common'; -import { logger } from '../../core/utils/console'; - -const FORMAT_TYPES = { - '3': 'abbreviated', - '4': 'wide', - '5': 'narrow' -}; - -const monthRegExpGenerator = function(count, dateParts) { - if(count > 2) { - return Object.keys(FORMAT_TYPES).map(function(count) { - return ['format', 'standalone'].map(function(type) { - return dateParts.getMonthNames(FORMAT_TYPES[count], type).join('|'); - }).join('|'); - }).join('|'); - } - return count === 2 ? '1[012]|0?[1-9]' : '0??[1-9]|1[012]'; -}; - -const PATTERN_REGEXPS = { - ':': function(count, dateParts) { - const countSuffix = count > 1 ? `{${count}}` : ''; - let timeSeparator = escapeRegExp(dateParts.getTimeSeparator()); - timeSeparator !== ':' && (timeSeparator = `${timeSeparator}|:`); - return `${timeSeparator}${countSuffix}`; - }, - y: function(count) { - return count === 2 ? `[0-9]{${count}}` : '[0-9]+?'; - }, - M: monthRegExpGenerator, - L: monthRegExpGenerator, - Q: function(count, dateParts) { - if(count > 2) { - return dateParts.getQuarterNames(FORMAT_TYPES[count], 'format').join('|'); - } - return '0?[1-4]'; - }, - E: function(count, dateParts) { - return '\\D*'; - }, - a: function(count, dateParts) { - return dateParts.getPeriodNames(FORMAT_TYPES[count < 3 ? 3 : count], 'format').join('|'); - }, - d: function(count) { - return count === 2 ? '3[01]|[12][0-9]|0?[1-9]' : '0??[1-9]|[12][0-9]|3[01]'; - }, - H: function(count) { - return count === 2 ? '2[0-3]|1[0-9]|0?[0-9]' : '0??[0-9]|1[0-9]|2[0-3]'; - }, - h: function(count) { - return count === 2 ? '1[012]|0?[1-9]' : '0??[1-9]|1[012]'; - }, - m: function(count) { - return count === 2 ? '[1-5][0-9]|0?[0-9]' : '0??[0-9]|[1-5][0-9]'; - }, - s: function(count) { - return count === 2 ? '[1-5][0-9]|0?[0-9]' : '0??[0-9]|[1-5][0-9]'; - }, - S: function(count) { - return `[0-9]{1,${count}}`; - }, - w: function(count) { - return count === 2 ? '[1-5][0-9]|0?[0-9]' : '0??[0-9]|[1-5][0-9]'; - }, - x: function(count) { - return count === 3 ? '[+-](?:2[0-3]|[01][0-9]):(?:[0-5][0-9])|Z' : '[+-](?:2[0-3]|[01][0-9])(?:[0-5][0-9])|Z'; - } -}; - -const parseNumber = Number; - -const caseInsensitiveIndexOf = function(array, value) { - return array.map((item) => item.toLowerCase()).indexOf(value.toLowerCase()); -}; - -const monthPatternParser = function(text, count, dateParts) { - if(count > 2) { - return ['format', 'standalone'].map(function(type) { - return Object.keys(FORMAT_TYPES).map(function(count) { - const monthNames = dateParts.getMonthNames(FORMAT_TYPES[count], type); - return caseInsensitiveIndexOf(monthNames, text); - }); - }).reduce(function(a, b) { - return a.concat(b); - }).filter(function(index) { - return index >= 0; - })[0]; - } - return parseNumber(text) - 1; -}; - -const PATTERN_PARSERS = { - y: function(text, count) { - const year = parseNumber(text); - if(count === 2) { - return year < 30 ? 2000 + year : 1900 + year; - } - return year; - }, - M: monthPatternParser, - L: monthPatternParser, - Q: function(text, count, dateParts) { - if(count > 2) { - return dateParts.getQuarterNames(FORMAT_TYPES[count], 'format').indexOf(text); - } - return parseNumber(text) - 1; - }, - E: function(text, count, dateParts) { - const dayNames = dateParts.getDayNames(FORMAT_TYPES[count < 3 ? 3 : count], 'format'); - return caseInsensitiveIndexOf(dayNames, text); - }, - a: function(text, count, dateParts) { - const periodNames = dateParts.getPeriodNames(FORMAT_TYPES[count < 3 ? 3 : count], 'format'); - return caseInsensitiveIndexOf(periodNames, text); - }, - d: parseNumber, - H: parseNumber, - h: parseNumber, - m: parseNumber, - s: parseNumber, - S: function(text, count) { - count = Math.max(count, 3); - text = text.slice(0, 3); - while(count < 3) { - text = text + '0'; - count++; - } - return parseNumber(text); - } -}; - -const ORDERED_PATTERNS = ['y', 'M', 'd', 'h', 'm', 's', 'S']; -const PATTERN_SETTERS = { - y: 'setFullYear', - M: 'setMonth', - L: 'setMonth', - a: function(date, value, datePartValues) { - let hours = date.getHours(); - - const hourPartValue = datePartValues['h']; - if(hourPartValue !== undefined && hourPartValue !== hours) { - hours--; - } - - if(!value && hours === 12) { - hours = 0; - } else if(value && hours !== 12) { - hours += 12; - } - - date.setHours(hours); - }, - d: 'setDate', - H: 'setHours', - h: 'setHours', - m: 'setMinutes', - s: 'setSeconds', - S: 'setMilliseconds' -}; - -const getSameCharCount = function(text, index) { - const char = text[index]; - if(!char) { - return 0; - } - let count = 0; - - do { - index++; - count++; - } while(text[index] === char); - - return count; -}; - -const createPattern = function(char, count) { - let result = ''; - for(let i = 0; i < count; i++) { - result += char; - } - return result; -}; - -export const getRegExpInfo = function(format, dateParts) { - let regexpText = ''; - let stubText = ''; - let isEscaping; - const patterns = []; - - const addPreviousStub = function() { - if(stubText) { - patterns.push(`'${stubText}'`); - regexpText += `${escapeRegExp(stubText)})`; - stubText = ''; - } - }; - - for(let i = 0; i < format.length; i++) { - const char = format[i]; - const isEscapeChar = char === '\''; - const regexpPart = PATTERN_REGEXPS[char]; - - if(isEscapeChar) { - isEscaping = !isEscaping; - if(format[i - 1] !== '\'') { - continue; - } - } - - if(regexpPart && !isEscaping) { - const count = getSameCharCount(format, i); - const pattern = createPattern(char, count); - - addPreviousStub(); - patterns.push(pattern); - - regexpText += `(${regexpPart(count, dateParts)})`; - i += count - 1; - } else { - if(!stubText) { - regexpText += '('; - } - stubText += char; - } - } - - addPreviousStub(); - if(!isPossibleForParsingFormat(patterns)) { - logger.warn(`The following format may be parsed incorrectly: ${format}.`); - } - - return { - patterns: patterns, - regexp: new RegExp(`^${regexpText}$`, 'i') - }; -}; - -const digitFieldSymbols = ['d', 'H', 'h', 'm', 's', 'w', 'M', 'L', 'Q']; -export const isPossibleForParsingFormat = function(patterns) { - const isDigitPattern = (pattern) => { - if(!pattern) { - return false; - } - const char = pattern[0]; - return ['y', 'S'].includes(char) || digitFieldSymbols.includes(char) && pattern.length < 3; - }; - - const isAmbiguousDigitPattern = (pattern) => { - return pattern[0] !== 'S' && pattern.length !== 2; - }; - - let possibleForParsing = true; - let ambiguousDigitPatternsCount = 0; - return patterns.every((pattern, index, patterns) => { - if(isDigitPattern(pattern)) { - if(isAmbiguousDigitPattern(pattern)) { - possibleForParsing = (++ambiguousDigitPatternsCount) < 2; - } - if(!isDigitPattern(patterns[index + 1])) { - ambiguousDigitPatternsCount = 0; - } - } - return possibleForParsing; - }); -}; - -export const getPatternSetters = function() { - return PATTERN_SETTERS; -}; - -const setPatternPart = function(date, pattern, text, dateParts, datePartValues) { - const patternChar = pattern[0]; - const partSetter = PATTERN_SETTERS[patternChar]; - const partParser = PATTERN_PARSERS[patternChar]; - - if(partSetter && partParser) { - const value = partParser(text, pattern.length, dateParts); - datePartValues[pattern] = value; - if(date[partSetter]) { - date[partSetter](value); - } else { - partSetter(date, value, datePartValues); - } - } -}; - -const setPatternPartFromNow = function(date, pattern, now) { - const setterName = PATTERN_SETTERS[pattern]; - const getterName = 'g' + setterName.substr(1); - const value = now[getterName](); - date[setterName](value); -}; - -const getShortPatterns = function(fullPatterns) { - return fullPatterns.map(function(pattern) { - if(pattern[0] === '\'') { - return ''; - } else { - return pattern[0] === 'H' ? 'h' : pattern[0]; - } - }); -}; - -const getMaxOrderedPatternIndex = function(patterns) { - const indexes = patterns.map(function(pattern) { - return ORDERED_PATTERNS.indexOf(pattern); - }); - - return Math.max.apply(Math, indexes); -}; - -const getOrderedFormatPatterns = function(formatPatterns) { - const otherPatterns = formatPatterns.filter(function(pattern) { - return ORDERED_PATTERNS.indexOf(pattern) < 0; - }); - - return ORDERED_PATTERNS.concat(otherPatterns); -}; - -export const getParser = function(format, dateParts) { - const regExpInfo = getRegExpInfo(format, dateParts); - - return function(text) { - const regExpResult = regExpInfo.regexp.exec(text); - - if(regExpResult) { - const now = new Date(); - const date = new Date(now.getFullYear(), 0, 1); - const formatPatterns = getShortPatterns(regExpInfo.patterns); - const maxPatternIndex = getMaxOrderedPatternIndex(formatPatterns); - const orderedFormatPatterns = getOrderedFormatPatterns(formatPatterns); - const datePartValues = { }; - - orderedFormatPatterns.forEach(function(pattern, index) { - if(!pattern || (index < ORDERED_PATTERNS.length && index > maxPatternIndex)) { - return; - } - - const patternIndex = formatPatterns.indexOf(pattern); - if(patternIndex >= 0) { - const regExpPattern = regExpInfo.patterns[patternIndex]; - const regExpText = regExpResult[patternIndex + 1]; - setPatternPart(date, regExpPattern, regExpText, dateParts, datePartValues); - } else { - setPatternPartFromNow(date, pattern, now); - } - }); - - return date; - } - - return null; - }; -}; +export * from '../../common/core/localization/ldml/date.parser'; diff --git a/packages/devextreme/js/localization/ldml/number.js b/packages/devextreme/js/localization/ldml/number.js index 180e103fa70d..b4f67195e660 100644 --- a/packages/devextreme/js/localization/ldml/number.js +++ b/packages/devextreme/js/localization/ldml/number.js @@ -1,230 +1 @@ -import { fitIntoRange, multiplyInExponentialForm } from '../../core/utils/math'; -import { toFixed } from '../utils'; - -const DEFAULT_CONFIG = { thousandsSeparator: ',', decimalSeparator: '.' }; -const ESCAPING_CHAR = '\''; -const MAXIMUM_NUMBER_LENGTH = 15; -const PERCENT_EXPONENT_SHIFT = 2; // '1e2' - -function getGroupSizes(formatString) { - return formatString.split(',').slice(1).map(function(str) { - let singleQuotesLeft = 0; - return str.split('').filter(function(char, index) { - singleQuotesLeft += char === '\''; - - const isDigit = char === '#' || char === '0'; - const isInStub = singleQuotesLeft % 2; - return isDigit && !isInStub; - }).length; - }); -} - -function getSignParts(format) { - const signParts = format.split(';'); - - if(signParts.length === 1) { - signParts.push('-' + signParts[0]); - } - - return signParts; -} - -function reverseString(str) { - return str.toString().split('').reverse().join(''); -} - -function isPercentFormat(format) { - return format.indexOf('%') !== -1 && !format.match(/'[^']*%[^']*'/g); -} - -function removeStubs(str) { - return str.replace(/'.+'/g, ''); -} - -function getNonRequiredDigitCount(floatFormat) { - if(!floatFormat) return 0; - const format = removeStubs(floatFormat); - return format.length - format.replace(/[#]/g, '').length; -} - -function getRequiredDigitCount(floatFormat) { - if(!floatFormat) return 0; - const format = removeStubs(floatFormat); - return format.length - format.replace(/[0]/g, '').length; -} - -function normalizeValueString(valuePart, minDigitCount, maxDigitCount) { - if(!valuePart) return ''; - - if(valuePart.length > maxDigitCount) { - valuePart = valuePart.substr(0, maxDigitCount); - } - - while(valuePart.length > minDigitCount && valuePart.slice(-1) === '0') { - valuePart = valuePart.substr(0, valuePart.length - 1); - } - - while(valuePart.length < minDigitCount) { - valuePart += '0'; - } - - return valuePart; -} - -function applyGroups(valueString, groupSizes, thousandsSeparator) { - if(!groupSizes.length) return valueString; - - const groups = []; - let index = 0; - - while(valueString) { - const groupSize = groupSizes[index]; - if(!groupSize) { - break; - } - groups.push(valueString.slice(0, groupSize)); - valueString = valueString.slice(groupSize); - if(index < groupSizes.length - 1) { - index++; - } - } - return groups.join(thousandsSeparator); -} - -function formatNumberPart(format, valueString) { - return format.split(ESCAPING_CHAR).map(function(formatPart, escapeIndex) { - const isEscape = escapeIndex % 2; - if(!formatPart && isEscape) { - return ESCAPING_CHAR; - } - return isEscape ? formatPart : formatPart.replace(/[,#0]+/, valueString); - }).join(''); -} - -function getFloatPointIndex(format) { - let isEscape = false; - - for(let index = 0; index < format.length; index++) { - if(format[index] === '\'') { - isEscape = !isEscape; - } - if(format[index] === '.' && !isEscape) { - return index; - } - } - - return format.length; -} - -export function getFormatter(format, config) { - config = config || DEFAULT_CONFIG; - - return function(value) { - if(typeof value !== 'number' || isNaN(value)) return ''; - - const signFormatParts = getSignParts(format); - const isPositiveZero = 1 / value === Infinity; - const isPositive = value > 0 || isPositiveZero; - const numberFormat = signFormatParts[isPositive ? 0 : 1]; - - const floatPointIndex = getFloatPointIndex(numberFormat); - const floatFormatParts = [numberFormat.substr(0, floatPointIndex), numberFormat.substr(floatPointIndex + 1)]; - const minFloatPrecision = getRequiredDigitCount(floatFormatParts[1]); - const maxFloatPrecision = minFloatPrecision + getNonRequiredDigitCount(floatFormatParts[1]); - - if(isPercentFormat(numberFormat)) { - value = multiplyInExponentialForm(value, PERCENT_EXPONENT_SHIFT); - } - - if(!isPositive) { - value = -value; - } - - const minIntegerPrecision = getRequiredDigitCount(floatFormatParts[0]); - const maxIntegerPrecision = getNonRequiredDigitCount(floatFormatParts[0]) || config.unlimitedIntegerDigits ? undefined : minIntegerPrecision; - const integerLength = Math.floor(value).toString().length; - const floatPrecision = fitIntoRange(maxFloatPrecision, 0, MAXIMUM_NUMBER_LENGTH - integerLength); - const groupSizes = getGroupSizes(floatFormatParts[0]).reverse(); - - const valueParts = toFixed(value, floatPrecision < 0 ? 0 : floatPrecision).split('.'); - - let valueIntegerPart = normalizeValueString(reverseString(valueParts[0]), minIntegerPrecision, maxIntegerPrecision); - const valueFloatPart = normalizeValueString(valueParts[1], minFloatPrecision, maxFloatPrecision); - - valueIntegerPart = applyGroups(valueIntegerPart, groupSizes, config.thousandsSeparator); - - const integerString = reverseString(formatNumberPart(reverseString(floatFormatParts[0]), valueIntegerPart)); - const floatString = maxFloatPrecision ? formatNumberPart(floatFormatParts[1], valueFloatPart) : ''; - - const result = integerString + (floatString.match(/\d/) ? config.decimalSeparator : '') + floatString; - - return result; - }; -} - -function parseValue(text, isPercent, isNegative) { - const value = (isPercent ? 0.01 : 1) * parseFloat(text) || 0; - - return isNegative ? -value : value; -} - -function prepareValueText(valueText, formatter, isPercent, isIntegerPart) { - let nextValueText = valueText; - let char; - let text; - let nextText; - - do { - if(nextText) { - char = text.length === nextText.length ? '0' : '1'; - valueText = isIntegerPart ? char + valueText : valueText + char; - } - text = nextText || formatter(parseValue(nextValueText, isPercent)); - nextValueText = isIntegerPart ? '1' + nextValueText : nextValueText + '1'; - nextText = formatter(parseValue(nextValueText, isPercent)); - } while(text !== nextText && (isIntegerPart ? text.length === nextText.length : text.length <= nextText.length)); - - if(isIntegerPart && nextText.length > text.length) { - const hasGroups = formatter(12345).indexOf('12345') === -1; - do { - valueText = '1' + valueText; - } while(hasGroups && parseValue(valueText, isPercent) < 100000); - } - - return valueText; -} - -function getFormatByValueText(valueText, formatter, isPercent, isNegative) { - let format = formatter(parseValue(valueText, isPercent, isNegative)); - const valueTextParts = valueText.split('.'); - const valueTextWithModifiedFloat = valueTextParts[0] + '.3' + valueTextParts[1].slice(1); - const valueWithModifiedFloat = parseValue(valueTextWithModifiedFloat, isPercent, isNegative); - const decimalSeparatorIndex = formatter(valueWithModifiedFloat).indexOf('3') - 1; - - format = format.replace(/(\d)\D(\d)/g, '$1,$2'); - - if(decimalSeparatorIndex >= 0) { - format = format.slice(0, decimalSeparatorIndex) + '.' + format.slice(decimalSeparatorIndex + 1); - } - - format = format.replace(/1+/, '1').replace(/1/g, '#'); - - if(!isPercent) { - format = format.replace(/%/g, '\'%\''); - } - - return format; -} - -export function getFormat(formatter) { - let valueText = '.'; - const isPercent = formatter(1).indexOf('100') >= 0; - - valueText = prepareValueText(valueText, formatter, isPercent, true); - valueText = prepareValueText(valueText, formatter, isPercent, false); - - const positiveFormat = getFormatByValueText(valueText, formatter, isPercent, false); - const negativeFormat = getFormatByValueText(valueText, formatter, isPercent, true); - - return negativeFormat === '-' + positiveFormat ? positiveFormat : positiveFormat + ';' + negativeFormat; -} +export * from '../../common/core/localization/ldml/number'; diff --git a/packages/devextreme/js/localization/message.d.ts b/packages/devextreme/js/localization/message.d.ts index 35fd53c0e3ca..c01e3600a9bf 100644 --- a/packages/devextreme/js/localization/message.d.ts +++ b/packages/devextreme/js/localization/message.d.ts @@ -1,6 +1,3 @@ -type messageLocalizationType = { - getFormatter(name: string): () => string; - format(name: string): string; -}; -declare const messageLocalization: messageLocalizationType; +import messageLocalization from '../common/core/localization/message'; + export default messageLocalization; diff --git a/packages/devextreme/js/localization/message.js b/packages/devextreme/js/localization/message.js index aa0af71f02f5..fc202dac8e18 100644 --- a/packages/devextreme/js/localization/message.js +++ b/packages/devextreme/js/localization/message.js @@ -1,92 +1 @@ -import dependencyInjector from '../core/utils/dependency_injector'; -import { extend } from '../core/utils/extend'; -import { format as stringFormat } from '../core/utils/string'; -import { humanize } from '../core/utils/inflector'; -import coreLocalization from './core'; -import { defaultMessages } from './default_messages'; - -const baseDictionary = extend(true, {}, defaultMessages); - -const getDataByLocale = (localeData, locale) => { - return localeData[locale] - || (locale?.toLowerCase && Object.entries(localeData).find( - ([key,]) => key.toLowerCase() === locale.toLowerCase())?.[1]) - || {}; -}; - -const newMessages = {}; - -const messageLocalization = dependencyInjector({ - engine: function() { - return 'base'; - }, - - _dictionary: baseDictionary, - - load: function(messages) { - extend(true, this._dictionary, messages); - }, - - _localizablePrefix: '@', - - setup: function(localizablePrefix) { - this._localizablePrefix = localizablePrefix; - }, - - localizeString: function(text) { - const that = this; - const regex = new RegExp('(^|[^a-zA-Z_0-9' + that._localizablePrefix + '-]+)(' + that._localizablePrefix + '{1,2})([a-zA-Z_0-9-]+)', 'g'); - const escapeString = that._localizablePrefix + that._localizablePrefix; - - return text.replace(regex, (str, prefix, escape, localizationKey) => { - const defaultResult = that._localizablePrefix + localizationKey; - let result; - - if(escape !== escapeString) { - result = that.format(localizationKey); - } - - if(!result) { - newMessages[localizationKey] = humanize(localizationKey); - } - - return prefix + (result || defaultResult); - }); - }, - - getMessagesByLocales: function() { - return this._dictionary; - }, - - getDictionary: function(onlyNew) { - if(onlyNew) { - return newMessages; - } - return extend({}, newMessages, this.getMessagesByLocales()[coreLocalization.locale()]); - }, - - getFormatter: function(key) { - return this._getFormatterBase(key) || this._getFormatterBase(key, 'en'); - }, - - _getFormatterBase: function(key, locale) { - const message = coreLocalization.getValueByClosestLocale((locale) => getDataByLocale(this._dictionary, locale)[key]); - - if(message) { - return function() { - const args = arguments.length === 1 && Array.isArray(arguments[0]) ? arguments[0].slice(0) : Array.prototype.slice.call(arguments, 0); - args.unshift(message); - return stringFormat.apply(this, args); - }; - } - }, - - format: function(key) { - const formatter = this.getFormatter(key); - const values = Array.prototype.slice.call(arguments, 1); - - return formatter && formatter.apply(this, values) || ''; - } -}); - -export default messageLocalization; +export { default } from '../common/core/localization/message'; diff --git a/packages/devextreme/js/localization/number.js b/packages/devextreme/js/localization/number.js index 4a5a8330b68c..59f4094dbdc2 100644 --- a/packages/devextreme/js/localization/number.js +++ b/packages/devextreme/js/localization/number.js @@ -1,382 +1 @@ -import dependencyInjector from '../core/utils/dependency_injector'; -import { escapeRegExp } from '../core/utils/common'; -import { each } from '../core/utils/iterator'; -import { isPlainObject } from '../core/utils/type'; -import { getFormatter } from './ldml/number'; -import config from '../core/config'; -import errors from '../core/errors'; -import { toFixed } from './utils'; -import currencyLocalization from './currency'; -import intlNumberLocalization from './intl/number'; - -const hasIntl = typeof Intl !== 'undefined'; -const MAX_LARGE_NUMBER_POWER = 4; -const DECIMAL_BASE = 10; - -const NUMERIC_FORMATS = ['currency', 'fixedpoint', 'exponential', 'percent', 'decimal']; - -const LargeNumberFormatPostfixes = { - 1: 'K', // kilo - 2: 'M', // mega - 3: 'B', // billions - 4: 'T' // tera -}; - -const LargeNumberFormatPowers = { - 'largenumber': 'auto', - 'thousands': 1, - 'millions': 2, - 'billions': 3, - 'trillions': 4 -}; - -const numberLocalization = dependencyInjector({ - engine: function() { - return 'base'; - }, - numericFormats: NUMERIC_FORMATS, - - defaultLargeNumberFormatPostfixes: LargeNumberFormatPostfixes, - - _parseNumberFormatString: function(formatType) { - const formatObject = {}; - - if(!formatType || typeof formatType !== 'string') return; - - const formatList = formatType.toLowerCase().split(' '); - each(formatList, (index, value) => { - if(NUMERIC_FORMATS.includes(value)) { - formatObject.formatType = value; - } else if(value in LargeNumberFormatPowers) { - formatObject.power = LargeNumberFormatPowers[value]; - } - }); - - if(formatObject.power && !formatObject.formatType) { - formatObject.formatType = 'fixedpoint'; - } - - if(formatObject.formatType) { - return formatObject; - } - }, - - _calculateNumberPower: function(value, base, minPower, maxPower) { - let number = Math.abs(value); - let power = 0; - - if(number > 1) { - while(number && number >= base && (maxPower === undefined || power < maxPower)) { - power++; - number = number / base; - } - } else if(number > 0 && number < 1) { - while(number < 1 && (minPower === undefined || power > minPower)) { - power--; - number = number * base; - } - } - - return power; - }, - _getNumberByPower: function(number, power, base) { - let result = number; - - while(power > 0) { - result = result / base; - power--; - } - - while(power < 0) { - result = result * base; - power++; - } - - return result; - }, - _formatNumber: function(value, formatObject, formatConfig) { - if(formatObject.power === 'auto') { - formatObject.power = this._calculateNumberPower(value, 1000, 0, MAX_LARGE_NUMBER_POWER); - } - - if(formatObject.power) { - value = this._getNumberByPower(value, formatObject.power, 1000); - } - - const powerPostfix = this.defaultLargeNumberFormatPostfixes[formatObject.power] || ''; - - let result = this._formatNumberCore(value, formatObject.formatType, formatConfig); - - result = result.replace(/(\d|.$)(\D*)$/, '$1' + powerPostfix + '$2'); - - return result; - }, - - _formatNumberExponential: function(value, formatConfig) { - let power = this._calculateNumberPower(value, DECIMAL_BASE); - let number = this._getNumberByPower(value, power, DECIMAL_BASE); - - if(formatConfig.precision === undefined) { - formatConfig.precision = 1; - } - - if(number.toFixed(formatConfig.precision || 0) >= DECIMAL_BASE) { - power++; - number = number / DECIMAL_BASE; - } - - const powString = (power >= 0 ? '+' : '') + power.toString(); - - return this._formatNumberCore(number, 'fixedpoint', formatConfig) + 'E' + powString; - }, - - _addZeroes: function(value, precision) { - const multiplier = Math.pow(10, precision); - const sign = value < 0 ? '-' : ''; - - value = ((Math.abs(value) * multiplier) >>> 0) / multiplier; - - let result = value.toString(); - while(result.length < precision) { - result = '0' + result; - } - - return sign + result; - }, - - _addGroupSeparators: function(value) { - const parts = value.toString().split('.'); - - return parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, config().thousandsSeparator) + (parts[1] ? config().decimalSeparator + parts[1] : ''); - }, - - _formatNumberCore: function(value, format, formatConfig) { - if(format === 'exponential') { - return this._formatNumberExponential(value, formatConfig); - } - - if(format !== 'decimal' && formatConfig.precision !== null) { - formatConfig.precision = formatConfig.precision || 0; - } - - if(format === 'percent') { - value = value * 100; - } - - if(formatConfig.precision !== undefined) { - if(format === 'decimal') { - value = this._addZeroes(value, formatConfig.precision); - } else { - value = formatConfig.precision === null ? value.toPrecision() : toFixed(value, formatConfig.precision); - } - } - - if(format !== 'decimal') { - value = this._addGroupSeparators(value); - } else { - value = value.toString().replace('.', config().decimalSeparator); - } - - if(format === 'percent') { - value += '%'; - } - - return value; - }, - - _normalizeFormat: function(format) { - if(!format) { - return {}; - } - - if(typeof (format) === 'function') { - return format; - } - - if(!isPlainObject(format)) { - format = { - type: format - }; - } - - return format; - }, - - _getSeparators: function() { - return { - decimalSeparator: this.getDecimalSeparator(), - thousandsSeparator: this.getThousandsSeparator() - }; - }, - - getThousandsSeparator: function() { - return this.format(10000, 'fixedPoint')[2]; - }, - - getDecimalSeparator: function() { - return this.format(1.2, { type: 'fixedPoint', precision: 1 })[1]; - }, - - convertDigits: function(value, toStandard) { - const digits = this.format(90, 'decimal'); - - if(typeof value !== 'string' || digits[1] === '0') { - return value; - } - - const fromFirstDigit = toStandard ? digits[1] : '0'; - const toFirstDigit = toStandard ? '0' : digits[1]; - const fromLastDigit = toStandard ? digits[0] : '9'; - const regExp = new RegExp('[' + fromFirstDigit + '-' + fromLastDigit + ']', 'g'); - - return value.replace(regExp, char => { - return String.fromCharCode(char.charCodeAt(0) + (toFirstDigit.charCodeAt(0) - fromFirstDigit.charCodeAt(0))); - }); - }, - - getNegativeEtalonRegExp: function(format) { - const separators = this._getSeparators(); - const digitalRegExp = new RegExp('[0-9' + escapeRegExp(separators.decimalSeparator + separators.thousandsSeparator) + ']+', 'g'); - const specialCharacters = ['\\', '(', ')', '[', ']', '*', '+', '$', '^', '?', '|', '{', '}']; - - let negativeEtalon = this.format(-1, format).replace(digitalRegExp, '1'); - specialCharacters.forEach(char => { - negativeEtalon = negativeEtalon.replace(new RegExp(`\\${char}`, 'g'), `\\${char}`); - }); - - negativeEtalon = negativeEtalon.replace(/ /g, '\\s'); - negativeEtalon = negativeEtalon.replace(/1/g, '.*'); - return new RegExp(negativeEtalon, 'g'); - }, - - getSign: function(text, format) { - if(!format) { - if(text.replace(/[^0-9-]/g, '').charAt(0) === '-') { - return -1; - } - return 1; - } - - const negativeEtalon = this.getNegativeEtalonRegExp(format); - return text.match(negativeEtalon) ? -1 : 1; - }, - - format: function(value, format) { - if(typeof value !== 'number') { - return value; - } - - if(typeof format === 'number') { - return value; - } - - format = format && format.formatter || format; - - if(typeof format === 'function') { - return format(value); - } - - format = this._normalizeFormat(format); - - if(!format.type) { - format.type = 'decimal'; - } - - const numberConfig = this._parseNumberFormatString(format.type); - - if(!numberConfig) { - const formatterConfig = this._getSeparators(); - formatterConfig.unlimitedIntegerDigits = format.unlimitedIntegerDigits; - return this.convertDigits(getFormatter(format.type, formatterConfig)(value)); - } - - return this._formatNumber(value, numberConfig, format); - }, - - parse: function(text, format) { - if(!text) { - return; - } - - if(format && format.parser) { - return format.parser(text); - } - - text = this.convertDigits(text, true); - - if(format && typeof format !== 'string') { - // Current parser functionality provided as-is and is independent of the most of capabilities of formatter. - errors.log('W0011'); - } - - const decimalSeparator = this.getDecimalSeparator(); - const regExp = new RegExp('[^0-9' + escapeRegExp(decimalSeparator) + ']', 'g'); - const cleanedText = text - .replace(regExp, '') - .replace(decimalSeparator, '.') - .replace(/\.$/g, ''); - - if(cleanedText === '.' || cleanedText === '') { - return null; - } - - if(this._calcSignificantDigits(cleanedText) > 15) { - return NaN; - } - - let parsed = (+cleanedText) * this.getSign(text, format); - - format = this._normalizeFormat(format); - const formatConfig = this._parseNumberFormatString(format.type); - - let power = formatConfig?.power; - - if(power) { - if(power === 'auto') { - const match = text.match(/\d(K|M|B|T)/); - if(match) { - power = Object.keys(LargeNumberFormatPostfixes).find(power => { - return LargeNumberFormatPostfixes[power] === match[1]; - }); - } - } - parsed = parsed * Math.pow(10, (3 * power)); - } - - if(formatConfig?.formatType === 'percent') { - parsed /= 100; - } - - return parsed; - }, - - _calcSignificantDigits: function(text) { - const [ integer, fractional ] = text.split('.'); - const calcDigitsAfterLeadingZeros = digits => { - let index = -1; - for(let i = 0; i < digits.length; i++) { - if(digits[i] !== '0') { - index = i; - break; - } - } - return index > -1 ? digits.length - index : 0; - }; - let result = 0; - if(integer) { - result += calcDigitsAfterLeadingZeros(integer.split('')); - } - if(fractional) { - result += calcDigitsAfterLeadingZeros(fractional.split('').reverse()); - } - return result; - } -}); - -numberLocalization.inject(currencyLocalization); - -if(hasIntl) { - numberLocalization.inject(intlNumberLocalization); -} - -export default numberLocalization; +export { default } from '../common/core/localization/number'; diff --git a/packages/devextreme/js/localization/open_xml_currency_format.js b/packages/devextreme/js/localization/open_xml_currency_format.js index b04dfe28d8bd..b4a352ccba9b 100644 --- a/packages/devextreme/js/localization/open_xml_currency_format.js +++ b/packages/devextreme/js/localization/open_xml_currency_format.js @@ -1,37 +1 @@ -export default (currencySymbol, accountingFormat) => { - if(!accountingFormat) { - return; - } - - let encodedCurrencySymbol = currencySymbol; - if(typeof currencySymbol === 'string') { - encodedCurrencySymbol = ''; - for(let i = 0; i < currencySymbol.length; i++) { - if(currencySymbol[i] !== '$') { - encodedCurrencySymbol += '\\'; - } - encodedCurrencySymbol += currencySymbol[i]; - } - } - - const encodeSymbols = { - '.00': '{0}', - '\'': '\\\'', - '\\(': '\\(', - '\\)': '\\)', - ' ': '\\ ', - '"': '"', - '\\¤': encodedCurrencySymbol - }; - - const result = accountingFormat.split(';'); - for(let i = 0; i < result.length; i++) { - for(const symbol in encodeSymbols) { - if(Object.prototype.hasOwnProperty.call(encodeSymbols, symbol)) { - result[i] = result[i].replace(new RegExp(symbol, 'g'), encodeSymbols[symbol]); - } - } - } - - return result.length === 2 ? result[0] + '_);' + result[1] : result[0]; -}; +export { default } from '../common/core/localization/open_xml_currency_format'; diff --git a/packages/devextreme/js/localization/parentLocale.js b/packages/devextreme/js/localization/parentLocale.js index 58862f431f31..f6cc4d8b7434 100644 --- a/packages/devextreme/js/localization/parentLocale.js +++ b/packages/devextreme/js/localization/parentLocale.js @@ -1,12 +1 @@ -/* eslint-disable import/no-commonjs */ -const PARENT_LOCALE_SEPARATOR = '-'; - -export default (parentLocales, locale) => { - const parentLocale = parentLocales[locale]; - - if(parentLocale) { - return parentLocale !== 'root' && parentLocale; - } - - return locale.substr(0, locale.lastIndexOf(PARENT_LOCALE_SEPARATOR)); -}; +export { default } from '../common/core/localization/parentLocale'; diff --git a/packages/devextreme/js/localization/utils.js b/packages/devextreme/js/localization/utils.js index ca7164e0d1b8..7d27fdde8140 100644 --- a/packages/devextreme/js/localization/utils.js +++ b/packages/devextreme/js/localization/utils.js @@ -1,23 +1 @@ -import { sign, multiplyInExponentialForm } from '../core/utils/math'; - -const DECIMAL_BASE = 10; - -function roundByAbs(value) { - const valueSign = sign(value); - - return valueSign * Math.round(Math.abs(value)); -} - -function adjustValue(value, precision) { - const precisionMultiplier = Math.pow(DECIMAL_BASE, precision); - const intermediateValue = multiplyInExponentialForm(value, precision); - - return roundByAbs(intermediateValue) / precisionMultiplier; -} - -export function toFixed(value, precision) { - const valuePrecision = precision || 0; - const adjustedValue = valuePrecision > 0 ? adjustValue(...arguments) : value; - - return (adjustedValue).toFixed(valuePrecision); -} +export * from '../common/core/localization/utils'; diff --git a/packages/devextreme/js/mobile/hide_callback.js b/packages/devextreme/js/mobile/hide_callback.js index 6f0aa83cef20..70a283bca760 100644 --- a/packages/devextreme/js/mobile/hide_callback.js +++ b/packages/devextreme/js/mobile/hide_callback.js @@ -1,33 +1 @@ -export const hideCallback = (function() { - let callbacks = []; - return { - add: function(callback) { - if(!callbacks.includes(callback)) { - callbacks.push(callback); - } - }, - remove: function(callback) { - const indexOfCallback = callbacks.indexOf(callback); - if(indexOfCallback !== -1) { - callbacks.splice(indexOfCallback, 1); - } - }, - fire: function() { - const callback = callbacks.pop(); - const result = !!callback; - if(result) { - callback(); - } - return result; - }, - hasCallback: function() { - return callbacks.length > 0; - } - ///#DEBUG - // eslint-disable-next-line comma-style - , reset: function() { - callbacks = []; - } - ///#ENDDEBUG - }; -})(); +export * from '../common/core/environment/hide_callback'; diff --git a/packages/devextreme/js/mobile/hide_top_overlay.d.ts b/packages/devextreme/js/mobile/hide_top_overlay.d.ts index a292db6c2e1d..2c333b5ede11 100644 --- a/packages/devextreme/js/mobile/hide_top_overlay.d.ts +++ b/packages/devextreme/js/mobile/hide_top_overlay.d.ts @@ -1,7 +1,3 @@ -/** - * @docid - * @publicName hideTopOverlay() - * @namespace DevExpress - * @public - */ -export default function hideTopOverlay(): boolean; +import { hideTopOverlay } from '../common/core/environment'; + +export default hideTopOverlay; diff --git a/packages/devextreme/js/mobile/hide_top_overlay.js b/packages/devextreme/js/mobile/hide_top_overlay.js index 40b4767a5021..2c333b5ede11 100644 --- a/packages/devextreme/js/mobile/hide_top_overlay.js +++ b/packages/devextreme/js/mobile/hide_top_overlay.js @@ -1,5 +1,3 @@ -import { hideCallback } from './hide_callback'; +import { hideTopOverlay } from '../common/core/environment'; -export default function() { - return hideCallback.fire(); -} +export default hideTopOverlay; diff --git a/packages/devextreme/js/mobile/init_mobile_viewport.d.ts b/packages/devextreme/js/mobile/init_mobile_viewport.d.ts index f05a90738bcd..337826dd1c1b 100644 --- a/packages/devextreme/js/mobile/init_mobile_viewport.d.ts +++ b/packages/devextreme/js/mobile/init_mobile_viewport.d.ts @@ -1,7 +1,3 @@ -/** - * @docid utils.initMobileViewport - * @publicName initMobileViewport(options) - * @namespace DevExpress.utils - * @public - */ -export default function initMobileViewport(options: { allowZoom?: boolean; allowPan?: boolean; allowSelection?: boolean }): void; +import { initMobileViewport } from '../common/core/environment'; + +export default initMobileViewport; diff --git a/packages/devextreme/js/mobile/init_mobile_viewport.js b/packages/devextreme/js/mobile/init_mobile_viewport.js index e653449b86fb..337826dd1c1b 100644 --- a/packages/devextreme/js/mobile/init_mobile_viewport.js +++ b/packages/devextreme/js/mobile/init_mobile_viewport.js @@ -1,2 +1,3 @@ -import { initMobileViewport } from './init_mobile_viewport/init_mobile_viewport'; +import { initMobileViewport } from '../common/core/environment'; + export default initMobileViewport; diff --git a/packages/devextreme/js/mobile/init_mobile_viewport/init_mobile_viewport.js b/packages/devextreme/js/mobile/init_mobile_viewport/init_mobile_viewport.js index 37b7ccfa47f3..d6cba8bb14aa 100644 --- a/packages/devextreme/js/mobile/init_mobile_viewport/init_mobile_viewport.js +++ b/packages/devextreme/js/mobile/init_mobile_viewport/init_mobile_viewport.js @@ -1,95 +1 @@ -import { getWidth, setWidth } from '../../core/utils/size'; -import $ from '../../core/renderer'; -import { getWindow } from '../../core/utils/window'; -const window = getWindow(); -import eventsEngine from '../../events/core/events_engine'; -import { extend } from '../../core/utils/extend'; -import resizeCallbacks from '../../core/utils/resize_callbacks'; -import { styleProp } from '../../core/utils/style'; - -import devices from '../../__internal/core/m_devices'; -import domAdapter from '../../__internal/core/m_dom_adapter'; -import supportUtils from '../../__internal/core/utils/m_support'; - -export const initMobileViewport = function(options) { - options = extend({}, options); - let realDevice = devices.real(); - const allowZoom = options.allowZoom; - const allowPan = options.allowPan; - const allowSelection = ('allowSelection' in options) ? options.allowSelection : realDevice.platform === 'generic'; - - const metaSelector = 'meta[name=viewport]'; - if(!$(metaSelector).length) { - $('').attr('name', 'viewport').appendTo('head'); - } - - const metaVerbs = ['width=device-width']; - const msTouchVerbs = []; - - if(allowZoom) { - msTouchVerbs.push('pinch-zoom'); - } else { - metaVerbs.push('initial-scale=1.0', 'maximum-scale=1.0, user-scalable=no'); - } - - if(allowPan) { - msTouchVerbs.push('pan-x', 'pan-y'); - } - - if(!allowPan && !allowZoom) { - $('html, body').css({ - 'msContentZooming': 'none', - 'msUserSelect': 'none', - 'overflow': 'hidden' - }); - } else { - $('html').css('msOverflowStyle', '-ms-autohiding-scrollbar'); - } - - if(!allowSelection && supportUtils.supportProp('userSelect')) { - $('.dx-viewport').css(styleProp('userSelect'), 'none'); - } - - $(metaSelector).attr('content', metaVerbs.join()); - $('html').css('msTouchAction', msTouchVerbs.join(' ') || 'none'); - - realDevice = devices.real(); - - if(supportUtils.touch) { - eventsEngine.off(domAdapter.getDocument(), '.dxInitMobileViewport'); - eventsEngine.on(domAdapter.getDocument(), 'dxpointermove.dxInitMobileViewport', function(e) { - const count = e.pointers.length; - const isTouchEvent = e.pointerType === 'touch'; - const zoomDisabled = !allowZoom && count > 1; - const panDisabled = !allowPan && count === 1 && !e.isScrollingEvent; - - if(isTouchEvent && (zoomDisabled || panDisabled)) { - e.preventDefault(); - } - }); - } - - if(realDevice.ios) { - const isPhoneGap = (domAdapter.getLocation().protocol === 'file:'); - - if(!isPhoneGap) { - // NOTE: fix app size after device rotation in Safari when keyboard was shown - resizeCallbacks.add(function() { - const windowWidth = getWidth(window); - setWidth($('body'), windowWidth); - }); - } - } - - if(realDevice.android) { - resizeCallbacks.add(function() { - setTimeout(function() { - const activeElement = domAdapter.getActiveElement(); - - activeElement.scrollIntoViewIfNeeded ? - activeElement.scrollIntoViewIfNeeded() : - activeElement.scrollIntoView(false); - }); - }); - } -}; +export * from '../../common/core/environment/init_mobile_viewport/init_mobile_viewport'; diff --git a/packages/devextreme/js/pdf_exporter.d.ts b/packages/devextreme/js/pdf_exporter.d.ts index c84402838790..c13c297b203e 100644 --- a/packages/devextreme/js/pdf_exporter.d.ts +++ b/packages/devextreme/js/pdf_exporter.d.ts @@ -1,374 +1,22 @@ -import { DxPromise } from './core/utils/deferred'; -import dxDataGrid from './ui/data_grid'; -import { ExportLoadPanel } from './exporter/export_load_panel'; -import dxGantt, { - GanttPdfExportMode, - GanttPdfExportDateRange, -} from './ui/gantt'; import { - DataGridCell as ExcelCell, -} from './excel_exporter'; - -/** - * @public - * @namespace DevExpress.pdfExporter - */ -export type DataGridCell = PdfDataGridCell; - - /** - * @namespace DevExpress.pdfExporter - * @deprecated Use DataGridCell instead - */ -export interface PdfDataGridCell extends ExcelCell {} - -/** - * @public - * @docid PdfCell - * @namespace DevExpress.pdfExporter - */ -export interface Cell { - /** - * @docid PdfCell.backgroundColor - * @default '#FFFFFF' - * @public - */ - backgroundColor?: string; - /** - * @docid PdfCell.borderColor - * @default '#979797' - * @public - */ - borderColor?: string; - /** - * @docid PdfCell.borderWidth - * @default 0.5 - * @public - */ - borderWidth?: number; - /** - * @docid PdfCell.drawLeftBorder - * @public - */ - drawLeftBorder?: boolean; - /** - * @docid PdfCell.drawTopBorder - * @public - */ - drawTopBorder?: boolean; - /** - * @docid PdfCell.drawRightBorder - * @public - */ - drawRightBorder?: boolean; - /** - * @docid PdfCell.drawBottomBorder - * @public - */ - drawBottomBorder?: boolean; - /** - * @docid PdfCell.font - * @public - */ - font?: { - /** - * @docid PdfCell.font.size - * @default 10 - * @public - */ - size?: number; - /** - * @docid PdfCell.font.name - * @public - */ - name?: string; - /** - * @docid PdfCell.font.style - * @default 'normal' - * @public - */ - style?: 'normal' | 'bold' | 'italic'; - }; - /** - * @docid PdfCell.horizontalAlign - * @public - */ - horizontalAlign?: 'left' | 'center' | 'right'; - /** - * @docid PdfCell.padding - * @public - */ - padding?: { - /** - * @docid PdfCell.padding.top - * @public - */ - top?: number; - /** - * @docid PdfCell.padding.left - * @public - */ - left?: number; - /** - * @docid PdfCell.padding.right - * @public - */ - right?: number; - /** - * @docid PdfCell.padding.bottom - * @public - */ - bottom?: number; - }; - /** - * @docid PdfCell.text - * @public - */ - text?: string; - /** - * @docid PdfCell.textColor - * @default '#000000' - * @public - */ - textColor?: string; - /** - * @docid PdfCell.verticalAlign - * @default 'middle' - * @public - */ - verticalAlign?: 'top' | 'middle' | 'bottom'; - /** - * @docid PdfCell.wordWrapEnabled - * @public - */ - wordWrapEnabled?: boolean; -} - -/** - * @docid - * @namespace DevExpress.pdfExporter - */ -export interface PdfExportDataGridProps { - /** - * @docid - * @default undefined - * @public - */ - jsPDFDocument?: object | undefined; - /** - * @docid - * @default undefined - * @public - */ - component?: dxDataGrid | undefined; - /** - * @docid - * @public - */ - topLeft?: { - /** - * @docid - * @default 0 - * @public - */ - x?: number; - /** - * @docid - * @default 0 - * @public - */ - y?: number; - }; - /** - * @docid - * @default undefined - * @public - */ - columnWidths?: Array | undefined; - /** - * @docid - * @default 0 - * @public - */ - indent?: number; - /** - * @docid - * @public - */ - margin?: { - /** - * @docid - * @public - */ - top?: number; - /** - * @docid - * @public - */ - left?: number; - /** - * @docid - * @public - */ - right?: number; - /** - * @docid - * @public - */ - bottom?: number; - }; - /** - * @docid - * @default true - * @public - */ - repeatHeaders?: boolean; - /** - * @docid - * @default false - * @public - */ - selectedRowsOnly?: boolean; - /** - * @docid - * @type_function_param1_field gridCell:PdfDataGridCell - * @type_function_param1_field pdfCell:PdfCell - * @type_function_param1_field doc:object - * @public - */ - customDrawCell?: ((options: { gridCell?: DataGridCell; pdfCell?: Cell; doc?: any; rect?: { x: number; y: number; h: number; w: number }; cancel?: boolean }) => void); - /** - * @docid - * @type_function_param1_field gridCell:PdfDataGridCell - * @type_function_param1_field pdfCell:PdfCell - * @public - */ - customizeCell?: ((options: { gridCell?: DataGridCell; pdfCell?: Cell }) => void); - /** - * @docid - * @type_function_param1_field rowCells:Array - * @public - */ - onRowExporting?: ((options: { rowCells?: Array; rowHeight?: number }) => void); - /** - * @docid - * @public - */ - loadPanel?: ExportLoadPanel; -} - -/** - * @docid pdfExporter.exportDataGrid - * @publicName exportDataGrid(options) - * @return Promise - * @namespace DevExpress.pdfExporter - * @static - * @public - */ -export function exportDataGrid(options: PdfExportDataGridProps): DxPromise; - -/** - * @docid - * @namespace DevExpress.pdfExporter - */ -export interface PdfExportGanttProps { - /** - * @docid - * @type_function_param1 options:object - * @public - */ - createDocumentMethod?: ((options: any) => object); - /** - * @docid - * @default undefined - * @public - */ - jsPDFDocument?: object | undefined; - /** - * @docid - * @default undefined - * @public - */ - component?: dxGantt | undefined; - /** - * @docid - * @default undefined - * @public - */ - format?: string | object | undefined; - /** - * @docid - * @default true - * @public - */ - landscape?: boolean; - /** - * @docid - * @default undefined - * @public - */ - fileName?: string | undefined; - /** - * @docid - * @default undefined - * @public - */ - margins?: object | undefined; - /** - * @docid - * @default 'all' - * @public - */ - exportMode?: GanttPdfExportMode; - /** - * @docid - * @public - */ - dateRange?: GanttPdfExportDateRange | object; - /** - * @docid - * @public - */ - font?: PdfExportGanttFont; -} - -/** - * @docid - */ -export interface PdfExportGanttFont { - /** - * @docid - * @default undefined - * @public - */ - fontObject: object | undefined; - /** - * @docid - * @default undefined - * @public - */ - name: string | undefined; - /** - * @docid - * @default 'normal' - * @acceptValues "bold" | "normal" | "italic" - * @public - */ - style?: string; - /** - * @docid - * @default undefined - * @acceptValues "normal" | "bold" | 400 | 700 - * @public - */ - weight?: string | number | undefined; -} - -/** - * @docid pdfExporter.exportGantt - * @publicName exportGantt(options) - * @return Promise - * @namespace DevExpress.pdfExporter - * @static - * @public - */ -export function exportGantt(options: PdfExportGanttProps): DxPromise; + DataGridCell, + Cell, + exportDataGrid, + exportGantt, + GanttExportFont, + DataGridExportOptions, + GanttExportOptions, +} from './common/export/pdf'; + +import { PdfDataGridCell } from './pdf_exporter.types'; + +export { + DataGridCell, + Cell, + exportDataGrid, + exportGantt, + GanttExportFont as PdfExportGanttFont, + DataGridExportOptions as PdfExportDataGridProps, + GanttExportOptions as PdfExportGanttProps, + PdfDataGridCell, +}; diff --git a/packages/devextreme/js/pdf_exporter.js b/packages/devextreme/js/pdf_exporter.js index 47aeeefad84c..e4c51779877d 100644 --- a/packages/devextreme/js/pdf_exporter.js +++ b/packages/devextreme/js/pdf_exporter.js @@ -1,18 +1,8 @@ -import { exportDataGrid } from './exporter/jspdf/export_data_grid'; -import { exportDataGrid as exportDataGridWithAutoTable } from './exporter/jspdf/autotable/export_data_grid'; -import { exportGantt } from './exporter/jspdf/export_gantt'; - -/** - * @name PdfDataGridCell - * @inherits ExcelDataGridCell - */ - -/** -* @name pdfExporter -* @section utils -*/ export { + exportGantt, exportDataGrid, - exportDataGridWithAutoTable, - exportGantt -}; +} from './common/export/pdf'; + +export { + exportDataGrid as exportDataGridWithAutoTable, +} from './exporter/jspdf/autotable/export_data_grid'; diff --git a/packages/devextreme/js/pdf_exporter.types.d.ts b/packages/devextreme/js/pdf_exporter.types.d.ts new file mode 100644 index 000000000000..cdc4b7fe1994 --- /dev/null +++ b/packages/devextreme/js/pdf_exporter.types.d.ts @@ -0,0 +1,9 @@ +import { + DataGridCell as ExcelCell, +} from './common/export/excel'; + +/** + * @namespace DevExpress.pdfExporter + * @deprecated Use DataGridCell instead + */ +export interface PdfDataGridCell extends ExcelCell {} diff --git a/packages/devextreme/js/time_zone_utils.d.ts b/packages/devextreme/js/time_zone_utils.d.ts index 621a32cd4d41..afbc768f5fe5 100644 --- a/packages/devextreme/js/time_zone_utils.d.ts +++ b/packages/devextreme/js/time_zone_utils.d.ts @@ -1,28 +1,4 @@ -/** - * @docid - * @public - */ -export interface dxSchedulerTimeZone { - /** - * @docid - */ - id: string; - /** - * @docid - */ - offset: number; - /** - * @docid - */ - title: string; -} - -/** - * @docid utils.getTimeZones - * @publicName getTimeZones(date) - * @param1 date:Date|undefined - * @namespace DevExpress.utils - * @static - * @public - */ -export function getTimeZones(date?: Date): Array; +export { + getTimeZones, + SchedulerTimeZone as dxSchedulerTimeZone, +} from './common/core/environment'; diff --git a/packages/devextreme/js/time_zone_utils.js b/packages/devextreme/js/time_zone_utils.js index e959a19f83c2..b88a0df88d76 100644 --- a/packages/devextreme/js/time_zone_utils.js +++ b/packages/devextreme/js/time_zone_utils.js @@ -1,3 +1 @@ -import timeZoneUtils from './__internal/scheduler/m_utils_time_zone'; - -export const getTimeZones = timeZoneUtils.getTimeZones; +export { getTimeZones } from './common/core/environment'; diff --git a/packages/devextreme/js/ui/accordion.d.ts b/packages/devextreme/js/ui/accordion.d.ts index ccccfa8e8e64..f9a0c03411bb 100644 --- a/packages/devextreme/js/ui/accordion.d.ts +++ b/packages/devextreme/js/ui/accordion.d.ts @@ -6,7 +6,7 @@ import { import { template, -} from '../core/templates/template'; +} from '../common'; import { DxPromise, @@ -18,7 +18,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import CollectionWidget, { CollectionWidgetItem, diff --git a/packages/devextreme/js/ui/action_sheet.d.ts b/packages/devextreme/js/ui/action_sheet.d.ts index f8415c1c7aca..58ca7254a967 100644 --- a/packages/devextreme/js/ui/action_sheet.d.ts +++ b/packages/devextreme/js/ui/action_sheet.d.ts @@ -14,7 +14,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import CollectionWidget, { CollectionWidgetItem, diff --git a/packages/devextreme/js/ui/autocomplete.d.ts b/packages/devextreme/js/ui/autocomplete.d.ts index b83d05497b9b..f62990b9d195 100644 --- a/packages/devextreme/js/ui/autocomplete.d.ts +++ b/packages/devextreme/js/ui/autocomplete.d.ts @@ -4,7 +4,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import dxDropDownList, { dxDropDownListOptions, diff --git a/packages/devextreme/js/ui/box.d.ts b/packages/devextreme/js/ui/box.d.ts index 2d2dd46f805d..f180e8cc66cb 100644 --- a/packages/devextreme/js/ui/box.d.ts +++ b/packages/devextreme/js/ui/box.d.ts @@ -6,7 +6,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import CollectionWidget, { CollectionWidgetItem, diff --git a/packages/devextreme/js/ui/button.d.ts b/packages/devextreme/js/ui/button.d.ts index 6002849771f7..b7ad4e77c1ce 100644 --- a/packages/devextreme/js/ui/button.d.ts +++ b/packages/devextreme/js/ui/button.d.ts @@ -5,24 +5,21 @@ import { import { template, -} from '../core/templates/template'; + ButtonType, + ButtonStyle, +} from '../common'; import { EventInfo, NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import Widget, { WidgetOptions, } from './widget/ui.widget'; -import { - ButtonType, - ButtonStyle, -} from '../common'; - export { ButtonType, ButtonStyle, diff --git a/packages/devextreme/js/ui/button_group.d.ts b/packages/devextreme/js/ui/button_group.d.ts index 9d4ce383459d..c8b256f5b0df 100644 --- a/packages/devextreme/js/ui/button_group.d.ts +++ b/packages/devextreme/js/ui/button_group.d.ts @@ -5,7 +5,10 @@ import { import { template, -} from '../core/templates/template'; + ButtonType, + ButtonStyle, + SingleMultipleOrNone, +} from '../common'; import { EventInfo, @@ -13,7 +16,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import { CollectionWidgetItem, @@ -24,12 +27,6 @@ import Widget, { WidgetOptions, } from './widget/ui.widget'; -import { - ButtonType, - ButtonStyle, - SingleMultipleOrNone, -} from '../common'; - export { ButtonType, ButtonStyle, diff --git a/packages/devextreme/js/ui/calendar.d.ts b/packages/devextreme/js/ui/calendar.d.ts index 36b05d2c476d..a2d626d953cb 100644 --- a/packages/devextreme/js/ui/calendar.d.ts +++ b/packages/devextreme/js/ui/calendar.d.ts @@ -8,21 +8,18 @@ import { EventInfo, InitializedEventInfo, NativeEventInfo, -} from '../events/index'; +} from '../common/core/events'; import { template, -} from '../core/templates/template'; + FirstDayOfWeek, +} from '../common'; import Editor, { ValueChangedInfo, EditorOptions, } from './editor/editor'; -import { - FirstDayOfWeek, -} from '../common'; - export { FirstDayOfWeek, }; diff --git a/packages/devextreme/js/ui/chat.d.ts b/packages/devextreme/js/ui/chat.d.ts index 425befb69287..54ad51e07b0f 100644 --- a/packages/devextreme/js/ui/chat.d.ts +++ b/packages/devextreme/js/ui/chat.d.ts @@ -1,6 +1,6 @@ import { Format, -} from '../localization'; +} from '../common/core/localization'; import { UserDefinedElement, @@ -9,7 +9,7 @@ import { import { template, -} from '../core/templates/template'; +} from '../common'; import Widget, { WidgetOptions } from './widget/ui.widget'; import { @@ -17,7 +17,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import DataSource, { DataSourceLike } from '../data/data_source'; /** diff --git a/packages/devextreme/js/ui/check_box.d.ts b/packages/devextreme/js/ui/check_box.d.ts index 131bc27fcfcb..07eb72bd5d5c 100644 --- a/packages/devextreme/js/ui/check_box.d.ts +++ b/packages/devextreme/js/ui/check_box.d.ts @@ -3,7 +3,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import Editor, { EditorOptions, diff --git a/packages/devextreme/js/ui/collection/ui.collection_widget.base.d.ts b/packages/devextreme/js/ui/collection/ui.collection_widget.base.d.ts index ee2df9161cfe..81845353ca8a 100644 --- a/packages/devextreme/js/ui/collection/ui.collection_widget.base.d.ts +++ b/packages/devextreme/js/ui/collection/ui.collection_widget.base.d.ts @@ -5,7 +5,7 @@ import { import { template, -} from '../../core/templates/template'; +} from '../../common'; import DataSource, { DataSourceLike } from '../../data/data_source'; @@ -14,7 +14,7 @@ import { NativeEventInfo, ItemInfo, AsyncCancelable, -} from '../../events/index'; +} from '../../common/core/events'; import Widget, { WidgetOptions, diff --git a/packages/devextreme/js/ui/color_box.d.ts b/packages/devextreme/js/ui/color_box.d.ts index 35b9855eb355..f4c2ab026577 100644 --- a/packages/devextreme/js/ui/color_box.d.ts +++ b/packages/devextreme/js/ui/color_box.d.ts @@ -8,11 +8,12 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { template, -} from '../core/templates/template'; + ApplyValueMode, +} from '../common'; import dxDropDownEditor, { dxDropDownEditorOptions, @@ -27,10 +28,6 @@ import { Properties as PopupProperties, } from './popup'; -import { - ApplyValueMode, -} from '../common'; - /** * @docid _ui_color_box_ChangeEvent * @public diff --git a/packages/devextreme/js/ui/context_menu.d.ts b/packages/devextreme/js/ui/context_menu.d.ts index a84ed0e002b3..554f592e594a 100644 --- a/packages/devextreme/js/ui/context_menu.d.ts +++ b/packages/devextreme/js/ui/context_menu.d.ts @@ -1,7 +1,7 @@ import { DataSourceLike } from '../data/data_source'; import { PositionConfig, -} from '../animation/position'; +} from '../common/core/animation'; import { UserDefinedElement, @@ -12,14 +12,15 @@ import { } from '../core/utils/deferred'; import { - DxEvent, Cancelable, EventInfo, NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; + +import { DxEvent } from '../events'; import dxMenuBase, { dxMenuBaseOptions, diff --git a/packages/devextreme/js/ui/context_menu/ui.menu_base.d.ts b/packages/devextreme/js/ui/context_menu/ui.menu_base.d.ts index aaf33396145e..27b3d4ff9b6f 100644 --- a/packages/devextreme/js/ui/context_menu/ui.menu_base.d.ts +++ b/packages/devextreme/js/ui/context_menu/ui.menu_base.d.ts @@ -1,7 +1,7 @@ import { DataSourceLike } from '../../data/data_source'; import { AnimationConfig, -} from '../../animation/fx'; +} from '../../common/core/animation'; import HierarchicalCollectionWidget, { HierarchicalCollectionWidgetOptions, diff --git a/packages/devextreme/js/ui/data_grid.d.ts b/packages/devextreme/js/ui/data_grid.d.ts index d6c9816cca23..bd141435d065 100644 --- a/packages/devextreme/js/ui/data_grid.d.ts +++ b/packages/devextreme/js/ui/data_grid.d.ts @@ -1,5 +1,4 @@ -import DataSource, { -} from '../data/data_source'; +import { DataSource } from '../common/data'; import { UserDefinedElement, @@ -13,7 +12,13 @@ import { import { template, -} from '../core/templates/template'; + HorizontalAlignment, + Mode, + Scrollable, + SelectAllMode, + SortOrder, + ToolbarItemLocation, +} from '../common'; import { Cancelable, @@ -21,7 +26,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { dxToolbarItem, @@ -34,15 +39,6 @@ import { Format, } from '../localization'; -import { - HorizontalAlignment, - Mode, - Scrollable, - SelectAllMode, - SortOrder, - ToolbarItemLocation, -} from '../common'; - import { AdaptiveDetailRowPreparingInfo, ColumnBase as ComponentColumnBase, diff --git a/packages/devextreme/js/ui/date_box.d.ts b/packages/devextreme/js/ui/date_box.d.ts index c578f9705e3f..2359b3e439f8 100644 --- a/packages/devextreme/js/ui/date_box.d.ts +++ b/packages/devextreme/js/ui/date_box.d.ts @@ -4,7 +4,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { ComponentDisabledDate, diff --git a/packages/devextreme/js/ui/date_range_box.d.ts b/packages/devextreme/js/ui/date_range_box.d.ts index 4e32102d3958..17198fb90abf 100644 --- a/packages/devextreme/js/ui/date_range_box.d.ts +++ b/packages/devextreme/js/ui/date_range_box.d.ts @@ -3,7 +3,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { DxElement, diff --git a/packages/devextreme/js/ui/defer_rendering.d.ts b/packages/devextreme/js/ui/defer_rendering.d.ts index b25c5c73fee7..59fea5aeb387 100644 --- a/packages/devextreme/js/ui/defer_rendering.d.ts +++ b/packages/devextreme/js/ui/defer_rendering.d.ts @@ -1,12 +1,12 @@ import { AnimationConfig, -} from '../animation/fx'; +} from '../common/core/animation'; import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import Widget, { WidgetOptions, diff --git a/packages/devextreme/js/ui/diagram.d.ts b/packages/devextreme/js/ui/diagram.d.ts index aa19468c161f..47e5629894ee 100644 --- a/packages/devextreme/js/ui/diagram.d.ts +++ b/packages/devextreme/js/ui/diagram.d.ts @@ -6,24 +6,21 @@ import { import { template, -} from '../core/templates/template'; + Orientation, + PageOrientation, + ToolbarItemLocation, +} from '../common'; import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import Widget, { WidgetOptions, } from './widget/ui.widget'; -import { - Orientation, - PageOrientation, - ToolbarItemLocation, -} from '../common'; - /** * @public * @namespace DevExpress.ui.dxDiagram diff --git a/packages/devextreme/js/ui/diagram/diagram.commands_manager.js b/packages/devextreme/js/ui/diagram/diagram.commands_manager.js index 8bc38b7db5a5..f629f72ec95d 100644 --- a/packages/devextreme/js/ui/diagram/diagram.commands_manager.js +++ b/packages/devextreme/js/ui/diagram/diagram.commands_manager.js @@ -3,7 +3,7 @@ import { fileSaver } from '../../exporter/file_saver'; import { isFunction } from '../../core/utils/type'; import { getWindow } from '../../core/utils/window'; import { extend } from '../../core/utils/extend'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; const SEPARATOR = 'separator'; const SEPARATOR_COMMAND = { widget: SEPARATOR }; diff --git a/packages/devextreme/js/ui/diagram/diagram.items_option.js b/packages/devextreme/js/ui/diagram/diagram.items_option.js index b1a2bc3c9851..2ae6694bdbe3 100644 --- a/packages/devextreme/js/ui/diagram/diagram.items_option.js +++ b/packages/devextreme/js/ui/diagram/diagram.items_option.js @@ -1,6 +1,6 @@ import { extend } from '../../core/utils/extend'; import { Component } from '../../core/component'; -import DataHelperMixin from '../../data_helper'; +import DataHelperMixin from '../../common/data/data_helper'; const ItemsOptionBase = Component.inherit({}).include(DataHelperMixin); diff --git a/packages/devextreme/js/ui/diagram/diagram.toolbox_manager.js b/packages/devextreme/js/ui/diagram/diagram.toolbox_manager.js index ccc9541dc75f..a63f31fbf31f 100644 --- a/packages/devextreme/js/ui/diagram/diagram.toolbox_manager.js +++ b/packages/devextreme/js/ui/diagram/diagram.toolbox_manager.js @@ -1,4 +1,4 @@ -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; const DiagramToolboxManager = { getDefaultGroups() { diff --git a/packages/devextreme/js/ui/diagram/ui.diagram.dialog_manager.js b/packages/devextreme/js/ui/diagram/ui.diagram.dialog_manager.js index 5142203af7a8..b148918f36cb 100644 --- a/packages/devextreme/js/ui/diagram/ui.diagram.dialog_manager.js +++ b/packages/devextreme/js/ui/diagram/ui.diagram.dialog_manager.js @@ -1,6 +1,6 @@ import $ from '../../core/renderer'; import { getDiagram } from './diagram.importer'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import FileUploader from '../file_uploader'; import { getWindow } from '../../core/utils/window'; diff --git a/packages/devextreme/js/ui/diagram/ui.diagram.dialogs.js b/packages/devextreme/js/ui/diagram/ui.diagram.dialogs.js index d1b45ff7851f..63aed4ebbf5d 100644 --- a/packages/devextreme/js/ui/diagram/ui.diagram.dialogs.js +++ b/packages/devextreme/js/ui/diagram/ui.diagram.dialogs.js @@ -1,6 +1,6 @@ import $ from '../../core/renderer'; import Widget from '../widget/ui.widget'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import Popup from '../popup/ui.popup'; import { extend } from '../../core/utils/extend'; diff --git a/packages/devextreme/js/ui/diagram/ui.diagram.js b/packages/devextreme/js/ui/diagram/ui.diagram.js index d0bb7bfd93a5..d6fcf75e9385 100644 --- a/packages/devextreme/js/ui/diagram/ui.diagram.js +++ b/packages/devextreme/js/ui/diagram/ui.diagram.js @@ -6,14 +6,14 @@ import registerComponent from '../../core/component_registrator'; import { extend } from '../../core/utils/extend'; import { isFunction, isDefined } from '../../core/utils/type'; import { compileSetter, compileGetter } from '../../core/utils/data'; -import positionUtils from '../../animation/position'; +import positionUtils from '../../common/core/animation/position'; import { getDiagram } from './diagram.importer'; import { getWindow, hasWindow } from '../../core/utils/window'; import { getPublicElement } from '../../core/element'; -import eventsEngine from '../../events/core/events_engine'; -import { addNamespace } from '../../events/utils/index'; -import messageLocalization from '../../localization/message'; -import numberLocalization from '../../localization/number'; +import eventsEngine from '../../common/core/events/core/events_engine'; +import { addNamespace } from '../../common/core/events/utils/index'; +import messageLocalization from '../../common/core/localization/message'; +import numberLocalization from '../../common/core/localization/number'; import * as zIndexPool from '../../__internal/ui/overlay/m_z_index'; import Overlay from '../overlay/ui.overlay'; diff --git a/packages/devextreme/js/ui/diagram/ui.diagram.panel.js b/packages/devextreme/js/ui/diagram/ui.diagram.panel.js index 1c80f4e69635..437d008446ee 100644 --- a/packages/devextreme/js/ui/diagram/ui.diagram.panel.js +++ b/packages/devextreme/js/ui/diagram/ui.diagram.panel.js @@ -1,8 +1,8 @@ import $ from '../../core/renderer'; import Widget from '../widget/ui.widget'; -import eventsEngine from '../../events/core/events_engine'; -import { addNamespace } from '../../events/utils/index'; -import pointerEvents from '../../events/pointer'; +import eventsEngine from '../../common/core/events/core/events_engine'; +import { addNamespace } from '../../common/core/events/utils/index'; +import pointerEvents from '../../common/core/events/pointer'; const POINTERUP_EVENT_NAME = addNamespace(pointerEvents.up, 'dxDiagramPanel'); const PREVENT_REFOCUS_SELECTOR = '.dx-textbox'; diff --git a/packages/devextreme/js/ui/diagram/ui.diagram.toolbox.js b/packages/devextreme/js/ui/diagram/ui.diagram.toolbox.js index 6d2111f7e48b..58c444b77add 100644 --- a/packages/devextreme/js/ui/diagram/ui.diagram.toolbox.js +++ b/packages/devextreme/js/ui/diagram/ui.diagram.toolbox.js @@ -3,7 +3,7 @@ import $ from '../../core/renderer'; import { extend } from '../../core/utils/extend'; import { hasWindow } from '../../core/utils/window'; import { Deferred } from '../../core/utils/deferred'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import TextBox from '../text_box'; import Accordion from '../accordion'; import ScrollView from '../scroll_view'; diff --git a/packages/devextreme/js/ui/draggable.d.ts b/packages/devextreme/js/ui/draggable.d.ts index bcc92b2ae0b9..0ef8e6023ce4 100644 --- a/packages/devextreme/js/ui/draggable.d.ts +++ b/packages/devextreme/js/ui/draggable.d.ts @@ -9,7 +9,8 @@ import { import { template, -} from '../core/templates/template'; + DragDirection, +} from '../common'; import { Cancelable, @@ -17,14 +18,10 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import dxSortable from './sortable'; -import { - DragDirection, -} from '../common'; - /** * @namespace DevExpress.ui * @docid diff --git a/packages/devextreme/js/ui/drawer.d.ts b/packages/devextreme/js/ui/drawer.d.ts index 4581c95ace2e..c17ff8c8ddb9 100644 --- a/packages/devextreme/js/ui/drawer.d.ts +++ b/packages/devextreme/js/ui/drawer.d.ts @@ -8,14 +8,15 @@ import { import { template, -} from '../core/templates/template'; +} from '../common'; import { - DxEvent, EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; + +import { DxEvent } from '../events'; import Widget, { WidgetOptions, diff --git a/packages/devextreme/js/ui/drop_down_box.d.ts b/packages/devextreme/js/ui/drop_down_box.d.ts index fbd490fadcc8..3ca54c38b2f7 100644 --- a/packages/devextreme/js/ui/drop_down_box.d.ts +++ b/packages/devextreme/js/ui/drop_down_box.d.ts @@ -5,7 +5,7 @@ import { import { template, -} from '../core/templates/template'; +} from '../common'; import DataSource, { DataSourceLike } from '../data/data_source'; @@ -14,7 +14,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import dxDropDownEditor, { dxDropDownEditorOptions, diff --git a/packages/devextreme/js/ui/drop_down_button.d.ts b/packages/devextreme/js/ui/drop_down_button.d.ts index 0a9b0783e588..23a84c41e53e 100644 --- a/packages/devextreme/js/ui/drop_down_button.d.ts +++ b/packages/devextreme/js/ui/drop_down_button.d.ts @@ -1,6 +1,7 @@ import { ButtonType, ButtonStyle, + template, } from '../common'; import { @@ -12,10 +13,6 @@ import { DxPromise, } from '../core/utils/deferred'; -import { - template, -} from '../core/templates/template'; - import DataSource, { DataSourceLike } from '../data/data_source'; import { @@ -23,7 +20,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { Item as dxListItem, diff --git a/packages/devextreme/js/ui/drop_down_editor/ui.drop_down_editor.d.ts b/packages/devextreme/js/ui/drop_down_editor/ui.drop_down_editor.d.ts index dd6084994fe5..698bec39036e 100644 --- a/packages/devextreme/js/ui/drop_down_editor/ui.drop_down_editor.d.ts +++ b/packages/devextreme/js/ui/drop_down_editor/ui.drop_down_editor.d.ts @@ -5,7 +5,11 @@ import { import { template, -} from '../../core/templates/template'; + ApplyValueMode, + Mode, + Position, + TextEditorButton, +} from '../../common'; import dxTextBox, { dxTextBoxOptions, @@ -21,14 +25,7 @@ import { import { EventInfo, -} from '../../events/index'; - -import { - ApplyValueMode, - Mode, - Position, - TextEditorButton, -} from '../../common'; +} from '../../common/core/events'; /** @public */ export type DropDownPredefinedButton = 'clear' | 'dropDown'; diff --git a/packages/devextreme/js/ui/drop_down_editor/ui.drop_down_list.d.ts b/packages/devextreme/js/ui/drop_down_editor/ui.drop_down_list.d.ts index 2541e1649b7c..194d825e4613 100644 --- a/packages/devextreme/js/ui/drop_down_editor/ui.drop_down_list.d.ts +++ b/packages/devextreme/js/ui/drop_down_editor/ui.drop_down_list.d.ts @@ -5,15 +5,16 @@ import { import { template, -} from '../../core/templates/template'; + SimplifiedSearchMode, +} from '../../common'; -import DataSource from '../../data/data_source'; +import { DataSource } from '../../common/data'; import { EventInfo, NativeEventInfo, ItemInfo, -} from '../../events/index'; +} from '../../common/core/events'; import { ValueChangedInfo, @@ -27,10 +28,6 @@ import dxDropDownEditor, { dxDropDownEditorOptions, } from './ui.drop_down_editor'; -import { - SimplifiedSearchMode, -} from '../../common'; - /** * @docid _ui_drop_down_editor_ui_drop_down_list_SelectionChangedInfo * @hidden diff --git a/packages/devextreme/js/ui/editor/editor.d.ts b/packages/devextreme/js/ui/editor/editor.d.ts index d73494dde913..2083bbf82587 100644 --- a/packages/devextreme/js/ui/editor/editor.d.ts +++ b/packages/devextreme/js/ui/editor/editor.d.ts @@ -1,6 +1,6 @@ import { NativeEventInfo, -} from '../../events/index'; +} from '../../common/core/events'; import Widget, { WidgetOptions, diff --git a/packages/devextreme/js/ui/editor/ui.data_expression.d.ts b/packages/devextreme/js/ui/editor/ui.data_expression.d.ts index 49c5c8c1f39c..bdb9a7404a71 100644 --- a/packages/devextreme/js/ui/editor/ui.data_expression.d.ts +++ b/packages/devextreme/js/ui/editor/ui.data_expression.d.ts @@ -5,7 +5,7 @@ import { import { template, -} from '../../core/templates/template'; +} from '../../common'; import DataSource, { DataSourceLike } from '../../data/data_source'; diff --git a/packages/devextreme/js/ui/file_manager.d.ts b/packages/devextreme/js/ui/file_manager.d.ts index a434ab6735d6..f697ee06e450 100644 --- a/packages/devextreme/js/ui/file_manager.d.ts +++ b/packages/devextreme/js/ui/file_manager.d.ts @@ -13,7 +13,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import FileSystemItem from '../file_management/file_system_item'; @@ -31,9 +31,6 @@ import Widget, { import { template, -} from '../core/templates/template'; - -import { DataType, SingleOrMultiple, HorizontalAlignment, diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.command_manager.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.command_manager.js index 1237f4116aa8..f36384de22d0 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.command_manager.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.command_manager.js @@ -1,7 +1,7 @@ import { extend } from '../../core/utils/extend'; import { each } from '../../core/utils/iterator'; import { isString } from '../../core/utils/type'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; export const defaultPermissions = { create: false, diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog.delete_item.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog.delete_item.js index b0a72f413ed4..506a2a1f6bf5 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog.delete_item.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog.delete_item.js @@ -1,7 +1,7 @@ import $ from '../../core/renderer'; import { extend } from '../../core/utils/extend'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import ScrollView from '../scroll_view'; import FileManagerDialogBase from './ui.file_manager.dialog'; diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog.folder_chooser.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog.folder_chooser.js index 3be7c3c0b8f6..9b65622d2bdb 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog.folder_chooser.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog.folder_chooser.js @@ -1,7 +1,7 @@ import $ from '../../core/renderer'; import { extend } from '../../core/utils/extend'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import { getMapFromObject } from './ui.file_manager.common'; import FileManagerDialogBase from './ui.file_manager.dialog'; diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog.js index bd8d77ee1966..0cc00154b8a1 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog.js @@ -1,7 +1,7 @@ import $ from '../../core/renderer'; import { extend } from '../../core/utils/extend'; import { isDefined } from '../../core/utils/type'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import Widget from '../widget/ui.widget'; import Popup from '../popup/ui.popup'; diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog_manager.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog_manager.js index d731aec0b34f..aae402052bd5 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog_manager.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.dialog_manager.js @@ -1,7 +1,7 @@ import $ from '../../core/renderer'; import { extend } from '../../core/utils/extend'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import FileManagerNameEditorDialog from './ui.file_manager.dialog.name_editor'; import FileManagerFolderChooserDialog from './ui.file_manager.dialog.folder_chooser'; diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.editing.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.editing.js index 9991c9357a41..6e35258b626f 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.editing.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.editing.js @@ -5,7 +5,7 @@ import { each } from '../../core/utils/iterator'; import { format } from '../../core/utils/string'; import { isDefined } from '../../core/utils/type'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import Widget from '../widget/ui.widget'; diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.item_list.details.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.item_list.details.js index 2fffacec6c98..4a361c39cdd7 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.item_list.details.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.item_list.details.js @@ -2,7 +2,7 @@ import $ from '../../core/renderer'; import { extend } from '../../core/utils/extend'; import { extendAttributes, getDisplayFileSize } from './ui.file_manager.common'; import { isString, isFunction, isDefined } from '../../core/utils/type'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; // NOTE: Using the "public" export here for the theme-builder deps check import DataGrid from '../../ui/data_grid'; diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.item_list.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.item_list.js index 87257e5df141..7f22babf96b3 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.item_list.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.item_list.js @@ -1,13 +1,13 @@ import { extend } from '../../core/utils/extend'; import { when } from '../../core/utils/deferred'; import { hasWindow } from '../../core/utils/window'; -import { name as dblClickName } from '../../events/double_click'; -import { addNamespace } from '../../events/utils/index'; -import eventsEngine from '../../events/core/events_engine'; +import { name as dblClickName } from '../../common/core/events/double_click'; +import { addNamespace } from '../../common/core/events/utils/index'; +import eventsEngine from '../../common/core/events/core/events_engine'; import { getImageContainer } from '../../core/utils/icon'; import devices from '../../core/devices'; -import CustomStore from '../../data/custom_store'; +import { CustomStore } from '../../common/data/custom_store'; import Widget from '../widget/ui.widget'; const FILE_MANAGER_FILES_VIEW_CLASS = 'dx-filemanager-files-view'; diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.item_list.thumbnails.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.item_list.thumbnails.js index f3ab8a3687f0..3b4cd4ceb621 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.item_list.thumbnails.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.item_list.thumbnails.js @@ -2,11 +2,11 @@ import $ from '../../core/renderer'; import { extend } from '../../core/utils/extend'; import { isDefined } from '../../core/utils/type'; import { Deferred } from '../../core/utils/deferred'; -import eventsEngine from '../../events/core/events_engine'; -import { addNamespace } from '../../events/utils/index'; -import { name as contextMenuEventName } from '../../events/contextmenu'; +import eventsEngine from '../../common/core/events/core/events_engine'; +import { addNamespace } from '../../common/core/events/utils/index'; +import { name as contextMenuEventName } from '../../common/core/events/contextmenu'; import { getDisplayFileSize } from './ui.file_manager.common'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import FileManagerThumbnailListBox from './ui.file_manager.items_list.thumbnails.list_box'; import FileManagerItemListBase from './ui.file_manager.item_list'; diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.items_list.thumbnails.list_box.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.items_list.thumbnails.list_box.js index 72a2f9ab816f..72c087b05dd6 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.items_list.thumbnails.list_box.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.items_list.thumbnails.list_box.js @@ -4,9 +4,9 @@ import { extend } from '../../core/utils/extend'; import { isDefined } from '../../core/utils/type'; import { Deferred, when } from '../../core/utils/deferred'; -import holdEvent from '../../events/hold'; -import { addNamespace, isCommandKeyPressed } from '../../events/utils/index'; -import eventsEngine from '../../events/core/events_engine'; +import holdEvent from '../../common/core/events/hold'; +import { addNamespace, isCommandKeyPressed } from '../../common/core/events/utils/index'; +import eventsEngine from '../../common/core/events/core/events_engine'; import { BindableTemplate } from '../../core/templates/bindable_template'; diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.js index e63c6cbf3421..f10f3472a1df 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.js @@ -4,7 +4,7 @@ import { isDefined, isEmptyObject, isFunction, type } from '../../core/utils/typ import { Deferred, when } from '../../core/utils/deferred'; import { ensureDefined, equalByValue } from '../../core/utils/common'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import registerComponent from '../../core/component_registrator'; import Widget from '../widget/ui.widget'; diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.messages.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.messages.js index ed2f8e56831f..8aa6a1a4ce10 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.messages.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.messages.js @@ -1,4 +1,4 @@ -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import ErrorCode from '../../file_management/error_codes'; export const FileManagerMessages = { diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.notification.progress_panel.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.notification.progress_panel.js index e45c45790920..2a5f02aefa4e 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.notification.progress_panel.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.notification.progress_panel.js @@ -2,7 +2,7 @@ import $ from '../../core/renderer'; import { extend } from '../../core/utils/extend'; import { ensureDefined } from '../../core/utils/common'; import { getImageContainer } from '../../core/utils/icon'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import Widget from '../widget/ui.widget'; import ProgressBar from '../progress_bar'; diff --git a/packages/devextreme/js/ui/file_manager/ui.file_manager.toolbar.js b/packages/devextreme/js/ui/file_manager/ui.file_manager.toolbar.js index 59d87bb01862..79f3efc7c79c 100644 --- a/packages/devextreme/js/ui/file_manager/ui.file_manager.toolbar.js +++ b/packages/devextreme/js/ui/file_manager/ui.file_manager.toolbar.js @@ -3,7 +3,7 @@ import $ from '../../core/renderer'; import { extend } from '../../core/utils/extend'; import { isDefined, isString } from '../../core/utils/type'; import { ensureDefined } from '../../core/utils/common'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import { extendAttributes } from './ui.file_manager.common'; import { isCompact, isFluent, isMaterial } from '../themes'; diff --git a/packages/devextreme/js/ui/file_uploader.d.ts b/packages/devextreme/js/ui/file_uploader.d.ts index b59341e50ac0..8390e42d14cc 100644 --- a/packages/devextreme/js/ui/file_uploader.d.ts +++ b/packages/devextreme/js/ui/file_uploader.d.ts @@ -8,7 +8,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import Editor, { EditorOptions, diff --git a/packages/devextreme/js/ui/filter_builder.d.ts b/packages/devextreme/js/ui/filter_builder.d.ts index ae356c722c2d..a6a51ea7e354 100644 --- a/packages/devextreme/js/ui/filter_builder.d.ts +++ b/packages/devextreme/js/ui/filter_builder.d.ts @@ -6,14 +6,15 @@ import { import { template, -} from '../core/templates/template'; + DataType, +} from '../common'; import { Cancelable, EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import Widget, { WidgetOptions, @@ -23,10 +24,6 @@ import { Format, } from '../localization'; -import { - DataType, -} from '../common'; - export { DataType, }; diff --git a/packages/devextreme/js/ui/form.d.ts b/packages/devextreme/js/ui/form.d.ts index 09b069daf00b..7224504d8b51 100644 --- a/packages/devextreme/js/ui/form.d.ts +++ b/packages/devextreme/js/ui/form.d.ts @@ -9,13 +9,25 @@ import { import { template, -} from '../core/templates/template'; + AsyncRule, + CompareRule, + CustomRule, + EmailRule, + HorizontalAlignment, + Mode, + NumericRule, + PatternRule, + RangeRule, + RequiredRule, + StringLengthRule, + VerticalAlignment, +} from '../common'; import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import dxButton, { dxButtonOptions, @@ -35,21 +47,6 @@ import Widget, { WidgetOptions, } from './widget/ui.widget'; -import { - AsyncRule, - CompareRule, - CustomRule, - EmailRule, - HorizontalAlignment, - Mode, - NumericRule, - PatternRule, - RangeRule, - RequiredRule, - StringLengthRule, - VerticalAlignment, -} from '../common'; - export { HorizontalAlignment, Mode, diff --git a/packages/devextreme/js/ui/gallery.d.ts b/packages/devextreme/js/ui/gallery.d.ts index c27e60791265..8e98ce43264d 100644 --- a/packages/devextreme/js/ui/gallery.d.ts +++ b/packages/devextreme/js/ui/gallery.d.ts @@ -9,7 +9,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import CollectionWidget, { CollectionWidgetItem, diff --git a/packages/devextreme/js/ui/gantt.d.ts b/packages/devextreme/js/ui/gantt.d.ts index 0782fd0473f6..229f106b9d69 100644 --- a/packages/devextreme/js/ui/gantt.d.ts +++ b/packages/devextreme/js/ui/gantt.d.ts @@ -5,13 +5,14 @@ import { } from '../core/element'; import { - DxEvent, Cancelable, EventInfo, NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; + +import { DxEvent } from '../events'; import { Column as TreeListColumn, @@ -31,18 +32,15 @@ import { import { template, -} from '../core/templates/template'; - -import { - DxPromise, -} from '../core/utils/deferred'; - -import { FirstDayOfWeek, SingleMultipleOrNone, ToolbarItemLocation, } from '../common'; +import { + DxPromise, +} from '../core/utils/deferred'; + import { HeaderFilterSearchConfig, } from '../common/grids'; diff --git a/packages/devextreme/js/ui/gantt/ui.gantt.bars.js b/packages/devextreme/js/ui/gantt/ui.gantt.bars.js index cbb62d2e9031..28d6a889c58c 100644 --- a/packages/devextreme/js/ui/gantt/ui.gantt.bars.js +++ b/packages/devextreme/js/ui/gantt/ui.gantt.bars.js @@ -1,7 +1,7 @@ import $ from '../../core/renderer'; import ToolbarMenu from '../toolbar'; import ContextMenu from '../context_menu'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import { extend } from '../../core/utils/extend'; const TOOLBAR_SEPARATOR_CLASS = 'dx-gantt-toolbar-separator'; diff --git a/packages/devextreme/js/ui/gantt/ui.gantt.data.option.js b/packages/devextreme/js/ui/gantt/ui.gantt.data.option.js index 2e0ded84f6c6..8076b7d23e39 100644 --- a/packages/devextreme/js/ui/gantt/ui.gantt.data.option.js +++ b/packages/devextreme/js/ui/gantt/ui.gantt.data.option.js @@ -1,5 +1,5 @@ import { Component } from '../../core/component'; -import DataHelperMixin from '../../data_helper'; +import DataHelperMixin from '../../common/data/data_helper'; class DataOption extends Component { constructor(optionName, getLoadPanel, dataSourceChangedCallback) { diff --git a/packages/devextreme/js/ui/gantt/ui.gantt.dialogs.js b/packages/devextreme/js/ui/gantt/ui.gantt.dialogs.js index a76e4335f2d6..390c582e843a 100644 --- a/packages/devextreme/js/ui/gantt/ui.gantt.dialogs.js +++ b/packages/devextreme/js/ui/gantt/ui.gantt.dialogs.js @@ -2,8 +2,8 @@ import Popup from '../popup/ui.popup'; import Form from '../form'; import '../tag_box'; import '../radio_group'; -import dateLocalization from '../../localization/date'; -import messageLocalization from '../../localization/message'; +import dateLocalization from '../../common/core/localization/date'; +import messageLocalization from '../../common/core/localization/message'; import '../list_light'; import '../../__internal/ui/list/modules/m_deleting'; diff --git a/packages/devextreme/js/ui/gantt/ui.gantt.export_helper.js b/packages/devextreme/js/ui/gantt/ui.gantt.export_helper.js index f38c0a3ef829..b69f447846d3 100644 --- a/packages/devextreme/js/ui/gantt/ui.gantt.export_helper.js +++ b/packages/devextreme/js/ui/gantt/ui.gantt.export_helper.js @@ -1,8 +1,8 @@ import { getWindow } from '../../core/utils/window'; import gridCoreUtils from '../../__internal/grids/grid_core/m_utils'; import { isDate, isDefined, isNumeric } from '../../core/utils/type'; -import dateLocalization from '../../localization/date'; -import numberLocalization from '../../localization/number'; +import dateLocalization from '../../common/core/localization/date'; +import numberLocalization from '../../common/core/localization/number'; const window = getWindow(); const TREELIST_EMPTY_SPACE = 'dx-treelist-empty-space'; diff --git a/packages/devextreme/js/ui/gantt/ui.gantt.helper.js b/packages/devextreme/js/ui/gantt/ui.gantt.helper.js index 8fc9506795bf..e9895f0502d6 100644 --- a/packages/devextreme/js/ui/gantt/ui.gantt.helper.js +++ b/packages/devextreme/js/ui/gantt/ui.gantt.helper.js @@ -1,6 +1,6 @@ import { compileGetter, compileSetter } from '../../core/utils/data'; import { isFunction } from '../../core/utils/type'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; export const GanttHelper = { diff --git a/packages/devextreme/js/ui/gantt/ui.gantt.treelist.js b/packages/devextreme/js/ui/gantt/ui.gantt.treelist.js index 4e51cb597724..6523f8585c10 100644 --- a/packages/devextreme/js/ui/gantt/ui.gantt.treelist.js +++ b/packages/devextreme/js/ui/gantt/ui.gantt.treelist.js @@ -4,8 +4,8 @@ import dxTreeList from '../tree_list'; import { getBoundingRect } from '../../core/utils/position'; import { isDefined } from '../../core/utils/type'; import { GanttHelper } from './ui.gantt.helper'; -import { DataSource } from '../../data/data_source/data_source'; -import ArrayStore from '../../data/array_store'; +import DataSource from '../../common/data/data_source'; +import ArrayStore from '../../common/data/array_store'; import { compileGetter } from '../../core/utils/data'; import { GanttTreeListNodesState } from './ui.gantt.treelist.nodes_state'; diff --git a/packages/devextreme/js/ui/gantt/ui.gantt.view.js b/packages/devextreme/js/ui/gantt/ui.gantt.view.js index 837d04d55a18..27fe3aaabde1 100644 --- a/packages/devextreme/js/ui/gantt/ui.gantt.view.js +++ b/packages/devextreme/js/ui/gantt/ui.gantt.view.js @@ -2,12 +2,12 @@ import $ from '../../core/renderer'; import Widget from '../widget/ui.widget'; import { getGanttViewCore } from './gantt_importer'; import { TaskAreaContainer } from './ui.gantt.task.area.container'; -import dateLocalization from '../../localization/date'; +import dateLocalization from '../../common/core/localization/date'; import { isDefined } from '../../core/utils/type'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import { format } from '../../core/utils/string'; -import coreLocalization from '../../localization/core'; -import { requestAnimationFrame, cancelAnimationFrame } from '../../animation/frame'; +import coreLocalization from '../../common/core/localization/core'; +import { requestAnimationFrame, cancelAnimationFrame } from '../../common/core/animation/frame'; const visualStateKey = 'visualState'; diff --git a/packages/devextreme/js/ui/html_editor.d.ts b/packages/devextreme/js/ui/html_editor.d.ts index 4f582708162a..937cd154e6d4 100644 --- a/packages/devextreme/js/ui/html_editor.d.ts +++ b/packages/devextreme/js/ui/html_editor.d.ts @@ -6,19 +6,16 @@ import { import { template, -} from '../core/templates/template'; + EditorStyle, + ToolbarItemLocation, +} from '../common'; import { EventInfo, NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; - -import { - EditorStyle, - ToolbarItemLocation, -} from '../common'; +} from '../common/core/events'; import Editor, { ValueChangedInfo, diff --git a/packages/devextreme/js/ui/list.d.ts b/packages/devextreme/js/ui/list.d.ts index bebab8fd2f12..e35daf99c07d 100644 --- a/packages/devextreme/js/ui/list.d.ts +++ b/packages/devextreme/js/ui/list.d.ts @@ -6,7 +6,11 @@ import { import { template, -} from '../core/templates/template'; + SelectAllMode, + ScrollbarMode, + PageLoadMode, + SingleMultipleAllOrNone, +} from '../common'; import { DxPromise, @@ -18,7 +22,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import CollectionWidget, { CollectionWidgetItem, @@ -35,13 +39,6 @@ import { SearchBoxMixinOptions, } from './widget/ui.search_box_mixin'; -import { - SelectAllMode, - ScrollbarMode, - PageLoadMode, - SingleMultipleAllOrNone, -} from '../common'; - export { SelectAllMode, ScrollbarMode, diff --git a/packages/devextreme/js/ui/load_indicator.d.ts b/packages/devextreme/js/ui/load_indicator.d.ts index 59187c5bece3..4836f99b6b8c 100644 --- a/packages/devextreme/js/ui/load_indicator.d.ts +++ b/packages/devextreme/js/ui/load_indicator.d.ts @@ -2,7 +2,7 @@ import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import Widget, { WidgetOptions, diff --git a/packages/devextreme/js/ui/load_panel.d.ts b/packages/devextreme/js/ui/load_panel.d.ts index 44350522bd43..60b29374ad30 100644 --- a/packages/devextreme/js/ui/load_panel.d.ts +++ b/packages/devextreme/js/ui/load_panel.d.ts @@ -7,15 +7,12 @@ import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { AnimationConfig, -} from '../animation/fx'; - -import { PositionConfig, -} from '../animation/position'; +} from '../common/core/animation'; import dxOverlay, { dxOverlayAnimation, diff --git a/packages/devextreme/js/ui/lookup.d.ts b/packages/devextreme/js/ui/lookup.d.ts index 934a12d0c8d7..6da51449f727 100644 --- a/packages/devextreme/js/ui/lookup.d.ts +++ b/packages/devextreme/js/ui/lookup.d.ts @@ -5,7 +5,9 @@ import { import { template, -} from '../core/templates/template'; + ApplyValueMode, + PageLoadMode, +} from '../common'; import { EventInfo, @@ -13,7 +15,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import { ValueChangedInfo, @@ -36,11 +38,6 @@ import { TitleRenderedInfo, } from './popup'; -import { - ApplyValueMode, - PageLoadMode, -} from '../common'; - export { ApplyValueMode, PageLoadMode, diff --git a/packages/devextreme/js/ui/map.d.ts b/packages/devextreme/js/ui/map.d.ts index 29899a7c5388..159188f2b6a6 100644 --- a/packages/devextreme/js/ui/map.d.ts +++ b/packages/devextreme/js/ui/map.d.ts @@ -7,7 +7,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import Widget, { WidgetOptions, diff --git a/packages/devextreme/js/ui/menu.d.ts b/packages/devextreme/js/ui/menu.d.ts index 5eda089cabe1..4b9f0089f3b0 100644 --- a/packages/devextreme/js/ui/menu.d.ts +++ b/packages/devextreme/js/ui/menu.d.ts @@ -10,7 +10,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import { CollectionWidgetItem, diff --git a/packages/devextreme/js/ui/multi_view.d.ts b/packages/devextreme/js/ui/multi_view.d.ts index 0e08bdbdd4f8..57a5d9b137e3 100644 --- a/packages/devextreme/js/ui/multi_view.d.ts +++ b/packages/devextreme/js/ui/multi_view.d.ts @@ -6,7 +6,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import CollectionWidget, { CollectionWidgetItem, diff --git a/packages/devextreme/js/ui/number_box.d.ts b/packages/devextreme/js/ui/number_box.d.ts index bc9fb5903a7b..60a423be1d5c 100644 --- a/packages/devextreme/js/ui/number_box.d.ts +++ b/packages/devextreme/js/ui/number_box.d.ts @@ -3,7 +3,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { TextEditorButton, diff --git a/packages/devextreme/js/ui/overlay.d.ts b/packages/devextreme/js/ui/overlay.d.ts index e27a254f215c..7638b70e5a25 100644 --- a/packages/devextreme/js/ui/overlay.d.ts +++ b/packages/devextreme/js/ui/overlay.d.ts @@ -1,6 +1,6 @@ import { AnimationConfig, -} from '../animation/fx'; +} from '../common/core/animation'; import { UserDefinedElement, @@ -9,17 +9,18 @@ import { import { template, -} from '../core/templates/template'; +} from '../common'; import { DxPromise, } from '../core/utils/deferred'; import { - DxEvent, Cancelable, EventInfo, -} from '../events/index'; +} from '../common/core/events'; + +import { DxEvent } from '../events'; import Widget, { WidgetOptions, diff --git a/packages/devextreme/js/ui/pagination.d.ts b/packages/devextreme/js/ui/pagination.d.ts index 6024a7aef341..20b0c1bf1256 100644 --- a/packages/devextreme/js/ui/pagination.d.ts +++ b/packages/devextreme/js/ui/pagination.d.ts @@ -1,11 +1,55 @@ import Widget, { WidgetOptions } from './widget/ui.widget'; import { - PagerBase, + DisplayMode, } from '../common'; export { DisplayMode, -} from '../common'; +}; + +/** + * @docid + * @hidden + * @namespace DevExpress.common + */ +export type PagerBase = { + /** + * @docid + * @public + * @default "adaptive" + */ + displayMode?: DisplayMode; + /** + * @docid + * @public + * @default "Page {0} of {1} ({2} items)" + */ + infoText?: string; + /** + * @docid + * @public + * @default false + */ + showInfo?: boolean; + /** + * @docid + * @public + * @default false + */ + showNavigationButtons?: boolean; + /** + * @docid + * @public + * @default false + */ + showPageSizeSelector?: boolean; + /** + * @docid + * @public + * @default "Page Navigation" + */ + label?: string; + }; /** * @public diff --git a/packages/devextreme/js/ui/pivot_grid.d.ts b/packages/devextreme/js/ui/pivot_grid.d.ts index cda99d3eaed4..9c8840a8b30e 100644 --- a/packages/devextreme/js/ui/pivot_grid.d.ts +++ b/packages/devextreme/js/ui/pivot_grid.d.ts @@ -8,7 +8,7 @@ import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import PivotGridDataSource, { Field, diff --git a/packages/devextreme/js/ui/pivot_grid/data_source.d.ts b/packages/devextreme/js/ui/pivot_grid/data_source.d.ts index ae1f66d4fffd..f6cb506ead28 100644 --- a/packages/devextreme/js/ui/pivot_grid/data_source.d.ts +++ b/packages/devextreme/js/ui/pivot_grid/data_source.d.ts @@ -3,11 +3,10 @@ import { } from '../../core/utils/deferred'; import { + DataSource, Store, StoreOptions, -} from '../../data/index'; - -import DataSource from '../../data/data_source'; +} from '../../common/data'; import { Format, diff --git a/packages/devextreme/js/ui/pivot_grid_field_chooser.d.ts b/packages/devextreme/js/ui/pivot_grid_field_chooser.d.ts index 349e043f27dd..9b77bda0bac5 100644 --- a/packages/devextreme/js/ui/pivot_grid_field_chooser.d.ts +++ b/packages/devextreme/js/ui/pivot_grid_field_chooser.d.ts @@ -1,9 +1,10 @@ import { - DxEvent, EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; + +import { DxEvent } from '../events'; import PivotGridDataSource, { Field, diff --git a/packages/devextreme/js/ui/popover.d.ts b/packages/devextreme/js/ui/popover.d.ts index 8b239591f5c0..52e80101f630 100644 --- a/packages/devextreme/js/ui/popover.d.ts +++ b/packages/devextreme/js/ui/popover.d.ts @@ -1,10 +1,7 @@ import { AnimationConfig, -} from '../animation/fx'; - -import { PositionConfig, -} from '../animation/position'; +} from '../common/core/animation'; import { UserDefinedElement, @@ -15,12 +12,13 @@ import { } from '../core/utils/deferred'; import { - DxEvent, Cancelable, EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; + +import { DxEvent } from '../events'; import dxPopup, { dxPopupAnimation, diff --git a/packages/devextreme/js/ui/popup.d.ts b/packages/devextreme/js/ui/popup.d.ts index 692a641420fe..c97792d8769c 100644 --- a/packages/devextreme/js/ui/popup.d.ts +++ b/packages/devextreme/js/ui/popup.d.ts @@ -1,10 +1,7 @@ import { AnimationConfig, -} from '../animation/fx'; - -import { PositionConfig, -} from '../animation/position'; +} from '../common/core/animation'; import { UserDefinedElement, @@ -13,7 +10,10 @@ import { import { template, -} from '../core/templates/template'; + PositionAlignment, + ToolbarItemLocation, + ToolbarItemComponent, +} from '../common'; import { Cancelable, @@ -21,18 +21,12 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { Item as dxToolbarItem, } from './toolbar'; -import { - PositionAlignment, - ToolbarItemLocation, - ToolbarItemComponent, -} from '../common'; - import dxOverlay, { dxOverlayAnimation, dxOverlayOptions, diff --git a/packages/devextreme/js/ui/progress_bar.d.ts b/packages/devextreme/js/ui/progress_bar.d.ts index e840b6ce2de1..6c308b0c7b12 100644 --- a/packages/devextreme/js/ui/progress_bar.d.ts +++ b/packages/devextreme/js/ui/progress_bar.d.ts @@ -3,7 +3,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { ValueChangedInfo, diff --git a/packages/devextreme/js/ui/radio_group.d.ts b/packages/devextreme/js/ui/radio_group.d.ts index 699adbdde305..e93f9b414096 100644 --- a/packages/devextreme/js/ui/radio_group.d.ts +++ b/packages/devextreme/js/ui/radio_group.d.ts @@ -1,11 +1,11 @@ -import DataSource from '../data/data_source'; +import { DataSource } from '../common/data'; import { EventInfo, NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import Editor, { ValueChangedInfo, diff --git a/packages/devextreme/js/ui/range_slider.d.ts b/packages/devextreme/js/ui/range_slider.d.ts index a0e8e4167909..3eef9e2964b3 100644 --- a/packages/devextreme/js/ui/range_slider.d.ts +++ b/packages/devextreme/js/ui/range_slider.d.ts @@ -3,7 +3,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { ValueChangedInfo, diff --git a/packages/devextreme/js/ui/recurrence_editor.d.ts b/packages/devextreme/js/ui/recurrence_editor.d.ts index dc4fa28f503c..aacb84fefb02 100644 --- a/packages/devextreme/js/ui/recurrence_editor.d.ts +++ b/packages/devextreme/js/ui/recurrence_editor.d.ts @@ -7,7 +7,7 @@ import { InitializedEventInfo, ChangedOptionInfo, NativeEventInfo, -} from '../events/index'; +} from '../common/core/events'; /** * @docid _ui_recurrence_editor_ContentReadyEvent diff --git a/packages/devextreme/js/ui/resizable.d.ts b/packages/devextreme/js/ui/resizable.d.ts index d8f16a6a773a..fdf14ed727a2 100644 --- a/packages/devextreme/js/ui/resizable.d.ts +++ b/packages/devextreme/js/ui/resizable.d.ts @@ -8,7 +8,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; /** @public */ export type ResizeHandle = 'bottom' | 'left' | 'right' | 'top' | 'all'; diff --git a/packages/devextreme/js/ui/responsive_box.d.ts b/packages/devextreme/js/ui/responsive_box.d.ts index ce2723a4af14..bbe3f4dfc17c 100644 --- a/packages/devextreme/js/ui/responsive_box.d.ts +++ b/packages/devextreme/js/ui/responsive_box.d.ts @@ -6,7 +6,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import CollectionWidget, { CollectionWidgetItem, diff --git a/packages/devextreme/js/ui/scheduler.d.ts b/packages/devextreme/js/ui/scheduler.d.ts index 8773c5d31487..aff8b8ed9416 100644 --- a/packages/devextreme/js/ui/scheduler.d.ts +++ b/packages/devextreme/js/ui/scheduler.d.ts @@ -5,18 +5,22 @@ import { import { template, -} from '../core/templates/template'; + FirstDayOfWeek, + Orientation, + ScrollMode, +} from '../common'; import DataSource, { DataSourceLike } from '../data/data_source'; import { - DxEvent, EventInfo, NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, Cancelable, -} from '../events/index'; +} from '../common/core/events'; + +import { DxEvent } from '../events'; import { CollectionWidgetItem, @@ -33,12 +37,6 @@ import Widget, { WidgetOptions, } from './widget/ui.widget'; -import { - FirstDayOfWeek, - Orientation, - ScrollMode, -} from '../common'; - interface AppointmentDraggingEvent { readonly component: dxScheduler; readonly event?: DxEvent; diff --git a/packages/devextreme/js/ui/scroll_view.d.ts b/packages/devextreme/js/ui/scroll_view.d.ts index c108118780e4..00bc3601f549 100644 --- a/packages/devextreme/js/ui/scroll_view.d.ts +++ b/packages/devextreme/js/ui/scroll_view.d.ts @@ -6,7 +6,7 @@ import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import dxScrollable, { dxScrollableOptions, diff --git a/packages/devextreme/js/ui/scroll_view/ui.scrollable.d.ts b/packages/devextreme/js/ui/scroll_view/ui.scrollable.d.ts index d07682976007..9600f8cc8f27 100644 --- a/packages/devextreme/js/ui/scroll_view/ui.scrollable.d.ts +++ b/packages/devextreme/js/ui/scroll_view/ui.scrollable.d.ts @@ -13,7 +13,7 @@ import { import { NativeEventInfo, -} from '../../events/index'; +} from '../../common/core/events'; import { ScrollDirection, diff --git a/packages/devextreme/js/ui/select_box.d.ts b/packages/devextreme/js/ui/select_box.d.ts index 3c2745db0b62..b226c35c2494 100644 --- a/packages/devextreme/js/ui/select_box.d.ts +++ b/packages/devextreme/js/ui/select_box.d.ts @@ -5,7 +5,7 @@ import { import { template, -} from '../core/templates/template'; +} from '../common'; import { EventInfo, @@ -13,7 +13,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import { DropDownButtonTemplateDataModel, diff --git a/packages/devextreme/js/ui/set_template_engine.d.ts b/packages/devextreme/js/ui/set_template_engine.d.ts index 39fd8a49764f..4458a1ae5b41 100644 --- a/packages/devextreme/js/ui/set_template_engine.d.ts +++ b/packages/devextreme/js/ui/set_template_engine.d.ts @@ -1,2 +1,3 @@ -//eslint-disable-next-line no-restricted-exports -export { default } from '../core/set_template_engine'; +import setTemplateEngine from '../core/set_template_engine'; + +export default setTemplateEngine; diff --git a/packages/devextreme/js/ui/shared/accessibility.js b/packages/devextreme/js/ui/shared/accessibility.js index d238cc56fe37..c889c887619a 100644 --- a/packages/devextreme/js/ui/shared/accessibility.js +++ b/packages/devextreme/js/ui/shared/accessibility.js @@ -1,6 +1,6 @@ import $ from '../../core/renderer'; -import eventsEngine from '../../events/core/events_engine'; -import { normalizeKeyName } from '../../events/utils/index'; +import eventsEngine from '../../common/core/events/core/events_engine'; +import { normalizeKeyName } from '../../common/core/events/utils/index'; import { extend } from '../../core/utils/extend'; import domAdapter from '../../core/dom_adapter'; import { noop } from '../../core/utils/common'; diff --git a/packages/devextreme/js/ui/shared/ui.editor_factory_mixin.js b/packages/devextreme/js/ui/shared/ui.editor_factory_mixin.js index bc73c09becb3..e2f693daa68c 100644 --- a/packages/devextreme/js/ui/shared/ui.editor_factory_mixin.js +++ b/packages/devextreme/js/ui/shared/ui.editor_factory_mixin.js @@ -1,5 +1,5 @@ import $ from '../../core/renderer'; -import eventsEngine from '../../events/core/events_engine'; +import eventsEngine from '../../common/core/events/core/events_engine'; import { isDefined, isObject, isFunction } from '../../core/utils/type'; import variableWrapper from '../../core/utils/variable_wrapper'; import { compileGetter } from '../../core/utils/data'; @@ -7,8 +7,8 @@ import browser from '../../core/utils/browser'; import { extend } from '../../core/utils/extend'; import devices from '../../core/devices'; import { getPublicElement } from '../../core/element'; -import { normalizeDataSourceOptions } from '../../data/data_source/utils'; -import { normalizeKeyName } from '../../events/utils/index'; +import { normalizeDataSourceOptions } from '../../common/data/data_source/utils'; +import { normalizeKeyName } from '../../common/core/events/utils/index'; const { isWrapped } = variableWrapper; diff --git a/packages/devextreme/js/ui/slider.d.ts b/packages/devextreme/js/ui/slider.d.ts index 8842dffcae6d..42b09d9de9ab 100644 --- a/packages/devextreme/js/ui/slider.d.ts +++ b/packages/devextreme/js/ui/slider.d.ts @@ -3,7 +3,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { ValueChangedInfo, diff --git a/packages/devextreme/js/ui/sortable.d.ts b/packages/devextreme/js/ui/sortable.d.ts index b203d8994c6f..09c68f791d68 100644 --- a/packages/devextreme/js/ui/sortable.d.ts +++ b/packages/devextreme/js/ui/sortable.d.ts @@ -7,27 +7,25 @@ import { import { template, -} from '../core/templates/template'; + DragHighlight, + Orientation, +} from '../common'; import { - DxEvent, Cancelable, EventInfo, NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; + +import { DxEvent } from '../events'; import dxDraggable, { DraggableBase, DraggableBaseOptions, } from './draggable'; -import { - DragHighlight, - Orientation, -} from '../common'; - export { DragHighlight, Orientation, diff --git a/packages/devextreme/js/ui/speed_dial_action.d.ts b/packages/devextreme/js/ui/speed_dial_action.d.ts index dbf290e61954..b71f1026f344 100644 --- a/packages/devextreme/js/ui/speed_dial_action.d.ts +++ b/packages/devextreme/js/ui/speed_dial_action.d.ts @@ -7,7 +7,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import Widget, { WidgetOptions, diff --git a/packages/devextreme/js/ui/splitter.d.ts b/packages/devextreme/js/ui/splitter.d.ts index afaeb0d96b12..b59317bc37f9 100644 --- a/packages/devextreme/js/ui/splitter.d.ts +++ b/packages/devextreme/js/ui/splitter.d.ts @@ -8,7 +8,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import CollectionWidget, { CollectionWidgetItem, diff --git a/packages/devextreme/js/ui/splitter_control.js b/packages/devextreme/js/ui/splitter_control.js index 340a5f9e01d1..1d1a53df352a 100644 --- a/packages/devextreme/js/ui/splitter_control.js +++ b/packages/devextreme/js/ui/splitter_control.js @@ -1,10 +1,10 @@ import $ from '../core/renderer'; import Widget from './widget/ui.widget'; import domAdapter from '../core/dom_adapter'; -import eventsEngine from '../events/core/events_engine'; -import pointerEvents from '../events/pointer'; +import eventsEngine from '../common/core/events/core/events_engine'; +import pointerEvents from '../common/core/events/pointer'; import { getWindow } from '../core/utils/window'; -import { addNamespace } from '../events/utils/index'; +import { addNamespace } from '../common/core/events/utils/index'; import Guid from '../core/guid'; const window = getWindow(); diff --git a/packages/devextreme/js/ui/switch.d.ts b/packages/devextreme/js/ui/switch.d.ts index 4969ab64ef37..0abcc3da551b 100644 --- a/packages/devextreme/js/ui/switch.d.ts +++ b/packages/devextreme/js/ui/switch.d.ts @@ -3,7 +3,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import Editor, { ValueChangedInfo, diff --git a/packages/devextreme/js/ui/tab_panel.d.ts b/packages/devextreme/js/ui/tab_panel.d.ts index df996cb013b9..8d013d39d9e4 100644 --- a/packages/devextreme/js/ui/tab_panel.d.ts +++ b/packages/devextreme/js/ui/tab_panel.d.ts @@ -6,7 +6,10 @@ import { import { template, -} from '../core/templates/template'; + Position, + TabsIconPosition, + TabsStyle, +} from '../common'; import { EventInfo, @@ -14,13 +17,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; - -import { - Position, - TabsIconPosition, - TabsStyle, -} from '../common'; +} from '../common/core/events'; import CollectionWidget, { SelectionChangeInfo, diff --git a/packages/devextreme/js/ui/tabs.d.ts b/packages/devextreme/js/ui/tabs.d.ts index 97decc7aaeed..8b4714f2f582 100644 --- a/packages/devextreme/js/ui/tabs.d.ts +++ b/packages/devextreme/js/ui/tabs.d.ts @@ -6,7 +6,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import CollectionWidget, { CollectionWidgetItem, diff --git a/packages/devextreme/js/ui/tag_box.d.ts b/packages/devextreme/js/ui/tag_box.d.ts index 81777a0c0465..bcd65388f928 100644 --- a/packages/devextreme/js/ui/tag_box.d.ts +++ b/packages/devextreme/js/ui/tag_box.d.ts @@ -5,7 +5,9 @@ import { import { template, -} from '../core/templates/template'; + ApplyValueMode, + SelectAllMode, +} from '../common'; import { Cancelable, @@ -14,7 +16,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import { SelectionChangeInfo, @@ -33,11 +35,6 @@ import dxSelectBox, { CustomItemCreatingInfo, } from './select_box'; -import { - ApplyValueMode, - SelectAllMode, -} from '../common'; - /** * @docid _ui_tag_box_ChangeEvent * @public diff --git a/packages/devextreme/js/ui/text_area.d.ts b/packages/devextreme/js/ui/text_area.d.ts index 60ae24793f92..e1409a3a8af4 100644 --- a/packages/devextreme/js/ui/text_area.d.ts +++ b/packages/devextreme/js/ui/text_area.d.ts @@ -3,7 +3,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { ValueChangedInfo, diff --git a/packages/devextreme/js/ui/text_box.d.ts b/packages/devextreme/js/ui/text_box.d.ts index 853df90583e8..75762ea2ce4c 100644 --- a/packages/devextreme/js/ui/text_box.d.ts +++ b/packages/devextreme/js/ui/text_box.d.ts @@ -3,7 +3,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { ValueChangedInfo, diff --git a/packages/devextreme/js/ui/text_box/ui.text_editor.base.d.ts b/packages/devextreme/js/ui/text_box/ui.text_editor.base.d.ts index 323cf3ce58ed..4523d23133dc 100644 --- a/packages/devextreme/js/ui/text_box/ui.text_editor.base.d.ts +++ b/packages/devextreme/js/ui/text_box/ui.text_editor.base.d.ts @@ -1,6 +1,6 @@ import { NativeEventInfo, -} from '../../events/index'; +} from '../../common/core/events'; import dxButton from '../button'; diff --git a/packages/devextreme/js/ui/tile_view.d.ts b/packages/devextreme/js/ui/tile_view.d.ts index 14e6acc8d1c2..1fbf822124e1 100644 --- a/packages/devextreme/js/ui/tile_view.d.ts +++ b/packages/devextreme/js/ui/tile_view.d.ts @@ -6,7 +6,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import CollectionWidget, { CollectionWidgetItem, diff --git a/packages/devextreme/js/ui/toast.d.ts b/packages/devextreme/js/ui/toast.d.ts index 7f124dbe5912..32604009d8bc 100644 --- a/packages/devextreme/js/ui/toast.d.ts +++ b/packages/devextreme/js/ui/toast.d.ts @@ -1,18 +1,16 @@ import { AnimationConfig, -} from '../animation/fx'; - -import { PositionConfig, -} from '../animation/position'; +} from '../common/core/animation'; import { - DxEvent, Cancelable, EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; + +import { DxEvent } from '../events'; import dxOverlay, { dxOverlayAnimation, diff --git a/packages/devextreme/js/ui/toolbar.d.ts b/packages/devextreme/js/ui/toolbar.d.ts index c44b6eaa6a52..33512ec49a23 100644 --- a/packages/devextreme/js/ui/toolbar.d.ts +++ b/packages/devextreme/js/ui/toolbar.d.ts @@ -6,7 +6,9 @@ import { import { template, -} from '../core/templates/template'; + ToolbarItemLocation, + ToolbarItemComponent, +} from '../common'; import { EventInfo, @@ -14,12 +16,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; - -import { - ToolbarItemLocation, - ToolbarItemComponent, -} from '../common'; +} from '../common/core/events'; import CollectionWidget, { CollectionWidgetItem, diff --git a/packages/devextreme/js/ui/tooltip.d.ts b/packages/devextreme/js/ui/tooltip.d.ts index 2f815b1dbfe0..6397deb27f01 100644 --- a/packages/devextreme/js/ui/tooltip.d.ts +++ b/packages/devextreme/js/ui/tooltip.d.ts @@ -3,7 +3,7 @@ import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import dxPopover, { dxPopoverOptions, diff --git a/packages/devextreme/js/ui/tree_list.d.ts b/packages/devextreme/js/ui/tree_list.d.ts index 25a8ca704947..65c5509ce3ca 100644 --- a/packages/devextreme/js/ui/tree_list.d.ts +++ b/packages/devextreme/js/ui/tree_list.d.ts @@ -6,13 +6,18 @@ import { import { template, -} from '../core/templates/template'; + DataStructure, + Mode, + ScrollMode, + SingleMultipleOrNone, + ToolbarItemLocation, +} from '../common'; import { DxPromise, } from '../core/utils/deferred'; -import DataSource from '../data/data_source'; +import { DataSource } from '../common/data'; import { Cancelable, @@ -20,15 +25,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; - -import { - DataStructure, - Mode, - ScrollMode, - SingleMultipleOrNone, - ToolbarItemLocation, -} from '../common'; +} from '../common/core/events'; import { AdaptiveDetailRowPreparingInfo, diff --git a/packages/devextreme/js/ui/tree_view.d.ts b/packages/devextreme/js/ui/tree_view.d.ts index c9415f478a43..4c182b047d18 100644 --- a/packages/devextreme/js/ui/tree_view.d.ts +++ b/packages/devextreme/js/ui/tree_view.d.ts @@ -12,7 +12,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { CollectionWidgetItem, diff --git a/packages/devextreme/js/ui/validation_group.d.ts b/packages/devextreme/js/ui/validation_group.d.ts index 5e614e2ba787..4a5a361a1f03 100644 --- a/packages/devextreme/js/ui/validation_group.d.ts +++ b/packages/devextreme/js/ui/validation_group.d.ts @@ -10,7 +10,7 @@ import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { AsyncRule, diff --git a/packages/devextreme/js/ui/validation_summary.d.ts b/packages/devextreme/js/ui/validation_summary.d.ts index 6b51ce56c76a..ed2e75a213ee 100644 --- a/packages/devextreme/js/ui/validation_summary.d.ts +++ b/packages/devextreme/js/ui/validation_summary.d.ts @@ -4,7 +4,7 @@ import { InitializedEventInfo, ChangedOptionInfo, ItemInfo, -} from '../events/index'; +} from '../common/core/events'; import CollectionWidget, { CollectionWidgetOptions, diff --git a/packages/devextreme/js/ui/validator.d.ts b/packages/devextreme/js/ui/validator.d.ts index cba624c8287a..8cc8a58c6628 100644 --- a/packages/devextreme/js/ui/validator.d.ts +++ b/packages/devextreme/js/ui/validator.d.ts @@ -10,7 +10,7 @@ import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { AsyncRule, diff --git a/packages/devextreme/js/ui/widget/template.d.ts b/packages/devextreme/js/ui/widget/template.d.ts index 5118abe3c78a..d5f89de338ca 100644 --- a/packages/devextreme/js/ui/widget/template.d.ts +++ b/packages/devextreme/js/ui/widget/template.d.ts @@ -1,11 +1,12 @@ -import { +import type { template, -} from '../../core/templates/template'; +} from '../../common'; /** * @docid ui.template * @namespace DevExpress.ui * @deprecated + * @type object * @public */ export type Template = template; diff --git a/packages/devextreme/js/ui/widget/ui.search_box_mixin.js b/packages/devextreme/js/ui/widget/ui.search_box_mixin.js index c386734ad875..4491d72a5413 100644 --- a/packages/devextreme/js/ui/widget/ui.search_box_mixin.js +++ b/packages/devextreme/js/ui/widget/ui.search_box_mixin.js @@ -1,6 +1,6 @@ import $ from '../../core/renderer'; import { extend } from '../../core/utils/extend'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import errors from '../widget/ui.errors'; import { Deferred } from '../../core/utils/deferred'; import { stubComponent } from '../../core/utils/stubs'; diff --git a/packages/devextreme/js/ui/widget/ui.widget.d.ts b/packages/devextreme/js/ui/widget/ui.widget.d.ts index 87fe3bcd01f8..b193f5e45f29 100644 --- a/packages/devextreme/js/ui/widget/ui.widget.d.ts +++ b/packages/devextreme/js/ui/widget/ui.widget.d.ts @@ -5,7 +5,7 @@ import DOMComponent, { import { EventInfo, -} from '../../events/index'; +} from '../../common/core/events'; /** * @namespace DevExpress.ui diff --git a/packages/devextreme/js/utils.d.ts b/packages/devextreme/js/utils.d.ts index 21d9b4461ad5..83af02c7c84b 100644 --- a/packages/devextreme/js/utils.d.ts +++ b/packages/devextreme/js/utils.d.ts @@ -1,15 +1,4 @@ -/** - * @docid Utils.compileGetter - * @publicName compileGetter(expr) - * @namespace DevExpress.data.utils - * @public - */ -export function compileGetter(expr: string | Array): Function; - -/** - * @docid Utils.compileSetter - * @publicName compileSetter(expr) - * @namespace DevExpress.data.utils - * @public - */ -export function compileSetter(expr: string | Array): Function; +export { + compileGetter, + compileSetter, +} from './common/data'; diff --git a/packages/devextreme/js/utils.js b/packages/devextreme/js/utils.js index 1733a2aedeb2..39ce31a3a29a 100644 --- a/packages/devextreme/js/utils.js +++ b/packages/devextreme/js/utils.js @@ -1,7 +1 @@ -import { compileGetter, compileSetter } from './core/utils/data'; - - -export { - compileGetter, - compileSetter -}; +export { compileGetter, compileSetter } from './common/data'; diff --git a/packages/devextreme/js/viz/bar_gauge.d.ts b/packages/devextreme/js/viz/bar_gauge.d.ts index 0b103253c679..197ba14b4044 100644 --- a/packages/devextreme/js/viz/bar_gauge.d.ts +++ b/packages/devextreme/js/viz/bar_gauge.d.ts @@ -5,13 +5,13 @@ import { import { template, -} from '../core/templates/template'; +} from '../common'; import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { Format, diff --git a/packages/devextreme/js/viz/bullet.d.ts b/packages/devextreme/js/viz/bullet.d.ts index bcbd6b775051..7f3f9fde76b0 100644 --- a/packages/devextreme/js/viz/bullet.d.ts +++ b/packages/devextreme/js/viz/bullet.d.ts @@ -2,7 +2,7 @@ import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { FileSavingEventInfo, diff --git a/packages/devextreme/js/viz/chart.d.ts b/packages/devextreme/js/viz/chart.d.ts index 6ca37fe59ef4..b31838092ba3 100644 --- a/packages/devextreme/js/viz/chart.d.ts +++ b/packages/devextreme/js/viz/chart.d.ts @@ -9,7 +9,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { Format, @@ -17,7 +17,11 @@ import { import { template, -} from '../core/templates/template'; + SingleOrMultiple, + HorizontalAlignment, + Position, + VerticalAlignment, +} from '../common'; import { BaseChart, @@ -39,13 +43,6 @@ import { IncidentInfo, } from './core/base_widget'; -import { - SingleOrMultiple, - HorizontalAlignment, - Position, - VerticalAlignment, -} from '../common'; - import { ArgumentAxisHoverMode, AxisScaleType, diff --git a/packages/devextreme/js/viz/chart_components/base_chart.d.ts b/packages/devextreme/js/viz/chart_components/base_chart.d.ts index a8f58fe68b74..d1221eb46190 100644 --- a/packages/devextreme/js/viz/chart_components/base_chart.d.ts +++ b/packages/devextreme/js/viz/chart_components/base_chart.d.ts @@ -5,14 +5,15 @@ import { import { template, -} from '../../core/templates/template'; + SingleOrMultiple, +} from '../../common'; import DataSource, { DataSourceLike } from '../../data/data_source'; import { EventInfo, NativeEventInfo, -} from '../../events/index'; +} from '../../common/core/events'; import { Format, @@ -44,10 +45,6 @@ import { PaletteExtensionMode, } from '../../common/charts'; -import { - SingleOrMultiple, -} from '../../common'; - /** * @docid * @hidden diff --git a/packages/devextreme/js/viz/chart_components/scroll_bar.js b/packages/devextreme/js/viz/chart_components/scroll_bar.js index c94223ce2a0b..cb0a054dfe4b 100644 --- a/packages/devextreme/js/viz/chart_components/scroll_bar.js +++ b/packages/devextreme/js/viz/chart_components/scroll_bar.js @@ -1,10 +1,10 @@ -import eventsEngine from '../../events/core/events_engine'; -import { fireEvent } from '../../events/utils/index'; +import eventsEngine from '../../common/core/events/core/events_engine'; +import { fireEvent } from '../../common/core/events/utils/index'; import { extend } from '../../core/utils/extend'; import { Translator2D } from '../translators/translator2d'; import { isDefined } from '../../core/utils/type'; import { noop } from '../../core/utils/common'; -import { start as dragEventStart, move as dragEventMove, end as dragEventEnd } from '../../events/drag'; +import { start as dragEventStart, move as dragEventMove, end as dragEventEnd } from '../../common/core/events/drag'; const _min = Math.min; const _max = Math.max; diff --git a/packages/devextreme/js/viz/chart_components/shutter_zoom.js b/packages/devextreme/js/viz/chart_components/shutter_zoom.js index 97b0becfb80a..d58f07eacd99 100644 --- a/packages/devextreme/js/viz/chart_components/shutter_zoom.js +++ b/packages/devextreme/js/viz/chart_components/shutter_zoom.js @@ -1,4 +1,4 @@ -import { start as dragEventStart, move as dragEventMove, end as dragEventEnd } from '../../events/drag'; +import { start as dragEventStart, move as dragEventMove, end as dragEventEnd } from '../../common/core/events/drag'; const SHUTTER_EVENTS_NS = '.shutter-zoom'; const DRAG_START_EVENT_NAME = dragEventStart + SHUTTER_EVENTS_NS; const DRAG_UPDATE_EVENT_NAME = dragEventMove + SHUTTER_EVENTS_NS; diff --git a/packages/devextreme/js/viz/chart_components/tracker.js b/packages/devextreme/js/viz/chart_components/tracker.js index c196126e275b..5a4493c32e7d 100644 --- a/packages/devextreme/js/viz/chart_components/tracker.js +++ b/packages/devextreme/js/viz/chart_components/tracker.js @@ -1,12 +1,12 @@ import domAdapter from '../../core/dom_adapter'; -import eventsEngine from '../../events/core/events_engine'; -import { name as clickEventName } from '../../events/click'; +import eventsEngine from '../../common/core/events/core/events_engine'; +import { name as clickEventName } from '../../common/core/events/click'; import { extend } from '../../core/utils/extend'; import { each as _each } from '../../core/utils/iterator'; import consts from '../components/consts'; import { getDistance, pointInCanvas as inCanvas, normalizeEnum as _normalizeEnum } from '../core/utils'; -import pointerEvents from '../../events/pointer'; -import { addNamespace } from '../../events/utils/index'; +import pointerEvents from '../../common/core/events/pointer'; +import { addNamespace } from '../../common/core/events/utils/index'; import { isDefined } from '../../core/utils/type'; import { noop as _noop } from '../../core/utils/common'; import errors from '../../core/errors'; diff --git a/packages/devextreme/js/viz/chart_components/zoom_and_pan.js b/packages/devextreme/js/viz/chart_components/zoom_and_pan.js index 3d9c68eaefeb..c6493f5a425d 100644 --- a/packages/devextreme/js/viz/chart_components/zoom_and_pan.js +++ b/packages/devextreme/js/viz/chart_components/zoom_and_pan.js @@ -2,9 +2,9 @@ import { isDefined } from '../../core/utils/type'; import { extend } from '../../core/utils/extend'; import { normalizeEnum, getVizRangeObject } from '../core/utils'; -import { name as wheelEvent } from '../../events/core/wheel'; -import * as transformEvents from '../../events/transform'; -import { start as dragEventStart, move as dragEventMove, end as dragEventEnd } from '../../events/drag'; +import { name as wheelEvent } from '../../common/core/events/core/wheel'; +import * as transformEvents from '../../common/core/events/transform'; +import { start as dragEventStart, move as dragEventMove, end as dragEventEnd } from '../../common/core/events/drag'; const EVENTS_NS = '.zoomAndPanNS'; diff --git a/packages/devextreme/js/viz/circular_gauge.d.ts b/packages/devextreme/js/viz/circular_gauge.d.ts index f1805c2f40b2..61bf9b612030 100644 --- a/packages/devextreme/js/viz/circular_gauge.d.ts +++ b/packages/devextreme/js/viz/circular_gauge.d.ts @@ -6,7 +6,7 @@ import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { FileSavingEventInfo, @@ -16,7 +16,7 @@ import { import { template, -} from '../core/templates/template'; +} from '../common'; import { BaseGauge, diff --git a/packages/devextreme/js/viz/components/tracker.js b/packages/devextreme/js/viz/components/tracker.js index 4d586ec57b6d..c08f04c6e8e7 100644 --- a/packages/devextreme/js/viz/components/tracker.js +++ b/packages/devextreme/js/viz/components/tracker.js @@ -1,8 +1,8 @@ -import { eventData as _eventData } from '../../events/utils/index'; +import { eventData as _eventData } from '../../common/core/events/utils/index'; import domAdapter from '../../core/dom_adapter'; -import { name as clickEventName } from '../../events/click'; -import pointer from '../../events/pointer'; -import eventsEngine from '../../events/core/events_engine'; +import { name as clickEventName } from '../../common/core/events/click'; +import pointer from '../../common/core/events/pointer'; +import eventsEngine from '../../common/core/events/core/events_engine'; const downPointerEventName = pointer.down; const movePointerEventName = pointer.move; diff --git a/packages/devextreme/js/viz/core/annotations.js b/packages/devextreme/js/viz/core/annotations.js index cbd5cfcc92fb..100b8afc6d4f 100644 --- a/packages/devextreme/js/viz/core/annotations.js +++ b/packages/devextreme/js/viz/core/annotations.js @@ -4,10 +4,10 @@ import { Tooltip } from '../core/tooltip'; import { extend } from '../../core/utils/extend'; import { patchFontOptions } from './utils'; import { Plaque } from './plaque'; -import pointerEvents from '../../events/pointer'; -import { start as dragEventStart, move as dragEventMove, end as dragEventEnd } from '../../events/drag'; -import { addNamespace } from '../../events/utils/index'; -import eventsEngine from '../../events/core/events_engine'; +import pointerEvents from '../../common/core/events/pointer'; +import { start as dragEventStart, move as dragEventMove, end as dragEventEnd } from '../../common/core/events/drag'; +import { addNamespace } from '../../common/core/events/utils/index'; +import eventsEngine from '../../common/core/events/core/events_engine'; const getDocument = domAdapter.getDocument; diff --git a/packages/devextreme/js/viz/core/base_widget.d.ts b/packages/devextreme/js/viz/core/base_widget.d.ts index f38d30aedac1..a7fc2975fbec 100644 --- a/packages/devextreme/js/viz/core/base_widget.d.ts +++ b/packages/devextreme/js/viz/core/base_widget.d.ts @@ -10,7 +10,7 @@ import { import { Cancelable, EventInfo, -} from '../../events/index'; +} from '../../common/core/events'; import { Format, diff --git a/packages/devextreme/js/viz/core/data_source.js b/packages/devextreme/js/viz/core/data_source.js index 5f33a3c1ee9c..27518ef780e8 100644 --- a/packages/devextreme/js/viz/core/data_source.js +++ b/packages/devextreme/js/viz/core/data_source.js @@ -1,5 +1,5 @@ import { noop } from '../../core/utils/common'; -import DataHelperMixin from '../../data_helper'; +import DataHelperMixin from '../../common/data/data_helper'; const postCtor = DataHelperMixin.postCtor; let name; const members = { diff --git a/packages/devextreme/js/viz/core/export.js b/packages/devextreme/js/viz/core/export.js index 3cfb800306f7..49add1f9fbe9 100644 --- a/packages/devextreme/js/viz/core/export.js +++ b/packages/devextreme/js/viz/core/export.js @@ -3,11 +3,11 @@ import { getWindow } from '../../core/utils/window'; import { patchFontOptions } from './utils'; import { HIDDEN_FOR_EXPORT } from '../../core/utils/svg'; import { export as _export, image as imageExporter, svg as svgExporter, pdf as pdfExporter } from '../../exporter'; -import messageLocalization from '../../localization/message'; +import messageLocalization from '../../common/core/localization/message'; import { isDefined } from '../../core/utils/type'; import { getTheme } from '../themes'; -import { start as hoverEventStart, end as hoverEventEnd } from '../../events/hover'; -import pointerEvents from '../../events/pointer'; +import { start as hoverEventStart, end as hoverEventEnd } from '../../common/core/events/hover'; +import pointerEvents from '../../common/core/events/pointer'; import { logger } from '../../core/utils/console'; import { getWidth } from '../../core/utils/size'; import { Renderer } from './renderers/renderer'; diff --git a/packages/devextreme/js/viz/core/renderers/animation.js b/packages/devextreme/js/viz/core/renderers/animation.js index 91e2c79bb021..beea948c287c 100644 --- a/packages/devextreme/js/viz/core/renderers/animation.js +++ b/packages/devextreme/js/viz/core/renderers/animation.js @@ -1,4 +1,4 @@ -import { requestAnimationFrame, cancelAnimationFrame } from '../../../animation/frame'; +import { requestAnimationFrame, cancelAnimationFrame } from '../../../common/core/animation/frame'; const noop = function() { }; export const easingFunctions = { easeOutCubic: function(pos, start, end) { return (pos === 1) ? end : ((1 - Math.pow((1 - pos), 3)) * (end - start) + (+start)); }, diff --git a/packages/devextreme/js/viz/core/renderers/renderer.js b/packages/devextreme/js/viz/core/renderers/renderer.js index 4795d7acbc6d..3317f2c83207 100644 --- a/packages/devextreme/js/viz/core/renderers/renderer.js +++ b/packages/devextreme/js/viz/core/renderers/renderer.js @@ -3,7 +3,7 @@ import domAdapter from '../../../core/dom_adapter'; import { getWindow } from '../../../core/utils/window'; import callOnce from '../../../core/utils/call_once'; -import eventsEngine from '../../../events/core/events_engine'; +import eventsEngine from '../../../common/core/events/core/events_engine'; import { getSvgMarkup } from '../../../core/utils/svg'; import { AnimationController } from './animation'; import { normalizeBBox, rotateBBox, normalizeEnum, normalizeArcParams, getNextDefsSvgId } from '../utils'; diff --git a/packages/devextreme/js/viz/funnel.d.ts b/packages/devextreme/js/viz/funnel.d.ts index 68a3015db7c2..11df9b417337 100644 --- a/packages/devextreme/js/viz/funnel.d.ts +++ b/packages/devextreme/js/viz/funnel.d.ts @@ -7,14 +7,16 @@ import { import { template, -} from '../core/templates/template'; + HorizontalEdge, + SingleMultipleOrNone, +} from '../common'; import { EventInfo, NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { Format, @@ -33,11 +35,6 @@ import BaseWidget, { IncidentInfo, } from './core/base_widget'; -import { - HorizontalEdge, - SingleMultipleOrNone, -} from '../common'; - import { DashStyle, HatchDirection, diff --git a/packages/devextreme/js/viz/gauges/base_gauge.d.ts b/packages/devextreme/js/viz/gauges/base_gauge.d.ts index 9c8db391b798..3d169ef86766 100644 --- a/packages/devextreme/js/viz/gauges/base_gauge.d.ts +++ b/packages/devextreme/js/viz/gauges/base_gauge.d.ts @@ -5,15 +5,17 @@ import { import { template, -} from '../../core/templates/template'; + HorizontalEdge, + VerticalEdge, +} from '../../common'; import { EventInfo, -} from '../../events/index'; +} from '../../common/core/events'; import { Format, -} from '../../localization'; +} from '../../common/core/localization'; import BaseWidget, { BaseWidgetLoadingIndicator, @@ -21,11 +23,6 @@ import BaseWidget, { BaseWidgetTooltip, } from '../core/base_widget'; -import { - HorizontalEdge, - VerticalEdge, -} from '../../common'; - import { AnimationEaseMode, Palette, diff --git a/packages/devextreme/js/viz/gauges/tracker.js b/packages/devextreme/js/viz/gauges/tracker.js index 7c148091735e..48816cd98603 100644 --- a/packages/devextreme/js/viz/gauges/tracker.js +++ b/packages/devextreme/js/viz/gauges/tracker.js @@ -1,10 +1,10 @@ -import eventsEngine from '../../events/core/events_engine'; +import eventsEngine from '../../common/core/events/core/events_engine'; import Class from '../../core/class'; import domAdapter from '../../core/dom_adapter'; -import { name as wheelEventName } from '../../events/core/wheel'; +import { name as wheelEventName } from '../../common/core/events/core/wheel'; import ReadyCallbacks from '../../core/utils/ready_callbacks'; -import { addNamespace } from '../../events/utils/index'; -import pointerEvents from '../../events/pointer'; +import { addNamespace } from '../../common/core/events/utils/index'; +import pointerEvents from '../../common/core/events/pointer'; ///#DEBUG import { debug } from '../../core/utils/console'; ///#ENDDEBUG diff --git a/packages/devextreme/js/viz/linear_gauge.d.ts b/packages/devextreme/js/viz/linear_gauge.d.ts index 0079aa0c4867..06283ea8b9bd 100644 --- a/packages/devextreme/js/viz/linear_gauge.d.ts +++ b/packages/devextreme/js/viz/linear_gauge.d.ts @@ -2,7 +2,7 @@ import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { FileSavingEventInfo, diff --git a/packages/devextreme/js/viz/pie_chart.d.ts b/packages/devextreme/js/viz/pie_chart.d.ts index 2c3096263e98..03a33bd4f755 100644 --- a/packages/devextreme/js/viz/pie_chart.d.ts +++ b/packages/devextreme/js/viz/pie_chart.d.ts @@ -5,14 +5,14 @@ import { import { template, -} from '../core/templates/template'; +} from '../common'; import { EventInfo, NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { Format, diff --git a/packages/devextreme/js/viz/polar_chart.d.ts b/packages/devextreme/js/viz/polar_chart.d.ts index 8490e8b0bd3b..df3467eb1df3 100644 --- a/packages/devextreme/js/viz/polar_chart.d.ts +++ b/packages/devextreme/js/viz/polar_chart.d.ts @@ -9,7 +9,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { Format, @@ -34,7 +34,8 @@ import { import { template, -} from '../core/templates/template'; + SingleOrMultiple, +} from '../common'; import { FileSavingEventInfo, @@ -42,10 +43,6 @@ import { IncidentInfo, } from './core/base_widget'; -import { - SingleOrMultiple, -} from '../common'; - import { ArgumentAxisHoverMode, AxisScaleType, diff --git a/packages/devextreme/js/viz/range_selector.d.ts b/packages/devextreme/js/viz/range_selector.d.ts index ee84c775a622..ac633fe31b30 100644 --- a/packages/devextreme/js/viz/range_selector.d.ts +++ b/packages/devextreme/js/viz/range_selector.d.ts @@ -5,7 +5,7 @@ import { NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { Format, diff --git a/packages/devextreme/js/viz/range_selector/tracker.js b/packages/devextreme/js/viz/range_selector/tracker.js index 4c64a4980ad4..703565ce6823 100644 --- a/packages/devextreme/js/viz/range_selector/tracker.js +++ b/packages/devextreme/js/viz/range_selector/tracker.js @@ -1,5 +1,5 @@ -import eventsEngine from '../../events/core/events_engine'; -import pointerEvents from '../../events/pointer'; +import eventsEngine from '../../common/core/events/core/events_engine'; +import pointerEvents from '../../common/core/events/pointer'; import { getWindow } from '../../core/utils/window'; import domAdapter from '../../core/dom_adapter'; import { each } from '../../core/utils/iterator'; diff --git a/packages/devextreme/js/viz/sankey.d.ts b/packages/devextreme/js/viz/sankey.d.ts index f29a7f0b2047..6fea1dcdedbf 100644 --- a/packages/devextreme/js/viz/sankey.d.ts +++ b/packages/devextreme/js/viz/sankey.d.ts @@ -7,14 +7,15 @@ import { import { template, -} from '../core/templates/template'; + VerticalAlignment, +} from '../common'; import { EventInfo, NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import BaseWidget, { BaseWidgetOptions, @@ -24,10 +25,6 @@ import BaseWidget, { IncidentInfo, } from './core/base_widget'; -import { - VerticalAlignment, -} from '../common'; - import { HatchDirection, Palette, diff --git a/packages/devextreme/js/viz/sparkline.d.ts b/packages/devextreme/js/viz/sparkline.d.ts index 94263a5ee38c..2c4c516fae0e 100644 --- a/packages/devextreme/js/viz/sparkline.d.ts +++ b/packages/devextreme/js/viz/sparkline.d.ts @@ -4,7 +4,7 @@ import { EventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { FileSavingEventInfo, diff --git a/packages/devextreme/js/viz/sparklines/base_sparkline.d.ts b/packages/devextreme/js/viz/sparklines/base_sparkline.d.ts index 57e98373fce9..70fe5a8d4cf3 100644 --- a/packages/devextreme/js/viz/sparklines/base_sparkline.d.ts +++ b/packages/devextreme/js/viz/sparklines/base_sparkline.d.ts @@ -5,11 +5,11 @@ import { import { template, -} from '../../core/templates/template'; +} from '../../common'; import { EventInfo, -} from '../../events/index'; +} from '../../common/core/events'; import BaseWidget, { BaseWidgetExport, diff --git a/packages/devextreme/js/viz/sparklines/base_sparkline.js b/packages/devextreme/js/viz/sparklines/base_sparkline.js index f69136bf7669..697fe576ff61 100644 --- a/packages/devextreme/js/viz/sparklines/base_sparkline.js +++ b/packages/devextreme/js/viz/sparklines/base_sparkline.js @@ -1,10 +1,10 @@ -import eventsEngine from '../../events/core/events_engine'; +import eventsEngine from '../../common/core/events/core/events_engine'; import domAdapter from '../../core/dom_adapter'; import { isFunction } from '../../core/utils/type'; import BaseWidget from '../../__internal/viz/core/m_base_widget'; import { extend } from '../../core/utils/extend'; -import { addNamespace } from '../../events/utils/index'; -import pointerEvents from '../../events/pointer'; +import { addNamespace } from '../../common/core/events/utils/index'; +import pointerEvents from '../../common/core/events/pointer'; import { pointInCanvas } from '../core/utils'; import $ from '../../core/renderer'; diff --git a/packages/devextreme/js/viz/tree_map.d.ts b/packages/devextreme/js/viz/tree_map.d.ts index fc80e072c193..fbb36e05d561 100644 --- a/packages/devextreme/js/viz/tree_map.d.ts +++ b/packages/devextreme/js/viz/tree_map.d.ts @@ -7,14 +7,15 @@ import { import { template, -} from '../core/templates/template'; + SingleMultipleOrNone, +} from '../common'; import { EventInfo, NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import BaseWidget, { BaseWidgetMargin, @@ -25,10 +26,6 @@ import BaseWidget, { IncidentInfo, } from './core/base_widget'; -import { - SingleMultipleOrNone, -} from '../common'; - import { Palette, PaletteExtensionMode, diff --git a/packages/devextreme/js/viz/vector_map.d.ts b/packages/devextreme/js/viz/vector_map.d.ts index e6bc4a43adf4..3e77d059f765 100644 --- a/packages/devextreme/js/viz/vector_map.d.ts +++ b/packages/devextreme/js/viz/vector_map.d.ts @@ -7,14 +7,17 @@ import { import { template, -} from '../core/templates/template'; + HorizontalAlignment, + SingleMultipleOrNone, + VerticalEdge, +} from '../common'; import { EventInfo, NativeEventInfo, InitializedEventInfo, ChangedOptionInfo, -} from '../events/index'; +} from '../common/core/events'; import { Format, @@ -45,12 +48,6 @@ import { Font, } from '../common/charts'; -import { - HorizontalAlignment, - SingleMultipleOrNone, - VerticalEdge, -} from '../common'; - export { SingleMultipleOrNone, Palette, diff --git a/packages/devextreme/js/viz/vector_map/map_layer.js b/packages/devextreme/js/viz/vector_map/map_layer.js index a7bb5cffa499..a6b60250c913 100644 --- a/packages/devextreme/js/viz/vector_map/map_layer.js +++ b/packages/devextreme/js/viz/vector_map/map_layer.js @@ -1,7 +1,7 @@ import { noop } from '../../core/utils/common'; import { extend } from '../../core/utils/extend'; import { each } from '../../core/utils/iterator'; -import DataHelperMixin from '../../data_helper'; +import DataHelperMixin from '../../common/data/data_helper'; import { isFunction as _isFunction, isDefined as _isDefined } from '../../core/utils/type'; import { Deferred, when } from '../../core/utils/deferred'; import { parseScalar as _parseScalar, diff --git a/packages/devextreme/js/viz/vector_map/tracker.js b/packages/devextreme/js/viz/vector_map/tracker.js index b6f0a8e241d6..e94fbbb5b31f 100644 --- a/packages/devextreme/js/viz/vector_map/tracker.js +++ b/packages/devextreme/js/viz/vector_map/tracker.js @@ -1,9 +1,9 @@ -import eventsEngine from '../../events/core/events_engine'; +import eventsEngine from '../../common/core/events/core/events_engine'; import { getNavigator, hasProperty } from '../../core/utils/window'; import domAdapter from '../../core/dom_adapter'; import { makeEventEmitter } from './event_emitter'; -import { addNamespace } from '../../events/utils/index'; -import { name as wheelEventName } from '../../events/core/wheel'; +import { addNamespace } from '../../common/core/events/utils/index'; +import { name as wheelEventName } from '../../common/core/events/core/wheel'; import { parseScalar } from '../core/utils'; const navigator = getNavigator(); diff --git a/packages/devextreme/project.json b/packages/devextreme/project.json index 5d2b5674ecaf..e6d99395baf0 100644 --- a/packages/devextreme/project.json +++ b/packages/devextreme/project.json @@ -21,8 +21,8 @@ "{projectRoot}/artifacts", "!{projectRoot}/artifacts/css", "{projectRoot}/js/bundles/dx.custom.js", - "{projectRoot}/js/localization/cldr-data", - "{projectRoot}/js/localization/default_messages.js", + "{projectRoot}/js/common/core/localization/cldr-data", + "{projectRoot}/js/common/core/localization/default_messages.js", "{projectRoot}/js/renovation/**/*.j.tsx", "{projectRoot}/testing/tests/Renovation/widgets.json" ] @@ -64,8 +64,8 @@ "{projectRoot}/artifacts", "!{projectRoot}/artifacts/css", "{projectRoot}/js/bundles/dx.custom.js", - "{projectRoot}/js/localization/cldr-data", - "{projectRoot}/js/localization/default_messages.js", + "{projectRoot}/js/common/core/localization/cldr-data", + "{projectRoot}/js/common/core/localization/default_messages.js", "{projectRoot}/js/renovation/**/*.j.tsx", "{projectRoot}/testing/tests/Renovation/widgets.json" ], diff --git a/packages/devextreme/testing/helpers/data.errorHandlingHelper.js b/packages/devextreme/testing/helpers/data.errorHandlingHelper.js index af3d56a2637d..9e4d4d445357 100644 --- a/packages/devextreme/testing/helpers/data.errorHandlingHelper.js +++ b/packages/devextreme/testing/helpers/data.errorHandlingHelper.js @@ -5,7 +5,7 @@ if(typeof define === 'function' && define.amd) { define(function(require, exports, module) { - root.DevExpress.data.testing.ErrorHandlingHelper = module.exports = factory(require('jquery'), require('core/class'), require('data/errors')); + root.DevExpress.data.testing.ErrorHandlingHelper = module.exports = factory(require('jquery'), require('core/class'), require('common/data/errors')); }); } else { root.DevExpress.data.testing.ErrorHandlingHelper = factory(window.jQuery, DevExpress.Class, DevExpress.data); diff --git a/packages/devextreme/testing/helpers/dataGridMocks.js b/packages/devextreme/testing/helpers/dataGridMocks.js index 5e004fc85ec8..966f4ccb369a 100644 --- a/packages/devextreme/testing/helpers/dataGridMocks.js +++ b/packages/devextreme/testing/helpers/dataGridMocks.js @@ -12,7 +12,7 @@ if(typeof define === 'function' && define.amd) { require('__internal/core/utils/m_dom'), require('__internal/core/utils/m_common'), require('__internal/core/utils/m_type'), - require('data/array_store'), + require('common/data/array_store'), 'DataGrid' ); }); @@ -26,7 +26,7 @@ if(typeof define === 'function' && define.amd) { DevExpress.require('__internal/core/utils/m_dom'), DevExpress.require('__internal/core/utils/m_common'), DevExpress.require('__internal/core/utils/m_type'), - DevExpress.require('data/array_store'), + DevExpress.require('common/data/array_store'), 'DataGrid' )); } diff --git a/packages/devextreme/testing/helpers/eventHelper.js b/packages/devextreme/testing/helpers/eventHelper.js index 176238f0a3b2..0e02549c83e4 100644 --- a/packages/devextreme/testing/helpers/eventHelper.js +++ b/packages/devextreme/testing/helpers/eventHelper.js @@ -1,4 +1,4 @@ -import registerEventCallbacks from 'events/core/event_registrator_callbacks'; +import registerEventCallbacks from 'common/core/events/core/event_registrator_callbacks'; export const special = {}; diff --git a/packages/devextreme/testing/helpers/fileManager/events.js b/packages/devextreme/testing/helpers/fileManager/events.js index c00410613759..14c34ca19301 100644 --- a/packages/devextreme/testing/helpers/fileManager/events.js +++ b/packages/devextreme/testing/helpers/fileManager/events.js @@ -1,4 +1,4 @@ -import pointerEvents from 'events/pointer'; +import pointerEvents from 'common/core/events/pointer'; export const triggerCellClick = ($cell, singleSelection) => { $cell diff --git a/packages/devextreme/testing/helpers/grid/keyboardNavigationHelper.js b/packages/devextreme/testing/helpers/grid/keyboardNavigationHelper.js index 8493ddbda084..697783eeed59 100644 --- a/packages/devextreme/testing/helpers/grid/keyboardNavigationHelper.js +++ b/packages/devextreme/testing/helpers/grid/keyboardNavigationHelper.js @@ -1,14 +1,14 @@ import $ from 'jquery'; import devices from '__internal/core/m_devices'; -import { addNamespace, createEvent } from 'events/utils/index'; +import { addNamespace, createEvent } from 'common/core/events/utils/index'; import { setupDataGridModules, MockDataController, MockColumnsController, MockSelectionController } from '../dataGridMocks.js'; -import clickEvent from 'events/click'; -import pointerEvents from 'events/pointer'; -import { keyboard } from 'events/short'; +import clickEvent from 'common/core/events/click'; +import pointerEvents from 'common/core/events/pointer'; +import { keyboard } from 'common/core/events/short'; import DataGridWrapper from '../wrappers/dataGridWrappers.js'; export const dataGridWrapper = new DataGridWrapper('#container'); diff --git a/packages/devextreme/testing/helpers/jQueryEventsPatch.js b/packages/devextreme/testing/helpers/jQueryEventsPatch.js index d6f3ea676162..5cfc97c2445c 100644 --- a/packages/devextreme/testing/helpers/jQueryEventsPatch.js +++ b/packages/devextreme/testing/helpers/jQueryEventsPatch.js @@ -1,6 +1,6 @@ /* global jQuery */ -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; let originalJQueryEvent; const originalJQueryMethods = {}; diff --git a/packages/devextreme/testing/helpers/pointerMock.js b/packages/devextreme/testing/helpers/pointerMock.js index f3f751f7de31..d5c923fe5d17 100644 --- a/packages/devextreme/testing/helpers/pointerMock.js +++ b/packages/devextreme/testing/helpers/pointerMock.js @@ -5,8 +5,8 @@ root.pointerMock = module.exports = factory( require('jquery'), require('inferno'), - require('events/gesture/emitter.gesture'), - require('events/click')); + require('common/core/events/gesture/emitter.gesture'), + require('common/core/events/click')); }); } else { root.pointerMock = factory(jQuery, DevExpress.events.GestureEmitter, DevExpress.events.click); diff --git a/packages/devextreme/testing/helpers/scheduler/helpers.js b/packages/devextreme/testing/helpers/scheduler/helpers.js index 1d5532258c14..5f2eee2a0af7 100644 --- a/packages/devextreme/testing/helpers/scheduler/helpers.js +++ b/packages/devextreme/testing/helpers/scheduler/helpers.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import { locate } from 'animation/translator'; +import { locate } from 'common/core/animation/translator'; import devices from '__internal/core/m_devices'; import pointerMock from '../../helpers/pointerMock.js'; import dataUtils from 'core/element_data'; diff --git a/packages/devextreme/testing/helpers/treeListMocks.js b/packages/devextreme/testing/helpers/treeListMocks.js index da98c335a813..45f1d23b83e0 100644 --- a/packages/devextreme/testing/helpers/treeListMocks.js +++ b/packages/devextreme/testing/helpers/treeListMocks.js @@ -12,7 +12,7 @@ if(typeof define === 'function' && define.amd) { require('__internal/core/utils/m_dom'), require('__internal/core/utils/m_common'), require('__internal/core/utils/m_type'), - require('data/array_store'), + require('common/data/array_store'), 'TreeList' ); }); @@ -26,7 +26,7 @@ if(typeof define === 'function' && define.amd) { DevExpress.require('__internal/core/utils/m_dom'), DevExpress.require('__internal/core/utils/m_common'), DevExpress.require('__internal/core/utils/m_type'), - DevExpress.require('data/array_store'), + DevExpress.require('common/data/array_store'), 'TreeList' )); } diff --git a/packages/devextreme/testing/tests/Bootstrap Integration/widget_bundled.tests.js b/packages/devextreme/testing/tests/Bootstrap Integration/widget_bundled.tests.js index 559c99e400a3..7e2f308a28c9 100644 --- a/packages/devextreme/testing/tests/Bootstrap Integration/widget_bundled.tests.js +++ b/packages/devextreme/testing/tests/Bootstrap Integration/widget_bundled.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import GoogleStaticProvider from '__internal/ui/map/m_provider.google_static'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.animation/easing.tests.js b/packages/devextreme/testing/tests/DevExpress.animation/easing.tests.js index adf9e3eeef7a..b09d7ca4bf74 100644 --- a/packages/devextreme/testing/tests/DevExpress.animation/easing.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.animation/easing.tests.js @@ -1,4 +1,4 @@ -const easing = require('animation/easing'); +const easing = require('common/core/animation/easing'); QUnit.module('easing'); diff --git a/packages/devextreme/testing/tests/DevExpress.animation/fx.tests.js b/packages/devextreme/testing/tests/DevExpress.animation/fx.tests.js index cf4909c380ef..7263b533411a 100644 --- a/packages/devextreme/testing/tests/DevExpress.animation/fx.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.animation/fx.tests.js @@ -1,10 +1,10 @@ import $ from 'jquery'; import renderer from 'core/renderer'; -import eventsEngine from 'events/core/events_engine'; -import fx from 'animation/fx'; -import translator from 'animation/translator'; -import animationFrame from 'animation/frame'; -import positionUtils from 'animation/position'; +import eventsEngine from 'common/core/events/core/events_engine'; +import fx from 'common/core/animation/fx'; +import translator from 'common/core/animation/translator'; +import animationFrame from 'common/core/animation/frame'; +import positionUtils from 'common/core/animation/position'; import support from '__internal/core/utils/m_support'; QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.animation/position.tests.js b/packages/devextreme/testing/tests/DevExpress.animation/position.tests.js index 1598072bb10c..4a2dbe729c71 100644 --- a/packages/devextreme/testing/tests/DevExpress.animation/position.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.animation/position.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import positionUtils from 'animation/position'; -import translator from 'animation/translator'; +import positionUtils from 'common/core/animation/position'; +import translator from 'common/core/animation/translator'; import browser from 'core/utils/browser'; import fixtures from '../../helpers/positionFixtures.js'; import devices from 'core/devices.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.animation/transitionExecutors.tests.js b/packages/devextreme/testing/tests/DevExpress.animation/transitionExecutors.tests.js index bfe41d92d605..0c8f20239018 100644 --- a/packages/devextreme/testing/tests/DevExpress.animation/transitionExecutors.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.animation/transitionExecutors.tests.js @@ -1,10 +1,10 @@ import $ from 'jquery'; import { noop } from '__internal/core/utils/m_common'; import devices from '__internal/core/m_devices'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; -import { presets as animationPresets } from 'animation/presets/presets'; -import TransitionExecutorModule from 'animation/transition_executor/transition_executor'; +import { presets as animationPresets } from 'common/core/animation/presets/presets'; +import TransitionExecutorModule from 'common/core/animation/transition_executor/transition_executor'; QUnit.module('transition executor', { beforeEach: function() { diff --git a/packages/devextreme/testing/tests/DevExpress.animation/translator.tests.js b/packages/devextreme/testing/tests/DevExpress.animation/translator.tests.js index 22387d5b9389..795307a74539 100644 --- a/packages/devextreme/testing/tests/DevExpress.animation/translator.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.animation/translator.tests.js @@ -1,5 +1,5 @@ const $ = require('jquery'); -const translator = require('animation/translator'); +const translator = require('common/core/animation/translator'); const styleUtils = require('core/utils/style'); const transformStyle = styleUtils.styleProp('transform'); diff --git a/packages/devextreme/testing/tests/DevExpress.core/domComponent.tests.js b/packages/devextreme/testing/tests/DevExpress.core/domComponent.tests.js index 755e5c4f6609..d425dbf2bb60 100644 --- a/packages/devextreme/testing/tests/DevExpress.core/domComponent.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.core/domComponent.tests.js @@ -7,8 +7,8 @@ import { TemplateManager } from 'core/template_manager'; import { noop } from 'core/utils/common'; import publicComponentUtils from 'core/utils/public_component'; import resizeCallbacks from 'core/utils/resize_callbacks'; -import eventsEngine from 'events/core/events_engine'; -import { triggerResizeEvent } from 'events/visibility_change'; +import eventsEngine from 'common/core/events/core/events_engine'; +import { triggerResizeEvent } from 'common/core/events/visibility_change'; import licenseModule, { setLicenseCheckSkipCondition } from '__internal/core/license/license_validation'; import $ from 'jquery'; diff --git a/packages/devextreme/testing/tests/DevExpress.core/utils.animationFrame.tests.js b/packages/devextreme/testing/tests/DevExpress.core/utils.animationFrame.tests.js index d9f77af4f661..d7e6613bccd6 100644 --- a/packages/devextreme/testing/tests/DevExpress.core/utils.animationFrame.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.core/utils.animationFrame.tests.js @@ -1,5 +1,5 @@ const $ = require('jquery'); -const animationFrame = require('animation/frame'); +const animationFrame = require('common/core/animation/frame'); QUnit.module('animation frame'); diff --git a/packages/devextreme/testing/tests/DevExpress.core/utils.dom.tests.js b/packages/devextreme/testing/tests/DevExpress.core/utils.dom.tests.js index d942925e548d..51e2fd52a7fd 100644 --- a/packages/devextreme/testing/tests/DevExpress.core/utils.dom.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.core/utils.dom.tests.js @@ -3,7 +3,7 @@ import domUtils from '__internal/core/utils/m_dom'; import support from '__internal/core/utils/m_support'; import styleUtils from 'core/utils/style'; import devices from '__internal/core/m_devices'; -import initMobileViewport from 'mobile/init_mobile_viewport'; +import initMobileViewport from 'common/core/environment/init_mobile_viewport'; import keyboardMock from '../../helpers/keyboardMock.js'; QUnit.module('createMarkup'); diff --git a/packages/devextreme/testing/tests/DevExpress.core/utils.topOverlay.tests.js b/packages/devextreme/testing/tests/DevExpress.core/utils.topOverlay.tests.js index 21eeb586be11..e166fe4a77b8 100644 --- a/packages/devextreme/testing/tests/DevExpress.core/utils.topOverlay.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.core/utils.topOverlay.tests.js @@ -1,5 +1,5 @@ -const hideTopOverlay = require('mobile/hide_top_overlay'); -const hideTopOverlayCallback = require('mobile/hide_callback').hideCallback; +const hideTopOverlay = require('common/core/environment/hide_top_overlay'); +const hideTopOverlayCallback = require('common/core/environment/hide_callback').hideCallback; QUnit.module('top overlay util'); diff --git a/packages/devextreme/testing/tests/DevExpress.core/utils.type.tests.js b/packages/devextreme/testing/tests/DevExpress.core/utils.type.tests.js index 89dd97bbd897..64fc102e8fbf 100644 --- a/packages/devextreme/testing/tests/DevExpress.core/utils.type.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.core/utils.type.tests.js @@ -2,7 +2,7 @@ const $ = require('jquery'); const typeUtils = require('core/utils/type'); const Deferred = require('core/utils/deferred').Deferred; const renderer = require('core/renderer'); -const eventsEngine = require('events/core/events_engine'); +const eventsEngine = require('common/core/events/core/events_engine'); QUnit.module('Type checking'); diff --git a/packages/devextreme/testing/tests/DevExpress.data/applyChanges.tests.js b/packages/devextreme/testing/tests/DevExpress.data/applyChanges.tests.js index c695345634ae..69e06664766a 100644 --- a/packages/devextreme/testing/tests/DevExpress.data/applyChanges.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.data/applyChanges.tests.js @@ -1,7 +1,7 @@ import { extend } from 'core/utils/extend'; -import { errors } from 'data/errors'; -import applyChanges from 'data/apply_changes'; -import { applyBatch } from 'data/array_utils'; +import { errors } from 'common/data/errors'; +import applyChanges from 'common/data/apply_changes'; +import { applyBatch } from 'common/data/array_utils'; QUnit.module('Apply Changes', { beforeEach: function() { diff --git a/packages/devextreme/testing/tests/DevExpress.data/dataSource.tests.js b/packages/devextreme/testing/tests/DevExpress.data/dataSource.tests.js index 08893a18ea7a..945740dc6339 100644 --- a/packages/devextreme/testing/tests/DevExpress.data/dataSource.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.data/dataSource.tests.js @@ -3,12 +3,12 @@ import { noop } from 'core/utils/common'; import typeUtils from 'core/utils/type'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; import ajaxMock from '../../helpers/ajaxMock.js'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import Store from 'data/abstract_store'; -import ArrayStore from 'data/array_store'; -import ODataStore from 'data/odata/store'; +import ArrayStore from 'common/data/array_store'; +import ODataStore from 'common/data/odata/store'; import AggregateCalculator from '__internal/grids/data_grid/m_aggregate_calculator'; -import LocalStore from 'data/local_store'; +import LocalStore from 'common/data/local_store'; const TEN_NUMBERS = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]; diff --git a/packages/devextreme/testing/tests/DevExpress.data/dataSourceCreating.tests.js b/packages/devextreme/testing/tests/DevExpress.data/dataSourceCreating.tests.js index 85817d81fd97..ef08ff6e5590 100644 --- a/packages/devextreme/testing/tests/DevExpress.data/dataSourceCreating.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.data/dataSourceCreating.tests.js @@ -1,8 +1,8 @@ -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; -import CustomStore from 'data/custom_store'; -import LocalStore from 'data/local_store'; -import ODataStore from 'data/odata/store'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import { CustomStore } from 'common/data/custom_store'; +import LocalStore from 'common/data/local_store'; +import ODataStore from 'common/data/odata/store'; import ajaxMock from '../../helpers/ajaxMock.js'; QUnit.test('no options', function(assert) { diff --git a/packages/devextreme/testing/tests/DevExpress.data/odataCommonOData.tests.js b/packages/devextreme/testing/tests/DevExpress.data/odataCommonOData.tests.js index 29fec4dfbad4..b34ede44a4c0 100644 --- a/packages/devextreme/testing/tests/DevExpress.data/odataCommonOData.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.data/odataCommonOData.tests.js @@ -1,6 +1,6 @@ const $ = require('jquery'); -const converters = require('data/odata/utils').keyConverters; -const interpretJsonFormat = require('data/odata/utils').OData__internals.interpretJsonFormat; +const converters = require('common/data/odata/utils').keyConverters; +const interpretJsonFormat = require('common/data/odata/utils').OData__internals.interpretJsonFormat; const Guid = require('core/guid'); QUnit.module('OData 2'); diff --git a/packages/devextreme/testing/tests/DevExpress.data/odataQuery.tests.js b/packages/devextreme/testing/tests/DevExpress.data/odataQuery.tests.js index 34c68a7770b1..ae4afe0e4af7 100644 --- a/packages/devextreme/testing/tests/DevExpress.data/odataQuery.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.data/odataQuery.tests.js @@ -1,11 +1,11 @@ import $ from 'jquery'; -import { EdmLiteral } from 'data/odata/utils'; -import query from 'data/query'; +import { EdmLiteral } from 'common/data/odata/utils'; +import query from 'common/data/query'; import config from 'core/config'; import ErrorHandlingHelper from '../../helpers/data.errorHandlingHelper.js'; import ajaxMock from '../../helpers/ajaxMock.js'; -import 'data/odata/query_adapter'; +import 'common/data/odata/query_adapter'; const MUST_NOT_REACH_MESSAGE = 'Shouldn\'t reach this point'; diff --git a/packages/devextreme/testing/tests/DevExpress.data/odataStore.tests.js b/packages/devextreme/testing/tests/DevExpress.data/odataStore.tests.js index 47aeef00fdec..d04ce4da3d7e 100644 --- a/packages/devextreme/testing/tests/DevExpress.data/odataStore.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.data/odataStore.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; -import { EdmLiteral } from 'data/odata/utils'; -import ODataStore from 'data/odata/store'; -import ODataContext from 'data/odata/context'; +import { EdmLiteral } from 'common/data/odata/utils'; +import ODataStore from 'common/data/odata/store'; +import ODataContext from 'common/data/odata/context'; import Guid from 'core/guid'; import config from 'core/config'; import ErrorHandlingHelper from '../../helpers/data.errorHandlingHelper.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.data/queryArray.tests.js b/packages/devextreme/testing/tests/DevExpress.data/queryArray.tests.js index 3dcef8b21a72..75f50b9b8518 100644 --- a/packages/devextreme/testing/tests/DevExpress.data/queryArray.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.data/queryArray.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import QUERY from 'data/query'; +import QUERY from 'common/data/query'; import ErrorHandlingHelper from '../../helpers/data.errorHandlingHelper.js'; QUnit.module('Misc'); diff --git a/packages/devextreme/testing/tests/DevExpress.data/storeArray.tests.js b/packages/devextreme/testing/tests/DevExpress.data/storeArray.tests.js index 84cc244759c6..fa57b16bac3f 100644 --- a/packages/devextreme/testing/tests/DevExpress.data/storeArray.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.data/storeArray.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import ArrayStore from 'data/array_store'; +import ArrayStore from 'common/data/array_store'; import config from 'core/config'; import ErrorHandlingHelper from '../../helpers/data.errorHandlingHelper.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.data/storeCustom.tests.js b/packages/devextreme/testing/tests/DevExpress.data/storeCustom.tests.js index b54f31ff3851..77d783ec7864 100644 --- a/packages/devextreme/testing/tests/DevExpress.data/storeCustom.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.data/storeCustom.tests.js @@ -1,7 +1,7 @@ const $ = require('jquery'); -const CustomStore = require('data/custom_store'); -const { isLoadResultObject, isGroupItemsArray, isItemsArray } = require('common/data/custom-store'); -const processRequestResultLock = require('data/utils').processRequestResultLock; +const CustomStore = require('common/data/custom_store').CustomStore; +const { isLoadResultObject, isGroupItemsArray, isItemsArray } = require('common/data/custom_store'); +const processRequestResultLock = require('common/data/utils').processRequestResultLock; const config = require('core/config'); const ERRORS = { INVALID_RETURN: 'E4012', diff --git a/packages/devextreme/testing/tests/DevExpress.data/storeCustom_loadModeRaw.tests.js b/packages/devextreme/testing/tests/DevExpress.data/storeCustom_loadModeRaw.tests.js index 96d1feb16542..1d77cb003870 100644 --- a/packages/devextreme/testing/tests/DevExpress.data/storeCustom_loadModeRaw.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.data/storeCustom_loadModeRaw.tests.js @@ -1,4 +1,4 @@ -const CustomStore = require('data/custom_store'); +const CustomStore = require('common/data/custom_store').CustomStore; const ErrorHandlingHelper = require('../../helpers/data.errorHandlingHelper.js'); const RAW = 'raw'; diff --git a/packages/devextreme/testing/tests/DevExpress.data/storeLocal.tests.js b/packages/devextreme/testing/tests/DevExpress.data/storeLocal.tests.js index 612e6ff9d87b..84d9f5ef2c2c 100644 --- a/packages/devextreme/testing/tests/DevExpress.data/storeLocal.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.data/storeLocal.tests.js @@ -1,4 +1,4 @@ -const LocalStore = require('data/local_store'); +const LocalStore = require('common/data/local_store'); const TEST_NAME = '65DFE188-D178-11E1-A097-51216288709B'; const DX_LOCALSTORAGE_ITEM_NAME = 'dx-data-localStore-' + TEST_NAME; diff --git a/packages/devextreme/testing/tests/DevExpress.data/utils.tests.js b/packages/devextreme/testing/tests/DevExpress.data/utils.tests.js index 8431238e4f57..8636eb417d75 100644 --- a/packages/devextreme/testing/tests/DevExpress.data/utils.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.data/utils.tests.js @@ -1,7 +1,7 @@ import Guid from 'core/guid'; -import { processRequestResultLock, keysEqual, isGroupCriterion, throttleChanges, base64_encode as b64, isUniformEqualsByOr } from 'data/utils'; -import { EdmLiteral } from 'data/odata/utils'; -import { createObjectWithChanges } from 'data/array_utils'; +import { processRequestResultLock, keysEqual, isGroupCriterion, throttleChanges, base64_encode as b64, isUniformEqualsByOr } from 'common/data/utils'; +import { EdmLiteral } from 'common/data/odata/utils'; +import { createObjectWithChanges } from 'common/data/array_utils'; QUnit.module('keysEqual'); diff --git a/packages/devextreme/testing/tests/DevExpress.exporter/commonParts/loadPanel.tests.js b/packages/devextreme/testing/tests/DevExpress.exporter/commonParts/loadPanel.tests.js index 69d27708414a..c9c852ee0bab 100644 --- a/packages/devextreme/testing/tests/DevExpress.exporter/commonParts/loadPanel.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.exporter/commonParts/loadPanel.tests.js @@ -2,7 +2,7 @@ import { setHeight } from 'core/utils/size'; import $ from 'core/renderer'; import localization from 'localization'; import ja from 'localization/messages/ja.json!'; -import messageLocalization from 'localization/message'; +import messageLocalization from 'common/core/localization/message'; import { getWindow, setWindow } from 'core/utils/window'; const LOAD_PANEL_CLASS = 'dx-loadpanel'; diff --git a/packages/devextreme/testing/tests/DevExpress.jquery/easing.tests.js b/packages/devextreme/testing/tests/DevExpress.jquery/easing.tests.js index 93fb2aea7c16..5fe65561f3a5 100644 --- a/packages/devextreme/testing/tests/DevExpress.jquery/easing.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.jquery/easing.tests.js @@ -1,6 +1,6 @@ define(function(require) { const $ = require('jquery'); - const easing = require('animation/easing'); + const easing = require('common/core/animation/easing'); require('integration/jquery'); diff --git a/packages/devextreme/testing/tests/DevExpress.jquery/eventRegistrator.tests.js b/packages/devextreme/testing/tests/DevExpress.jquery/eventRegistrator.tests.js index 070d6b6c34f9..515a82a64cb8 100644 --- a/packages/devextreme/testing/tests/DevExpress.jquery/eventRegistrator.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.jquery/eventRegistrator.tests.js @@ -1,6 +1,6 @@ define(function(require) { const $ = require('jquery'); - const registerEvent = require('events/core/event_registrator'); + const registerEvent = require('common/core/events/core/event_registrator'); const Class = require('core/class'); require('integration/jquery'); diff --git a/packages/devextreme/testing/tests/DevExpress.knockout/dataGrid.tests.js b/packages/devextreme/testing/tests/DevExpress.knockout/dataGrid.tests.js index 457fb2d01906..243371183df1 100644 --- a/packages/devextreme/testing/tests/DevExpress.knockout/dataGrid.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.knockout/dataGrid.tests.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import ko from 'knockout'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import { logger } from 'core/utils/console'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import dataSourceAdapter from '__internal/grids/data_grid/m_data_source_adapter'; import dataGridMocks from '../../helpers/dataGridMocks.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.knockout/datebox.tests.js b/packages/devextreme/testing/tests/DevExpress.knockout/datebox.tests.js index e29096d6e049..03537c6f0d0b 100644 --- a/packages/devextreme/testing/tests/DevExpress.knockout/datebox.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.knockout/datebox.tests.js @@ -1,11 +1,11 @@ import '../../helpers/noIntl.js'; import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import support from '__internal/core/utils/m_support'; import devices from '__internal/core/m_devices'; import uiDateUtils from '__internal/ui/date_box/m_date_utils'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import ko from 'knockout'; import 'integration/knockout'; diff --git a/packages/devextreme/testing/tests/DevExpress.knockout/eventRegistration.tests.js b/packages/devextreme/testing/tests/DevExpress.knockout/eventRegistration.tests.js index 36f117bdb39b..d361180f9fd4 100644 --- a/packages/devextreme/testing/tests/DevExpress.knockout/eventRegistration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.knockout/eventRegistration.tests.js @@ -1,11 +1,11 @@ const $ = require('jquery'); const ko = require('knockout'); -const registerEvent = require('events/core/event_registrator'); -const dragEvents = require('events/drag'); -const clickEvent = require('events/click'); -const holdEvent = require('events/hold'); -const pointerEvents = require('events/pointer'); -const swipeEvents = require('events/swipe'); +const registerEvent = require('common/core/events/core/event_registrator'); +const dragEvents = require('common/core/events/drag'); +const clickEvent = require('common/core/events/click'); +const holdEvent = require('common/core/events/hold'); +const pointerEvents = require('common/core/events/pointer'); +const swipeEvents = require('common/core/events/swipe'); require('integration/knockout'); diff --git a/packages/devextreme/testing/tests/DevExpress.knockout/form.tests.js b/packages/devextreme/testing/tests/DevExpress.knockout/form.tests.js index 8029aeed34a1..31700ce67b68 100644 --- a/packages/devextreme/testing/tests/DevExpress.knockout/form.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.knockout/form.tests.js @@ -4,7 +4,7 @@ import { FIELD_ITEM_CONTENT_CLASS } from '__internal/ui/form/constants'; import { FIELD_ITEM_CONTENT_LOCATION_CLASS } from '__internal/ui/form/components/m_field_item'; import { FIELD_ITEM_LABEL_LOCATION_CLASS } from '__internal/ui/form/components/m_label'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import 'ui/form'; import 'ui/text_area'; diff --git a/packages/devextreme/testing/tests/DevExpress.knockout/lookup.tests.js b/packages/devextreme/testing/tests/DevExpress.knockout/lookup.tests.js index 23670235094d..35414eb2f14c 100644 --- a/packages/devextreme/testing/tests/DevExpress.knockout/lookup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.knockout/lookup.tests.js @@ -1,5 +1,5 @@ const $ = require('jquery'); -const fx = require('animation/fx'); +const fx = require('common/core/animation/fx'); const executeAsyncMock = require('../../helpers/executeAsyncMock.js'); const ko = require('knockout'); diff --git a/packages/devextreme/testing/tests/DevExpress.knockout/overlay.tests.js b/packages/devextreme/testing/tests/DevExpress.knockout/overlay.tests.js index 8d639dd14750..4a0fee800fa1 100644 --- a/packages/devextreme/testing/tests/DevExpress.knockout/overlay.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.knockout/overlay.tests.js @@ -1,5 +1,5 @@ const $ = require('jquery'); -const fx = require('animation/fx'); +const fx = require('common/core/animation/fx'); const ko = require('knockout'); require('ui/overlay/ui.overlay'); diff --git a/packages/devextreme/testing/tests/DevExpress.knockout/selectBox.tests.js b/packages/devextreme/testing/tests/DevExpress.knockout/selectBox.tests.js index 84f6b611e11e..e1ef4e07e3a6 100644 --- a/packages/devextreme/testing/tests/DevExpress.knockout/selectBox.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.knockout/selectBox.tests.js @@ -1,6 +1,6 @@ const $ = require('jquery'); const SelectBox = require('ui/select_box'); -const fx = require('animation/fx'); +const fx = require('common/core/animation/fx'); const ko = require('knockout'); require('integration/knockout'); diff --git a/packages/devextreme/testing/tests/DevExpress.knockout/tagBox.tests.js b/packages/devextreme/testing/tests/DevExpress.knockout/tagBox.tests.js index 5a48c80d0db8..88ba2a659dd1 100644 --- a/packages/devextreme/testing/tests/DevExpress.knockout/tagBox.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.knockout/tagBox.tests.js @@ -1,6 +1,6 @@ const $ = require('jquery'); const TagBox = require('ui/tag_box'); -const fx = require('animation/fx'); +const fx = require('common/core/animation/fx'); const ko = require('knockout'); require('integration/knockout'); diff --git a/packages/devextreme/testing/tests/DevExpress.localization/ldml.tests.js b/packages/devextreme/testing/tests/DevExpress.localization/ldml.tests.js index 5817e1307444..b29a2a08b8c5 100644 --- a/packages/devextreme/testing/tests/DevExpress.localization/ldml.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.localization/ldml.tests.js @@ -1,17 +1,17 @@ require('../../helpers/noIntl.js'); -const getNumberFormatter = require('localization/ldml/number').getFormatter; -const getNumberFormat = require('localization/ldml/number').getFormat; -const getDateParser = require('localization/ldml/date.parser').getParser; -const getRegExpInfo = require('localization/ldml/date.parser').getRegExpInfo; -const getDateFormatter = require('localization/ldml/date.formatter').getFormatter; -const getDateFormat = require('localization/ldml/date.format').getFormat; -const defaultDateNames = require('localization/default_date_names'); -const numberLocalization = require('localization/number'); -const dateLocalization = require('localization/date'); +const getNumberFormatter = require('common/core/localization/ldml/number').getFormatter; +const getNumberFormat = require('common/core/localization/ldml/number').getFormat; +const getDateParser = require('common/core/localization/ldml/date.parser').getParser; +const getRegExpInfo = require('common/core/localization/ldml/date.parser').getRegExpInfo; +const getDateFormatter = require('common/core/localization/ldml/date.formatter').getFormatter; +const getDateFormat = require('common/core/localization/ldml/date.format').getFormat; +const defaultDateNames = require('common/core/localization/default_date_names'); +const numberLocalization = require('common/core/localization/number'); +const dateLocalization = require('common/core/localization/date'); const extend = require('core/utils/extend').extend; const console = require('core/utils/console').logger; -require('localization/currency'); +require('common/core/localization/currency'); const dateParts = extend({}, defaultDateNames, { getPeriodNames: function() { diff --git a/packages/devextreme/testing/tests/DevExpress.localization/locales.tests.js b/packages/devextreme/testing/tests/DevExpress.localization/locales.tests.js index c2e0e95a785c..7148c2d07e2c 100644 --- a/packages/devextreme/testing/tests/DevExpress.localization/locales.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.localization/locales.tests.js @@ -1,4 +1,4 @@ -const messageLocalization = require('localization/message'); +const messageLocalization = require('common/core/localization/message'); const localization = require('localization'); const dictionaries = {}; diff --git a/packages/devextreme/testing/tests/DevExpress.localization/localization.base.tests.js b/packages/devextreme/testing/tests/DevExpress.localization/localization.base.tests.js index fa576022e381..13324b337cf0 100644 --- a/packages/devextreme/testing/tests/DevExpress.localization/localization.base.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.localization/localization.base.tests.js @@ -1,9 +1,9 @@ import '../../helpers/noIntl.js'; import sharedTests from './sharedParts/localization.shared.js'; import localization from 'localization'; -import numberLocalization from 'localization/number'; -import dateLocalization from 'localization/date'; -import messageLocalization from 'localization/message'; +import numberLocalization from 'common/core/localization/number'; +import dateLocalization from 'common/core/localization/date'; +import messageLocalization from 'common/core/localization/message'; import { logger } from 'core/utils/console'; QUnit.module('base localization', {}, () => { diff --git a/packages/devextreme/testing/tests/DevExpress.localization/localization.custom.tests.js b/packages/devextreme/testing/tests/DevExpress.localization/localization.custom.tests.js index 1177965ed1de..c3079b762b39 100644 --- a/packages/devextreme/testing/tests/DevExpress.localization/localization.custom.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.localization/localization.custom.tests.js @@ -1,5 +1,5 @@ -const numberLocalization = require('localization/number'); -const dateLocalization = require('localization/date'); +const numberLocalization = require('common/core/localization/number'); +const dateLocalization = require('common/core/localization/date'); QUnit.module('Custom date names', { beforeEach: function() { diff --git a/packages/devextreme/testing/tests/DevExpress.localization/localization.globalize.tests.js b/packages/devextreme/testing/tests/DevExpress.localization/localization.globalize.tests.js index caace08a1911..d028a628baf6 100644 --- a/packages/devextreme/testing/tests/DevExpress.localization/localization.globalize.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.localization/localization.globalize.tests.js @@ -2,11 +2,11 @@ SystemJS.config({ meta: { './localization.base.tests.js': { deps: [ - 'localization/globalize/core', - 'localization/globalize/number', - 'localization/globalize/currency', - 'localization/globalize/date', - 'localization/globalize/message' + 'common/core/localization/globalize/core', + 'common/core/localization/globalize/number', + 'common/core/localization/globalize/currency', + 'common/core/localization/globalize/date', + 'common/core/localization/globalize/message' ] } }, @@ -29,19 +29,19 @@ define(function(require, exports, module) { require('devextreme-cldr-data/da.json!json') ]; - require('localization/globalize/core'); - require('localization/globalize/number'); - require('localization/globalize/currency'); - require('localization/globalize/date'); - require('localization/globalize/message'); + require('common/core/localization/globalize/core'); + require('common/core/localization/globalize/number'); + require('common/core/localization/globalize/currency'); + require('common/core/localization/globalize/date'); + require('common/core/localization/globalize/message'); const generateExpectedDate = require('../../helpers/dateHelper.js').generateDate; const $ = require('jquery'); const Globalize = require('globalize'); - const numberLocalization = require('localization/number'); - const dateLocalization = require('localization/date'); - const messageLocalization = require('localization/message'); + const numberLocalization = require('common/core/localization/number'); + const dateLocalization = require('common/core/localization/date'); + const messageLocalization = require('common/core/localization/message'); const config = require('core/config'); const ExcelJSLocalizationFormatTests = require('../DevExpress.exporter/exceljsParts/exceljs.format.tests.js'); diff --git a/packages/devextreme/testing/tests/DevExpress.localization/localization.globalize.widgets.tests.js b/packages/devextreme/testing/tests/DevExpress.localization/localization.globalize.widgets.tests.js index 72451b01e2ff..459ce6cb4c20 100644 --- a/packages/devextreme/testing/tests/DevExpress.localization/localization.globalize.widgets.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.localization/localization.globalize.widgets.tests.js @@ -16,14 +16,14 @@ cldrData.forEach(localeCldrData => { Globalize.load(localeCldrData); }); -require('localization/globalize/core'); -require('localization/globalize/number'); -require('localization/globalize/currency'); -require('localization/globalize/date'); -require('localization/globalize/message'); +require('common/core/localization/globalize/core'); +require('common/core/localization/globalize/number'); +require('common/core/localization/globalize/currency'); +require('common/core/localization/globalize/date'); +require('common/core/localization/globalize/message'); const $ = require('jquery'); -const dateLocalization = require('localization/date'); +const dateLocalization = require('common/core/localization/date'); require('ui/date_box'); require('viz/chart'); diff --git a/packages/devextreme/testing/tests/DevExpress.localization/localization.intl.tests.js b/packages/devextreme/testing/tests/DevExpress.localization/localization.intl.tests.js index d703cb459f62..67bfb491acee 100644 --- a/packages/devextreme/testing/tests/DevExpress.localization/localization.intl.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.localization/localization.intl.tests.js @@ -1,12 +1,12 @@ import '../../helpers/noIntl.js'; import Intl from 'intl'; import sharedTests from './sharedParts/localization.shared.js'; -import dateLocalization from 'localization/date'; -import numberLocalization from 'localization/number'; -import intlDateLocalization from 'localization/intl/date'; -import intlNumberLocalization from 'localization/intl/number'; -import { locale } from 'localization/core'; -import { disableIntl } from 'localization'; +import dateLocalization from 'common/core/localization/date'; +import numberLocalization from 'common/core/localization/number'; +import intlDateLocalization from 'common/core/localization/intl/date'; +import intlNumberLocalization from 'common/core/localization/intl/number'; +import { locale } from 'common/core/localization/core'; +import { disableIntl } from 'common/core/localization'; import config from 'core/config'; import ExcelJSLocalizationFormatTests from '../DevExpress.exporter/exceljsParts/exceljs.format.tests.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.localization/localization.intl.widgets.tests.js b/packages/devextreme/testing/tests/DevExpress.localization/localization.intl.widgets.tests.js index 7d04d2d60d70..b8568c4684bb 100644 --- a/packages/devextreme/testing/tests/DevExpress.localization/localization.intl.widgets.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.localization/localization.intl.widgets.tests.js @@ -1,11 +1,11 @@ import 'intl'; -import 'localization/number'; -import { locale } from 'localization/core'; +import 'common/core/localization/number'; +import { locale } from 'common/core/localization/core'; import $ from 'jquery'; import 'ui/date_box'; import { ExportFormat } from 'exporter/exceljs/export_format'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import keyboardMock from '../../helpers/keyboardMock.js'; const TEXTEDITOR_INPUT_SELECTOR = '.dx-texteditor-input'; diff --git a/packages/devextreme/testing/tests/DevExpress.localization/localization.nativeIntl.base.tests.js b/packages/devextreme/testing/tests/DevExpress.localization/localization.nativeIntl.base.tests.js index e934db79c565..802712834c5e 100644 --- a/packages/devextreme/testing/tests/DevExpress.localization/localization.nativeIntl.base.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.localization/localization.nativeIntl.base.tests.js @@ -1,6 +1,6 @@ -import dateLocalization from 'localization/date'; -import numberLocalization from 'localization/number'; -import { locale } from 'localization/core'; +import dateLocalization from 'common/core/localization/date'; +import numberLocalization from 'common/core/localization/number'; +import { locale } from 'common/core/localization/core'; locale('en'); diff --git a/packages/devextreme/testing/tests/DevExpress.localization/localization.utils.tests.js b/packages/devextreme/testing/tests/DevExpress.localization/localization.utils.tests.js index b2fef7d89ea5..7a30ec972570 100644 --- a/packages/devextreme/testing/tests/DevExpress.localization/localization.utils.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.localization/localization.utils.tests.js @@ -1,4 +1,4 @@ -import { toFixed } from 'localization/utils'; +import { toFixed } from 'common/core/localization/utils'; const { module: testModule, test } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.localization/sharedParts/localization.shared.js b/packages/devextreme/testing/tests/DevExpress.localization/sharedParts/localization.shared.js index cf45f8dd2395..75749894b0da 100644 --- a/packages/devextreme/testing/tests/DevExpress.localization/sharedParts/localization.shared.js +++ b/packages/devextreme/testing/tests/DevExpress.localization/sharedParts/localization.shared.js @@ -1,7 +1,7 @@ import $ from 'jquery'; -import dateLocalization from 'localization/date'; -import numberLocalization from 'localization/number'; -import messageLocalization from 'localization/message'; +import dateLocalization from 'common/core/localization/date'; +import numberLocalization from 'common/core/localization/number'; +import messageLocalization from 'common/core/localization/message'; import errors from 'core/errors'; import localization from 'localization'; import config from 'core/config'; diff --git a/packages/devextreme/testing/tests/DevExpress.localization/validation.tests.js b/packages/devextreme/testing/tests/DevExpress.localization/validation.tests.js index 3db8ffa96ac4..623796d1dd67 100644 --- a/packages/devextreme/testing/tests/DevExpress.localization/validation.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.localization/validation.tests.js @@ -1,8 +1,8 @@ -require('localization/globalize/core'); -require('localization/globalize/number'); -require('localization/globalize/currency'); -require('localization/globalize/date'); -require('localization/globalize/message'); +require('common/core/localization/globalize/core'); +require('common/core/localization/globalize/number'); +require('common/core/localization/globalize/currency'); +require('common/core/localization/globalize/date'); +require('common/core/localization/globalize/message'); const cldrData = [ require('devextreme-cldr-data/fr.json!json') ]; diff --git a/packages/devextreme/testing/tests/DevExpress.performance/overlaysStyleRecalculations.tests.js b/packages/devextreme/testing/tests/DevExpress.performance/overlaysStyleRecalculations.tests.js index ba690583970c..27278b49c314 100644 --- a/packages/devextreme/testing/tests/DevExpress.performance/overlaysStyleRecalculations.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.performance/overlaysStyleRecalculations.tests.js @@ -5,7 +5,7 @@ require('ui/popup'); require('generic_light.css!'); const $ = require('jquery'); -const positionUtils = require('animation/position'); +const positionUtils = require('common/core/animation/position'); positionUtils.calculateScrollbarWidth(); diff --git a/packages/devextreme/testing/tests/DevExpress.performance/translatorRecalculations.tests.js b/packages/devextreme/testing/tests/DevExpress.performance/translatorRecalculations.tests.js index 232060e7df51..cab359634bbf 100644 --- a/packages/devextreme/testing/tests/DevExpress.performance/translatorRecalculations.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.performance/translatorRecalculations.tests.js @@ -1,6 +1,6 @@ require('../../helpers/qunitPerformanceExtension.js'); const $ = require('jquery'); -const translator = require('animation/translator'); +const translator = require('common/core/animation/translator'); QUnit.testStart(function() { $('#qunit-fixture').html('
'); diff --git a/packages/devextreme/testing/tests/DevExpress.serverSide/widgetsCreation.tests.js b/packages/devextreme/testing/tests/DevExpress.serverSide/widgetsCreation.tests.js index 2d3b4b8802d8..cd0c19786b31 100644 --- a/packages/devextreme/testing/tests/DevExpress.serverSide/widgetsCreation.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.serverSide/widgetsCreation.tests.js @@ -1,6 +1,6 @@ const widgets = require('../../helpers/widgetsList.js').widgetsList; -const DataSource = require('data/data_source'); +const DataSource = require('common/data/data_source'); QUnit.module('Widget creation', { beforeEach: function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/click.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/click.tests.js index bb78aa995d6f..b1a60379837d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/click.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/click.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import { noop } from 'core/utils/common'; -import clickEvent from 'events/click'; +import clickEvent from 'common/core/events/click'; import domUtils from '__internal/core/utils/m_dom'; import support from '__internal/core/utils/m_support'; import devices from '__internal/core/m_devices'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/contextmenu.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/contextmenu.tests.js index 25de98e2b59d..b2fbf79af553 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/contextmenu.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/contextmenu.tests.js @@ -2,8 +2,8 @@ const $ = require('jquery'); const noop = require('core/utils/common').noop; const devices = require('core/devices'); const support = require('core/utils/support'); -const holdEvent = require('events/hold'); -const contextMenuEvent = require('events/contextmenu'); +const holdEvent = require('common/core/events/hold'); +const contextMenuEvent = require('common/core/events/contextmenu'); QUnit.testStart(function() { const markup = diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/dblclick.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/dblclick.tests.js index 0d6d62db4230..0a29dd77b7f3 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/dblclick.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/dblclick.tests.js @@ -1,5 +1,5 @@ const $ = require('jquery'); -const dblclickEvent = require('events/dblclick'); +const dblclickEvent = require('common/core/events/dblclick'); const { dblClick } = require('__internal/events/m_dblclick'); const pointerMock = require('../../helpers/pointerMock.js'); @@ -39,7 +39,7 @@ QUnit.test('dxdblclick should not be handled on a usual dxclick even if dblClick const el = $('#element'); const handler = sinon.stub(); - // emulate calling .off('dxdblclick') before import 'events/dblclick' (T1208575) + // emulate calling .off('dxdblclick') before import 'common/core/events/dblclick' (T1208575) dblClick.remove(); el.off(dblclickEvent.name); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/drag.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/drag.tests.js index 075133aea5e5..182e9b32063c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/drag.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/drag.tests.js @@ -1,8 +1,8 @@ const $ = require('jquery'); const noop = require('core/utils/common').noop; -const dragEvents = require('events/drag'); +const dragEvents = require('common/core/events/drag'); const support = require('core/utils/support'); -const GestureEmitter = require('events/gesture/emitter.gesture'); +const GestureEmitter = require('common/core/events/gesture/emitter.gesture'); const dropTargets = dragEvents.dropTargets; const pointerMock = require('../../helpers/pointerMock.js'); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/eventRegistrator.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/eventRegistrator.tests.js index 8991da54889f..0bdf439505a3 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/eventRegistrator.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/eventRegistrator.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; -import registerEvent from 'events/core/event_registrator'; -import eventsEngine from 'events/core/events_engine'; -import registerEventCallbacks from 'events/core/event_registrator_callbacks'; +import registerEvent from 'common/core/events/core/event_registrator'; +import eventsEngine from 'common/core/events/core/events_engine'; +import registerEventCallbacks from 'common/core/events/core/event_registrator_callbacks'; import Class from 'core/class'; import eventHelper from '../../helpers/eventHelper.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/events.utils.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/events.utils.tests.js index b1debe5b84b3..9def33e8166b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/events.utils.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/events.utils.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import { compare } from 'core/utils/version'; -import { getEventTarget } from 'events/utils/event_target'; +import { getEventTarget } from 'common/core/events/utils/event_target'; import { eventData, eventDelta, @@ -9,7 +9,7 @@ import { normalizeKeyName, getChar, isCommandKeyPressed, -} from 'events/utils/index'; +} from 'common/core/events/utils/index'; import pointerMock from '../../helpers/pointerMock.js'; import nativePointerMock from '../../helpers/nativePointerMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/eventsEngine.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/eventsEngine.tests.js index 9131093a4db0..69dd769503b9 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/eventsEngine.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/eventsEngine.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import keyboardMock from '../../helpers/keyboardMock.js'; -import registerEvent from 'events/core/event_registrator'; +import registerEvent from 'common/core/events/core/event_registrator'; import { compare as compareVersion } from 'core/utils/version'; QUnit.module('base'); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/eventsInteraction.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/eventsInteraction.tests.js index d4ccecc93f9b..627e83b40965 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/eventsInteraction.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/eventsInteraction.tests.js @@ -2,17 +2,17 @@ import $ from 'jquery'; import { noop } from '__internal/core/utils/m_common'; import domUtils from '__internal/core/utils/m_dom'; import devices from '__internal/core/m_devices'; -import eventUtils from 'events/utils/index'; -import Emitter from 'events/core/emitter'; -import GestureEmitter from 'events/gesture/emitter.gesture'; -import registerEmitter from 'events/core/emitter_registrator'; -import feedbackEvents from 'events/core/emitter.feedback'; -import scrollEvents from 'events/gesture/emitter.gesture.scroll'; -import holdEvent from 'events/hold'; -import swipeEvents from 'events/swipe'; -import transformEvent from 'events/transform'; -import dragEvents from 'events/drag'; -import dblclickEvent from 'events/dblclick'; +import eventUtils from 'common/core/events/utils/index'; +import Emitter from 'common/core/events/core/emitter'; +import GestureEmitter from 'common/core/events/gesture/emitter.gesture'; +import registerEmitter from 'common/core/events/core/emitter_registrator'; +import feedbackEvents from 'common/core/events/core/emitter.feedback'; +import scrollEvents from 'common/core/events/gesture/emitter.gesture.scroll'; +import holdEvent from 'common/core/events/hold'; +import swipeEvents from 'common/core/events/swipe'; +import transformEvent from 'common/core/events/transform'; +import dragEvents from 'common/core/events/drag'; +import dblclickEvent from 'common/core/events/dblclick'; import pointerMock from '../../helpers/pointerMock.js'; const GESTURE_COVER_CLASS = 'dx-gesture-cover'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/feedback.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/feedback.tests.js index ca7bdd606531..6458f0852da3 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/feedback.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/feedback.tests.js @@ -1,7 +1,7 @@ const $ = require('jquery'); const noop = require('core/utils/common').noop; const devices = require('core/devices'); -const feedbackEvents = require('events/core/emitter.feedback'); +const feedbackEvents = require('common/core/events/core/emitter.feedback'); const pointerMock = require('../../helpers/pointerMock.js'); QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/hold.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/hold.tests.js index fefc05414cfb..78a4db9961b1 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/hold.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/hold.tests.js @@ -1,5 +1,5 @@ const $ = require('jquery'); -const holdEvent = require('events/hold'); +const holdEvent = require('common/core/events/hold'); const pointerMock = require('../../helpers/pointerMock.js'); QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/hover.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/hover.tests.js index 0924e5cdb6cb..a358fb58f39d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/hover.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/hover.tests.js @@ -1,6 +1,6 @@ const $ = require('jquery'); const devices = require('core/devices'); -const hoverEvents = require('events/hover'); +const hoverEvents = require('common/core/events/hover'); QUnit.testStart(function() { const markup = diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/baseTests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/baseTests.js index e17b0d147aca..abb399642422 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/baseTests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/baseTests.js @@ -1,7 +1,7 @@ const $ = require('jquery'); const noop = require('core/utils/common').noop; -const BaseStrategy = require('events/pointer/base'); -const registerEvent = require('events/core/event_registrator'); +const BaseStrategy = require('common/core/events/pointer/base'); +const registerEvent = require('common/core/events/core/event_registrator'); const special = require('../../../helpers/eventHelper.js').special; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/mouseAndTouchTests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/mouseAndTouchTests.js index fa064fc4536e..ac065b0129b6 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/mouseAndTouchTests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/mouseAndTouchTests.js @@ -1,6 +1,6 @@ const $ = require('jquery'); -const MouseAndTouchStrategy = require('events/pointer/mouse_and_touch'); -const registerEvent = require('events/core/event_registrator'); +const MouseAndTouchStrategy = require('common/core/events/pointer/mouse_and_touch'); +const registerEvent = require('common/core/events/core/event_registrator'); const nativePointerMock = require('../../../helpers/nativePointerMock.js'); const special = require('../../../helpers/eventHelper.js').special; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/mouseTests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/mouseTests.js index 2ba312e54303..8733017ed2d0 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/mouseTests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/mouseTests.js @@ -1,6 +1,6 @@ const $ = require('jquery'); -const MouseStrategy = require('events/pointer/mouse'); -const registerEvent = require('events/core/event_registrator'); +const MouseStrategy = require('common/core/events/pointer/mouse'); +const registerEvent = require('common/core/events/core/event_registrator'); const nativePointerMock = require('../../../helpers/nativePointerMock.js'); const special = require('../../../helpers/eventHelper.js').special; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/strategySelectionTests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/strategySelectionTests.js index 20c35dbfa8d8..323f83a215b7 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/strategySelectionTests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/strategySelectionTests.js @@ -1,8 +1,8 @@ import GlobalConfig from 'core/config'; -import { getStrategy } from 'events/pointer'; -import TouchStrategy from 'events/pointer/touch'; -import MouseStrategy from 'events/pointer/mouse'; -import MouseAndTouchStrategy from 'events/pointer/mouse_and_touch'; +import { getStrategy } from 'common/core/events/pointer'; +import TouchStrategy from 'common/core/events/pointer/touch'; +import MouseStrategy from 'common/core/events/pointer/mouse'; +import MouseAndTouchStrategy from 'common/core/events/pointer/mouse_and_touch'; const { test } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/touchTests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/touchTests.js index 5857804e8c85..78cf41582d81 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/touchTests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/pointerParts/touchTests.js @@ -1,10 +1,10 @@ const $ = require('jquery'); -const TouchStrategy = require('events/pointer/touch'); -const registerEvent = require('events/core/event_registrator'); +const TouchStrategy = require('common/core/events/pointer/touch'); +const registerEvent = require('common/core/events/core/event_registrator'); const nativePointerMock = require('../../../helpers/nativePointerMock.js'); const noop = require('core/utils/common').noop; const special = require('../../../helpers/eventHelper.js').special; -const eventsEngine = require('events/core/events_engine'); +const eventsEngine = require('common/core/events/core/events_engine'); QUnit.module('touch events', { beforeEach: function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/remove.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/remove.tests.js index 93ab45907107..b5f4cc51e47b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/remove.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/remove.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import eventsEngine from 'events/core/events_engine'; -import { removeEvent } from 'events/remove'; +import eventsEngine from 'common/core/events/core/events_engine'; +import { removeEvent } from 'common/core/events/remove'; QUnit.testStart(function() { const markup = '
'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/scroll.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/scroll.tests.js index d15ad4438cab..d80ac13750a1 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/scroll.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/scroll.tests.js @@ -1,11 +1,11 @@ const $ = require('jquery'); const noop = require('core/utils/common').noop; -const scrollEvents = require('events/gesture/emitter.gesture.scroll'); -const GestureEmitter = require('events/gesture/emitter.gesture'); -const eventUtils = require('events/utils/index'); +const scrollEvents = require('common/core/events/gesture/emitter.gesture.scroll'); +const GestureEmitter = require('common/core/events/gesture/emitter.gesture'); +const eventUtils = require('common/core/events/utils/index'); const devices = require('core/devices'); const compareVersions = require('core/utils/version').compare; -const animationFrame = require('animation/frame'); +const animationFrame = require('common/core/animation/frame'); const pointerMock = require('../../helpers/pointerMock.js'); QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/swipe.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/swipe.tests.js index b2b216b4a6ac..fbfa26200fb5 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/swipe.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/swipe.tests.js @@ -1,11 +1,11 @@ import $ from 'jquery'; import { noop } from 'core/utils/common'; -import swipeEvents from 'events/swipe'; +import swipeEvents from 'common/core/events/swipe'; import mathUtils from 'core/utils/math'; import domUtils from '__internal/core/utils/m_dom'; import Action from '__internal/core/m_action'; import devices from '__internal/core/m_devices'; -import GestureEmitter from 'events/gesture/emitter.gesture'; +import GestureEmitter from 'common/core/events/gesture/emitter.gesture'; import pointerMock from '../../helpers/pointerMock.js'; QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/transformation.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/transformation.tests.js index 42ee470f4d90..a0e83e63a5a6 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/transformation.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/transformation.tests.js @@ -1,5 +1,5 @@ const $ = require('jquery'); -const transformEvent = require('events/transform'); +const transformEvent = require('common/core/events/transform'); $('#qunit-fixture').addClass('qunit-fixture-visible'); QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.events/wheel.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.events/wheel.tests.js index 400784272019..458537abb57c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.events/wheel.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.events/wheel.tests.js @@ -1,5 +1,5 @@ const $ = require('jquery'); -const wheelEvent = require('events/core/wheel'); +const wheelEvent = require('common/core/events/core/wheel'); const nativePointerMock = require('../../helpers/nativePointerMock.js'); QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/adaptiveColumns.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/adaptiveColumns.integration.tests.js index 14987b98a6f6..065bbf64d23b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/adaptiveColumns.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/adaptiveColumns.integration.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import typeUtils from 'core/utils/type'; import browser from 'core/utils/browser'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import config from 'core/config'; import DataGridWrapper from '../../helpers/wrappers/dataGridWrappers.js'; import { createDataGrid, baseModuleConfig } from '../../helpers/dataGridHelper.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/adaptiveColumns.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/adaptiveColumns.tests.js index 52cbd4f0801d..e31a921306a1 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/adaptiveColumns.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/adaptiveColumns.tests.js @@ -7,7 +7,7 @@ import { noop as noop } from 'core/utils/common'; import { addShadowDomStyles } from 'core/utils/shadow_dom'; import dataGridMocks from '../../helpers/dataGridMocks.js'; import pointerMock from '../../helpers/pointerMock.js'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import typeUtils from 'core/utils/type'; import config from 'core/config'; import renderer from 'core/renderer'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnChooser.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnChooser.integration.tests.js index 4aacf0bd2a18..c0ccae2eb2f8 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnChooser.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnChooser.integration.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import { createDataGrid, baseModuleConfig } from '../../helpers/dataGridHelper.js'; -import messageLocalization from 'localization/message'; +import messageLocalization from 'common/core/localization/message'; QUnit.testStart(function() { const gridMarkup = ` diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnChooserModule.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnChooserModule.tests.js index 523515b3ce96..ce46b35f237d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnChooserModule.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnChooserModule.tests.js @@ -8,7 +8,7 @@ import devices from '__internal/core/m_devices'; import themes from 'ui/themes'; import dataGridMocks from '../../helpers/dataGridMocks.js'; import publicComponentUtils from 'core/utils/public_component'; -import messageLocalization from 'localization/message'; +import messageLocalization from 'common/core/localization/message'; import { TreeViewSearchBoxWrapper } from '../../helpers/wrappers/searchBoxWrappers.js'; const device = devices.real(); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnFixing.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnFixing.integration.tests.js index ece56b890fbd..e7d48ef9d175 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnFixing.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnFixing.integration.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import browser from 'core/utils/browser'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import commonUtils from 'core/utils/common'; import DataGridWrapper from '../../helpers/wrappers/dataGridWrappers.js'; import { createDataGrid, baseModuleConfig } from '../../helpers/dataGridHelper.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnFixing.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnFixing.tests.js index cdf71831588a..376215cf6ef8 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnFixing.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnFixing.tests.js @@ -9,7 +9,7 @@ import nativePointerMock from '../../helpers/nativePointerMock.js'; import { setupDataGridModules, MockDataController, MockColumnsController } from '../../helpers/dataGridMocks.js'; import gridCoreUtils from '__internal/grids/grid_core/m_utils'; import dataUtils from 'core/element_data'; -import translator from 'animation/translator'; +import translator from 'common/core/animation/translator'; import { getOuterHeight } from 'core/utils/size'; import { addShadowDomStyles } from 'core/utils/shadow_dom'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsController.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsController.tests.js index 87bcb225c478..f6d917b6793b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsController.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsController.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; -import dateLocalization from 'localization/date'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import dateLocalization from 'common/core/localization/date'; import { isFunction } from 'core/utils/type'; import gridCore from '__internal/grids/data_grid/m_core'; import dataSourceAdapter from '__internal/grids/data_grid/m_data_source_adapter'; @@ -14,9 +14,9 @@ import ajaxMock from '../../helpers/ajaxMock.js'; import 'ui/data_grid'; -import 'localization/globalize/currency'; -import 'localization/globalize/number'; -import { locale } from 'localization/core'; +import 'common/core/localization/globalize/currency'; +import 'common/core/localization/globalize/number'; +import { locale } from 'common/core/localization/core'; const createMockDataSource = function(items, loadOptions) { loadOptions = loadOptions || {}; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsHeadersView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsHeadersView.tests.js index dcb9f6736e7a..ee037ba51fe7 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsHeadersView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsHeadersView.tests.js @@ -6,11 +6,11 @@ import typeUtils from 'core/utils/type'; import { format } from 'core/utils/string'; import config from 'core/config'; import devices from '__internal/core/m_devices'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import dataGridMocks from '../../helpers/dataGridMocks.js'; import { findShadowHostOrDocument } from '../../helpers/dataGridHelper.js'; -import dateLocalization from 'localization/date'; -import messageLocalization from 'localization/message'; +import dateLocalization from 'common/core/localization/date'; +import messageLocalization from 'common/core/localization/message'; import { addShadowDomStyles } from 'core/utils/shadow_dom.js'; import 'ui/data_grid'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsResizingReorderingModule.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsResizingReorderingModule.tests.js index 58395ff82d76..b35855666997 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsResizingReorderingModule.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsResizingReorderingModule.tests.js @@ -6,7 +6,7 @@ import 'ui/data_grid'; import $ from 'jquery'; import { noop } from 'core/utils/common'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import dataGridMocks from '../../helpers/dataGridMocks.js'; const MockTablePositionViewController = dataGridMocks.MockTablePositionViewController; @@ -20,7 +20,7 @@ const MockColumnsController = dataGridMocks.MockColumnsController; const MockEditingController = dataGridMocks.MockEditingController; import gridCore from '__internal/grids/data_grid/m_core'; -import dragEvents from 'events/drag'; +import dragEvents from 'common/core/events/drag'; import columnsResizingReordering from '__internal/grids/data_grid/module_not_extended/columns_resizing_reordering'; import { ColumnChooserView } from '__internal/grids/data_grid/module_not_extended/column_chooser'; import { ColumnHeadersView } from '__internal/grids/data_grid/module_not_extended/column_headers'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsView.tests.js index 7115bd35e590..a372e45c8d8f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/columnsView.tests.js @@ -7,7 +7,7 @@ import 'ui/data_grid'; import browser from 'core/utils/browser'; import { ColumnsView } from '__internal/grids/grid_core/views/m_columns_view'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import dataGridMocks from '../../helpers/dataGridMocks.js'; const MockColumnsController = dataGridMocks.MockColumnsController; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataController.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataController.tests.js index 4c8f74f96489..07c53c564db5 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataController.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataController.tests.js @@ -2,10 +2,10 @@ import $ from 'jquery'; import config from 'core/config'; import formatHelper from 'format_helper'; import errors from 'ui/widget/ui.errors'; -import { errors as dataErrors } from 'data/errors'; +import { errors as dataErrors } from 'common/data/errors'; import typeUtils from 'core/utils/type'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; import gridCoreUtils from '__internal/grids/grid_core/m_utils'; import { setupDataGridModules, MockGridDataSource } from '../../helpers/dataGridMocks.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataGrid.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataGrid.tests.js index 021b42030641..e2000e8a5f9c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataGrid.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataGrid.tests.js @@ -9,11 +9,11 @@ import devices from '__internal/core/m_devices'; import { version } from 'core/version'; import errors from 'core/errors'; import gridCore from '__internal/grids/data_grid/m_core'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; -import messageLocalization from 'localization/message'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import messageLocalization from 'common/core/localization/message'; import { setTemplateEngine } from 'core/templates/template_engine_registry'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import config from 'core/config'; import ajaxMock from '../../helpers/ajaxMock.js'; import DataGridWrapper from '../../helpers/wrappers/dataGridWrappers.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataSource.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataSource.tests.js index 6cf38d965b14..bc43bc4c75f4 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataSource.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/dataSource.tests.js @@ -1,11 +1,11 @@ import $ from 'jquery'; import { logger } from 'core/utils/console'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; -import CustomStore from 'data/custom_store'; -import ODataStore from 'data/odata/store'; -import dataQuery from 'data/query'; -import { queryByOptions } from 'data/store_helper'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import { CustomStore } from 'common/data/custom_store'; +import ODataStore from 'common/data/odata/store'; +import dataQuery from 'common/data/query'; +import { queryByOptions } from 'common/data/store_helper'; import gridCore from '__internal/grids/data_grid/m_core'; import { createOffsetFilter } from '__internal/grids/data_grid/grouping/m_grouping_core'; import { setupDataGridModules } from '../../helpers/dataGridMocks.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.integration.tests.js index ea186dd1c2b2..23cbd3158a7f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.integration.tests.js @@ -1,10 +1,10 @@ import $ from 'jquery'; import devices from '__internal/core/m_devices'; -import fx from 'animation/fx'; -import pointerEvents from 'events/pointer'; +import fx from 'common/core/animation/fx'; +import pointerEvents from 'common/core/events/pointer'; import themes from 'ui/themes'; import typeUtils from 'core/utils/type'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import SelectBox from 'ui/select_box'; import 'ui/text_area'; import config from 'core/config'; @@ -18,7 +18,7 @@ import { createDataGrid, baseModuleConfig } from '../../helpers/dataGridHelper.j import { generateItems } from '../../helpers/dataGridMocks.js'; import { getOuterHeight } from 'core/utils/size'; import { getEmulatorStyles } from '../../helpers/stylesHelper.js'; -import messageLocalization from 'localization/message'; +import messageLocalization from 'common/core/localization/message'; const TEXTEDITOR_INPUT_SELECTOR = '.dx-texteditor-input'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.tests.js index 6d5f8a21bc2e..b712d1cc835b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editing.tests.js @@ -1,4 +1,4 @@ -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import config from 'core/config'; import devices from '__internal/core/m_devices'; import dataUtils from 'core/element_data'; @@ -9,11 +9,11 @@ import { Deferred } from 'core/utils/deferred'; import { getHeight, getWidth, setWidth, getOffset } from 'core/utils/size'; import typeUtils from 'core/utils/type'; import { addShadowDomStyles } from 'core/utils/shadow_dom'; -import eventsEngine from 'events/core/events_engine'; -import pointerEvents from 'events/pointer'; -import { name as clickEventName } from 'events/click'; -import { name as dblClickEventName } from 'events/dblclick'; -import { triggerResizeEvent } from 'events/visibility_change'; +import eventsEngine from 'common/core/events/core/events_engine'; +import pointerEvents from 'common/core/events/pointer'; +import { name as clickEventName } from 'common/core/events/click'; +import { name as dblClickEventName } from 'common/core/events/dblclick'; +import { triggerResizeEvent } from 'common/core/events/visibility_change'; import 'generic_light.css!'; import $ from 'jquery'; import 'ui/autocomplete'; @@ -29,7 +29,7 @@ import { getCells, generateItems, MockColumnsController, MockDataController, set import pointerMock from '../../helpers/pointerMock.js'; import DataGridWrapper from '../../helpers/wrappers/dataGridWrappers.js'; import { findShadowHostOrDocument } from '../../helpers/dataGridHelper.js'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; QUnit.testStart(function() { const markup = diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editorFactory.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editorFactory.tests.js index 62034517bae9..807f0e5b6085 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editorFactory.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/editorFactory.tests.js @@ -39,7 +39,7 @@ import 'ui/tag_box'; import TextArea from 'ui/text_area'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import browser from 'core/utils/browser'; import devices from '__internal/core/m_devices'; import SelectBox from 'ui/select_box'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/exportController.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/exportController.tests.js index 4c3fcd3b2c40..05fab53a5e4f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/exportController.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/exportController.tests.js @@ -5,8 +5,8 @@ import 'generic_light.css!'; import 'ui/data_grid'; import { setupDataGridModules } from '../../helpers/dataGridMocks.js'; -import ArrayStore from 'data/array_store'; -import messageLocalization from 'localization/message'; +import ArrayStore from 'common/data/array_store'; +import messageLocalization from 'common/core/localization/message'; import { prepareItems } from '__internal/grids/grid_core/m_export'; QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterBuilder.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterBuilder.tests.js index 14626172b33c..7bddf49743e8 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterBuilder.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterBuilder.tests.js @@ -1,7 +1,7 @@ import 'ui/data_grid'; import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import dataGridMocks from '../../helpers/dataGridMocks.js'; const setupDataGridModules = dataGridMocks.setupDataGridModules; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterPanel.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterPanel.tests.js index 1024fcd0d58b..907d3e03370a 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterPanel.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterPanel.tests.js @@ -1,10 +1,10 @@ import 'ui/data_grid'; import $ from 'jquery'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; import { setupDataGridModules } from '../../helpers/dataGridMocks.js'; -import ArrayStore from 'data/array_store'; +import ArrayStore from 'common/data/array_store'; import errors from 'ui/widget/ui.errors'; const FILTER_PANEL_CLASS = 'dx-datagrid-filter-panel'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterRow.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterRow.tests.js index 858cc643fa2a..1744b86ee05f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterRow.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterRow.tests.js @@ -2,15 +2,15 @@ import 'generic_light.css!'; import 'ui/data_grid'; import 'ui/tag_box'; -import ArrayStore from 'data/array_store'; +import ArrayStore from 'common/data/array_store'; import $ from 'jquery'; import { noop } from 'core/utils/common'; import { value as viewPort } from 'core/utils/view_port'; import { addShadowDomStyles } from 'core/utils/shadow_dom'; import devices from '__internal/core/m_devices'; -import fx from 'animation/fx'; -import dateLocalization from 'localization/date'; +import fx from 'common/core/animation/fx'; +import dateLocalization from 'common/core/localization/date'; import { setupDataGridModules, MockDataController, MockColumnsController } from '../../helpers/dataGridMocks.js'; const device = devices.real(); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterSync.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterSync.tests.js index 493ebf26e57b..7431103e369b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterSync.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filterSync.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import { setupDataGridModules } from '../../helpers/dataGridMocks.js'; import * as customOperations from '__internal/grids/grid_core/filter/m_filter_custom_operations'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import 'ui/data_grid'; const HEADER_FILTER_CLASS = 'dx-header-filter'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filtering.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filtering.integration.tests.js index 9d0c5c900661..b59cefcd8d46 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filtering.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/filtering.integration.tests.js @@ -1,10 +1,10 @@ import $ from 'jquery'; -import { EdmLiteral } from 'data/odata/utils'; +import { EdmLiteral } from 'common/data/odata/utils'; import commonUtils from 'core/utils/common'; import devices from '__internal/core/m_devices'; -import ArrayStore from 'data/array_store'; +import ArrayStore from 'common/data/array_store'; import gridCoreUtils from '__internal/grids/grid_core/m_utils'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import DataGridWrapper from '../../helpers/wrappers/dataGridWrappers.js'; import { createDataGrid, baseModuleConfig } from '../../helpers/dataGridHelper.js'; import { getEmulatorStyles } from '../../helpers/stylesHelper.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/focus.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/focus.integration.tests.js index 93cf67b56db3..eae2d8691466 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/focus.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/focus.integration.tests.js @@ -1,15 +1,15 @@ import $ from 'jquery'; import typeUtils from 'core/utils/type'; import devices from '__internal/core/m_devices'; -import pointerEvents from 'events/pointer'; -import fx from 'animation/fx'; +import pointerEvents from 'common/core/events/pointer'; +import fx from 'common/core/animation/fx'; import commonUtils from 'core/utils/common'; -import { keyboard } from 'events/short'; +import { keyboard } from 'common/core/events/short'; import keyboardMock from '../../helpers/keyboardMock.js'; import DataGridWrapper from '../../helpers/wrappers/dataGridWrappers.js'; import { CLICK_EVENT } from '../../helpers/grid/keyboardNavigationHelper.js'; import { createDataGrid, baseModuleConfig } from '../../helpers/dataGridHelper.js'; -import ArrayStore from 'data/array_store'; +import ArrayStore from 'common/data/array_store'; import DataGrid from 'ui/data_grid'; import { getEmulatorStyles } from '../../helpers/stylesHelper.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/focus.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/focus.tests.js index 515537b82400..c98a8834c3f4 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/focus.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/focus.tests.js @@ -1,12 +1,12 @@ import 'generic_light.css!'; import 'ui/data_grid'; -import 'data/odata/store'; +import 'common/data/odata/store'; import $ from 'jquery'; -import ArrayStore from 'data/array_store'; -import pointerEvents from 'events/pointer'; -import clickEvent from 'events/click'; +import ArrayStore from 'common/data/array_store'; +import pointerEvents from 'common/core/events/pointer'; +import clickEvent from 'common/core/events/click'; import { setupDataGridModules, generateItems } from '../../helpers/dataGridMocks.js'; import DataGridWrapper from '../../helpers/wrappers/dataGridWrappers.js'; import { CLICK_EVENT, isMobile, device, fireKeyDown, triggerKeyDown } from '../../helpers/grid/keyboardNavigationHelper.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/gridView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/gridView.tests.js index 35373bbff836..e6d65c183617 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/gridView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/gridView.tests.js @@ -1,5 +1,5 @@ import devices from '__internal/core/m_devices'; -import visibilityChange from 'events/visibility_change'; +import visibilityChange from 'common/core/events/visibility_change'; import 'generic_light.css!'; import $ from 'jquery'; import 'ui/data_grid'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/grouping.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/grouping.integration.tests.js index 7446d8e80e6e..9f01e09d6f54 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/grouping.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/grouping.integration.tests.js @@ -1,6 +1,6 @@ import gridCore from '__internal/grids/data_grid/m_core'; -import ArrayStore from 'data/array_store'; -import { DataSource } from 'data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import { DataSource } from 'common/data/data_source/data_source'; import commonUtils from 'core/utils/common'; import typeUtils from 'core/utils/type'; import config from 'core/config'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/headerFilter.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/headerFilter.tests.js index 5cfa85c32794..12054fd3ed0a 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/headerFilter.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/headerFilter.tests.js @@ -4,17 +4,17 @@ import 'ui/data_grid'; import gridCoreUtils from '__internal/grids/grid_core/m_utils'; import $ from 'jquery'; -import ArrayStore from 'data/array_store'; +import ArrayStore from 'common/data/array_store'; import { noop } from 'core/utils/common'; -import ODataStore from 'data/odata/store'; +import ODataStore from 'common/data/odata/store'; import devices from '__internal/core/m_devices'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import { invertFilterExpression } from '__internal/grids/grid_core/header_filter/m_header_filter'; -import dragEvents from 'events/drag'; +import dragEvents from 'common/core/events/drag'; import { setupDataGridModules, MockDataController, MockColumnsController } from '../../helpers/dataGridMocks.js'; import viewPortUtils from 'core/utils/view_port'; -import fx from 'animation/fx'; -import messageLocalization from 'localization/message'; +import fx from 'common/core/animation/fx'; +import messageLocalization from 'common/core/localization/message'; import dateSerialization from 'core/utils/date_serialization'; import { ListSearchBoxWrapper } from '../../helpers/wrappers/searchBoxWrappers.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.accessibility.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.accessibility.tests.js index 41970aa5a5d6..cee07ca172ce 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.accessibility.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.accessibility.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import 'generic_light.css!'; import 'ui/data_grid'; -import { createEvent } from 'events/utils/index'; +import { createEvent } from 'common/core/events/utils/index'; import { setupDataGridModules } from '../../helpers/dataGridMocks.js'; import { CLICK_EVENT, @@ -12,7 +12,7 @@ import { focusCell, dataGridWrapper } from '../../helpers/grid/keyboardNavigationHelper.js'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; QUnit.testStart(function() { const markup = ` diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.keyboardController.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.keyboardController.tests.js index 80895419e3b9..e1dfabf05991 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.keyboardController.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.keyboardController.tests.js @@ -8,9 +8,9 @@ import { keyboardNavigationModule } from '__internal/grids/grid_core/keyboard_na import commonUtils from 'core/utils/common'; import typeUtils from 'core/utils/type'; import publicComponentUtils from 'core/utils/public_component'; -import eventsEngine from 'events/core/events_engine'; -import pointerEvents from 'events/pointer'; -import { keyboard } from 'events/short'; +import eventsEngine from 'common/core/events/core/events_engine'; +import pointerEvents from 'common/core/events/pointer'; +import { keyboard } from 'common/core/events/short'; import { MockDataController, MockColumnsController, MockEditingController } from '../../helpers/dataGridMocks.js'; import { CLICK_EVENT, callViewsRenderCompleted } from '../../helpers/grid/keyboardNavigationHelper.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.keyboardKeys.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.keyboardKeys.tests.js index 5996aab4694e..e5d405eace5e 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.keyboardKeys.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.keyboardKeys.tests.js @@ -10,7 +10,7 @@ import keyboardMock from '../../helpers/keyboardMock.js'; import commonUtils from 'core/utils/common'; import typeUtils from 'core/utils/type'; import { addShadowDomStyles } from 'core/utils/shadow_dom'; -import pointerEvents from 'events/pointer'; +import pointerEvents from 'common/core/events/pointer'; import { setupDataGridModules, MockDataController } from '../../helpers/dataGridMocks.js'; import { CLICK_EVENT, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.realControllers.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.realControllers.tests.js index 0b82ca67a442..d42ef80dfbfd 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.realControllers.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.realControllers.tests.js @@ -5,7 +5,7 @@ import $ from 'jquery'; import 'ui/data_grid'; import commonUtils from 'core/utils/common'; -import pointerEvents from 'events/pointer'; +import pointerEvents from 'common/core/events/pointer'; import { setupDataGridModules } from '../../helpers/dataGridMocks.js'; import { getActiveElement } from '../../helpers/shadowDom.js'; import { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.rowsView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.rowsView.tests.js index ba14041e1ea2..5d965d595942 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.rowsView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/keyboardNavigation.rowsView.tests.js @@ -3,10 +3,10 @@ import 'generic_light.css!'; import $ from 'jquery'; import 'ui/data_grid'; import commonUtils from 'core/utils/common'; -import { createEvent } from 'events/utils/index'; +import { createEvent } from 'common/core/events/utils/index'; import typeUtils from 'core/utils/type'; -import pointerEvents from 'events/pointer'; -import eventsEngine from 'events/core/events_engine'; +import pointerEvents from 'common/core/events/pointer'; +import eventsEngine from 'common/core/events/core/events_engine'; import { setupDataGridModules, MockDataController, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/masterDetail.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/masterDetail.integration.tests.js index f7709b0f1ce1..66657433e0bf 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/masterDetail.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/masterDetail.integration.tests.js @@ -1,6 +1,6 @@ import typeUtils from 'core/utils/type'; import config from 'core/config'; -import pointerEvents from 'events/pointer'; +import pointerEvents from 'common/core/events/pointer'; import commonUtils from 'core/utils/common'; import { createDataGrid, baseModuleConfig } from '../../helpers/dataGridHelper.js'; import $ from 'jquery'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/pagerView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/pagerView.tests.js index 00926234a4d4..8445df0838a4 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/pagerView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/pagerView.tests.js @@ -5,7 +5,7 @@ import 'ui/data_grid'; import $ from 'jquery'; import { setupDataGridModules, MockDataController } from '../../helpers/dataGridMocks.js'; import dataUtils from 'core/element_data'; -import { createEvent } from 'events/utils/index'; +import { createEvent } from 'common/core/events/utils/index'; import { addShadowDomStyles } from 'core/utils/shadow_dom'; import Pager from 'ui/pagination'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/rowDragging.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/rowDragging.integration.tests.js index 26a45b348cf6..864236c6b19b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/rowDragging.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/rowDragging.integration.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import DataGrid from 'ui/data_grid'; import pointerMock from '../../helpers/pointerMock.js'; import { createDataGrid, baseModuleConfig } from '../../helpers/dataGridHelper.js'; -import CustomStore from 'data/custom_store'; +import { CustomStore } from 'common/data/custom_store'; import { generateItems } from '../../helpers/dataGridMocks.js'; QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/rowsView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/rowsView.tests.js index 7cdf1941c18e..90a424aad1af 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/rowsView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/rowsView.tests.js @@ -17,10 +17,10 @@ import pointerMock from '../../helpers/pointerMock.js'; import nativePointerMock from '../../helpers/nativePointerMock.js'; import { setupDataGridModules, MockDataController, MockColumnsController, MockSelectionController, getCells, generateItems } from '../../helpers/dataGridMocks.js'; import { findShadowHostOrDocument } from '../../helpers/dataGridHelper.js'; -import numberLocalization from 'localization/number'; +import numberLocalization from 'common/core/localization/number'; import virtualScrollingCore from '__internal/grids/grid_core/virtual_scrolling/m_virtual_scrolling_core'; -import ODataStore from 'data/odata/store'; -import ArrayStore from 'data/array_store'; +import ODataStore from 'common/data/odata/store'; +import ArrayStore from 'common/data/array_store'; const expandCellTemplate = gridCoreUtils.getExpandCellTemplate(); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/scrolling.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/scrolling.integration.tests.js index 184e3995ca19..27c0b4fa179c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/scrolling.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/scrolling.integration.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import commonUtils from 'core/utils/common'; import devices from '__internal/core/m_devices'; import browser from 'core/utils/browser'; -import pointerEvents from 'events/pointer'; +import pointerEvents from 'common/core/events/pointer'; import DataGridWrapper from '../../helpers/wrappers/dataGridWrappers.js'; import { createDataGrid, baseModuleConfig } from '../../helpers/dataGridHelper.js'; import { getHeight, getWidth } from 'core/utils/size'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/selection.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/selection.tests.js index 8dfb7b85c570..a99fcd24349d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/selection.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/selection.tests.js @@ -1,13 +1,13 @@ import 'ui/data_grid'; -import 'data/odata/store'; +import 'common/data/odata/store'; import $ from 'jquery'; import { setupDataGridModules, generateItems } from '../../helpers/dataGridMocks.js'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; -import CustomStore from 'data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import { CustomStore } from 'common/data/custom_store'; import DataGridWrapper from '../../helpers/wrappers/dataGridWrappers.js'; -import clickEvent from 'events/click'; +import clickEvent from 'common/core/events/click'; import errors from 'ui/widget/ui.errors'; const dataGridWrapper = new DataGridWrapper('#container'); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/stateStoring.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/stateStoring.tests.js index 1ee65154aa5a..6fcd98396d5f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/stateStoring.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/stateStoring.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import { setupDataGridModules, MockDataController } from '../../helpers/dataGridMocks.js'; -import ArrayStore from 'data/array_store'; -import fx from 'animation/fx'; +import ArrayStore from 'common/data/array_store'; +import fx from 'common/core/animation/fx'; import 'ui/data_grid'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/virtualColumns.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/virtualColumns.tests.js index bdafceaebb9e..7fa3b79effb6 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/virtualColumns.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/virtualColumns.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import dataGridMocks from '../../helpers/dataGridMocks.js'; import 'ui/data_grid'; import 'generic_light.css!'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import dataSourceAdapter from '__internal/grids/data_grid/m_data_source_adapter'; import { getOuterWidth } from 'core/utils/size'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/virtualScrolling.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/virtualScrolling.integration.tests.js index 7471f1c6c1a3..aacfa5f7a6f4 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/virtualScrolling.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.dataGrid/virtualScrolling.integration.tests.js @@ -2,17 +2,17 @@ import { getHeight, getWidth } from 'core/utils/size'; import devices from '__internal/core/m_devices'; import commonUtils from 'core/utils/common'; import browser from 'core/utils/browser'; -import ArrayStore from 'data/array_store'; -import { DataSource } from 'data/data_source/data_source'; -import pointerEvents from 'events/pointer'; +import ArrayStore from 'common/data/array_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import pointerEvents from 'common/core/events/pointer'; import DataGridWrapper from '../../helpers/wrappers/dataGridWrappers.js'; import { createDataGrid, baseModuleConfig } from '../../helpers/dataGridHelper.js'; import Scrollable from 'ui/scroll_view/ui.scrollable.js'; import $ from 'jquery'; import pointerMock from '../../helpers/pointerMock.js'; -import translator from 'animation/translator'; +import translator from 'common/core/animation/translator'; import dataUtils from 'core/element_data'; -import ODataStore from 'data/odata/store'; +import ODataStore from 'common/data/odata/store'; const dataGridWrapper = new DataGridWrapper('#dataGrid'); const isRenovatedScrollable = !!Scrollable.IS_RENOVATED_WIDGET; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/autocomplete.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/autocomplete.tests.js index be257b8c8cb9..a59a8740b37b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/autocomplete.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/autocomplete.tests.js @@ -1,15 +1,15 @@ import $ from 'jquery'; -import ArrayStore from 'data/array_store'; +import ArrayStore from 'common/data/array_store'; import Autocomplete from 'ui/autocomplete'; import config from 'core/config'; import devices from '__internal/core/m_devices'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import keyboardMock from '../../helpers/keyboardMock.js'; import pointerMock from '../../helpers/pointerMock.js'; import resizeCallbacks from 'core/utils/resize_callbacks'; import { isRenderer } from 'core/utils/type'; -import { normalizeKeyName } from 'events/utils/index'; +import { normalizeKeyName } from 'common/core/events/utils/index'; import { getHeight, getOuterHeight } from 'core/utils/size'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendar.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendar.markup.tests.js index 7c06483a693f..40bf86ddbe24 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendar.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendar.markup.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import dateSerialization from 'core/utils/date_serialization'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import { isDefined, isRenderer } from 'core/utils/type'; import config from 'core/config'; import windowUtils from 'core/utils/window'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendar.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendar.tests.js index 6f0fbba10678..589c3eb44a1e 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendar.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendar.tests.js @@ -1,11 +1,11 @@ import $ from 'jquery'; import { camelize } from 'core/utils/inflector'; -import translator from 'animation/translator'; +import translator from 'common/core/animation/translator'; import dateUtils from 'core/utils/date'; import dateSerialization from 'core/utils/date_serialization'; import { noop } from 'core/utils/common'; -import swipeEvents from 'events/swipe'; -import fx from 'animation/fx'; +import swipeEvents from 'common/core/events/swipe'; +import fx from 'common/core/animation/fx'; import Views from '__internal/ui/calendar/m_calendar.views'; import Calendar from 'ui/calendar'; import pointerMock from '../../helpers/pointerMock.js'; @@ -13,8 +13,8 @@ import keyboardMock from '../../helpers/keyboardMock.js'; import config from 'core/config'; import dataUtils from 'core/element_data'; import devices from 'core/devices.js'; -import dateLocalization from 'localization/date'; -import { normalizeKeyName } from 'events/utils/index'; +import dateLocalization from 'common/core/localization/date'; +import { normalizeKeyName } from 'common/core/events/utils/index'; import localization from 'localization'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendarView.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendarView.markup.tests.js index 05620297cb43..e80fa16e1624 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendarView.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendarView.markup.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import dateUtils from 'core/utils/date'; import BaseView from '__internal/ui/calendar/m_calendar.base_view'; import Views from '__internal/ui/calendar/m_calendar.views'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import dateSerialization from 'core/utils/date_serialization'; import 'ui/calendar'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendarViews.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendarViews.tests.js index 4e2adb617845..c651dd953a7d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendarViews.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/calendarViews.tests.js @@ -4,10 +4,10 @@ import dateUtils from 'core/utils/date'; import BaseView from '__internal/ui/calendar/m_calendar.base_view'; import Views from '__internal/ui/calendar/m_calendar.views'; import pointerMock from '../../helpers/pointerMock.js'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import dateSerialization from 'core/utils/date_serialization'; -import dateLocalization from 'localization/date'; -import messageLocalization from 'localization/message'; +import dateLocalization from 'common/core/localization/date'; +import messageLocalization from 'common/core/localization/message'; import 'ui/calendar'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/checkbox.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/checkbox.tests.js index 8ca9fe5cc5e2..18d4917d8cae 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/checkbox.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/checkbox.tests.js @@ -3,7 +3,7 @@ import devices from '__internal/core/m_devices'; import keyboardMock from '../../helpers/keyboardMock.js'; import { validateGroup } from 'ui/validation_engine'; import dxCheckBox from 'ui/check_box'; -import { normalizeKeyName } from 'events/utils/index'; +import { normalizeKeyName } from 'common/core/events/utils/index'; // eslint-disable-next-line spellcheck/spell-checker import { rerender } from 'inferno'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorBox.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorBox.markup.tests.js index 5466de50e605..2e2555c156c0 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorBox.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorBox.markup.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import 'ui/color_box'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorBox.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorBox.tests.js index 0e53e926ffb1..426da5f2d34e 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorBox.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorBox.tests.js @@ -4,8 +4,8 @@ import devices from '__internal/core/m_devices'; import Color from 'color'; import pointerMock from '../../helpers/pointerMock.js'; import keyboardMock from '../../helpers/keyboardMock.js'; -import fx from 'animation/fx'; -import { normalizeKeyName } from 'events/utils/index'; +import fx from 'common/core/animation/fx'; +import { normalizeKeyName } from 'common/core/events/utils/index'; import 'generic_light.css!'; import 'ui/color_box'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorView.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorView.markup.tests.js index d7685ff6afb4..b1c5da30188d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorView.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorView.markup.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import '__internal/ui/color_box/m_color_view'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorView.tests.js index eecf87e3ba8f..74a7891a7649 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/colorView.tests.js @@ -3,8 +3,8 @@ import { noop } from 'core/utils/common'; import Color from 'color'; import pointerMock from '../../helpers/pointerMock.js'; import keyboardMock from '../../helpers/keyboardMock.js'; -import fx from 'animation/fx'; -import { normalizeKeyName } from 'events/utils/index'; +import fx from 'common/core/animation/fx'; +import { normalizeKeyName } from 'common/core/events/utils/index'; import 'generic_light.css!'; import '__internal/ui/color_box/m_color_view'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dateRangeBox.strategy.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dateRangeBox.strategy.tests.js index 0e55024c426f..94e7bdc274ac 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dateRangeBox.strategy.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dateRangeBox.strategy.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import dataUtils from 'core/element_data'; import devices from 'core/devices.js'; import keyboardMock from '../../helpers/keyboardMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dateRangeBox.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dateRangeBox.tests.js index 0bcf4db7663d..909c17dd248d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dateRangeBox.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dateRangeBox.tests.js @@ -5,8 +5,8 @@ import DateRangeBox from 'ui/date_range_box'; import DateBox from 'ui/date_box'; import { isRenderer } from 'core/utils/type'; import { isObject } from 'core/utils/type.js'; -import fx from 'animation/fx'; -import hoverEvents from 'events/hover'; +import fx from 'common/core/animation/fx'; +import hoverEvents from 'common/core/events/hover'; import keyboardMock from '../../helpers/keyboardMock.js'; import Popup from 'ui/popup/ui.popup'; import localization from 'localization'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dateView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dateView.tests.js index e3829d50a32c..aa540bb086ab 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dateView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dateView.tests.js @@ -1,10 +1,10 @@ -import fx from 'animation/fx'; -import translator from 'animation/translator'; +import fx from 'common/core/animation/fx'; +import translator from 'common/core/animation/translator'; import devices from '__internal/core/m_devices'; -import { triggerShownEvent } from 'events/visibility_change'; +import { triggerShownEvent } from 'common/core/events/visibility_change'; import 'generic_light.css!'; import $ from 'jquery'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import '__internal/ui/date_box/m_date_view'; import '__internal/ui/date_box/m_date_view_roller'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/datebox.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/datebox.markup.tests.js index cfa747b15631..2e60fd803657 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/datebox.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/datebox.markup.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import support from '__internal/core/utils/m_support'; import uiDateUtils from '__internal/ui/date_box/m_date_utils'; import DateBox from 'ui/date_box'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import keyboardMock from '../../helpers/keyboardMock.js'; QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/datebox.mask.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/datebox.mask.tests.js index b64cf2697129..11fd1e75c021 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/datebox.mask.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/datebox.mask.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import { renderDateParts, getDatePartIndexByPosition } from '__internal/ui/date_box/m_date_box.mask.parts'; -import dateParser from 'localization/ldml/date.parser'; -import dateLocalization from 'localization/date'; +import dateParser from 'common/core/localization/ldml/date.parser'; +import dateLocalization from 'common/core/localization/date'; import { noop } from 'core/utils/common'; import pointerMock from '../../helpers/pointerMock.js'; import 'ui/date_box'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/datebox.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/datebox.tests.js index 313f68a77bef..44d85ada1a0d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/datebox.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/datebox.tests.js @@ -4,14 +4,14 @@ import Box from 'ui/box'; import Calendar from 'ui/calendar'; import DateBox from 'ui/date_box'; import config from 'core/config'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import dateSerialization from 'core/utils/date_serialization'; import dateUtils from 'core/utils/date'; import devices from '__internal/core/m_devices'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import keyboardMock from '../../helpers/keyboardMock.js'; import { getActiveElement } from '../../helpers/shadowDom.js'; -import messageLocalization from 'localization/message'; +import messageLocalization from 'common/core/localization/message'; import localization from 'localization'; import ja from 'localization/messages/ja.json!'; import pointerMock from '../../helpers/pointerMock.js'; @@ -20,7 +20,7 @@ import typeUtils from 'core/utils/type'; import uiDateUtils from '__internal/ui/date_box/m_date_utils'; import { noop } from 'core/utils/common'; import { logger } from 'core/utils/console'; -import { normalizeKeyName } from 'events/utils/index'; +import { normalizeKeyName } from 'common/core/events/utils/index'; import browser from 'core/utils/browser'; import '../../helpers/calendarFixtures.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownBox.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownBox.markup.tests.js index 33b6195cca2e..ad9825e9da8e 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownBox.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownBox.markup.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import CustomStore from 'data/custom_store'; +import { CustomStore } from 'common/data/custom_store'; import DropDownBox from 'ui/drop_down_box'; import { isRenderer } from 'core/utils/type'; import config from 'core/config'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownBox.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownBox.tests.js index aa78535ab2c1..b6380f72581f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownBox.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownBox.tests.js @@ -1,14 +1,14 @@ import $ from 'jquery'; import renderer from 'core/renderer'; import keyboardMock from '../../helpers/keyboardMock.js'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import DropDownBox from 'ui/drop_down_box'; import typeUtils, { isRenderer } from 'core/utils/type'; import config from 'core/config'; import devices from '__internal/core/m_devices'; -import { normalizeKeyName } from 'events/utils/index'; -import CustomStore from 'data/custom_store'; -import { DataSource } from 'data/data_source/data_source'; +import { normalizeKeyName } from 'common/core/events/utils/index'; +import { CustomStore } from 'common/data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; import 'generic_light.css!'; import 'ui/validator'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownEditor.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownEditor.tests.js index 7fe118d4bdfb..5667f2beb58d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownEditor.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownEditor.tests.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import config from 'core/config'; import devices from '__internal/core/m_devices'; -import eventsEngine from 'events/core/events_engine'; -import fx from 'animation/fx'; +import eventsEngine from 'common/core/events/core/events_engine'; +import fx from 'common/core/animation/fx'; import keyboardMock from '../../helpers/keyboardMock.js'; import pointerMock from '../../helpers/pointerMock.js'; import support from '__internal/core/utils/m_support'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownList.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownList.tests.js index 4b768c1f9ae6..65bf4226cb28 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownList.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownList.tests.js @@ -3,11 +3,11 @@ import { noop } from 'core/utils/common'; import devices from '__internal/core/m_devices'; import { Template } from 'core/templates/template'; import Guid from 'core/guid'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; -import CustomStore from 'data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import { CustomStore } from 'common/data/custom_store'; import keyboardMock from '../../helpers/keyboardMock.js'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { isRenderer } from 'core/utils/type'; import config from 'core/config'; import ajaxMock from '../../helpers/ajaxMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownOptions.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownOptions.tests.js index ef6adc46e879..a78e5fc9309f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownOptions.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/dropDownOptions.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { dropDownEditorsList } from '../../helpers/widgetsList.js'; import { defaultDropDownOptions } from '../../helpers/dropDownOptions.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/editor.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/editor.tests.js index 605373f2d87c..3b3ed11d3275 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/editor.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/editor.tests.js @@ -4,7 +4,7 @@ import OldEditor from 'ui/editor/editor'; import CheckBoxEditor from '__internal/ui/check_box/editor_base/generated_wrapper'; import Class from 'core/class'; import ValidationEngine from 'ui/validation_engine'; -import hoverEvents from 'events/hover'; +import hoverEvents from 'common/core/events/hover'; import { wrapRenovatedWidget } from '../../helpers/wrapRenovatedWidget.js'; import Validator from 'ui/validator'; import { getOuterWidth } from 'core/utils/size'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/lookup.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/lookup.markup.tests.js index 949c77b71871..ae7ce916c143 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/lookup.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/lookup.markup.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import Lookup from 'ui/lookup'; import { Deferred } from 'core/utils/deferred'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/lookup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/lookup.tests.js index 93323dc89330..838b145d5d19 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/lookup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/lookup.tests.js @@ -1,17 +1,17 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import devices from '__internal/core/m_devices'; import dataUtils from 'core/element_data'; import config from 'core/config'; import browser from 'core/utils/browser'; import errors from 'core/errors'; import { isRenderer } from 'core/utils/type'; -import { normalizeKeyName } from 'events/utils/index'; +import { normalizeKeyName } from 'common/core/events/utils/index'; -import ArrayStore from 'data/array_store'; -import CustomStore from 'data/custom_store'; -import Query from 'data/query'; -import { DataSource } from 'data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import { CustomStore } from 'common/data/custom_store'; +import Query from 'common/data/query'; +import { DataSource } from 'common/data/data_source/data_source'; import themes from 'ui/themes'; import Lookup from 'ui/lookup'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/numberBoxParts/common.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/numberBoxParts/common.tests.js index 72ee81b75e89..e12ac51610be 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/numberBoxParts/common.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/numberBoxParts/common.tests.js @@ -2,10 +2,10 @@ import $ from 'jquery'; import SpinButton from '__internal/ui/number_box/m_number_box.spin'; import config from 'core/config'; import devices from '__internal/core/m_devices'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import keyboardMock from '../../../helpers/keyboardMock.js'; import pointerMock from '../../../helpers/pointerMock.js'; -import { normalizeKeyName } from 'events/utils/index'; +import { normalizeKeyName } from 'common/core/events/utils/index'; import 'ui/number_box'; import 'ui/validator'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/numberBoxParts/mask.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/numberBoxParts/mask.tests.js index 8a7bef64bced..31ceaafc392f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/numberBoxParts/mask.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/numberBoxParts/mask.tests.js @@ -3,7 +3,7 @@ import browser from 'core/utils/browser'; import config from 'core/config'; import devices from '__internal/core/m_devices'; import keyboardMock from '../../../helpers/keyboardMock.js'; -import numberLocalization from 'localization/number'; +import numberLocalization from 'common/core/localization/number'; import errors from 'core/errors'; import 'ui/text_box/ui.text_editor'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/numberbox.format.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/numberbox.format.tests.js index 08fa02972804..d272889078ea 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/numberbox.format.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/numberbox.format.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import keyboardMock from '../../helpers/keyboardMock.js'; -import numberLocalization from 'localization/number'; +import numberLocalization from 'common/core/localization/number'; import localization from 'localization'; import 'ui/number_box'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/radioGroup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/radioGroup.tests.js index da0a2aa91d6f..52234311698d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/radioGroup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/radioGroup.tests.js @@ -2,12 +2,12 @@ import $ from 'jquery'; import devices from '__internal/core/m_devices'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; import keyboardMock from '../../helpers/keyboardMock.js'; -import CustomStore from 'data/custom_store'; -import { DataSource } from 'data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; import { deferUpdate } from 'core/utils/common'; import registerKeyHandlerTestHelper from '../../helpers/registerKeyHandlerTestHelper.js'; import errors from 'ui/widget/ui.errors'; -import { normalizeKeyName } from 'events/utils/index'; +import { normalizeKeyName } from 'common/core/events/utils/index'; import 'ui/radio_group'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/rangeSlider.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/rangeSlider.tests.js index 87c4662ccd2c..93be1ed70b11 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/rangeSlider.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/rangeSlider.tests.js @@ -2,8 +2,8 @@ import $ from 'jquery'; import SliderTooltip from '__internal/ui/slider/m_slider_tooltip'; import keyboardMock from '../../helpers/keyboardMock.js'; import pointerMock from '../../helpers/pointerMock.js'; -import fx from 'animation/fx'; -import { normalizeKeyName } from 'events/utils/index'; +import fx from 'common/core/animation/fx'; +import { normalizeKeyName } from 'common/core/events/utils/index'; import 'ui/range_slider'; import 'ui/number_box'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/selectBox.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/selectBox.markup.tests.js index f30ae86e67f8..71239e4fcce2 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/selectBox.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/selectBox.markup.tests.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import SelectBox from 'ui/select_box'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; -import fx from 'animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; +import fx from 'common/core/animation/fx'; import windowUtils from 'core/utils/window'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/selectBox.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/selectBox.tests.js index 8fb9b590d91b..577bf2e4398d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/selectBox.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/selectBox.tests.js @@ -4,15 +4,15 @@ import SelectBox from 'ui/select_box'; import devices from '__internal/core/m_devices'; import pointerMock from '../../helpers/pointerMock.js'; import keyboardMock from '../../helpers/keyboardMock.js'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; -import CustomStore from 'data/custom_store'; -import fx from 'animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import { CustomStore } from 'common/data/custom_store'; +import fx from 'common/core/animation/fx'; import { isRenderer } from 'core/utils/type'; import errors from 'core/errors'; import config from 'core/config'; import ariaAccessibilityTestHelper from '../../helpers/ariaAccessibilityTestHelper.js'; -import { normalizeKeyName } from 'events/utils/index'; +import { normalizeKeyName } from 'common/core/events/utils/index'; import 'generic_light.css!'; import 'ui/validator'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/slider.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/slider.tests.js index 5b48bb6340bf..e0c1e58c4698 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/slider.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/slider.tests.js @@ -1,17 +1,17 @@ -import fx from 'animation/fx'; -import positionUtils from 'animation/position'; +import fx from 'common/core/animation/fx'; +import positionUtils from 'common/core/animation/position'; import 'generic_light.css!'; import config from 'core/config'; import resizeCallbacks from 'core/utils/resize_callbacks'; -import { triggerShownEvent } from 'events/visibility_change'; +import { triggerShownEvent } from 'common/core/events/visibility_change'; import $ from 'jquery'; -import { hideCallback as hideTopOverlayCallback } from 'mobile/hide_callback'; +import { hideCallback as hideTopOverlayCallback } from 'common/core/environment/hide_callback'; import 'ui/slider'; import SliderTooltip from '__internal/ui/slider/m_slider_tooltip'; import SliderHandle from '__internal/ui/slider/m_slider_handle'; import keyboardMock from '../../helpers/keyboardMock.js'; import pointerMock from '../../helpers/pointerMock.js'; -import { normalizeKeyName } from 'events/utils/index'; +import { normalizeKeyName } from 'common/core/events/utils/index'; const { module, testStart, test, testInActiveWindow } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/switch.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/switch.tests.js index 3c80857a2593..6f1c0ed35639 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/switch.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/switch.tests.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import pointerMock from '../../helpers/pointerMock.js'; import keyboardMock from '../../helpers/keyboardMock.js'; -import fx from 'animation/fx'; -import { normalizeKeyName } from 'events/utils/index'; +import fx from 'common/core/animation/fx'; +import { normalizeKeyName } from 'common/core/events/utils/index'; import 'generic_light.css!'; import 'ui/switch'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/tagBox.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/tagBox.markup.tests.js index 0ccd779e77c2..f6c4e6ea1224 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/tagBox.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/tagBox.markup.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import TagBox from 'ui/tag_box'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { isRenderer } from 'core/utils/type'; import config from 'core/config'; import windowModule from 'core/utils/window'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/tagBox.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/tagBox.tests.js index 96c105041037..9bb8d4085150 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/tagBox.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/tagBox.tests.js @@ -1,23 +1,23 @@ import $ from 'jquery'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import { isRenderer } from 'core/utils/type'; import { createTextElementHiddenCopy } from '__internal/core/utils/m_dom'; import ajaxMock from '../../helpers/ajaxMock.js'; import config from 'core/config'; -import dataQuery from 'data/query'; +import dataQuery from 'common/data/query'; import devices from '__internal/core/m_devices'; import coreErrors from 'core/errors'; import uiErrors from 'ui/widget/ui.errors'; -import { errors as dataErrors } from 'data/errors'; -import fx from 'animation/fx'; +import { errors as dataErrors } from 'common/data/errors'; +import fx from 'common/core/animation/fx'; import keyboardMock from '../../helpers/keyboardMock.js'; -import messageLocalization from 'localization/message'; +import messageLocalization from 'common/core/localization/message'; import pointerMock from '../../helpers/pointerMock.js'; -import ArrayStore from 'data/array_store'; -import CustomStore from 'data/custom_store'; -import ODataStore from 'data/odata/store'; +import ArrayStore from 'common/data/array_store'; +import { CustomStore } from 'common/data/custom_store'; +import ODataStore from 'common/data/odata/store'; import TagBox from 'ui/tag_box'; -import { normalizeKeyName } from 'events/utils/index'; +import { normalizeKeyName } from 'common/core/events/utils/index'; import { getWidth, getHeight } from 'core/utils/size'; import Guid from 'core/guid'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/textEditorParts/common.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/textEditorParts/common.tests.js index 561d3c8f06f1..40bf5e1f5dc8 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/textEditorParts/common.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/textEditorParts/common.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import domUtils from '__internal/core/utils/m_dom'; import devices from '__internal/core/m_devices'; import pointerMock from '../../../helpers/pointerMock.js'; @@ -8,7 +8,7 @@ import caretWorkaround from './caretWorkaround.js'; import themes from 'ui/themes'; import config from 'core/config'; import consoleUtils from 'core/utils/console'; -import { normalizeKeyName } from 'events/utils/index'; +import { normalizeKeyName } from 'common/core/events/utils/index'; import { getWidth, implementationsMap } from 'core/utils/size'; import TextEditor from '__internal/ui/text_box/m_text_editor'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/timeView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/timeView.tests.js index ea6ea5d2142e..8c139c6a929b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/timeView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/timeView.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import keyboardMock from '../../helpers/keyboardMock.js'; import 'ui/date_box/ui.time_view'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/trackBar.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/trackBar.tests.js index faa06e63aaf9..1294c9a6041f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/trackBar.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/trackBar.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import 'ui/track_bar'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/validationGroup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/validationGroup.tests.js index b26ef3c5b0ad..7a92ddb0f4e1 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/validationGroup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/validationGroup.tests.js @@ -1,6 +1,6 @@ import Class from 'core/class'; import { Deferred } from 'core/utils/deferred'; -import { triggerShownEvent } from 'events/visibility_change'; +import { triggerShownEvent } from 'common/core/events/visibility_change'; import $ from 'jquery'; import DefaultAdapter from '__internal/ui/validation/m_default_adapter'; import ValidationEngine from 'ui/validation_engine'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.form/form.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.form/form.tests.js index 9e82cdcbc985..ce3da955d02c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.form/form.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.form/form.tests.js @@ -5,7 +5,7 @@ import domAdapter from '__internal/core/m_dom_adapter'; import resizeCallbacks from '__internal/core/utils/m_resize_callbacks'; import typeUtils from 'core/utils/type'; import { extend } from 'core/utils/extend'; -import visibilityEventsModule from 'events/visibility_change'; +import visibilityEventsModule from 'common/core/events/visibility_change'; import { EDITORS_WITHOUT_LABELS } from '__internal/ui/form/m_form.layout_manager.utils'; import 'generic_light.css!'; import $ from 'jquery'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/events.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/events.tests.js index 156c95129201..cbd086dd5988 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/events.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/events.tests.js @@ -2,10 +2,10 @@ import $ from 'jquery'; import 'ui/html_editor'; import { deferUpdate } from 'core/utils/common'; -import { Event as dxEvent } from 'events/index'; +import { Event as dxEvent } from 'common/core/events'; import devices from '__internal/core/m_devices'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import keyboardMock from '../../../helpers/keyboardMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/imageCursorModule.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/imageCursorModule.tests.js index 423781adbbc5..99fe6df8b00f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/imageCursorModule.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/imageCursorModule.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import ImageCursor from '__internal/ui/html_editor/modules/m_imageCursor'; -import { name as clickEvent } from 'events/click'; +import { name as clickEvent } from 'common/core/events/click'; const moduleConfig = { beforeEach: function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/imageUploadIntegration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/imageUploadIntegration.tests.js index e1e432ee2a6e..a37e42942c78 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/imageUploadIntegration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/imageUploadIntegration.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import keyboardMock from '../../../helpers/keyboardMock.js'; import '../../../helpers/xmlHttpRequestMock.js'; import devices from '__internal/core/m_devices'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import 'ui/html_editor'; const FIELD_ITEM_CLASS = 'dx-field-item'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/mentionModule.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/mentionModule.tests.js index c1c7cd2703e4..ea0b9c9d8921 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/mentionModule.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/mentionModule.tests.js @@ -5,8 +5,8 @@ import Mentions from '__internal/ui/html_editor/modules/m_mentions'; import { noop } from 'core/utils/common'; import devices from '__internal/core/m_devices'; -import { Event as dxEvent } from 'events/index'; -import { normalizeKeyName } from 'events/utils/index'; +import { Event as dxEvent } from 'common/core/events'; +import { normalizeKeyName } from 'common/core/events/utils/index'; import Quill from 'devextreme-quill'; const SUGGESTION_LIST_CLASS = 'dx-suggestion-list'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/resizingIntegration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/resizingIntegration.tests.js index f05740789f35..013b88b365f9 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/resizingIntegration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/resizingIntegration.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import 'ui/html_editor'; -import { name as clickEvent } from 'events/click'; +import { name as clickEvent } from 'common/core/events/click'; import PointerMock from '../../../helpers/pointerMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/resizingModule.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/resizingModule.tests.js index 00e1266be20f..c0746beff649 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/resizingModule.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/resizingModule.tests.js @@ -3,7 +3,7 @@ import Quill from 'devextreme-quill'; import Resizing from '__internal/ui/html_editor/modules/m_resizing'; import devices from '__internal/core/m_devices'; -import { name as clickEvent } from 'events/click'; +import { name as clickEvent } from 'common/core/events/click'; import PointerMock from '../../../helpers/pointerMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/scrolling.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/scrolling.tests.js index 414288767752..1c0cf647c3cb 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/scrolling.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/scrolling.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import nativePointerMock from '../../../helpers/nativePointerMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/tableContextMenuIntegration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/tableContextMenuIntegration.tests.js index 7e865222021c..e39f1cc280eb 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/tableContextMenuIntegration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/tableContextMenuIntegration.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import 'ui/html_editor'; -import { createEvent } from 'events/utils/index'; -import eventsEngine from 'events/core/events_engine'; +import { createEvent } from 'common/core/events/utils/index'; +import eventsEngine from 'common/core/events/core/events_engine'; const tableMarkup = '\ before table text
\ diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/toolbarIntegration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/toolbarIntegration.tests.js index e7917546b6ff..2caf6d03d10e 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/toolbarIntegration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/toolbarIntegration.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import 'ui/html_editor'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { checkLink, prepareEmbedValue, prepareTableValue } from './utils.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/toolbarModule.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/toolbarModule.tests.js index 80e7b67e8f8f..0820c0ee012d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/toolbarModule.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.htmlEditor/htmlEditorParts/toolbarModule.tests.js @@ -9,7 +9,7 @@ import Toolbar from '__internal/ui/html_editor/modules/m_toolbar'; import FormDialog from '__internal/ui/html_editor/ui/m_formDialog'; import { noop } from 'core/utils/common'; import keyboardMock from '../../../helpers/keyboardMock.js'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import errors from 'ui/widget/ui.errors'; import localization from 'localization'; import resizeCallbacks from 'core/utils/resize_callbacks.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/dataSource_bundled.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/dataSource_bundled.tests.js index 2c2352e1317a..2b4ad041c12d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/dataSource_bundled.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/dataSource_bundled.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import ArrayStore from 'data/array_store'; -import CustomStore from 'data/custom_store'; +import ArrayStore from 'common/data/array_store'; +import { CustomStore } from 'common/data/custom_store'; import inflector from '__internal/core/utils/m_inflector'; import { PivotGridDataSource } from '__internal/grids/pivot_grid/data_source/m_data_source'; import summaryDisplayModesModule from '__internal/grids/pivot_grid/summary_display_modes/m_summary_display_modes'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/export.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/export.tests.js index 4ca2544c65d7..9d573c939658 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/export.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/export.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import { DataProvider } from '__internal/grids/pivot_grid/export/m_export'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; import { checkDxFontIcon, DX_ICON_XLSX_FILE_CONTENT_CODE } from '../../helpers/checkDxFontIconHelper.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/fieldChooser.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/fieldChooser.tests.js index 8b447dad051c..231994df9bc9 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/fieldChooser.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/fieldChooser.tests.js @@ -10,7 +10,7 @@ import { isDefined } from 'core/utils/type'; import devices from '__internal/core/m_devices'; import dataUtils from 'core/element_data'; import renderer from 'core/renderer'; -import { triggerShownEvent } from 'events/visibility_change'; +import { triggerShownEvent } from 'common/core/events/visibility_change'; import 'generic_light.css!'; import $ from 'jquery'; import { PivotGridDataSource } from '__internal/grids/pivot_grid/data_source/m_data_source'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/pivotGrid.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/pivotGrid.tests.js index faa572fd7d05..45633cf2b948 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/pivotGrid.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/pivotGrid.tests.js @@ -15,8 +15,8 @@ QUnit.testStart(function() { addShadowDomStyles($('#qunit-fixture')); }); -import fx from 'animation/fx'; -import eventsEngine from 'events/core/events_engine'; +import fx from 'common/core/animation/fx'; +import eventsEngine from 'common/core/events/core/events_engine'; import config from 'core/config'; import devices from '__internal/core/m_devices'; import dataUtils from 'core/element_data'; @@ -29,10 +29,10 @@ import { } from 'core/utils/size'; import { isRenderer } from 'core/utils/type'; import { addShadowDomStyles } from 'core/utils/shadow_dom'; -import { triggerShownEvent } from 'events/visibility_change'; +import { triggerShownEvent } from 'common/core/events/visibility_change'; import 'generic_light.css!'; import $ from 'jquery'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import { PivotGridDataSource } from '__internal/grids/pivot_grid/data_source/m_data_source'; import 'ui/pivot_grid/ui.pivot_grid'; import { getRealElementWidth } from '__internal/grids/pivot_grid/area_item/m_area_item'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.local.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.local.tests.js index 9f0146e6b6e3..237695e110a0 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.local.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.local.tests.js @@ -1,5 +1,5 @@ import '../../content/orders.js'; -import 'data/odata/store'; +import 'common/data/odata/store'; import $ from 'jquery'; import { noop } from 'core/utils/common'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.remote.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.remote.tests.js index 6c56b401b6f0..47576ac5a2c3 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.remote.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.remote.tests.js @@ -3,8 +3,8 @@ import { RemoteStore } from '__internal/grids/pivot_grid/remote_store/m_remote_s import { forEachGroup } from '__internal/grids/pivot_grid/remote_store/m_remote_store_utils'; import { sort } from '__internal/grids/pivot_grid/data_source/m_data_source_utils'; import pivotGridUtils from '__internal/grids/pivot_grid/m_widget_utils'; -import ArrayStore from 'data/array_store'; -import DataSource from 'data/data_source'; +import ArrayStore from 'common/data/array_store'; +import DataSource from 'common/data/data_source'; import '../../content/orders.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.xmla.common.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.xmla.common.tests.js index c1a5438f9e99..399dbfce3634 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.xmla.common.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.pivotGrid/store.xmla.common.tests.js @@ -2,9 +2,9 @@ import $ from 'jquery'; import ajax from 'core/utils/ajax'; import pivotGridUtils from '__internal/grids/pivot_grid/m_widget_utils'; import { XmlaStore } from '__internal/grids/pivot_grid/xmla_store/m_xmla_store'; -import { errors } from 'data/errors'; +import { errors } from 'common/data/errors'; import localization from 'localization'; -import { getLanguageId } from 'localization/language_codes'; +import { getLanguageId } from 'common/core/localization/language_codes'; const languageId = getLanguageId(); const ERROR_RESPONCE = 'XMLAnalysisError.0xc10a004dQuery (1, 77) The Fiscal hierarchy is used more than once in the Crossjoin function.17712030127'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/agenda.resourceProcessor.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/agenda.resourceProcessor.tests.js index 1e128ca73f70..567b65c3ff22 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/agenda.resourceProcessor.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/agenda.resourceProcessor.tests.js @@ -1,6 +1,6 @@ import { AgendaResourceProcessor } from '__internal/scheduler/resources/m_agenda_resource_processor'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; const { module, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/agenda.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/agenda.tests.js index 808835325da7..9edc20cb647d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/agenda.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/agenda.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import SchedulerAgenda from '__internal/scheduler/workspaces/m_agenda'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import { AppointmentDataProvider } from '__internal/scheduler/appointments/data_provider/m_appointment_data_provider'; const DATE_TABLE_CELL_CLASS = 'dx-scheduler-date-table-cell'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-0.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-0.tests.js index 88fc1f551599..38afcfbdae5a 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-0.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-0.tests.js @@ -1,11 +1,11 @@ import { getOuterHeight, getOuterWidth } from 'core/utils/size'; import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import pointerMock from '../../helpers/pointerMock.js'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; -import CustomStore from 'data/custom_store'; -import Query from 'data/query'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import { CustomStore } from 'common/data/custom_store'; +import Query from 'common/data/query'; import dataUtils from 'core/element_data'; import { CLASSES, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-1.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-1.tests.js index 076d1849749a..0bb5897746cd 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-1.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.common-1.tests.js @@ -1,10 +1,10 @@ import { getOuterHeight, getOuterWidth } from 'core/utils/size'; import $ from 'jquery'; -import translator from 'animation/translator'; -import dblclickEvent from 'events/dblclick'; -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; +import translator from 'common/core/animation/translator'; +import dblclickEvent from 'common/core/events/dblclick'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; import { supportedScrollingModes, createWrapper, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.dragging.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.dragging.tests.js index 77a38539b704..9c87513ac4c9 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.dragging.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/allDayAppointments.dragging.tests.js @@ -1,9 +1,9 @@ import { getOuterHeight } from 'core/utils/size'; import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import pointerMock from '../../helpers/pointerMock.js'; -import dragEvents from 'events/drag'; -import { DataSource } from 'data/data_source/data_source'; +import dragEvents from 'common/core/events/drag'; +import { DataSource } from 'common/data/data_source/data_source'; import dataUtils from 'core/element_data'; import { createWrapper, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.dataProcessor.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.dataProcessor.tests.js index 85d929195135..2caa4b3ec2e4 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.dataProcessor.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.dataProcessor.tests.js @@ -1,6 +1,6 @@ import { compileGetter, compileSetter } from 'core/utils/data'; import config from 'core/config'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import { AppointmentDataProvider } from '__internal/scheduler/appointments/data_provider/m_appointment_data_provider'; import { getPreparedDataItems } from '__internal/scheduler/r1/utils/index.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.editing.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.editing.tests.js index f98018c6e1f2..d919ca0b6be0 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.editing.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.editing.tests.js @@ -1,10 +1,10 @@ import { getOuterWidth, getOuterHeight } from 'core/utils/size'; import $ from 'jquery'; import { noop } from 'core/utils/common'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import pointerMock from '../../helpers/pointerMock.js'; import { hide } from '__internal/ui/tooltip/m_tooltip'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import { Deferred } from 'core/utils/deferred'; import { initTestMarkup, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.filtering.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.filtering.tests.js index 220fcf1e9caf..77330b3b5554 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.filtering.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.filtering.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; import dataUtils from 'core/element_data'; import { initTestMarkup, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.monthView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.monthView.tests.js index 3431660dbc4d..94bc36bdf4de 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.monthView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.monthView.tests.js @@ -1,11 +1,11 @@ import { getOuterWidth, getOuterHeight } from 'core/utils/size'; import $ from 'jquery'; -import translator from 'animation/translator'; -import fx from 'animation/fx'; +import translator from 'common/core/animation/translator'; +import fx from 'common/core/animation/fx'; import pointerMock from '../../helpers/pointerMock.js'; import Color from 'color'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; import browser from 'core/utils/browser'; import { APPOINTMENT_FORM_GROUP_NAMES } from '__internal/scheduler/appointment_popup/m_form'; import { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.resources.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.resources.tests.js index d3d60f7fd8a4..b13e711234a3 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.resources.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.resources.tests.js @@ -1,5 +1,5 @@ -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; import { initTestMarkup, createWrapper diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.scroll.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.scroll.tests.js index 1ba94cd7d728..79f4b7d64c86 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.scroll.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.scroll.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; import { createWrapper, initTestMarkup diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.templates.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.templates.tests.js index 5cd084df5568..8b7d65a9d431 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.templates.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.templates.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; import { initTestMarkup, createWrapper, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.tests.js index 720225f79b07..e5eb6f3b3519 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import { Appointment } from '__internal/scheduler/appointments/m_appointment'; import { Deferred } from 'core/utils/deferred'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; const { module, test, testStart } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.timeLines.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.timeLines.tests.js index dfe2c60d7e23..f5f5b165432d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.timeLines.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.timeLines.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import pointerMock from '../../helpers/pointerMock.js'; import { initTestMarkup, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.tooltip.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.tooltip.tests.js index 7208a8dce980..cb14107d4702 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.tooltip.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.tooltip.tests.js @@ -1,4 +1,4 @@ -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { initTestMarkup, createWrapper diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.week.based.views.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.week.based.views.tests.js index 0becf99bad76..a9fbe2f1207b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.week.based.views.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointment.week.based.views.tests.js @@ -1,14 +1,14 @@ import { getHeight, getOuterHeight, getOuterWidth } from 'core/utils/size'; import $ from 'jquery'; import errors from 'ui/widget/ui.errors'; -import translator from 'animation/translator'; -import dateLocalization from 'localization/date'; -import fx from 'animation/fx'; +import translator from 'common/core/animation/translator'; +import dateLocalization from 'common/core/localization/date'; +import fx from 'common/core/animation/fx'; import pointerMock from '../../helpers/pointerMock.js'; import Color from 'color'; import { hide } from '__internal/ui/tooltip/m_tooltip'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; import dataUtils from 'core/element_data'; import dateSerialization from 'core/utils/date_serialization'; import { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointmentPopup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointmentPopup.tests.js index 7e34004484b4..7279e2a97ac3 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointmentPopup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointmentPopup.tests.js @@ -5,10 +5,10 @@ import { initTestMarkup, createWrapper, isDesktopEnvironment } from '../../helpe import $ from 'jquery'; import devices from '__internal/core/m_devices'; import SelectBox from 'ui/select_box'; -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; import resizeCallbacks from 'core/utils/resize_callbacks'; -import messageLocalization from 'localization/message'; +import messageLocalization from 'common/core/localization/message'; import { APPOINTMENT_FORM_GROUP_NAMES } from '__internal/scheduler/appointment_popup/m_form'; import { dateToMilliseconds as toMs } from 'core/utils/date'; import '__internal/scheduler/m_scheduler'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.horizontalStrategy.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.horizontalStrategy.tests.js index 099a2881a952..9ffbf0c621ec 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.horizontalStrategy.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.horizontalStrategy.tests.js @@ -3,7 +3,7 @@ import $ from 'jquery'; import dataCoreUtils from 'core/utils/data'; import typeUtils from 'core/utils/type'; import { Deferred } from 'core/utils/deferred'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import '__internal/scheduler/m_scheduler'; import { ExpressionUtils } from '__internal/scheduler/m_expression_utils'; import { createExpressions } from '__internal/scheduler/resources/m_utils'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.tests.js index a7bde7993cd3..f03db0b2147f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.tests.js @@ -9,16 +9,16 @@ import '__internal/scheduler/workspaces/m_work_space_week'; import VerticalAppointmentsStrategy from '__internal/scheduler/appointments/rendering_strategies/m_strategy_vertical'; import HorizontalMonthAppointmentsStrategy from '__internal/scheduler/appointments/rendering_strategies/m_strategy_horizontal_month'; import SchedulerAppointments from '__internal/scheduler/appointments/m_appointment_collection'; -import eventsEngine from 'events/core/events_engine'; -import dblclickEvent from 'events/dblclick'; -import translator from 'animation/translator'; +import eventsEngine from 'common/core/events/core/events_engine'; +import dblclickEvent from 'common/core/events/dblclick'; +import translator from 'common/core/animation/translator'; import dataCoreUtils from 'core/utils/data'; import commonUtils from 'core/utils/common'; import typeUtils, { isRenderer } from 'core/utils/type'; import config from 'core/config'; import Resizable from 'ui/resizable'; -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; import { ExpressionUtils } from '__internal/scheduler/m_expression_utils'; import { Deferred } from 'core/utils/deferred'; import { createExpressions } from '__internal/scheduler/resources/m_utils'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.verticalStrategy.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.verticalStrategy.tests.js index 7f2caa21f27b..38558a04058b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.verticalStrategy.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/appointments.verticalStrategy.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import dataCoreUtils from 'core/utils/data'; import typeUtils from 'core/utils/type'; import { Deferred } from 'core/utils/deferred'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import '__internal/scheduler/m_scheduler'; import { ExpressionUtils } from '__internal/scheduler/m_expression_utils'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.events.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.events.tests.js index 219250b5c200..e5171bb93fa8 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.events.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.events.tests.js @@ -1,10 +1,10 @@ -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import Color from 'color'; import config from 'core/config'; import { noop } from 'core/utils/common'; import resizeCallbacks from 'core/utils/resize_callbacks'; import { isRenderer } from 'core/utils/type'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import $ from 'jquery'; import dxScheduler from '__internal/scheduler/m_scheduler'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.initialization.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.initialization.tests.js index 3bf12679570b..bd87840ab89a 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.initialization.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.initialization.tests.js @@ -1,7 +1,7 @@ -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; -import { triggerHidingEvent, triggerShownEvent } from 'events/visibility_change'; +import { triggerHidingEvent, triggerShownEvent } from 'common/core/events/visibility_change'; import $ from 'jquery'; import { AppointmentDataProvider } from '__internal/scheduler/appointments/data_provider/m_appointment_data_provider'; import errors from 'ui/widget/ui.errors'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.markup.tests.js index 199f5c1a45ff..a6b49100d9a8 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.markup.tests.js @@ -1,6 +1,6 @@ -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import dxScheduler from '__internal/scheduler/m_scheduler'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import dateUtils from 'core/utils/date'; import { AppointmentDataProvider } from '__internal/scheduler/appointments/data_provider/m_appointment_data_provider'; import { createWrapper, initTestMarkup } from '../../helpers/scheduler/helpers.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.methods.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.methods.tests.js index c485cf937e32..36821518546f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.methods.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.methods.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; -import fx from 'animation/fx'; -import CustomStore from 'data/custom_store'; -import { DataSource } from 'data/data_source/data_source'; +import fx from 'common/core/animation/fx'; +import { CustomStore } from 'common/data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; import timeZoneUtils from '__internal/scheduler/m_utils_time_zone'; import { createWrapper, initTestMarkup } from '../../helpers/scheduler/helpers.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.options.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.options.tests.js index 50c77159e65a..42d65aaeaa37 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.options.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.options.tests.js @@ -1,10 +1,10 @@ import { getOuterHeight } from 'core/utils/size'; import config from 'core/config'; import devices from '__internal/core/m_devices'; -import CustomStore from 'data/custom_store'; -import { DataSource } from 'data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; -import { triggerHidingEvent, triggerShownEvent } from 'events/visibility_change'; +import { triggerHidingEvent, triggerShownEvent } from 'common/core/events/visibility_change'; import $ from 'jquery'; import dxSchedulerWorkSpaceDay from '__internal/scheduler/workspaces/m_work_space_day'; import errors from 'ui/widget/ui.errors'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.tests.js index f06fc99c4f45..5520801da509 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/common.tests.js @@ -1,13 +1,13 @@ import { getOuterHeight, getHeight } from 'core/utils/size'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import config from 'core/config'; import dataUtils from 'core/element_data'; import { isRenderer } from 'core/utils/type'; -import CustomStore from 'data/custom_store'; -import { DataSource } from 'data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; import timeZoneDataUtils from '__internal/scheduler/timezones/m_utils_timezones_data'; -import { triggerHidingEvent, triggerShownEvent } from 'events/visibility_change'; +import { triggerHidingEvent, triggerShownEvent } from 'common/core/events/visibility_change'; import 'generic_light.css!'; import $ from 'jquery'; import { getTimeZones } from 'time_zone_utils'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/contentReadyEvent.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/contentReadyEvent.tests.js index 729fc3dd8658..2e2bfbbea0cd 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/contentReadyEvent.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/contentReadyEvent.tests.js @@ -1,9 +1,9 @@ import { SchedulerTestWrapper, initTestMarkup } from '../../helpers/scheduler/helpers.js'; import $ from 'jquery'; -import translator from 'animation/translator'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; -import fx from 'animation/fx'; +import translator from 'common/core/animation/translator'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; +import fx from 'common/core/animation/fx'; import '__internal/scheduler/m_scheduler'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/dataSource.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/dataSource.tests.js index c3ea1f1cf93f..c8aa780d4d35 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/dataSource.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/dataSource.tests.js @@ -5,15 +5,15 @@ import { initTestMarkup, isDesktopEnvironment } from '../../helpers/scheduler/helpers.js'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; -import fx from 'animation/fx'; -import translator from 'animation/translator'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import fx from 'common/core/animation/fx'; +import translator from 'common/core/animation/translator'; import timeZoneUtils from '__internal/scheduler/m_utils_time_zone'; -import CustomStore from 'data/custom_store'; +import { CustomStore } from 'common/data/custom_store'; import { noop } from 'core/utils/common'; import pointerMock from '../../helpers/pointerMock.js'; -import dragEvents from 'events/drag'; +import dragEvents from 'common/core/events/drag'; const { module, test, testStart } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/dragAndDropAppointments.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/dragAndDropAppointments.tests.js index d800b813b3ea..22639ee2083c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/dragAndDropAppointments.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/dragAndDropAppointments.tests.js @@ -1,11 +1,11 @@ -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import $ from 'jquery'; import pointerMock from '../../helpers/pointerMock.js'; import browser from 'core/utils/browser'; -import { DataSource } from 'data/data_source/data_source'; -import translator from 'animation/translator'; +import { DataSource } from 'common/data/data_source/data_source'; +import translator from 'common/core/animation/translator'; import config from 'core/config'; -import dragEvents from 'events/drag'; +import dragEvents from 'common/core/events/drag'; import dataUtils from 'core/element_data'; import Color from 'color'; import { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/editing.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/editing.tests.js index c138be185f39..2e7218bdb3fe 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/editing.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/editing.tests.js @@ -1,7 +1,7 @@ const $ = require('jquery'); const devices = require('core/devices'); const tooltip = require('__internal/ui/tooltip/m_tooltip'); -const fx = require('animation/fx'); +const fx = require('common/core/animation/fx'); const keyboardMock = require('../../helpers/keyboardMock.js'); const dataUtils = require('core/element_data'); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.RTL.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.RTL.tests.js index 2d30b47853ce..123285126aaa 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.RTL.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.RTL.tests.js @@ -1,6 +1,6 @@ -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { createWrapper, initTestMarkup, isDesktopEnvironment } from '../../helpers/scheduler/helpers.js'; -import translator from 'animation/translator'; +import translator from 'common/core/animation/translator'; import '__internal/scheduler/m_scheduler'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.adaptivity.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.adaptivity.tests.js index 8807bc417173..325a994a7173 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.adaptivity.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.adaptivity.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { createWrapper, initTestMarkup, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.agenda.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.agenda.tests.js index 1c0a2a7b6e09..1626ceb4c9f4 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.agenda.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.agenda.tests.js @@ -2,11 +2,11 @@ import { getOuterHeight, getOuterWidth } from 'core/utils/size'; import $ from 'jquery'; import devices from '__internal/core/m_devices'; import resizeCallbacks from 'core/utils/resize_callbacks'; -import dblclickEvent from 'events/dblclick'; -import fx from 'animation/fx'; +import dblclickEvent from 'common/core/events/dblclick'; +import fx from 'common/core/animation/fx'; import AgendaAppointmentsStrategy from '__internal/scheduler/appointments/rendering_strategies/m_strategy_agenda'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; import dataUtils from 'core/element_data'; import { createWrapper, SchedulerTestWrapper, initTestMarkup } from '../../helpers/scheduler/helpers.js'; import timeZoneUtils from '__internal/scheduler/m_utils_time_zone'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointmentCollector.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointmentCollector.tests.js index a7d60dbb6649..9d8c2b74fe2f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointmentCollector.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointmentCollector.tests.js @@ -1,13 +1,13 @@ import $ from 'jquery'; -import translator from 'animation/translator'; -import fx from 'animation/fx'; +import translator from 'common/core/animation/translator'; +import fx from 'common/core/animation/fx'; import { createWrapper } from '../../helpers/scheduler/helpers.js'; import themes from 'ui/themes'; import { CompactAppointmentsHelper } from '__internal/scheduler/m_compact_appointments_helper'; import Widget from 'ui/widget/ui.widget'; import Color from 'color'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; import AppointmentAdapter from '__internal/scheduler/m_appointment_adapter'; import '__internal/scheduler/m_scheduler'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointmentTooltip.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointmentTooltip.tests.js index 9738705dc927..89a059ea6519 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointmentTooltip.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointmentTooltip.tests.js @@ -3,10 +3,10 @@ import dateSerialization from 'core/utils/date_serialization'; import Tooltip from 'ui/tooltip'; import { hide } from '__internal/ui/tooltip/m_tooltip'; import resizeCallbacks from 'core/utils/resize_callbacks'; -import fx from 'animation/fx'; -import dateLocalization from 'localization/date'; -import messageLocalization from 'localization/message'; -import { DataSource } from 'data/data_source/data_source'; +import fx from 'common/core/animation/fx'; +import dateLocalization from 'common/core/localization/date'; +import messageLocalization from 'common/core/localization/message'; +import { DataSource } from 'common/data/data_source/data_source'; import keyboardMock from '../../helpers/keyboardMock.js'; import devices from '__internal/core/m_devices'; import dataUtils from 'core/element_data'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointments.crossScrollingEnabled.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointments.crossScrollingEnabled.tests.js index 12de53f4bd51..3a1c712c31dc 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointments.crossScrollingEnabled.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointments.crossScrollingEnabled.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import translator from 'animation/translator'; -import fx from 'animation/fx'; +import translator from 'common/core/animation/translator'; +import fx from 'common/core/animation/fx'; import pointerMock from '../../helpers/pointerMock.js'; import devices from '__internal/core/m_devices'; import { initTestMarkup, createWrapper } from '../../helpers/scheduler/helpers.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointmentsVertical.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointmentsVertical.tests.js index 92e022999c98..55fceff27c50 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointmentsVertical.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.appointmentsVertical.tests.js @@ -1,10 +1,10 @@ import { getOuterHeight, getOuterWidth, getWidth, getHeight } from 'core/utils/size'; import $ from 'jquery'; import { createWrapper, initTestMarkup } from '../../helpers/scheduler/helpers.js'; -import translator from 'animation/translator'; -import fx from 'animation/fx'; +import translator from 'common/core/animation/translator'; +import fx from 'common/core/animation/fx'; import pointerMock from '../../helpers/pointerMock.js'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import dataUtils from 'core/element_data'; import timeZoneUtils from '__internal/scheduler/m_utils_time_zone'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.dateNavigator.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.dateNavigator.tests.js index 860dbaac525e..49b56c8c4b02 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.dateNavigator.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.dateNavigator.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import '__internal/scheduler/m_scheduler'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.dstAppointments.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.dstAppointments.tests.js index a91264398963..c143f21ce6b2 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.dstAppointments.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.dstAppointments.tests.js @@ -1,6 +1,6 @@ import { initTestMarkup, createWrapper } from '../../helpers/scheduler/helpers.js'; -import dateLocalization from 'localization/date'; -import fx from 'animation/fx'; +import dateLocalization from 'common/core/localization/date'; +import fx from 'common/core/animation/fx'; import { dateToMilliseconds as toMs } from 'core/utils/date'; import timeZoneUtils from '__internal/scheduler/m_utils_time_zone'; import '__internal/scheduler/m_scheduler'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.multiWeekAppointments.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.multiWeekAppointments.tests.js index ad7735085df0..f8223015ffce 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.multiWeekAppointments.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.multiWeekAppointments.tests.js @@ -1,10 +1,10 @@ import { getOuterWidth, getOuterHeight } from 'core/utils/size'; import $ from 'jquery'; import { initTestMarkup, createWrapper } from '../../helpers/scheduler/helpers.js'; -import translator from 'animation/translator'; +import translator from 'common/core/animation/translator'; import Color from 'color'; -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; import '__internal/scheduler/m_scheduler'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.optionChange.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.optionChange.tests.js index c98c1bdd2520..34df43b98cbf 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.optionChange.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.optionChange.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import '__internal/scheduler/m_scheduler'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.recurrenceRuleValidation.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.recurrenceRuleValidation.tests.js index 54c9878baa39..9088f23acc68 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.recurrenceRuleValidation.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.recurrenceRuleValidation.tests.js @@ -9,9 +9,9 @@ QUnit.testStart(function() { require('generic_light.css!'); -const fx = require('animation/fx'); -const dragEvents = require('events/drag'); -const DataSource = require('data/data_source/data_source').DataSource; +const fx = require('common/core/animation/fx'); +const dragEvents = require('common/core/events/drag'); +const DataSource = require('common/data/data_source/data_source').DataSource; require('__internal/scheduler/m_scheduler'); require('ui/drop_down_button'); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.recurringAppointments.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.recurringAppointments.tests.js index deed380449a0..413d64817d9b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.recurringAppointments.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.recurringAppointments.tests.js @@ -1,12 +1,12 @@ import { getOuterHeight, getOuterWidth } from 'core/utils/size'; import $ from 'jquery'; -import dblclickEvent from 'events/dblclick'; +import dblclickEvent from 'common/core/events/dblclick'; import Color from 'color'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import pointerMock from '../../helpers/pointerMock.js'; -import dragEvents from 'events/drag'; -import translator from 'animation/translator'; -import { DataSource } from 'data/data_source/data_source'; +import dragEvents from 'common/core/events/drag'; +import translator from 'common/core/animation/translator'; +import { DataSource } from 'common/data/data_source/data_source'; import dateSerialization from 'core/utils/date_serialization'; import { createWrapper, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.resources.dataSource.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.resources.dataSource.tests.js index 6f0a1bf4d54b..dfcd1070325d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.resources.dataSource.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.resources.dataSource.tests.js @@ -1,6 +1,6 @@ import { createWrapper, initTestMarkup } from '../../helpers/scheduler/helpers.js'; -import fx from 'animation/fx'; -import CustomStore from 'data/custom_store'; +import fx from 'common/core/animation/fx'; +import { CustomStore } from 'common/data/custom_store'; const moduleConfig = { beforeEach() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.resources.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.resources.tests.js index 82de6fb8c0be..c13dcbc6cc68 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.resources.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.resources.tests.js @@ -3,12 +3,12 @@ import devices from '__internal/core/m_devices'; import 'generic_light.css!'; -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; import { getOuterHeight } from 'core/utils/size'; -import CustomStore from 'data/custom_store'; +import { CustomStore } from 'common/data/custom_store'; import Color from 'color'; -import translator from 'animation/translator'; +import translator from 'common/core/animation/translator'; import '__internal/scheduler/m_scheduler'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.timeline.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.timeline.tests.js index 5ffb1fb6412f..b657c3880d4f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.timeline.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.timeline.tests.js @@ -9,8 +9,8 @@ QUnit.testStart(() => { import 'generic_light.css!'; -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; import devices from '__internal/core/m_devices'; import '__internal/scheduler/m_scheduler'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.viewSwitcher.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.viewSwitcher.tests.js index c0bb30d79b4a..de69d636a4f4 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.viewSwitcher.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.viewSwitcher.tests.js @@ -11,7 +11,7 @@ require('generic_light.css!'); require('ui/drop_down_button'); const noop = require('core/utils/common').noop; -const DataSource = require('data/data_source/data_source').DataSource; +const DataSource = require('common/data/data_source/data_source').DataSource; require('__internal/scheduler/m_scheduler'); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.workSpace.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.workSpace.tests.js index f9e0e5b51679..8ff5de049bfe 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.workSpace.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/integration.workSpace.tests.js @@ -1,16 +1,16 @@ import $ from 'jquery'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import { createWrapper, CLASSES, initTestMarkup, isDesktopEnvironment } from '../../helpers/scheduler/helpers.js'; import keyboardMock from '../../helpers/keyboardMock.js'; import localization from 'localization'; -import eventsEngine from 'events/core/events_engine'; -import fx from 'animation/fx'; +import eventsEngine from 'common/core/events/core/events_engine'; +import fx from 'common/core/animation/fx'; import pointerMock from '../../helpers/pointerMock.js'; -import dragEvents from 'events/drag'; -import CustomStore from 'data/custom_store'; +import dragEvents from 'common/core/events/drag'; +import { CustomStore } from 'common/data/custom_store'; import { isRenderer } from 'core/utils/type'; import config from 'core/config'; -import translator from 'animation/translator'; +import translator from 'common/core/animation/translator'; import { getOuterHeight, getInnerHeight, getOuterWidth } from 'core/utils/size'; const SELECTED_CELL_CLASS = CLASSES.selectedCell.slice(1); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/keyboardNavigation.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/keyboardNavigation.tests.js index e10bab9864a1..b086b19552c0 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/keyboardNavigation.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/keyboardNavigation.tests.js @@ -1,4 +1,4 @@ -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import $ from 'jquery'; import keyboardMock from '../../helpers/keyboardMock.js'; import { createWrapper, initTestMarkup } from '../../helpers/scheduler/helpers.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/layoutManager.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/layoutManager.tests.js index 48029d5231f4..f6dba4a3fa63 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/layoutManager.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/layoutManager.tests.js @@ -5,7 +5,7 @@ import '__internal/scheduler/m_scheduler'; import $ from 'jquery'; import keyboardMock from '../../helpers/keyboardMock.js'; import pointerMock from '../../helpers/pointerMock.js'; -import translator from 'animation/translator'; +import translator from 'common/core/animation/translator'; import AppointmentLayoutManager from '__internal/scheduler/m_appointments_layout_manager'; import BaseAppointmentsStrategy from '__internal/scheduler/appointments/rendering_strategies/m_strategy_base'; @@ -14,7 +14,7 @@ import HorizontalAppointmentsStrategy from '__internal/scheduler/appointments/re import HorizontalMonthLineAppointmentsStrategy from '__internal/scheduler/appointments/rendering_strategies/m_strategy_horizontal_month_line'; import Color from 'color'; import dataUtils from 'core/element_data'; -import CustomStore from 'data/custom_store'; +import { CustomStore } from 'common/data/custom_store'; import { SchedulerTestWrapper } from '../../helpers/scheduler/helpers.js'; const APPOINTMENT_DEFAULT_LEFT_OFFSET = 26; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/loading.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/loading.tests.js index dadcef0df999..44f42af161a7 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/loading.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/loading.tests.js @@ -1,7 +1,7 @@ const $ = require('jquery'); const loading = require('__internal/scheduler/m_loading'); const viewPort = require('core/utils/view_port').value; -const fx = require('animation/fx'); +const fx = require('common/core/animation/fx'); const LoadPanel = require('ui/load_panel'); QUnit.module('loading tests', { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/pacificTime.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/pacificTime.tests.js index 4cf3509202e3..0ee4c5f70869 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/pacificTime.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/pacificTime.tests.js @@ -1,6 +1,6 @@ import { initTestMarkup, createWrapper, isDesktopEnvironment, CLASSES } from '../../helpers/scheduler/helpers.js'; import pointerMock from '../../helpers/pointerMock.js'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import timeZoneUtils from '__internal/scheduler/m_utils_time_zone'; import { getRecurrenceProcessor } from '__internal/scheduler/m_recurrence'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/perfomance.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/perfomance.tests.js index 40b15c59f759..fb018a5a2957 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/perfomance.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/perfomance.tests.js @@ -3,10 +3,10 @@ import '__internal/scheduler/m_scheduler'; import $ from 'jquery'; import pointerMock from '../../helpers/pointerMock.js'; -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; -import CustomStore from 'data/custom_store'; +import { CustomStore } from 'common/data/custom_store'; import { SchedulerTestWrapper } from '../../helpers/scheduler/helpers.js'; QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/recurrenceDialog.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/recurrenceDialog.tests.js index 2f348043ff0f..ae32ab6226a4 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/recurrenceDialog.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/recurrenceDialog.tests.js @@ -1,4 +1,4 @@ -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import 'generic_light.css!'; import { createWrapper, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/recurrenceEditor.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/recurrenceEditor.tests.js index a5568c9817a2..42f0c320a0c3 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/recurrenceEditor.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/recurrenceEditor.tests.js @@ -8,7 +8,7 @@ import ButtonGroup from 'ui/button_group'; import DateBox from 'ui/date_box'; import { getRecurrenceProcessor } from '__internal/scheduler/m_recurrence'; import { createTimeZoneCalculator } from '__internal/scheduler/r1/timezone_calculator/index.js'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; const FREQUENCY_EDITOR = 'dx-recurrence-selectbox-freq'; const REPEAT_COUNT_EDITOR = 'dx-recurrence-numberbox-repeat-count'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/resourceManager.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/resourceManager.tests.js index 615573335171..e3bfd926801b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/resourceManager.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/resourceManager.tests.js @@ -16,8 +16,8 @@ import { getDataAccessors, loadResources } from '__internal/scheduler/resources/m_utils'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; const testData = { rooms: [{ diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/scrollTo.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/scrollTo.tests.js index 6c342c9eb544..ff263e9731bd 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/scrollTo.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/scrollTo.tests.js @@ -1,4 +1,4 @@ -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import 'generic_light.css!'; import $ from 'jquery'; import errors from 'ui/widget/ui.errors'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/scrollToTime.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/scrollToTime.tests.js index 2afcf8232c09..3dcfc368b394 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/scrollToTime.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/scrollToTime.tests.js @@ -1,5 +1,5 @@ import { getOuterHeight, getOuterWidth } from 'core/utils/size'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import errors from 'ui/widget/ui.errors'; import { createWrapper, initTestMarkup } from '../../helpers/scheduler/helpers.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/subscribes.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/subscribes.tests.js index 6e679236c11d..39230f2ad22e 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/subscribes.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/subscribes.tests.js @@ -7,7 +7,7 @@ import { } from '__internal/scheduler/appointments/m_settings_generator'; import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import dateUtils from 'core/utils/date'; import config from 'core/config'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.markup.tests.js index 7150489f25ad..086abb0dd47e 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.markup.tests.js @@ -5,7 +5,7 @@ import SchedulerTimelineWeek from '__internal/scheduler/workspaces/m_timeline_we import SchedulerTimelineWorkWeek from '__internal/scheduler/workspaces/m_timeline_work_week'; import SchedulerTimelineMonth from '__internal/scheduler/workspaces/m_timeline_month'; import dataUtils from 'core/element_data'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import SchedulerWorkSpaceVerticalStrategy from '__internal/scheduler/workspaces/m_work_space_grouped_strategy_vertical'; import SchedulerWorkSpaceHorizontalStrategy from '__internal/scheduler/workspaces/m_work_space_grouped_strategy_horizontal'; import '__internal/scheduler/m_scheduler'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.tests.js index 56880cc842ca..551178c100a0 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timeline.tests.js @@ -1,7 +1,7 @@ import { getOuterWidth, getOuterHeight } from 'core/utils/size'; import dateUtils from 'core/utils/date'; import resizeCallbacks from 'core/utils/resize_callbacks'; -import { triggerHidingEvent, triggerShownEvent } from 'events/visibility_change'; +import { triggerHidingEvent, triggerShownEvent } from 'common/core/events/visibility_change'; import 'generic_light.css!'; import $ from 'jquery'; import '__internal/scheduler/workspaces/m_timeline'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timezones.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timezones.tests.js index eb5ea7986f2c..f291df8d07c4 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timezones.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/timezones.tests.js @@ -1,6 +1,6 @@ import { getOuterHeight, getOuterWidth } from 'core/utils/size'; import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { CLASSES, createWrapper, @@ -9,12 +9,12 @@ import { } from '../../helpers/scheduler/helpers.js'; import pointerMock from '../../helpers/pointerMock.js'; import dateUtils from 'core/utils/date'; -import dateLocalization from 'localization/date'; -import translator from 'animation/translator'; +import dateLocalization from 'common/core/localization/date'; +import translator from 'common/core/animation/translator'; import { hide } from '__internal/ui/tooltip/m_tooltip'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; -import dragEvents from 'events/drag'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import dragEvents from 'common/core/events/drag'; import timeZoneUtils from '__internal/scheduler/m_utils_time_zone'; const { testStart, test, module } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/views.cellTemplate.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/views.cellTemplate.tests.js index 447a6cfdda22..3f1170a82e6c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/views.cellTemplate.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/views.cellTemplate.tests.js @@ -1,6 +1,6 @@ import { getOuterWidth, getOuterHeight } from 'core/utils/size'; import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { isRenderer } from 'core/utils/type'; import config from 'core/config'; import { createWrapper, initTestMarkup } from '../../helpers/scheduler/helpers.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/views.cellsSelection.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/views.cellsSelection.tests.js index a75c337466ca..d5e4324c3a88 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/views.cellsSelection.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/views.cellsSelection.tests.js @@ -1,5 +1,5 @@ import 'generic_light.css!'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { createWrapper, initTestMarkup, CLASSES, isDesktopEnvironment } from '../../helpers/scheduler/helpers.js'; const { test, module, testStart } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/virtual_scrolling.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/virtual_scrolling.integration.tests.js index 9227eaf30754..33bfec9efc43 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/virtual_scrolling.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/virtual_scrolling.integration.tests.js @@ -4,7 +4,7 @@ import { getWindow } from 'core/utils/window'; import 'generic_light.css!'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import { createWrapper, initTestMarkup, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/virtual_scrolling.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/virtual_scrolling.tests.js index b71feb807567..a361ac90a46d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/virtual_scrolling.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/virtual_scrolling.tests.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import { VirtualScrollingDispatcher } from '__internal/scheduler/workspaces/m_virtual_scrolling'; import domAdapter from '__internal/core/m_dom_adapter'; -import eventsEngine from 'events/core/events_engine'; -import { addNamespace } from 'events/utils/index'; +import eventsEngine from 'common/core/events/core/events_engine'; +import { addNamespace } from 'common/core/events/utils/index'; const { module, diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.base.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.base.tests.js index ab03e67c0fcd..7a267060e3fa 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.base.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.base.tests.js @@ -2,7 +2,7 @@ import dateUtils from 'core/utils/date'; import resizeCallbacks from 'core/utils/resize_callbacks'; import 'generic_light.css!'; import $ from 'jquery'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import '__internal/scheduler/workspaces/m_work_space_day'; import '__internal/scheduler/workspaces/m_work_space_week'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.day.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.day.tests.js index d81c7a7a320c..b0d7d2a776b7 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.day.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.day.tests.js @@ -1,9 +1,9 @@ import { getOuterHeight } from 'core/utils/size'; -import dragEvents from 'events/drag'; +import dragEvents from 'common/core/events/drag'; import 'generic_light.css!'; import $ from 'jquery'; import resizeCallbacks from 'core/utils/resize_callbacks'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import '__internal/scheduler/workspaces/m_work_space_day'; const CELL_CLASS = 'dx-scheduler-date-table-cell'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.markup.tests.js index 6bcfadcc8848..300ba086289b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.markup.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import SchedulerWorkSpace from '__internal/scheduler/workspaces/m_work_space'; import SchedulerWorkSpaceHorizontalStrategy from '__internal/scheduler/workspaces/m_work_space_grouped_strategy_horizontal'; import SchedulerWorkSpaceVerticalStrategy from '__internal/scheduler/workspaces/m_work_space_grouped_strategy_vertical'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; import devices from '__internal/core/m_devices'; import '__internal/scheduler/m_scheduler'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.week.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.week.tests.js index fbd0ce283580..728071bd5b47 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.week.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpace.week.tests.js @@ -1,5 +1,5 @@ import dateUtils from 'core/utils/date'; -import { triggerShownEvent } from 'events/visibility_change'; +import { triggerShownEvent } from 'common/core/events/visibility_change'; import 'generic_light.css!'; import $ from 'jquery'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpaceWithHorizontalScroll.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpaceWithHorizontalScroll.tests.js index 22f38d83e963..1bc35007c3c1 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpaceWithHorizontalScroll.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.scheduler/workSpaceWithHorizontalScroll.tests.js @@ -1,6 +1,6 @@ import { getOuterWidth } from 'core/utils/size'; import devices from '__internal/core/m_devices'; -import { triggerHidingEvent, triggerResizeEvent, triggerShownEvent } from 'events/visibility_change'; +import { triggerHidingEvent, triggerResizeEvent, triggerShownEvent } from 'common/core/events/visibility_change'; import 'generic_light.css!'; import $ from 'jquery'; import '__internal/scheduler/m_scheduler'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/dataController.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/dataController.tests.js index 7e8d942a9b96..48c13f570c10 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/dataController.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/dataController.tests.js @@ -1,9 +1,9 @@ import '__internal/grids/tree_list/m_widget'; import $ from 'jquery'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; import Guid from 'core/guid'; -import query from 'data/query'; +import query from 'common/data/query'; import { setupTreeListModules } from '../../helpers/treeListMocks.js'; const createDataSource = function(data, storeOptions, dataSourceOptions) { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/editing.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/editing.tests.js index a3a6894bb894..739ec19cbfa7 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/editing.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/editing.tests.js @@ -13,9 +13,9 @@ QUnit.testStart(function() { import 'generic_light.css!'; import '__internal/grids/tree_list/m_widget'; import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { setupTreeListModules } from '../../helpers/treeListMocks.js'; -import ArrayStore from 'data/array_store'; +import ArrayStore from 'common/data/array_store'; fx.off = true; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/gridView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/gridView.tests.js index 3a7873ec60d1..c674df72460d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/gridView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/gridView.tests.js @@ -13,7 +13,7 @@ QUnit.testStart(function() { import 'generic_light.css!'; import '__internal/grids/tree_list/m_widget'; import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { setupTreeListModules, MockColumnsController, MockDataController } from '../../helpers/treeListMocks.js'; fx.off = true; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/headerPanel.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/headerPanel.tests.js index 86a3f4e6250d..58be3c61f0fb 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/headerPanel.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/headerPanel.tests.js @@ -13,7 +13,7 @@ QUnit.testStart(function() { import 'generic_light.css!'; import '__internal/grids/tree_list/m_widget'; import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { setupTreeListModules, MockColumnsController, MockDataController } from '../../helpers/treeListMocks.js'; fx.off = true; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/rows.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/rows.tests.js index 51ca79a39314..fe7bb1de5abb 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/rows.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/rows.tests.js @@ -13,7 +13,7 @@ QUnit.testStart(function() { import 'generic_light.css!'; import '__internal/grids/tree_list/m_widget'; import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { noop } from 'core/utils/common'; import { setupTreeListModules, MockColumnsController, MockDataController } from '../../helpers/treeListMocks.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/selection.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/selection.integration.tests.js index 1c4d0a63d6e6..aee3b13368cc 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/selection.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/selection.integration.tests.js @@ -1,6 +1,6 @@ import 'ui/tree_list'; import { baseModuleConfig } from '../../helpers/dataGridHelper.js'; -import ArrayStore from 'data/array_store'; +import ArrayStore from 'common/data/array_store'; import $ from 'jquery'; QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/selection.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/selection.tests.js index 74ab81b9dde9..75b0c86e86e9 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/selection.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/selection.tests.js @@ -17,8 +17,8 @@ QUnit.testStart(function() { import 'generic_light.css!'; import '__internal/grids/tree_list/m_widget'; import $ from 'jquery'; -import fx from 'animation/fx'; -import ArrayStore from 'data/array_store'; +import fx from 'common/core/animation/fx'; +import ArrayStore from 'common/data/array_store'; import { setupTreeListModules } from '../../helpers/treeListMocks.js'; fx.off = true; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/treeList.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/treeList.tests.js index b1c0fdd16403..aedd188026d1 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/treeList.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.treeList/treeList.tests.js @@ -16,14 +16,14 @@ import $ from 'jquery'; import { noop } from 'core/utils/common'; import devices from '__internal/core/m_devices'; import { getOuterHeight } from 'core/utils/size'; -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; import { TreeListWrapper } from '../../helpers/wrappers/dataGridWrappers.js'; -import ArrayStore from 'data/array_store'; +import ArrayStore from 'common/data/array_store'; import TreeList from '__internal/grids/tree_list/m_widget'; import pointerMock from '../../helpers/pointerMock.js'; import { CLICK_EVENT } from '../../helpers/grid/keyboardNavigationHelper.js'; -import { createEvent } from 'events/utils/index'; +import { createEvent } from 'common/core/events/utils/index'; fx.off = true; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/accordion.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/accordion.tests.js index 3bfd4c50eb28..a9d3879c71d1 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/accordion.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/accordion.tests.js @@ -1,14 +1,14 @@ -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import 'generic_light.css!'; import config from 'core/config'; import { getHeight } from 'core/utils/size'; import { deferUpdate, noop } from 'core/utils/common'; import { extend } from 'core/utils/extend'; import { isRenderer } from 'core/utils/type'; -import CustomStore from 'data/custom_store'; -import { DataSource } from 'data/data_source/data_source'; -import holdEvent from 'events/hold'; -import { triggerShownEvent } from 'events/visibility_change'; +import { CustomStore } from 'common/data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import holdEvent from 'common/core/events/hold'; +import { triggerShownEvent } from 'common/core/events/visibility_change'; import $ from 'jquery'; import Accordion from 'ui/accordion'; import themes from 'ui/themes'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/actionSheet.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/actionSheet.tests.js index 1e545c20d3ad..6ed74a4cff0e 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/actionSheet.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/actionSheet.tests.js @@ -1,8 +1,8 @@ import { getWidth, getHeight, getOuterWidth } from 'core/utils/size'; import $ from 'jquery'; -import fx from 'animation/fx'; -import positionUtils from 'animation/position'; -import holdEvent from 'events/hold'; +import fx from 'common/core/animation/fx'; +import positionUtils from 'common/core/animation/position'; +import holdEvent from 'common/core/events/hold'; import pointerMock from '../../helpers/pointerMock.js'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/animator.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/animator.tests.js index 6ce5ac0fea35..356f079812fe 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/animator.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/animator.tests.js @@ -1,5 +1,5 @@ import Animator from '__internal/ui/scroll_view/m_animator'; -import animationFrame from 'animation/frame'; +import animationFrame from 'common/core/animation/frame'; const REQEST_ANIMATION_FRAME_TIMEOUT = 10; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/box.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/box.tests.js index dadff813e2d9..ba5e00cb6453 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/box.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/box.tests.js @@ -1,4 +1,4 @@ -import { triggerShownEvent } from 'events/visibility_change'; +import { triggerShownEvent } from 'common/core/events/visibility_change'; import $ from 'jquery'; import 'ui/box'; import 'ui/scroll_view/ui.scrollable'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/buttonGroup.selection.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/buttonGroup.selection.tests.js index 5cbaec03068d..0711e1b30500 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/buttonGroup.selection.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/buttonGroup.selection.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import 'ui/button'; import 'ui/button_group'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/buttonGroup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/buttonGroup.tests.js index 2acd972a81b1..18721695eb82 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/buttonGroup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/buttonGroup.tests.js @@ -3,7 +3,7 @@ import $ from 'jquery'; import 'ui/button'; import 'ui/button_group'; import devices from '__internal/core/m_devices'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import keyboardMock from '../../helpers/keyboardMock.js'; import pointerMock from '../../helpers/pointerMock.js'; import registerKeyHandlerTestHelper from '../../helpers/registerKeyHandlerTestHelper.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/chatParts/chat.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/chatParts/chat.tests.js index d41f75c374b3..e4a5d2ca92a9 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/chatParts/chat.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/chatParts/chat.tests.js @@ -5,14 +5,14 @@ import MessageList from '__internal/ui/chat/messagelist'; import AlertList from '__internal/ui/chat/alertlist'; import MessageBox, { TYPING_END_DELAY } from '__internal/ui/chat/messagebox'; import keyboardMock from '../../../helpers/keyboardMock.js'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; import dataUtils from 'core/element_data'; import { isRenderer } from 'core/utils/type'; import config from 'core/config'; -import ArrayStore from 'data/array_store'; +import ArrayStore from 'common/data/array_store'; const CHAT_MESSAGEGROUP_CLASS = 'dx-chat-messagegroup'; const CHAT_MESSAGELIST_CLASS = 'dx-chat-messagelist'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/chatParts/messageGroup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/chatParts/messageGroup.tests.js index 2594b6320469..9d625b283669 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/chatParts/messageGroup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/chatParts/messageGroup.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import MessageGroup from '__internal/ui/chat/messagegroup'; import ChatAvatar from '__internal/ui/chat/avatar'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; const AVATAR_CLASS = 'dx-avatar'; const CHAT_MESSAGEGROUP_TIME_CLASS = 'dx-chat-messagegroup-time'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/chatParts/messageList.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/chatParts/messageList.tests.js index 1563d6168aba..e853c3fd501d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/chatParts/messageList.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/chatParts/messageList.tests.js @@ -14,7 +14,7 @@ import MessageGroup from '__internal/ui/chat/messagegroup'; import TypingIndicator from '__internal/ui/chat/typingindicator'; import devices from '__internal/core/m_devices'; import localization from 'localization'; -import dateLocalization from 'localization/date'; +import dateLocalization from 'common/core/localization/date'; const CHAT_MESSAGELIST_CONTENT_CLASS = 'dx-chat-messagelist-content'; const CHAT_MESSAGELIST_EMPTY_MESSAGE_CLASS = 'dx-chat-messagelist-empty-message'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/contextMenu.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/contextMenu.tests.js index 200ca0c4e072..72e8890f6bc7 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/contextMenu.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/contextMenu.tests.js @@ -4,11 +4,11 @@ import domAdapter from '__internal/core/m_dom_adapter'; import resizeCallbacks from 'core/utils/resize_callbacks'; import support from '__internal/core/utils/m_support'; import { implementationsMap, getWidth, getHeight } from 'core/utils/size'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import ContextMenu from 'ui/context_menu'; -import { addNamespace } from 'events/utils/index'; -import contextMenuEvent from 'events/contextmenu'; -import holdEvent from 'events/hold'; +import { addNamespace } from 'common/core/events/utils/index'; +import contextMenuEvent from 'common/core/events/contextmenu'; +import holdEvent from 'common/core/events/hold'; import { isRenderer } from 'core/utils/type'; import config from 'core/config'; import keyboardMock from '../../helpers/keyboardMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/deferRendering.animation.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/deferRendering.animation.tests.js index 632dd1dfcbd4..c76ddd1b3ec8 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/deferRendering.animation.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/deferRendering.animation.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import TransitionExecutorModule from 'animation/transition_executor/transition_executor'; +import TransitionExecutorModule from 'common/core/animation/transition_executor/transition_executor'; import 'ui/defer_rendering'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/deferRendering.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/deferRendering.tests.js index 27bd29c0465b..7532f603f6f1 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/deferRendering.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/deferRendering.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import TransitionExecutorModule from 'animation/transition_executor/transition_executor'; +import TransitionExecutorModule from 'common/core/animation/transition_executor/transition_executor'; import dataUtils from 'core/element_data'; import 'ui/defer_rendering'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/diagramParts/dataBinding.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/diagramParts/dataBinding.tests.js index d84e50e012c8..8adecd44f449 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/diagramParts/dataBinding.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/diagramParts/dataBinding.tests.js @@ -2,8 +2,8 @@ import $ from 'jquery'; const { test } = QUnit; import 'ui/diagram'; -import DataSource from 'data/data_source'; -import ArrayStore from 'data/array_store'; +import DataSource from 'common/data/data_source'; +import ArrayStore from 'common/data/array_store'; import { DiagramCommand } from 'devexpress-diagram'; import { Consts } from '../../../helpers/diagramHelpers.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/draggable.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/draggable.tests.js index ca6e3f1840c0..4773e8b148ed 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/draggable.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/draggable.tests.js @@ -2,10 +2,10 @@ import $ from 'jquery'; import { noop } from 'core/utils/common'; import pointerMock from '../../helpers/pointerMock.js'; import viewPort from 'core/utils/view_port'; -import GestureEmitter from 'events/gesture/emitter.gesture.js'; -import animationFrame from 'animation/frame'; -import translator from 'animation/translator'; -import fx from 'animation/fx'; +import GestureEmitter from 'common/core/events/gesture/emitter.gesture.js'; +import animationFrame from 'common/core/animation/frame'; +import translator from 'common/core/animation/translator'; +import fx from 'common/core/animation/fx'; import keyboardMock from '../../helpers/keyboardMock.js'; import 'generic_light.css!'; import 'ui/draggable'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/drawer.scenarios.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/drawer.scenarios.tests.js index af522b075b55..e78d9004381d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/drawer.scenarios.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/drawer.scenarios.tests.js @@ -15,7 +15,7 @@ import 'ui/tree_view'; import 'generic_light.css!'; import dxDrawer from 'ui/drawer'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; const moduleConfig = { beforeEach: function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/drawer.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/drawer.tests.js index 6cd1cb92aa91..4daa246b1172 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/drawer.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/drawer.tests.js @@ -1,13 +1,13 @@ import { getHeight, getWidth, getOuterWidth } from 'core/utils/size'; -import fx from 'animation/fx'; -import translator from 'animation/translator'; +import fx from 'common/core/animation/fx'; +import translator from 'common/core/animation/translator'; import 'generic_light.css!'; import config from 'core/config'; import resizeCallbacks from 'core/utils/resize_callbacks'; import typeUtils from 'core/utils/type'; import { addShadowDomStyles } from 'core/utils/shadow_dom'; -import eventsEngine from 'events/core/events_engine'; -import visibilityChange from 'events/visibility_change'; +import eventsEngine from 'common/core/events/core/events_engine'; +import visibilityChange from 'common/core/events/visibility_change'; import $ from 'jquery'; import Button from 'ui/button'; import Drawer from 'ui/drawer'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/dropDownButton.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/dropDownButton.markup.tests.js index 4e0f2794616b..f832cc762498 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/dropDownButton.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/dropDownButton.markup.tests.js @@ -2,7 +2,7 @@ import { getHeight, getOuterWidth, getWidth } from 'core/utils/size'; import $ from 'jquery'; import DropDownButton from 'ui/drop_down_button'; import windowUtils from 'core/utils/window'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/dropDownButton.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/dropDownButton.tests.js index 802fb7ad746f..6f78358fb9dd 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/dropDownButton.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/dropDownButton.tests.js @@ -3,11 +3,11 @@ import $ from 'jquery'; import DropDownButton from 'ui/drop_down_button'; import typeUtils, { isRenderer } from 'core/utils/type'; import config from 'core/config'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import keyboardMock from '../../helpers/keyboardMock.js'; -import ArrayStore from 'data/array_store'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; +import ArrayStore from 'common/data/array_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; import { extend } from 'core/utils/extend'; import devices from '__internal/core/m_devices'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/adaptivity.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/adaptivity.tests.js index dbd20e5dd2b9..4838c746a60f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/adaptivity.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/adaptivity.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import resizeCallbacks from 'core/utils/resize_callbacks'; import 'ui/file_manager'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { FileManagerWrapper, createTestFileSystem, Consts } from '../../../helpers/fileManagerHelpers.js'; import { implementationsMap, getOuterWidth } from 'core/utils/size'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/contextMenu.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/contextMenu.tests.js index 7dc4b80f182d..7c5784cab477 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/contextMenu.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/contextMenu.tests.js @@ -1,8 +1,8 @@ import $ from 'jquery'; const { test } = QUnit; import 'ui/file_manager'; -import fx from 'animation/fx'; -import pointerEvents from 'events/pointer'; +import fx from 'common/core/animation/fx'; +import pointerEvents from 'common/core/events/pointer'; import { Consts, FileManagerWrapper, createTestFileSystem, isDesktopDevice } from '../../../helpers/fileManagerHelpers.js'; const moduleConfig = { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/detailsView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/detailsView.tests.js index 3bbab7800c31..e0858c41dc17 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/detailsView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/detailsView.tests.js @@ -1,9 +1,9 @@ import $ from 'jquery'; import 'ui/file_manager'; -import fx from 'animation/fx'; -import pointerEvents from 'events/pointer'; +import fx from 'common/core/animation/fx'; +import pointerEvents from 'common/core/events/pointer'; import localization from 'localization'; -import messageLocalization from 'localization/message'; +import messageLocalization from 'common/core/localization/message'; import { FileManagerWrapper, createTestFileSystem, isDesktopDevice, createHugeFileSystem } from '../../../helpers/fileManagerHelpers.js'; import { triggerCellClick } from '../../../helpers/fileManager/events.js'; import { implementationsMap } from 'core/utils/size'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/editing.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/editing.tests.js index 6011f2b4e1e2..03f89a532b42 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/editing.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/editing.tests.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import 'ui/file_manager'; import FileUploader from 'ui/file_uploader'; -import fx from 'animation/fx'; -import pointerEvents from 'events/pointer'; +import fx from 'common/core/animation/fx'; +import pointerEvents from 'common/core/events/pointer'; import ObjectFileSystemProvider from 'file_management/object_provider'; import CustomFileSystemProvider from 'file_management/custom_provider'; import FileSystemError from 'file_management/error.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/editingEvents.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/editingEvents.tests.js index eb1fe03603b4..4c4d05851af7 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/editingEvents.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/editingEvents.tests.js @@ -1,7 +1,7 @@ const { test } = QUnit; import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import FileUploader from 'ui/file_uploader'; import ObjectFileSystemProvider from 'file_management/object_provider'; import { createTestFileSystem, createEditingEvents, createUploaderFiles, stubFileReader, FileManagerWrapper, FileManagerProgressPanelWrapper } from '../../../helpers/fileManagerHelpers.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/editingProgress.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/editingProgress.tests.js index f03cdfabb2c9..115a8d8b7e63 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/editingProgress.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/editingProgress.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { Deferred } from 'core/utils/deferred'; import ObjectFileSystemProvider from 'file_management/object_provider'; import ErrorCode from 'file_management/error_codes'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/markup.tests.js index 1e45a7232e97..dae688fb8a16 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/markup.tests.js @@ -1,7 +1,7 @@ const { test } = QUnit; import $ from 'jquery'; import 'ui/file_manager'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import windowUtils from 'core/utils/window'; import { FileManagerWrapper, createTestFileSystem, Consts, isDesktopDevice } from '../../../helpers/fileManagerHelpers.js'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/navigation.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/navigation.tests.js index 5091f952c79f..2d3bedb252de 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/navigation.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/navigation.tests.js @@ -6,7 +6,7 @@ import CustomFileSystemProvider from 'file_management/custom_provider'; import ObjectFileSystemProvider from 'file_management/object_provider.js'; import { FileItemsController } from 'ui/file_manager/file_items_controller'; import FileManagerBreadcrumbs from 'ui/file_manager/ui.file_manager.breadcrumbs'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { FileManagerWrapper, FileManagerBreadcrumbsWrapper, FileManagerProgressPanelWrapper, createTestFileSystem } from '../../../helpers/fileManagerHelpers.js'; import SlowFileProvider from '../../../helpers/fileManager/file_provider.slow.js'; import { implementationsMap } from 'core/utils/size'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/progressPanel.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/progressPanel.tests.js index fa250f296d37..a05552b84601 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/progressPanel.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/progressPanel.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import FileUploader from 'ui/file_uploader'; import resizeCallbacks from 'core/utils/resize_callbacks'; import { createTestFileSystem, createUploaderFiles, FileManagerProgressPanelWrapper, FileManagerWrapper } from '../../../helpers/fileManagerHelpers.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/scroll.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/scroll.tests.js index 1513bf6dbf57..9b8f00fef4d9 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/scroll.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/scroll.tests.js @@ -1,8 +1,8 @@ import $ from 'jquery'; const { test } = QUnit; import 'ui/file_manager'; -import fx from 'animation/fx'; -import pointerEvents from 'events/pointer'; +import fx from 'common/core/animation/fx'; +import pointerEvents from 'common/core/events/pointer'; import { FileManagerWrapper, FileManagerProgressPanelWrapper, createTestFileSystem, createHugeFileSystem, Consts } from '../../../helpers/fileManagerHelpers.js'; import { CLICK_EVENT } from '../../../helpers/grid/keyboardNavigationHelper.js'; import { implementationsMap } from 'core/utils/size'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/selection.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/selection.tests.js index 150ea384eaf5..76d3bb33ae63 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/selection.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/selection.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; const { test } = QUnit; import 'ui/file_manager'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { FileManagerWrapper, createTestFileSystem, isDesktopDevice } from '../../../helpers/fileManagerHelpers.js'; import { triggerCellClick } from '../../../helpers/fileManager/events.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/thumbnailsView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/thumbnailsView.tests.js index 6682e6aa1ae7..99db0116d6cf 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/thumbnailsView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/thumbnailsView.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import 'ui/file_manager'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { FileManagerWrapper, createTestFileSystem, isDesktopDevice } from '../../../helpers/fileManagerHelpers.js'; const { test } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/toolbar.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/toolbar.tests.js index 6342300c06e2..0179d6333cdc 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/toolbar.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/fileManagerParts/toolbar.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import 'ui/file_manager'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { Consts, FileManagerWrapper, createTestFileSystem } from '../../../helpers/fileManagerHelpers.js'; import { implementationsMap } from 'core/utils/size'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/filterBuilderParts/utilsTests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/filterBuilderParts/utilsTests.js index d8cec614de70..94ace09cb88d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/filterBuilderParts/utilsTests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/filterBuilderParts/utilsTests.js @@ -1,7 +1,7 @@ import * as utils from '__internal/filter_builder/m_utils'; import * as between from '__internal/filter_builder/m_between'; -import CustomStore from 'data/custom_store'; -import messageLocalization from 'localization/message'; +import { CustomStore } from 'common/data/custom_store'; +import messageLocalization from 'common/core/localization/message'; import fields from '../../../helpers/filterBuilderTestData.js'; import filterUtils from 'ui/shared/filtering'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/gallery.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/gallery.tests.js index d3eeceb49356..df62a05aecd2 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/gallery.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/gallery.tests.js @@ -1,10 +1,10 @@ import { getHeight, getOuterHeight, getOuterWidth, getWidth } from 'core/utils/size'; import $ from 'jquery'; -import { DataSource } from 'data/data_source/data_source'; -import visibilityChange from 'events/visibility_change'; -import ArrayStore from 'data/array_store'; -import fx from 'animation/fx'; -import animationFrame from 'animation/frame'; +import { DataSource } from 'common/data/data_source/data_source'; +import visibilityChange from 'common/core/events/visibility_change'; +import ArrayStore from 'common/data/array_store'; +import fx from 'common/core/animation/fx'; +import animationFrame from 'common/core/animation/frame'; import resizeCallbacks from 'core/utils/resize_callbacks'; import { isRenderer } from 'core/utils/type'; import config from 'core/config'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/clientSideEvents.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/clientSideEvents.tests.js index 17779645422a..1bde62f8e235 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/clientSideEvents.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/clientSideEvents.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import messageLocalization from 'localization/message'; +import messageLocalization from 'common/core/localization/message'; import 'ui/gantt'; import { Consts, options, data, getGanttViewCore, showTaskEditDialog, getDependencyElements } from '../../../helpers/ganttHelpers.js'; const { test } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/dialogs.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/dialogs.tests.js index 51eb9231e147..2b8e36b7424c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/dialogs.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/dialogs.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import messageLocalization from 'localization/message'; +import messageLocalization from 'common/core/localization/message'; import 'ui/gantt'; import { Consts, data, options, showTaskEditDialog, getGanttViewCore } from '../../../helpers/ganttHelpers.js'; const { test } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/editDataSources.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/editDataSources.tests.js index 3522835b2a85..8f90e5d3fb00 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/editDataSources.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/editDataSources.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; -import ArrayStore from 'data/array_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; +import ArrayStore from 'common/data/array_store'; import 'ui/gantt'; import { Consts, getGanttViewCore } from '../../../helpers/ganttHelpers.js'; const { test } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/refresh.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/refresh.tests.js index d1e45eea134d..4918e83f446b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/refresh.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/ganttParts/refresh.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import 'ui/gantt'; import { Consts, options, data, showTaskEditDialog } from '../../../helpers/ganttHelpers.js'; -import CustomStore from 'data/custom_store'; +import { CustomStore } from 'common/data/custom_store'; const { test } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/init_dispose_widget_bundled_tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/init_dispose_widget_bundled_tests.js index 286feb077c36..a214f7b0928b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/init_dispose_widget_bundled_tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/init_dispose_widget_bundled_tests.js @@ -1,5 +1,5 @@ import GoogleStaticProvider from '__internal/ui/map/m_provider.google_static'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { each } from 'core/utils/iterator'; import 'bundles/modules/parts/widgets-web'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/commonTests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/commonTests.js index 807aaa6620bd..73d02c4d7201 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/commonTests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/commonTests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import { isRenderer } from 'core/utils/type'; import { noop } from 'core/utils/common'; import config from 'core/config'; @@ -7,20 +7,20 @@ import devices from '__internal/core/m_devices'; import resizeCallbacks from 'core/utils/resize_callbacks'; import errors from 'ui/widget/ui.errors'; import executeAsyncMock from '../../../helpers/executeAsyncMock.js'; -import fx from 'animation/fx'; -import holdEvent from 'events/hold'; +import fx from 'common/core/animation/fx'; +import holdEvent from 'common/core/events/hold'; import keyboardMock from '../../../helpers/keyboardMock.js'; import pointerMock from '../../../helpers/pointerMock.js'; import registerComponent from 'core/component_registrator'; -import swipeEvents from 'events/swipe'; +import swipeEvents from 'common/core/events/swipe'; import themes from 'ui/themes'; -import ArrayStore from 'data/array_store'; -import CustomStore from 'data/custom_store'; +import ArrayStore from 'common/data/array_store'; +import { CustomStore } from 'common/data/custom_store'; import DOMComponent from 'core/dom_component'; import List from 'ui/list'; import { setScrollView } from '__internal/ui/list/m_list.base'; import ScrollView from 'ui/scroll_view'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import ariaAccessibilityTestHelper from '../../../helpers/ariaAccessibilityTestHelper.js'; import { reorderingPointerMock } from './utils.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/editingTests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/editingTests.js index 550556a2730f..9816363ccd2c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/editingTests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/editingTests.js @@ -2,8 +2,8 @@ import $ from 'jquery'; import typeUtils from 'core/utils/type'; import executeAsyncMock from '../../../helpers/executeAsyncMock.js'; import keyboardMock from '../../../helpers/keyboardMock.js'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; import 'ui/list'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/editingUITests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/editingUITests.js index bbcc804710e8..a12b3f76a8bc 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/editingUITests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/editingUITests.js @@ -1,20 +1,20 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import errors from 'ui/widget/ui.errors'; -import translator from 'animation/translator'; -import holdEvent from 'events/hold'; +import translator from 'common/core/animation/translator'; +import holdEvent from 'common/core/events/hold'; import { noop } from 'core/utils/common'; import { isRenderer } from 'core/utils/type'; import config from 'core/config'; import pointerMock from '../../../helpers/pointerMock.js'; -import contextMenuEvent from 'events/contextmenu'; +import contextMenuEvent from 'common/core/events/contextmenu'; import keyboardMock from '../../../helpers/keyboardMock.js'; import { registry, register } from '__internal/ui/list/m_list.edit.decorator_registry'; import SwitchableEditDecorator from '__internal/ui/list/m_list.edit.decorator.switchable'; import SwitchableButtonEditDecorator from '__internal/ui/list/m_list.edit.decorator.switchable.button'; import themes from 'ui/themes'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; import { reorderingPointerMock, toSelector } from './utils.js'; import 'ui/action_sheet'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/liveUpdateTests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/liveUpdateTests.js index 76a8b639f54f..cf8c3b7a1c66 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/liveUpdateTests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/listParts/liveUpdateTests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; import 'ui/list'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/loadIndicator.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/loadIndicator.tests.js index 12940d53773e..9d3b4cf64939 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/loadIndicator.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/loadIndicator.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import support from '__internal/core/utils/m_support'; -import messageLocalization from 'localization/message'; +import messageLocalization from 'common/core/localization/message'; import 'ui/load_indicator'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/loadPanel.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/loadPanel.tests.js index 2215b6bb36e3..3c642c01eee5 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/loadPanel.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/loadPanel.tests.js @@ -1,9 +1,9 @@ import { getOuterWidth, getOuterHeight } from 'core/utils/size'; import $ from 'jquery'; import keyboardMock from '../../helpers/keyboardMock.js'; -import messageLocalization from 'localization/message'; +import messageLocalization from 'common/core/localization/message'; import uiErrors from 'ui/widget/ui.errors'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import 'generic_light.css!'; import 'ui/load_panel'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/menu.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/menu.markup.tests.js index fadda5c4eee6..2806e2db9734 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/menu.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/menu.markup.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import Menu from '__internal/ui/menu/m_menu'; import '__internal/ui/menu/m_submenu'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/menu.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/menu.tests.js index 7e01fcaa7b66..b79a8a248707 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/menu.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/menu.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import devices from '__internal/core/m_devices'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import renderer from 'core/renderer'; import { isRenderer } from 'core/utils/type'; import config from 'core/config'; @@ -10,10 +10,10 @@ import domAdapter from '__internal/core/m_dom_adapter'; import Menu from '__internal/ui/menu/m_menu'; import keyboardMock from '../../helpers/keyboardMock.js'; import fixtures from '../../helpers/positionFixtures.js'; -import CustomStore from 'data/custom_store'; -import ArrayStore from 'data/array_store'; -import eventsEngine from 'events/core/events_engine'; -import { DataSource } from 'data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; +import ArrayStore from 'common/data/array_store'; +import eventsEngine from 'common/core/events/core/events_engine'; +import { DataSource } from 'common/data/data_source/data_source'; import * as checkStyleHelper from '../../helpers/checkStyleHelper.js'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/multiView.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/multiView.integration.tests.js index 2cbdbd8e9ac5..fd1b2985c3a1 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/multiView.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/multiView.integration.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { animation, _translator } from '__internal/ui/multi_view/m_multi_view.animation'; import 'ui/multi_view'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/multiView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/multiView.tests.js index d797a9dfe085..8a39512a008c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/multiView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/multiView.tests.js @@ -1,11 +1,11 @@ -import fx from 'animation/fx'; -import translator from 'animation/translator'; +import fx from 'common/core/animation/fx'; +import translator from 'common/core/animation/translator'; import 'generic_light.css!'; import config from 'core/config'; import devices from '__internal/core/m_devices'; import { isRenderer } from 'core/utils/type'; -import Swipeable from 'events/gesture/swipeable'; -import { triggerShownEvent } from 'events/visibility_change'; +import Swipeable from 'common/core/events/gesture/swipeable'; +import { triggerShownEvent } from 'common/core/events/visibility_change'; import $ from 'jquery'; import 'ui/multi_view'; import { animation } from '__internal/ui/multi_view/m_multi_view.animation'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/optionChanged_bundled.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/optionChanged_bundled.tests.js index d2912bcf6b75..bc28d7d5f7d1 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/optionChanged_bundled.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/optionChanged_bundled.tests.js @@ -3,9 +3,9 @@ import $ from 'jquery'; import { Component } from 'core/component'; import devices from '__internal/core/m_devices'; import GoogleStaticProvider from '__internal/ui/map/m_provider.google_static'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import '../../helpers/ignoreQuillTimers.js'; import 'bundles/modules/parts/widgets-web'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/overlay.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/overlay.tests.js index 0b8dc41d9569..c3b03339b674 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/overlay.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/overlay.tests.js @@ -1,7 +1,7 @@ import { getWidth, getHeight, getOuterWidth } from 'core/utils/size'; -import fx from 'animation/fx'; -import positionUtils from 'animation/position'; -import { locate } from 'animation/translator'; +import fx from 'common/core/animation/fx'; +import positionUtils from 'common/core/animation/position'; +import { locate } from 'common/core/animation/translator'; import 'generic_light.css!'; import config from 'core/config'; import devices from '__internal/core/m_devices'; @@ -9,10 +9,10 @@ import { Template } from 'core/templates/template'; import resizeCallbacks from 'core/utils/resize_callbacks'; import { isRenderer } from 'core/utils/type'; import { value as viewPort } from 'core/utils/view_port'; -import eventsEngine from 'events/core/events_engine'; -import visibilityChange, { triggerHidingEvent, triggerShownEvent } from 'events/visibility_change'; +import eventsEngine from 'common/core/events/core/events_engine'; +import visibilityChange, { triggerHidingEvent, triggerShownEvent } from 'common/core/events/visibility_change'; import $ from 'jquery'; -import { hideCallback as hideTopOverlayCallback } from 'mobile/hide_callback'; +import { hideCallback as hideTopOverlayCallback } from 'common/core/environment/hide_callback'; import errors from 'core/errors'; import uiErrors from 'ui/widget/ui.errors'; import Overlay from 'ui/overlay/ui.overlay'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/popover.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/popover.tests.js index a09aeda81aae..6407421084f5 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/popover.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/popover.tests.js @@ -1,9 +1,9 @@ import { getHeight, getWidth, getOuterHeight, getOuterWidth } from 'core/utils/size'; import $ from 'jquery'; import fixtures from '../../helpers/positionFixtures.js'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import pointerMock from '../../helpers/pointerMock.js'; -import positionUtils from 'animation/position'; +import positionUtils from 'common/core/animation/position'; import uiErrors from 'ui/widget/ui.errors'; import Popover from 'ui/popover'; import { getBoundingRect } from 'core/utils/position'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/popup.materialTheme.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/popup.materialTheme.tests.js index 4cde1ded0993..c25926819f97 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/popup.materialTheme.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/popup.materialTheme.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { value as viewPort } from 'core/utils/view_port'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/popup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/popup.tests.js index 54d1e9f36c06..79c984441973 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/popup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/popup.tests.js @@ -10,7 +10,7 @@ import { import $ from 'jquery'; import devices from '__internal/core/m_devices'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { value as viewPort } from 'core/utils/view_port'; import pointerMock from '../../helpers/pointerMock.js'; import keyboardMock from '../../helpers/keyboardMock.js'; @@ -23,7 +23,7 @@ import windowUtils from '__internal/core/utils/m_window'; import uiErrors from 'ui/widget/ui.errors'; import themes from 'ui/themes'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; -import visibilityChangeUtils from 'events/visibility_change'; +import visibilityChangeUtils from 'common/core/events/visibility_change'; import domAdapter from '__internal/core/m_dom_adapter'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/progressBar.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/progressBar.tests.js index e1b4cf69eaf3..fc3371b1f3ee 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/progressBar.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/progressBar.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import 'ui/progress_bar'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/resizable.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/resizable.tests.js index 3f04ec9b0a29..63f0eef12e6c 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/resizable.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/resizable.tests.js @@ -1,5 +1,5 @@ -import translator from 'animation/translator'; -import visibilityChange from 'events/visibility_change'; +import translator from 'common/core/animation/translator'; +import visibilityChange from 'common/core/events/visibility_change'; import $ from 'jquery'; import 'ui/resizable'; import pointerMock from '../../helpers/pointerMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/resizeHandle.markup.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/resizeHandle.markup.tests.js index 17c7780ab58e..e60f48fd7536 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/resizeHandle.markup.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/resizeHandle.markup.tests.js @@ -2,9 +2,9 @@ import $ from 'jquery'; import 'ui/splitter'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import ResizeHandle from '__internal/ui/splitter/resize_handle'; -import messageLocalization from 'localization/message'; +import messageLocalization from 'common/core/localization/message'; QUnit.testStart(function() { const markup = diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/resizeHandle.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/resizeHandle.tests.js index 58e32799d4e4..338b560c25af 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/resizeHandle.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/resizeHandle.tests.js @@ -1,10 +1,10 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { isRenderer } from 'core/utils/type'; import config from 'core/config'; import pointerMock from '../../helpers/pointerMock.js'; import ResizeHandle from '__internal/ui/splitter/resize_handle'; -import { name as DOUBLE_CLICK_EVENT } from 'events/double_click'; +import { name as DOUBLE_CLICK_EVENT } from 'common/core/events/double_click'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/responsiveBox.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/responsiveBox.tests.js index a2e7bc820e2c..a9146aabf51e 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/responsiveBox.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/responsiveBox.tests.js @@ -6,7 +6,7 @@ import ResponsiveBox from 'ui/responsive_box'; import responsiveBoxScreenMock from '../../helpers/responsiveBoxScreenMock.js'; import dxButton from 'ui/button'; import 'ui/box'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import domAdapter from '__internal/core/m_dom_adapter'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollView.tests.js index 0b4585ed517e..4a427cab5341 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollView.tests.js @@ -2,10 +2,10 @@ import $ from 'jquery'; import renderer from 'core/renderer'; import { noop } from 'core/utils/common'; import { getTranslateValues } from '__internal/ui/scroll_view/utils/get_translate_values'; -import animationFrame from 'animation/frame'; +import animationFrame from 'common/core/animation/frame'; import devices from '__internal/core/m_devices'; -import eventsEngine from 'events/core/events_engine'; -import messageLocalization from 'localization/message'; +import eventsEngine from 'common/core/events/core/events_engine'; +import messageLocalization from 'common/core/localization/message'; import themes from 'ui/themes'; import pointerMock from '../../helpers/pointerMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.actions.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.actions.tests.js index 0c2c47ce45cb..7abe7db46727 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.actions.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.actions.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import { noop } from 'core/utils/common'; import { getTranslateValues } from '__internal/ui/scroll_view/utils/get_translate_values'; -import animationFrame from 'animation/frame'; +import animationFrame from 'common/core/animation/frame'; import pointerMock from '../../../helpers/pointerMock.js'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.dynamic.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.dynamic.tests.js index 718c333c79a3..69713f341355 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.dynamic.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.dynamic.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import { getTranslateValues } from '__internal/ui/scroll_view/utils/get_translate_values'; -import animationFrame from 'animation/frame'; +import animationFrame from 'common/core/animation/frame'; import resizeCallbacks from 'core/utils/resize_callbacks'; import pointerMock from '../../../helpers/pointerMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.main.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.main.tests.js index 8ed7d7646478..d509a85b9306 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.main.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.main.tests.js @@ -1,13 +1,13 @@ -import animationFrame from 'animation/frame'; +import animationFrame from 'common/core/animation/frame'; import { getTranslateValues } from '__internal/ui/scroll_view/utils/get_translate_values'; import 'generic_light.css!'; import devices from '__internal/core/m_devices'; import domUtils from '__internal/core/utils/m_dom'; import styleUtils from 'core/utils/style'; import support from '__internal/core/utils/m_support'; -import { triggerHidingEvent, triggerShownEvent } from 'events/visibility_change'; +import { triggerHidingEvent, triggerShownEvent } from 'common/core/events/visibility_change'; import $ from 'jquery'; -import initMobileViewport from 'mobile/init_mobile_viewport'; +import initMobileViewport from 'common/core/environment/init_mobile_viewport'; import Scrollable from 'ui/scroll_view/ui.scrollable'; import pointerMock from '../../../helpers/pointerMock.js'; import { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.mouseWheel.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.mouseWheel.tests.js index 3390caf34a1d..b5d55b29f49e 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.mouseWheel.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.mouseWheel.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import animationFrame from 'animation/frame'; +import animationFrame from 'common/core/animation/frame'; import devices from '__internal/core/m_devices'; import pointerMock from '../../../helpers/pointerMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.rtl.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.rtl.tests.js index aa60848560dd..3ff9108055fd 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.rtl.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.rtl.tests.js @@ -1,6 +1,6 @@ -import animationFrame from 'animation/frame'; +import animationFrame from 'common/core/animation/frame'; import 'generic_light.css!'; -import { triggerShownEvent } from 'events/visibility_change'; +import { triggerShownEvent } from 'common/core/events/visibility_change'; import $ from 'jquery'; import Scrollable from 'ui/scroll_view/ui.scrollable'; import { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.scrollbar.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.scrollbar.tests.js index 8bbffbf11d93..5c9225a0ba6d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.scrollbar.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.scrollbar.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import animationFrame from 'animation/frame'; +import animationFrame from 'common/core/animation/frame'; import devices from '__internal/core/m_devices'; import Scrollbar from '__internal/ui/scroll_view/m_scrollbar'; import pointerMock from '../../../helpers/pointerMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.scrollingByThumb.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.scrollingByThumb.tests.js index c77d8c5f7791..88a6a904f272 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.scrollingByThumb.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.scrollingByThumb.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import { getTranslateValues } from '__internal/ui/scroll_view/utils/get_translate_values'; -import animationFrame from 'animation/frame'; +import animationFrame from 'common/core/animation/frame'; import Scrollbar from '__internal/ui/scroll_view/m_scrollbar'; import pointerMock from '../../../helpers/pointerMock.js'; import Scrollable from 'ui/scroll_view/ui.scrollable'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.useNative.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.useNative.tests.js index b9bd6580b16a..1cc00c4e5afc 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.useNative.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/scrollableParts/scrollable.useNative.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import { getTranslateValues } from '__internal/ui/scroll_view/utils/get_translate_values'; -import animationFrame from 'animation/frame'; +import animationFrame from 'common/core/animation/frame'; import pointerMock from '../../../helpers/pointerMock.js'; import Scrollable from 'ui/scroll_view/ui.scrollable'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/selection.test.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/selection.test.js index 5443a3199ab7..0c447c1acc6a 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/selection.test.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/selection.test.js @@ -2,9 +2,9 @@ import $ from 'jquery'; import errors from 'ui/widget/ui.errors'; import Selection from '__internal/ui/selection/m_selection'; import Guid from 'core/guid'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; -import ArrayStore from 'data/array_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; +import ArrayStore from 'common/data/array_store'; const createDataSource = function(data, storeOptions, dataSourceOptions) { const arrayStore = new ArrayStore(storeOptions ? $.extend(true, { data: data }, storeOptions) : data); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/sortable.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/sortable.tests.js index d8f19c79683f..afcf528bde09 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/sortable.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/sortable.tests.js @@ -2,10 +2,10 @@ import $ from 'jquery'; import pointerMock from '../../helpers/pointerMock.js'; import 'ui/sortable'; import 'ui/scroll_view'; -import fx from 'animation/fx'; -import animationFrame from 'animation/frame'; +import fx from 'common/core/animation/fx'; +import animationFrame from 'common/core/animation/frame'; import browser from 'core/utils/browser'; -import translator from 'animation/translator'; +import translator from 'common/core/animation/translator'; import viewPort from 'core/utils/view_port'; import devices from '__internal/core/m_devices'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/speedDialAction.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/speedDialAction.tests.js index 2af32bbbf09e..798ce2d71f80 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/speedDialAction.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/speedDialAction.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import config from 'core/config'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import SpeedDialItem from '__internal/ui/speed_dial_action/m_speed_dial_item'; import { logger } from 'core/utils/console'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/splitter.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/splitter.tests.js index 69a8e7893c33..2afc216148fe 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/splitter.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/splitter.tests.js @@ -1,13 +1,13 @@ import $ from 'jquery'; import Splitter from 'ui/splitter'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import pointerMock from '../../helpers/pointerMock.js'; import keyboardMock from '../../helpers/keyboardMock.js'; import { isRenderer, isNumeric } from 'core/utils/type'; import config from 'core/config'; -import { createEvent } from 'events/utils/index'; -import { name as DOUBLE_CLICK_EVENT } from 'events/double_click'; -import { name as CLICK_EVENT } from 'events/click'; +import { createEvent } from 'common/core/events/utils/index'; +import { name as DOUBLE_CLICK_EVENT } from 'common/core/events/double_click'; +import { name as CLICK_EVENT } from 'common/core/events/click'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/swipeable.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/swipeable.tests.js index 7b7871d7e46a..642f8fb0440f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/swipeable.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/swipeable.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import { noop } from 'core/utils/common'; -import Swipeable from 'events/gesture/swipeable'; -import swipeEvents from 'events/swipe'; +import Swipeable from 'common/core/events/gesture/swipeable'; +import swipeEvents from 'common/core/events/swipe'; import pointerMock from '../../helpers/pointerMock.js'; QUnit.module('swipeable', { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabPanel.repaintChangesOnly.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabPanel.repaintChangesOnly.tests.js index 8d57efe630de..e257e1a14fe0 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabPanel.repaintChangesOnly.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabPanel.repaintChangesOnly.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import 'ui/tab_panel'; QUnit.module('repaintChangesOnly', { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabPanel.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabPanel.tests.js index eddb25133241..c3565886e8a2 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabPanel.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabPanel.tests.js @@ -1,4 +1,4 @@ -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import config from 'core/config'; import devices from '__internal/core/m_devices'; import { deferUpdate } from 'core/utils/common'; @@ -10,7 +10,7 @@ import TabPanel from 'ui/tab_panel'; import keyboardMock from '../../helpers/keyboardMock.js'; import pointerMock from '../../helpers/pointerMock.js'; import registerKeyHandlerTestHelper from '../../helpers/registerKeyHandlerTestHelper.js'; -import translator from 'animation/translator'; +import translator from 'common/core/animation/translator'; QUnit.testStart(() => { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabPanel.width.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabPanel.width.tests.js index 1cc8ffb73487..46810c56ff84 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabPanel.width.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabPanel.width.tests.js @@ -1,7 +1,7 @@ import { getOuterWidth } from 'core/utils/size'; import 'generic_light.css!'; -import { triggerResizeEvent, triggerShownEvent } from 'events/visibility_change'; +import { triggerResizeEvent, triggerShownEvent } from 'common/core/events/visibility_change'; import $ from 'jquery'; import 'ui/tab_panel'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.tests.js index acade277387a..018160e8f483 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.tests.js @@ -1,9 +1,9 @@ import 'generic_light.css!'; import themes from 'ui/themes'; import { extend } from 'core/utils/extend'; -import { DataSource } from 'data/data_source/data_source'; -import holdEvent from 'events/hold'; -import { triggerShownEvent } from 'events/visibility_change'; +import { DataSource } from 'common/data/data_source/data_source'; +import holdEvent from 'common/core/events/hold'; +import { triggerShownEvent } from 'common/core/events/visibility_change'; import $ from 'jquery'; import 'ui/responsive_box'; import 'ui/tabs'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.width.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.width.tests.js index 3ca58b50c6c2..ba3d813e308f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.width.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.width.tests.js @@ -1,5 +1,5 @@ import 'generic_light.css!'; -import { triggerResizeEvent, triggerShownEvent } from 'events/visibility_change'; +import { triggerResizeEvent, triggerShownEvent } from 'common/core/events/visibility_change'; import $ from 'jquery'; import 'ui/tabs'; import { addShadowDomStyles } from 'core/utils/shadow_dom'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tileView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tileView.tests.js index fd557ec0ca3e..5f66c2ca2ec1 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tileView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tileView.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import globalConfig from 'core/config'; import keyboardMock from '../../helpers/keyboardMock.js'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import { isRenderer } from 'core/utils/type'; import { deferUpdate } from 'core/utils/common'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/toast.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/toast.tests.js index fa96b9decf0d..b961b10e3180 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/toast.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/toast.tests.js @@ -1,7 +1,7 @@ import { getWidth, getHeight, getOuterHeight, getOuterWidth } from 'core/utils/size'; import $ from 'jquery'; import pointerMock from '../../helpers/pointerMock.js'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { value as setViewPort } from 'core/utils/view_port'; import Toast from 'ui/toast'; import devices from 'core/devices.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.disabled.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.disabled.tests.js index ce46b6c3f17f..8dd187aca0fa 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.disabled.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.disabled.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import 'ui/toolbar'; import 'ui/toolbar/ui.toolbar.base'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import 'ui/button_group'; import 'ui/text_box'; @@ -17,7 +17,7 @@ import 'ui/menu'; import devices from '__internal/core/m_devices'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; const moduleConfig = { beforeEach: function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.menu.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.menu.tests.js index 013ac6314df4..b013fb7b4ddc 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.menu.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.menu.tests.js @@ -1,7 +1,7 @@ import { getOuterHeight, getOuterWidth } from 'core/utils/size'; import $ from 'jquery'; -import ArrayStore from 'data/array_store'; -import fx from 'animation/fx'; +import ArrayStore from 'common/data/array_store'; +import fx from 'common/core/animation/fx'; import Button from 'ui/button'; import Popup from 'ui/popup'; import DropDownMenu from '__internal/ui/toolbar/internal/m_toolbar.menu'; @@ -10,7 +10,7 @@ import executeAsyncMock from '../../helpers/executeAsyncMock.js'; import pointerMock from '../../helpers/pointerMock.js'; import keyboardMock from '../../helpers/keyboardMock.js'; import config from 'core/config'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import { isRenderer } from 'core/utils/type'; import themes from 'ui/themes'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.tests.js index 72e64c685afb..8236ef1c985f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbar.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import ToolbarBase from '__internal/ui/toolbar/m_toolbar.base'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import resizeCallbacks from 'core/utils/resize_callbacks'; import themes from 'ui/themes'; import { deferUpdate } from 'core/utils/common'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbarParts/toolbar.themes.sharedTests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbarParts/toolbar.themes.sharedTests.js index 922c39d11a26..80db9043bc4b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbarParts/toolbar.themes.sharedTests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/toolbarParts/toolbar.themes.sharedTests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import Toolbar from 'ui/toolbar'; const BUTTON_CLASS = 'dx-button'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tooltip.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tooltip.tests.js index aa76389e1416..296a064268d6 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tooltip.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tooltip.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import Tooltip from 'ui/tooltip'; import renderer from 'core/renderer'; import uiErrors from 'ui/widget/ui.errors'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeView.checkboxes.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeView.checkboxes.tests.js index f556caac8c24..a53038734cdb 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeView.checkboxes.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeView.checkboxes.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import TreeViewTestWrapper from '../../helpers/TreeViewTestHelper.js'; import { Deferred } from 'core/utils/deferred'; -import CustomStore from 'data/custom_store'; +import { CustomStore } from 'common/data/custom_store'; import { DATA, data2 } from './treeViewParts/testData.js'; import localization from 'localization'; import 'ui/tree_view'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeView.expanded.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeView.expanded.tests.js index c749df0433ad..2440a4d59d81 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeView.expanded.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeView.expanded.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import TreeViewTestWrapper from '../../helpers/TreeViewTestHelper.js'; import { noop } from 'core/utils/common'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { DATA } from './treeViewParts/testData.js'; import { makeSlowDataSource } from './treeViewParts/testUtils.js'; import 'ui/tree_view'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeView.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeView.tests.js index a5a470ad0342..967d64ee1c0f 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeView.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeView.tests.js @@ -1,8 +1,8 @@ /* global stripFunctions */ import $ from 'jquery'; -import CustomStore from 'data/custom_store'; -import ArrayStore from 'data/array_store'; +import { CustomStore } from 'common/data/custom_store'; +import ArrayStore from 'common/data/array_store'; import 'ui/tree_view'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/accessibility.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/accessibility.js index 996adf6395b4..0eba897beccc 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/accessibility.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/accessibility.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import TreeView from 'ui/tree_view'; import ariaAccessibilityTestHelper from '../../../helpers/ariaAccessibilityTestHelper.js'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; const { module, test } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/animation.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/animation.js index 2386ab4bfc19..25714187aae5 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/animation.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/animation.js @@ -1,7 +1,7 @@ /* global internals */ import $ from 'jquery'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import keyboardMock from '../../../helpers/keyboardMock.js'; QUnit.module('Animation', { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/events.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/events.js index e764d016cdd1..e333a7a541bc 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/events.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/events.js @@ -3,11 +3,11 @@ import $ from 'jquery'; import commonUtils from 'core/utils/common'; import typeUtils from 'core/utils/type'; -import holdEvent from 'events/hold'; +import holdEvent from 'common/core/events/hold'; import devices from '__internal/core/m_devices'; -import fx from 'animation/fx'; -import contextMenuEvent from 'events/contextmenu'; -import dblclickEvent from 'events/dblclick'; +import fx from 'common/core/animation/fx'; +import contextMenuEvent from 'common/core/events/contextmenu'; +import dblclickEvent from 'common/core/events/dblclick'; import TreeViewTestWrapper from '../../../helpers/TreeViewTestHelper.js'; const createInstance = (options) => new TreeViewTestWrapper(options); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/initialization.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/initialization.js index 694ba7278fbc..8b9650374fdc 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/initialization.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/initialization.js @@ -1,6 +1,6 @@ /* global initTree */ -import ArrayStore from 'data/array_store'; -import { DataSource } from 'data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import { DataSource } from 'common/data/data_source/data_source'; import TreeViewTestWrapper from '../../../helpers/TreeViewTestHelper.js'; import $ from 'jquery'; QUnit.module('Initialization', () => { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/keyboardNavigation.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/keyboardNavigation.js index 1e05073c92b4..3e66f5311cd3 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/keyboardNavigation.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/keyboardNavigation.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import { noop } from 'core/utils/common'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import devices from '__internal/core/m_devices'; import keyboardMock from '../../../helpers/keyboardMock.js'; import { isRenderer } from 'core/utils/type'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/rendering.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/rendering.js index d77447be17ab..fcd1cfddcc40 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/rendering.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/rendering.js @@ -3,10 +3,10 @@ import $ from 'jquery'; import commonUtils from 'core/utils/common'; import { isFunction } from 'core/utils/type'; -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; -import CustomStore from 'data/custom_store'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import { CustomStore } from 'common/data/custom_store'; import TreeViewTestWrapper from '../../../helpers/TreeViewTestHelper.js'; const NODE_LOAD_INDICATOR_CLASS = 'dx-treeview-node-loadindicator'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/selection.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/selection.js index d90f4910e9c4..0771e3bccd94 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/selection.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/selection.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import keyboardMock from '../../../helpers/keyboardMock.js'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import TreeViewTestWrapper from '../../../helpers/TreeViewTestHelper.js'; const { module, test } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/testUtils.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/testUtils.js index 2991f798d60a..91413a0149ae 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/testUtils.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/testUtils.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import CustomStore from 'data/custom_store'; -import ArrayStore from 'data/array_store'; +import { CustomStore } from 'common/data/custom_store'; +import ArrayStore from 'common/data/array_store'; export const makeSlowDataSource = (data) => { return { diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/virtualMode.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/virtualMode.js index 96409d06fe08..1a217b818bf9 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/virtualMode.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/treeViewParts/virtualMode.js @@ -2,13 +2,13 @@ import $ from 'jquery'; import { noop } from 'core/utils/common'; -import fx from 'animation/fx'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; -import CustomStore from 'data/custom_store'; -import dblclickEvent from 'events/dblclick'; +import fx from 'common/core/animation/fx'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import { CustomStore } from 'common/data/custom_store'; +import dblclickEvent from 'common/core/events/dblclick'; import TreeView from 'ui/tree_view'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import TreeViewTestWrapper from '../../../helpers/TreeViewTestHelper.js'; import LoadIndicator from 'ui/load_indicator'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui/collectionWidget.tests.js b/packages/devextreme/testing/tests/DevExpress.ui/collectionWidget.tests.js index 14a0f679139f..f17dfaf1b2d6 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui/collectionWidget.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui/collectionWidget.tests.js @@ -3,12 +3,12 @@ import { noop } from 'core/utils/common'; import { isRenderer } from 'core/utils/type'; import config from 'core/config'; import registerComponent from 'core/component_registrator'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import Store from 'data/abstract_store'; -import ArrayStore from 'data/array_store'; +import ArrayStore from 'common/data/array_store'; import { setTemplateEngine } from 'core/templates/template_engine_registry'; import support from '__internal/core/utils/m_support'; -import holdEvent from 'events/hold'; +import holdEvent from 'common/core/events/hold'; import CollectionWidget from 'ui/collection/ui.collection_widget.edit'; import List from 'ui/list'; import executeAsyncMock from '../../helpers/executeAsyncMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui/collectionWidgetParts/editingTests.js b/packages/devextreme/testing/tests/DevExpress.ui/collectionWidgetParts/editingTests.js index 6fcf86c77c57..91b8870e57ea 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui/collectionWidgetParts/editingTests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui/collectionWidgetParts/editingTests.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import CollectionWidget from 'ui/collection/ui.collection_widget.edit'; -import { DataSource } from 'data/data_source/data_source'; -import ArrayStore from 'data/array_store'; -import CustomStore from 'data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import ArrayStore from 'common/data/array_store'; +import { CustomStore } from 'common/data/custom_store'; import executeAsyncMock from '../../../helpers/executeAsyncMock.js'; import keyboardMock from '../../../helpers/keyboardMock.js'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui/collectionWidgetParts/liveUpdateTests.js b/packages/devextreme/testing/tests/DevExpress.ui/collectionWidgetParts/liveUpdateTests.js index 6d01ba87c210..b18ee15d8ef0 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui/collectionWidgetParts/liveUpdateTests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui/collectionWidgetParts/liveUpdateTests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import CollectionWidget from 'ui/collection/ui.collection_widget.live_update'; -import { DataSource } from 'data/data_source/data_source'; -import CustomStore from 'data/custom_store'; +import { DataSource } from 'common/data/data_source/data_source'; +import { CustomStore } from 'common/data/custom_store'; const { module, test } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui/dialog.tests.js b/packages/devextreme/testing/tests/DevExpress.ui/dialog.tests.js index d53fbd6f6f20..156fe7316ef8 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui/dialog.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui/dialog.tests.js @@ -4,7 +4,7 @@ import devices from '__internal/core/m_devices'; import { alert, confirm, custom } from 'ui/dialog'; import domUtils from '__internal/core/utils/m_dom'; import errors from 'ui/widget/ui.errors'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import keyboardMock from '../../helpers/keyboardMock.js'; import { value as viewPort } from 'core/utils/view_port'; import domAdapter from '__internal/core/m_dom_adapter'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui/floatingActionButtonRepaint.tests.js b/packages/devextreme/testing/tests/DevExpress.ui/floatingActionButtonRepaint.tests.js index e89538151d6f..7682004820ac 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui/floatingActionButtonRepaint.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui/floatingActionButtonRepaint.tests.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import config from 'core/config'; import repaintFloatingActionButton from 'ui/speed_dial_action/repaint_floating_action_button'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import 'ui/speed_dial_action'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui/hideToasts.tests.js b/packages/devextreme/testing/tests/DevExpress.ui/hideToasts.tests.js index 42764de09e88..86cb76ca9d2b 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui/hideToasts.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui/hideToasts.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import notify from 'ui/notify'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import hideToasts from 'ui/toast/hide_toasts'; QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.ui/hierarchicalCollectionWidgetParts/hierarchicalCollectionWidget.js b/packages/devextreme/testing/tests/DevExpress.ui/hierarchicalCollectionWidgetParts/hierarchicalCollectionWidget.js index afa01c4ea2c1..038b2f801ecf 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui/hierarchicalCollectionWidgetParts/hierarchicalCollectionWidget.js +++ b/packages/devextreme/testing/tests/DevExpress.ui/hierarchicalCollectionWidgetParts/hierarchicalCollectionWidget.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import HierarchicalCollectionWidget from 'ui/hierarchical_collection/ui.hierarchical_collection_widget'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; const DISABLED_STATE_CLASS = 'dx-state-disabled'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui/hierarchicalCollectionWidgetParts/hierarchicalDataAdapter.js b/packages/devextreme/testing/tests/DevExpress.ui/hierarchicalCollectionWidgetParts/hierarchicalDataAdapter.js index 27347eabf7a1..4ffaddf4654a 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui/hierarchicalCollectionWidgetParts/hierarchicalDataAdapter.js +++ b/packages/devextreme/testing/tests/DevExpress.ui/hierarchicalCollectionWidgetParts/hierarchicalDataAdapter.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import HierarchicalDataAdapter from '__internal/ui/hierarchical_collection/m_data_adapter'; -import { processRequestResultLock } from 'data/utils'; +import { processRequestResultLock } from 'common/data/utils'; import HierarchicalCollectionTestHelper from './hierarchicalCollectionTestHelper.js'; import errors from 'ui/widget/ui.errors'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui/keyboardProcessor.tests.js b/packages/devextreme/testing/tests/DevExpress.ui/keyboardProcessor.tests.js index 72044865678f..fd104853ace6 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui/keyboardProcessor.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui/keyboardProcessor.tests.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import KeyboardProcessor from 'events/core/keyboard_processor'; +import KeyboardProcessor from 'common/core/events/core/keyboard_processor'; const { test } = QUnit; diff --git a/packages/devextreme/testing/tests/DevExpress.ui/notify.tests.js b/packages/devextreme/testing/tests/DevExpress.ui/notify.tests.js index bc77b7bd7f1d..c960f9adc11a 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui/notify.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui/notify.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import notify from 'ui/notify'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; import { value as viewPort } from 'core/utils/view_port'; import { isPlainObject } from 'core/utils/type'; import 'generic_light.css!'; diff --git a/packages/devextreme/testing/tests/DevExpress.ui/tooltip.tests.js b/packages/devextreme/testing/tests/DevExpress.ui/tooltip.tests.js index 5149503d9ec0..9ab72d865498 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui/tooltip.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui/tooltip.tests.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import Tooltip from 'ui/tooltip'; import { show } from '__internal/ui/tooltip/m_tooltip'; import viewPort from 'core/utils/view_port'; -import fx from 'animation/fx'; +import fx from 'common/core/animation/fx'; function checkTooltip(assert) { const $testContent = $('.dx-popup-content').find('.test-content'); diff --git a/packages/devextreme/testing/tests/DevExpress.ui/widget.tests.js b/packages/devextreme/testing/tests/DevExpress.ui/widget.tests.js index 616099e6a8aa..4c23b34429a3 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui/widget.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui/widget.tests.js @@ -6,7 +6,7 @@ import { extend } from 'core/utils/extend'; import { TemplateBase } from 'core/templates/template_base'; import { Template } from 'core/templates/template'; import DataHelperMixin from 'data_helper'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import keyboardMock from '../../helpers/keyboardMock.js'; import pointerMock from '../../helpers/pointerMock.js'; import config from 'core/config'; diff --git a/packages/devextreme/testing/tests/DevExpress.utils/utils.inkRipple.tests.js b/packages/devextreme/testing/tests/DevExpress.utils/utils.inkRipple.tests.js index 44ec872ea0ab..ce7e9d86dcc5 100644 --- a/packages/devextreme/testing/tests/DevExpress.utils/utils.inkRipple.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.utils/utils.inkRipple.tests.js @@ -1,6 +1,6 @@ const $ = require('jquery'); const inkRipple = require('ui/widget/utils.ink_ripple'); -const fx = require('animation/fx'); +const fx = require('common/core/animation/fx'); const INKRIPPLE_CLASS = 'dx-inkripple'; const INKRIPPLE_WAVE_CLASS = 'dx-inkripple-wave'; diff --git a/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.part1.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.part1.tests.js index 53a73ac4c48d..3d647e934993 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.part1.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.part1.tests.js @@ -2,7 +2,7 @@ const $ = require('jquery'); const noop = require('core/utils/common').noop; const vizMocks = require('../../helpers/vizMocks.js'); const commons = require('./chartParts/commons.js'); -const DataSource = require('data/data_source/data_source').DataSource; +const DataSource = require('common/data/data_source/data_source').DataSource; const { BaseChart } = require('__internal/viz/chart_components/m_base_chart'); const rendererModule = require('viz/core/renderers/renderer'); const layoutManagerModule = require('viz/chart_components/layout_manager'); @@ -516,7 +516,7 @@ QUnit.test('not hide on resize, when resize', function(assert) { }); QUnit.test('Schedule loading indicator hiding on data source changed event', function(assert) { - const DataSource = require('data/data_source/data_source').DataSource; + const DataSource = require('common/data/data_source/data_source').DataSource; const dataSource = new DataSource({ load: function() { return []; diff --git a/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.tests.js index 7229bfee3640..2514bd7b64fa 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.charts/chart.tests.js @@ -15,7 +15,7 @@ const Legend = vizMocks.Legend; const ChartTitle = vizMocks.Title; const Axis = vizMocks.stubClass(axisModule.Axis); const Range = vizMocks.stubClass(rangeModule.Range); -const DataSource = require('data/data_source/data_source').DataSource; +const DataSource = require('common/data/data_source/data_source').DataSource; const DataSourceMock = vizMocks.stubClass(DataSource); require('viz/chart'); diff --git a/packages/devextreme/testing/tests/DevExpress.viz.charts/chartInteraction.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.charts/chartInteraction.tests.js index af04c50dc2ad..18a6afc7c339 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.charts/chartInteraction.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.charts/chartInteraction.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import devices from '__internal/core/m_devices'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; import errors from 'core/errors'; import 'viz/chart'; diff --git a/packages/devextreme/testing/tests/DevExpress.viz.charts/chartSync.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.charts/chartSync.tests.js index 5fbca7ff30ca..cb0506e6c71d 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.charts/chartSync.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.charts/chartSync.tests.js @@ -18,7 +18,7 @@ const layoutManagerModule = require('viz/chart_components/layout_manager'); const LayoutManager = vizMocks.stubClass(layoutManagerModule.LayoutManager); let validateData; // It lives outside of a test context because of "resetMocksInChart" which lives outside of a test context const dataValidatorModule = require('viz/components/data_validator'); -const CustomStore = require('data/custom_store'); +const CustomStore = require('common/data/custom_store').CustomStore; const chartThemeManagerModule = require('viz/components/chart_theme_manager'); const scrollBarModule = require('viz/chart_components/scroll_bar'); const ScrollBar = scrollBarModule.ScrollBar; diff --git a/packages/devextreme/testing/tests/DevExpress.viz.charts/pieChart.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.charts/pieChart.tests.js index a070e3347a7d..a8b8754837f9 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.charts/pieChart.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.charts/pieChart.tests.js @@ -8,7 +8,7 @@ import { BaseChart } from '__internal/viz/chart_components/m_base_chart'; import labelModule from 'viz/series/points/label'; import dataValidatorModule from 'viz/components/data_validator'; import translator1DModule from 'viz/translators/translator1d'; -import CustomStore from 'data/custom_store'; +import { CustomStore } from 'common/data/custom_store'; import chartThemeManagerModule from 'viz/components/chart_theme_manager'; import layoutManagerModule from 'viz/chart_components/layout_manager'; import trackerModule from 'viz/chart_components/tracker'; @@ -19,7 +19,7 @@ import { } from '../../helpers/chartMocks.js'; import TemplateManagerModule from '__internal/core/m_template_manager'; import graphicObjects from '__internal/common/m_charts'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import devices from '__internal/core/m_devices'; const LabelCtor = new vizMocks.ObjectPool(labelModule.Label); diff --git a/packages/devextreme/testing/tests/DevExpress.viz.charts/scrollBar.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.charts/scrollBar.tests.js index 1e766568996b..bfbb7dbfbffc 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.charts/scrollBar.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.charts/scrollBar.tests.js @@ -3,7 +3,7 @@ import vizMocks from '../../helpers/vizMocks.js'; import { ScrollBar } from 'viz/chart_components/scroll_bar'; import translator2DModule from 'viz/translators/translator2d'; import pointerMock from '../../helpers/pointerMock.js'; -import dragEvents from 'events/drag'; +import dragEvents from 'common/core/events/drag'; const Translator = vizMocks.stubClass(translator2DModule.Translator2D); diff --git a/packages/devextreme/testing/tests/DevExpress.viz.charts/tracker.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.charts/tracker.tests.js index 972fe2ef4d0d..ea50c540fd12 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.charts/tracker.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.charts/tracker.tests.js @@ -6,7 +6,7 @@ import axisModule from 'viz/axes/base_axis'; import { Crosshair } from 'viz/chart_components/crosshair'; import trackers from 'viz/chart_components/tracker'; import { MockAxis } from '../../helpers/chartMocks.js'; -import holdEvent from 'events/hold'; +import holdEvent from 'common/core/events/hold'; import errors from 'core/errors'; function getEvent(type, params) { diff --git a/packages/devextreme/testing/tests/DevExpress.viz.core/annotations.plugins.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.core/annotations.plugins.tests.js index 33b7f15e44f5..3ddf3e76c8da 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.core/annotations.plugins.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.core/annotations.plugins.tests.js @@ -4,7 +4,7 @@ import rendererModule from 'viz/core/renderers/renderer'; import TooltipModule from 'viz/core/tooltip'; import vizMocks from '../../helpers/vizMocks.js'; import pointerMock from '../../helpers/pointerMock.js'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import { getDocument } from 'core/dom_adapter'; import devices from '__internal/core/m_devices'; diff --git a/packages/devextreme/testing/tests/DevExpress.viz.core/loadingIndicator.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.core/loadingIndicator.integration.tests.js index 5b4140afe64b..6b1d9a40c5fa 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.core/loadingIndicator.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.core/loadingIndicator.integration.tests.js @@ -3,7 +3,7 @@ require('viz/tree_map/tree_map'); const $ = require('jquery'); const vizMocks = require('../../helpers/vizMocks.js'); const loadingIndicatorModule = require('viz/core/loading_indicator'); -const DataSource = require('data/data_source/data_source').DataSource; +const DataSource = require('common/data/data_source/data_source').DataSource; $('#qunit-fixture').append('
'); diff --git a/packages/devextreme/testing/tests/DevExpress.viz.funnel/funnel.tracker.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.funnel/funnel.tracker.tests.js index 6a152c63a7b8..b5c2398f9854 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.funnel/funnel.tracker.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.funnel/funnel.tracker.tests.js @@ -3,8 +3,8 @@ const common = require('./commonParts/common.js'); const createFunnel = common.createFunnel; const environment = common.environment; const trackerModule = require('viz/funnel/tracker'); -const clickEventName = require('events/click').name; -const pointerEvents = require('events/pointer'); +const clickEventName = require('common/core/events/click').name; +const pointerEvents = require('common/core/events/pointer'); const labelModule = require('viz/series/points/label'); const vizMocks = require('../../helpers/vizMocks.js'); const Label = labelModule.Label; diff --git a/packages/devextreme/testing/tests/DevExpress.viz.gauges/tracker.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.gauges/tracker.tests.js index 1b3363b38881..b74b11e33c1c 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.gauges/tracker.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.gauges/tracker.tests.js @@ -2,7 +2,7 @@ const $ = require('jquery'); const noop = require('core/utils/common').noop; const vizMocks = require('../../helpers/vizMocks.js'); const Tracker = require('viz/gauges/tracker'); -const pointerEvents = require('events/pointer'); +const pointerEvents = require('common/core/events/pointer'); QUnit.module('Tracker', { beforeEach: function() { diff --git a/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part1.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part1.tests.js index 8f67f9e2a78a..202c2f5411e8 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part1.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part1.tests.js @@ -1,6 +1,6 @@ const $ = require('jquery'); const trackerModule = require('viz/range_selector/tracker'); -const DataSource = require('data/data_source/data_source').DataSource; +const DataSource = require('common/data/data_source/data_source').DataSource; const seriesDataSourceModule = require('viz/range_selector/series_data_source'); const commons = require('./rangeSelectorParts/commons.js'); diff --git a/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part2.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part2.tests.js index 66b53a83f0c5..f30fac4fb796 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part2.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part2.tests.js @@ -1,7 +1,7 @@ const $ = require('jquery'); const commons = require('./rangeSelectorParts/commons.js'); const seriesDataSourceModule = require('viz/range_selector/series_data_source'); -const dataSourceModule = require('data/data_source/data_source'); +const dataSourceModule = require('common/data/data_source/data_source'); const _SeriesDataSource = seriesDataSourceModule.SeriesDataSource; const dateUtils = require('core/utils/date'); const vizMocks = require('../../helpers/vizMocks.js'); diff --git a/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part3.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part3.tests.js index 45ccd3a191d7..066708ca35d9 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part3.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/common.part3.tests.js @@ -4,8 +4,8 @@ import { DEBUG_stub_createIncidentOccurred, DEBUG_restore_createIncidentOccurred import commons from './rangeSelectorParts/commons.js'; import slidersControllerModule from 'viz/range_selector/sliders_controller'; import seriesDataSourceModule from 'viz/range_selector/series_data_source'; -import { DataSource } from 'data/data_source/data_source'; -import dateLocalization from 'localization/date'; +import { DataSource } from 'common/data/data_source/data_source'; +import dateLocalization from 'common/core/localization/date'; import axisModule from 'viz/axes/base_axis'; const _SeriesDataSource = seriesDataSourceModule.SeriesDataSource; diff --git a/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/range_selector.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/range_selector.integration.tests.js index b326cc17975e..bb7be9472727 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/range_selector.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/range_selector.integration.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; import 'viz/range_selector/range_selector'; -import { DataSource } from 'data/data_source/data_source'; +import { DataSource } from 'common/data/data_source/data_source'; QUnit.testStart(function() { const markup = diff --git a/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/tracker.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/tracker.tests.js index b61aed28566b..d3a52e1291f8 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/tracker.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.rangeSelector/tracker.tests.js @@ -1,5 +1,5 @@ const $ = require('jquery'); -const pointerEvents = require('events/pointer'); +const pointerEvents = require('common/core/events/pointer'); const trackerModule = require('viz/range_selector/tracker'); QUnit.testStart(function() { diff --git a/packages/devextreme/testing/tests/DevExpress.viz.renderers/Animation.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.renderers/Animation.tests.js index 1313bbbbde8e..52364a182d3d 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.renderers/Animation.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.renderers/Animation.tests.js @@ -1,7 +1,7 @@ /* global currentAssert */ const $ = require('jquery'); -const animationFrame = require('animation/frame'); +const animationFrame = require('common/core/animation/frame'); const commonUtils = require('core/utils/common'); const typeUtils = require('core/utils/type'); const animationModule = require('viz/core/renderers/animation'); diff --git a/packages/devextreme/testing/tests/DevExpress.viz.renderers/SvgElement.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.renderers/SvgElement.tests.js index e1ee76ce0aa4..5d113cb9924b 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.renderers/SvgElement.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.renderers/SvgElement.tests.js @@ -2,7 +2,7 @@ import jQuery from 'jquery'; import typeUtils from 'core/utils/type'; import rendererModule from 'viz/core/renderers/renderer'; import coreRenderer from 'core/renderer'; -import eventsEngine from 'events/core/events_engine'; +import eventsEngine from 'common/core/events/core/events_engine'; import domAdapter from '__internal/core/m_dom_adapter'; import Color from 'color'; diff --git a/packages/devextreme/testing/tests/DevExpress.viz.sankey/sankey.tracker.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.sankey/sankey.tracker.tests.js index 372dc7123474..cfe4d9e8199b 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.sankey/sankey.tracker.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.sankey/sankey.tracker.tests.js @@ -2,8 +2,8 @@ import $ from 'jquery'; import common, { createSankey, environment } from './commonParts/common.js'; import trackerModule from 'viz/sankey/tracker'; import tooltipModule from 'viz/core/tooltip'; -import { name as clickEventName } from 'events/click'; -import pointerEvents from 'events/pointer'; +import { name as clickEventName } from 'common/core/events/click'; +import pointerEvents from 'common/core/events/pointer'; import { setTooltipCustomOptions } from 'viz/sankey/tooltip'; import domAdapter from '__internal/core/m_dom_adapter'; diff --git a/packages/devextreme/testing/tests/DevExpress.viz.sparklines/baseSparklineTooltipEvents.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.sparklines/baseSparklineTooltipEvents.tests.js index 9c6c48ed38ab..0bbc8be3d200 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.sparklines/baseSparklineTooltipEvents.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.sparklines/baseSparklineTooltipEvents.tests.js @@ -3,7 +3,7 @@ const $ = require('jquery'); const vizMocks = require('../../helpers/vizMocks.js'); const rendererModule = require('viz/core/renderers/renderer'); -const pointerEvents = require('events/pointer'); +const pointerEvents = require('common/core/events/pointer'); require('viz/sparkline'); require('viz/bullet'); diff --git a/packages/devextreme/testing/tests/DevExpress.viz.sparklines/sparkline.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.sparklines/sparkline.tests.js index 691cd7511c7e..16d0f1f00652 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.sparklines/sparkline.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.sparklines/sparkline.tests.js @@ -8,7 +8,7 @@ const rendererModule = require('viz/core/renderers/renderer'); const dataValidatorModule = require('viz/components/data_validator'); const translator2DModule = require('viz/translators/translator2d'); const seriesModule = require('viz/series/base_series'); -const DataSource = require('data/data_source/data_source').DataSource; +const DataSource = require('common/data/data_source/data_source').DataSource; require('viz/sparkline'); diff --git a/packages/devextreme/testing/tests/DevExpress.viz.treeMap/tracker.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.treeMap/tracker.tests.js index 3349058cba6f..3144a0c5ff70 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.treeMap/tracker.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.treeMap/tracker.tests.js @@ -4,8 +4,8 @@ const $ = require('jquery'); const trackerModule = require('viz/tree_map/tracker'); const tooltipModule = require('viz/core/tooltip'); -const clickEventName = require('events/click').name; -const pointerEvents = require('events/pointer'); +const clickEventName = require('common/core/events/click').name; +const pointerEvents = require('common/core/events/pointer'); const dxTreeMap = require('viz/tree_map/tree_map'); diff --git a/packages/devextreme/testing/tests/DevExpress.viz.treeMap/treeMap.base.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.treeMap/treeMap.base.tests.js index 36f5a8ebdfc3..be089a9c83e4 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.treeMap/treeMap.base.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.treeMap/treeMap.base.tests.js @@ -1,7 +1,7 @@ const $ = require('jquery'); const common = require('./commonParts/common.js'); const themeModule = require('viz/themes'); -const DataSource = require('data/data_source/data_source').DataSource; +const DataSource = require('common/data/data_source/data_source').DataSource; function createDataSource(value) { return new DataSource({ diff --git a/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/map.integration.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/map.integration.tests.js index ec5b0954966e..9b9883d31a5c 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/map.integration.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/map.integration.tests.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import CustomStore from 'data/custom_store'; -import DataSource from 'data/data_source'; +import { CustomStore } from 'common/data/custom_store'; +import DataSource from 'common/data/data_source'; import { projection } from 'viz/vector_map/projection'; const simpleProjection = projection({ aspectRatio: 4 / 3, diff --git a/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/mapLayer.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/mapLayer.tests.js index 6c53d4a603ee..7bc8257484a2 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/mapLayer.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/mapLayer.tests.js @@ -11,7 +11,7 @@ let stubSelectStrategy; let StubMapLayerElement; let StubProxy; const projectionModule = require('viz/vector_map/projection.main'); -const DataSource = require('data/data_source/data_source').DataSource; +const DataSource = require('common/data/data_source/data_source').DataSource; const baseThemeManagerModule = require('viz/core/base_theme_manager'); const vizMocks = require('../../helpers/vizMocks.js'); diff --git a/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/mapLayer_new.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/mapLayer_new.tests.js index f13b7a33fbec..445590248afa 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/mapLayer_new.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/mapLayer_new.tests.js @@ -7,7 +7,7 @@ const controlBarModule = require('viz/vector_map/control_bar/control_bar'); const legendModule = require('viz/vector_map/legend'); const tooltipModule = require('viz/core/tooltip'); const tooltipViewerModule = require('viz/vector_map/tooltip_viewer'); -const DataSource = require('data/data_source/data_source').DataSource; +const DataSource = require('common/data/data_source/data_source').DataSource; const exportMenuModule = require('viz/core/export'); // TODO maybe if you test layer - you should create exact layer? const rendererModule = require('viz/core/renderers/renderer'); diff --git a/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/tracker.tests.js b/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/tracker.tests.js index 611197e8e10f..adb782eeaa39 100644 --- a/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/tracker.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.viz.vectorMap/tracker.tests.js @@ -9,7 +9,7 @@ import { noop } from 'core/utils/common'; import vizMocks from '../../helpers/vizMocks.js'; import trackerModule from 'viz/vector_map/tracker'; import eventEmitterModule from 'viz/vector_map/event_emitter'; -import animationFrame from 'animation/frame'; +import animationFrame from 'common/core/animation/frame'; const FOCUS_OFF_DELAY = 100; diff --git a/packages/devextreme/ts/aliases.d.ts b/packages/devextreme/ts/aliases.d.ts index d75d552c5088..4e43900f2519 100644 --- a/packages/devextreme/ts/aliases.d.ts +++ b/packages/devextreme/ts/aliases.d.ts @@ -1,826 +1,940 @@ -declare module DevExpress { - /** @deprecated Use DevExpress.events.EventObject instead */ - export type dxEvent = DevExpress.events.EventObject; - /** @deprecated Use DevExpress.events.event instead */ - export type event = DevExpress.events.event; -} - -declare module DevExpress.viz { - /** @deprecated Use DevExpress.viz.ChartSeries instead */ - export type dxChartSeries = DevExpress.viz.ChartSeries; - /** @deprecated Use DevExpress.viz.PieChartSeries instead */ - export type dxPieChartSeries = DevExpress.viz.PieChartSeries; - /** @deprecated Use DevExpress.viz.PolarChartSeries instead */ - export type dxPolarChartSeries = DevExpress.viz.PolarChartSeries; - - /** @deprecated Use DevExpress.viz instead */ - export module charts { - /** @deprecated */ - export type dxChartOptions = DevExpress.viz.dxChartOptions; - /** @deprecated */ - export type dxChartArgumentAxis = DevExpress.viz.dxChartArgumentAxis; - /** @deprecated */ - export type dxChartArgumentAxisConstantLines = DevExpress.viz.dxChartArgumentAxisConstantLines; - /** @deprecated */ - export type dxChartArgumentAxisConstantLinesLabel = DevExpress.viz.dxChartArgumentAxisConstantLinesLabel; - /** @deprecated */ - export type dxChartArgumentAxisConstantLineStyle = DevExpress.viz.dxChartArgumentAxisConstantLineStyle; - /** @deprecated */ - export type dxChartArgumentAxisConstantLineStyleLabel = DevExpress.viz.dxChartArgumentAxisConstantLineStyleLabel; - /** @deprecated */ - export type dxChartArgumentAxisLabel = DevExpress.viz.dxChartArgumentAxisLabel; - /** @deprecated */ - export type dxChartArgumentAxisStrips = DevExpress.viz.dxChartArgumentAxisStrips; - /** @deprecated */ - export type dxChartArgumentAxisStripsLabel = DevExpress.viz.dxChartArgumentAxisStripsLabel; - /** @deprecated */ - export type dxChartArgumentAxisTitle = DevExpress.viz.dxChartArgumentAxisTitle; - /** @deprecated */ - export type dxChartCommonAxisSettings = DevExpress.viz.dxChartCommonAxisSettings; - /** @deprecated */ - export type dxChartCommonAxisSettingsConstantLineStyle = DevExpress.viz.dxChartCommonAxisSettingsConstantLineStyle; - /** @deprecated */ - export type dxChartCommonAxisSettingsConstantLineStyleLabel = DevExpress.viz.dxChartCommonAxisSettingsConstantLineStyleLabel; - /** @deprecated */ - export type dxChartCommonAxisSettingsLabel = DevExpress.viz.dxChartCommonAxisSettingsLabel; - /** @deprecated */ - export type dxChartCommonAxisSettingsStripStyle = DevExpress.viz.dxChartCommonAxisSettingsStripStyle; - /** @deprecated */ - export type dxChartCommonAxisSettingsStripStyleLabel = DevExpress.viz.dxChartCommonAxisSettingsStripStyleLabel; - /** @deprecated */ - export type dxChartCommonAxisSettingsTitle = DevExpress.viz.dxChartCommonAxisSettingsTitle; - /** @deprecated */ - export type dxChartCommonPaneSettings = DevExpress.viz.dxChartCommonPaneSettings; - /** @deprecated */ - export type dxChartCommonSeriesSettings = DevExpress.viz.dxChartCommonSeriesSettings; - /** @deprecated */ - export type dxChartLegend = DevExpress.viz.dxChartLegend; - /** @deprecated */ - export type dxChartPanes = DevExpress.viz.dxChartPanes; - /** @deprecated */ - export type dxChartSeries = DevExpress.viz.dxChartSeries; - /** @deprecated */ - export type dxChartTooltip = DevExpress.viz.dxChartTooltip; - /** @deprecated */ - export type dxChartValueAxis = DevExpress.viz.dxChartValueAxis; - /** @deprecated */ - export type dxChartValueAxisConstantLines = DevExpress.viz.dxChartValueAxisConstantLines; - /** @deprecated */ - export type dxChartValueAxisConstantLinesLabel = DevExpress.viz.dxChartValueAxisConstantLinesLabel; - /** @deprecated */ - export type dxChartValueAxisConstantLineStyle = DevExpress.viz.dxChartValueAxisConstantLineStyle; - /** @deprecated */ - export type dxChartValueAxisConstantLineStyleLabel = DevExpress.viz.dxChartValueAxisConstantLineStyleLabel; - /** @deprecated */ - export type dxChartValueAxisLabel = DevExpress.viz.dxChartValueAxisLabel; - /** @deprecated */ - export type dxChartValueAxisStrips = DevExpress.viz.dxChartValueAxisStrips; - /** @deprecated */ - export type dxChartValueAxisStripsLabel = DevExpress.viz.dxChartValueAxisStripsLabel; - /** @deprecated */ - export type dxChartValueAxisTitle = DevExpress.viz.dxChartValueAxisTitle; - - /** @deprecated */ - export type dxPieChartOptions = DevExpress.viz.dxPieChartOptions; - /** @deprecated */ - export type dxPieChartAdaptiveLayout = DevExpress.viz.dxPieChartAdaptiveLayout; - /** @deprecated */ - export type dxPieChartLegend = DevExpress.viz.dxPieChartLegend; - /** @deprecated */ - export type dxPieChartSeries = DevExpress.viz.dxPieChartSeries; - - /** @deprecated */ - export type dxPolarChartOptions = DevExpress.viz.dxPolarChartOptions; - /** @deprecated */ - export type dxPolarChartAdaptiveLayout = DevExpress.viz.dxPolarChartAdaptiveLayout; - /** @deprecated */ - export type dxPolarChartArgumentAxis = DevExpress.viz.dxPolarChartArgumentAxis; - /** @deprecated */ - export type dxPolarChartArgumentAxisConstantLines = DevExpress.viz.dxPolarChartArgumentAxisConstantLines; - /** @deprecated */ - export type dxPolarChartArgumentAxisConstantLinesLabel = DevExpress.viz.dxPolarChartArgumentAxisConstantLinesLabel; - /** @deprecated */ - export type dxPolarChartArgumentAxisLabel = DevExpress.viz.dxPolarChartArgumentAxisLabel; - /** @deprecated */ - export type dxPolarChartArgumentAxisStrips = DevExpress.viz.dxPolarChartArgumentAxisStrips; - /** @deprecated */ - export type dxPolarChartArgumentAxisStripsLabel = DevExpress.viz.dxPolarChartArgumentAxisStripsLabel; - /** @deprecated */ - export type dxPolarChartCommonAxisSettings = DevExpress.viz.dxPolarChartCommonAxisSettings; - /** @deprecated */ - export type dxPolarChartCommonAxisSettingsConstantLineStyle = DevExpress.viz.dxPolarChartCommonAxisSettingsConstantLineStyle; - /** @deprecated */ - export type dxPolarChartCommonAxisSettingsConstantLineStyleLabel = DevExpress.viz.dxPolarChartCommonAxisSettingsConstantLineStyleLabel; - /** @deprecated */ - export type dxPolarChartCommonAxisSettingsLabel = DevExpress.viz.dxPolarChartCommonAxisSettingsLabel; - /** @deprecated */ - export type dxPolarChartCommonAxisSettingsStripStyle = DevExpress.viz.dxPolarChartCommonAxisSettingsStripStyle; - /** @deprecated */ - export type dxPolarChartCommonAxisSettingsStripStyleLabel = DevExpress.viz.dxPolarChartCommonAxisSettingsStripStyleLabel; - /** @deprecated */ - export type dxPolarChartCommonAxisSettingsTick = DevExpress.viz.dxPolarChartCommonAxisSettingsTick; - /** @deprecated */ - export type dxPolarChartCommonSeriesSettings = DevExpress.viz.dxPolarChartCommonSeriesSettings; - /** @deprecated */ - export type dxPolarChartLegend = DevExpress.viz.dxPolarChartLegend; - /** @deprecated */ - export type dxPolarChartSeries = DevExpress.viz.dxPolarChartSeries; - /** @deprecated */ - export type dxPolarChartTooltip = DevExpress.viz.dxPolarChartTooltip; - /** @deprecated */ - export type dxPolarChartValueAxis = DevExpress.viz.dxPolarChartValueAxis; - /** @deprecated */ - export type dxPolarChartValueAxisConstantLines = DevExpress.viz.dxPolarChartValueAxisConstantLines; - /** @deprecated */ - export type dxPolarChartValueAxisConstantLinesLabel = DevExpress.viz.dxPolarChartValueAxisConstantLinesLabel; - /** @deprecated */ - export type dxPolarChartValueAxisLabel = DevExpress.viz.dxPolarChartValueAxisLabel; - /** @deprecated */ - export type dxPolarChartValueAxisStrips = DevExpress.viz.dxPolarChartValueAxisStrips; - /** @deprecated */ - export type dxPolarChartValueAxisStripsLabel = DevExpress.viz.dxPolarChartValueAxisStripsLabel; - /** @deprecated */ - export type dxPolarChartValueAxisTick = DevExpress.viz.dxPolarChartValueAxisTick; - } - - /** @deprecated Use DevExpress.viz instead */ - export module funnel { - /** @deprecated */ - export type dxFunnelOptions = DevExpress.viz.dxFunnelOptions; - /** @deprecated */ - export type dxFunnelTooltip = DevExpress.viz.dxFunnelTooltip; - } - - /** @deprecated Use DevExpress.viz instead */ - export module gauges { - /** @deprecated */ - export type dxCircularGaugeOptions = DevExpress.viz.dxCircularGaugeOptions; - /** @deprecated */ - export type dxCircularGaugeRangeContainer = DevExpress.viz.dxCircularGaugeRangeContainer; - /** @deprecated */ - export type dxCircularGaugeScale = DevExpress.viz.dxCircularGaugeScale; - /** @deprecated */ - export type dxCircularGaugeScaleLabel = DevExpress.viz.dxCircularGaugeScaleLabel; - - /** @deprecated */ - export type dxLinearGaugeOptions = DevExpress.viz.dxLinearGaugeOptions; - /** @deprecated */ - export type dxLinearGaugeRangeContainer = DevExpress.viz.dxLinearGaugeRangeContainer; - /** @deprecated */ - export type dxLinearGaugeScale = DevExpress.viz.dxLinearGaugeScale; - /** @deprecated */ - export type dxLinearGaugeScaleLabel = DevExpress.viz.dxLinearGaugeScaleLabel; - - /** @deprecated */ - export type dxBarGaugeOptions = DevExpress.viz.dxBarGaugeOptions; - /** @deprecated */ - export type dxBarGaugeTooltip = DevExpress.viz.dxBarGaugeTooltip; - } - - /** @deprecated Use DevExpress.viz instead */ - export module rangeSelector { - /** @deprecated */ - export type dxRangeSelectorOptions = DevExpress.viz.dxRangeSelectorOptions; - } - - /** @deprecated Use DevExpress.viz instead */ - export module sparklines { - /** @deprecated */ - export type dxSparklineOptions = DevExpress.viz.dxSparklineOptions; - /** @deprecated */ - export type dxBulletOptions = DevExpress.viz.dxBulletOptions; - } - - /** @deprecated Use DevExpress.viz instead */ - export module map { - /** @deprecated */ - export type dxVectorMapOptions = DevExpress.viz.dxVectorMapOptions; - /** @deprecated */ - export type dxVectorMapTooltip = DevExpress.viz.dxVectorMapTooltip; - } - - /** @deprecated Use DevExpress.viz instead */ - export module treeMap { - /** @deprecated */ - export type dxTreeMapOptions = DevExpress.viz.dxTreeMapOptions; - /** @deprecated */ - export type dxTreeMapTooltip = DevExpress.viz.dxTreeMapTooltip; - } -} - -declare module DevExpress.ui { - /** @deprecated Use DevExpress.ui.dxAccordionItem */ - export type dxAccordionItemTemplate = DevExpress.ui.dxAccordionItem; - - /** @deprecated Use DevExpress.ui.dxActionSheetItem */ - export type dxActionSheetItemTemplate = DevExpress.ui.dxActionSheetItem; - - /** @deprecated Use DevExpress.ui.dxBoxItem */ - export type dxBoxItemTemplate = DevExpress.ui.dxBoxItem; - - /** @deprecated Use DevExpress.ui.dxGalleryItem */ - export type dxGalleryItemTemplate = DevExpress.ui.dxGalleryItem; - - /** @deprecated Use DevExpress.ui.dxMultiViewItem */ - export type dxMultiViewItemTemplate = DevExpress.ui.dxMultiViewItem; - - /** @deprecated Use DevExpress.ui.dxResponsiveBoxItem */ - export type dxResponsiveBoxItemTemplate = DevExpress.ui.dxResponsiveBoxItem; - - /** @deprecated Use DevExpress.ui.dxSchedulerAppointment */ - export type dxSchedulerAppointmentTemplate = DevExpress.ui.dxSchedulerAppointment; - - /** @deprecated Use DevExpress.ui.dxTabsItem */ - export type dxTabsItemTemplate = DevExpress.ui.dxTabsItem; - - /** @deprecated Use DevExpress.ui.dxTabPanelItem */ - export type dxTabPanelItemTemplate = DevExpress.ui.dxTabPanelItem; - - /** @deprecated Use DevExpress.ui.dxTileViewItem */ - export type dxTileViewItemTemplate = DevExpress.ui.dxTileViewItem; - - /** @deprecated Use DevExpress.ui.dxToolbarItem */ - export type dxToolbarItemTemplate = DevExpress.ui.dxToolbarItem; - - /** @deprecated Use DevExpress.ui.CollectionWidgetItem */ - export type CollectionWidgetItemTemplate = DevExpress.ui.CollectionWidgetItem; - - /** @deprecated Use DevExpress.ui.dxContextMenuItem */ - export type dxContextMenuItemTemplate = DevExpress.ui.dxContextMenuItem; +declare namespace DevExpress { + /** @deprecated Use DevExpress.common.EventObject instead */ + export type dxEvent = common.core.events.EventObject; + /** @deprecated Use DevExpress.common.event instead */ + export type event = events.event; +} + +declare namespace DevExpress.viz { + /** @deprecated Use DevExpress.viz.ChartSeries instead */ + export type dxChartSeries = ChartSeries; + /** @deprecated Use DevExpress.viz.PieChartSeries instead */ + export type dxPieChartSeries = PieChartSeries; + /** @deprecated Use DevExpress.viz.PolarChartSeries instead */ + export type dxPolarChartSeries = PolarChartSeries; + + /** @deprecated Use DevExpress.viz instead */ + export namespace charts { + /** @deprecated */ + export type dxChartOptions = viz.dxChartOptions; + /** @deprecated */ + export type dxChartArgumentAxis = viz.dxChartArgumentAxis; + /** @deprecated */ + export type dxChartArgumentAxisConstantLines = viz.dxChartArgumentAxisConstantLines; + /** @deprecated */ + export type dxChartArgumentAxisConstantLinesLabel = viz.dxChartArgumentAxisConstantLinesLabel; + /** @deprecated */ + export type dxChartArgumentAxisConstantLineStyle = viz.dxChartArgumentAxisConstantLineStyle; + /** @deprecated */ + export type dxChartArgumentAxisConstantLineStyleLabel = viz.dxChartArgumentAxisConstantLineStyleLabel; + /** @deprecated */ + export type dxChartArgumentAxisLabel = viz.dxChartArgumentAxisLabel; + /** @deprecated */ + export type dxChartArgumentAxisStrips = viz.dxChartArgumentAxisStrips; + /** @deprecated */ + export type dxChartArgumentAxisStripsLabel = viz.dxChartArgumentAxisStripsLabel; + /** @deprecated */ + export type dxChartArgumentAxisTitle = viz.dxChartArgumentAxisTitle; + /** @deprecated */ + export type dxChartCommonAxisSettings = viz.dxChartCommonAxisSettings; + /** @deprecated */ + export type dxChartCommonAxisSettingsConstantLineStyle = viz.dxChartCommonAxisSettingsConstantLineStyle; + /** @deprecated */ + export type dxChartCommonAxisSettingsConstantLineStyleLabel = viz.dxChartCommonAxisSettingsConstantLineStyleLabel; + /** @deprecated */ + export type dxChartCommonAxisSettingsLabel = viz.dxChartCommonAxisSettingsLabel; + /** @deprecated */ + export type dxChartCommonAxisSettingsStripStyle = viz.dxChartCommonAxisSettingsStripStyle; + /** @deprecated */ + export type dxChartCommonAxisSettingsStripStyleLabel = viz.dxChartCommonAxisSettingsStripStyleLabel; + /** @deprecated */ + export type dxChartCommonAxisSettingsTitle = viz.dxChartCommonAxisSettingsTitle; + /** @deprecated */ + export type dxChartCommonPaneSettings = viz.dxChartCommonPaneSettings; + /** @deprecated */ + export type dxChartCommonSeriesSettings = viz.dxChartCommonSeriesSettings; + /** @deprecated */ + export type dxChartLegend = viz.dxChartLegend; + /** @deprecated */ + export type dxChartPanes = viz.dxChartPanes; + /** @deprecated */ + export type dxChartSeries = viz.dxChartSeries; + /** @deprecated */ + export type dxChartTooltip = viz.dxChartTooltip; + /** @deprecated */ + export type dxChartValueAxis = viz.dxChartValueAxis; + /** @deprecated */ + export type dxChartValueAxisConstantLines = viz.dxChartValueAxisConstantLines; + /** @deprecated */ + export type dxChartValueAxisConstantLinesLabel = viz.dxChartValueAxisConstantLinesLabel; + /** @deprecated */ + export type dxChartValueAxisConstantLineStyle = viz.dxChartValueAxisConstantLineStyle; + /** @deprecated */ + export type dxChartValueAxisConstantLineStyleLabel = viz.dxChartValueAxisConstantLineStyleLabel; + /** @deprecated */ + export type dxChartValueAxisLabel = viz.dxChartValueAxisLabel; + /** @deprecated */ + export type dxChartValueAxisStrips = viz.dxChartValueAxisStrips; + /** @deprecated */ + export type dxChartValueAxisStripsLabel = viz.dxChartValueAxisStripsLabel; + /** @deprecated */ + export type dxChartValueAxisTitle = viz.dxChartValueAxisTitle; + + /** @deprecated */ + export type dxPieChartOptions = viz.dxPieChartOptions; + /** @deprecated */ + export type dxPieChartAdaptiveLayout = viz.dxPieChartAdaptiveLayout; + /** @deprecated */ + export type dxPieChartLegend = viz.dxPieChartLegend; + /** @deprecated */ + export type dxPieChartSeries = viz.dxPieChartSeries; + + /** @deprecated */ + export type dxPolarChartOptions = viz.dxPolarChartOptions; + /** @deprecated */ + export type dxPolarChartAdaptiveLayout = viz.dxPolarChartAdaptiveLayout; + /** @deprecated */ + export type dxPolarChartArgumentAxis = viz.dxPolarChartArgumentAxis; + /** @deprecated */ + export type dxPolarChartArgumentAxisConstantLines = viz.dxPolarChartArgumentAxisConstantLines; + /** @deprecated */ + export type dxPolarChartArgumentAxisConstantLinesLabel = viz.dxPolarChartArgumentAxisConstantLinesLabel; + /** @deprecated */ + export type dxPolarChartArgumentAxisLabel = viz.dxPolarChartArgumentAxisLabel; + /** @deprecated */ + export type dxPolarChartArgumentAxisStrips = viz.dxPolarChartArgumentAxisStrips; + /** @deprecated */ + export type dxPolarChartArgumentAxisStripsLabel = viz.dxPolarChartArgumentAxisStripsLabel; + /** @deprecated */ + export type dxPolarChartCommonAxisSettings = viz.dxPolarChartCommonAxisSettings; + /** @deprecated */ + export type dxPolarChartCommonAxisSettingsConstantLineStyle = viz.dxPolarChartCommonAxisSettingsConstantLineStyle; + /** @deprecated */ + export type dxPolarChartCommonAxisSettingsConstantLineStyleLabel = viz.dxPolarChartCommonAxisSettingsConstantLineStyleLabel; + /** @deprecated */ + export type dxPolarChartCommonAxisSettingsLabel = viz.dxPolarChartCommonAxisSettingsLabel; + /** @deprecated */ + export type dxPolarChartCommonAxisSettingsStripStyle = viz.dxPolarChartCommonAxisSettingsStripStyle; + /** @deprecated */ + export type dxPolarChartCommonAxisSettingsStripStyleLabel = viz.dxPolarChartCommonAxisSettingsStripStyleLabel; + /** @deprecated */ + export type dxPolarChartCommonAxisSettingsTick = viz.dxPolarChartCommonAxisSettingsTick; + /** @deprecated */ + export type dxPolarChartCommonSeriesSettings = viz.dxPolarChartCommonSeriesSettings; + /** @deprecated */ + export type dxPolarChartLegend = viz.dxPolarChartLegend; + /** @deprecated */ + export type dxPolarChartSeries = viz.dxPolarChartSeries; + /** @deprecated */ + export type dxPolarChartTooltip = viz.dxPolarChartTooltip; + /** @deprecated */ + export type dxPolarChartValueAxis = viz.dxPolarChartValueAxis; + /** @deprecated */ + export type dxPolarChartValueAxisConstantLines = viz.dxPolarChartValueAxisConstantLines; + /** @deprecated */ + export type dxPolarChartValueAxisConstantLinesLabel = viz.dxPolarChartValueAxisConstantLinesLabel; + /** @deprecated */ + export type dxPolarChartValueAxisLabel = viz.dxPolarChartValueAxisLabel; + /** @deprecated */ + export type dxPolarChartValueAxisStrips = viz.dxPolarChartValueAxisStrips; + /** @deprecated */ + export type dxPolarChartValueAxisStripsLabel = viz.dxPolarChartValueAxisStripsLabel; + /** @deprecated */ + export type dxPolarChartValueAxisTick = viz.dxPolarChartValueAxisTick; + } + + /** @deprecated Use DevExpress.viz instead */ + export namespace funnel { + /** @deprecated */ + export type dxFunnelOptions = viz.dxFunnelOptions; + /** @deprecated */ + export type dxFunnelTooltip = viz.dxFunnelTooltip; + } + + /** @deprecated Use DevExpress.viz instead */ + export namespace gauges { + /** @deprecated */ + export type dxCircularGaugeOptions = viz.dxCircularGaugeOptions; + /** @deprecated */ + export type dxCircularGaugeRangeContainer = viz.dxCircularGaugeRangeContainer; + /** @deprecated */ + export type dxCircularGaugeScale = viz.dxCircularGaugeScale; + /** @deprecated */ + export type dxCircularGaugeScaleLabel = viz.dxCircularGaugeScaleLabel; + + /** @deprecated */ + export type dxLinearGaugeOptions = viz.dxLinearGaugeOptions; + /** @deprecated */ + export type dxLinearGaugeRangeContainer = viz.dxLinearGaugeRangeContainer; + /** @deprecated */ + export type dxLinearGaugeScale = viz.dxLinearGaugeScale; + /** @deprecated */ + export type dxLinearGaugeScaleLabel = viz.dxLinearGaugeScaleLabel; + + /** @deprecated */ + export type dxBarGaugeOptions = viz.dxBarGaugeOptions; + /** @deprecated */ + export type dxBarGaugeTooltip = viz.dxBarGaugeTooltip; + } + + /** @deprecated Use DevExpress.viz instead */ + export namespace rangeSelector { + /** @deprecated */ + export type dxRangeSelectorOptions = viz.dxRangeSelectorOptions; + } + + /** @deprecated Use DevExpress.viz instead */ + export namespace sparklines { + /** @deprecated */ + export type dxSparklineOptions = viz.dxSparklineOptions; + /** @deprecated */ + export type dxBulletOptions = viz.dxBulletOptions; + } + + /** @deprecated Use DevExpress.viz instead */ + export namespace map { + /** @deprecated */ + export type dxVectorMapOptions = viz.dxVectorMapOptions; + /** @deprecated */ + export type dxVectorMapTooltip = viz.dxVectorMapTooltip; + } + + /** @deprecated Use DevExpress.viz instead */ + export namespace treeMap { + /** @deprecated */ + export type dxTreeMapOptions = viz.dxTreeMapOptions; + /** @deprecated */ + export type dxTreeMapTooltip = viz.dxTreeMapTooltip; + } +} - /** @deprecated Use DevExpress.ui.dxMenuBaseItem */ - export type dxMenuBaseItemTemplate = DevExpress.ui.dxMenuBaseItem; +declare namespace DevExpress.ui { + /** @deprecated Use DevExpress.ui.dxAccordionItem */ + export type dxAccordionItemTemplate = dxAccordionItem; - /** @deprecated Use DevExpress.ui.CollectionWidgetItem */ - export type DataExpressionMixinItemTemplate = DevExpress.ui.CollectionWidgetItem; + /** @deprecated Use DevExpress.ui.dxActionSheetItem */ + export type dxActionSheetItemTemplate = dxActionSheetItem; - /** @deprecated Use DevExpress.ui.dxListItem */ - export type dxListItemTemplate = DevExpress.ui.dxListItem; + /** @deprecated Use DevExpress.ui.dxBoxItem */ + export type dxBoxItemTemplate = dxBoxItem; - /** @deprecated Use DevExpress.ui.dxMenuItem */ - export type dxMenuItemTemplate = DevExpress.ui.dxMenuItem; + /** @deprecated Use DevExpress.ui.dxGalleryItem */ + export type dxGalleryItemTemplate = dxGalleryItem; - /** @deprecated Use DevExpress.ui.dxTreeViewItem */ - export type dxTreeViewItemTemplate = DevExpress.ui.dxTreeViewItem; -} + /** @deprecated Use DevExpress.ui.dxMultiViewItem */ + export type dxMultiViewItemTemplate = dxMultiViewItem; + + /** @deprecated Use DevExpress.ui.dxResponsiveBoxItem */ + export type dxResponsiveBoxItemTemplate = dxResponsiveBoxItem; + + /** @deprecated Use DevExpress.ui.dxSchedulerAppointment */ + export type dxSchedulerAppointmentTemplate = dxSchedulerAppointment; + + /** @deprecated Use DevExpress.ui.dxTabsItem */ + export type dxTabsItemTemplate = dxTabsItem; + + /** @deprecated Use DevExpress.ui.dxTabPanelItem */ + export type dxTabPanelItemTemplate = dxTabPanelItem; + + /** @deprecated Use DevExpress.ui.dxTileViewItem */ + export type dxTileViewItemTemplate = dxTileViewItem; + + /** @deprecated Use DevExpress.ui.dxToolbarItem */ + export type dxToolbarItemTemplate = dxToolbarItem; + + /** @deprecated Use DevExpress.ui.CollectionWidgetItem */ + export type CollectionWidgetItemTemplate = CollectionWidgetItem; + + /** @deprecated Use DevExpress.ui.dxContextMenuItem */ + export type dxContextMenuItemTemplate = dxContextMenuItem; + + /** @deprecated Use DevExpress.ui.dxMenuBaseItem */ + export type dxMenuBaseItemTemplate = dxMenuBaseItem; + + /** @deprecated Use DevExpress.ui.CollectionWidgetItem */ + export type DataExpressionMixinItemTemplate = CollectionWidgetItem; + /** @deprecated Use DevExpress.ui.dxListItem */ + export type dxListItemTemplate = dxListItem; + + /** @deprecated Use DevExpress.ui.dxMenuItem */ + export type dxMenuItemTemplate = dxMenuItem; + + /** @deprecated Use DevExpress.ui.dxTreeViewItem */ + export type dxTreeViewItemTemplate = dxTreeViewItem; +} // v22.1 -declare module DevExpress.ui { - /** @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 type GridBase = DevExpress.common.grids.GridBase; - /** @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 type GridBaseOptions, TRowData = any, TKey = any> = DevExpress.common.grids.GridBaseOptions; -} - -declare module DevExpress.ui.dxDataGrid { - - /** @deprecated Use DevExpress.common.Scrollable */ - export type Scrollable = DevExpress.common.Scrollable; - - /** @deprecated Use DevExpress.common.grids.ColumnChooser instead */ - export type ColumnChooser = DevExpress.common.grids.ColumnChooser; - /** @deprecated Use DevExpress.common.grids.ColumnCustomizeTextArg instead */ - export type ColumnCustomizeTextArg = DevExpress.common.grids.ColumnCustomizeTextArg; - /** @deprecated Use DevExpress.common.grids.ColumnFixing instead */ - export type ColumnFixing = DevExpress.common.grids.ColumnFixing; - /** @deprecated Use DevExpress.common.grids.ColumnFixingTexts instead */ - export type ColumnFixingTexts = DevExpress.common.grids.ColumnFixingTexts; - /** @deprecated Use DevExpress.common.grids.ColumnHeaderFilter instead */ - export type ColumnHeaderFilter = DevExpress.common.grids.ColumnHeaderFilter; - /** @deprecated Use DevExpress.common.grids.ColumnLookup instead */ - export type ColumnLookup = DevExpress.common.grids.ColumnLookup; - /** @deprecated Use DevExpress.common.grids.DataChange instead */ - export type DataChange = DevExpress.common.grids.DataChange; - /** @deprecated Use DevExpress.common.grids.FilterPanelTexts instead */ - export type FilterPanelTexts = DevExpress.common.grids.FilterPanelTexts; - /** @deprecated Use DevExpress.common.grids.FilterRow instead */ - export type FilterRow = DevExpress.common.grids.FilterRow; - /** @deprecated Use DevExpress.common.grids.FilterRowOperationDescriptions instead */ - export type FilterRowOperationDescriptions = DevExpress.common.grids.FilterRowOperationDescriptions; - /** @deprecated Use DevExpress.common.grids.HeaderFilter instead */ - export type HeaderFilter = DevExpress.common.grids.HeaderFilter; - /** @deprecated Use DevExpress.common.grids.HeaderFilterGroupInterval instead */ - export type HeaderFilterGroupInterval = DevExpress.common.grids.HeaderFilterGroupInterval; - /** @deprecated Use DevExpress.common.grids.HeaderFilterTexts instead */ - export type HeaderFilterTexts = DevExpress.common.grids.HeaderFilterTexts; - /** @deprecated Use DevExpress.common.grids.KeyboardNavigation instead */ - export type KeyboardNavigation = DevExpress.common.grids.KeyboardNavigation; - /** @deprecated Use DevExpress.common.grids.LoadPanel instead */ - export type LoadPanel = DevExpress.common.grids.LoadPanel; - /** @deprecated Use DevExpress.common.grids.Pager instead */ - export type Pager = DevExpress.common.grids.Pager; - /** @deprecated Use DevExpress.common.grids.RowDraggingTemplateData instead */ - export type RowDraggingTemplateData = DevExpress.common.grids.RowDraggingTemplateData; - /** @deprecated Use DevExpress.common.grids.RowDraggingTemplateData instead */ - export type RowDraggingTemplateDataModel = DevExpress.common.grids.RowDraggingTemplateData; - /** @deprecated Use DevExpress.common.grids.SearchPanel instead */ - export type SearchPanel = DevExpress.common.grids.SearchPanel; - /** @deprecated Use DevExpress.common.grids.Sorting instead */ - export type Sorting = DevExpress.common.grids.Sorting; - /** @deprecated Use DevExpress.common.grids.StateStoring instead */ - export type StateStoring = DevExpress.common.grids.StateStoring; - - /** @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 type AdaptiveDetailRowPreparingInfo = DevExpress.common.grids.AdaptiveDetailRowPreparingInfo; - /** @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 type DataChangeInfo = DevExpress.common.grids.DataChangeInfo; - /** @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 type DataErrorOccurredInfo = DevExpress.common.grids.DataErrorOccurredInfo; - /** @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 type DragDropInfo = DevExpress.common.grids.DragDropInfo; - /** @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 type DragReorderInfo = DevExpress.common.grids.DragReorderInfo; - /** @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 type DragStartEventInfo = DevExpress.common.grids.DragStartEventInfo; - /** @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 type KeyDownInfo = DevExpress.common.grids.KeyDownInfo; - /** @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 type NewRowInfo = DevExpress.common.grids.NewRowInfo; - /** @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 type PagingBase = DevExpress.common.grids.PagingBase; - /** @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 type RowDraggingEventInfo = DevExpress.common.grids.RowDraggingEventInfo; - /** @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 type RowInsertedInfo = DevExpress.common.grids.RowInsertedInfo; - /** @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 type RowInsertingInfo = DevExpress.common.grids.RowInsertingInfo; - /** @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 type RowKeyInfo = DevExpress.common.grids.RowKeyInfo; - /** @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 type RowRemovedInfo = DevExpress.common.grids.RowRemovedInfo; - /** @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 type RowRemovingInfo = DevExpress.common.grids.RowRemovingInfo; - /** @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 type RowUpdatedInfo = DevExpress.common.grids.RowUpdatedInfo; - /** @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 type RowUpdatingInfo = DevExpress.common.grids.RowUpdatingInfo; - /** @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 type RowValidatingInfo = DevExpress.common.grids.RowValidatingInfo; - /** @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 type SavingInfo = DevExpress.common.grids.SavingInfo; - /** @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 type SelectionChangedInfo = DevExpress.common.grids.SelectionChangedInfo; - /** @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 type ToolbarPreparingInfo = DevExpress.common.grids.ToolbarPreparingInfo; -} - -declare module DevExpress.common.charts { - /** @deprecated Use DevExpress.common.grids.ApplyChangesMode instead */ - export type ApplyChangesMode = DevExpress.common.grids.ApplyChangesMode; - /** @deprecated Use DevExpress.common.grids.ApplyFilterMode instead */ - export type ApplyFilterMode = DevExpress.common.grids.ApplyFilterMode; - /** @deprecated Use DevExpress.common.grids.ColumnChooserMode instead */ - export type ColumnChooserMode = DevExpress.common.grids.ColumnChooserMode; - /** @deprecated Use DevExpress.common.grids.ColumnResizeMode instead */ - export type ColumnResizeMode = DevExpress.common.grids.ColumnResizeMode; - /** @deprecated Use DevExpress.common.grids.DataChangeType instead */ - export type DataChangeType = DevExpress.common.grids.DataChangeType; - /** @deprecated Use DevExpress.common.grids.DataRenderMode instead */ - export type DataRenderMode = DevExpress.common.grids.DataRenderMode; - /** @deprecated Use DevExpress.common.grids.EnterKeyAction instead */ - export type EnterKeyAction = DevExpress.common.grids.EnterKeyAction; - /** @deprecated Use DevExpress.common.grids.EnterKeyDirection instead */ - export type EnterKeyDirection = DevExpress.common.grids.EnterKeyDirection; - /** @deprecated Use DevExpress.common.grids.FilterOperation instead */ - export type FilterOperation = DevExpress.common.grids.FilterOperation; - /** @deprecated Use DevExpress.common.grids.FilterType instead */ - export type FilterType = DevExpress.common.grids.FilterType; - /** @deprecated Use DevExpress.common.grids.GridsEditMode instead */ - export type GridsEditMode = DevExpress.common.grids.GridsEditMode; - /** @deprecated Use DevExpress.common.grids.GridsEditRefreshMode instead */ - export type GridsEditRefreshMode = DevExpress.common.grids.GridsEditRefreshMode; - /** @deprecated Use DevExpress.common.grids.GroupExpandMode instead */ - export type GroupExpandMode = DevExpress.common.grids.GroupExpandMode; - /** @deprecated Use DevExpress.common.grids.NewRowPosition instead */ - export type NewRowPosition = DevExpress.common.grids.NewRowPosition; - /** @deprecated Use DevExpress.common.DisplayMode instead */ - export type PagerDisplayMode = DevExpress.common.DisplayMode; - /** @deprecated Use DevExpress.common.grids.PagerPageSize instead */ - export type PagerPageSize = DevExpress.common.grids.PagerPageSize; - /** @deprecated Use DevExpress.common.grids.SelectedFilterOperation instead */ - export type SelectedFilterOperation = DevExpress.common.grids.SelectedFilterOperation; - /** @deprecated Use DevExpress.common.grids.SelectionColumnDisplayMode instead */ - export type SelectionColumnDisplayMode = DevExpress.common.grids.SelectionColumnDisplayMode; - /** @deprecated Use DevExpress.common.grids.StartEditAction instead */ - export type StartEditAction = DevExpress.common.grids.StartEditAction; - /** @deprecated Use DevExpress.common.grids.StateStoreType instead */ - export type StateStoreType = DevExpress.common.grids.StateStoreType; - /** @deprecated Use DevExpress.common.grids.SummaryType instead */ - export type SummaryType = DevExpress.common.grids.SummaryType; +declare namespace DevExpress.ui { + /** @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 type GridBase = common.grids.GridBase; + /** @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 type GridBaseOptions, TRowData = any, TKey = any> = common.grids.GridBaseOptions; +} + +declare namespace DevExpress.ui.dxDataGrid { + + /** @deprecated Use DevExpress.common.Scrollable */ + export type Scrollable = common.Scrollable; + + /** @deprecated Use DevExpress.common.grids.ColumnChooser instead */ + export type ColumnChooser = common.grids.ColumnChooser; + /** @deprecated Use DevExpress.common.grids.ColumnCustomizeTextArg instead */ + export type ColumnCustomizeTextArg = common.grids.ColumnCustomizeTextArg; + /** @deprecated Use DevExpress.common.grids.ColumnFixing instead */ + export type ColumnFixing = common.grids.ColumnFixing; + /** @deprecated Use DevExpress.common.grids.ColumnFixingTexts instead */ + export type ColumnFixingTexts = common.grids.ColumnFixingTexts; + /** @deprecated Use DevExpress.common.grids.ColumnHeaderFilter instead */ + export type ColumnHeaderFilter = common.grids.ColumnHeaderFilter; + /** @deprecated Use DevExpress.common.grids.ColumnLookup instead */ + export type ColumnLookup = common.grids.ColumnLookup; + /** @deprecated Use DevExpress.common.grids.DataChange instead */ + export type DataChange = common.grids.DataChange; + /** @deprecated Use DevExpress.common.grids.FilterPanelTexts instead */ + export type FilterPanelTexts = common.grids.FilterPanelTexts; + /** @deprecated Use DevExpress.common.grids.FilterRow instead */ + export type FilterRow = common.grids.FilterRow; + /** @deprecated Use DevExpress.common.grids.FilterRowOperationDescriptions instead */ + export type FilterRowOperationDescriptions = common.grids.FilterRowOperationDescriptions; + /** @deprecated Use DevExpress.common.grids.HeaderFilter instead */ + export type HeaderFilter = common.grids.HeaderFilter; + /** @deprecated Use DevExpress.common.grids.HeaderFilterGroupInterval instead */ + export type HeaderFilterGroupInterval = common.grids.HeaderFilterGroupInterval; + /** @deprecated Use DevExpress.common.grids.HeaderFilterTexts instead */ + export type HeaderFilterTexts = common.grids.HeaderFilterTexts; + /** @deprecated Use DevExpress.common.grids.KeyboardNavigation instead */ + export type KeyboardNavigation = common.grids.KeyboardNavigation; + /** @deprecated Use DevExpress.common.grids.LoadPanel instead */ + export type LoadPanel = common.grids.LoadPanel; + /** @deprecated Use DevExpress.common.grids.Pager instead */ + export type Pager = common.grids.Pager; + /** @deprecated Use DevExpress.common.grids.RowDraggingTemplateData instead */ + export type RowDraggingTemplateData = common.grids.RowDraggingTemplateData; + /** @deprecated Use DevExpress.common.grids.RowDraggingTemplateData instead */ + export type RowDraggingTemplateDataModel = common.grids.RowDraggingTemplateData; + /** @deprecated Use DevExpress.common.grids.SearchPanel instead */ + export type SearchPanel = common.grids.SearchPanel; + /** @deprecated Use DevExpress.common.grids.Sorting instead */ + export type Sorting = common.grids.Sorting; + /** @deprecated Use DevExpress.common.grids.StateStoring instead */ + export type StateStoring = common.grids.StateStoring; + + /** @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 type AdaptiveDetailRowPreparingInfo = common.grids.AdaptiveDetailRowPreparingInfo; + /** @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 type DataChangeInfo = common.grids.DataChangeInfo; + /** @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 type DataErrorOccurredInfo = common.grids.DataErrorOccurredInfo; + /** @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 type DragDropInfo = common.grids.DragDropInfo; + /** @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 type DragReorderInfo = common.grids.DragReorderInfo; + /** @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 type DragStartEventInfo = common.grids.DragStartEventInfo; + /** @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 type KeyDownInfo = common.grids.KeyDownInfo; + /** @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 type NewRowInfo = common.grids.NewRowInfo; + /** @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 type PagingBase = common.grids.PagingBase; + /** @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 type RowDraggingEventInfo = common.grids.RowDraggingEventInfo; + /** @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 type RowInsertedInfo = common.grids.RowInsertedInfo; + /** @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 type RowInsertingInfo = common.grids.RowInsertingInfo; + /** @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 type RowKeyInfo = common.grids.RowKeyInfo; + /** @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 type RowRemovedInfo = common.grids.RowRemovedInfo; + /** @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 type RowRemovingInfo = common.grids.RowRemovingInfo; + /** @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 type RowUpdatedInfo = common.grids.RowUpdatedInfo; + /** @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 type RowUpdatingInfo = common.grids.RowUpdatingInfo; + /** @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 type RowValidatingInfo = common.grids.RowValidatingInfo; + /** @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 type SavingInfo = common.grids.SavingInfo; + /** @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 type SelectionChangedInfo = common.grids.SelectionChangedInfo; + /** @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 type ToolbarPreparingInfo = common.grids.ToolbarPreparingInfo; +} + +declare namespace DevExpress.common.charts { + /** @deprecated Use DevExpress.common.grids.ApplyChangesMode instead */ + export type ApplyChangesMode = grids.ApplyChangesMode; + /** @deprecated Use DevExpress.common.grids.ApplyFilterMode instead */ + export type ApplyFilterMode = grids.ApplyFilterMode; + /** @deprecated Use DevExpress.common.grids.ColumnChooserMode instead */ + export type ColumnChooserMode = grids.ColumnChooserMode; + /** @deprecated Use DevExpress.common.grids.ColumnResizeMode instead */ + export type ColumnResizeMode = grids.ColumnResizeMode; + /** @deprecated Use DevExpress.common.grids.DataChangeType instead */ + export type DataChangeType = grids.DataChangeType; + /** @deprecated Use DevExpress.common.grids.DataRenderMode instead */ + export type DataRenderMode = grids.DataRenderMode; + /** @deprecated Use DevExpress.common.grids.EnterKeyAction instead */ + export type EnterKeyAction = grids.EnterKeyAction; + /** @deprecated Use DevExpress.common.grids.EnterKeyDirection instead */ + export type EnterKeyDirection = grids.EnterKeyDirection; + /** @deprecated Use DevExpress.common.grids.FilterOperation instead */ + export type FilterOperation = grids.FilterOperation; + /** @deprecated Use DevExpress.common.grids.FilterType instead */ + export type FilterType = grids.FilterType; + /** @deprecated Use DevExpress.common.grids.GridsEditMode instead */ + export type GridsEditMode = grids.GridsEditMode; + /** @deprecated Use DevExpress.common.grids.GridsEditRefreshMode instead */ + export type GridsEditRefreshMode = grids.GridsEditRefreshMode; + /** @deprecated Use DevExpress.common.grids.GroupExpandMode instead */ + export type GroupExpandMode = grids.GroupExpandMode; + /** @deprecated Use DevExpress.common.grids.NewRowPosition instead */ + export type NewRowPosition = grids.NewRowPosition; + /** @deprecated Use DevExpress.common.DisplayMode instead */ + export type PagerDisplayMode = DisplayMode; + /** @deprecated Use DevExpress.common.grids.PagerPageSize instead */ + export type PagerPageSize = grids.PagerPageSize; + /** @deprecated Use DevExpress.common.grids.SelectedFilterOperation instead */ + export type SelectedFilterOperation = grids.SelectedFilterOperation; + /** @deprecated Use DevExpress.common.grids.SelectionColumnDisplayMode instead */ + export type SelectionColumnDisplayMode = grids.SelectionColumnDisplayMode; + /** @deprecated Use DevExpress.common.grids.StartEditAction instead */ + export type StartEditAction = grids.StartEditAction; + /** @deprecated Use DevExpress.common.grids.StateStoreType instead */ + export type StateStoreType = grids.StateStoreType; + /** @deprecated Use DevExpress.common.grids.SummaryType instead */ + export type SummaryType = grids.SummaryType; } // v22.2 -declare module DevExpress { - /** @deprecated Use DevExpress.GlobalConfig instead */ - export type globalConfig = DevExpress.common.GlobalConfig; -} - -declare module DevExpress.ui { - /** @deprecated Use DevExpress.common.AsyncRule instead */ - export type AsyncRule = DevExpress.common.AsyncRule; - /** @deprecated Use DevExpress.common.CompareRule instead */ - export type CompareRule = DevExpress.common.CompareRule; - /** @deprecated Use DevExpress.common.CustomRule instead */ - export type CustomRule = DevExpress.common.CustomRule; - /** @deprecated Use DevExpress.common.EmailRule instead */ - export type EmailRule = DevExpress.common.EmailRule; - /** @deprecated Use DevExpress.common.NumericRule instead */ - export type NumericRule = DevExpress.common.NumericRule; - /** @deprecated Use DevExpress.common.PatternRule instead */ - export type PatternRule = DevExpress.common.PatternRule; - /** @deprecated Use DevExpress.common.RangeRule instead */ - export type RangeRule = DevExpress.common.RangeRule; - /** @deprecated Use DevExpress.common.RequiredRule instead */ - export type RequiredRule = DevExpress.common.RequiredRule; - /** @deprecated Use DevExpress.common.StringLengthRule instead */ - export type StringLengthRule = DevExpress.common.StringLengthRule; - /** @deprecated Use DevExpress.common.ValidationCallbackData instead */ - export type ValidationCallbackData = DevExpress.common.ValidationCallbackData; - /** @deprecated Use DevExpress.common.ValidationRule instead */ - export type ValidationRule = DevExpress.common.ValidationRule; - /** @deprecated Use DevExpress.common.ValidationRuleType instead */ - export type ValidationRuleType = DevExpress.common.ValidationRuleType; -} - -declare module DevExpress.viz { - /** @deprecated Use DevExpress.common.charts.ScaleBreak instead */ - export type ScaleBreak = DevExpress.common.charts.ScaleBreak - /** @deprecated Use DevExpress.common.charts.SeriesType instead */ - export type SeriesType = DevExpress.common.charts.SeriesType - /** @deprecated Use DevExpress.common.charts.VisualRange instead */ - export type VisualRange = DevExpress.common.charts.VisualRange - /** @deprecated Use DevExpress.common.charts.TimeIntervalConfig instead */ - export type VizTimeInterval = DevExpress.common.charts.TimeIntervalConfig - /** @deprecated Use DevExpress.common.charts.SeriesPoint instead */ - export type dxChartSeriesTypesCommonSeriesPoint = DevExpress.common.charts.SeriesPoint; - /** @deprecated Use DevExpress.common.charts.SeriesLabel instead */ - export type dxChartSeriesTypesCommonSeriesLabel = DevExpress.common.charts.SeriesLabel; - /** @deprecated Use DevExpress.common.charts.LegendItem instead */ - export type BaseChartLegendItem = DevExpress.common.charts.LegendItem; +declare namespace DevExpress { + /** @deprecated Use DevExpress.GlobalConfig instead */ + export type globalConfig = common.GlobalConfig; +} + +declare namespace DevExpress.ui { + /** @deprecated Use DevExpress.common.AsyncRule instead */ + export type AsyncRule = common.AsyncRule; + /** @deprecated Use DevExpress.common.CompareRule instead */ + export type CompareRule = common.CompareRule; + /** @deprecated Use DevExpress.common.CustomRule instead */ + export type CustomRule = common.CustomRule; + /** @deprecated Use DevExpress.common.EmailRule instead */ + export type EmailRule = common.EmailRule; + /** @deprecated Use DevExpress.common.NumericRule instead */ + export type NumericRule = common.NumericRule; + /** @deprecated Use DevExpress.common.PatternRule instead */ + export type PatternRule = common.PatternRule; + /** @deprecated Use DevExpress.common.RangeRule instead */ + export type RangeRule = common.RangeRule; + /** @deprecated Use DevExpress.common.RequiredRule instead */ + export type RequiredRule = common.RequiredRule; + /** @deprecated Use DevExpress.common.StringLengthRule instead */ + export type StringLengthRule = common.StringLengthRule; + /** @deprecated Use DevExpress.common.ValidationCallbackData instead */ + export type ValidationCallbackData = common.ValidationCallbackData; + /** @deprecated Use DevExpress.common.ValidationRule instead */ + export type ValidationRule = common.ValidationRule; + /** @deprecated Use DevExpress.common.ValidationRuleType instead */ + export type ValidationRuleType = common.ValidationRuleType; +} + +declare namespace DevExpress.viz { + /** @deprecated Use DevExpress.common.charts.ScaleBreak instead */ + export type ScaleBreak = common.charts.ScaleBreak; + /** @deprecated Use DevExpress.common.charts.SeriesType instead */ + export type SeriesType = common.charts.SeriesType; + /** @deprecated Use DevExpress.common.charts.VisualRange instead */ + export type VisualRange = common.charts.VisualRange; + /** @deprecated Use DevExpress.common.charts.TimeIntervalConfig instead */ + export type VizTimeInterval = common.charts.TimeIntervalConfig; + /** @deprecated Use DevExpress.common.charts.SeriesPoint instead */ + export type dxChartSeriesTypesCommonSeriesPoint = common.charts.SeriesPoint; + /** @deprecated Use DevExpress.common.charts.SeriesLabel instead */ + export type dxChartSeriesTypesCommonSeriesLabel = common.charts.SeriesLabel; + /** @deprecated Use DevExpress.common.charts.LegendItem instead */ + export type BaseChartLegendItem = common.charts.LegendItem; } declare namespace DevExpress.data { - /** @deprecated Use DevExpress.data.Store.Options instead */ - export type StoreOptions = Store.Options; + /** @deprecated Use DevExpress.common.data.StoreOptions instead */ + export type StoreOptions = common.data.StoreOptions; } // v23.1 -declare module DevExpress.ui.dxSlider { - /** @deprecated Use DevExpress.common.SliderValueChangeMode instead */ - export type ValueChangeMode = DevExpress.common.SliderValueChangeMode; +declare namespace DevExpress.ui.dxSlider { + /** @deprecated Use DevExpress.common.SliderValueChangeMode instead */ + export type ValueChangeMode = common.SliderValueChangeMode; } -declare module DevExpress.viz.dxFunnel { - /** @deprecated Use DevExpress.common.charts.ShiftLabelOverlap instead */ - export type FunnelLabelOverlap = DevExpress.common.charts.ShiftLabelOverlap; +declare namespace DevExpress.viz.dxFunnel { + /** @deprecated Use DevExpress.common.charts.ShiftLabelOverlap instead */ + export type FunnelLabelOverlap = common.charts.ShiftLabelOverlap; } -declare module DevExpress.viz.dxPieChart { - /** @deprecated Use DevExpress.common.charts.ShiftLabelOverlap instead */ - export type PieChartLabelOverlap = DevExpress.common.charts.ShiftLabelOverlap; +declare namespace DevExpress.viz.dxPieChart { + /** @deprecated Use DevExpress.common.charts.ShiftLabelOverlap instead */ + export type PieChartLabelOverlap = common.charts.ShiftLabelOverlap; } -declare module DevExpress.viz { +declare namespace DevExpress.viz { - /** @deprecated Use DevExpress.viz.dxBarGauge.Legend instead */ - export type dxBarGaugeLegend = DevExpress.viz.dxBarGauge.Legend; + /** @deprecated Use DevExpress.viz.dxBarGauge.Legend instead */ + export type dxBarGaugeLegend = dxBarGauge.Legend; - /** @deprecated Use DevExpress.viz.dxBarGauge.LoadingIndicator instead */ - export type dxBarGaugeLoadingIndicator = DevExpress.viz.dxBarGauge.LoadingIndicator; + /** @deprecated Use DevExpress.viz.dxBarGauge.LoadingIndicator instead */ + export type dxBarGaugeLoadingIndicator = dxBarGauge.LoadingIndicator; - /** @deprecated Use DevExpress.viz.dxBarGauge.Tooltip instead */ - export type dxBarGaugeTooltip = DevExpress.viz.dxBarGauge.Tooltip; + /** @deprecated Use DevExpress.viz.dxBarGauge.Tooltip instead */ + export type dxBarGaugeTooltip = dxBarGauge.Tooltip; - /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxis instead */ - export type dxChartArgumentAxis = DevExpress.viz.dxChart.ArgumentAxis; + /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxis instead */ + export type dxChartArgumentAxis = dxChart.ArgumentAxis; - /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisConstantLines instead */ - export type dxChartArgumentAxisConstantLines = DevExpress.viz.dxChart.ArgumentAxisConstantLines; + /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisConstantLines instead */ + export type dxChartArgumentAxisConstantLines = dxChart.ArgumentAxisConstantLines; - /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisConstantLinesLabel instead */ - export type dxChartArgumentAxisConstantLinesLabel = DevExpress.viz.dxChart.ArgumentAxisConstantLinesLabel; + /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisConstantLinesLabel instead */ + export type dxChartArgumentAxisConstantLinesLabel = dxChart.ArgumentAxisConstantLinesLabel; - /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisConstantLineStyle instead */ - export type dxChartArgumentAxisConstantLineStyle = DevExpress.viz.dxChart.ArgumentAxisConstantLineStyle; + /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisConstantLineStyle instead */ + export type dxChartArgumentAxisConstantLineStyle = dxChart.ArgumentAxisConstantLineStyle; - /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisConstantLineStyleLabel instead */ - export type dxChartArgumentAxisConstantLineStyleLabel = DevExpress.viz.dxChart.ArgumentAxisConstantLineStyleLabel; + /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisConstantLineStyleLabel instead */ + export type dxChartArgumentAxisConstantLineStyleLabel = dxChart.ArgumentAxisConstantLineStyleLabel; - /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisLabel instead */ - export type dxChartArgumentAxisLabel = DevExpress.viz.dxChart.ArgumentAxisLabel; + /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisLabel instead */ + export type dxChartArgumentAxisLabel = dxChart.ArgumentAxisLabel; - /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisStrips instead */ - export type dxChartArgumentAxisStrips = DevExpress.viz.dxChart.ArgumentAxisStrips; + /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisStrips instead */ + export type dxChartArgumentAxisStrips = dxChart.ArgumentAxisStrips; - /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisStripsLabel instead */ - export type dxChartArgumentAxisStripsLabel = DevExpress.viz.dxChart.ArgumentAxisStripsLabel; + /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisStripsLabel instead */ + export type dxChartArgumentAxisStripsLabel = dxChart.ArgumentAxisStripsLabel; - /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisTitle instead */ - export type dxChartArgumentAxisTitle = DevExpress.viz.dxChart.ArgumentAxisTitle; + /** @deprecated Use DevExpress.viz.dxChart.ArgumentAxisTitle instead */ + export type dxChartArgumentAxisTitle = dxChart.ArgumentAxisTitle; - /** @deprecated Use DevExpress.viz.dxChart.CommonAxisSettings instead */ - export type dxChartCommonAxisSettings = DevExpress.viz.dxChart.CommonAxisSettings; + /** @deprecated Use DevExpress.viz.dxChart.CommonAxisSettings instead */ + export type dxChartCommonAxisSettings = dxChart.CommonAxisSettings; - /** @deprecated Use DevExpress.viz.dxChart.CommonAxisSettingsConstantLineStyle instead */ - export type dxChartCommonAxisSettingsConstantLineStyle = DevExpress.viz.dxChart.CommonAxisSettingsConstantLineStyle; + /** @deprecated Use DevExpress.viz.dxChart.CommonAxisSettingsConstantLineStyle instead */ + export type dxChartCommonAxisSettingsConstantLineStyle = dxChart.CommonAxisSettingsConstantLineStyle; - /** @deprecated Use DevExpress.viz.dxChart.CommonAxisSettingsConstantLineStyleLabel instead */ - export type dxChartCommonAxisSettingsConstantLineStyleLabel = DevExpress.viz.dxChart.CommonAxisSettingsConstantLineStyleLabel; + /** @deprecated Use DevExpress.viz.dxChart.CommonAxisSettingsConstantLineStyleLabel instead */ + export type dxChartCommonAxisSettingsConstantLineStyleLabel = dxChart.CommonAxisSettingsConstantLineStyleLabel; - /** @deprecated Use DevExpress.viz.dxChart.CommonAxisSettingsLabel instead */ - export type dxChartCommonAxisSettingsLabel = DevExpress.viz.dxChart.CommonAxisSettingsLabel; + /** @deprecated Use DevExpress.viz.dxChart.CommonAxisSettingsLabel instead */ + export type dxChartCommonAxisSettingsLabel = dxChart.CommonAxisSettingsLabel; - /** @deprecated Use DevExpress.viz.dxChart.CommonAxisSettingsStripStyle instead */ - export type dxChartCommonAxisSettingsStripStyle = DevExpress.viz.dxChart.CommonAxisSettingsStripStyle; + /** @deprecated Use DevExpress.viz.dxChart.CommonAxisSettingsStripStyle instead */ + export type dxChartCommonAxisSettingsStripStyle = dxChart.CommonAxisSettingsStripStyle; - /** @deprecated Use DevExpress.viz.dxChart.CommonAxisSettingsStripStyleLabel instead */ - export type dxChartCommonAxisSettingsStripStyleLabel = DevExpress.viz.dxChart.CommonAxisSettingsStripStyleLabel; + /** @deprecated Use DevExpress.viz.dxChart.CommonAxisSettingsStripStyleLabel instead */ + export type dxChartCommonAxisSettingsStripStyleLabel = dxChart.CommonAxisSettingsStripStyleLabel; - /** @deprecated Use DevExpress.viz.dxChart.CommonAxisSettingsTitle instead */ - export type dxChartCommonAxisSettingsTitle = DevExpress.viz.dxChart.CommonAxisSettingsTitle; + /** @deprecated Use DevExpress.viz.dxChart.CommonAxisSettingsTitle instead */ + export type dxChartCommonAxisSettingsTitle = dxChart.CommonAxisSettingsTitle; - /** @deprecated Use DevExpress.viz.dxChart.CommonPaneSettings instead */ - export type dxChartCommonPaneSettings = DevExpress.viz.dxChart.CommonPaneSettings; + /** @deprecated Use DevExpress.viz.dxChart.CommonPaneSettings instead */ + export type dxChartCommonPaneSettings = dxChart.CommonPaneSettings; - /** @deprecated Use DevExpress.viz.dxChart.CommonSeriesSettings instead */ - export type dxChartCommonSeriesSettings = DevExpress.viz.dxChart.CommonSeriesSettings; + /** @deprecated Use DevExpress.viz.dxChart.CommonSeriesSettings instead */ + export type dxChartCommonSeriesSettings = dxChart.CommonSeriesSettings; - /** @deprecated Use DevExpress.viz.dxChart.Legend instead */ - export type dxChartLegend = DevExpress.viz.dxChart.Legend; + /** @deprecated Use DevExpress.viz.dxChart.Legend instead */ + export type dxChartLegend = dxChart.Legend; - /** @deprecated Use DevExpress.viz.dxChart.Panes instead */ - export type dxChartPanes = DevExpress.viz.dxChart.Panes; + /** @deprecated Use DevExpress.viz.dxChart.Panes instead */ + export type dxChartPanes = dxChart.Panes; - /** @deprecated Use DevExpress.viz.dxChart.Tooltip instead */ - export type dxChartTooltip = DevExpress.viz.dxChart.Tooltip; + /** @deprecated Use DevExpress.viz.dxChart.Tooltip instead */ + export type dxChartTooltip = dxChart.Tooltip; - /** @deprecated Use DevExpress.viz.dxChart.ValueAxis instead */ - export type dxChartValueAxis = DevExpress.viz.dxChart.ValueAxis; + /** @deprecated Use DevExpress.viz.dxChart.ValueAxis instead */ + export type dxChartValueAxis = dxChart.ValueAxis; - /** @deprecated Use DevExpress.viz.dxChart.ValueAxisConstantLines instead */ - export type dxChartValueAxisConstantLines = DevExpress.viz.dxChart.ValueAxisConstantLines; + /** @deprecated Use DevExpress.viz.dxChart.ValueAxisConstantLines instead */ + export type dxChartValueAxisConstantLines = dxChart.ValueAxisConstantLines; - /** @deprecated Use DevExpress.viz.dxChart.ValueAxisConstantLinesLabel instead */ - export type dxChartValueAxisConstantLinesLabel = DevExpress.viz.dxChart.ValueAxisConstantLinesLabel; + /** @deprecated Use DevExpress.viz.dxChart.ValueAxisConstantLinesLabel instead */ + export type dxChartValueAxisConstantLinesLabel = dxChart.ValueAxisConstantLinesLabel; - /** @deprecated Use DevExpress.viz.dxChart.ValueAxisConstantLineStyle instead */ - export type dxChartValueAxisConstantLineStyle = DevExpress.viz.dxChart.ValueAxisConstantLineStyle; + /** @deprecated Use DevExpress.viz.dxChart.ValueAxisConstantLineStyle instead */ + export type dxChartValueAxisConstantLineStyle = dxChart.ValueAxisConstantLineStyle; - /** @deprecated Use DevExpress.viz.dxChart.ValueAxisConstantLineStyleLabel instead */ - export type dxChartValueAxisConstantLineStyleLabel = DevExpress.viz.dxChart.ValueAxisConstantLineStyleLabel; + /** @deprecated Use DevExpress.viz.dxChart.ValueAxisConstantLineStyleLabel instead */ + export type dxChartValueAxisConstantLineStyleLabel = dxChart.ValueAxisConstantLineStyleLabel; - /** @deprecated Use DevExpress.viz.dxChart.ValueAxisLabel instead */ - export type dxChartValueAxisLabel = DevExpress.viz.dxChart.ValueAxisLabel; + /** @deprecated Use DevExpress.viz.dxChart.ValueAxisLabel instead */ + export type dxChartValueAxisLabel = dxChart.ValueAxisLabel; - /** @deprecated Use DevExpress.viz.dxChart.ValueAxisStrips instead */ - export type dxChartValueAxisStrips = DevExpress.viz.dxChart.ValueAxisStrips; + /** @deprecated Use DevExpress.viz.dxChart.ValueAxisStrips instead */ + export type dxChartValueAxisStrips = dxChart.ValueAxisStrips; - /** @deprecated Use DevExpress.viz.dxChart.ValueAxisStripsLabel instead */ - export type dxChartValueAxisStripsLabel = DevExpress.viz.dxChart.ValueAxisStripsLabel; + /** @deprecated Use DevExpress.viz.dxChart.ValueAxisStripsLabel instead */ + export type dxChartValueAxisStripsLabel = dxChart.ValueAxisStripsLabel; - /** @deprecated Use DevExpress.viz.dxChart.ValueAxisTitle instead */ - export type dxChartValueAxisTitle = DevExpress.viz.dxChart.ValueAxisTitle; + /** @deprecated Use DevExpress.viz.dxChart.ValueAxisTitle instead */ + export type dxChartValueAxisTitle = dxChart.ValueAxisTitle; - /** @deprecated Use DevExpress.viz.dxPolarChart.AdaptiveLayout instead */ - export type dxPolarChartAdaptiveLayout = DevExpress.viz.dxPolarChart.AdaptiveLayout; + /** @deprecated Use DevExpress.viz.dxPolarChart.AdaptiveLayout instead */ + export type dxPolarChartAdaptiveLayout = dxPolarChart.AdaptiveLayout; - /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxis instead */ - export type dxPolarChartArgumentAxis = DevExpress.viz.dxPolarChart.ArgumentAxis; + /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxis instead */ + export type dxPolarChartArgumentAxis = dxPolarChart.ArgumentAxis; - /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxisConstantLines instead */ - export type dxPolarChartArgumentAxisConstantLines = DevExpress.viz.dxPolarChart.ArgumentAxisConstantLines; + /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxisConstantLines instead */ + export type dxPolarChartArgumentAxisConstantLines = dxPolarChart.ArgumentAxisConstantLines; - /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxisConstantLinesLabel instead */ - export type dxPolarChartArgumentAxisConstantLinesLabel = DevExpress.viz.dxPolarChart.ArgumentAxisConstantLinesLabel; + /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxisConstantLinesLabel instead */ + export type dxPolarChartArgumentAxisConstantLinesLabel = dxPolarChart.ArgumentAxisConstantLinesLabel; - /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxisLabel instead */ - export type dxPolarChartArgumentAxisLabel = DevExpress.viz.dxPolarChart.ArgumentAxisLabel; + /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxisLabel instead */ + export type dxPolarChartArgumentAxisLabel = dxPolarChart.ArgumentAxisLabel; - /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxisMinorTick instead */ - export type dxPolarChartArgumentAxisMinorTick = DevExpress.viz.dxPolarChart.ArgumentAxisMinorTick; + /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxisMinorTick instead */ + export type dxPolarChartArgumentAxisMinorTick = dxPolarChart.ArgumentAxisMinorTick; - /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxisStrips instead */ - export type dxPolarChartArgumentAxisStrips = DevExpress.viz.dxPolarChart.ArgumentAxisStrips; + /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxisStrips instead */ + export type dxPolarChartArgumentAxisStrips = dxPolarChart.ArgumentAxisStrips; - /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxisStripsLabel instead */ - export type dxPolarChartArgumentAxisStripsLabel = DevExpress.viz.dxPolarChart.ArgumentAxisStripsLabel; + /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxisStripsLabel instead */ + export type dxPolarChartArgumentAxisStripsLabel = dxPolarChart.ArgumentAxisStripsLabel; - /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxisTick instead */ - export type dxPolarChartArgumentAxisTick = DevExpress.viz.dxPolarChart.ArgumentAxisTick; + /** @deprecated Use DevExpress.viz.dxPolarChart.ArgumentAxisTick instead */ + export type dxPolarChartArgumentAxisTick = dxPolarChart.ArgumentAxisTick; - /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettings instead */ - export type dxPolarChartCommonAxisSettings = DevExpress.viz.dxPolarChart.CommonAxisSettings; + /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettings instead */ + export type dxPolarChartCommonAxisSettings = dxPolarChart.CommonAxisSettings; - /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettingsConstantLineStyle instead */ - export type dxPolarChartCommonAxisSettingsConstantLineStyle = DevExpress.viz.dxPolarChart.CommonAxisSettingsConstantLineStyle; + /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettingsConstantLineStyle instead */ + export type dxPolarChartCommonAxisSettingsConstantLineStyle = dxPolarChart.CommonAxisSettingsConstantLineStyle; - /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettingsConstantLineStyleLabel instead */ - export type dxPolarChartCommonAxisSettingsConstantLineStyleLabel = DevExpress.viz.dxPolarChart.CommonAxisSettingsConstantLineStyleLabel; + /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettingsConstantLineStyleLabel instead */ + export type dxPolarChartCommonAxisSettingsConstantLineStyleLabel = dxPolarChart.CommonAxisSettingsConstantLineStyleLabel; - /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettingsLabel instead */ - export type dxPolarChartCommonAxisSettingsLabel = DevExpress.viz.dxPolarChart.CommonAxisSettingsLabel; + /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettingsLabel instead */ + export type dxPolarChartCommonAxisSettingsLabel = dxPolarChart.CommonAxisSettingsLabel; - /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettingsMinorTick instead */ - export type dxPolarChartCommonAxisSettingsMinorTick = DevExpress.viz.dxPolarChart.CommonAxisSettingsMinorTick; + /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettingsMinorTick instead */ + export type dxPolarChartCommonAxisSettingsMinorTick = dxPolarChart.CommonAxisSettingsMinorTick; - /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettingsStripStyle instead */ - export type dxPolarChartCommonAxisSettingsStripStyle = DevExpress.viz.dxPolarChart.CommonAxisSettingsStripStyle; + /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettingsStripStyle instead */ + export type dxPolarChartCommonAxisSettingsStripStyle = dxPolarChart.CommonAxisSettingsStripStyle; - /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettingsStripStyleLabel instead */ - export type dxPolarChartCommonAxisSettingsStripStyleLabel = DevExpress.viz.dxPolarChart.CommonAxisSettingsStripStyleLabel; + /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettingsStripStyleLabel instead */ + export type dxPolarChartCommonAxisSettingsStripStyleLabel = dxPolarChart.CommonAxisSettingsStripStyleLabel; - /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettingsTick instead */ - export type dxPolarChartCommonAxisSettingsTick = DevExpress.viz.dxPolarChart.CommonAxisSettingsTick; + /** @deprecated Use DevExpress.viz.dxPolarChart.CommonAxisSettingsTick instead */ + export type dxPolarChartCommonAxisSettingsTick = dxPolarChart.CommonAxisSettingsTick; - /** @deprecated Use DevExpress.viz.dxPolarChart.CommonSeriesSettings instead */ - export type dxPolarChartCommonSeriesSettings = DevExpress.viz.dxPolarChart.CommonSeriesSettings; + /** @deprecated Use DevExpress.viz.dxPolarChart.CommonSeriesSettings instead */ + export type dxPolarChartCommonSeriesSettings = dxPolarChart.CommonSeriesSettings; - /** @deprecated Use DevExpress.viz.dxPolarChart.Legend instead */ - export type dxPolarChartLegend = DevExpress.viz.dxPolarChart.Legend; + /** @deprecated Use DevExpress.viz.dxPolarChart.Legend instead */ + export type dxPolarChartLegend = dxPolarChart.Legend; - /** @deprecated Use DevExpress.viz.dxPolarChart.Tooltip instead */ - export type dxPolarChartTooltip = DevExpress.viz.dxPolarChart.Tooltip; + /** @deprecated Use DevExpress.viz.dxPolarChart.Tooltip instead */ + export type dxPolarChartTooltip = dxPolarChart.Tooltip; - /** @deprecated Use DevExpress.viz.dxPolarChart.ValueAxis instead */ - export type dxPolarChartValueAxis = DevExpress.viz.dxPolarChart.ValueAxis; + /** @deprecated Use DevExpress.viz.dxPolarChart.ValueAxis instead */ + export type dxPolarChartValueAxis = dxPolarChart.ValueAxis; - /** @deprecated Use DevExpress.viz.dxPolarChart.ValueAxisConstantLines instead */ - export type dxPolarChartValueAxisConstantLines = DevExpress.viz.dxPolarChart.ValueAxisConstantLines; + /** @deprecated Use DevExpress.viz.dxPolarChart.ValueAxisConstantLines instead */ + export type dxPolarChartValueAxisConstantLines = dxPolarChart.ValueAxisConstantLines; - /** @deprecated Use DevExpress.viz.dxPolarChart.ValueAxisConstantLinesLabel instead */ - export type dxPolarChartValueAxisConstantLinesLabel = DevExpress.viz.dxPolarChart.ValueAxisConstantLinesLabel; + /** @deprecated Use DevExpress.viz.dxPolarChart.ValueAxisConstantLinesLabel instead */ + export type dxPolarChartValueAxisConstantLinesLabel = dxPolarChart.ValueAxisConstantLinesLabel; - /** @deprecated Use DevExpress.viz.dxPolarChart.ValueAxisLabel instead */ - export type dxPolarChartValueAxisLabel = DevExpress.viz.dxPolarChart.ValueAxisLabel; + /** @deprecated Use DevExpress.viz.dxPolarChart.ValueAxisLabel instead */ + export type dxPolarChartValueAxisLabel = dxPolarChart.ValueAxisLabel; - /** @deprecated Use DevExpress.viz.dxPolarChart.ValueAxisStrips instead */ - export type dxPolarChartValueAxisStrips = DevExpress.viz.dxPolarChart.ValueAxisStrips; + /** @deprecated Use DevExpress.viz.dxPolarChart.ValueAxisStrips instead */ + export type dxPolarChartValueAxisStrips = dxPolarChart.ValueAxisStrips; - /** @deprecated Use DevExpress.viz.dxPolarChart.ValueAxisStripsLabel instead */ - export type dxPolarChartValueAxisStripsLabel = DevExpress.viz.dxPolarChart.ValueAxisStripsLabel; + /** @deprecated Use DevExpress.viz.dxPolarChart.ValueAxisStripsLabel instead */ + export type dxPolarChartValueAxisStripsLabel = dxPolarChart.ValueAxisStripsLabel; - /** @deprecated Use DevExpress.viz.dxPolarChart.ValueAxisTick instead */ - export type dxPolarChartValueAxisTick = DevExpress.viz.dxPolarChart.ValueAxisTick; + /** @deprecated Use DevExpress.viz.dxPolarChart.ValueAxisTick instead */ + export type dxPolarChartValueAxisTick = dxPolarChart.ValueAxisTick; - /** @deprecated Use DevExpress.viz.dxCircularGauge.RangeContainer instead */ - export type dxCircularGaugeRangeContainer = DevExpress.viz.dxCircularGauge.RangeContainer; + /** @deprecated Use DevExpress.viz.dxCircularGauge.RangeContainer instead */ + export type dxCircularGaugeRangeContainer = dxCircularGauge.RangeContainer; - /** @deprecated Use DevExpress.viz.dxCircularGauge.Scale instead */ - export type dxCircularGaugeScale = DevExpress.viz.dxCircularGauge.Scale; + /** @deprecated Use DevExpress.viz.dxCircularGauge.Scale instead */ + export type dxCircularGaugeScale = dxCircularGauge.Scale; - /** @deprecated Use DevExpress.viz.dxCircularGauge.ScaleLabel instead */ - export type dxCircularGaugeScaleLabel = DevExpress.viz.dxCircularGauge.ScaleLabel; + /** @deprecated Use DevExpress.viz.dxCircularGauge.ScaleLabel instead */ + export type dxCircularGaugeScaleLabel = dxCircularGauge.ScaleLabel; - /** @deprecated Use DevExpress.viz.dxFunnel.Legend instead */ - export type dxFunnelLegend = DevExpress.viz.dxFunnel.Legend; + /** @deprecated Use DevExpress.viz.dxFunnel.Legend instead */ + export type dxFunnelLegend = dxFunnel.Legend; - /** @deprecated Use DevExpress.viz.dxFunnel.Tooltip instead */ - export type dxFunnelTooltip = DevExpress.viz.dxFunnel.Tooltip; + /** @deprecated Use DevExpress.viz.dxFunnel.Tooltip instead */ + export type dxFunnelTooltip = dxFunnel.Tooltip; - /** @deprecated Use DevExpress.viz.dxLinearGauge.RangeContainer instead */ - export type dxLinearGaugeRangeContainer = DevExpress.viz.dxLinearGauge.RangeContainer; + /** @deprecated Use DevExpress.viz.dxLinearGauge.RangeContainer instead */ + export type dxLinearGaugeRangeContainer = dxLinearGauge.RangeContainer; - /** @deprecated Use DevExpress.viz.dxLinearGauge.Scale instead */ - export type dxLinearGaugeScale = DevExpress.viz.dxLinearGauge.Scale; + /** @deprecated Use DevExpress.viz.dxLinearGauge.Scale instead */ + export type dxLinearGaugeScale = dxLinearGauge.Scale; - /** @deprecated Use DevExpress.viz.dxLinearGauge.ScaleLabel instead */ - export type dxLinearGaugeScaleLabel = DevExpress.viz.dxLinearGauge.ScaleLabel; + /** @deprecated Use DevExpress.viz.dxLinearGauge.ScaleLabel instead */ + export type dxLinearGaugeScaleLabel = dxLinearGauge.ScaleLabel; - /** @deprecated Use DevExpress.viz.dxPieChart.AdaptiveLayout instead */ - export type dxPieChartAdaptiveLayout = DevExpress.viz.dxPieChart.AdaptiveLayout; + /** @deprecated Use DevExpress.viz.dxPieChart.AdaptiveLayout instead */ + export type dxPieChartAdaptiveLayout = dxPieChart.AdaptiveLayout; - /** @deprecated Use DevExpress.viz.dxPieChart.Legend instead */ - export type dxPieChartLegend = DevExpress.viz.dxPieChart.Legend; + /** @deprecated Use DevExpress.viz.dxPieChart.Legend instead */ + export type dxPieChartLegend = dxPieChart.Legend; - /** @deprecated Use DevExpress.viz.dxSankey.Tooltip instead */ - export type dxSankeyTooltip = DevExpress.viz.dxSankey.Tooltip; + /** @deprecated Use DevExpress.viz.dxSankey.Tooltip instead */ + export type dxSankeyTooltip = dxSankey.Tooltip; - /** @deprecated Use DevExpress.viz.dxTreeMap.Tooltip instead */ - export type dxTreeMapTooltip = DevExpress.viz.dxTreeMap.Tooltip; + /** @deprecated Use DevExpress.viz.dxTreeMap.Tooltip instead */ + export type dxTreeMapTooltip = dxTreeMap.Tooltip; - /** @deprecated Use DevExpress.viz.dxVectorMap.Legend instead */ - export type dxVectorMapLegends = DevExpress.viz.dxVectorMap.Legend; + /** @deprecated Use DevExpress.viz.dxVectorMap.Legend instead */ + export type dxVectorMapLegends = dxVectorMap.Legend; - /** @deprecated Use DevExpress.viz.dxVectorMap.Tooltip instead */ - export type dxVectorMapTooltip = DevExpress.viz.dxVectorMap.Tooltip; + /** @deprecated Use DevExpress.viz.dxVectorMap.Tooltip instead */ + export type dxVectorMapTooltip = dxVectorMap.Tooltip; } -declare module DevExpress.ui { +declare namespace DevExpress.ui { - /** @deprecated Use DevExpress.ui.dxDataGrid.Editing instead */ - export type dxDataGridEditing = DevExpress.ui.dxDataGrid.Editing; + /** @deprecated Use DevExpress.ui.dxDataGrid.Editing instead */ + export type dxDataGridEditing = dxDataGrid.Editing; - /** @deprecated Use DevExpress.ui.dxDataGrid.Scrolling instead */ - export type dxDataGridScrolling = DevExpress.ui.dxDataGrid.Scrolling; + /** @deprecated Use DevExpress.ui.dxDataGrid.Scrolling instead */ + export type dxDataGridScrolling = dxDataGrid.Scrolling; - /** @deprecated Use DevExpress.ui.dxDataGrid.Selection instead */ - export type dxDataGridSelection = DevExpress.ui.dxDataGrid.Selection; + /** @deprecated Use DevExpress.ui.dxDataGrid.Selection instead */ + export type dxDataGridSelection = dxDataGrid.Selection; - /** @deprecated Use DevExpress.ui.dxTreeList.Editing instead */ - export type dxTreeListEditing = DevExpress.ui.dxTreeList.Editing; + /** @deprecated Use DevExpress.ui.dxTreeList.Editing instead */ + export type dxTreeListEditing = dxTreeList.Editing; - /** @deprecated Use DevExpress.ui.dxTreeList.Scrolling instead */ - export type dxTreeListScrolling = DevExpress.ui.dxTreeList.Scrolling; + /** @deprecated Use DevExpress.ui.dxTreeList.Scrolling instead */ + export type dxTreeListScrolling = dxTreeList.Scrolling; - /** @deprecated Use DevExpress.ui.dxTreeList.Selection instead */ - export type dxTreeListSelection = DevExpress.ui.dxTreeList.Selection; + /** @deprecated Use DevExpress.ui.dxTreeList.Selection instead */ + export type dxTreeListSelection = dxTreeList.Selection; - /** @deprecated Use DevExpress.ui.dxTreeList.EditingTexts instead */ - export type dxTreeListEditingTexts = DevExpress.ui.dxTreeList.EditingTexts; + /** @deprecated Use DevExpress.ui.dxTreeList.EditingTexts instead */ + export type dxTreeListEditingTexts = dxTreeList.EditingTexts; - /** @deprecated Use DevExpress.ui.dxTreeList.Paging instead */ - export type dxTreeListPaging = DevExpress.ui.dxTreeList.Paging; + /** @deprecated Use DevExpress.ui.dxTreeList.Paging instead */ + export type dxTreeListPaging = dxTreeList.Paging; - /** @deprecated Use DevExpress.ui.dxDataGrid.Column instead */ - export type GridBaseColumn = DevExpress.ui.dxDataGrid.ColumnBase; + /** @deprecated Use DevExpress.ui.dxDataGrid.Column instead */ + export type GridBaseColumn = dxDataGrid.ColumnBase; - /** @deprecated Use DevExpress.ui.dxDataGrid.ColumnButton instead */ - export type GridBaseColumnButton = DevExpress.ui.dxDataGrid.ColumnButtonBase; + /** @deprecated Use DevExpress.ui.dxDataGrid.ColumnButton instead */ + export type GridBaseColumnButton = dxDataGrid.ColumnButtonBase; - /** @deprecated Use DevExpress.ui.dxDataGrid.Editing instead */ - export type GridBaseEditing = DevExpress.ui.dxDataGrid.EditingBase; + /** @deprecated Use DevExpress.ui.dxDataGrid.Editing instead */ + export type GridBaseEditing = dxDataGrid.EditingBase; - /** @deprecated Use DevExpress.ui.dxDataGrid.EditingTexts instead */ - export type GridBaseEditingTexts = DevExpress.ui.dxDataGrid.EditingTextsBase; + /** @deprecated Use DevExpress.ui.dxDataGrid.EditingTexts instead */ + export type GridBaseEditingTexts = dxDataGrid.EditingTextsBase; - /** @deprecated Use DevExpress.ui.dxDataGrid.Paging instead */ - export type GridBasePaging = DevExpress.ui.dxDataGrid.Paging; + /** @deprecated Use DevExpress.ui.dxDataGrid.Paging instead */ + export type GridBasePaging = dxDataGrid.Paging; - /** @deprecated Use DevExpress.ui.dxDataGrid.Scrolling instead */ - export type GridBaseScrolling = DevExpress.ui.dxDataGrid.Scrolling; + /** @deprecated Use DevExpress.ui.dxDataGrid.Scrolling instead */ + export type GridBaseScrolling = dxDataGrid.Scrolling; - /** @deprecated Use DevExpress.ui.dxDataGrid.Selection instead */ - export type GridBaseSelection = DevExpress.ui.dxDataGrid.Selection; + /** @deprecated Use DevExpress.ui.dxDataGrid.Selection instead */ + export type GridBaseSelection = dxDataGrid.Selection; } -declare module DevExpress.ui.dxDataGrid { +declare namespace DevExpress.ui.dxDataGrid { - /** @deprecated Use DevExpress.ui.dxDataGrid.SortByGroupSummaryInfoItem instead */ - export type dxDataGridSortByGroupSummaryInfoItem = DevExpress.ui.dxDataGrid.SortByGroupSummaryInfoItem; + /** @deprecated Use DevExpress.ui.dxDataGrid.SortByGroupSummaryInfoItem instead */ + export type dxDataGridSortByGroupSummaryInfoItem = SortByGroupSummaryInfoItem; - /** @deprecated Use DevExpress.ui.dxDataGrid.EditingTexts instead */ - export type EditingTextsBase = DevExpress.ui.dxDataGrid.EditingTexts; + /** @deprecated Use DevExpress.ui.dxDataGrid.EditingTexts instead */ + export type EditingTextsBase = EditingTexts; } // v24.1 -declare module DevExpress.ui { - /** @deprecated DevExpress.ui.dxDiagram.CustomCommand instead */ - export type dxDiagramCustomCommand = DevExpress.ui.dxDiagram.CustomCommand; +declare namespace DevExpress.ui { + /** @deprecated DevExpress.ui.dxDiagram.CustomCommand instead */ + export type dxDiagramCustomCommand = dxDiagram.CustomCommand; } -declare module DevExpress.ui.dxDiagram { - /** @deprecated Use DevExpress.ui.dxDiagram.AutoZoomMode instead */ - export type DiagramAutoZoomMode = DevExpress.ui.dxDiagram.AutoZoomMode; +declare namespace DevExpress.ui.dxDiagram { + /** @deprecated Use DevExpress.ui.dxDiagram.AutoZoomMode instead */ + export type DiagramAutoZoomMode = AutoZoomMode; - /** @deprecated Use DevExpress.ui.dxDiagram.Command instead */ - export type DiagramCommand = DevExpress.ui.dxDiagram.Command; + /** @deprecated Use DevExpress.ui.dxDiagram.Command instead */ + export type DiagramCommand = Command; - /** @deprecated Use DevExpress.ui.dxDiagram.ConnectorLineEnd instead */ - export type DiagramConnectorLineEnd = DevExpress.ui.dxDiagram.ConnectorLineEnd; + /** @deprecated Use DevExpress.ui.dxDiagram.ConnectorLineEnd instead */ + export type DiagramConnectorLineEnd = ConnectorLineEnd; - /** @deprecated Use DevExpress.ui.dxDiagram.ConnectorLineType instead */ - export type DiagramConnectorLineType = DevExpress.ui.dxDiagram.ConnectorLineType; + /** @deprecated Use DevExpress.ui.dxDiagram.ConnectorLineType instead */ + export type DiagramConnectorLineType = ConnectorLineType; - /** @deprecated Use DevExpress.ui.dxDiagram.ConnectorPosition instead */ - export type DiagramConnectorPosition = DevExpress.ui.dxDiagram.ConnectorPosition; + /** @deprecated Use DevExpress.ui.dxDiagram.ConnectorPosition instead */ + export type DiagramConnectorPosition = ConnectorPosition; - /** @deprecated Use DevExpress.ui.dxDiagram.DataLayoutType instead */ - export type DiagramDataLayoutType = DevExpress.ui.dxDiagram.DataLayoutType; + /** @deprecated Use DevExpress.ui.dxDiagram.DataLayoutType instead */ + export type DiagramDataLayoutType = DataLayoutType; - /** @deprecated Use DevExpress.ui.dxDiagram.ItemType instead */ - export type DiagramItemType = DevExpress.ui.dxDiagram.ItemType; + /** @deprecated Use DevExpress.ui.dxDiagram.ItemType instead */ + export type DiagramItemType = ItemType; - /** @deprecated Use DevExpress.ui.dxDiagram.ModelOperation instead */ - export type DiagramModelOperation = DevExpress.ui.dxDiagram.ModelOperation; + /** @deprecated Use DevExpress.ui.dxDiagram.ModelOperation instead */ + export type DiagramModelOperation = ModelOperation; - /** @deprecated Use DevExpress.ui.dxDiagram.PanelVisibility instead */ - export type DiagramPanelVisibility = DevExpress.ui.dxDiagram.PanelVisibility; + /** @deprecated Use DevExpress.ui.dxDiagram.PanelVisibility instead */ + export type DiagramPanelVisibility = PanelVisibility; - /** @deprecated Use DevExpress.ui.dxDiagram.RequestEditOperationReason instead */ - export type DiagramRequestEditOperationReason = DevExpress.ui.dxDiagram.RequestEditOperationReason; + /** @deprecated Use DevExpress.ui.dxDiagram.RequestEditOperationReason instead */ + export type DiagramRequestEditOperationReason = RequestEditOperationReason; - /** @deprecated Use DevExpress.ui.dxDiagram.ShapeCategory instead */ - export type DiagramShapeCategory = DevExpress.ui.dxDiagram.ShapeCategory; + /** @deprecated Use DevExpress.ui.dxDiagram.ShapeCategory instead */ + export type DiagramShapeCategory = ShapeCategory; - /** @deprecated Use DevExpress.ui.dxDiagram.ShapeType instead */ - export type DiagramShapeType = DevExpress.ui.dxDiagram.ShapeType; + /** @deprecated Use DevExpress.ui.dxDiagram.ShapeType instead */ + export type DiagramShapeType = ShapeType; - /** @deprecated Use DevExpress.ui.dxDiagram.ToolboxDisplayMode instead */ - export type DiagramToolboxDisplayMode = DevExpress.ui.dxDiagram.ToolboxDisplayMode; + /** @deprecated Use DevExpress.ui.dxDiagram.ToolboxDisplayMode instead */ + export type DiagramToolboxDisplayMode = ToolboxDisplayMode; - /** @deprecated Use DevExpress.ui.dxDiagram.Units instead */ - export type DiagramUnits = DevExpress.ui.dxDiagram.Units; + /** @deprecated Use DevExpress.ui.dxDiagram.Units instead */ + export type DiagramUnits = Units; } // 24.2 -declare module DevExpress.common.grids { +declare namespace DevExpress.common.grids { /** @deprecated Use DevExpress.common.DisplayMode instead */ - export type PagerDisplayMode = DevExpress.common.DisplayMode; + export type PagerDisplayMode = DisplayMode; +} + +declare namespace DevExpress { + export type AnimationConfig = DevExpress.common.core.animation.AnimationConfig; + export const animationPresets: typeof DevExpress.common.core.animation.animationPresets + export type Device = DevExpress.common.core.environment.Device; + export const devices: typeof DevExpress.common.core.environment.devices; + export type dxSchedulerTimeZone = DevExpress.common.core.environment.SchedulerTimeZone; + export type EndpointSelector = DevExpress.common.data.EndpointSelector; + export const fx: typeof DevExpress.common.core.animation.fx; + export const hideTopOverlay: typeof DevExpress.common.core.environment.hideTopOverlay; + export const localizationformatDate: typeof DevExpress.common.core.localization.formatDate; + export const localizationformatMessage: typeof DevExpress.common.core.localization.formatMessage; + export const localizationformatNumber: typeof DevExpress.common.core.localization.formatNumber; + export const localizationloadMessages: typeof DevExpress.common.core.localization.loadMessages; + export const localizationlocale: typeof DevExpress.common.core.localization.locale; + export const localizationparseDate: typeof DevExpress.common.core.localization.parseDate; + export const localizationparseNumber: typeof DevExpress.common.core.localization.parseNumber; + export type PositionConfig = DevExpress.common.core.animation.PositionConfig; + export type TransitionExecutor = DevExpress.common.core.animation.TransitionExecutor; + export const utilscancelAnimationFrame: typeof DevExpress.common.core.animation.cancelAnimationFrame; + export const utilsrequestAnimationFrame: typeof DevExpress.common.core.animation.requestAnimationFrame; +} + +declare namespace DevExpress.common { + export type GroupItem = DevExpress.common.data.GroupItem; + export const isGroupItemsArray: typeof DevExpress.common.data.isGroupItemsArray; + export const isItemsArray: typeof DevExpress.common.data.isItemsArray; + export const isLoadResultObject: typeof DevExpress.common.data.isLoadResultObject; + export type LoadResult = DevExpress.common.data.LoadResult; + export type LoadResultObject = DevExpress.common.data.LoadResultObject; +} + +declare namespace DevExpress.animation { + export type AnimationState = DevExpress.common.core.animation.AnimationState; + export type CollisionResolution = DevExpress.common.core.animation.CollisionResolution; + export type CollisionResolutionCombination = DevExpress.common.core.animation.CollisionResolutionCombination; +} + +declare namespace DevExpress.data { + export const applyChanges: typeof DevExpress.common.data.applyChanges; + export type ArrayStore = DevExpress.common.data.ArrayStore; + export const base64_encode: typeof DevExpress.common.data.base64_encode; + export type CustomStore = DevExpress.common.data.CustomStore; + export type DataSource = DevExpress.common.data.DataSource; + export type EdmLiteral = DevExpress.common.data.EdmLiteral; + export const errorHandler: typeof DevExpress.common.data.errorHandler; + export type LangParams = DevExpress.common.data.LangParams; + export type LocalStore = DevExpress.common.data.LocalStore; + export type ODataContext = DevExpress.common.data.ODataContext; + export type ODataStore = DevExpress.common.data.ODataStore; + export const query: typeof DevExpress.common.data.query; + export type Query = DevExpress.common.data.Query; + export const setErrorHandler: typeof DevExpress.common.data.setErrorHandler; + export type Store = DevExpress.common.data.Store; +} + +declare namespace DevExpress.data.CustomStore { + export type GroupItem = DevExpress.common.data.GroupItem; + export type ResolvedData = DevExpress.common.data.ResolvedData; +} + +declare namespace DevExpress.data.DataSource { + export type Options = DevExpress.common.data.DataSourceOptions; +} + +declare namespace DevExpress.data.Store { + export type Options = DevExpress.common.data.StoreOptions; +} + +declare namespace DevExpress.data.utils { + export const compileGetter: typeof DevExpress.common.data.compileGetter; + export const compileSetter: typeof DevExpress.common.data.compileSetter; +} + +declare namespace DevExpress.data.utils.odata { + export const keyConverters: typeof DevExpress.common.data.keyConverters; +} + +declare namespace DevExpress.events { + export type AsyncCancelable = DevExpress.common.core.events.AsyncCancelable; + export type Cancelable = DevExpress.common.core.events.Cancelable; + export type ChangedOptionInfo = DevExpress.common.core.events.ChangedOptionInfo; + export type EventInfo = DevExpress.common.core.events.EventInfo; + export type InitializedEventInfo = DevExpress.common.core.events.InitializedEventInfo; + export type ItemInfo = DevExpress.common.core.events.ItemInfo; + export type NativeEventInfo = DevExpress.common.core.events.NativeEventInfo; + export const off: typeof DevExpress.common.core.events.off; + export const on: typeof DevExpress.common.core.events.on; + export const one: typeof DevExpress.common.core.events.one; + export const trigger: typeof DevExpress.common.core.events.trigger; +} + +declare namespace DevExpress.excelExporter { + export type DataGridCell = DevExpress.common.Export.excel.DataGridCell; + export type ExcelExportDataGridProps = DevExpress.common.Export.excel.DataGridExportOptions; + export type ExcelExportPivotGridProps = DevExpress.common.Export.excel.PivotGridExportOptions; + export const exportDataGrid: typeof DevExpress.common.Export.excel.exportDataGrid; + export const exportPivotGrid: typeof DevExpress.common.Export.excel.exportPivotGrid; + export type PivotGridCell = DevExpress.common.Export.excel.PivotGridCell; +} + +declare namespace DevExpress.pdfExporter { + export type Cell = DevExpress.common.Export.pdf.Cell; + export type DataGridCell = DevExpress.common.Export.pdf.DataGridCell; + export const exportDataGrid: typeof DevExpress.common.Export.pdf.exportDataGrid; + export const exportGantt: typeof DevExpress.common.Export.pdf.exportGantt; + export type PdfExportDataGridProps = DevExpress.common.Export.pdf.DataGridExportOptions; + export type PdfExportGanttFont = DevExpress.common.Export.pdf.GanttExportFont; + export type PdfExportGanttProps = DevExpress.common.Export.pdf.GanttExportOptions; +} + +declare namespace DevExpress.utils { + export const getTimeZones: typeof DevExpress.common.core.environment.getTimeZones; + export const initMobileViewport: typeof DevExpress.common.core.environment.initMobileViewport; } diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts index dce0ec8343b2..d20e27ee292e 100644 --- a/packages/devextreme/ts/dx.all.d.ts +++ b/packages/devextreme/ts/dx.all.d.ts @@ -515,93 +515,6 @@ declare global { interface JQueryPromise {} } declare module DevExpress { - /** - * [descr:AnimationConfig] - */ - export type AnimationConfig = { - /** - * [descr:AnimationConfig.complete] - */ - complete?: ( - $element: DevExpress.core.DxElement, - config: AnimationConfig - ) => void; - /** - * [descr:AnimationConfig.delay] - */ - delay?: number; - /** - * [descr:AnimationConfig.direction] - */ - direction?: DevExpress.common.Direction | undefined; - /** - * [descr:AnimationConfig.duration] - */ - duration?: number; - /** - * [descr:AnimationConfig.easing] - */ - easing?: string; - /** - * [descr:AnimationConfig.from] - */ - from?: DevExpress.animation.AnimationState; - /** - * [descr:AnimationConfig.staggerDelay] - */ - staggerDelay?: number | undefined; - /** - * [descr:AnimationConfig.start] - */ - start?: ( - $element: DevExpress.core.DxElement, - config: AnimationConfig - ) => void; - /** - * [descr:AnimationConfig.to] - */ - to?: DevExpress.animation.AnimationState; - /** - * [descr:AnimationConfig.type] - */ - type?: DevExpress.animation.AnimationType; - }; - /** - * [descr:animationPresets] - */ - export const animationPresets: { - /** - * [descr:animationPresets.applyChanges()] - */ - applyChanges(): void; - /** - * [descr:animationPresets.clear()] - */ - clear(): void; - /** - * [descr:animationPresets.clear(name)] - */ - clear(name: string): void; - /** - * [descr:animationPresets.getPreset(name)] - */ - getPreset(name: string): AnimationConfig; - /** - * [descr:animationPresets.registerDefaultPresets()] - */ - registerDefaultPresets(): void; - /** - * [descr:animationPresets.registerPreset(name, config)] - */ - registerPreset( - name: string, - config: { animation: AnimationConfig; device?: Device } - ): void; - /** - * [descr:animationPresets.resetToDefaults()] - */ - resetToDefaults(): void; - }; /** * [descr:Component] * @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. @@ -704,92 +617,18 @@ declare module DevExpress { /** * [descr:DataHelperMixin.getDataSource()] */ - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.data.DataSource; } /** - * [descr:Device] + * [descr:DefaultOptionsRule] */ - export type Device = { - /** - * [descr:Device.android] - */ - android?: boolean; - /** - * [descr:Device.deviceType] - */ - deviceType?: 'phone' | 'tablet' | 'desktop'; - /** - * [descr:Device.generic] - */ - generic?: boolean; - /** - * [descr:Device.grade] - */ - grade?: 'A' | 'B' | 'C'; - /** - * [descr:Device.ios] - */ - ios?: boolean; - /** - * [descr:Device.phone] - */ - phone?: boolean; - /** - * [descr:Device.platform] - */ - platform?: 'android' | 'ios' | 'generic'; - /** - * [descr:Device.tablet] - */ - tablet?: boolean; - /** - * [descr:Device.version] - */ - version?: Array; + export type DefaultOptionsRule = { + device?: + | DevExpress.common.core.environment.Device + | DevExpress.common.core.environment.Device[] + | ((device: DevExpress.common.core.environment.Device) => boolean); + options: DevExpress.core.DeepPartial; }; - /** - * [descr:devices] - */ - export const devices: DevicesObject; - /** - * [descr:DevicesObject] - */ - export class DevicesObject { - constructor(options?: { window?: Window }); - /** - * [descr:DevicesObject.current()] - */ - current(): Device; - /** - * [descr:DevicesObject.current(deviceName)] - */ - current(deviceName: string | Device): void; - /** - * [descr:DevicesObject.off(eventName)] - */ - off(eventName: DevExpress.core.EventName): this; - /** - * [descr:DevicesObject.off(eventName, eventHandler)] - */ - off(eventName: DevExpress.core.EventName, eventHandler: Function): this; - /** - * [descr:DevicesObject.on(eventName, eventHandler)] - */ - on(eventName: DevExpress.core.EventName, eventHandler: Function): this; - /** - * [descr:DevicesObject.on(events)] - */ - on(events: { [key in DevExpress.core.EventName]?: Function }): this; - /** - * [descr:DevicesObject.orientation()] - */ - orientation(): 'portrait' | 'landscape' | undefined; - /** - * [descr:DevicesObject.real()] - */ - real(): Device; - isSimulator(): boolean; - } /** * [descr:DOMComponent] * @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. @@ -817,7 +656,7 @@ declare module DevExpress { * [descr:DOMComponent.defaultOptions(rule)] */ static defaultOptions( - rule: DevExpress.core.DefaultOptionsRule + rule: DefaultOptionsRule ): void; /** @@ -850,8 +689,8 @@ declare module DevExpress { * @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 type OptionChangedEventInfo = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; /** * @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. */ @@ -864,8 +703,8 @@ declare module DevExpress { */ export interface DOMComponentOptions extends ComponentOptions< - DevExpress.events.EventInfo, - DevExpress.events.InitializedEventInfo, + DevExpress.common.core.events.EventInfo, + DevExpress.common.core.events.InitializedEventInfo, DevExpress.DOMComponent.OptionChangedEventInfo > { /** @@ -883,7 +722,9 @@ declare module DevExpress { /** * [descr:DOMComponentOptions.onDisposing] */ - onDisposing?: (e: DevExpress.events.EventInfo) => void; + onDisposing?: ( + e: DevExpress.common.core.events.EventInfo + ) => void; /** * [descr:DOMComponentOptions.onOptionChanged] */ @@ -899,33 +740,6 @@ declare module DevExpress { */ width?: number | string | (() => number | string) | undefined; } - /** - * [descr:dxSchedulerTimeZone] - */ - export interface dxSchedulerTimeZone { - /** - * [descr:dxSchedulerTimeZone.id] - */ - id: string; - /** - * [descr:dxSchedulerTimeZone.offset] - */ - offset: number; - /** - * [descr:dxSchedulerTimeZone.title] - */ - title: string; - } - /** - * [descr:EndpointSelector] - */ - export class EndpointSelector { - constructor(options: any); - /** - * [descr:EndpointSelector.urlFor(key)] - */ - urlFor(key: string): string; - } /** * [descr:ExportLoadPanel] * @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. @@ -968,175 +782,7 @@ declare module DevExpress { */ shadingColor?: string; } - /** - * @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. - */ - type ExternalFormat = Intl.DateTimeFormatOptions | Intl.NumberFormatOptions; - /** - * @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 FormatObject { - /** - * [descr:Format.currency] - */ - currency?: string; - /** - * [descr:Format.useCurrencyAccountingStyle] - */ - useCurrencyAccountingStyle?: boolean; - /** - * [descr:Format.formatter] - */ - formatter?: (value: number | Date) => string; - /** - * [descr:Format.parser] - */ - parser?: (value: string) => number | Date; - /** - * [descr:Format.precision] - */ - precision?: number; - /** - * [descr:Format.type] - */ - type?: DevExpress.common.Format | string; - } - /** - * [descr:fx] - */ - export const fx: { - /** - * [descr:fx.animate(element, config)] - */ - animate( - element: Element, - config: AnimationConfig - ): DevExpress.core.utils.DxPromise; - - /** - * [descr:fx.isAnimating(element)] - */ - isAnimating(element: Element): boolean; - - /** - * [descr:fx.stop(element, jumpToEnd)] - */ - stop(element: Element, jumpToEnd: boolean): void; - }; - /** - * [descr:hideTopOverlay()] - */ - export function hideTopOverlay(): boolean; - /** - * [descr:PdfExportGanttFont] - * @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 PdfExportGanttFont { - /** - * [descr:PdfExportGanttFont.fontObject] - */ - fontObject: object | undefined; - /** - * [descr:PdfExportGanttFont.name] - */ - name: string | undefined; - /** - * [descr:PdfExportGanttFont.style] - */ - style?: string; - /** - * [descr:PdfExportGanttFont.weight] - */ - weight?: string | number | undefined; - } - /** - * [descr:PositionConfig] - */ - export interface PositionConfig { - /** - * [descr:PositionConfig.at] - */ - at?: - | DevExpress.common.PositionAlignment - | { - /** - * [descr:PositionConfig.at.x] - */ - x?: DevExpress.common.HorizontalAlignment; - /** - * [descr:PositionConfig.at.y] - */ - y?: DevExpress.common.VerticalAlignment; - }; - /** - * [descr:PositionConfig.boundary] - */ - boundary?: string | DevExpress.core.UserDefinedElement | Window; - /** - * [descr:PositionConfig.boundaryOffset] - */ - boundaryOffset?: - | string - | { - /** - * [descr:PositionConfig.boundaryOffset.x] - */ - x?: number; - /** - * [descr:PositionConfig.boundaryOffset.y] - */ - y?: number; - }; - /** - * [descr:PositionConfig.collision] - */ - collision?: - | DevExpress.animation.CollisionResolutionCombination - | { - /** - * [descr:PositionConfig.collision.x] - */ - x?: DevExpress.animation.CollisionResolution; - /** - * [descr:PositionConfig.collision.y] - */ - y?: DevExpress.animation.CollisionResolution; - }; - /** - * [descr:PositionConfig.my] - */ - my?: - | DevExpress.common.PositionAlignment - | { - /** - * [descr:PositionConfig.my.x] - */ - x?: DevExpress.common.HorizontalAlignment; - /** - * [descr:PositionConfig.my.y] - */ - y?: DevExpress.common.VerticalAlignment; - }; - /** - * [descr:PositionConfig.of] - */ - of?: string | DevExpress.core.UserDefinedElement | Window; - /** - * [descr:PositionConfig.offset] - */ - offset?: - | string - | { - /** - * [descr:PositionConfig.offset.x] - */ - x?: number; - /** - * [descr:PositionConfig.offset.y] - */ - y?: number; - }; - } + export type FloatingActionButtonDirection = 'auto' | 'up' | 'down'; /** * [descr:registerComponent(name, componentClass)] * @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. @@ -1164,36 +810,9 @@ declare module DevExpress { render?: Function; }): void; /** - * [descr:TransitionExecutor] + * [descr:template] */ - export class TransitionExecutor { - /** - * [descr:TransitionExecutor.enter(elements, animation)] - */ - enter( - elements: DevExpress.core.UserDefinedElementsArray, - animation: AnimationConfig | string - ): void; - /** - * [descr:TransitionExecutor.leave(elements, animation)] - */ - leave( - elements: DevExpress.core.UserDefinedElementsArray, - animation: AnimationConfig | string - ): void; - /** - * [descr:TransitionExecutor.reset()] - */ - reset(): void; - /** - * [descr:TransitionExecutor.start()] - */ - start(): DevExpress.core.utils.DxPromise; - /** - * [descr:TransitionExecutor.stop()] - */ - stop(): void; - } + export type template = string | Function | DevExpress.core.UserDefinedElement; /** * [descr:validationEngine] */ @@ -1240,45 +859,17 @@ declare module DevExpress { } declare module DevExpress.animation { /** - * @deprecated Use the AnimationConfig type instead + * @deprecated Use the DevExpress.common.core.animation.AnimationConfig type from common/core/animation instead */ - export type animationConfig = AnimationConfig; + export type animationConfig = + DevExpress.common.core.animation.AnimationConfig; /** - * [descr:AnimationState] + * @deprecated Use the DevExpress.common.core.animation.PositionConfig type from common/core/animation instead */ - export type AnimationState = - | string - | number - | { - /** - * [descr:AnimationState.opacity] - */ - opacity: number; - } - | { - /** - * [descr:AnimationState.scale] - */ - scale: number; - } - | { - /** - * [descr:AnimationState.position] - */ - position: PositionConfig; - } - | { - /** - * [descr:AnimationState.left] - */ - left: number; - } - | { - /** - * [descr:AnimationState.top] - */ - top: number; - }; + export interface positionConfig + extends DevExpress.common.core.animation.PositionConfig {} +} +declare module DevExpress.common { /** * @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. */ @@ -1291,28 +882,6 @@ declare module DevExpress.animation { | 'slide' | 'slideIn' | 'slideOut'; - export type CollisionResolution = 'fit' | 'flip' | 'flipfit' | 'none'; - export type CollisionResolutionCombination = - | 'fit' - | 'fit flip' - | 'fit flipfit' - | 'fit none' - | 'flip' - | 'flip fit' - | 'flip none' - | 'flipfit' - | 'flipfit fit' - | 'flipfit none' - | 'none' - | 'none fit' - | 'none flip' - | 'none flipfit'; - /** - * @deprecated Use the PositionConfig type instead - */ - export interface positionConfig extends PositionConfig {} -} -declare module DevExpress.common { export type ApplyValueMode = 'instantly' | 'useButtons'; /** * [descr:AsyncRule] @@ -1400,6 +969,10 @@ declare module DevExpress.common { */ validationCallback?: (options: ValidationCallbackData) => boolean; }; + /** + * @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. + */ + type DataSourceEventName = 'changed' | 'loadError' | 'loadingChanged'; export type DataStructure = 'plain' | 'tree'; export type DataType = | 'string' @@ -1432,7 +1005,15 @@ declare module DevExpress.common { */ type: 'email'; }; + /** + * @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. + */ + type EventName = 'orientationChanged'; export type ExportFormat = 'GIF' | 'JPEG' | 'PDF' | 'PNG' | 'SVG'; + /** + * @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. + */ + type ExternalFormat = Intl.DateTimeFormatOptions | Intl.NumberFormatOptions; export type FieldChooserLayout = 0 | 1 | 2; export type FirstDayOfWeek = 0 | 1 | 2 | 3 | 4 | 5 | 6; export type Format = @@ -1464,6 +1045,35 @@ declare module DevExpress.common { | 'minute' | 'second' | 'shortDateShortTime'; + /** + * @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 FormatObject { + /** + * [descr:Format.currency] + */ + currency?: string; + /** + * [descr:Format.useCurrencyAccountingStyle] + */ + useCurrencyAccountingStyle?: boolean; + /** + * [descr:Format.formatter] + */ + formatter?: (value: number | Date) => string; + /** + * [descr:Format.parser] + */ + parser?: (value: string) => number | Date; + /** + * [descr:Format.precision] + */ + precision?: number; + /** + * [descr:Format.type] + */ + type?: PredefinedFormat | string; + } /** * [descr:GlobalConfig] */ @@ -1496,7 +1106,7 @@ declare module DevExpress.common { /** * [descr:GlobalConfig.floatingActionButtonConfig.direction] */ - direction?: DevExpress.core.FloatingActionButtonDirection; + direction?: FloatingActionButtonDirection; /** * [descr:GlobalConfig.floatingActionButtonConfig.icon] */ @@ -1512,7 +1122,10 @@ declare module DevExpress.common { /** * [descr:GlobalConfig.floatingActionButtonConfig.position] */ - position?: PositionAlignment | PositionConfig | Function; + position?: + | PositionAlignment + | DevExpress.common.core.animation.PositionConfig + | Function; /** * [descr:GlobalConfig.floatingActionButtonConfig.shading] */ @@ -1562,89 +1175,35 @@ declare module DevExpress.common { buyNowLink?: string; licensingDocLink?: string; }; - /** - * [descr:GroupItem] - */ - export type GroupItem = { - /** - * [descr:GroupItem.key] - */ - key: any | string | number; - /** - * [descr:GroupItem.items] - */ - items: Array | Array> | null; - /** - * [descr:GroupItem.count] - */ - count?: number; - /** - * [descr:GroupItem.summary] - */ - summary?: Array; - }; export type HorizontalAlignment = 'center' | 'left' | 'right'; export type HorizontalEdge = 'left' | 'right'; /** - * [descr:isGroupItemsArray] - */ - export function isGroupItemsArray( - res: LoadResult - ): res is Array>; - /** - * [descr:isItemsArray] - */ - export function isItemsArray( - res: LoadResult - ): res is Array; - /** - * [descr:isLoadResultObject] + * @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 function isLoadResultObject( - res: LoadResult - ): res is LoadResultObject; + export type HttpMethod = 'GET' | 'POST' | 'PATCH' | 'MERGE'; export type LabelMode = 'static' | 'floating' | 'hidden' | 'outside'; /** - * [descr:LoadResult] + * @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 type LoadResult = - | Object - | LoadResultArray - | LoadResultObject; + type LoadFunctionResult = + | T + | DevExpress.core.utils.DxPromise + | PromiseLike; /** * @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. */ - type LoadResultArray = Array | Array>; + type LoadResultArray = + | Array + | Array>; + export type MaskMode = 'always' | 'onFocus'; + export type Mode = 'auto'; + /** - * [descr:LoadResultObject] + * [descr:NumericRule] */ - export type LoadResultObject = { + export type NumericRule = { /** - * [descr:LoadResultObject.data] - */ - data: Array | Array>; - /** - * [descr:LoadResultObject.totalCount] - */ - totalCount?: number; - /** - * [descr:LoadResultObject.summary] - */ - summary?: Array; - /** - * [descr:LoadResultObject.groupCount] - */ - groupCount?: number; - }; - export type MaskMode = 'always' | 'onFocus'; - export type Mode = 'auto'; - - /** - * [descr:NumericRule] - */ - export type NumericRule = { - /** - * [descr:NumericRule.ignoreEmptyValue] + * [descr:NumericRule.ignoreEmptyValue] */ ignoreEmptyValue?: boolean; /** @@ -1656,6 +1215,22 @@ declare module DevExpress.common { */ type: 'numeric'; }; + /** + * @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 ODataRequestOptions { + accepts: any; + async: boolean; + contentType: string | boolean; + data: any; + dataType: string; + headers: any; + jsonp?: boolean; + method: string; + timeout: number; + url: string; + xhrFields: any; + } export type Orientation = 'horizontal' | 'vertical'; export type PageLoadMode = 'nextButton' | 'scrollBottom'; export type PageOrientation = 'portrait' | 'landscape'; @@ -1721,6 +1296,10 @@ declare module DevExpress.common { | 'right bottom' | 'right top' | 'top'; + /** + * @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. + */ + type PredefinedFormat = Format; /** * [descr:RangeRule] */ @@ -1757,7 +1336,7 @@ declare module DevExpress.common { TComponent extends DevExpress.common.grids.GridBase > = Required< Pick< - DevExpress.events.NativeEventInfo< + DevExpress.common.core.events.NativeEventInfo< TComponent, PointerEvent | MouseEvent | TouchEvent >, @@ -2271,7 +1850,7 @@ declare module DevExpress.common.charts { /** * [descr:dxChartSeriesTypes.CommonSeries.label.argumentFormat] */ - argumentFormat?: DevExpress.ui.Format | undefined; + argumentFormat?: DevExpress.common.core.localization.Format | undefined; /** * [descr:dxChartSeriesTypes.CommonSeries.label.backgroundColor] */ @@ -2325,7 +1904,7 @@ declare module DevExpress.common.charts { /** * [descr:dxChartSeriesTypes.CommonSeries.label.format] */ - format?: DevExpress.ui.Format | undefined; + format?: DevExpress.common.core.localization.Format | undefined; /** * [descr:dxChartSeriesTypes.CommonSeries.label.horizontalOffset] */ @@ -2642,302 +2221,2320 @@ declare module DevExpress.common.charts { export type WordWrap = 'normal' | 'breakWord' | 'none'; export type ZoomPanAction = 'zoom' | 'pan'; } -declare module DevExpress.common.grids { - /** - * [descr:AdaptiveDetailRowPreparingInfo] - * @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 type AdaptiveDetailRowPreparingInfo = { - /** - * [descr:AdaptiveDetailRowPreparingInfo.formOptions] - */ - readonly formOptions: any; - }; - export type ApplyChangesMode = 'instantly' | 'onDemand'; - export type ApplyFilterMode = 'auto' | 'onClick'; +declare module DevExpress.common.core.animation { /** - * [descr:GridBaseColumn] - * @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. + * [descr:AnimationConfig] */ - export interface ColumnBase { + export type AnimationConfig = { /** - * [descr:GridBaseColumn.alignment] + * [descr:AnimationConfig.complete] */ - alignment?: HorizontalAlignment | undefined; + complete?: ( + $element: DevExpress.core.DxElement, + config: AnimationConfig + ) => void; /** - * [descr:GridBaseColumn.allowEditing] + * [descr:AnimationConfig.delay] */ - allowEditing?: boolean; + delay?: number; /** - * [descr:GridBaseColumn.allowFiltering] + * [descr:AnimationConfig.direction] */ - allowFiltering?: boolean; + direction?: Direction | undefined; /** - * [descr:GridBaseColumn.allowFixing] + * [descr:AnimationConfig.duration] */ - allowFixing?: boolean; + duration?: number; /** - * [descr:GridBaseColumn.allowHeaderFiltering] + * [descr:AnimationConfig.easing] */ - allowHeaderFiltering?: boolean; + easing?: string; /** - * [descr:GridBaseColumn.allowHiding] + * [descr:AnimationConfig.from] */ - allowHiding?: boolean; + from?: AnimationState; /** - * [descr:GridBaseColumn.allowReordering] + * [descr:AnimationConfig.staggerDelay] */ - allowReordering?: boolean; + staggerDelay?: number | undefined; /** - * [descr:GridBaseColumn.allowResizing] + * [descr:AnimationConfig.start] */ - allowResizing?: boolean; + start?: ( + $element: DevExpress.core.DxElement, + config: AnimationConfig + ) => void; /** - * [descr:GridBaseColumn.allowSearch] + * [descr:AnimationConfig.to] */ - allowSearch?: boolean; + to?: AnimationState; /** - * [descr:GridBaseColumn.allowSorting] + * [descr:AnimationConfig.type] */ - allowSorting?: boolean; + type?: AnimationType; + }; + /** + * [descr:animationPresets] + */ + export const animationPresets: { /** - * [descr:GridBaseColumn.calculateCellValue] + * [descr:animationPresets.applyChanges()] */ - calculateCellValue?: (this: ColumnBase, rowData: TRowData) => any; - defaultCalculateCellValue?: this['calculateCellValue']; + applyChanges(): void; /** - * [descr:GridBaseColumn.calculateDisplayValue] + * [descr:animationPresets.clear()] */ - calculateDisplayValue?: - | string - | ((this: ColumnBase, rowData: TRowData) => any); + clear(): void; /** - * [descr:GridBaseColumn.calculateFilterExpression] + * [descr:animationPresets.clear(name)] */ - calculateFilterExpression?: ( - this: ColumnBase, - filterValue: any, - selectedFilterOperation: string | null, - target: string - ) => string | Array | Function; - defaultCalculateFilterExpression?: this['calculateFilterExpression']; + clear(name: string): void; /** - * [descr:GridBaseColumn.calculateSortValue] + * [descr:animationPresets.getPreset(name)] */ - calculateSortValue?: - | string - | ((this: ColumnBase, rowData: TRowData) => any); + getPreset(name: string): AnimationConfig; /** - * [descr:GridBaseColumn.caption] + * [descr:animationPresets.registerDefaultPresets()] */ - caption?: string | undefined; + registerDefaultPresets(): void; /** - * [descr:GridBaseColumn.cssClass] + * [descr:animationPresets.registerPreset(name, config)] */ - cssClass?: string | undefined; + registerPreset( + name: string, + config: { + animation: AnimationConfig; + device?: DevExpress.common.core.environment.Device; + } + ): void; /** - * [descr:GridBaseColumn.customizeText] + * [descr:animationPresets.resetToDefaults()] */ - customizeText?: ( - this: ColumnBase, - cellInfo: ColumnCustomizeTextArg - ) => string; + resetToDefaults(): void; + }; + /** + * [descr:AnimationState] + */ + export type AnimationState = + | string + | number + | { + /** + * [descr:AnimationState.opacity] + */ + opacity: number; + } + | { + /** + * [descr:AnimationState.scale] + */ + scale: number; + } + | { + /** + * [descr:AnimationState.position] + */ + position: PositionConfig; + } + | { + /** + * [descr:AnimationState.left] + */ + left: number; + } + | { + /** + * [descr:AnimationState.top] + */ + top: number; + }; + /** + * [descr:utils.cancelAnimationFrame(requestID)] + */ + export function cancelAnimationFrame(requestID: number): void; + export type CollisionResolution = 'fit' | 'flip' | 'flipfit' | 'none'; + export type CollisionResolutionCombination = + | 'fit' + | 'fit flip' + | 'fit flipfit' + | 'fit none' + | 'flip' + | 'flip fit' + | 'flip none' + | 'flipfit' + | 'flipfit fit' + | 'flipfit none' + | 'none' + | 'none fit' + | 'none flip' + | 'none flipfit'; + /** + * [descr:fx] + */ + export const fx: { /** - * [descr:GridBaseColumn.dataField] + * [descr:fx.animate(element, config)] */ - dataField?: string | undefined; + animate( + element: Element, + config: AnimationConfig + ): DevExpress.core.utils.DxPromise; + /** - * [descr:GridBaseColumn.dataType] + * [descr:fx.isAnimating(element)] */ - dataType?: DataType | undefined; + isAnimating(element: Element): boolean; + /** - * [descr:GridBaseColumn.editorOptions] + * [descr:fx.stop(element, jumpToEnd)] */ - editorOptions?: any; + stop(element: Element, jumpToEnd: boolean): void; + }; + /** + * [descr:PositionConfig] + */ + export type PositionConfig = { /** - * [descr:GridBaseColumn.encodeHtml] + * [descr:PositionConfig.at] */ - encodeHtml?: boolean; + at?: + | PositionAlignment + | { + /** + * [descr:PositionConfig.at.x] + */ + x?: HorizontalAlignment; + /** + * [descr:PositionConfig.at.y] + */ + y?: VerticalAlignment; + }; /** - * [descr:GridBaseColumn.falseText] + * [descr:PositionConfig.boundary] */ - falseText?: string; + boundary?: string | DevExpress.core.UserDefinedElement | Window; /** - * [descr:GridBaseColumn.filterOperations] + * [descr:PositionConfig.boundaryOffset] */ - filterOperations?: Array; + boundaryOffset?: + | string + | { + /** + * [descr:PositionConfig.boundaryOffset.x] + */ + x?: number; + /** + * [descr:PositionConfig.boundaryOffset.y] + */ + y?: number; + }; /** - * [descr:GridBaseColumn.filterType] + * [descr:PositionConfig.collision] */ - filterType?: FilterType; + collision?: + | CollisionResolutionCombination + | { + /** + * [descr:PositionConfig.collision.x] + */ + x?: CollisionResolution; + /** + * [descr:PositionConfig.collision.y] + */ + y?: CollisionResolution; + }; /** - * [descr:GridBaseColumn.filterValue] + * [descr:PositionConfig.my] */ - filterValue?: any | undefined; + my?: + | PositionAlignment + | { + /** + * [descr:PositionConfig.my.x] + */ + x?: HorizontalAlignment; + /** + * [descr:PositionConfig.my.y] + */ + y?: VerticalAlignment; + }; /** - * [descr:GridBaseColumn.filterValues] + * [descr:PositionConfig.of] */ - filterValues?: Array; + of?: string | DevExpress.core.UserDefinedElement | Window; /** - * [descr:GridBaseColumn.fixed] + * [descr:PositionConfig.offset] */ - fixed?: boolean; + offset?: + | string + | { + /** + * [descr:PositionConfig.offset.x] + */ + x?: number; + /** + * [descr:PositionConfig.offset.y] + */ + y?: number; + }; + }; + /** + * [descr:utils.requestAnimationFrame(callback)] + */ + export function requestAnimationFrame(callback: Function): number; + /** + * [descr:TransitionExecutor] + */ + export class TransitionExecutor { /** - * [descr:GridBaseColumn.fixedPosition] + * [descr:TransitionExecutor.enter(elements, animation)] */ - fixedPosition?: FixedPosition | undefined; + enter( + elements: DevExpress.core.UserDefinedElementsArray, + animation: AnimationConfig | string + ): void; /** - * [descr:GridBaseColumn.formItem] + * [descr:TransitionExecutor.leave(elements, animation)] */ - formItem?: DevExpress.ui.dxForm.SimpleItem; + leave( + elements: DevExpress.core.UserDefinedElementsArray, + animation: AnimationConfig | string + ): void; /** - * [descr:GridBaseColumn.format] + * [descr:TransitionExecutor.reset()] */ - format?: DevExpress.ui.Format; + reset(): void; /** - * [descr:GridBaseColumn.headerFilter] + * [descr:TransitionExecutor.start()] */ - headerFilter?: ColumnHeaderFilter | undefined; + start(): DevExpress.core.utils.DxPromise; /** - * [descr:GridBaseColumn.hidingPriority] + * [descr:TransitionExecutor.stop()] */ - hidingPriority?: number | undefined; + stop(): void; + } +} +declare module DevExpress.common.core.environment { + /** + * [descr:Device] + */ + export type Device = { /** - * [descr:GridBaseColumn.isBand] + * [descr:Device.android] */ - isBand?: boolean | undefined; + android?: boolean; /** - * [descr:GridBaseColumn.lookup] + * [descr:Device.deviceType] */ - lookup?: ColumnLookup | undefined; + deviceType?: 'phone' | 'tablet' | 'desktop'; /** - * [descr:GridBaseColumn.minWidth] + * [descr:Device.generic] */ - minWidth?: number | undefined; + generic?: boolean; /** - * [descr:GridBaseColumn.name] + * [descr:Device.grade] */ - name?: string | undefined; + grade?: 'A' | 'B' | 'C'; /** - * [descr:GridBaseColumn.ownerBand] + * [descr:Device.ios] */ - ownerBand?: number | undefined; + ios?: boolean; /** - * [descr:GridBaseColumn.renderAsync] + * [descr:Device.phone] */ - renderAsync?: boolean; + phone?: boolean; /** - * [descr:GridBaseColumn.selectedFilterOperation] + * [descr:Device.platform] */ - selectedFilterOperation?: SelectedFilterOperation | undefined; + platform?: 'android' | 'ios' | 'generic'; /** - * [descr:GridBaseColumn.setCellValue] + * [descr:Device.tablet] */ - setCellValue?: ( - this: ColumnBase, - newData: DevExpress.core.DeepPartial, - value: any, - currentRowData: TRowData - ) => void | PromiseLike; - defaultSetCellValue?: this['setCellValue']; + tablet?: boolean; /** - * [descr:GridBaseColumn.showEditorAlways] + * [descr:Device.version] */ - showEditorAlways?: boolean; + version?: Array; + }; + /** + * [descr:devices] + */ + export const devices: DevExpress.core.DevicesObject; + /** + * [descr:utils.getTimeZones(date)] + */ + export function getTimeZones(date?: Date): Array; + /** + * [descr:hideTopOverlay()] + */ + export function hideTopOverlay(): boolean; + /** + * [descr:utils.initMobileViewport(options)] + */ + export function initMobileViewport(options: { + allowZoom?: boolean; + allowPan?: boolean; + allowSelection?: boolean; + }): void; + /** + * [descr:SchedulerTimeZone] + */ + export type SchedulerTimeZone = { /** - * [descr:GridBaseColumn.showInColumnChooser] + * [descr:SchedulerTimeZone.id] */ - showInColumnChooser?: boolean; + id: string; /** - * [descr:GridBaseColumn.sortIndex] + * [descr:SchedulerTimeZone.offset] */ - sortIndex?: number | undefined; + offset: number; /** - * [descr:GridBaseColumn.sortOrder] + * [descr:SchedulerTimeZone.title] */ - sortOrder?: SortOrder | undefined; + title: string; + }; +} +declare module DevExpress.common.core.events { + /** + * [descr:AsyncCancelable] + */ + export type AsyncCancelable = { /** - * [descr:GridBaseColumn.sortingMethod] + * [descr:AsyncCancelable.cancel] */ - sortingMethod?: - | ((this: ColumnBase, value1: any, value2: any) => number) - | undefined; + cancel: boolean | PromiseLike; + }; + /** + * [descr:Cancelable] + */ + export type Cancelable = { /** - * [descr:GridBaseColumn.trueText] + * [descr:Cancelable.cancel] */ - trueText?: string; + cancel?: boolean; + }; + /** + * [descr:ChangedOptionInfo] + */ + export type ChangedOptionInfo = { /** - * [descr:GridBaseColumn.validationRules] + * [descr:ChangedOptionInfo.name] */ - validationRules?: Array; + readonly name: string; /** - * [descr:GridBaseColumn.visible] + * [descr:ChangedOptionInfo.fullName] */ - visible?: boolean; + readonly fullName: string; /** - * [descr:GridBaseColumn.visibleIndex] + * [descr:ChangedOptionInfo.value] */ - visibleIndex?: number | undefined; + readonly value?: any; /** - * [descr:GridBaseColumn.width] + * [descr:ChangedOptionInfo.previousValue] */ - width?: number | string | undefined; - } + readonly previousValue?: any; + }; /** - * [descr:GridBaseColumnButton] - * @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. + * [descr:EventInfo] */ - export interface ColumnButtonBase { + export type EventInfo = { /** - * [descr:GridBaseColumnButton.cssClass] - */ - cssClass?: string; - /** - * [descr:GridBaseColumnButton.hint] + * [descr:EventInfo.component] */ - hint?: string; + readonly component: TComponent; /** - * [descr:GridBaseColumnButton.icon] + * [descr:EventInfo.element] */ - icon?: string; + readonly element: DevExpress.core.DxElement; /** - * [descr:GridBaseColumnButton.text] + * [descr:EventInfo.model] */ - text?: string; - } + readonly model?: any; + }; + export type EventObject = DevExpress.events.EventObject; /** - * [descr:ColumnChooser] + * [descr:InitializedEventInfo] */ - export type ColumnChooser = { + export type InitializedEventInfo = { /** - * [descr:GridBaseOptions.columnChooser.allowSearch] - * @deprecated [depNote:GridBaseOptions.columnChooser.allowSearch] + * [descr:InitializedEventInfo.component] */ - allowSearch?: boolean; + readonly component?: TComponent; /** - * [descr:GridBaseOptions.columnChooser.container] + * [descr:InitializedEventInfo.element] */ - container?: string | DevExpress.core.UserDefinedElement | undefined; + readonly element?: DevExpress.core.DxElement; + }; + /** + * [descr:ItemInfo] + */ + export type ItemInfo = { /** - * [descr:GridBaseOptions.columnChooser.emptyPanelText] + * [descr:ItemInfo.itemData] */ - emptyPanelText?: string; + readonly itemData?: TItemData; /** - * [descr:GridBaseOptions.columnChooser.enabled] + * [descr:ItemInfo.itemElement] */ - enabled?: boolean; + readonly itemElement: DevExpress.core.DxElement; /** - * [descr:GridBaseOptions.columnChooser.height] + * [descr:ItemInfo.itemIndex] */ - height?: number | string; + readonly itemIndex: number; + }; + /** + * [descr:NativeEventInfo] + */ + export type NativeEventInfo = { /** - * [descr:GridBaseOptions.columnChooser.mode] + * [descr:NativeEventInfo.component] */ - mode?: ColumnChooserMode; + readonly component: TComponent; /** - * [descr:GridBaseOptions.columnChooser.position] + * [descr:NativeEventInfo.element] */ - position?: PositionConfig | undefined; + readonly element: DevExpress.core.DxElement; + /** + * [descr:NativeEventInfo.model] + */ + readonly model?: any; + /** + * [descr:NativeEventInfo.event] + */ + readonly event?: DevExpress.events.DxEvent; + }; + /** + * [descr:events.off(element)] + */ + export function off(element: Element | Array): void; + /** + * [descr:events.off(element, eventName)] + */ + export function off( + element: Element | Array, + eventName: string + ): void; + /** + * [descr:events.off(element, eventName, handler)] + */ + export function off( + element: Element | Array, + eventName: string, + handler: Function + ): void; + /** + * [descr:events.off(element, eventName, selector)] + */ + export function off( + element: Element | Array, + eventName: string, + selector: string + ): void; + /** + * [descr:events.off(element, eventName, selector, handler)] + */ + export function off( + element: Element | Array, + eventName: string, + selector: string, + handler: Function + ): void; + /** + * [descr:events.on(element, eventName, data, handler)] + */ + export function on( + element: Element | Array, + eventName: string, + data: any, + handler: Function + ): void; + /** + * [descr:events.on(element, eventName, handler)] + */ + export function on( + element: Element | Array, + eventName: string, + handler: Function + ): void; + /** + * [descr:events.on(element, eventName, selector, data, handler)] + */ + export function on( + element: Element | Array, + eventName: string, + selector: string, + data: any, + handler: Function + ): void; + /** + * [descr:events.on(element, eventName, selector, handler)] + */ + export function on( + element: Element | Array, + eventName: string, + selector: string, + handler: Function + ): void; + /** + * [descr:events.one(element, eventName, data, handler)] + */ + export function one( + element: Element | Array, + eventName: string, + data: any, + handler: Function + ): void; + /** + * [descr:events.one(element, eventName, handler)] + */ + export function one( + element: Element | Array, + eventName: string, + handler: Function + ): void; + /** + * [descr:events.one(element, eventName, selector, data, handler)] + */ + export function one( + element: Element | Array, + eventName: string, + selector: string, + data: any, + handler: Function + ): void; + /** + * [descr:events.one(element, eventName, selector, handler)] + */ + export function one( + element: Element | Array, + eventName: string, + selector: string, + handler: Function + ): void; + /** + * [descr:events.trigger(element, event)] + */ + export function trigger( + element: Element | Array, + event: string | DevExpress.events.DxEvent + ): void; + /** + * [descr:events.trigger(element, event, extraParameters)] + */ + export function trigger( + element: Element | Array, + event: string | DevExpress.events.DxEvent, + extraParameters: any + ): void; +} +declare module DevExpress.common.core.localization { + /** + * [descr:Format] + */ + export type Format = + | FormatObject + | PredefinedFormat + | string + | ((value: number | Date) => string) + | ((value: Date) => string) + | ((value: number) => string) + | ExternalFormat + | undefined; + /** + * [descr:localization.formatDate(value, format)] + */ + export function formatDate(value: Date, format: Format): string; + /** + * [descr:localization.formatMessage(key, value)] + */ + export function formatMessage(key: string, ...values: Array): string; + /** + * [descr:localization.formatNumber(value, format)] + */ + export function formatNumber(value: number, format: Format): string; + /** + * [descr:localization.loadMessages(messages)] + */ + export function loadMessages(messages: any): void; + /** + * [descr:localization.locale()] + */ + export function locale(): string; + /** + * [descr:localization.locale(locale)] + */ + export function locale(locale: string): void; + /** + * [descr:localization.parseDate(text, format)] + */ + export function parseDate(text: string, format: Format): Date; + /** + * [descr:localization.parseNumber(text, format)] + */ + export function parseNumber(text: string, format: Format): number; +} +declare module DevExpress.common.data { + /** + * @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 class AbstractStore extends Store< + TItem, + TKey + > { + constructor( + options?: DevExpress.common.data.AbstractStore.Options + ); + /** + * [descr:Store.load()] + */ + load(): DevExpress.core.utils.DxExtendedPromise>; + /** + * [descr:Store.load(options)] + */ + load( + options: LoadOptions + ): DevExpress.core.utils.DxExtendedPromise>; + } + module AbstractStore { + /** + * @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 type Options = AbstractStoreOptions< + TItem, + TKey + >; + } + /** + * @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 AbstractStoreOptions + extends StoreOptions { + /** + * [descr:StoreOptions.onLoaded] + */ + onLoaded?: (result: Array, loadOptions: LoadOptions) => void; + } + /** + * [descr:Utils.applyChanges(data, changes, options)] + */ + export function applyChanges( + data: Array, + changes: Array, + options?: { keyExpr?: string | Array; immutable?: boolean } + ): Array; + /** + * [descr:ArrayStore] + */ + export class ArrayStore extends AbstractStore< + TItem, + TKey + > { + constructor(options?: ArrayStoreOptions); + /** + * [descr:ArrayStore.byKey(key)] + */ + byKey(key: TKey): DevExpress.core.utils.DxPromise; + /** + * [descr:ArrayStore.clear()] + */ + clear(): void; + /** + * [descr:ArrayStore.createQuery()] + */ + createQuery(): Query; + } + /** + * [descr:ArrayStoreOptions] + */ + export type ArrayStoreOptions = AbstractStoreOptions< + TItem, + TKey + > & { + /** + * [descr:ArrayStoreOptions.data] + */ + data?: Array; + }; + /** + * [descr:Utils.base64_encode(input)] + */ + export function base64_encode(input: string | Array): string; + /** + * [descr:Utils.compileGetter(expr)] + */ + export function compileGetter(expr: string | Array): Function; + /** + * [descr:Utils.compileSetter(expr)] + */ + export function compileSetter(expr: string | Array): Function; + /** + * [descr:CustomStore] + */ + export class CustomStore extends Store { + constructor(options?: CustomStoreOptions); + /** + * [descr:CustomStore.byKey(key, extraOptions)] + */ + byKey( + key: TKey, + extraOptions?: LoadOptions + ): DevExpress.core.utils.DxPromise; + /** + * [descr:CustomStore.clearRawDataCache()] + */ + clearRawDataCache(): void; + /** + * [descr:CustomStore.load()] + */ + load(): DevExpress.core.utils.DxExtendedPromise>; + /** + * [descr:CustomStore.load(options)] + */ + load( + options: LoadOptions + ): DevExpress.core.utils.DxExtendedPromise>; + } + /** + * [descr:CustomStoreOptions] + */ + export type CustomStoreOptions = StoreOptions< + TItem, + TKey + > & { + /** + * [descr:CustomStoreOptions.byKey] + */ + byKey?: ( + key: TKey, + extraOptions?: LoadOptions + ) => PromiseLike; + /** + * [descr:CustomStoreOptions.cacheRawData] + */ + cacheRawData?: boolean; + /** + * [descr:CustomStoreOptions.insert] + */ + insert?: (values: TItem) => PromiseLike; + /** + * [descr:CustomStoreOptions.load] + */ + load: ( + options: LoadOptions + ) => LoadFunctionResult>; + /** + * [descr:CustomStoreOptions.loadMode] + */ + loadMode?: 'processed' | 'raw'; + /** + * [descr:CustomStoreOptions.onLoaded] + */ + onLoaded?: ( + result: LoadResult, + loadOptions: LoadOptions + ) => void; + /** + * [descr:CustomStoreOptions.remove] + */ + remove?: (key: TKey) => PromiseLike; + /** + * [descr:CustomStoreOptions.totalCount] + */ + totalCount?: (loadOptions: { + filter?: FilterDescriptor | Array; + group?: GroupDescriptor | Array>; + }) => PromiseLike; + /** + * [descr:CustomStoreOptions.update] + */ + update?: (key: TKey, values: TItem) => PromiseLike; + /** + * [descr:CustomStoreOptions.useDefaultSearch] + */ + useDefaultSearch?: boolean | undefined; + }; + /** + * [descr:DataSource] + */ + export class DataSource { + constructor(data: Array); + constructor( + options: + | CustomStoreOptions + | DataSourceOptions + ); + constructor(store: DevExpress.data.utils.Store); + constructor(url: string); + /** + * [descr:DataSource.cancel(operationId)] + */ + cancel(operationId: number): boolean; + /** + * [descr:DataSource.dispose()] + */ + dispose(): void; + /** + * [descr:DataSource.filter()] + */ + filter(): FilterDescriptor | Array; + /** + * [descr:DataSource.filter(filterExpr)] + */ + filter(filterExpr: FilterDescriptor | Array): void; + /** + * [descr:DataSource.group()] + */ + group(): GroupDescriptor | Array>; + /** + * [descr:DataSource.group(groupExpr)] + */ + group( + groupExpr: GroupDescriptor | Array> + ): void; + /** + * [descr:DataSource.isLastPage()] + */ + isLastPage(): boolean; + /** + * [descr:DataSource.isLoaded()] + */ + isLoaded(): boolean; + /** + * [descr:DataSource.isLoading()] + */ + isLoading(): boolean; + /** + * [descr:DataSource.items()] + */ + items(): Array; + /** + * [descr:DataSource.key()] + */ + key(): string | Array; + /** + * [descr:DataSource.load()] + */ + load(): DevExpress.core.utils.DxExtendedPromise; + /** + * [descr:DataSource.loadOptions()] + */ + loadOptions(): LoadOptions; + /** + * [descr:DataSource.off(eventName)] + */ + off(eventName: DataSourceEventName): this; + /** + * [descr:DataSource.off(eventName, eventHandler)] + */ + off(eventName: DataSourceEventName, eventHandler: Function): this; + /** + * [descr:DataSource.on(eventName, eventHandler)] + */ + on(eventName: DataSourceEventName, eventHandler: Function): this; + /** + * [descr:DataSource.on(events)] + */ + on(events: { [key in DataSourceEventName]?: Function }): this; + /** + * [descr:DataSource.pageIndex()] + */ + pageIndex(): number; + /** + * [descr:DataSource.pageIndex(newIndex)] + */ + pageIndex(newIndex: number): void; + /** + * [descr:DataSource.pageSize()] + */ + pageSize(): number; + /** + * [descr:DataSource.pageSize(value)] + */ + pageSize(value: number): void; + /** + * [descr:DataSource.paginate()] + */ + paginate(): boolean; + /** + * [descr:DataSource.paginate(value)] + */ + paginate(value: boolean): void; + /** + * [descr:DataSource.reload()] + */ + reload(): DevExpress.core.utils.DxExtendedPromise; + /** + * [descr:DataSource.requireTotalCount()] + */ + requireTotalCount(): boolean; + /** + * [descr:DataSource.requireTotalCount(value)] + */ + requireTotalCount(value: boolean): void; + /** + * [descr:DataSource.searchExpr()] + */ + searchExpr(): string & Function & Array; + /** + * [descr:DataSource.searchExpr(expr)] + */ + searchExpr(expr: string | Function | Array): void; + /** + * [descr:DataSource.searchOperation()] + */ + searchOperation(): string; + /** + * [descr:DataSource.searchOperation(op)] + */ + searchOperation(op: string): void; + /** + * [descr:DataSource.searchValue()] + */ + searchValue(): any; + /** + * [descr:DataSource.searchValue(value)] + */ + searchValue(value: any): void; + /** + * [descr:DataSource.select()] + */ + select(): SelectDescriptor; + /** + * [descr:DataSource.select(expr)] + */ + select(expr: SelectDescriptor): void; + /** + * [descr:DataSource.sort()] + */ + sort(): SortDescriptor | Array>; + /** + * [descr:DataSource.sort(sortExpr)] + */ + sort(sortExpr: SortDescriptor | Array>): void; + /** + * [descr:DataSource.store()] + */ + store(): DevExpress.data.utils.Store; + /** + * [descr:DataSource.totalCount()] + */ + totalCount(): number; + } + /** + * [descr:DataSourceOptions] + */ + export type DataSourceOptions< + TStoreItem = any, + TMappedItem = TStoreItem, + TItem = TMappedItem, + TKey = any + > = { + /** + * [descr:DataSourceOptions.customQueryParams] + */ + customQueryParams?: any; + /** + * [descr:DataSourceOptions.expand] + */ + expand?: Array | string; + /** + * [descr:DataSourceOptions.filter] + */ + filter?: FilterDescriptor | Array; + /** + * [descr:DataSourceOptions.group] + */ + group?: GroupDescriptor | Array>; + /** + * [descr:DataSourceOptions.langParams] + */ + langParams?: LangParams; + /** + * [descr:DataSourceOptions.map] + */ + map?: (dataItem: TStoreItem) => TMappedItem; + /** + * [descr:DataSourceOptions.onChanged] + */ + onChanged?: (e: { readonly changes?: Array }) => void; + /** + * [descr:DataSourceOptions.onLoadError] + */ + onLoadError?: (error: { readonly message?: string }) => void; + /** + * [descr:DataSourceOptions.onLoadingChanged] + */ + onLoadingChanged?: (isLoading: boolean) => void; + /** + * [descr:DataSourceOptions.pageSize] + */ + pageSize?: number; + /** + * [descr:DataSourceOptions.paginate] + */ + paginate?: boolean | undefined; + /** + * [descr:DataSourceOptions.postProcess] + */ + postProcess?: (data: Array) => Array; + /** + * [descr:DataSourceOptions.pushAggregationTimeout] + */ + pushAggregationTimeout?: number | undefined; + /** + * [descr:DataSourceOptions.requireTotalCount] + */ + requireTotalCount?: boolean; + /** + * [descr:DataSourceOptions.reshapeOnPush] + */ + reshapeOnPush?: boolean; + /** + * [descr:DataSourceOptions.searchExpr] + */ + searchExpr?: string | Function | Array; + /** + * [descr:DataSourceOptions.searchOperation] + */ + searchOperation?: SearchOperation; + /** + * [descr:DataSourceOptions.searchValue] + */ + searchValue?: any; + /** + * [descr:DataSourceOptions.select] + */ + select?: SelectDescriptor; + /** + * [descr:DataSourceOptions.sort] + */ + sort?: SortDescriptor | Array>; + /** + * [descr:DataSourceOptions.store] + */ + store?: + | Array + | DevExpress.data.utils.Store + | DevExpress.data.utils.StoreOptions; + }; + /** + * [descr:EdmLiteral] + */ + export class EdmLiteral { + constructor(value: string); + /** + * [descr:EdmLiteral.valueOf()] + */ + valueOf(): string; + } + /** + * [descr:EndpointSelector] + */ + export class EndpointSelector { + constructor(options: any); + /** + * [descr:EndpointSelector.urlFor(key)] + */ + urlFor(key: string): string; + } + /** + * [descr:Utils.errorHandler] + * @deprecated [depNote:Utils.errorHandler] + */ + export function errorHandler(e: Error): void; + /** + * [descr:FilterDescriptor] + */ + export type FilterDescriptor = DevExpress.data.FilterDescriptor; + /** + * [descr:GroupDescriptor] + */ + export type GroupDescriptor = DevExpress.data.GroupDescriptor; + export type GroupingInterval = DevExpress.data.GroupingInterval; + /** + * [descr:GroupItem] + */ + export type GroupItem = { + /** + * [descr:GroupItem.key] + */ + key: any | string | number; + /** + * [descr:GroupItem.items] + */ + items: Array | Array> | null; + /** + * [descr:GroupItem.count] + */ + count?: number; + /** + * [descr:GroupItem.summary] + */ + summary?: Array; + }; + /** + * [descr:isGroupItemsArray] + */ + export function isGroupItemsArray( + res: LoadResult + ): res is Array>; + /** + * [descr:isItemsArray] + */ + export function isItemsArray( + res: LoadResult + ): res is Array; + /** + * [descr:isLoadResultObject] + */ + export function isLoadResultObject( + res: LoadResult + ): res is LoadResultObject; + /** + * [descr:Utils.keyConverters] + */ + export var keyConverters: any; + /** + * [descr:LangParams] + */ + export type LangParams = { + /** + * [descr:LangParams.locale] + */ + locale: string; + /** + * [descr:LangParams.collatorOptions] + */ + collatorOptions?: Intl.CollatorOptions; + }; + /** + * [descr:LoadOptions] + */ + export type LoadOptions = DevExpress.data.LoadOptions; + /** + * [descr:LoadResult] + */ + export type LoadResult = + | Object + | LoadResultArray + | LoadResultObject; + /** + * [descr:LoadResultObject] + */ + export type LoadResultObject = { + /** + * [descr:LoadResultObject.data] + */ + data: Array | Array>; + /** + * [descr:LoadResultObject.totalCount] + */ + totalCount?: number; + /** + * [descr:LoadResultObject.summary] + */ + summary?: Array; + /** + * [descr:LoadResultObject.groupCount] + */ + groupCount?: number; + }; + /** + * [descr:LocalStore] + */ + export class LocalStore extends ArrayStore< + TItem, + TKey + > { + constructor(options?: LocalStoreOptions); + /** + * [descr:LocalStore.clear()] + */ + clear(): void; + } + /** + * [descr:LocalStoreOptions] + */ + export type LocalStoreOptions = ArrayStoreOptions< + TItem, + TKey + > & { + /** + * [descr:LocalStoreOptions.flushInterval] + */ + flushInterval?: number; + /** + * [descr:LocalStoreOptions.immediate] + */ + immediate?: boolean; + /** + * [descr:LocalStoreOptions.name] + */ + name?: string; + }; + /** + * [descr:ODataContext] + */ + export class ODataContext { + constructor(options?: ODataContextOptions); + /** + * [descr:ODataContext.get(operationName, params)] + */ + get( + operationName: string, + params: any + ): DevExpress.core.utils.DxPromise; + /** + * [descr:ODataContext.invoke(operationName, params, httpMethod)] + */ + invoke( + operationName: string, + params: any, + httpMethod: HttpMethod + ): DevExpress.core.utils.DxPromise; + /** + * [descr:ODataContext.objectLink(entityAlias, key)] + */ + objectLink(entityAlias: string, key: any | string | number): any; + } + /** + * [descr:ODataContextOptions] + */ + export type ODataContextOptions = { + /** + * [descr:ODataContextOptions.beforeSend] + */ + beforeSend?: (options: { + url: string; + async: boolean; + method: string; + timeout: number; + params: any; + payload: any; + headers: any; + }) => void; + /** + * [descr:ODataContextOptions.deserializeDates] + */ + deserializeDates?: boolean; + /** + * [descr:ODataContextOptions.entities] + */ + entities?: any; + /** + * [descr:ODataContextOptions.errorHandler] + */ + errorHandler?: (e: { + httpStatus: number; + errorDetails: any; + requestOptions: ODataRequestOptions; + }) => void; + /** + * [descr:ODataContextOptions.filterToLower] + */ + filterToLower?: boolean; + /** + * [descr:ODataContextOptions.jsonp] + */ + jsonp?: boolean; + /** + * [descr:ODataContextOptions.url] + */ + url?: string; + /** + * [descr:ODataContextOptions.version] + */ + version?: number; + /** + * [descr:ODataContextOptions.withCredentials] + */ + withCredentials?: boolean; + }; + /** + * [descr:ODataStore] + */ + export class ODataStore extends AbstractStore< + TItem, + TKey + > { + constructor(options?: ODataStoreOptions); + /** + * [descr:ODataStore.byKey(key, extraOptions)] + */ + byKey( + key: TKey, + extraOptions?: { + expand?: string | Array; + select?: string | Array; + } + ): DevExpress.core.utils.DxPromise; + /** + * [descr:ODataStore.createQuery(loadOptions)] + */ + createQuery(loadOptions?: { + expand?: string | Array; + requireTotalCount?: boolean; + customQueryParams?: any; + }): Query; + } + /** + * [descr:ODataStoreOptions] + */ + export type ODataStoreOptions = AbstractStoreOptions< + TItem, + TKey + > & { + /** + * [descr:ODataStoreOptions.beforeSend] + */ + beforeSend?: (options: { + url: string; + async: boolean; + method: string; + timeout: number; + params: any; + payload: any; + headers: any; + }) => void; + /** + * [descr:ODataStoreOptions.deserializeDates] + */ + deserializeDates?: boolean; + /** + * [descr:ODataStoreOptions.errorHandler] + */ + errorHandler?: (e: { + httpStatus: number; + errorDetails: any; + requestOptions: ODataRequestOptions; + }) => void; + /** + * [descr:ODataStoreOptions.fieldTypes] + */ + fieldTypes?: any; + /** + * [descr:ODataStoreOptions.filterToLower] + */ + filterToLower?: boolean; + /** + * [descr:ODataStoreOptions.jsonp] + */ + jsonp?: boolean; + /** + * [descr:ODataStoreOptions.keyType] + */ + keyType?: + | 'String' + | 'Int32' + | 'Int64' + | 'Guid' + | 'Boolean' + | 'Single' + | 'Decimal' + | any; + /** + * [descr:ODataStoreOptions.url] + */ + url?: string; + /** + * [descr:ODataStoreOptions.version] + */ + version?: number; + /** + * [descr:ODataStoreOptions.withCredentials] + */ + withCredentials?: boolean; + }; + /** + * [descr:Utils.query(array, queryOptions)] + */ + export function query(array: Array, queryOptions?: any): Query; + /** + * [descr:Utils.query(url, queryOptions)] + */ + export function query(url: string, queryOptions: any): Query; + /** + * [descr:Query] + */ + export type Query = { + /** + * [descr:Query.aggregate(seed, step, finalize)] + */ + aggregate( + seed: any, + step: Function, + finalize: Function + ): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.aggregate(step)] + */ + aggregate(step: Function): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.avg()] + */ + avg(): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.avg(getter)] + */ + avg(getter: any): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.count()] + */ + count(): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.enumerate()] + */ + enumerate(): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.filter(criteria)] + */ + filter(criteria: Array): Query; + /** + * [descr:Query.filter(predicate)] + */ + filter(predicate: Function): Query; + /** + * [descr:Query.groupBy(getter)] + */ + groupBy(getter: any): Query; + /** + * [descr:Query.max()] + */ + max(): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.max(getter)] + */ + max(getter: any): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.min()] + */ + min(): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.min(getter)] + */ + min(getter: any): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.select(getter)] + */ + select(...getters: any[]): Query; + /** + * [descr:Query.slice(skip, take)] + */ + slice(skip: number, take?: number): Query; + /** + * [descr:Query.sortBy(getter)] + */ + sortBy(getter: any): Query; + /** + * [descr:Query.sortBy(getter, desc)] + */ + sortBy(getter: any, desc: boolean): Query; + /** + * [descr:Query.sum()] + */ + sum(): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.sum(getter)] + */ + sum(getter: any): DevExpress.core.utils.DxPromise; + /** + * [descr:Query.thenBy(getter)] + */ + thenBy(getter: any): Query; + /** + * [descr:Query.thenBy(getter, desc)] + */ + thenBy(getter: any, desc: boolean): Query; + /** + * [descr:Query.toArray()] + */ + toArray(): Array; + }; + /** + * [descr:ResolvedData] + * @deprecated [depNote:ResolvedData] + */ + export type ResolvedData = LoadResult; + export type SearchOperation = DevExpress.data.SearchOperation; + /** + * [descr:SelectDescriptor] + */ + export type SelectDescriptor = DevExpress.data.SelectDescriptor; + /** + * [descr:Utils.setErrorHandler] + */ + export function setErrorHandler(handler: (e: Error) => void): void; + /** + * [descr:SortDescriptor] + */ + export type SortDescriptor = DevExpress.data.SortDescriptor; + /** + * [descr:Store] + * @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 class Store { + constructor(options?: StoreOptions); + /** + * [descr:Store.insert(values)] + */ + insert(values: TItem): DevExpress.core.utils.DxExtendedPromise; + /** + * [descr:Store.key()] + */ + key(): string | Array; + /** + * [descr:Store.keyOf(obj)] + */ + keyOf(obj: TItem): TKey; + /** + * [descr:Store.off(eventName)] + */ + off(eventName: DevExpress.data.StoreEventName): this; + /** + * [descr:Store.off(eventName, eventHandler)] + */ + off( + eventName: DevExpress.data.StoreEventName, + eventHandler: Function + ): this; + /** + * [descr:Store.on(eventName, eventHandler)] + */ + on(eventName: DevExpress.data.StoreEventName, eventHandler: Function): this; + /** + * [descr:Store.on(events)] + */ + on(events: { [key in DevExpress.data.StoreEventName]?: Function }): this; + /** + * [descr:Store.push(changes)] + */ + push( + changes: Array<{ + type: 'insert' | 'update' | 'remove'; + data?: DevExpress.core.DeepPartial; + key?: TKey; + index?: number; + }> + ): void; + /** + * [descr:Store.remove(key)] + */ + remove(key: TKey): DevExpress.core.utils.DxPromise; + /** + * [descr:Store.totalCount(options)] + */ + totalCount(obj: { + filter?: FilterDescriptor | Array; + group?: GroupDescriptor | Array>; + }): DevExpress.core.utils.DxPromise; + /** + * [descr:Store.update(key, values)] + */ + update( + key: TKey, + values: DevExpress.core.DeepPartial + ): DevExpress.core.utils.DxExtendedPromise; + } + /** + * [descr:StoreOptions] + * @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 type StoreOptions = { + /** + * [descr:StoreOptions.errorHandler] + */ + errorHandler?: Function; + /** + * [descr:StoreOptions.key] + */ + key?: string | Array; + /** + * [descr:StoreOptions.onInserted] + */ + onInserted?: (values: TItem, key: TKey) => void; + /** + * [descr:StoreOptions.onInserting] + */ + onInserting?: (values: TItem) => void; + /** + * [descr:StoreOptions.onLoading] + */ + onLoading?: (loadOptions: LoadOptions) => void; + /** + * [descr:StoreOptions.onModified] + */ + onModified?: Function; + /** + * [descr:StoreOptions.onModifying] + */ + onModifying?: Function; + /** + * [descr:StoreOptions.onPush] + */ + onPush?: (changes: Array) => void; + /** + * [descr:StoreOptions.onRemoved] + */ + onRemoved?: (key: TKey) => void; + /** + * [descr:StoreOptions.onRemoving] + */ + onRemoving?: (key: TKey) => void; + /** + * [descr:StoreOptions.onUpdated] + */ + onUpdated?: (key: TKey, values: TItem) => void; + /** + * [descr:StoreOptions.onUpdating] + */ + onUpdating?: (key: TKey, values: TItem) => void; + }; + /** + * [descr:SummaryDescriptor] + */ + export type SummaryDescriptor = DevExpress.data.SummaryDescriptor; +} +declare module DevExpress.common.Export.excel { + export type DataGridCell = DevExpress.excelExporter.ExcelDataGridCell; + /** + * [descr:ExcelExportDataGridProps] + */ + export type DataGridExportOptions = + DevExpress.excelExporter.ExcelExportBaseOptions & { + /** + * [descr:ExcelExportDataGridProps.component] + */ + component?: DevExpress.ui.dxDataGrid | undefined; + /** + * [descr:ExcelExportDataGridProps.selectedRowsOnly] + */ + selectedRowsOnly?: boolean; + /** + * [descr:ExcelExportDataGridProps.autoFilterEnabled] + */ + autoFilterEnabled?: boolean; + /** + * [descr:ExcelExportDataGridProps.customizeCell] + */ + customizeCell?: (options: { + gridCell?: DataGridCell; + excelCell?: any; + }) => void; + }; + /** + * [descr:excelExporter.exportDataGrid(options)] + */ + export function exportDataGrid( + options: DataGridExportOptions + ): DevExpress.core.utils.DxPromise; + /** + * [descr:excelExporter.exportPivotGrid(options)] + */ + export function exportPivotGrid( + options: PivotGridExportOptions + ): DevExpress.core.utils.DxPromise; + export type PivotGridCell = DevExpress.excelExporter.ExcelPivotGridCell; + /** + * [descr:PivotGridExportOptions] + */ + export type PivotGridExportOptions = + DevExpress.excelExporter.ExcelExportBaseOptions & { + /** + * [descr:PivotGridExportOptions.component] + */ + component?: DevExpress.ui.dxPivotGrid | undefined; + /** + * [descr:PivotGridExportOptions.mergeRowFieldValues] + */ + mergeRowFieldValues?: boolean; + /** + * [descr:PivotGridExportOptions.mergeColumnFieldValues] + */ + mergeColumnFieldValues?: boolean; + /** + * [descr:PivotGridExportOptions.exportFilterFieldHeaders] + */ + exportFilterFieldHeaders?: boolean; + /** + * [descr:PivotGridExportOptions.exportDataFieldHeaders] + */ + exportDataFieldHeaders?: boolean; + /** + * [descr:PivotGridExportOptions.exportColumnFieldHeaders] + */ + exportColumnFieldHeaders?: boolean; + /** + * [descr:PivotGridExportOptions.exportRowFieldHeaders] + */ + exportRowFieldHeaders?: boolean; + /** + * [descr:PivotGridExportOptions.customizeCell] + */ + customizeCell?: (options: { + pivotCell?: PivotGridCell; + excelCell?: any; + }) => void; + }; +} +declare module DevExpress.common.Export.pdf { + /** + * [descr:PdfCell] + */ + export type Cell = { + /** + * [descr:PdfCell.backgroundColor] + */ + backgroundColor?: string; + /** + * [descr:PdfCell.borderColor] + */ + borderColor?: string; + /** + * [descr:PdfCell.borderWidth] + */ + borderWidth?: number; + /** + * [descr:PdfCell.drawLeftBorder] + */ + drawLeftBorder?: boolean; + /** + * [descr:PdfCell.drawTopBorder] + */ + drawTopBorder?: boolean; + /** + * [descr:PdfCell.drawRightBorder] + */ + drawRightBorder?: boolean; + /** + * [descr:PdfCell.drawBottomBorder] + */ + drawBottomBorder?: boolean; + /** + * [descr:PdfCell.font] + */ + font?: { + /** + * [descr:PdfCell.font.size] + */ + size?: number; + /** + * [descr:PdfCell.font.name] + */ + name?: string; + /** + * [descr:PdfCell.font.style] + */ + style?: 'normal' | 'bold' | 'italic'; + }; + /** + * [descr:PdfCell.horizontalAlign] + */ + horizontalAlign?: 'left' | 'center' | 'right'; + /** + * [descr:PdfCell.padding] + */ + padding?: { + /** + * [descr:PdfCell.padding.top] + */ + top?: number; + /** + * [descr:PdfCell.padding.left] + */ + left?: number; + /** + * [descr:PdfCell.padding.right] + */ + right?: number; + /** + * [descr:PdfCell.padding.bottom] + */ + bottom?: number; + }; + /** + * [descr:PdfCell.text] + */ + text?: string; + /** + * [descr:PdfCell.textColor] + */ + textColor?: string; + /** + * [descr:PdfCell.verticalAlign] + */ + verticalAlign?: 'top' | 'middle' | 'bottom'; + /** + * [descr:PdfCell.wordWrapEnabled] + */ + wordWrapEnabled?: boolean; + }; + export type DataGridCell = DevExpress.pdfExporter.PdfDataGridCell; + /** + * [descr:PdfExportDataGridProps] + */ + export type DataGridExportOptions = { + /** + * [descr:PdfExportDataGridProps.jsPDFDocument] + */ + jsPDFDocument?: object | undefined; + /** + * [descr:PdfExportDataGridProps.component] + */ + component?: DevExpress.ui.dxDataGrid | undefined; + /** + * [descr:PdfExportDataGridProps.topLeft] + */ + topLeft?: { + /** + * [descr:PdfExportDataGridProps.topLeft.x] + */ + x?: number; + /** + * [descr:PdfExportDataGridProps.topLeft.y] + */ + y?: number; + }; + /** + * [descr:PdfExportDataGridProps.columnWidths] + */ + columnWidths?: Array | undefined; + /** + * [descr:PdfExportDataGridProps.indent] + */ + indent?: number; + /** + * [descr:PdfExportDataGridProps.margin] + */ + margin?: { + /** + * [descr:PdfExportDataGridProps.margin.top] + */ + top?: number; + /** + * [descr:PdfExportDataGridProps.margin.left] + */ + left?: number; + /** + * [descr:PdfExportDataGridProps.margin.right] + */ + right?: number; + /** + * [descr:PdfExportDataGridProps.margin.bottom] + */ + bottom?: number; + }; + /** + * [descr:PdfExportDataGridProps.repeatHeaders] + */ + repeatHeaders?: boolean; + /** + * [descr:PdfExportDataGridProps.selectedRowsOnly] + */ + selectedRowsOnly?: boolean; + /** + * [descr:PdfExportDataGridProps.customDrawCell] + */ + customDrawCell?: (options: { + gridCell?: DataGridCell; + pdfCell?: Cell; + doc?: any; + rect?: { x: number; y: number; h: number; w: number }; + cancel?: boolean; + }) => void; + /** + * [descr:PdfExportDataGridProps.customizeCell] + */ + customizeCell?: (options: { + gridCell?: DataGridCell; + pdfCell?: Cell; + }) => void; + /** + * [descr:PdfExportDataGridProps.onRowExporting] + */ + onRowExporting?: (options: { + rowCells?: Array; + rowHeight?: number; + }) => void; + /** + * [descr:PdfExportDataGridProps.loadPanel] + */ + loadPanel?: ExportLoadPanel; + }; + /** + * [descr:pdfExporter.exportDataGrid(options)] + */ + export function exportDataGrid( + options: DataGridExportOptions + ): DevExpress.core.utils.DxPromise; + /** + * [descr:pdfExporter.exportGantt(options)] + */ + export function exportGantt( + options: GanttExportOptions + ): DevExpress.core.utils.DxPromise; + /** + * [descr:GanttExportFont] + */ + export type GanttExportFont = { + /** + * [descr:GanttExportFont.fontObject] + */ + fontObject: object | undefined; + /** + * [descr:GanttExportFont.name] + */ + name: string | undefined; + /** + * [descr:GanttExportFont.style] + */ + style?: string; + /** + * [descr:GanttExportFont.weight] + */ + weight?: string | number | undefined; + }; + /** + * [descr:GanttExportOptions] + */ + export type GanttExportOptions = { + /** + * [descr:GanttExportOptions.createDocumentMethod] + */ + createDocumentMethod?: (options: any) => object; + /** + * [descr:GanttExportOptions.jsPDFDocument] + */ + jsPDFDocument?: object | undefined; + /** + * [descr:GanttExportOptions.component] + */ + component?: DevExpress.ui.dxGantt | undefined; + /** + * [descr:GanttExportOptions.format] + */ + format?: string | object | undefined; + /** + * [descr:GanttExportOptions.landscape] + */ + landscape?: boolean; + /** + * [descr:GanttExportOptions.fileName] + */ + fileName?: string | undefined; + /** + * [descr:GanttExportOptions.margins] + */ + margins?: object | undefined; + /** + * [descr:GanttExportOptions.exportMode] + */ + exportMode?: DevExpress.ui.dxGantt.GanttPdfExportMode; + /** + * [descr:GanttExportOptions.dateRange] + */ + dateRange?: DevExpress.ui.dxGantt.GanttPdfExportDateRange | object; + /** + * [descr:GanttExportOptions.font] + */ + font?: GanttExportFont; + }; +} +declare module DevExpress.common.grids { + /** + * [descr:AdaptiveDetailRowPreparingInfo] + * @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 type AdaptiveDetailRowPreparingInfo = { + /** + * [descr:AdaptiveDetailRowPreparingInfo.formOptions] + */ + readonly formOptions: any; + }; + export type ApplyChangesMode = 'instantly' | 'onDemand'; + export type ApplyFilterMode = 'auto' | 'onClick'; + /** + * [descr:GridBaseColumn] + * @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 ColumnBase { + /** + * [descr:GridBaseColumn.alignment] + */ + alignment?: HorizontalAlignment | undefined; + /** + * [descr:GridBaseColumn.allowEditing] + */ + allowEditing?: boolean; + /** + * [descr:GridBaseColumn.allowFiltering] + */ + allowFiltering?: boolean; + /** + * [descr:GridBaseColumn.allowFixing] + */ + allowFixing?: boolean; + /** + * [descr:GridBaseColumn.allowHeaderFiltering] + */ + allowHeaderFiltering?: boolean; + /** + * [descr:GridBaseColumn.allowHiding] + */ + allowHiding?: boolean; + /** + * [descr:GridBaseColumn.allowReordering] + */ + allowReordering?: boolean; + /** + * [descr:GridBaseColumn.allowResizing] + */ + allowResizing?: boolean; + /** + * [descr:GridBaseColumn.allowSearch] + */ + allowSearch?: boolean; + /** + * [descr:GridBaseColumn.allowSorting] + */ + allowSorting?: boolean; + /** + * [descr:GridBaseColumn.calculateCellValue] + */ + calculateCellValue?: (this: ColumnBase, rowData: TRowData) => any; + defaultCalculateCellValue?: this['calculateCellValue']; + /** + * [descr:GridBaseColumn.calculateDisplayValue] + */ + calculateDisplayValue?: + | string + | ((this: ColumnBase, rowData: TRowData) => any); + /** + * [descr:GridBaseColumn.calculateFilterExpression] + */ + calculateFilterExpression?: ( + this: ColumnBase, + filterValue: any, + selectedFilterOperation: string | null, + target: string + ) => string | Array | Function; + defaultCalculateFilterExpression?: this['calculateFilterExpression']; + /** + * [descr:GridBaseColumn.calculateSortValue] + */ + calculateSortValue?: + | string + | ((this: ColumnBase, rowData: TRowData) => any); + /** + * [descr:GridBaseColumn.caption] + */ + caption?: string | undefined; + /** + * [descr:GridBaseColumn.cssClass] + */ + cssClass?: string | undefined; + /** + * [descr:GridBaseColumn.customizeText] + */ + customizeText?: ( + this: ColumnBase, + cellInfo: ColumnCustomizeTextArg + ) => string; + /** + * [descr:GridBaseColumn.dataField] + */ + dataField?: string | undefined; + /** + * [descr:GridBaseColumn.dataType] + */ + dataType?: DataType | undefined; + /** + * [descr:GridBaseColumn.editorOptions] + */ + editorOptions?: any; + /** + * [descr:GridBaseColumn.encodeHtml] + */ + encodeHtml?: boolean; + /** + * [descr:GridBaseColumn.falseText] + */ + falseText?: string; + /** + * [descr:GridBaseColumn.filterOperations] + */ + filterOperations?: Array; + /** + * [descr:GridBaseColumn.filterType] + */ + filterType?: FilterType; + /** + * [descr:GridBaseColumn.filterValue] + */ + filterValue?: any | undefined; + /** + * [descr:GridBaseColumn.filterValues] + */ + filterValues?: Array; + /** + * [descr:GridBaseColumn.fixed] + */ + fixed?: boolean; + /** + * [descr:GridBaseColumn.fixedPosition] + */ + fixedPosition?: FixedPosition | undefined; + /** + * [descr:GridBaseColumn.formItem] + */ + formItem?: DevExpress.ui.dxForm.SimpleItem; + /** + * [descr:GridBaseColumn.format] + */ + format?: DevExpress.common.core.localization.Format; + /** + * [descr:GridBaseColumn.headerFilter] + */ + headerFilter?: ColumnHeaderFilter | undefined; + /** + * [descr:GridBaseColumn.hidingPriority] + */ + hidingPriority?: number | undefined; + /** + * [descr:GridBaseColumn.isBand] + */ + isBand?: boolean | undefined; + /** + * [descr:GridBaseColumn.lookup] + */ + lookup?: ColumnLookup | undefined; + /** + * [descr:GridBaseColumn.minWidth] + */ + minWidth?: number | undefined; + /** + * [descr:GridBaseColumn.name] + */ + name?: string | undefined; + /** + * [descr:GridBaseColumn.ownerBand] + */ + ownerBand?: number | undefined; + /** + * [descr:GridBaseColumn.renderAsync] + */ + renderAsync?: boolean; + /** + * [descr:GridBaseColumn.selectedFilterOperation] + */ + selectedFilterOperation?: SelectedFilterOperation | undefined; + /** + * [descr:GridBaseColumn.setCellValue] + */ + setCellValue?: ( + this: ColumnBase, + newData: DevExpress.core.DeepPartial, + value: any, + currentRowData: TRowData + ) => void | PromiseLike; + defaultSetCellValue?: this['setCellValue']; + /** + * [descr:GridBaseColumn.showEditorAlways] + */ + showEditorAlways?: boolean; + /** + * [descr:GridBaseColumn.showInColumnChooser] + */ + showInColumnChooser?: boolean; + /** + * [descr:GridBaseColumn.sortIndex] + */ + sortIndex?: number | undefined; + /** + * [descr:GridBaseColumn.sortOrder] + */ + sortOrder?: SortOrder | undefined; + /** + * [descr:GridBaseColumn.sortingMethod] + */ + sortingMethod?: + | ((this: ColumnBase, value1: any, value2: any) => number) + | undefined; + /** + * [descr:GridBaseColumn.trueText] + */ + trueText?: string; + /** + * [descr:GridBaseColumn.validationRules] + */ + validationRules?: Array; + /** + * [descr:GridBaseColumn.visible] + */ + visible?: boolean; + /** + * [descr:GridBaseColumn.visibleIndex] + */ + visibleIndex?: number | undefined; + /** + * [descr:GridBaseColumn.width] + */ + width?: number | string | undefined; + } + /** + * [descr:GridBaseColumnButton] + * @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 ColumnButtonBase { + /** + * [descr:GridBaseColumnButton.cssClass] + */ + cssClass?: string; + /** + * [descr:GridBaseColumnButton.hint] + */ + hint?: string; + /** + * [descr:GridBaseColumnButton.icon] + */ + icon?: string; + /** + * [descr:GridBaseColumnButton.text] + */ + text?: string; + } + /** + * [descr:ColumnChooser] + */ + export type ColumnChooser = { + /** + * [descr:GridBaseOptions.columnChooser.allowSearch] + * @deprecated [depNote:GridBaseOptions.columnChooser.allowSearch] + */ + allowSearch?: boolean; + /** + * [descr:GridBaseOptions.columnChooser.container] + */ + container?: string | DevExpress.core.UserDefinedElement | undefined; + /** + * [descr:GridBaseOptions.columnChooser.emptyPanelText] + */ + emptyPanelText?: string; + /** + * [descr:GridBaseOptions.columnChooser.enabled] + */ + enabled?: boolean; + /** + * [descr:GridBaseOptions.columnChooser.height] + */ + height?: number | string; + /** + * [descr:GridBaseOptions.columnChooser.mode] + */ + mode?: ColumnChooserMode; + /** + * [descr:GridBaseOptions.columnChooser.position] + */ + position?: DevExpress.common.core.animation.PositionConfig | undefined; /** * [descr:GridBaseOptions.columnChooser.search] */ @@ -3089,7 +4686,7 @@ declare module DevExpress.common.grids { | DevExpress.ui.dxFilterBuilder.FilterLookupDataSource | ((options: { component?: any; - dataSource?: DevExpress.data.DataSource.Options | null; + dataSource?: DevExpress.common.data.DataSourceOptions | null; }) => void) | undefined; /** @@ -3639,7 +5236,7 @@ declare module DevExpress.common.grids { * [descr:GridBase.getCombinedFilter(returnDataField)] */ getCombinedFilter(returnDataField: boolean): any; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.data.DataSource; /** * [descr:GridBase.getKeyByRowIndex(rowIndex)] */ @@ -3835,10 +5432,7 @@ declare module DevExpress.common.grids { /** * [descr:GridBaseOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike< - TRowData, - TKey - > | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:GridBaseOptions.dateSerializationFormat] */ @@ -3915,144 +5509,152 @@ declare module DevExpress.common.grids { * [descr:GridBaseOptions.onAdaptiveDetailRowPreparing] */ onAdaptiveDetailRowPreparing?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.core.events.EventInfo & AdaptiveDetailRowPreparingInfo ) => void; /** * [descr:GridBaseOptions.onDataErrorOccurred] */ onDataErrorOccurred?: ( - e: DevExpress.events.EventInfo & DataErrorOccurredInfo + e: DevExpress.common.core.events.EventInfo & + DataErrorOccurredInfo ) => void; /** * [descr:GridBaseOptions.onEditCanceled] */ onEditCanceled?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.core.events.EventInfo & DataChangeInfo ) => void; /** * [descr:GridBaseOptions.onEditCanceling] */ onEditCanceling?: ( - e: DevExpress.events.Cancelable & - DevExpress.events.EventInfo & + e: DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo & DataChangeInfo ) => void; /** * [descr:GridBaseOptions.onInitNewRow] */ onInitNewRow?: ( - e: DevExpress.events.EventInfo & NewRowInfo + e: DevExpress.common.core.events.EventInfo & + NewRowInfo ) => void; /** * [descr:GridBaseOptions.onKeyDown] */ onKeyDown?: ( - e: DevExpress.events.NativeEventInfo & + e: DevExpress.common.core.events.NativeEventInfo< + TComponent, + KeyboardEvent + > & KeyDownInfo ) => void; /** * [descr:GridBaseOptions.onRowCollapsed] */ onRowCollapsed?: ( - e: DevExpress.events.EventInfo & RowKeyInfo + e: DevExpress.common.core.events.EventInfo & RowKeyInfo ) => void; /** * [descr:GridBaseOptions.onRowCollapsing] */ onRowCollapsing?: ( - e: DevExpress.events.Cancelable & - DevExpress.events.EventInfo & + e: DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo & RowKeyInfo ) => void; /** * [descr:GridBaseOptions.onRowExpanded] */ onRowExpanded?: ( - e: DevExpress.events.EventInfo & RowKeyInfo + e: DevExpress.common.core.events.EventInfo & RowKeyInfo ) => void; /** * [descr:GridBaseOptions.onRowExpanding] */ onRowExpanding?: ( - e: DevExpress.events.Cancelable & - DevExpress.events.EventInfo & + e: DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo & RowKeyInfo ) => void; /** * [descr:GridBaseOptions.onRowInserted] */ onRowInserted?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.core.events.EventInfo & RowInsertedInfo ) => void; /** * [descr:GridBaseOptions.onRowInserting] */ onRowInserting?: ( - e: DevExpress.events.EventInfo & RowInsertingInfo + e: DevExpress.common.core.events.EventInfo & + RowInsertingInfo ) => void; /** * [descr:GridBaseOptions.onRowRemoved] */ onRowRemoved?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.core.events.EventInfo & RowRemovedInfo ) => void; /** * [descr:GridBaseOptions.onRowRemoving] */ onRowRemoving?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.core.events.EventInfo & RowRemovingInfo ) => void; /** * [descr:GridBaseOptions.onRowUpdated] */ onRowUpdated?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.core.events.EventInfo & RowUpdatedInfo ) => void; /** * [descr:GridBaseOptions.onRowUpdating] */ onRowUpdating?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.core.events.EventInfo & RowUpdatingInfo ) => void; /** * [descr:GridBaseOptions.onRowValidating] */ onRowValidating?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.core.events.EventInfo & RowValidatingInfo ) => void; /** * [descr:GridBaseOptions.onSaved] */ onSaved?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.core.events.EventInfo & DataChangeInfo ) => void; /** * [descr:GridBaseOptions.onSaving] */ onSaving?: ( - e: DevExpress.events.EventInfo & SavingInfo + e: DevExpress.common.core.events.EventInfo & + SavingInfo ) => void; /** * [descr:GridBaseOptions.onSelectionChanged] */ onSelectionChanged?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.core.events.EventInfo & SelectionChangedInfo ) => void; /** * [descr:GridBaseOptions.onToolbarPreparing] */ onToolbarPreparing?: ( - e: DevExpress.events.EventInfo & ToolbarPreparingInfo + e: DevExpress.common.core.events.EventInfo & + ToolbarPreparingInfo ) => void; /** * [descr:GridBaseOptions.pager] @@ -4414,7 +6016,7 @@ declare module DevExpress.common.grids { * [descr:GridBaseOptions.rowDragging.dragTemplate] */ dragTemplate?: - | DevExpress.core.template + | template | (( dragInfo: RowDraggingTemplateData, containerElement: DevExpress.core.DxElement @@ -4449,7 +6051,7 @@ declare module DevExpress.common.grids { * [descr:GridBaseOptions.rowDragging.onDragChange] */ onDragChange?: ( - e: DevExpress.events.Cancelable & + e: DevExpress.common.core.events.Cancelable & ReducedNativeEventInfo & RowDraggingEventInfo & DragDropInfo @@ -4458,7 +6060,7 @@ declare module DevExpress.common.grids { * [descr:GridBaseOptions.rowDragging.onDragEnd] */ onDragEnd?: ( - e: DevExpress.events.Cancelable & + e: DevExpress.common.core.events.Cancelable & ReducedNativeEventInfo & RowDraggingEventInfo & DragDropInfo @@ -4467,7 +6069,7 @@ declare module DevExpress.common.grids { * [descr:GridBaseOptions.rowDragging.onDragMove] */ onDragMove?: ( - e: DevExpress.events.Cancelable & + e: DevExpress.common.core.events.Cancelable & ReducedNativeEventInfo & RowDraggingEventInfo & DragDropInfo @@ -4476,7 +6078,7 @@ declare module DevExpress.common.grids { * [descr:GridBaseOptions.rowDragging.onDragStart] */ onDragStart?: ( - e: DevExpress.events.Cancelable & + e: DevExpress.common.core.events.Cancelable & ReducedNativeEventInfo & DragStartEventInfo ) => void; @@ -4918,12 +6520,46 @@ declare module DevExpress.core { [P in keyof T]?: DeepPartial; }; /** - * [descr:DefaultOptionsRule] + * [descr:DevicesObject] */ - export type DefaultOptionsRule = { - device?: Device | Device[] | ((device: Device) => boolean); - options: DeepPartial; - }; + export class DevicesObject { + constructor(options?: { window?: Window }); + /** + * [descr:DevicesObject.current()] + */ + current(): DevExpress.common.core.environment.Device; + /** + * [descr:DevicesObject.current(deviceName)] + */ + current( + deviceName: string | DevExpress.common.core.environment.Device + ): void; + /** + * [descr:DevicesObject.off(eventName)] + */ + off(eventName: DevExpress.common.EventName): this; + /** + * [descr:DevicesObject.off(eventName, eventHandler)] + */ + off(eventName: DevExpress.common.EventName, eventHandler: Function): this; + /** + * [descr:DevicesObject.on(eventName, eventHandler)] + */ + on(eventName: DevExpress.common.EventName, eventHandler: Function): this; + /** + * [descr:DevicesObject.on(events)] + */ + on(events: { [key in DevExpress.common.EventName]?: Function }): this; + /** + * [descr:DevicesObject.orientation()] + */ + orientation(): 'portrait' | 'landscape' | undefined; + /** + * [descr:DevicesObject.real()] + */ + real(): DevExpress.common.core.environment.Device; + isSimulator(): boolean; + } /** * [descr:dxElement] * @deprecated [depNote:dxElement] @@ -4973,11 +6609,6 @@ declare module DevExpress.core { * @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. */ interface ElementWrapper extends JQuery {} - /** - * @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. - */ - type EventName = 'orientationChanged'; - export type FloatingActionButtonDirection = 'auto' | 'up' | 'down'; /** * @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. */ @@ -5019,10 +6650,6 @@ declare module DevExpress.core { | Function | Symbol | Array; - /** - * [descr:template] - */ - export type template = string | Function | UserDefinedElement; /** * @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. @@ -5041,610 +6668,97 @@ declare module DevExpress.core { * [descr:UserDefinedElement] * @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 type UserDefinedElement = - {} extends Condition ? T : ElementWrapper | T; - /** - * @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 type UserDefinedElementsArray = {} extends Condition - ? Array - : ElementsArrayWrapper; -} -declare module DevExpress.core.utils { - /** - * @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 type DxExtendedPromise = DxPromise & { - then( - onFulfilled?: - | (( - value: T, - extraParameters?: any - ) => TResult1 | PromiseLike) - | undefined - | null, - onRejected?: - | ((reason: any) => TResult2 | PromiseLike) - | undefined - | null - ): PromiseLike; - }; - /** - * [descr:DxPromise] - * @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 type DxPromise = {} extends PromiseType - ? Promise - : PromiseType; -} -declare module DevExpress.data { - /** - * @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 class AbstractStore extends Store< - TItem, - TKey - > { - constructor(options?: DevExpress.data.AbstractStore.Options); - /** - * [descr:Store.load()] - */ - load(): DevExpress.core.utils.DxExtendedPromise>; - /** - * [descr:Store.load(options)] - */ - load( - options: LoadOptions - ): DevExpress.core.utils.DxExtendedPromise>; - } - module AbstractStore { - /** - * @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 type Options = AbstractStoreOptions< - TItem, - TKey - >; - } - /** - * @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. - */ - interface AbstractStoreOptions - extends DevExpress.data.Store.Options { - /** - * [descr:StoreOptions.onLoaded] - */ - onLoaded?: (result: Array, loadOptions: LoadOptions) => void; - } - /** - * [descr:Utils.applyChanges(data, changes, options)] - */ - export function applyChanges( - data: Array, - changes: Array, - options?: { keyExpr?: string | Array; immutable?: boolean } - ): Array; - /** - * [descr:ArrayStore] - */ - export class ArrayStore extends AbstractStore< - TItem, - TKey - > { - constructor(options?: DevExpress.data.ArrayStore.Options); - /** - * [descr:ArrayStore.byKey(key)] - */ - byKey(key: TKey): DevExpress.core.utils.DxPromise; - /** - * [descr:ArrayStore.clear()] - */ - clear(): void; - /** - * [descr:ArrayStore.createQuery()] - */ - createQuery(): Query; - } - module ArrayStore { - export type Options = ArrayStoreOptions< - TItem, - TKey - >; - } - /** - * [descr:ArrayStoreOptions] - * @deprecated [depNote:ArrayStoreOptions] - * @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 ArrayStoreOptions - extends DevExpress.data.AbstractStore.Options { - /** - * [descr:ArrayStoreOptions.data] - */ - data?: Array; - } - /** - * [descr:Utils.base64_encode(input)] - */ - export function base64_encode(input: string | Array): string; - /** - * [descr:CustomStore] - */ - export class CustomStore extends Store { - constructor(options?: DevExpress.data.CustomStore.Options); - /** - * [descr:CustomStore.byKey(key, extraOptions)] - */ - byKey( - key: TKey, - extraOptions?: LoadOptions - ): DevExpress.core.utils.DxPromise; - /** - * [descr:CustomStore.clearRawDataCache()] - */ - clearRawDataCache(): void; - /** - * [descr:CustomStore.load()] - */ - load(): DevExpress.core.utils.DxExtendedPromise< - DevExpress.common.LoadResult - >; - /** - * [descr:CustomStore.load(options)] - */ - load( - options: LoadOptions - ): DevExpress.core.utils.DxExtendedPromise< - DevExpress.common.LoadResult - >; - } - module CustomStore { - /** - * @deprecated Use GroupItem from common/data/custom-store instead - */ - export type GroupItem = DevExpress.common.GroupItem; - /** - * @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. - */ - type LoadFunctionResult = - | T - | DevExpress.core.utils.DxPromise - | PromiseLike; - export type Options = CustomStoreOptions< - TItem, - TKey - >; - /** - * [descr:ResolvedData] - * @deprecated [depNote:ResolvedData] - */ - export type ResolvedData = DevExpress.common.LoadResult; - } - /** - * [descr:CustomStoreOptions] - * @deprecated [depNote:CustomStoreOptions] - * @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 CustomStoreOptions - extends DevExpress.data.Store.Options { - /** - * [descr:CustomStoreOptions.byKey] - */ - byKey?: ( - key: TKey, - extraOptions?: LoadOptions - ) => PromiseLike; - /** - * [descr:CustomStoreOptions.cacheRawData] - */ - cacheRawData?: boolean; - /** - * [descr:CustomStoreOptions.insert] - */ - insert?: (values: TItem) => PromiseLike; - /** - * [descr:CustomStoreOptions.load] - */ - load: ( - options: LoadOptions - ) => DevExpress.data.CustomStore.LoadFunctionResult< - DevExpress.common.LoadResult - >; - /** - * [descr:CustomStoreOptions.loadMode] - */ - loadMode?: 'processed' | 'raw'; - /** - * [descr:CustomStoreOptions.onLoaded] - */ - onLoaded?: ( - result: DevExpress.common.LoadResult, - loadOptions: LoadOptions - ) => void; - /** - * [descr:CustomStoreOptions.remove] - */ - remove?: (key: TKey) => PromiseLike; - /** - * [descr:CustomStoreOptions.totalCount] - */ - totalCount?: (loadOptions: { - filter?: FilterDescriptor | Array; - group?: GroupDescriptor | Array>; - }) => PromiseLike; - /** - * [descr:CustomStoreOptions.update] - */ - update?: (key: TKey, values: TItem) => PromiseLike; - /** - * [descr:CustomStoreOptions.useDefaultSearch] - */ - useDefaultSearch?: boolean | undefined; - } - /** - * [descr:DataSource] - */ - export class DataSource { - constructor(data: Array); - constructor( - options: - | DevExpress.data.CustomStore.Options - | DevExpress.data.DataSource.Options - ); - constructor(store: DevExpress.data.utils.Store); - constructor(url: string); - /** - * [descr:DataSource.cancel(operationId)] - */ - cancel(operationId: number): boolean; - /** - * [descr:DataSource.dispose()] - */ - dispose(): void; - /** - * [descr:DataSource.filter()] - */ - filter(): FilterDescriptor | Array; - /** - * [descr:DataSource.filter(filterExpr)] - */ - filter(filterExpr: FilterDescriptor | Array): void; - /** - * [descr:DataSource.group()] - */ - group(): GroupDescriptor | Array>; - /** - * [descr:DataSource.group(groupExpr)] - */ - group( - groupExpr: GroupDescriptor | Array> - ): void; - /** - * [descr:DataSource.isLastPage()] - */ - isLastPage(): boolean; - /** - * [descr:DataSource.isLoaded()] - */ - isLoaded(): boolean; - /** - * [descr:DataSource.isLoading()] - */ - isLoading(): boolean; - /** - * [descr:DataSource.items()] - */ - items(): Array; - /** - * [descr:DataSource.key()] - */ - key(): string | Array; - /** - * [descr:DataSource.load()] - */ - load(): DevExpress.core.utils.DxExtendedPromise; - /** - * [descr:DataSource.loadOptions()] - */ - loadOptions(): LoadOptions; - /** - * [descr:DataSource.off(eventName)] - */ - off(eventName: DevExpress.data.DataSource.EventName): this; - /** - * [descr:DataSource.off(eventName, eventHandler)] - */ - off( - eventName: DevExpress.data.DataSource.EventName, - eventHandler: Function - ): this; - /** - * [descr:DataSource.on(eventName, eventHandler)] - */ - on( - eventName: DevExpress.data.DataSource.EventName, - eventHandler: Function - ): this; - /** - * [descr:DataSource.on(events)] - */ - on( - events: { [key in DevExpress.data.DataSource.EventName]?: Function } - ): this; - /** - * [descr:DataSource.pageIndex()] - */ - pageIndex(): number; - /** - * [descr:DataSource.pageIndex(newIndex)] - */ - pageIndex(newIndex: number): void; - /** - * [descr:DataSource.pageSize()] - */ - pageSize(): number; - /** - * [descr:DataSource.pageSize(value)] - */ - pageSize(value: number): void; - /** - * [descr:DataSource.paginate()] - */ - paginate(): boolean; - /** - * [descr:DataSource.paginate(value)] - */ - paginate(value: boolean): void; - /** - * [descr:DataSource.reload()] - */ - reload(): DevExpress.core.utils.DxExtendedPromise; - /** - * [descr:DataSource.requireTotalCount()] - */ - requireTotalCount(): boolean; - /** - * [descr:DataSource.requireTotalCount(value)] - */ - requireTotalCount(value: boolean): void; - /** - * [descr:DataSource.searchExpr()] - */ - searchExpr(): string & Function & Array; - /** - * [descr:DataSource.searchExpr(expr)] - */ - searchExpr(expr: string | Function | Array): void; - /** - * [descr:DataSource.searchOperation()] - */ - searchOperation(): string; - /** - * [descr:DataSource.searchOperation(op)] - */ - searchOperation(op: string): void; - /** - * [descr:DataSource.searchValue()] - */ - searchValue(): any; - /** - * [descr:DataSource.searchValue(value)] - */ - searchValue(value: any): void; - /** - * [descr:DataSource.select()] - */ - select(): SelectDescriptor; - /** - * [descr:DataSource.select(expr)] - */ - select(expr: SelectDescriptor): void; - /** - * [descr:DataSource.sort()] - */ - sort(): SortDescriptor | Array>; - /** - * [descr:DataSource.sort(sortExpr)] - */ - sort(sortExpr: SortDescriptor | Array>): void; - /** - * [descr:DataSource.store()] - */ - store(): DevExpress.data.utils.Store; - /** - * [descr:DataSource.totalCount()] - */ - totalCount(): number; - } - module DataSource { - /** - * [descr:DataSourceLike] - * @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 type DataSourceLike = - | string - | Array - | DevExpress.data.utils.Store - | DataSourceOptionsStub - | DataSource; - /** - * @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. - */ - interface DataSourceOptionsStub< - TStoreItem = any, - TMappedItem = TStoreItem, - TItem = TMappedItem - > { - customQueryParams?: any; - expand?: Array | string; - filter?: FilterDescriptor | Array; - group?: GroupDescriptor | Array>; - map?: (dataItem: TStoreItem) => TMappedItem; - onChanged?: (e: { readonly changes?: Array }) => void; - onLoadError?: (error: { readonly message?: string }) => void; - onLoadingChanged?: (isLoading: boolean) => void; - pageSize?: number; - paginate?: boolean; - postProcess?: (data: Array) => Array; - pushAggregationTimeout?: number; - requireTotalCount?: boolean; - reshapeOnPush?: boolean; - searchExpr?: string | Function | Array; - searchOperation?: SearchOperation; - searchValue?: any; - select?: SelectDescriptor; - sort?: SortDescriptor | Array>; - store?: - | Array - | DevExpress.data.utils.Store - | DevExpress.data.utils.StoreOptions; - } - /** - * @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. - */ - type EventName = 'changed' | 'loadError' | 'loadingChanged'; - export type Options< - TStoreItem = any, - TMappedItem = TStoreItem, - TItem = TMappedItem, - TKey = any - > = DataSourceOptions; - } + export type UserDefinedElement = + {} extends Condition ? T : ElementWrapper | T; + /** + * @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 type UserDefinedElementsArray = {} extends Condition + ? Array + : ElementsArrayWrapper; +} +declare module DevExpress.core.utils { + /** + * @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 type DxExtendedPromise = DxPromise & { + then( + onFulfilled?: + | (( + value: T, + extraParameters?: any + ) => TResult1 | PromiseLike) + | undefined + | null, + onRejected?: + | ((reason: any) => TResult2 | PromiseLike) + | undefined + | null + ): PromiseLike; + }; + /** + * [descr:DxPromise] + * @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 type DxPromise = {} extends PromiseType + ? Promise + : PromiseType; +} +declare module DevExpress.data { + /** + * [descr:DataSourceLike] + * @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 type DataSourceLike = + | string + | Array + | DevExpress.data.utils.Store + | DataSourceOptionsStub + | DevExpress.common.data.DataSource; /** - * [descr:DataSourceOptions] - * @deprecated [depNote:DataSourceOptions] * @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 DataSourceOptions< + export interface DataSourceOptionsStub< TStoreItem = any, TMappedItem = TStoreItem, - TItem = TMappedItem, - TKey = any + TItem = TMappedItem > { - /** - * [descr:DataSourceOptions.customQueryParams] - */ customQueryParams?: any; - /** - * [descr:DataSourceOptions.expand] - */ expand?: Array | string; - /** - * [descr:DataSourceOptions.filter] - */ - filter?: FilterDescriptor | Array; - /** - * [descr:DataSourceOptions.group] - */ - group?: GroupDescriptor | Array>; - /** - * [descr:DataSourceOptions.langParams] - */ - langParams?: LangParams; - /** - * [descr:DataSourceOptions.map] - */ + filter?: + | DevExpress.common.data.FilterDescriptor + | Array; + group?: + | DevExpress.common.data.GroupDescriptor + | Array>; map?: (dataItem: TStoreItem) => TMappedItem; - /** - * [descr:DataSourceOptions.onChanged] - */ onChanged?: (e: { readonly changes?: Array }) => void; - /** - * [descr:DataSourceOptions.onLoadError] - */ onLoadError?: (error: { readonly message?: string }) => void; - /** - * [descr:DataSourceOptions.onLoadingChanged] - */ onLoadingChanged?: (isLoading: boolean) => void; - /** - * [descr:DataSourceOptions.pageSize] - */ pageSize?: number; - /** - * [descr:DataSourceOptions.paginate] - */ - paginate?: boolean | undefined; - /** - * [descr:DataSourceOptions.postProcess] - */ + paginate?: boolean; postProcess?: (data: Array) => Array; - /** - * [descr:DataSourceOptions.pushAggregationTimeout] - */ - pushAggregationTimeout?: number | undefined; - /** - * [descr:DataSourceOptions.requireTotalCount] - */ + pushAggregationTimeout?: number; requireTotalCount?: boolean; - /** - * [descr:DataSourceOptions.reshapeOnPush] - */ reshapeOnPush?: boolean; - /** - * [descr:DataSourceOptions.searchExpr] - */ searchExpr?: string | Function | Array; - /** - * [descr:DataSourceOptions.searchOperation] - */ - searchOperation?: SearchOperation; - /** - * [descr:DataSourceOptions.searchValue] - */ + searchOperation?: DevExpress.common.data.SearchOperation; searchValue?: any; - /** - * [descr:DataSourceOptions.select] - */ - select?: SelectDescriptor; - /** - * [descr:DataSourceOptions.sort] - */ - sort?: SortDescriptor | Array>; - /** - * [descr:DataSourceOptions.store] - */ + select?: DevExpress.common.data.SelectDescriptor; + sort?: + | DevExpress.common.data.SortDescriptor + | Array>; store?: | Array - | DevExpress.data.utils.Store - | DevExpress.data.utils.StoreOptions; - } - /** - * [descr:EdmLiteral] - */ - export class EdmLiteral { - constructor(value: string); - /** - * [descr:EdmLiteral.valueOf()] - */ - valueOf(): string; + | DevExpress.data.utils.Store + | DevExpress.data.utils.StoreOptions; } - /** - * [descr:Utils.errorHandler] - * @deprecated [depNote:Utils.errorHandler] - */ - export function errorHandler(e: Error): void; /** * @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. */ - type EventName = - | 'loaded' - | 'loading' - | 'inserted' - | 'inserting' - | 'updated' - | 'updating' - | 'push' - | 'removed' - | 'removing' - | 'modified' - | 'modifying'; - /** - * [descr:FilterDescriptor] - */ export type FilterDescriptor = any; /** - * [descr:GroupDescriptor] + * @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 type GroupDescriptor = | KeySelector @@ -5652,6 +6766,9 @@ declare module DevExpress.data { groupInterval?: number | GroupingInterval; isExpanded?: boolean; }); + /** + * @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 type GroupingInterval = | 'year' | 'quarter' @@ -5679,24 +6796,11 @@ declare module DevExpress.data { /** * @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. */ - type KeySelector = + export type KeySelector = | string | ((source: T) => string | number | Date | Object); /** - * [descr:LangParams] - */ - export type LangParams = { - /** - * [descr:LangParams.locale] - */ - locale: string; - /** - * [descr:LangParams.collatorOptions] - */ - collatorOptions?: Intl.CollatorOptions; - }; - /** - * [descr:LoadOptions] + * @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 LoadOptions { /** @@ -5776,251 +6880,10 @@ declare module DevExpress.data { */ userData?: any; } - /** - * [descr:LocalStore] - */ - export class LocalStore extends ArrayStore< - TItem, - TKey - > { - constructor(options?: DevExpress.data.LocalStore.Options); - /** - * [descr:LocalStore.clear()] - */ - clear(): void; - } - module LocalStore { - export type Options = LocalStoreOptions< - TItem, - TKey - >; - } - /** - * [descr:LocalStoreOptions] - * @deprecated [depNote:LocalStoreOptions] - * @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 LocalStoreOptions - extends ArrayStoreOptions { - /** - * [descr:LocalStoreOptions.flushInterval] - */ - flushInterval?: number; - /** - * [descr:LocalStoreOptions.immediate] - */ - immediate?: boolean; - /** - * [descr:LocalStoreOptions.name] - */ - name?: string; - } - /** - * [descr:ODataContext] - */ - export class ODataContext { - constructor(options?: ODataContextOptions); - /** - * [descr:ODataContext.get(operationName, params)] - */ - get( - operationName: string, - params: any - ): DevExpress.core.utils.DxPromise; - /** - * [descr:ODataContext.invoke(operationName, params, httpMethod)] - */ - invoke( - operationName: string, - params: any, - httpMethod: DevExpress.data.ODataContext.HttpMethod - ): DevExpress.core.utils.DxPromise; - /** - * [descr:ODataContext.objectLink(entityAlias, key)] - */ - objectLink(entityAlias: string, key: any | string | number): any; - } - module ODataContext { - /** - * @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. - */ - type HttpMethod = 'GET' | 'POST' | 'PATCH' | 'MERGE'; - /** - * @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 ODataRequestOptions { - accepts: any; - async: boolean; - contentType: string | boolean; - data: any; - dataType: string; - headers: any; - jsonp?: boolean; - method: string; - timeout: number; - url: string; - xhrFields: any; - } - } - /** - * [descr:ODataContextOptions] - * @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 ODataContextOptions { - /** - * [descr:ODataContextOptions.beforeSend] - */ - beforeSend?: (options: { - url: string; - async: boolean; - method: string; - timeout: number; - params: any; - payload: any; - headers: any; - }) => void; - /** - * [descr:ODataContextOptions.deserializeDates] - */ - deserializeDates?: boolean; - /** - * [descr:ODataContextOptions.entities] - */ - entities?: any; - /** - * [descr:ODataContextOptions.errorHandler] - */ - errorHandler?: (e: { - httpStatus: number; - errorDetails: any; - requestOptions: DevExpress.data.ODataContext.ODataRequestOptions; - }) => void; - /** - * [descr:ODataContextOptions.filterToLower] - */ - filterToLower?: boolean; - /** - * [descr:ODataContextOptions.jsonp] - */ - jsonp?: boolean; - /** - * [descr:ODataContextOptions.url] - */ - url?: string; - /** - * [descr:ODataContextOptions.version] - */ - version?: number; - /** - * [descr:ODataContextOptions.withCredentials] - */ - withCredentials?: boolean; - } - /** - * [descr:ODataStore] - */ - export class ODataStore extends AbstractStore< - TItem, - TKey - > { - constructor(options?: DevExpress.data.ODataStore.Options); - /** - * [descr:ODataStore.byKey(key, extraOptions)] - */ - byKey( - key: TKey, - extraOptions?: { - expand?: string | Array; - select?: string | Array; - } - ): DevExpress.core.utils.DxPromise; - /** - * [descr:ODataStore.createQuery(loadOptions)] - */ - createQuery(loadOptions?: { - expand?: string | Array; - requireTotalCount?: boolean; - customQueryParams?: any; - }): Query; - } - module ODataStore { - export type Options = ODataStoreOptions< - TItem, - TKey - >; - } - /** - * [descr:ODataStoreOptions] - * @deprecated [depNote:ODataStoreOptions] - * @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 ODataStoreOptions - extends DevExpress.data.AbstractStore.Options { - /** - * [descr:ODataStoreOptions.beforeSend] - */ - beforeSend?: (options: { - url: string; - async: boolean; - method: string; - timeout: number; - params: any; - payload: any; - headers: any; - }) => void; - /** - * [descr:ODataStoreOptions.deserializeDates] - */ - deserializeDates?: boolean; - /** - * [descr:ODataStoreOptions.errorHandler] - */ - errorHandler?: (e: { - httpStatus: number; - errorDetails: any; - requestOptions: DevExpress.data.ODataContext.ODataRequestOptions; - }) => void; - /** - * [descr:ODataStoreOptions.fieldTypes] - */ - fieldTypes?: any; - /** - * [descr:ODataStoreOptions.filterToLower] - */ - filterToLower?: boolean; - /** - * [descr:ODataStoreOptions.jsonp] - */ - jsonp?: boolean; - /** - * [descr:ODataStoreOptions.keyType] - */ - keyType?: - | 'String' - | 'Int32' - | 'Int64' - | 'Guid' - | 'Boolean' - | 'Single' - | 'Decimal' - | any; - /** - * [descr:ODataStoreOptions.url] - */ - url?: string; - /** - * [descr:ODataStoreOptions.version] - */ - version?: number; - /** - * [descr:ODataStoreOptions.withCredentials] - */ - withCredentials?: boolean; - } /** * @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. */ - type OrderingDescriptor = SelectionDescriptor & { + export type OrderingDescriptor = SelectionDescriptor & { desc?: boolean; }; /** @@ -6045,7 +6908,7 @@ declare module DevExpress.data { dataIndex?: number; maxRowCount?: number; customColumns?: Array; - }): DataSource; + }): DevExpress.common.data.DataSource; /** * [descr:PivotGridDataSource.dispose()] */ @@ -6255,7 +7118,7 @@ declare module DevExpress.data { /** * [descr:PivotGridDataSourceOptions.fields.format] */ - format?: DevExpress.ui.Format; + format?: DevExpress.common.core.localization.Format; /** * [descr:PivotGridDataSourceOptions.fields.groupIndex] */ @@ -6344,190 +7207,88 @@ declare module DevExpress.data { /** * [descr:PivotGridDataSourceOptions.fields.summaryType] */ - summaryType?: DevExpress.common.grids.SummaryType | string; - /** - * [descr:PivotGridDataSourceOptions.fields.visible] - */ - visible?: boolean; - /** - * [descr:PivotGridDataSourceOptions.fields.width] - */ - width?: number; - /** - * [descr:PivotGridDataSourceOptions.fields.wordWrapEnabled] - */ - wordWrapEnabled?: boolean; - } - /** - * [descr:PivotGridDataSourceOptions] - * @deprecated [depNote:PivotGridDataSourceOptions] - * @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 PivotGridDataSourceOptions { - /** - * [descr:PivotGridDataSourceOptions.fields] - */ - fields?: Array; - /** - * [descr:PivotGridDataSourceOptions.filter] - */ - filter?: string | Array | Function; - /** - * [descr:PivotGridDataSourceOptions.onChanged] - */ - onChanged?: Function; - /** - * [descr:PivotGridDataSourceOptions.onFieldsPrepared] - */ - onFieldsPrepared?: ( - fields: Array - ) => void; - /** - * [descr:PivotGridDataSourceOptions.onLoadError] - */ - onLoadError?: (error: any) => void; - /** - * [descr:PivotGridDataSourceOptions.onLoadingChanged] - */ - onLoadingChanged?: (isLoading: boolean) => void; - /** - * [descr:PivotGridDataSourceOptions.paginate] - */ - paginate?: boolean; - /** - * [descr:PivotGridDataSourceOptions.remoteOperations] - */ - remoteOperations?: boolean; - /** - * [descr:PivotGridDataSourceOptions.retrieveFields] - */ - retrieveFields?: boolean; - /** - * [descr:PivotGridDataSourceOptions.store] - */ - store?: - | DevExpress.data.utils.Store - | DevExpress.data.utils.StoreOptions - | XmlaStore - | (XmlaStoreOptions & { type: 'xmla' }) - | Array<{ - /** - * [descr:PivotGridDataSourceOptions.store.type] - */ - type?: DevExpress.data.PivotGridDataSource.PivotGridStoreType; - }> - | { - /** - * [descr:PivotGridDataSourceOptions.store.type] - */ - type?: DevExpress.data.PivotGridDataSource.PivotGridStoreType; - }; - } - /** - * [descr:Utils.query(array, queryOptions)] - */ - export function query(array: Array, queryOptions?: any): Query; - /** - * [descr:Utils.query(url, queryOptions)] - */ - export function query(url: string, queryOptions: any): Query; - /** - * [descr:Query] - */ - export interface Query { - /** - * [descr:Query.aggregate(seed, step, finalize)] - */ - aggregate( - seed: any, - step: Function, - finalize: Function - ): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.aggregate(step)] - */ - aggregate(step: Function): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.avg()] - */ - avg(): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.avg(getter)] - */ - avg(getter: any): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.count()] - */ - count(): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.enumerate()] - */ - enumerate(): DevExpress.core.utils.DxPromise; - /** - * [descr:Query.filter(criteria)] - */ - filter(criteria: Array): Query; - /** - * [descr:Query.filter(predicate)] - */ - filter(predicate: Function): Query; - /** - * [descr:Query.groupBy(getter)] - */ - groupBy(getter: any): Query; + summaryType?: DevExpress.common.grids.SummaryType | string; /** - * [descr:Query.max()] + * [descr:PivotGridDataSourceOptions.fields.visible] */ - max(): DevExpress.core.utils.DxPromise; + visible?: boolean; /** - * [descr:Query.max(getter)] + * [descr:PivotGridDataSourceOptions.fields.width] */ - max(getter: any): DevExpress.core.utils.DxPromise; + width?: number; /** - * [descr:Query.min()] + * [descr:PivotGridDataSourceOptions.fields.wordWrapEnabled] */ - min(): DevExpress.core.utils.DxPromise; + wordWrapEnabled?: boolean; + } + /** + * [descr:PivotGridDataSourceOptions] + * @deprecated [depNote:PivotGridDataSourceOptions] + * @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 PivotGridDataSourceOptions { /** - * [descr:Query.min(getter)] + * [descr:PivotGridDataSourceOptions.fields] */ - min(getter: any): DevExpress.core.utils.DxPromise; + fields?: Array; /** - * [descr:Query.select(getter)] + * [descr:PivotGridDataSourceOptions.filter] */ - select(...getters: any[]): Query; + filter?: string | Array | Function; /** - * [descr:Query.slice(skip, take)] + * [descr:PivotGridDataSourceOptions.onChanged] */ - slice(skip: number, take?: number): Query; + onChanged?: Function; /** - * [descr:Query.sortBy(getter)] + * [descr:PivotGridDataSourceOptions.onFieldsPrepared] */ - sortBy(getter: any): Query; + onFieldsPrepared?: ( + fields: Array + ) => void; /** - * [descr:Query.sortBy(getter, desc)] + * [descr:PivotGridDataSourceOptions.onLoadError] */ - sortBy(getter: any, desc: boolean): Query; + onLoadError?: (error: any) => void; /** - * [descr:Query.sum()] + * [descr:PivotGridDataSourceOptions.onLoadingChanged] */ - sum(): DevExpress.core.utils.DxPromise; + onLoadingChanged?: (isLoading: boolean) => void; /** - * [descr:Query.sum(getter)] + * [descr:PivotGridDataSourceOptions.paginate] */ - sum(getter: any): DevExpress.core.utils.DxPromise; + paginate?: boolean; /** - * [descr:Query.thenBy(getter)] + * [descr:PivotGridDataSourceOptions.remoteOperations] */ - thenBy(getter: any): Query; + remoteOperations?: boolean; /** - * [descr:Query.thenBy(getter, desc)] + * [descr:PivotGridDataSourceOptions.retrieveFields] */ - thenBy(getter: any, desc: boolean): Query; + retrieveFields?: boolean; /** - * [descr:Query.toArray()] + * [descr:PivotGridDataSourceOptions.store] */ - toArray(): Array; + store?: + | DevExpress.data.utils.Store + | DevExpress.data.utils.StoreOptions + | XmlaStore + | (XmlaStoreOptions & { type: 'xmla' }) + | Array<{ + /** + * [descr:PivotGridDataSourceOptions.store.type] + */ + type?: DevExpress.data.PivotGridDataSource.PivotGridStoreType; + }> + | { + /** + * [descr:PivotGridDataSourceOptions.store.type] + */ + type?: DevExpress.data.PivotGridDataSource.PivotGridStoreType; + }; } + /** + * @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 type SearchOperation = | '=' | '<>' @@ -6540,7 +7301,7 @@ declare module DevExpress.data { | 'contains' | 'notcontains'; /** - * [descr:SelectDescriptor] + * @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 type SelectDescriptor = | string @@ -6549,83 +7310,30 @@ declare module DevExpress.data { /** * @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. */ - type SelectionDescriptor = { + export type SelectionDescriptor = { selector: KeySelector; }; /** - * [descr:Utils.setErrorHandler] - */ - export function setErrorHandler(handler: (e: Error) => void): void; - /** - * [descr:SortDescriptor] + * @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 type SortDescriptor = KeySelector | OrderingDescriptor; /** - * [descr:Store] * @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 class Store { - constructor(options?: DevExpress.data.Store.Options); - /** - * [descr:Store.insert(values)] - */ - insert(values: TItem): DevExpress.core.utils.DxExtendedPromise; - /** - * [descr:Store.key()] - */ - key(): string | Array; - /** - * [descr:Store.keyOf(obj)] - */ - keyOf(obj: TItem): TKey; - /** - * [descr:Store.off(eventName)] - */ - off(eventName: EventName): this; - /** - * [descr:Store.off(eventName, eventHandler)] - */ - off(eventName: EventName, eventHandler: Function): this; - /** - * [descr:Store.on(eventName, eventHandler)] - */ - on(eventName: EventName, eventHandler: Function): this; - /** - * [descr:Store.on(events)] - */ - on(events: { [key in EventName]?: Function }): this; - /** - * [descr:Store.push(changes)] - */ - push( - changes: Array<{ - type: 'insert' | 'update' | 'remove'; - data?: DevExpress.core.DeepPartial; - key?: TKey; - index?: number; - }> - ): void; - /** - * [descr:Store.remove(key)] - */ - remove(key: TKey): DevExpress.core.utils.DxPromise; - /** - * [descr:Store.totalCount(options)] - */ - totalCount(obj: { - filter?: FilterDescriptor | Array; - group?: GroupDescriptor | Array>; - }): DevExpress.core.utils.DxPromise; - /** - * [descr:Store.update(key, values)] - */ - update( - key: TKey, - values: DevExpress.core.DeepPartial - ): DevExpress.core.utils.DxExtendedPromise; - } + type StoreEventName = + | 'loaded' + | 'loading' + | 'inserted' + | 'inserting' + | 'updated' + | 'updating' + | 'push' + | 'removed' + | 'removing' + | 'modified' + | 'modifying'; /** - * [descr:SummaryDescriptor] + * @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 type SummaryDescriptor = | KeySelector @@ -6668,135 +7376,64 @@ declare module DevExpress.data { url?: string; } } -declare module DevExpress.data.PivotGridDataSource { +declare module DevExpress.data.ArrayStore { /** - * [descr:PivotGridDataSourceOptions.fields] + * @deprecated Use DevExpress.common.data.ArrayStoreOptions from /common/data instead */ - export type Field = PivotGridDataSourceField; + export type Options< + TItem = any, + TKey = any + > = DevExpress.common.data.ArrayStoreOptions; } -declare module DevExpress.data.Store { +declare module DevExpress.data.CustomStore { /** - * [descr:StoreOptions] - * @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. + * @deprecated Use DevExpress.common.data.CustomStoreOptions from /common/data instead */ - export type Options = { - /** - * [descr:StoreOptions.errorHandler] - */ - errorHandler?: Function; - /** - * [descr:StoreOptions.key] - */ - key?: string | Array; - /** - * [descr:StoreOptions.onInserted] - */ - onInserted?: (values: TItem, key: TKey) => void; - /** - * [descr:StoreOptions.onInserting] - */ - onInserting?: (values: TItem) => void; - /** - * [descr:StoreOptions.onLoading] - */ - onLoading?: (loadOptions: LoadOptions) => void; - /** - * [descr:StoreOptions.onModified] - */ - onModified?: Function; - /** - * [descr:StoreOptions.onModifying] - */ - onModifying?: Function; - /** - * [descr:StoreOptions.onPush] - */ - onPush?: (changes: Array) => void; - /** - * [descr:StoreOptions.onRemoved] - */ - onRemoved?: (key: TKey) => void; - /** - * [descr:StoreOptions.onRemoving] - */ - onRemoving?: (key: TKey) => void; - /** - * [descr:StoreOptions.onUpdated] - */ - onUpdated?: (key: TKey, values: TItem) => void; - /** - * [descr:StoreOptions.onUpdating] - */ - onUpdating?: (key: TKey, values: TItem) => void; - }; + export type Options< + TItem = any, + TKey = any + > = DevExpress.common.data.CustomStoreOptions; } -declare module DevExpress.data.utils { +declare module DevExpress.data.LocalStore { /** - * [descr:Utils.compileGetter(expr)] + * @deprecated Use DevExpress.common.data.LocalStoreOptions from /common/data instead */ - export function compileGetter(expr: string | Array): Function; + export type Options< + TItem = any, + TKey = any + > = DevExpress.common.data.LocalStoreOptions; +} +declare module DevExpress.data.ODataStore { + export type Options< + TItem = any, + TKey = any + > = DevExpress.common.data.ODataStoreOptions; +} +declare module DevExpress.data.PivotGridDataSource { /** - * [descr:Utils.compileSetter(expr)] + * [descr:PivotGridDataSourceOptions.fields] */ - export function compileSetter(expr: string | Array): Function; + export type Field = PivotGridDataSourceField; +} +declare module DevExpress.data.utils { export type Store = - | CustomStore - | ArrayStore - | LocalStore - | ODataStore; + | DevExpress.common.data.CustomStore + | DevExpress.common.data.ArrayStore + | DevExpress.common.data.LocalStore + | DevExpress.common.data.ODataStore; export type StoreOptions = - | DevExpress.data.CustomStore.Options - | (DevExpress.data.ArrayStore.Options & { type: 'array' }) - | (DevExpress.data.LocalStore.Options & { type: 'local' }) - | (DevExpress.data.ODataStore.Options & { type: 'odata' }); -} -declare module DevExpress.data.utils.odata { - /** - * [descr:Utils.keyConverters] - */ - export var keyConverters: any; + | DevExpress.common.data.CustomStoreOptions + | (DevExpress.common.data.ArrayStoreOptions & { + type: 'array'; + }) + | (DevExpress.common.data.LocalStoreOptions & { + type: 'local'; + }) + | (DevExpress.common.data.ODataStoreOptions & { + type: 'odata'; + }); } declare module DevExpress.events { - /** - * [descr:AsyncCancelable] - */ - export type AsyncCancelable = { - /** - * [descr:AsyncCancelable.cancel] - */ - cancel: boolean | PromiseLike; - }; - /** - * [descr:Cancelable] - */ - export interface Cancelable { - /** - * [descr:Cancelable.cancel] - */ - cancel?: boolean; - } - /** - * [descr:ChangedOptionInfo] - */ - export interface ChangedOptionInfo { - /** - * [descr:ChangedOptionInfo.name] - */ - readonly name: string; - /** - * [descr:ChangedOptionInfo.fullName] - */ - readonly fullName: string; - /** - * [descr:ChangedOptionInfo.value] - */ - readonly value?: any; - /** - * [descr:ChangedOptionInfo.previousValue] - */ - readonly previousValue?: any; - } - /** * [descr:DxEvent] * @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. @@ -6811,24 +7448,7 @@ declare module DevExpress.events { */ export type event = DxEvent; /** - * [descr:EventInfo] - */ - export interface EventInfo { - /** - * [descr:EventInfo.component] - */ - readonly component: TComponent; - /** - * [descr:EventInfo.element] - */ - readonly element: DevExpress.core.DxElement; - /** - * [descr:EventInfo.model] - */ - readonly model?: any; - } - /** - * [descr:EventObject] + * @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 type EventObject = { /** @@ -6884,186 +7504,6 @@ declare module DevExpress.events { * @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 EventType {} - /** - * @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. - */ - interface EventType extends JQueryEventObject { - cancel?: boolean; - } - /** - * [descr:InitializedEventInfo] - */ - export interface InitializedEventInfo { - /** - * [descr:InitializedEventInfo.component] - */ - readonly component?: TComponent; - /** - * [descr:InitializedEventInfo.element] - */ - readonly element?: DevExpress.core.DxElement; - } - /** - * [descr:ItemInfo] - */ - export interface ItemInfo { - /** - * [descr:ItemInfo.itemData] - */ - readonly itemData?: TItemData; - /** - * [descr:ItemInfo.itemElement] - */ - readonly itemElement: DevExpress.core.DxElement; - /** - * [descr:ItemInfo.itemIndex] - */ - readonly itemIndex: number; - } - /** - * [descr:NativeEventInfo] - */ - export interface NativeEventInfo { - /** - * [descr:NativeEventInfo.component] - */ - readonly component: TComponent; - /** - * [descr:NativeEventInfo.element] - */ - readonly element: DevExpress.core.DxElement; - /** - * [descr:NativeEventInfo.model] - */ - readonly model?: any; - /** - * [descr:NativeEventInfo.event] - */ - readonly event?: DxEvent; - } - /** - * [descr:events.off(element)] - */ - export function off(element: Element | Array): void; - /** - * [descr:events.off(element, eventName)] - */ - export function off( - element: Element | Array, - eventName: string - ): void; - /** - * [descr:events.off(element, eventName, handler)] - */ - export function off( - element: Element | Array, - eventName: string, - handler: Function - ): void; - /** - * [descr:events.off(element, eventName, selector)] - */ - export function off( - element: Element | Array, - eventName: string, - selector: string - ): void; - /** - * [descr:events.off(element, eventName, selector, handler)] - */ - export function off( - element: Element | Array, - eventName: string, - selector: string, - handler: Function - ): void; - /** - * [descr:events.on(element, eventName, data, handler)] - */ - export function on( - element: Element | Array, - eventName: string, - data: any, - handler: Function - ): void; - /** - * [descr:events.on(element, eventName, handler)] - */ - export function on( - element: Element | Array, - eventName: string, - handler: Function - ): void; - /** - * [descr:events.on(element, eventName, selector, data, handler)] - */ - export function on( - element: Element | Array, - eventName: string, - selector: string, - data: any, - handler: Function - ): void; - /** - * [descr:events.on(element, eventName, selector, handler)] - */ - export function on( - element: Element | Array, - eventName: string, - selector: string, - handler: Function - ): void; - /** - * [descr:events.one(element, eventName, data, handler)] - */ - export function one( - element: Element | Array, - eventName: string, - data: any, - handler: Function - ): void; - /** - * [descr:events.one(element, eventName, handler)] - */ - export function one( - element: Element | Array, - eventName: string, - handler: Function - ): void; - /** - * [descr:events.one(element, eventName, selector, data, handler)] - */ - export function one( - element: Element | Array, - eventName: string, - selector: string, - data: any, - handler: Function - ): void; - /** - * [descr:events.one(element, eventName, selector, handler)] - */ - export function one( - element: Element | Array, - eventName: string, - selector: string, - handler: Function - ): void; - /** - * [descr:events.trigger(element, event)] - */ - export function trigger( - element: Element | Array, - event: string | DxEvent - ): void; - /** - * [descr:events.trigger(element, event, extraParameters)] - */ - export function trigger( - element: Element | Array, - event: string | DxEvent, - extraParameters: any - ): void; /** * [descr:events.triggerHandler(element, event)] * @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. @@ -7111,7 +7551,6 @@ declare module DevExpress.excelExporter { */ to?: CellAddress; } - export type DataGridCell = ExcelDataGridCell; /** * @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. @@ -7156,96 +7595,31 @@ declare module DevExpress.excelExporter { value?: any; } /** - * [descr:ExcelExportBaseProps] + * [descr:ExcelExportBaseOptions] * @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 ExcelExportBaseProps { + export interface ExcelExportBaseOptions { /** - * [descr:ExcelExportBaseProps.worksheet] + * [descr:ExcelExportBaseOptions.worksheet] */ worksheet?: object | undefined; /** - * [descr:ExcelExportBaseProps.topLeftCell] + * [descr:ExcelExportBaseOptions.topLeftCell] */ topLeftCell?: CellAddress | string; /** - * [descr:ExcelExportBaseProps.keepColumnWidths] + * [descr:ExcelExportBaseOptions.keepColumnWidths] */ keepColumnWidths?: boolean; /** - * [descr:ExcelExportBaseProps.loadPanel] + * [descr:ExcelExportBaseOptions.loadPanel] */ loadPanel?: ExportLoadPanel; /** - * [descr:ExcelExportBaseProps.encodeExecutableContent] + * [descr:ExcelExportBaseOptions.encodeExecutableContent] */ encodeExecutableContent?: boolean; } - /** - * [descr:ExcelExportDataGridProps] - */ - export interface ExcelExportDataGridProps extends ExcelExportBaseProps { - /** - * [descr:ExcelExportDataGridProps.component] - */ - component?: DevExpress.ui.dxDataGrid | undefined; - /** - * [descr:ExcelExportDataGridProps.selectedRowsOnly] - */ - selectedRowsOnly?: boolean; - /** - * [descr:ExcelExportDataGridProps.autoFilterEnabled] - */ - autoFilterEnabled?: boolean; - /** - * [descr:ExcelExportDataGridProps.customizeCell] - */ - customizeCell?: (options: { - gridCell?: DataGridCell; - excelCell?: any; - }) => void; - } - /** - * [descr:ExcelExportPivotGridProps] - * @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 ExcelExportPivotGridProps extends ExcelExportBaseProps { - /** - * [descr:ExcelExportPivotGridProps.component] - */ - component?: DevExpress.ui.dxPivotGrid | undefined; - /** - * [descr:ExcelExportPivotGridProps.mergeRowFieldValues] - */ - mergeRowFieldValues?: boolean; - /** - * [descr:ExcelExportPivotGridProps.mergeColumnFieldValues] - */ - mergeColumnFieldValues?: boolean; - /** - * [descr:ExcelExportPivotGridProps.exportFilterFieldHeaders] - */ - exportFilterFieldHeaders?: boolean; - /** - * [descr:ExcelExportPivotGridProps.exportDataFieldHeaders] - */ - exportDataFieldHeaders?: boolean; - /** - * [descr:ExcelExportPivotGridProps.exportColumnFieldHeaders] - */ - exportColumnFieldHeaders?: boolean; - /** - * [descr:ExcelExportPivotGridProps.exportRowFieldHeaders] - */ - exportRowFieldHeaders?: boolean; - /** - * [descr:ExcelExportPivotGridProps.customizeCell] - */ - customizeCell?: (options: { - pivotCell?: PivotGridCell; - excelCell?: any; - }) => void; - } /** * @deprecated Use PivotGridCell 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. @@ -7268,19 +7642,6 @@ declare module DevExpress.excelExporter { */ headerType?: 'column' | 'row' | 'data' | 'filter'; } - /** - * [descr:excelExporter.exportDataGrid(options)] - */ - export function exportDataGrid( - options: ExcelExportDataGridProps - ): DevExpress.core.utils.DxPromise; - /** - * [descr:excelExporter.exportPivotGrid(options)] - */ - export function exportPivotGrid( - options: ExcelExportPivotGridProps - ): DevExpress.core.utils.DxPromise; - export type PivotGridCell = ExcelPivotGridCell; } declare module DevExpress.fileManagement { /** @@ -7679,295 +8040,13 @@ declare module DevExpress.fileManagement { chunkIndex: number; } } -declare module DevExpress.localization { - /** - * [descr:localization.formatDate(value, format)] - */ - export function formatDate(value: Date, format: DevExpress.ui.Format): string; - /** - * [descr:localization.formatMessage(key, value)] - */ - export function formatMessage(key: string, ...values: Array): string; - /** - * [descr:localization.formatNumber(value, format)] - */ - export function formatNumber( - value: number, - format: DevExpress.ui.Format - ): string; - /** - * [descr:localization.loadMessages(messages)] - */ - export function loadMessages(messages: any): void; - /** - * [descr:localization.locale()] - */ - export function locale(): string; - /** - * [descr:localization.locale(locale)] - */ - export function locale(locale: string): void; - /** - * [descr:localization.parseDate(text, format)] - */ - export function parseDate(text: string, format: DevExpress.ui.Format): Date; - /** - * [descr:localization.parseNumber(text, format)] - */ - export function parseNumber( - text: string, - format: DevExpress.ui.Format - ): number; -} declare module DevExpress.pdfExporter { - /** - * [descr:PdfCell] - */ - export interface Cell { - /** - * [descr:PdfCell.backgroundColor] - */ - backgroundColor?: string; - /** - * [descr:PdfCell.borderColor] - */ - borderColor?: string; - /** - * [descr:PdfCell.borderWidth] - */ - borderWidth?: number; - /** - * [descr:PdfCell.drawLeftBorder] - */ - drawLeftBorder?: boolean; - /** - * [descr:PdfCell.drawTopBorder] - */ - drawTopBorder?: boolean; - /** - * [descr:PdfCell.drawRightBorder] - */ - drawRightBorder?: boolean; - /** - * [descr:PdfCell.drawBottomBorder] - */ - drawBottomBorder?: boolean; - /** - * [descr:PdfCell.font] - */ - font?: { - /** - * [descr:PdfCell.font.size] - */ - size?: number; - /** - * [descr:PdfCell.font.name] - */ - name?: string; - /** - * [descr:PdfCell.font.style] - */ - style?: 'normal' | 'bold' | 'italic'; - }; - /** - * [descr:PdfCell.horizontalAlign] - */ - horizontalAlign?: 'left' | 'center' | 'right'; - /** - * [descr:PdfCell.padding] - */ - padding?: { - /** - * [descr:PdfCell.padding.top] - */ - top?: number; - /** - * [descr:PdfCell.padding.left] - */ - left?: number; - /** - * [descr:PdfCell.padding.right] - */ - right?: number; - /** - * [descr:PdfCell.padding.bottom] - */ - bottom?: number; - }; - /** - * [descr:PdfCell.text] - */ - text?: string; - /** - * [descr:PdfCell.textColor] - */ - textColor?: string; - /** - * [descr:PdfCell.verticalAlign] - */ - verticalAlign?: 'top' | 'middle' | 'bottom'; - /** - * [descr:PdfCell.wordWrapEnabled] - */ - wordWrapEnabled?: boolean; - } - export type DataGridCell = PdfDataGridCell; - /** - * [descr:pdfExporter.exportDataGrid(options)] - */ - export function exportDataGrid( - options: PdfExportDataGridProps - ): DevExpress.core.utils.DxPromise; - /** - * [descr:pdfExporter.exportGantt(options)] - */ - export function exportGantt( - options: PdfExportGanttProps - ): DevExpress.core.utils.DxPromise; /** * @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. */ export interface PdfDataGridCell - extends DevExpress.excelExporter.DataGridCell {} - /** - * [descr:PdfExportDataGridProps] - * @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 PdfExportDataGridProps { - /** - * [descr:PdfExportDataGridProps.jsPDFDocument] - */ - jsPDFDocument?: object | undefined; - /** - * [descr:PdfExportDataGridProps.component] - */ - component?: DevExpress.ui.dxDataGrid | undefined; - /** - * [descr:PdfExportDataGridProps.topLeft] - */ - topLeft?: { - /** - * [descr:PdfExportDataGridProps.topLeft.x] - */ - x?: number; - /** - * [descr:PdfExportDataGridProps.topLeft.y] - */ - y?: number; - }; - /** - * [descr:PdfExportDataGridProps.columnWidths] - */ - columnWidths?: Array | undefined; - /** - * [descr:PdfExportDataGridProps.indent] - */ - indent?: number; - /** - * [descr:PdfExportDataGridProps.margin] - */ - margin?: { - /** - * [descr:PdfExportDataGridProps.margin.top] - */ - top?: number; - /** - * [descr:PdfExportDataGridProps.margin.left] - */ - left?: number; - /** - * [descr:PdfExportDataGridProps.margin.right] - */ - right?: number; - /** - * [descr:PdfExportDataGridProps.margin.bottom] - */ - bottom?: number; - }; - /** - * [descr:PdfExportDataGridProps.repeatHeaders] - */ - repeatHeaders?: boolean; - /** - * [descr:PdfExportDataGridProps.selectedRowsOnly] - */ - selectedRowsOnly?: boolean; - /** - * [descr:PdfExportDataGridProps.customDrawCell] - */ - customDrawCell?: (options: { - gridCell?: DataGridCell; - pdfCell?: Cell; - doc?: any; - rect?: { x: number; y: number; h: number; w: number }; - cancel?: boolean; - }) => void; - /** - * [descr:PdfExportDataGridProps.customizeCell] - */ - customizeCell?: (options: { - gridCell?: DataGridCell; - pdfCell?: Cell; - }) => void; - /** - * [descr:PdfExportDataGridProps.onRowExporting] - */ - onRowExporting?: (options: { - rowCells?: Array; - rowHeight?: number; - }) => void; - /** - * [descr:PdfExportDataGridProps.loadPanel] - */ - loadPanel?: ExportLoadPanel; - } - /** - * [descr:PdfExportGanttProps] - * @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 PdfExportGanttProps { - /** - * [descr:PdfExportGanttProps.createDocumentMethod] - */ - createDocumentMethod?: (options: any) => object; - /** - * [descr:PdfExportGanttProps.jsPDFDocument] - */ - jsPDFDocument?: object | undefined; - /** - * [descr:PdfExportGanttProps.component] - */ - component?: DevExpress.ui.dxGantt | undefined; - /** - * [descr:PdfExportGanttProps.format] - */ - format?: string | object | undefined; - /** - * [descr:PdfExportGanttProps.landscape] - */ - landscape?: boolean; - /** - * [descr:PdfExportGanttProps.fileName] - */ - fileName?: string | undefined; - /** - * [descr:PdfExportGanttProps.margins] - */ - margins?: object | undefined; - /** - * [descr:PdfExportGanttProps.exportMode] - */ - exportMode?: DevExpress.ui.dxGantt.GanttPdfExportMode; - /** - * [descr:PdfExportGanttProps.dateRange] - */ - dateRange?: DevExpress.ui.dxGantt.GanttPdfExportDateRange | object; - /** - * [descr:PdfExportGanttProps.font] - */ - font?: PdfExportGanttFont; - } + extends DevExpress.common.Export.excel.DataGridCell {} } declare module DevExpress.ui { /** @@ -8005,7 +8084,7 @@ declare module DevExpress.ui { TItem extends DevExpress.ui.CollectionWidget.ItemLike = any, TKey = any > extends Widget { - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.data.DataSource; } module CollectionWidget { /** @@ -8030,8 +8109,8 @@ declare module DevExpress.ui { * @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 type SelectionChangingEventBase = - DevExpress.events.AsyncCancelable & - DevExpress.events.EventInfo & + DevExpress.common.core.events.AsyncCancelable & + DevExpress.common.core.events.EventInfo & SelectionChangeInfo; } /** @@ -8051,7 +8130,7 @@ declare module DevExpress.ui { * [descr:CollectionWidgetItem.template] */ template?: - | DevExpress.core.template + | template | (( itemData: this, itemIndex: number, @@ -8078,7 +8157,7 @@ declare module DevExpress.ui { /** * [descr:CollectionWidgetOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:CollectionWidgetOptions.itemHoldTimeout] */ @@ -8087,7 +8166,7 @@ declare module DevExpress.ui { * [descr:CollectionWidgetOptions.itemTemplate] */ itemTemplate?: - | DevExpress.core.template + | template | (( itemData: TItem, itemIndex: number, @@ -8110,39 +8189,39 @@ declare module DevExpress.ui { */ onItemClick?: | (( - e: DevExpress.events.NativeEventInfo< + e: DevExpress.common.core.events.NativeEventInfo< TComponent, MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo + DevExpress.common.core.events.ItemInfo ) => void) | string; /** * [descr:CollectionWidgetOptions.onItemContextMenu] */ onItemContextMenu?: ( - e: DevExpress.events.NativeEventInfo< + e: DevExpress.common.core.events.NativeEventInfo< TComponent, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo + DevExpress.common.core.events.ItemInfo ) => void; /** * [descr:CollectionWidgetOptions.onItemHold] */ onItemHold?: ( - e: DevExpress.events.NativeEventInfo< + e: DevExpress.common.core.events.NativeEventInfo< TComponent, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo + DevExpress.common.core.events.ItemInfo ) => void; /** * [descr:CollectionWidgetOptions.onItemRendered] */ onItemRendered?: ( - e: DevExpress.events.EventInfo & - DevExpress.events.ItemInfo + e: DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ItemInfo ) => void; /** * [descr:CollectionWidgetOptions.onSelectionChanging] @@ -8154,7 +8233,7 @@ declare module DevExpress.ui { * [descr:CollectionWidgetOptions.onSelectionChanged] */ onSelectionChanged?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.core.events.EventInfo & DevExpress.ui.CollectionWidget.SelectionChangeInfo ) => void; /** @@ -8188,7 +8267,7 @@ declare module DevExpress.ui { */ export class DataExpressionMixin { constructor(options?: DataExpressionMixinOptions); - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.data.DataSource; } /** * [descr:DataExpressionMixinOptions] @@ -8198,7 +8277,7 @@ declare module DevExpress.ui { /** * [descr:DataExpressionMixinOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike< + dataSource?: DevExpress.data.DataSourceLike< CollectionWidgetItem | any > | null; /** @@ -8209,7 +8288,7 @@ declare module DevExpress.ui { * [descr:DataExpressionMixinOptions.itemTemplate] */ itemTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -8269,7 +8348,7 @@ declare module DevExpress.ui { /** * [descr:DateBoxBaseOptions.displayFormat] */ - displayFormat?: Format; + displayFormat?: DevExpress.common.core.localization.Format; /** * [descr:DateBoxBaseOptions.max] */ @@ -8392,14 +8471,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; /** * [descr:_ui_accordion_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -8419,40 +8498,42 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.core.events.InitializedEventInfo< + dxAccordion + >; /** * [descr:_ui_accordion_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxAccordion, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_accordion_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxAccordion, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_accordion_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxAccordion, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * @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. */ @@ -8463,27 +8544,27 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_accordion_ItemTitleClickEvent] */ export type ItemTitleClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxAccordion, MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_accordion_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -8494,7 +8575,7 @@ declare module DevExpress.ui { export type SelectionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.ui.CollectionWidget.SelectionChangeInfo; } /** @@ -8514,7 +8595,7 @@ declare module DevExpress.ui { * [descr:dxAccordionItem.titleTemplate] */ titleTemplate?: - | DevExpress.core.template + | template | (() => string | DevExpress.core.UserDefinedElement); } /** @@ -8536,7 +8617,7 @@ declare module DevExpress.ui { /** * [descr:dxAccordionOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxAccordionOptions.deferRendering] */ @@ -8557,7 +8638,7 @@ declare module DevExpress.ui { * [descr:dxAccordionOptions.itemTemplate] */ itemTemplate?: - | DevExpress.core.template + | template | (( itemData: TItem, itemIndex: number, @@ -8567,7 +8648,7 @@ declare module DevExpress.ui { * [descr:dxAccordionOptions.itemTitleTemplate] */ itemTitleTemplate?: - | DevExpress.core.template + | template | (( itemData: TItem, itemIndex: number, @@ -8625,22 +8706,22 @@ declare module DevExpress.ui { export type CancelClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo>; /** * [descr:_ui_action_sheet_ContentReadyEvent] */ export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; /** * [descr:_ui_action_sheet_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; export type ExplicitTypes, TKey> = { Properties: Properties; CancelClickEvent: CancelClickEvent; @@ -8659,40 +8740,42 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.core.events.InitializedEventInfo< + dxActionSheet + >; /** * [descr:_ui_action_sheet_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxActionSheet, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_action_sheet_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxActionSheet, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_action_sheet_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxActionSheet, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * @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. */ @@ -8703,16 +8786,16 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_action_sheet_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -8732,7 +8815,7 @@ declare module DevExpress.ui { */ onClick?: | (( - e: DevExpress.events.NativeEventInfo< + e: DevExpress.common.core.events.NativeEventInfo< dxActionSheet, MouseEvent | PointerEvent > @@ -8762,7 +8845,7 @@ declare module DevExpress.ui { /** * [descr:dxActionSheetOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxActionSheetOptions.items] */ @@ -8811,56 +8894,59 @@ declare module DevExpress.ui { /** * [descr:_ui_autocomplete_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo< + export type ChangeEvent = DevExpress.common.core.events.NativeEventInfo< dxAutocomplete, Event >; /** * [descr:_ui_autocomplete_ClosedEvent] */ - export type ClosedEvent = DevExpress.events.EventInfo; + export type ClosedEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_autocomplete_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_autocomplete_CopyEvent] */ - export type CopyEvent = DevExpress.events.NativeEventInfo< + export type CopyEvent = DevExpress.common.core.events.NativeEventInfo< dxAutocomplete, ClipboardEvent >; /** * [descr:_ui_autocomplete_CutEvent] */ - export type CutEvent = DevExpress.events.NativeEventInfo< + export type CutEvent = DevExpress.common.core.events.NativeEventInfo< dxAutocomplete, ClipboardEvent >; /** * [descr:_ui_autocomplete_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; export type DropDownButtonTemplateData = DevExpress.ui.dxDropDownEditor.DropDownButtonTemplateDataModel; /** * [descr:_ui_autocomplete_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.core.events.NativeEventInfo< dxAutocomplete, KeyboardEvent >; /** * [descr:_ui_autocomplete_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.core.events.NativeEventInfo< dxAutocomplete, FocusEvent >; /** * [descr:_ui_autocomplete_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.core.events.NativeEventInfo< dxAutocomplete, FocusEvent >; @@ -8868,54 +8954,55 @@ declare module DevExpress.ui { * [descr:_ui_autocomplete_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_autocomplete_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.core.events.NativeEventInfo< dxAutocomplete, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_autocomplete_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo< + export type ItemClickEvent = DevExpress.common.core.events.NativeEventInfo< dxAutocomplete, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_autocomplete_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.core.events.NativeEventInfo< dxAutocomplete, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.core.events.NativeEventInfo< dxAutocomplete, KeyboardEvent >; /** * [descr:_ui_autocomplete_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.core.events.NativeEventInfo< dxAutocomplete, KeyboardEvent >; /** * [descr:_ui_autocomplete_OpenedEvent] */ - export type OpenedEvent = DevExpress.events.EventInfo; + export type OpenedEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_autocomplete_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; /** * [descr:_ui_autocomplete_PasteEvent] */ - export type PasteEvent = DevExpress.events.NativeEventInfo< + export type PasteEvent = DevExpress.common.core.events.NativeEventInfo< dxAutocomplete, ClipboardEvent >; @@ -8924,16 +9011,17 @@ declare module DevExpress.ui { * [descr:_ui_autocomplete_SelectionChangedEvent] */ export type SelectionChangedEvent = - DevExpress.events.EventInfo & + DevExpress.common.core.events.EventInfo & DevExpress.ui.dxDropDownList.SelectionChangedInfo; /** * [descr:_ui_autocomplete_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< - dxAutocomplete, - KeyboardEvent | MouseEvent | PointerEvent | Event - > & - DevExpress.ui.Editor.ValueChangedInfo; + export type ValueChangedEvent = + DevExpress.common.core.events.NativeEventInfo< + dxAutocomplete, + KeyboardEvent | MouseEvent | PointerEvent | Event + > & + DevExpress.ui.Editor.ValueChangedInfo; } /** * [descr:dxAutocompleteOptions] @@ -8979,7 +9067,7 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; export type CrosswiseDistribution = 'center' | 'end' | 'start' | 'stretch'; /** * [descr:_ui_box_DisposingEvent] @@ -8987,7 +9075,7 @@ declare module DevExpress.ui { export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; export type Distribution = | 'center' | 'end' @@ -9011,40 +9099,40 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.core.events.InitializedEventInfo>; /** * [descr:_ui_box_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxBox, MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_box_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxBox, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_box_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxBox, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * @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. */ @@ -9055,16 +9143,16 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_box_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -9111,7 +9199,7 @@ declare module DevExpress.ui { /** * [descr:dxBoxOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxBoxOptions.direction] */ @@ -9129,7 +9217,7 @@ declare module DevExpress.ui { /** * [descr:_ui_button_ClickEvent] */ - export type ClickEvent = DevExpress.events.NativeEventInfo< + export type ClickEvent = DevExpress.common.core.events.NativeEventInfo< dxButton, KeyboardEvent | MouseEvent | PointerEvent > & { @@ -9141,21 +9229,24 @@ declare module DevExpress.ui { /** * [descr:_ui_button_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_button_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_button_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_button_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxButtonOptions; export type TemplateData = { readonly text?: string; @@ -9170,36 +9261,38 @@ declare module DevExpress.ui { /** * [descr:_ui_button_group_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_button_group_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_button_group_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_button_group_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo< + export type ItemClickEvent = DevExpress.common.core.events.NativeEventInfo< dxButtonGroup, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_button_group_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxButtonGroupOptions; /** * [descr:_ui_button_group_SelectionChangedEvent] */ export type SelectionChangedEvent = - DevExpress.events.EventInfo & + DevExpress.common.core.events.EventInfo & DevExpress.ui.CollectionWidget.SelectionChangeInfo; } /** @@ -9235,7 +9328,7 @@ declare module DevExpress.ui { * [descr:dxButtonGroupOptions.buttonTemplate] */ buttonTemplate?: - | DevExpress.core.template + | template | (( buttonData: any, buttonContent: DevExpress.core.DxElement @@ -9317,7 +9410,7 @@ declare module DevExpress.ui { * [descr:dxButtonOptions.template] */ template?: - | DevExpress.core.template + | template | (( data: DevExpress.ui.dxButton.TemplateData, contentElement: DevExpress.core.DxElement @@ -9366,7 +9459,8 @@ declare module DevExpress.ui { readonly date: Date; readonly view: string; } - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:DisabledDate] */ @@ -9374,26 +9468,29 @@ declare module DevExpress.ui { /** * [descr:_ui_calendar_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_calendar_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_calendar_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxCalendarOptions; /** * [descr:_ui_calendar_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< - dxCalendar, - KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | Event - > & - DevExpress.ui.Editor.ValueChangedInfo; + export type ValueChangedEvent = + DevExpress.common.core.events.NativeEventInfo< + dxCalendar, + KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | Event + > & + DevExpress.ui.Editor.ValueChangedInfo; export type WeekNumberRule = | 'auto' | 'firstDay' @@ -9414,7 +9511,7 @@ declare module DevExpress.ui { * [descr:dxCalendarOptions.cellTemplate] */ cellTemplate?: - | DevExpress.core.template + | template | (( itemData: DevExpress.ui.dxCalendar.CellTemplateData, itemIndex: number, @@ -9514,13 +9611,14 @@ declare module DevExpress.ui { */ renderMessage(message: DevExpress.ui.dxChat.Message): void; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.data.DataSource; } module dxChat { /** * [descr:_ui_chat_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; export type ExplicitTypes = { Properties: Properties; DisposingEvent: DisposingEvent; @@ -9531,19 +9629,20 @@ declare module DevExpress.ui { * [descr:_ui_chat_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_chat_MessageEnteredEvent] */ - export type MessageEnteredEvent = DevExpress.events.NativeEventInfo< - dxChat, - KeyboardEvent | PointerEvent | MouseEvent | TouchEvent - > & { - /** - * [descr:_ui_chat_MessageEnteredEvent.message] - */ - readonly message?: Message; - }; + export type MessageEnteredEvent = + DevExpress.common.core.events.NativeEventInfo< + dxChat, + KeyboardEvent | PointerEvent | MouseEvent | TouchEvent + > & { + /** + * [descr:_ui_chat_MessageEnteredEvent.message] + */ + readonly message?: Message; + }; export type MessageTemplateData = { readonly component: dxChat; readonly message?: Message; @@ -9551,30 +9650,33 @@ declare module DevExpress.ui { /** * [descr:_ui_chat_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxChatOptions; /** * [descr:_ui_chat_TypingEndEvent] */ - export type TypingEndEvent = DevExpress.events.EventInfo & { - /** - * [descr:_ui_chat_TypingEndEvent.user] - */ - readonly user?: User; - }; + export type TypingEndEvent = + DevExpress.common.core.events.EventInfo & { + /** + * [descr:_ui_chat_TypingEndEvent.user] + */ + readonly user?: User; + }; /** * [descr:_ui_chat_TypingStartEvent] */ - export type TypingStartEvent = DevExpress.events.NativeEventInfo< - dxChat, - UIEvent & { target: HTMLInputElement } - > & { - /** - * [descr:_ui_chat_TypingStartEvent.user] - */ - readonly user?: User; - }; + export type TypingStartEvent = + DevExpress.common.core.events.NativeEventInfo< + dxChat, + UIEvent & { target: HTMLInputElement } + > & { + /** + * [descr:_ui_chat_TypingStartEvent.user] + */ + readonly user?: User; + }; } /** * [descr:dxChatOptions] @@ -9604,11 +9706,11 @@ declare module DevExpress.ui { /** * [descr:dxChatOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxChatOptions.dayHeaderFormat] */ - dayHeaderFormat?: Format; + dayHeaderFormat?: DevExpress.common.core.localization.Format; /** * [descr:dxChatOptions.reloadOnChange] */ @@ -9621,7 +9723,7 @@ declare module DevExpress.ui { * [descr:dxChatOptions.messageTemplate] */ messageTemplate?: - | DevExpress.core.template + | template | null | (( data: DevExpress.ui.dxChat.MessageTemplateData, @@ -9630,7 +9732,7 @@ declare module DevExpress.ui { /** * [descr:dxChatOptions.messageTimestampFormat] */ - messageTimestampFormat?: Format; + messageTimestampFormat?: DevExpress.common.core.localization.Format; /** * [descr:dxChatOptions.typingUsers] */ @@ -9687,30 +9789,34 @@ declare module DevExpress.ui { /** * [descr:_ui_check_box_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_check_box_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_check_box_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_check_box_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxCheckBoxOptions; /** * [descr:_ui_check_box_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< - dxCheckBox, - KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | Event - > & - DevExpress.ui.Editor.ValueChangedInfo; + export type ValueChangedEvent = + DevExpress.common.core.events.NativeEventInfo< + dxCheckBox, + KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | Event + > & + DevExpress.ui.Editor.ValueChangedInfo; } /** * [descr:dxCheckBoxOptions] @@ -9764,52 +9870,54 @@ declare module DevExpress.ui { /** * [descr:_ui_color_box_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo< + export type ChangeEvent = DevExpress.common.core.events.NativeEventInfo< dxColorBox, Event >; /** * [descr:_ui_color_box_ClosedEvent] */ - export type ClosedEvent = DevExpress.events.EventInfo; + export type ClosedEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_color_box_CopyEvent] */ - export type CopyEvent = DevExpress.events.NativeEventInfo< + export type CopyEvent = DevExpress.common.core.events.NativeEventInfo< dxColorBox, ClipboardEvent >; /** * [descr:_ui_color_box_CutEvent] */ - export type CutEvent = DevExpress.events.NativeEventInfo< + export type CutEvent = DevExpress.common.core.events.NativeEventInfo< dxColorBox, ClipboardEvent >; /** * [descr:_ui_color_box_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; export type DropDownButtonTemplateData = DevExpress.ui.dxDropDownEditor.DropDownButtonTemplateDataModel; /** * [descr:_ui_color_box_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.core.events.NativeEventInfo< dxColorBox, KeyboardEvent >; /** * [descr:_ui_color_box_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.core.events.NativeEventInfo< dxColorBox, FocusEvent >; /** * [descr:_ui_color_box_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.core.events.NativeEventInfo< dxColorBox, FocusEvent >; @@ -9817,45 +9925,47 @@ declare module DevExpress.ui { * [descr:_ui_color_box_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_color_box_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.core.events.NativeEventInfo< dxColorBox, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_color_box_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.core.events.NativeEventInfo< dxColorBox, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.core.events.NativeEventInfo< dxColorBox, KeyboardEvent >; /** * [descr:_ui_color_box_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.core.events.NativeEventInfo< dxColorBox, KeyboardEvent >; /** * [descr:_ui_color_box_OpenedEvent] */ - export type OpenedEvent = DevExpress.events.EventInfo; + export type OpenedEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_color_box_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; /** * [descr:_ui_color_box_PasteEvent] */ - export type PasteEvent = DevExpress.events.NativeEventInfo< + export type PasteEvent = DevExpress.common.core.events.NativeEventInfo< dxColorBox, ClipboardEvent >; @@ -9863,11 +9973,12 @@ declare module DevExpress.ui { /** * [descr:_ui_color_box_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< - dxColorBox, - KeyboardEvent | MouseEvent | PointerEvent | UIEvent | Event - > & - DevExpress.ui.Editor.ValueChangedInfo; + export type ValueChangedEvent = + DevExpress.common.core.events.NativeEventInfo< + dxColorBox, + KeyboardEvent | MouseEvent | PointerEvent | UIEvent | Event + > & + DevExpress.ui.Editor.ValueChangedInfo; } /** * [descr:dxColorBoxOptions] @@ -9896,7 +10007,7 @@ declare module DevExpress.ui { * [descr:dxColorBoxOptions.fieldTemplate] */ fieldTemplate?: - | DevExpress.core.template + | template | (( value: string, fieldElement: DevExpress.core.DxElement @@ -9939,16 +10050,14 @@ declare module DevExpress.ui { /** * [descr:_ui_context_menu_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo< - dxContextMenu - >; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo>; export type ContextSubmenuDirection = 'auto' | 'left' | 'right'; /** * [descr:_ui_context_menu_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo< - dxContextMenu - >; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -9968,82 +10077,80 @@ declare module DevExpress.ui { /** * [descr:_ui_context_menu_HiddenEvent] */ - export type HiddenEvent = DevExpress.events.EventInfo< - dxContextMenu - >; + export type HiddenEvent = + DevExpress.common.core.events.EventInfo>; /** * [descr:_ui_context_menu_HidingEvent] */ - export type HidingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo>; + export type HidingEvent = + DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo>; /** * [descr:_ui_context_menu_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo>; + DevExpress.common.core.events.InitializedEventInfo>; /** * [descr:_ui_context_menu_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo< - dxContextMenu, - KeyboardEvent | MouseEvent | PointerEvent - > & - DevExpress.events.ItemInfo; + export type ItemClickEvent = + DevExpress.common.core.events.NativeEventInfo< + dxContextMenu, + KeyboardEvent | MouseEvent | PointerEvent + > & + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_context_menu_ItemContextMenuEvent] */ export type ItemContextMenuEvent = - DevExpress.events.NativeEventInfo< + DevExpress.common.core.events.NativeEventInfo< dxContextMenu, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_context_menu_ItemRenderedEvent] */ - export type ItemRenderedEvent = DevExpress.events.EventInfo< - dxContextMenu - > & - DevExpress.events.ItemInfo; + export type ItemRenderedEvent = + DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_context_menu_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo< - dxContextMenu - > & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ChangedOptionInfo; /** * [descr:_ui_context_menu_PositioningEvent] */ export type PositioningEvent = - DevExpress.events.NativeEventInfo< + DevExpress.common.core.events.NativeEventInfo< dxContextMenu, MouseEvent | PointerEvent | TouchEvent > & { /** * [descr:_ui_context_menu_PositioningEvent.position] */ - readonly position: PositionConfig; + readonly position: DevExpress.common.core.animation.PositionConfig; }; export type Properties = dxContextMenuOptions; /** * [descr:_ui_context_menu_SelectionChangedEvent] */ - export type SelectionChangedEvent = DevExpress.events.EventInfo< - dxContextMenu - > & - DevExpress.ui.CollectionWidget.SelectionChangeInfo; + export type SelectionChangedEvent = + DevExpress.common.core.events.EventInfo> & + DevExpress.ui.CollectionWidget.SelectionChangeInfo; /** * [descr:_ui_context_menu_ShowingEvent] */ - export type ShowingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo>; + export type ShowingEvent = + DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo>; /** * [descr:_ui_context_menu_ShownEvent] */ - export type ShownEvent = DevExpress.events.EventInfo< - dxContextMenu - >; + export type ShownEvent = + DevExpress.common.core.events.EventInfo>; } /** * @deprecated Use DevExpress.ui.dxContextMenu.Item instead @@ -10075,7 +10182,7 @@ declare module DevExpress.ui { /** * [descr:dxContextMenuOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike< + dataSource?: DevExpress.data.DataSourceLike< DevExpress.ui.dxContextMenu.Item, TKey > | null; @@ -10118,7 +10225,7 @@ declare module DevExpress.ui { /** * [descr:dxContextMenuOptions.position] */ - position?: PositionConfig; + position?: DevExpress.common.core.animation.PositionConfig; /** * [descr:dxContextMenuOptions.showEvent] */ @@ -10273,7 +10380,7 @@ declare module DevExpress.ui { ): DevExpress.core.DxElement | undefined; getCombinedFilter(): any; getCombinedFilter(returnDataField: boolean): any; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.data.DataSource; getKeyByRowIndex(rowIndex: number): TKey | undefined; getRowElement( rowIndex: number @@ -10318,7 +10425,7 @@ declare module DevExpress.ui { export type AdaptiveDetailRowPreparingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.AdaptiveDetailRowPreparingInfo; /** * [descr:_ui_data_grid_CellClickEvent] @@ -10326,7 +10433,7 @@ declare module DevExpress.ui { export type CellClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxDataGrid, PointerEvent | MouseEvent > & { @@ -10381,7 +10488,7 @@ declare module DevExpress.ui { export type CellDblClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxDataGrid, PointerEvent | MouseEvent > & { @@ -10436,7 +10543,7 @@ declare module DevExpress.ui { export type CellHoverChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.core.events.EventInfo> & { /** * [descr:_ui_data_grid_CellHoverChangedEvent.eventType] */ @@ -10492,7 +10599,7 @@ declare module DevExpress.ui { export type CellPreparedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.core.events.EventInfo> & { /** * [descr:_ui_data_grid_CellPreparedEvent.data] */ @@ -10583,7 +10690,7 @@ declare module DevExpress.ui { export type ColumnButtonClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxDataGrid, PointerEvent | MouseEvent > & { @@ -10659,14 +10766,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; /** * [descr:_ui_data_grid_ContextMenuPreparingEvent] */ export type ContextMenuPreparingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.core.events.EventInfo> & { /** * [descr:_ui_data_grid_ContextMenuPreparingEvent.items] */ @@ -10710,7 +10817,7 @@ declare module DevExpress.ui { export type DataErrorOccurredEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.DataErrorOccurredInfo; export type DataGridCommandColumnType = | 'adaptive' @@ -10752,7 +10859,7 @@ declare module DevExpress.ui { export type DisposingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; /** * @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. */ @@ -10767,7 +10874,7 @@ declare module DevExpress.ui { export type EditCanceledEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.DataChangeInfo; /** * [descr:_ui_data_grid_EditCancelingEvent] @@ -10775,8 +10882,8 @@ declare module DevExpress.ui { export type EditCancelingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.DataChangeInfo; /** * [descr:dxDataGridEditing] @@ -10830,8 +10937,8 @@ declare module DevExpress.ui { export type EditingStartEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & { + > = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo> & { /** * [descr:_ui_data_grid_EditingStartEvent.data] */ @@ -10852,7 +10959,7 @@ declare module DevExpress.ui { export type EditorPreparedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.core.events.EventInfo> & { /** * [descr:_ui_data_grid_EditorPreparedEvent.parentType] */ @@ -10904,7 +11011,7 @@ declare module DevExpress.ui { export type EditorPreparingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.core.events.EventInfo> & { /** * [descr:_ui_data_grid_EditorPreparingEvent.parentType] */ @@ -11077,8 +11184,8 @@ declare module DevExpress.ui { export type ExportingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & { + > = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo> & { /** * [descr:_ui_data_grid_ExportingEvent.fileName] */ @@ -11121,7 +11228,7 @@ declare module DevExpress.ui { export type FocusedCellChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.core.events.EventInfo> & { /** * [descr:_ui_data_grid_FocusedCellChangedEvent.cellElement] */ @@ -11149,8 +11256,8 @@ declare module DevExpress.ui { export type FocusedCellChangingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.NativeEventInfo< dxDataGrid, KeyboardEvent | PointerEvent | MouseEvent | TouchEvent > & { @@ -11193,7 +11300,7 @@ declare module DevExpress.ui { export type FocusedRowChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.core.events.EventInfo> & { /** * [descr:_ui_data_grid_FocusedRowChangedEvent.rowElement] */ @@ -11213,8 +11320,8 @@ declare module DevExpress.ui { export type FocusedRowChangingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.NativeEventInfo< dxDataGrid, KeyboardEvent | PointerEvent | MouseEvent | TouchEvent > & { @@ -11339,14 +11446,16 @@ declare module DevExpress.ui { export type InitializedEvent< TRowData = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.core.events.InitializedEventInfo< + dxDataGrid + >; /** * [descr:_ui_data_grid_InitNewRowEvent] */ export type InitNewRowEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.NewRowInfo; /** * [descr:_ui_data_grid_KeyDownEvent] @@ -11354,7 +11463,7 @@ declare module DevExpress.ui { export type KeyDownEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxDataGrid, KeyboardEvent > & @@ -11375,7 +11484,7 @@ declare module DevExpress.ui { * [descr:dxDataGridOptions.masterDetail.template] */ template?: - | DevExpress.core.template + | template | (( detailElement: DevExpress.core.DxElement, detailInfo: MasterDetailTemplateData @@ -11392,8 +11501,8 @@ declare module DevExpress.ui { export type OptionChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ChangedOptionInfo; /** * @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. */ @@ -11487,7 +11596,7 @@ declare module DevExpress.ui { export type RowClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxDataGrid, PointerEvent | MouseEvent > & { @@ -11546,7 +11655,7 @@ declare module DevExpress.ui { export type RowCollapsedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.RowKeyInfo; /** * [descr:_ui_data_grid_RowCollapsingEvent] @@ -11554,8 +11663,8 @@ declare module DevExpress.ui { export type RowCollapsingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.RowKeyInfo; /** * [descr:_ui_data_grid_RowDblClickEvent] @@ -11563,7 +11672,7 @@ declare module DevExpress.ui { export type RowDblClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxDataGrid, PointerEvent | MouseEvent > & { @@ -11625,21 +11734,21 @@ declare module DevExpress.ui { export type RowDraggingChangeEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & + > = DevExpress.common.core.events.Cancelable & DevExpress.common.ReducedNativeEventInfo> & DevExpress.common.grids.RowDraggingEventInfo & DevExpress.common.grids.DragDropInfo; export type RowDraggingEndEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & + > = DevExpress.common.core.events.Cancelable & DevExpress.common.ReducedNativeEventInfo> & DevExpress.common.grids.RowDraggingEventInfo & DevExpress.common.grids.DragDropInfo; export type RowDraggingMoveEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & + > = DevExpress.common.core.events.Cancelable & DevExpress.common.ReducedNativeEventInfo> & DevExpress.common.grids.RowDraggingEventInfo & DevExpress.common.grids.DragDropInfo; @@ -11657,7 +11766,7 @@ declare module DevExpress.ui { export type RowDraggingStartEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & + > = DevExpress.common.core.events.Cancelable & DevExpress.common.ReducedNativeEventInfo> & DevExpress.common.grids.DragStartEventInfo; /** @@ -11666,7 +11775,7 @@ declare module DevExpress.ui { export type RowExpandedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.RowKeyInfo; /** * [descr:_ui_data_grid_RowExpandingEvent] @@ -11674,8 +11783,8 @@ declare module DevExpress.ui { export type RowExpandingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.RowKeyInfo; /** * [descr:_ui_data_grid_RowInsertedEvent] @@ -11683,7 +11792,7 @@ declare module DevExpress.ui { export type RowInsertedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.RowInsertedInfo; /** * [descr:_ui_data_grid_RowInsertingEvent] @@ -11691,7 +11800,7 @@ declare module DevExpress.ui { export type RowInsertingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.RowInsertingInfo; /** * [descr:_ui_data_grid_RowPreparedEvent] @@ -11699,7 +11808,7 @@ declare module DevExpress.ui { export type RowPreparedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.core.events.EventInfo> & { /** * [descr:_ui_data_grid_RowPreparedEvent.data] */ @@ -11751,7 +11860,7 @@ declare module DevExpress.ui { export type RowRemovedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.RowRemovedInfo; /** * [descr:_ui_data_grid_RowRemovingEvent] @@ -11759,7 +11868,7 @@ declare module DevExpress.ui { export type RowRemovingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.RowRemovingInfo; export type RowTemplateData = { readonly key: TKey; @@ -11779,7 +11888,7 @@ declare module DevExpress.ui { export type RowUpdatedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.RowUpdatedInfo; /** * [descr:_ui_data_grid_RowUpdatingEvent] @@ -11787,7 +11896,7 @@ declare module DevExpress.ui { export type RowUpdatingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.RowUpdatingInfo; /** * [descr:_ui_data_grid_RowValidatingEvent] @@ -11795,7 +11904,7 @@ declare module DevExpress.ui { export type RowValidatingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.RowValidatingInfo; /** * [descr:_ui_data_grid_SavedEvent] @@ -11803,7 +11912,7 @@ declare module DevExpress.ui { export type SavedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.DataChangeInfo; /** * [descr:_ui_data_grid_SavingEvent] @@ -11811,7 +11920,7 @@ declare module DevExpress.ui { export type SavingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.SavingInfo; /** * [descr:dxDataGridScrolling] @@ -11856,7 +11965,7 @@ declare module DevExpress.ui { export type SelectionChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.SelectionChangedInfo; export type SelectionSensitivity = 'base' | 'accent' | 'case' | 'variant'; /** @@ -11950,7 +12059,7 @@ declare module DevExpress.ui { /** * [descr:dxDataGridOptions.summary.groupItems.valueFormat] */ - valueFormat?: Format | undefined; + valueFormat?: DevExpress.common.core.localization.Format | undefined; }; export type SummaryItemTextInfo = { readonly value?: string | number | Date; @@ -12040,7 +12149,7 @@ declare module DevExpress.ui { /** * [descr:dxDataGridOptions.summary.totalItems.valueFormat] */ - valueFormat?: Format | undefined; + valueFormat?: DevExpress.common.core.localization.Format | undefined; }; /** * [descr:_ui_data_grid_ToolbarPreparingEvent] @@ -12048,7 +12157,7 @@ declare module DevExpress.ui { export type ToolbarPreparingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.ToolbarPreparingInfo; } /** @@ -12086,7 +12195,7 @@ declare module DevExpress.ui { * [descr:dxDataGridColumn.cellTemplate] */ cellTemplate?: - | DevExpress.core.template + | template | (( cellElement: DevExpress.core.DxElement, cellInfo: DevExpress.ui.dxDataGrid.ColumnCellTemplateData< @@ -12104,7 +12213,7 @@ declare module DevExpress.ui { * [descr:dxDataGridColumn.editCellTemplate] */ editCellTemplate?: - | DevExpress.core.template + | template | (( cellElement: DevExpress.core.DxElement, cellInfo: DevExpress.ui.dxDataGrid.ColumnEditCellTemplateData< @@ -12116,7 +12225,7 @@ declare module DevExpress.ui { * [descr:dxDataGridColumn.groupCellTemplate] */ groupCellTemplate?: - | DevExpress.core.template + | template | (( cellElement: DevExpress.core.DxElement, cellInfo: DevExpress.ui.dxDataGrid.ColumnGroupCellTemplateData< @@ -12132,7 +12241,7 @@ declare module DevExpress.ui { * [descr:dxDataGridColumn.headerCellTemplate] */ headerCellTemplate?: - | DevExpress.core.template + | template | (( columnHeader: DevExpress.core.DxElement, headerInfo: DevExpress.ui.dxDataGrid.ColumnHeaderCellTemplateData< @@ -12169,7 +12278,7 @@ declare module DevExpress.ui { * [descr:dxDataGridColumnButton.template] */ template?: - | DevExpress.core.template + | template | (( cellElement: DevExpress.core.DxElement, cellInfo: DevExpress.ui.dxDataGrid.ColumnButtonTemplateData< @@ -12379,7 +12488,7 @@ declare module DevExpress.ui { * @deprecated [depNote:dxDataGridOptions.rowTemplate] */ rowTemplate?: - | DevExpress.core.template + | template | (( rowElement: DevExpress.core.DxElement, rowInfo: DevExpress.ui.dxDataGrid.RowTemplateData @@ -12388,7 +12497,7 @@ declare module DevExpress.ui { * [descr:dxDataGridOptions.dataRowTemplate] */ dataRowTemplate?: - | DevExpress.core.template + | template | (( rowElement: DevExpress.core.DxElement, rowInfo: DevExpress.ui.dxDataGrid.DataRowTemplateData @@ -12441,29 +12550,31 @@ declare module DevExpress.ui { /** * [descr:_ui_date_box_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo< + export type ChangeEvent = DevExpress.common.core.events.NativeEventInfo< dxDateBox, Event >; /** * [descr:_ui_date_box_ClosedEvent] */ - export type ClosedEvent = DevExpress.events.EventInfo; + export type ClosedEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_date_box_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_date_box_CopyEvent] */ - export type CopyEvent = DevExpress.events.NativeEventInfo< + export type CopyEvent = DevExpress.common.core.events.NativeEventInfo< dxDateBox, ClipboardEvent >; /** * [descr:_ui_date_box_CutEvent] */ - export type CutEvent = DevExpress.events.NativeEventInfo< + export type CutEvent = DevExpress.common.core.events.NativeEventInfo< dxDateBox, ClipboardEvent >; @@ -12474,27 +12585,28 @@ declare module DevExpress.ui { /** * [descr:_ui_date_box_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; export type DropDownButtonTemplateData = DevExpress.ui.dxDropDownEditor.DropDownButtonTemplateDataModel; /** * [descr:_ui_date_box_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.core.events.NativeEventInfo< dxDateBox, KeyboardEvent >; /** * [descr:_ui_date_box_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.core.events.NativeEventInfo< dxDateBox, FocusEvent >; /** * [descr:_ui_date_box_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.core.events.NativeEventInfo< dxDateBox, FocusEvent >; @@ -12502,45 +12614,47 @@ declare module DevExpress.ui { * [descr:_ui_date_box_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_date_box_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.core.events.NativeEventInfo< dxDateBox, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_date_box_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.core.events.NativeEventInfo< dxDateBox, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.core.events.NativeEventInfo< dxDateBox, KeyboardEvent >; /** * [descr:_ui_date_box_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.core.events.NativeEventInfo< dxDateBox, KeyboardEvent >; /** * [descr:_ui_date_box_OpenedEvent] */ - export type OpenedEvent = DevExpress.events.EventInfo; + export type OpenedEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_date_box_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; /** * [descr:_ui_date_box_PasteEvent] */ - export type PasteEvent = DevExpress.events.NativeEventInfo< + export type PasteEvent = DevExpress.common.core.events.NativeEventInfo< dxDateBox, ClipboardEvent >; @@ -12548,11 +12662,12 @@ declare module DevExpress.ui { /** * [descr:_ui_date_box_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< - dxDateBox, - KeyboardEvent | MouseEvent | PointerEvent | Event - > & - DevExpress.ui.Editor.ValueChangedInfo; + export type ValueChangedEvent = + DevExpress.common.core.events.NativeEventInfo< + dxDateBox, + KeyboardEvent | MouseEvent | PointerEvent | Event + > & + DevExpress.ui.Editor.ValueChangedInfo; } /** * [descr:dxDateBoxOptions] @@ -12644,53 +12759,57 @@ declare module DevExpress.ui { /** * [descr:_ui_date_range_box_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo; + export type ChangeEvent = + DevExpress.common.core.events.NativeEventInfo; /** * [descr:_ui_date_range_box_ClosedEvent] */ - export type ClosedEvent = DevExpress.events.EventInfo; + export type ClosedEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_date_range_box_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_date_range_box_CopyEvent] */ - export type CopyEvent = DevExpress.events.NativeEventInfo< + export type CopyEvent = DevExpress.common.core.events.NativeEventInfo< dxDateRangeBox, ClipboardEvent >; /** * [descr:_ui_date_range_box_CutEvent] */ - export type CutEvent = DevExpress.events.NativeEventInfo< + export type CutEvent = DevExpress.common.core.events.NativeEventInfo< dxDateRangeBox, ClipboardEvent >; /** * [descr:_ui_date_range_box_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; export type DropDownButtonTemplateData = DevExpress.ui.dxDropDownEditor.DropDownButtonTemplateDataModel; /** * [descr:_ui_date_range_box_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.core.events.NativeEventInfo< dxDateRangeBox, KeyboardEvent >; /** * [descr:_ui_date_range_box_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.core.events.NativeEventInfo< dxDateRangeBox, FocusEvent >; /** * [descr:_ui_date_range_box_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.core.events.NativeEventInfo< dxDateRangeBox, FocusEvent >; @@ -12698,46 +12817,47 @@ declare module DevExpress.ui { * [descr:_ui_date_range_box_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_date_range_box_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.core.events.NativeEventInfo< dxDateRangeBox, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_date_range_box_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.core.events.NativeEventInfo< dxDateRangeBox, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.core.events.NativeEventInfo< dxDateRangeBox, KeyboardEvent >; /** * [descr:_ui_date_range_box_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.core.events.NativeEventInfo< dxDateRangeBox, KeyboardEvent >; /** * [descr:_ui_date_range_box_OpenedEvent] */ - export type OpenedEvent = DevExpress.events.EventInfo; + export type OpenedEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_date_range_box_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; /** * [descr:_ui_date_range_box_PasteEvent] */ - export type PasteEvent = DevExpress.events.NativeEventInfo< + export type PasteEvent = DevExpress.common.core.events.NativeEventInfo< dxDateRangeBox, ClipboardEvent >; @@ -12832,11 +12952,12 @@ declare module DevExpress.ui { /** * [descr:_ui_date_range_box_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< - dxDateRangeBox, - KeyboardEvent | MouseEvent | PointerEvent | Event - > & - DevExpress.ui.Editor.ValueChangedInfo; + export type ValueChangedEvent = + DevExpress.common.core.events.NativeEventInfo< + dxDateRangeBox, + KeyboardEvent | MouseEvent | PointerEvent | Event + > & + DevExpress.ui.Editor.ValueChangedInfo; } /** * [descr:dxDeferRendering] @@ -12847,31 +12968,34 @@ declare module DevExpress.ui { * [descr:_ui_defer_rendering_ContentReadyEvent] */ export type ContentReadyEvent = - DevExpress.events.EventInfo; + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_defer_rendering_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_defer_rendering_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_defer_rendering_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxDeferRenderingOptions; /** * [descr:_ui_defer_rendering_RenderedEvent] */ - export type RenderedEvent = DevExpress.events.EventInfo; + export type RenderedEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_defer_rendering_ShownEvent] */ - export type ShownEvent = DevExpress.events.EventInfo; + export type ShownEvent = + DevExpress.common.core.events.EventInfo; } /** * [descr:dxDeferRenderingOptions] @@ -12883,7 +13007,7 @@ declare module DevExpress.ui { /** * [descr:dxDeferRenderingOptions.animation] */ - animation?: AnimationConfig | undefined; + animation?: DevExpress.common.core.animation.AnimationConfig | undefined; /** * [descr:dxDeferRenderingOptions.onRendered] */ @@ -12912,11 +13036,11 @@ declare module DevExpress.ui { /** * [descr:dxDiagram.getNodeDataSource()] */ - getNodeDataSource(): DevExpress.data.DataSource; + getNodeDataSource(): DevExpress.common.data.DataSource; /** * [descr:dxDiagram.getEdgeDataSource()] */ - getEdgeDataSource(): DevExpress.data.DataSource; + getEdgeDataSource(): DevExpress.common.data.DataSource; /** * [descr:dxDiagram.getItemByKey(key)] */ @@ -12973,7 +13097,8 @@ declare module DevExpress.ui { /** * [descr:_ui_diagram_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_diagram_CustomCommandEvent] */ @@ -13000,41 +13125,45 @@ declare module DevExpress.ui { /** * [descr:_ui_diagram_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_diagram_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_diagram_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.EventInfo & { - /** - * [descr:_ui_diagram_ItemClickEvent.item] - */ - readonly item: Item; - }; + export type ItemClickEvent = + DevExpress.common.core.events.EventInfo & { + /** + * [descr:_ui_diagram_ItemClickEvent.item] + */ + readonly item: Item; + }; /** * [descr:_ui_diagram_ItemDblClickEvent] */ - export type ItemDblClickEvent = DevExpress.events.EventInfo & { - /** - * [descr:_ui_diagram_ItemDblClickEvent.item] - */ - readonly item: Item; - }; + export type ItemDblClickEvent = + DevExpress.common.core.events.EventInfo & { + /** + * [descr:_ui_diagram_ItemDblClickEvent.item] + */ + readonly item: Item; + }; /** * [descr:_ui_diagram_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxDiagramOptions; /** * [descr:_ui_diagram_RequestEditOperationEvent] */ export type RequestEditOperationEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_diagram_RequestEditOperationEvent.operation] */ @@ -13074,7 +13203,7 @@ declare module DevExpress.ui { * [descr:_ui_diagram_RequestLayoutUpdateEvent] */ export type RequestLayoutUpdateEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_diagram_RequestLayoutUpdateEvent.changes] */ @@ -13088,7 +13217,7 @@ declare module DevExpress.ui { * [descr:_ui_diagram_SelectionChangedEvent] */ export type SelectionChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_diagram_SelectionChangedEvent.items] */ @@ -13434,7 +13563,7 @@ declare module DevExpress.ui { * [descr:dxDiagramOptions.customShapeTemplate] */ customShapeTemplate?: - | DevExpress.core.template + | template | (( container: DevExpress.core.DxElement, data: DevExpress.ui.dxDiagram.CustomShapeTemplateData @@ -13443,7 +13572,7 @@ declare module DevExpress.ui { * [descr:dxDiagramOptions.customShapeToolboxTemplate] */ customShapeToolboxTemplate?: - | DevExpress.core.template + | template | (( container: DevExpress.core.DxElement, data: DevExpress.ui.dxDiagram.CustomShapeToolboxTemplateData @@ -13565,7 +13694,7 @@ declare module DevExpress.ui { * [descr:dxDiagramOptions.customShapes.template] */ template?: - | DevExpress.core.template + | template | (( container: DevExpress.core.DxElement, data: DevExpress.ui.dxDiagram.CustomShapeTemplateData @@ -13610,7 +13739,7 @@ declare module DevExpress.ui { * [descr:dxDiagramOptions.customShapes.toolboxTemplate] */ toolboxTemplate?: - | DevExpress.core.template + | template | (( container: DevExpress.core.DxElement, data: DevExpress.ui.dxDiagram.CustomShapeToolboxTemplateData @@ -13717,7 +13846,7 @@ declare module DevExpress.ui { /** * [descr:dxDiagramOptions.edges.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxDiagramOptions.edges.fromExpr] */ @@ -13847,7 +13976,7 @@ declare module DevExpress.ui { /** * [descr:dxDiagramOptions.nodes.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxDiagramOptions.nodes.heightExpr] */ @@ -14254,12 +14383,13 @@ declare module DevExpress.ui { /** * [descr:_ui_draggable_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_draggable_DragEndEvent] */ - export type DragEndEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type DragEndEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.NativeEventInfo< dxDraggable, PointerEvent | MouseEvent | TouchEvent > & { @@ -14291,8 +14421,8 @@ declare module DevExpress.ui { /** * [descr:_ui_draggable_DragMoveEvent] */ - export type DragMoveEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type DragMoveEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.NativeEventInfo< dxDraggable, PointerEvent | MouseEvent | TouchEvent > & { @@ -14324,8 +14454,8 @@ declare module DevExpress.ui { /** * [descr:_ui_draggable_DragStartEvent] */ - export type DragStartEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type DragStartEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.NativeEventInfo< dxDraggable, PointerEvent | MouseEvent | TouchEvent > & { @@ -14350,12 +14480,13 @@ declare module DevExpress.ui { * [descr:_ui_draggable_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_draggable_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxDraggableOptions; } /** @@ -14373,7 +14504,7 @@ declare module DevExpress.ui { * [descr:dxDraggableOptions.dragTemplate] */ dragTemplate?: - | DevExpress.core.template + | template | (( dragInfo: DevExpress.ui.dxDraggable.DragTemplateData, containerElement: DevExpress.core.DxElement @@ -14417,18 +14548,20 @@ declare module DevExpress.ui { /** * [descr:_ui_drawer_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_drawer_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; export type OpenedStateMode = 'overlap' | 'shrink' | 'push'; /** * [descr:_ui_drawer_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type PanelLocation = | 'left' | 'right' @@ -14494,28 +14627,27 @@ declare module DevExpress.ui { /** * [descr:dxDrawerOptions.template] */ - template?: - | DevExpress.core.template - | ((Element: DevExpress.core.DxElement) => any); + template?: template | ((Element: DevExpress.core.DxElement) => any); } /** * [descr:dxDropDownBox] */ export class dxDropDownBox extends dxDropDownEditor { - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.data.DataSource; } module dxDropDownBox { /** * [descr:_ui_drop_down_box_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo< + export type ChangeEvent = DevExpress.common.core.events.NativeEventInfo< dxDropDownBox, Event >; /** * [descr:_ui_drop_down_box_ClosedEvent] */ - export type ClosedEvent = DevExpress.events.EventInfo; + export type ClosedEvent = + DevExpress.common.core.events.EventInfo; export type ContentTemplateData = { component: dxDropDownBox; readonly value?: any; @@ -14523,41 +14655,42 @@ declare module DevExpress.ui { /** * [descr:_ui_drop_down_box_CopyEvent] */ - export type CopyEvent = DevExpress.events.NativeEventInfo< + export type CopyEvent = DevExpress.common.core.events.NativeEventInfo< dxDropDownBox, ClipboardEvent >; /** * [descr:_ui_drop_down_box_CutEvent] */ - export type CutEvent = DevExpress.events.NativeEventInfo< + export type CutEvent = DevExpress.common.core.events.NativeEventInfo< dxDropDownBox, ClipboardEvent >; /** * [descr:_ui_drop_down_box_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; export type DropDownButtonTemplateData = DevExpress.ui.dxDropDownEditor.DropDownButtonTemplateDataModel; /** * [descr:_ui_drop_down_box_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.core.events.NativeEventInfo< dxDropDownBox, KeyboardEvent >; /** * [descr:_ui_drop_down_box_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.core.events.NativeEventInfo< dxDropDownBox, FocusEvent >; /** * [descr:_ui_drop_down_box_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.core.events.NativeEventInfo< dxDropDownBox, FocusEvent >; @@ -14565,46 +14698,47 @@ declare module DevExpress.ui { * [descr:_ui_drop_down_box_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_drop_down_box_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.core.events.NativeEventInfo< dxDropDownBox, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_drop_down_box_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.core.events.NativeEventInfo< dxDropDownBox, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.core.events.NativeEventInfo< dxDropDownBox, KeyboardEvent >; /** * [descr:_ui_drop_down_box_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.core.events.NativeEventInfo< dxDropDownBox, KeyboardEvent >; /** * [descr:_ui_drop_down_box_OpenedEvent] */ - export type OpenedEvent = DevExpress.events.EventInfo; + export type OpenedEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_drop_down_box_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; /** * [descr:_ui_drop_down_box_PasteEvent] */ - export type PasteEvent = DevExpress.events.NativeEventInfo< + export type PasteEvent = DevExpress.common.core.events.NativeEventInfo< dxDropDownBox, ClipboardEvent >; @@ -14612,11 +14746,12 @@ declare module DevExpress.ui { /** * [descr:_ui_drop_down_box_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< - dxDropDownBox, - KeyboardEvent | MouseEvent | PointerEvent | Event - > & - DevExpress.ui.Editor.ValueChangedInfo; + export type ValueChangedEvent = + DevExpress.common.core.events.NativeEventInfo< + dxDropDownBox, + KeyboardEvent | MouseEvent | PointerEvent | Event + > & + DevExpress.ui.Editor.ValueChangedInfo; } /** * [descr:dxDropDownBoxOptions] @@ -14634,7 +14769,7 @@ declare module DevExpress.ui { * [descr:dxDropDownBoxOptions.contentTemplate] */ contentTemplate?: - | DevExpress.core.template + | template | (( templateData: DevExpress.ui.dxDropDownBox.ContentTemplateData, contentElement: DevExpress.core.DxElement @@ -14642,7 +14777,7 @@ declare module DevExpress.ui { /** * [descr:dxDropDownBoxOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxDropDownBoxOptions.displayValueFormatter] */ @@ -14651,7 +14786,7 @@ declare module DevExpress.ui { * [descr:dxDropDownBoxOptions.fieldTemplate] */ fieldTemplate?: - | DevExpress.core.template + | template | (( value: any, fieldElement: DevExpress.core.DxElement @@ -14682,7 +14817,7 @@ declare module DevExpress.ui { * [descr:dxDropDownButton.close()] */ close(): DevExpress.core.utils.DxPromise; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.data.DataSource; /** * [descr:dxDropDownButton.open()] */ @@ -14700,33 +14835,35 @@ declare module DevExpress.ui { /** * [descr:_ui_drop_down_button_ButtonClickEvent] */ - export type ButtonClickEvent = DevExpress.events.NativeEventInfo< - dxDropDownButton, - KeyboardEvent | MouseEvent | PointerEvent - > & { - /** - * [descr:_ui_drop_down_button_ButtonClickEvent.selectedItem] - */ - readonly selectedItem?: any; - }; + export type ButtonClickEvent = + DevExpress.common.core.events.NativeEventInfo< + dxDropDownButton, + KeyboardEvent | MouseEvent | PointerEvent + > & { + /** + * [descr:_ui_drop_down_button_ButtonClickEvent.selectedItem] + */ + readonly selectedItem?: any; + }; /** * [descr:_ui_drop_down_button_ContentReadyEvent] */ export type ContentReadyEvent = - DevExpress.events.EventInfo; + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_drop_down_button_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_drop_down_button_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_drop_down_button_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo< + export type ItemClickEvent = DevExpress.common.core.events.NativeEventInfo< dxDropDownButton, KeyboardEvent | MouseEvent | PointerEvent > & { @@ -14743,14 +14880,14 @@ declare module DevExpress.ui { * [descr:_ui_drop_down_button_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxDropDownButtonOptions; /** * [descr:_ui_drop_down_button_SelectionChangedEvent] */ export type SelectionChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_drop_down_button_SelectionChangedEvent.item] */ @@ -14783,7 +14920,7 @@ declare module DevExpress.ui { /** * [descr:dxDropDownButtonOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike< + dataSource?: DevExpress.data.DataSourceLike< DevExpress.ui.dxDropDownButton.Item | any > | null; /** @@ -14798,9 +14935,11 @@ declare module DevExpress.ui { * [descr:dxDropDownButtonOptions.dropDownContentTemplate] */ dropDownContentTemplate?: - | DevExpress.core.template + | template | (( - data: Array | DevExpress.data.DataSource, + data: + | Array + | DevExpress.common.data.DataSource, contentElement: DevExpress.core.DxElement ) => string | DevExpress.core.UserDefinedElement); /** @@ -14823,7 +14962,7 @@ declare module DevExpress.ui { * [descr:dxDropDownButtonOptions.itemTemplate] */ itemTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -14887,7 +15026,7 @@ declare module DevExpress.ui { * [descr:dxDropDownButtonOptions.template] */ template?: - | DevExpress.core.template + | template | (( data: DevExpress.ui.dxButton.TemplateData, contentElement: DevExpress.core.DxElement @@ -14984,7 +15123,7 @@ declare module DevExpress.ui { * [descr:dxDropDownEditorOptions.dropDownButtonTemplate] */ dropDownButtonTemplate?: - | DevExpress.core.template + | template | (( buttonData: DevExpress.ui.dxDropDownEditor.DropDownButtonTemplateDataModel, contentElement: DevExpress.core.DxElement @@ -14992,11 +15131,11 @@ declare module DevExpress.ui { /** * [descr:dxDropDownEditorOptions.onClosed] */ - onClosed?: (e: DevExpress.events.EventInfo) => void; + onClosed?: (e: DevExpress.common.core.events.EventInfo) => void; /** * [descr:dxDropDownEditorOptions.onOpened] */ - onOpened?: (e: DevExpress.events.EventInfo) => void; + onOpened?: (e: DevExpress.common.core.events.EventInfo) => void; /** * [descr:dxDropDownEditorOptions.openOnFieldClick] */ @@ -15027,7 +15166,7 @@ declare module DevExpress.ui { export class dxDropDownList< TProperties > extends dxDropDownEditor { - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.data.DataSource; } module dxDropDownList { /** @@ -15056,7 +15195,7 @@ declare module DevExpress.ui { * [descr:dxDropDownListOptions.groupTemplate] */ groupTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -15078,24 +15217,24 @@ declare module DevExpress.ui { * [descr:dxDropDownListOptions.onItemClick] */ onItemClick?: ( - e: DevExpress.events.NativeEventInfo< + e: DevExpress.common.core.events.NativeEventInfo< TComponent, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo + DevExpress.common.core.events.ItemInfo ) => void; /** * [descr:dxDropDownListOptions.onSelectionChanged] */ onSelectionChanged?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.core.events.EventInfo & DevExpress.ui.dxDropDownList.SelectionChangedInfo ) => void; /** * [descr:dxDropDownListOptions.onValueChanged] */ onValueChanged?: ( - e: DevExpress.events.NativeEventInfo< + e: DevExpress.common.core.events.NativeEventInfo< TComponent, KeyboardEvent | MouseEvent | PointerEvent | Event > & @@ -15181,61 +15320,64 @@ declare module DevExpress.ui { /** * [descr:_ui_file_manager_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_file_manager_ContextMenuItemClickEvent] */ - export type ContextMenuItemClickEvent = DevExpress.events.NativeEventInfo< - dxFileManager, - KeyboardEvent | PointerEvent | MouseEvent - > & { - /** - * [descr:_ui_file_manager_ContextMenuItemClickEvent.itemData] - */ - readonly itemData: any; - /** - * [descr:_ui_file_manager_ContextMenuItemClickEvent.itemElement] - */ - readonly itemElement: DevExpress.core.DxElement; - /** - * [descr:_ui_file_manager_ContextMenuItemClickEvent.itemIndex] - */ - readonly itemIndex: number; - /** - * [descr:_ui_file_manager_ContextMenuItemClickEvent.fileSystemItem] - */ - readonly fileSystemItem?: DevExpress.fileManagement.FileSystemItem; - /** - * [descr:_ui_file_manager_ContextMenuItemClickEvent.viewArea] - */ - readonly viewArea: FileManagerViewArea; - }; - /** - * [descr:_ui_file_manager_ContextMenuShowingEvent] - */ - export type ContextMenuShowingEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type ContextMenuItemClickEvent = + DevExpress.common.core.events.NativeEventInfo< dxFileManager, KeyboardEvent | PointerEvent | MouseEvent > & { /** - * [descr:_ui_file_manager_ContextMenuShowingEvent.fileSystemItem] + * [descr:_ui_file_manager_ContextMenuItemClickEvent.itemData] */ - readonly fileSystemItem?: DevExpress.fileManagement.FileSystemItem; + readonly itemData: any; + /** + * [descr:_ui_file_manager_ContextMenuItemClickEvent.itemElement] + */ + readonly itemElement: DevExpress.core.DxElement; + /** + * [descr:_ui_file_manager_ContextMenuItemClickEvent.itemIndex] + */ + readonly itemIndex: number; /** - * [descr:_ui_file_manager_ContextMenuShowingEvent.targetElement] + * [descr:_ui_file_manager_ContextMenuItemClickEvent.fileSystemItem] */ - readonly targetElement?: DevExpress.core.DxElement; + readonly fileSystemItem?: DevExpress.fileManagement.FileSystemItem; /** - * [descr:_ui_file_manager_ContextMenuShowingEvent.viewArea] + * [descr:_ui_file_manager_ContextMenuItemClickEvent.viewArea] */ readonly viewArea: FileManagerViewArea; }; + /** + * [descr:_ui_file_manager_ContextMenuShowingEvent] + */ + export type ContextMenuShowingEvent = + DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.NativeEventInfo< + dxFileManager, + KeyboardEvent | PointerEvent | MouseEvent + > & { + /** + * [descr:_ui_file_manager_ContextMenuShowingEvent.fileSystemItem] + */ + readonly fileSystemItem?: DevExpress.fileManagement.FileSystemItem; + /** + * [descr:_ui_file_manager_ContextMenuShowingEvent.targetElement] + */ + readonly targetElement?: DevExpress.core.DxElement; + /** + * [descr:_ui_file_manager_ContextMenuShowingEvent.viewArea] + */ + readonly viewArea: FileManagerViewArea; + }; /** * [descr:_ui_file_manager_CurrentDirectoryChangedEvent] */ export type CurrentDirectoryChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_file_manager_CurrentDirectoryChangedEvent.directory] */ @@ -15245,7 +15387,7 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_DirectoryCreatedEvent] */ export type DirectoryCreatedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_file_manager_DirectoryCreatedEvent.parentDirectory] */ @@ -15259,7 +15401,7 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_DirectoryCreatingEvent] */ export type DirectoryCreatingEvent = - DevExpress.events.EventInfo & + DevExpress.common.core.events.EventInfo & ActionEventInfo & { /** * [descr:_ui_file_manager_DirectoryCreatingEvent.parentDirectory] @@ -15273,12 +15415,13 @@ declare module DevExpress.ui { /** * [descr:_ui_file_manager_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_file_manager_ErrorOccurredEvent] */ export type ErrorOccurredEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_file_manager_ErrorOccurredEvent.errorCode] */ @@ -15326,7 +15469,7 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_FileUploadedEvent] */ export type FileUploadedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_file_manager_FileUploadedEvent.fileData] */ @@ -15340,7 +15483,7 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_FileUploadingEvent] */ export type FileUploadingEvent = - DevExpress.events.EventInfo & + DevExpress.common.core.events.EventInfo & ActionEventInfo & { /** * [descr:_ui_file_manager_FileUploadingEvent.fileData] @@ -15355,7 +15498,7 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_FocusedItemChangedEvent] */ export type FocusedItemChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_file_manager_FocusedItemChangedEvent.item] */ @@ -15369,47 +15512,49 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_file_manager_ItemCopiedEvent] */ - export type ItemCopiedEvent = DevExpress.events.EventInfo & { - /** - * [descr:_ui_file_manager_ItemCopiedEvent.sourceItem] - */ - readonly sourceItem: DevExpress.fileManagement.FileSystemItem; - /** - * [descr:_ui_file_manager_ItemCopiedEvent.parentDirectory] - */ - readonly parentDirectory: DevExpress.fileManagement.FileSystemItem; - /** - * [descr:_ui_file_manager_ItemCopiedEvent.itemName] - */ - readonly itemName: string; - /** - * [descr:_ui_file_manager_ItemCopiedEvent.itemPath] - */ - readonly itemPath: string; - }; - /** - * [descr:_ui_file_manager_ItemCopyingEvent] - */ - export type ItemCopyingEvent = DevExpress.events.EventInfo & - ActionEventInfo & { + export type ItemCopiedEvent = + DevExpress.common.core.events.EventInfo & { /** - * [descr:_ui_file_manager_ItemCopyingEvent.item] + * [descr:_ui_file_manager_ItemCopiedEvent.sourceItem] */ - readonly item: DevExpress.fileManagement.FileSystemItem; + readonly sourceItem: DevExpress.fileManagement.FileSystemItem; /** - * [descr:_ui_file_manager_ItemCopyingEvent.destinationDirectory] + * [descr:_ui_file_manager_ItemCopiedEvent.parentDirectory] */ - readonly destinationDirectory: DevExpress.fileManagement.FileSystemItem; + readonly parentDirectory: DevExpress.fileManagement.FileSystemItem; + /** + * [descr:_ui_file_manager_ItemCopiedEvent.itemName] + */ + readonly itemName: string; + /** + * [descr:_ui_file_manager_ItemCopiedEvent.itemPath] + */ + readonly itemPath: string; }; + /** + * [descr:_ui_file_manager_ItemCopyingEvent] + */ + export type ItemCopyingEvent = + DevExpress.common.core.events.EventInfo & + ActionEventInfo & { + /** + * [descr:_ui_file_manager_ItemCopyingEvent.item] + */ + readonly item: DevExpress.fileManagement.FileSystemItem; + /** + * [descr:_ui_file_manager_ItemCopyingEvent.destinationDirectory] + */ + readonly destinationDirectory: DevExpress.fileManagement.FileSystemItem; + }; /** * [descr:_ui_file_manager_ItemDeletedEvent] */ export type ItemDeletedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_file_manager_ItemDeletedEvent.item] */ @@ -15418,18 +15563,19 @@ declare module DevExpress.ui { /** * [descr:_ui_file_manager_ItemDeletingEvent] */ - export type ItemDeletingEvent = DevExpress.events.EventInfo & - ActionEventInfo & { - /** - * [descr:_ui_file_manager_ItemDeletingEvent.item] - */ - readonly item: DevExpress.fileManagement.FileSystemItem; - }; + export type ItemDeletingEvent = + DevExpress.common.core.events.EventInfo & + ActionEventInfo & { + /** + * [descr:_ui_file_manager_ItemDeletingEvent.item] + */ + readonly item: DevExpress.fileManagement.FileSystemItem; + }; /** * [descr:_ui_file_manager_ItemDownloadingEvent] */ export type ItemDownloadingEvent = - DevExpress.events.EventInfo & + DevExpress.common.core.events.EventInfo & ActionEventInfo & { /** * [descr:_ui_file_manager_ItemDownloadingEvent.item] @@ -15439,43 +15585,45 @@ declare module DevExpress.ui { /** * [descr:_ui_file_manager_ItemMovedEvent] */ - export type ItemMovedEvent = DevExpress.events.EventInfo & { - /** - * [descr:_ui_file_manager_ItemMovedEvent.sourceItem] - */ - readonly sourceItem: DevExpress.fileManagement.FileSystemItem; - /** - * [descr:_ui_file_manager_ItemMovedEvent.parentDirectory] - */ - readonly parentDirectory: DevExpress.fileManagement.FileSystemItem; - /** - * [descr:_ui_file_manager_ItemMovedEvent.itemName] - */ - readonly itemName: string; - /** - * [descr:_ui_file_manager_ItemMovedEvent.itemPath] - */ - readonly itemPath: string; - }; - /** - * [descr:_ui_file_manager_ItemMovingEvent] - */ - export type ItemMovingEvent = DevExpress.events.EventInfo & - ActionEventInfo & { + export type ItemMovedEvent = + DevExpress.common.core.events.EventInfo & { /** - * [descr:_ui_file_manager_ItemMovingEvent.item] + * [descr:_ui_file_manager_ItemMovedEvent.sourceItem] */ - readonly item: DevExpress.fileManagement.FileSystemItem; + readonly sourceItem: DevExpress.fileManagement.FileSystemItem; + /** + * [descr:_ui_file_manager_ItemMovedEvent.parentDirectory] + */ + readonly parentDirectory: DevExpress.fileManagement.FileSystemItem; /** - * [descr:_ui_file_manager_ItemMovingEvent.destinationDirectory] + * [descr:_ui_file_manager_ItemMovedEvent.itemName] */ - readonly destinationDirectory: DevExpress.fileManagement.FileSystemItem; + readonly itemName: string; + /** + * [descr:_ui_file_manager_ItemMovedEvent.itemPath] + */ + readonly itemPath: string; }; + /** + * [descr:_ui_file_manager_ItemMovingEvent] + */ + export type ItemMovingEvent = + DevExpress.common.core.events.EventInfo & + ActionEventInfo & { + /** + * [descr:_ui_file_manager_ItemMovingEvent.item] + */ + readonly item: DevExpress.fileManagement.FileSystemItem; + /** + * [descr:_ui_file_manager_ItemMovingEvent.destinationDirectory] + */ + readonly destinationDirectory: DevExpress.fileManagement.FileSystemItem; + }; /** * [descr:_ui_file_manager_ItemRenamedEvent] */ export type ItemRenamedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_file_manager_ItemRenamedEvent.sourceItem] */ @@ -15488,29 +15636,30 @@ declare module DevExpress.ui { /** * [descr:_ui_file_manager_ItemRenamingEvent] */ - export type ItemRenamingEvent = DevExpress.events.EventInfo & - ActionEventInfo & { - /** - * [descr:_ui_file_manager_ItemRenamingEvent.item] - */ - readonly item: DevExpress.fileManagement.FileSystemItem; - /** - * [descr:_ui_file_manager_ItemRenamingEvent.newName] - */ - readonly newName: string; - }; + export type ItemRenamingEvent = + DevExpress.common.core.events.EventInfo & + ActionEventInfo & { + /** + * [descr:_ui_file_manager_ItemRenamingEvent.item] + */ + readonly item: DevExpress.fileManagement.FileSystemItem; + /** + * [descr:_ui_file_manager_ItemRenamingEvent.newName] + */ + readonly newName: string; + }; /** * [descr:_ui_file_manager_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxFileManagerOptions; /** * [descr:_ui_file_manager_SelectedFileOpenedEvent] */ export type SelectedFileOpenedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_file_manager_SelectedFileOpenedEvent.file] */ @@ -15520,7 +15669,7 @@ declare module DevExpress.ui { * [descr:_ui_file_manager_SelectionChangedEvent] */ export type SelectionChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_file_manager_SelectionChangedEvent.currentSelectedItemKeys] */ @@ -15541,23 +15690,24 @@ declare module DevExpress.ui { /** * [descr:_ui_file_manager_ToolbarItemClickEvent] */ - export type ToolbarItemClickEvent = DevExpress.events.NativeEventInfo< - dxFileManager, - PointerEvent | MouseEvent - > & { - /** - * [descr:_ui_file_manager_ToolbarItemClickEvent.itemData] - */ - readonly itemData: any; - /** - * [descr:_ui_file_manager_ToolbarItemClickEvent.itemElement] - */ - readonly itemElement: DevExpress.core.DxElement; - /** - * [descr:_ui_file_manager_ToolbarItemClickEvent.itemIndex] - */ - readonly itemIndex: number; - }; + export type ToolbarItemClickEvent = + DevExpress.common.core.events.NativeEventInfo< + dxFileManager, + PointerEvent | MouseEvent + > & { + /** + * [descr:_ui_file_manager_ToolbarItemClickEvent.itemData] + */ + readonly itemData: any; + /** + * [descr:_ui_file_manager_ToolbarItemClickEvent.itemElement] + */ + readonly itemElement: DevExpress.core.DxElement; + /** + * [descr:_ui_file_manager_ToolbarItemClickEvent.itemIndex] + */ + readonly itemIndex: number; + }; } /** * [descr:dxFileManagerContextMenu] @@ -15595,9 +15745,7 @@ declare module DevExpress.ui { /** * [descr:dxFileManagerContextMenuItem.template] */ - template?: - | DevExpress.core.template - | (() => string | DevExpress.core.UserDefinedElement); + template?: template | (() => string | DevExpress.core.UserDefinedElement); } /** * [descr:dxFileManagerDetailsColumn] @@ -15952,14 +16100,12 @@ declare module DevExpress.ui { /** * [descr:dxFileManagerToolbarItem.template] */ - template?: - | DevExpress.core.template - | (() => string | DevExpress.core.UserDefinedElement); + template?: template | (() => string | DevExpress.core.UserDefinedElement); /** * [descr:dxFileManagerToolbarItem.menuItemTemplate] */ menuItemTemplate?: - | DevExpress.core.template + | template | (() => string | DevExpress.core.UserDefinedElement); } /** @@ -16008,7 +16154,7 @@ declare module DevExpress.ui { * [descr:_ui_file_uploader_BeforeSendEvent] */ export type BeforeSendEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_file_uploader_BeforeSendEvent.request] */ @@ -16025,57 +16171,61 @@ declare module DevExpress.ui { /** * [descr:_ui_file_uploader_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_file_uploader_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_file_uploader_DropZoneEnterEvent] */ - export type DropZoneEnterEvent = DevExpress.events.NativeEventInfo< - dxFileUploader, - PointerEvent | MouseEvent - > & { - /** - * [descr:_ui_file_uploader_DropZoneEnterEvent.dropZoneElement] - */ - readonly dropZoneElement: DevExpress.core.DxElement; - }; + export type DropZoneEnterEvent = + DevExpress.common.core.events.NativeEventInfo< + dxFileUploader, + PointerEvent | MouseEvent + > & { + /** + * [descr:_ui_file_uploader_DropZoneEnterEvent.dropZoneElement] + */ + readonly dropZoneElement: DevExpress.core.DxElement; + }; /** * [descr:_ui_file_uploader_DropZoneLeaveEvent] */ - export type DropZoneLeaveEvent = DevExpress.events.NativeEventInfo< - dxFileUploader, - PointerEvent | MouseEvent - > & { - /** - * [descr:_ui_file_uploader_DropZoneLeaveEvent.dropZoneElement] - */ - readonly dropZoneElement: DevExpress.core.DxElement; - }; + export type DropZoneLeaveEvent = + DevExpress.common.core.events.NativeEventInfo< + dxFileUploader, + PointerEvent | MouseEvent + > & { + /** + * [descr:_ui_file_uploader_DropZoneLeaveEvent.dropZoneElement] + */ + readonly dropZoneElement: DevExpress.core.DxElement; + }; /** * [descr:_ui_file_uploader_FilesUploadedEvent] */ export type FilesUploadedEvent = - DevExpress.events.EventInfo; + DevExpress.common.core.events.EventInfo; export type FileUploadMode = 'instantly' | 'useButtons' | 'useForm'; /** * [descr:_ui_file_uploader_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_file_uploader_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; /** * [descr:_ui_file_uploader_ProgressEvent] */ export type ProgressEvent = - DevExpress.events.NativeEventInfo & { + DevExpress.common.core.events.NativeEventInfo & { /** * [descr:_ui_file_uploader_ProgressEvent.file] */ @@ -16102,7 +16252,7 @@ declare module DevExpress.ui { * [descr:_ui_file_uploader_UploadAbortedEvent] */ export type UploadAbortedEvent = - DevExpress.events.NativeEventInfo & { + DevExpress.common.core.events.NativeEventInfo & { /** * [descr:_ui_file_uploader_UploadAbortedEvent.file] */ @@ -16120,7 +16270,7 @@ declare module DevExpress.ui { * [descr:_ui_file_uploader_UploadedEvent] */ export type UploadedEvent = - DevExpress.events.NativeEventInfo & { + DevExpress.common.core.events.NativeEventInfo & { /** * [descr:_ui_file_uploader_UploadedEvent.file] */ @@ -16138,7 +16288,7 @@ declare module DevExpress.ui { * [descr:_ui_file_uploader_UploadErrorEvent] */ export type UploadErrorEvent = - DevExpress.events.NativeEventInfo & { + DevExpress.common.core.events.NativeEventInfo & { /** * [descr:_ui_file_uploader_UploadErrorEvent.file] */ @@ -16161,7 +16311,7 @@ declare module DevExpress.ui { * [descr:_ui_file_uploader_UploadStartedEvent] */ export type UploadStartedEvent = - DevExpress.events.NativeEventInfo & { + DevExpress.common.core.events.NativeEventInfo & { /** * [descr:_ui_file_uploader_UploadStartedEvent.file] */ @@ -16175,7 +16325,7 @@ declare module DevExpress.ui { * [descr:_ui_file_uploader_ValueChangedEvent] */ export type ValueChangedEvent = - DevExpress.events.NativeEventInfo & { + DevExpress.common.core.events.NativeEventInfo & { /** * [descr:_ui_file_uploader_ValueChangedEvent.value] */ @@ -16404,7 +16554,7 @@ declare module DevExpress.ui { * [descr:_ui_filter_builder_ContentReadyEvent] */ export type ContentReadyEvent = - DevExpress.events.EventInfo; + DevExpress.common.core.events.EventInfo; export type CustomOperation = dxFilterBuilderCustomOperation; export type CustomOperationEditorTemplate = { readonly value?: string | number | Date; @@ -16414,12 +16564,13 @@ declare module DevExpress.ui { /** * [descr:_ui_filter_builder_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_filter_builder_EditorPreparedEvent] */ export type EditorPreparedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_filter_builder_EditorPreparedEvent.value] */ @@ -16468,57 +16619,58 @@ declare module DevExpress.ui { /** * [descr:_ui_filter_builder_EditorPreparingEvent] */ - export type EditorPreparingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { - /** - * [descr:_ui_filter_builder_EditorPreparingEvent.value] - */ - readonly value?: any; - /** - * [descr:_ui_filter_builder_EditorPreparingEvent.setValue] - */ - readonly setValue: any; - /** - * [descr:_ui_filter_builder_EditorPreparingEvent.editorElement] - */ - readonly editorElement?: DevExpress.core.DxElement; - /** - * [descr:_ui_filter_builder_EditorPreparingEvent.editorName] - */ - editorName: string; - /** - * [descr:_ui_filter_builder_EditorPreparingEvent.editorOptions] - */ - editorOptions?: any; - /** - * [descr:_ui_filter_builder_EditorPreparingEvent.dataField] - */ - readonly dataField?: string; - /** - * [descr:_ui_filter_builder_EditorPreparingEvent.filterOperation] - */ - readonly filterOperation?: string; - /** - * [descr:_ui_filter_builder_EditorPreparingEvent.updateValueTimeout] - */ - updateValueTimeout?: number; - /** - * [descr:_ui_filter_builder_EditorPreparingEvent.width] - */ - readonly width?: number; - /** - * [descr:_ui_filter_builder_EditorPreparingEvent.readOnly] - */ - readonly readOnly: boolean; - /** - * [descr:_ui_filter_builder_EditorPreparingEvent.disabled] - */ - readonly disabled: boolean; - /** - * [descr:_ui_filter_builder_EditorPreparingEvent.rtlEnabled] - */ - readonly rtlEnabled: boolean; - }; + export type EditorPreparingEvent = + DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo & { + /** + * [descr:_ui_filter_builder_EditorPreparingEvent.value] + */ + readonly value?: any; + /** + * [descr:_ui_filter_builder_EditorPreparingEvent.setValue] + */ + readonly setValue: any; + /** + * [descr:_ui_filter_builder_EditorPreparingEvent.editorElement] + */ + readonly editorElement?: DevExpress.core.DxElement; + /** + * [descr:_ui_filter_builder_EditorPreparingEvent.editorName] + */ + editorName: string; + /** + * [descr:_ui_filter_builder_EditorPreparingEvent.editorOptions] + */ + editorOptions?: any; + /** + * [descr:_ui_filter_builder_EditorPreparingEvent.dataField] + */ + readonly dataField?: string; + /** + * [descr:_ui_filter_builder_EditorPreparingEvent.filterOperation] + */ + readonly filterOperation?: string; + /** + * [descr:_ui_filter_builder_EditorPreparingEvent.updateValueTimeout] + */ + updateValueTimeout?: number; + /** + * [descr:_ui_filter_builder_EditorPreparingEvent.width] + */ + readonly width?: number; + /** + * [descr:_ui_filter_builder_EditorPreparingEvent.readOnly] + */ + readonly readOnly: boolean; + /** + * [descr:_ui_filter_builder_EditorPreparingEvent.disabled] + */ + readonly disabled: boolean; + /** + * [descr:_ui_filter_builder_EditorPreparingEvent.rtlEnabled] + */ + readonly rtlEnabled: boolean; + }; export type FieldEditorTemplate = { readonly value?: string | number | Date; readonly filterOperation?: string; @@ -16546,27 +16698,27 @@ declare module DevExpress.ui { * @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 type FilterLookupDataSource = Exclude< - DevExpress.data.DataSource.DataSourceLike, - string | DevExpress.data.DataSource + DevExpress.data.DataSourceLike, + string | DevExpress.common.data.DataSource >; export type GroupOperation = 'and' | 'or' | 'notAnd' | 'notOr'; /** * [descr:_ui_filter_builder_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_filter_builder_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxFilterBuilderOptions; /** * [descr:_ui_filter_builder_ValueChangedEvent] */ export type ValueChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_filter_builder_ValueChangedEvent.value] */ @@ -16609,7 +16761,7 @@ declare module DevExpress.ui { * [descr:dxFilterBuilderCustomOperation.editorTemplate] */ editorTemplate?: - | DevExpress.core.template + | template | (( conditionInfo: DevExpress.ui.dxFilterBuilder.CustomOperationEditorTemplate, container: DevExpress.core.DxElement @@ -16666,7 +16818,7 @@ declare module DevExpress.ui { * [descr:dxFilterBuilderField.editorTemplate] */ editorTemplate?: - | DevExpress.core.template + | template | (( conditionInfo: DevExpress.ui.dxFilterBuilder.FieldEditorTemplate, container: DevExpress.core.DxElement @@ -16684,7 +16836,7 @@ declare module DevExpress.ui { /** * [descr:dxFilterBuilderField.format] */ - format?: Format; + format?: DevExpress.common.core.localization.Format; /** * [descr:dxFilterBuilderField.lookup] */ @@ -16907,33 +17059,37 @@ declare module DevExpress.ui { /** * [descr:_ui_form_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_form_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_form_EditorEnterKeyEvent] */ - export type EditorEnterKeyEvent = DevExpress.events.EventInfo & { - /** - * [descr:_ui_form_EditorEnterKeyEvent.dataField] - */ - readonly dataField?: string; - }; + export type EditorEnterKeyEvent = + DevExpress.common.core.events.EventInfo & { + /** + * [descr:_ui_form_EditorEnterKeyEvent.dataField] + */ + readonly dataField?: string; + }; /** * [descr:_ui_form_FieldDataChangedEvent] */ - export type FieldDataChangedEvent = DevExpress.events.EventInfo & { - /** - * [descr:_ui_form_FieldDataChangedEvent.dataField] - */ - readonly dataField?: string; - /** - * [descr:_ui_form_FieldDataChangedEvent.value] - */ - readonly value?: any; - }; + export type FieldDataChangedEvent = + DevExpress.common.core.events.EventInfo & { + /** + * [descr:_ui_form_FieldDataChangedEvent.dataField] + */ + readonly dataField?: string; + /** + * [descr:_ui_form_FieldDataChangedEvent.value] + */ + readonly value?: any; + }; export type FormItemComponent = | 'dxAutocomplete' | 'dxCalendar' @@ -16973,13 +17129,14 @@ declare module DevExpress.ui { * [descr:_ui_form_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; export type LabelLocation = 'left' | 'right' | 'top'; /** * [descr:_ui_form_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxFormOptions; export type SimpleItemLabelTemplateData = SimpleItemTemplateData & { text: string; @@ -17081,7 +17238,7 @@ declare module DevExpress.ui { * [descr:dxFormGroupItem.captionTemplate] */ captionTemplate?: - | DevExpress.core.template + | template | (( data: DevExpress.ui.dxForm.GroupCaptionTemplateData, itemElement: DevExpress.core.DxElement @@ -17118,7 +17275,7 @@ declare module DevExpress.ui { * [descr:dxFormGroupItem.template] */ template?: - | DevExpress.core.template + | template | (( data: DevExpress.ui.dxForm.GroupItemTemplateData, itemElement: DevExpress.core.DxElement @@ -17294,7 +17451,7 @@ declare module DevExpress.ui { * [descr:dxFormSimpleItem.label.template] */ template?: - | DevExpress.core.template + | template | (( itemData: DevExpress.ui.dxForm.SimpleItemLabelTemplateData, itemElement: DevExpress.core.DxElement @@ -17316,7 +17473,7 @@ declare module DevExpress.ui { * [descr:dxFormSimpleItem.template] */ template?: - | DevExpress.core.template + | template | (( data: DevExpress.ui.dxForm.SimpleItemTemplateData, itemElement: DevExpress.core.DxElement @@ -17405,7 +17562,7 @@ declare module DevExpress.ui { * [descr:dxFormTabbedItem.tabs.tabTemplate] */ tabTemplate?: - | DevExpress.core.template + | template | (( tabData: any, tabIndex: number, @@ -17416,7 +17573,7 @@ declare module DevExpress.ui { * [descr:dxFormTabbedItem.tabs.template] */ template?: - | DevExpress.core.template + | template | (( tabData: any, tabIndex: number, @@ -17467,14 +17624,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; /** * [descr:_ui_gallery_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -17493,40 +17650,42 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.core.events.InitializedEventInfo< + dxGallery + >; /** * [descr:_ui_gallery_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxGallery, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_gallery_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxGallery, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_gallery_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxGallery, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * @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. */ @@ -17537,16 +17696,16 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_gallery_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -17557,7 +17716,7 @@ declare module DevExpress.ui { export type SelectionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.ui.CollectionWidget.SelectionChangeInfo; } /** @@ -17593,7 +17752,7 @@ declare module DevExpress.ui { /** * [descr:dxGalleryOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxGalleryOptions.focusStateEnabled] */ @@ -17796,42 +17955,44 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_gantt_ContextMenuPreparingEvent] */ - export type ContextMenuPreparingEvent = DevExpress.events.Cancelable & { - /** - * [descr:_ui_gantt_ContextMenuPreparingEvent.component] - */ - readonly component?: dxGantt; - /** - * [descr:_ui_gantt_ContextMenuPreparingEvent.element] - */ - readonly element?: DevExpress.core.DxElement; - /** - * [descr:_ui_gantt_ContextMenuPreparingEvent.event] - */ - readonly event?: DevExpress.events.DxEvent< - PointerEvent | MouseEvent | TouchEvent - >; - /** - * [descr:_ui_gantt_ContextMenuPreparingEvent.targetKey] - */ - readonly targetKey?: any; - /** - * [descr:_ui_gantt_ContextMenuPreparingEvent.targetType] - */ - readonly targetType?: string; - /** - * [descr:_ui_gantt_ContextMenuPreparingEvent.data] - */ - readonly data?: any; - /** - * [descr:_ui_gantt_ContextMenuPreparingEvent.items] - */ - readonly items?: Array; - }; + export type ContextMenuPreparingEvent = + DevExpress.common.core.events.Cancelable & { + /** + * [descr:_ui_gantt_ContextMenuPreparingEvent.component] + */ + readonly component?: dxGantt; + /** + * [descr:_ui_gantt_ContextMenuPreparingEvent.element] + */ + readonly element?: DevExpress.core.DxElement; + /** + * [descr:_ui_gantt_ContextMenuPreparingEvent.event] + */ + readonly event?: DevExpress.events.DxEvent< + PointerEvent | MouseEvent | TouchEvent + >; + /** + * [descr:_ui_gantt_ContextMenuPreparingEvent.targetKey] + */ + readonly targetKey?: any; + /** + * [descr:_ui_gantt_ContextMenuPreparingEvent.targetType] + */ + readonly targetType?: string; + /** + * [descr:_ui_gantt_ContextMenuPreparingEvent.data] + */ + readonly data?: any; + /** + * [descr:_ui_gantt_ContextMenuPreparingEvent.items] + */ + readonly items?: Array; + }; /** * [descr:_ui_gantt_CustomCommandEvent] */ @@ -17853,7 +18014,7 @@ declare module DevExpress.ui { * [descr:_ui_gantt_DependencyDeletedEvent] */ export type DependencyDeletedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_gantt_DependencyDeletedEvent.values] */ @@ -17866,22 +18027,23 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_DependencyDeletingEvent] */ - export type DependencyDeletingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { - /** - * [descr:_ui_gantt_DependencyDeletingEvent.values] - */ - readonly values: any; - /** - * [descr:_ui_gantt_DependencyDeletingEvent.key] - */ - readonly key: any; - }; + export type DependencyDeletingEvent = + DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo & { + /** + * [descr:_ui_gantt_DependencyDeletingEvent.values] + */ + readonly values: any; + /** + * [descr:_ui_gantt_DependencyDeletingEvent.key] + */ + readonly key: any; + }; /** * [descr:_ui_gantt_DependencyInsertedEvent] */ export type DependencyInsertedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_gantt_DependencyInsertedEvent.values] */ @@ -17894,17 +18056,19 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_DependencyInsertingEvent] */ - export type DependencyInsertingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { - /** - * [descr:_ui_gantt_DependencyInsertingEvent.values] - */ - readonly values: any; - }; + export type DependencyInsertingEvent = + DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo & { + /** + * [descr:_ui_gantt_DependencyInsertingEvent.values] + */ + readonly values: any; + }; /** * [descr:_ui_gantt_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * @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. */ @@ -17974,12 +18138,13 @@ declare module DevExpress.ui { * [descr:_ui_gantt_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_gantt_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type ProgressTooltipTemplateData = { readonly progress: number; }; @@ -17987,82 +18152,88 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_ResourceAssignedEvent] */ - export type ResourceAssignedEvent = DevExpress.events.EventInfo & { - /** - * [descr:_ui_gantt_ResourceAssignedEvent.values] - */ - readonly values: any; - /** - * [descr:_ui_gantt_ResourceAssignedEvent.key] - */ - readonly key: any; - }; - /** - * [descr:_ui_gantt_ResourceAssigningEvent] - */ - export type ResourceAssigningEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type ResourceAssignedEvent = + DevExpress.common.core.events.EventInfo & { /** - * [descr:_ui_gantt_ResourceAssigningEvent.values] + * [descr:_ui_gantt_ResourceAssignedEvent.values] */ readonly values: any; + /** + * [descr:_ui_gantt_ResourceAssignedEvent.key] + */ + readonly key: any; }; /** - * [descr:_ui_gantt_ResourceDeletedEvent] + * [descr:_ui_gantt_ResourceAssigningEvent] */ - export type ResourceDeletedEvent = DevExpress.events.EventInfo & { - /** - * [descr:_ui_gantt_ResourceDeletedEvent.values] - */ - readonly values: any; - /** - * [descr:_ui_gantt_ResourceDeletedEvent.key] - */ - readonly key: any; - }; + export type ResourceAssigningEvent = + DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo & { + /** + * [descr:_ui_gantt_ResourceAssigningEvent.values] + */ + readonly values: any; + }; /** - * [descr:_ui_gantt_ResourceDeletingEvent] + * [descr:_ui_gantt_ResourceDeletedEvent] */ - export type ResourceDeletingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type ResourceDeletedEvent = + DevExpress.common.core.events.EventInfo & { /** - * [descr:_ui_gantt_ResourceDeletingEvent.values] + * [descr:_ui_gantt_ResourceDeletedEvent.values] */ readonly values: any; /** - * [descr:_ui_gantt_ResourceDeletingEvent.key] + * [descr:_ui_gantt_ResourceDeletedEvent.key] */ readonly key: any; }; /** - * [descr:_ui_gantt_ResourceInsertedEvent] + * [descr:_ui_gantt_ResourceDeletingEvent] */ - export type ResourceInsertedEvent = DevExpress.events.EventInfo & { - /** - * [descr:_ui_gantt_ResourceInsertedEvent.values] - */ - readonly values: any; - /** - * [descr:_ui_gantt_ResourceInsertedEvent.key] - */ - readonly key: any; - }; + export type ResourceDeletingEvent = + DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo & { + /** + * [descr:_ui_gantt_ResourceDeletingEvent.values] + */ + readonly values: any; + /** + * [descr:_ui_gantt_ResourceDeletingEvent.key] + */ + readonly key: any; + }; /** - * [descr:_ui_gantt_ResourceInsertingEvent] + * [descr:_ui_gantt_ResourceInsertedEvent] */ - export type ResourceInsertingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type ResourceInsertedEvent = + DevExpress.common.core.events.EventInfo & { /** - * [descr:_ui_gantt_ResourceInsertingEvent.values] + * [descr:_ui_gantt_ResourceInsertedEvent.values] */ readonly values: any; + /** + * [descr:_ui_gantt_ResourceInsertedEvent.key] + */ + readonly key: any; }; + /** + * [descr:_ui_gantt_ResourceInsertingEvent] + */ + export type ResourceInsertingEvent = + DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo & { + /** + * [descr:_ui_gantt_ResourceInsertingEvent.values] + */ + readonly values: any; + }; /** * [descr:_ui_gantt_ResourceManagerDialogShowingEvent] */ export type ResourceManagerDialogShowingEvent = - DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_gantt_ResourceManagerDialogShowingEvent.values] */ @@ -18072,7 +18243,7 @@ declare module DevExpress.ui { * [descr:_ui_gantt_ResourceUnassignedEvent] */ export type ResourceUnassignedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_gantt_ResourceUnassignedEvent.values] */ @@ -18085,22 +18256,23 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_ResourceUnassigningEvent] */ - export type ResourceUnassigningEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { - /** - * [descr:_ui_gantt_ResourceUnassigningEvent.values] - */ - readonly values: any; - /** - * [descr:_ui_gantt_ResourceUnassigningEvent.key] - */ - readonly key: any; - }; + export type ResourceUnassigningEvent = + DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo & { + /** + * [descr:_ui_gantt_ResourceUnassigningEvent.values] + */ + readonly values: any; + /** + * [descr:_ui_gantt_ResourceUnassigningEvent.key] + */ + readonly key: any; + }; /** * [descr:_ui_gantt_ScaleCellPreparedEvent] */ export type ScaleCellPreparedEvent = - DevExpress.events.InitializedEventInfo & { + DevExpress.common.core.events.InitializedEventInfo & { /** * [descr:_ui_gantt_ScaleCellPreparedEvent.scaleIndex] */ @@ -18129,16 +18301,17 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_SelectionChangedEvent] */ - export type SelectionChangedEvent = DevExpress.events.EventInfo & { - /** - * [descr:_ui_gantt_SelectionChangedEvent.selectedRowKey] - */ - readonly selectedRowKey?: any; - }; + export type SelectionChangedEvent = + DevExpress.common.core.events.EventInfo & { + /** + * [descr:_ui_gantt_SelectionChangedEvent.selectedRowKey] + */ + readonly selectedRowKey?: any; + }; /** * [descr:_ui_gantt_TaskClickEvent] */ - export type TaskClickEvent = DevExpress.events.NativeEventInfo< + export type TaskClickEvent = DevExpress.common.core.events.NativeEventInfo< dxGantt, PointerEvent | MouseEvent > & { @@ -18163,8 +18336,11 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_TaskDblClickEvent] */ - export type TaskDblClickEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo & { + export type TaskDblClickEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.NativeEventInfo< + dxGantt, + PointerEvent | MouseEvent + > & { /** * [descr:_ui_gantt_TaskDblClickEvent.key] */ @@ -18177,21 +18353,22 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_TaskDeletedEvent] */ - export type TaskDeletedEvent = DevExpress.events.EventInfo & { - /** - * [descr:_ui_gantt_TaskDeletedEvent.values] - */ - readonly values: any; - /** - * [descr:_ui_gantt_TaskDeletedEvent.key] - */ - readonly key: any; - }; + export type TaskDeletedEvent = + DevExpress.common.core.events.EventInfo & { + /** + * [descr:_ui_gantt_TaskDeletedEvent.values] + */ + readonly values: any; + /** + * [descr:_ui_gantt_TaskDeletedEvent.key] + */ + readonly key: any; + }; /** * [descr:_ui_gantt_TaskDeletingEvent] */ - export type TaskDeletingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type TaskDeletingEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_gantt_TaskDeletingEvent.values] */ @@ -18204,43 +18381,45 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_TaskEditDialogShowingEvent] */ - export type TaskEditDialogShowingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type TaskEditDialogShowingEvent = + DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo & { + /** + * [descr:_ui_gantt_TaskEditDialogShowingEvent.values] + */ + readonly values: any; + /** + * [descr:_ui_gantt_TaskEditDialogShowingEvent.key] + */ + readonly key: any; + /** + * [descr:_ui_gantt_TaskEditDialogShowingEvent.readOnlyFields] + */ + readonly readOnlyFields?: Array; + /** + * [descr:_ui_gantt_TaskEditDialogShowingEvent.hiddenFields] + */ + readonly hiddenFields?: Array; + }; + /** + * [descr:_ui_gantt_TaskInsertedEvent] + */ + export type TaskInsertedEvent = + DevExpress.common.core.events.EventInfo & { /** - * [descr:_ui_gantt_TaskEditDialogShowingEvent.values] + * [descr:_ui_gantt_TaskInsertedEvent.values] */ - readonly values: any; + readonly values?: any; /** - * [descr:_ui_gantt_TaskEditDialogShowingEvent.key] + * [descr:_ui_gantt_TaskInsertedEvent.key] */ readonly key: any; - /** - * [descr:_ui_gantt_TaskEditDialogShowingEvent.readOnlyFields] - */ - readonly readOnlyFields?: Array; - /** - * [descr:_ui_gantt_TaskEditDialogShowingEvent.hiddenFields] - */ - readonly hiddenFields?: Array; }; - /** - * [descr:_ui_gantt_TaskInsertedEvent] - */ - export type TaskInsertedEvent = DevExpress.events.EventInfo & { - /** - * [descr:_ui_gantt_TaskInsertedEvent.values] - */ - readonly values?: any; - /** - * [descr:_ui_gantt_TaskInsertedEvent.key] - */ - readonly key: any; - }; /** * [descr:_ui_gantt_TaskInsertingEvent] */ - export type TaskInsertingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type TaskInsertingEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_gantt_TaskInsertingEvent.values] */ @@ -18249,8 +18428,8 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_TaskMovingEvent] */ - export type TaskMovingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type TaskMovingEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_gantt_TaskMovingEvent.newValues] */ @@ -18267,21 +18446,22 @@ declare module DevExpress.ui { /** * [descr:_ui_gantt_TaskUpdatedEvent] */ - export type TaskUpdatedEvent = DevExpress.events.EventInfo & { - /** - * [descr:_ui_gantt_TaskUpdatedEvent.values] - */ - readonly values: any; - /** - * [descr:_ui_gantt_TaskUpdatedEvent.key] - */ - readonly key: any; - }; + export type TaskUpdatedEvent = + DevExpress.common.core.events.EventInfo & { + /** + * [descr:_ui_gantt_TaskUpdatedEvent.values] + */ + readonly values: any; + /** + * [descr:_ui_gantt_TaskUpdatedEvent.key] + */ + readonly key: any; + }; /** * [descr:_ui_gantt_TaskUpdatingEvent] */ - export type TaskUpdatingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type TaskUpdatingEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_gantt_TaskUpdatingEvent.newValues] */ @@ -18625,7 +18805,7 @@ declare module DevExpress.ui { /** * [descr:dxGanttOptions.dependencies.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxGanttOptions.dependencies.keyExpr] */ @@ -18865,7 +19045,7 @@ declare module DevExpress.ui { /** * [descr:dxGanttOptions.resourceAssignments.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxGanttOptions.resourceAssignments.keyExpr] */ @@ -18890,7 +19070,7 @@ declare module DevExpress.ui { /** * [descr:dxGanttOptions.resources.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxGanttOptions.resources.keyExpr] */ @@ -18956,7 +19136,7 @@ declare module DevExpress.ui { /** * [descr:dxGanttOptions.tasks.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxGanttOptions.tasks.endExpr] */ @@ -18998,7 +19178,7 @@ declare module DevExpress.ui { * [descr:dxGanttOptions.taskTooltipContentTemplate] */ taskTooltipContentTemplate?: - | DevExpress.core.template + | template | (( container: DevExpress.core.DxElement, task: any @@ -19007,7 +19187,7 @@ declare module DevExpress.ui { * [descr:dxGanttOptions.taskTimeTooltipContentTemplate] */ taskTimeTooltipContentTemplate?: - | DevExpress.core.template + | template | (( container: DevExpress.core.DxElement, item: DevExpress.ui.dxGantt.TimeTooltipTemplateData @@ -19016,7 +19196,7 @@ declare module DevExpress.ui { * [descr:dxGanttOptions.taskProgressTooltipContentTemplate] */ taskProgressTooltipContentTemplate?: - | DevExpress.core.template + | template | (( container: DevExpress.core.DxElement, item: DevExpress.ui.dxGantt.ProgressTooltipTemplateData @@ -19025,7 +19205,7 @@ declare module DevExpress.ui { * [descr:dxGanttOptions.taskContentTemplate] */ taskContentTemplate?: - | DevExpress.core.template + | template | (( container: DevExpress.core.DxElement, item: DevExpress.ui.dxGantt.TaskContentTemplateData @@ -19245,22 +19425,24 @@ declare module DevExpress.ui { /** * [descr:_ui_html_editor_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_html_editor_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_html_editor_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.core.events.NativeEventInfo< dxHtmlEditor, FocusEvent >; /** * [descr:_ui_html_editor_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.core.events.NativeEventInfo< dxHtmlEditor, FocusEvent >; @@ -19364,7 +19546,7 @@ declare module DevExpress.ui { * [descr:_ui_html_editor_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; export interface MentionTemplateData { readonly marker: string; readonly id?: string | number; @@ -19373,17 +19555,19 @@ declare module DevExpress.ui { /** * [descr:_ui_html_editor_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxHtmlEditorOptions; /** * [descr:_ui_html_editor_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< - dxHtmlEditor, - KeyboardEvent | ClipboardEvent | Event - > & - DevExpress.ui.Editor.ValueChangedInfo; + export type ValueChangedEvent = + DevExpress.common.core.events.NativeEventInfo< + dxHtmlEditor, + KeyboardEvent | ClipboardEvent | Event + > & + DevExpress.ui.Editor.ValueChangedInfo; } /** * [descr:dxHtmlEditorImageUpload] @@ -19446,7 +19630,7 @@ declare module DevExpress.ui { /** * [descr:dxHtmlEditorMention.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxHtmlEditorMention.displayExpr] */ @@ -19455,7 +19639,7 @@ declare module DevExpress.ui { * [descr:dxHtmlEditorMention.itemTemplate] */ itemTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -19481,7 +19665,7 @@ declare module DevExpress.ui { * [descr:dxHtmlEditorMention.template] */ template?: - | DevExpress.core.template + | template | (( mentionData: DevExpress.ui.dxHtmlEditor.MentionTemplateData, contentElement: DevExpress.core.DxElement @@ -19677,7 +19861,7 @@ declare module DevExpress.ui { /** * [descr:dxHtmlEditorVariables.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxHtmlEditorVariables.escapeChar] */ @@ -19800,14 +19984,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; /** * [descr:_ui_list_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -19836,7 +20020,7 @@ declare module DevExpress.ui { export type GroupRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.core.events.EventInfo> & { /** * [descr:_ui_list_GroupRenderedEvent.groupData] */ @@ -19856,14 +20040,14 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.core.events.InitializedEventInfo>; /** * [descr:_ui_list_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxList, KeyboardEvent | MouseEvent | PointerEvent > & @@ -19874,7 +20058,7 @@ declare module DevExpress.ui { export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxList, MouseEvent | PointerEvent | TouchEvent > & @@ -19885,7 +20069,8 @@ declare module DevExpress.ui { export type ItemDeletedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & ListItemInfo; + > = DevExpress.common.core.events.EventInfo> & + ListItemInfo; export type ItemDeleteMode = | 'context' | 'slideButton' @@ -19899,7 +20084,7 @@ declare module DevExpress.ui { export type ItemDeletingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & ListItemInfo & { /** * [descr:_ui_list_ItemDeletingEvent.cancel] @@ -19912,7 +20097,7 @@ declare module DevExpress.ui { export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxList, MouseEvent | PointerEvent | TouchEvent > & @@ -19927,15 +20112,15 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends Item | any = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_list_ItemReorderedEvent] */ export type ItemReorderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & ListItemInfo & { /** * [descr:_ui_list_ItemReorderedEvent.fromIndex] @@ -19952,7 +20137,7 @@ declare module DevExpress.ui { export type ItemSwipeEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxList, MouseEvent | PointerEvent | TouchEvent > & @@ -19987,15 +20172,15 @@ declare module DevExpress.ui { export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ChangedOptionInfo; /** * [descr:_ui_list_PageLoadingEvent] */ export type PageLoadingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; export type Properties< TItem extends ItemLike = any, TKey = any @@ -20006,14 +20191,17 @@ declare module DevExpress.ui { export type PullRefreshEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; /** * [descr:_ui_list_ScrollEvent] */ export type ScrollEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo, Event> & + > = DevExpress.common.core.events.NativeEventInfo< + dxList, + Event + > & ScrollInfo; /** * [descr:ScrollInfo] @@ -20047,7 +20235,7 @@ declare module DevExpress.ui { export type SelectAllValueChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.core.events.EventInfo> & { /** * [descr:_ui_list_SelectAllValueChangedEvent.value] */ @@ -20059,7 +20247,7 @@ declare module DevExpress.ui { export type SelectionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.ui.CollectionWidget.SelectionChangeInfo; /** * [descr:_ui_list_SelectionChangingEvent] @@ -20121,7 +20309,7 @@ declare module DevExpress.ui { /** * [descr:dxListOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxListOptions.displayExpr] */ @@ -20134,7 +20322,7 @@ declare module DevExpress.ui { * [descr:dxListOptions.groupTemplate] */ groupTemplate?: - | DevExpress.core.template + | template | (( groupData: any, groupIndex: number, @@ -20329,22 +20517,23 @@ declare module DevExpress.ui { * [descr:_ui_load_indicator_ContentReadyEvent] */ export type ContentReadyEvent = - DevExpress.events.EventInfo; + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_load_indicator_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_load_indicator_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_load_indicator_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxLoadIndicatorOptions; } /** @@ -20367,40 +20556,45 @@ declare module DevExpress.ui { /** * [descr:_ui_load_panel_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_load_panel_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_load_panel_HiddenEvent] */ - export type HiddenEvent = DevExpress.events.EventInfo; + export type HiddenEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_load_panel_HidingEvent] */ - export type HidingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; + export type HidingEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_load_panel_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_load_panel_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxLoadPanelOptions; /** * [descr:_ui_load_panel_ShowingEvent] */ - export type ShowingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; + export type ShowingEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_load_panel_ShownEvent] */ - export type ShownEvent = DevExpress.events.EventInfo; + export type ShownEvent = + DevExpress.common.core.events.EventInfo; } /** * [descr:dxLoadPanelAnimation] @@ -20410,11 +20604,11 @@ declare module DevExpress.ui { /** * [descr:dxLoadPanelOptions.animation.hide] */ - hide?: AnimationConfig; + hide?: DevExpress.common.core.animation.AnimationConfig; /** * [descr:dxLoadPanelOptions.animation.show] */ - show?: AnimationConfig; + show?: DevExpress.common.core.animation.AnimationConfig; } /** * [descr:dxLoadPanelOptions] @@ -20461,7 +20655,10 @@ declare module DevExpress.ui { /** * [descr:dxLoadPanelOptions.position] */ - position?: DevExpress.common.PositionAlignment | PositionConfig | Function; + position?: + | DevExpress.common.PositionAlignment + | DevExpress.common.core.animation.PositionConfig + | Function; /** * [descr:dxLoadPanelOptions.shadingColor] */ @@ -20487,50 +20684,55 @@ declare module DevExpress.ui { /** * [descr:_ui_lookup_ClosedEvent] */ - export type ClosedEvent = DevExpress.events.EventInfo; + export type ClosedEvent = DevExpress.common.core.events.EventInfo; /** * [descr:_ui_lookup_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_lookup_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_lookup_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_lookup_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo< + export type ItemClickEvent = DevExpress.common.core.events.NativeEventInfo< dxLookup, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_lookup_OpenedEvent] */ - export type OpenedEvent = DevExpress.events.EventInfo; + export type OpenedEvent = DevExpress.common.core.events.EventInfo; /** * [descr:_ui_lookup_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; /** * [descr:_ui_lookup_PageLoadingEvent] */ - export type PageLoadingEvent = DevExpress.events.EventInfo; + export type PageLoadingEvent = + DevExpress.common.core.events.EventInfo; export type Properties = dxLookupOptions; /** * [descr:_ui_lookup_PullRefreshEvent] */ - export type PullRefreshEvent = DevExpress.events.EventInfo; + export type PullRefreshEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_lookup_ScrollEvent] */ - export type ScrollEvent = DevExpress.events.NativeEventInfo< + export type ScrollEvent = DevExpress.common.core.events.NativeEventInfo< dxLookup, MouseEvent | Event > & @@ -20538,18 +20740,21 @@ declare module DevExpress.ui { /** * [descr:_ui_lookup_SelectionChangedEvent] */ - export type SelectionChangedEvent = DevExpress.events.EventInfo & - DevExpress.ui.dxDropDownList.SelectionChangedInfo; - export type TitleRenderedEvent = DevExpress.events.EventInfo & - DevExpress.ui.dxPopup.TitleRenderedInfo; + export type SelectionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.ui.dxDropDownList.SelectionChangedInfo; + export type TitleRenderedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.ui.dxPopup.TitleRenderedInfo; /** * [descr:_ui_lookup_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< - dxLookup, - KeyboardEvent | MouseEvent | PointerEvent | Event - > & - DevExpress.ui.Editor.ValueChangedInfo; + export type ValueChangedEvent = + DevExpress.common.core.events.NativeEventInfo< + dxLookup, + KeyboardEvent | MouseEvent | PointerEvent | Event + > & + DevExpress.ui.Editor.ValueChangedInfo; } /** * [descr:dxLookupOptions] @@ -20581,7 +20786,7 @@ declare module DevExpress.ui { * [descr:dxLookupOptions.fieldTemplate] */ fieldTemplate?: - | DevExpress.core.template + | template | (( selectedItem: any, fieldElement: DevExpress.core.DxElement @@ -20599,7 +20804,7 @@ declare module DevExpress.ui { * [descr:dxLookupOptions.groupTemplate] */ groupTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -20730,53 +20935,56 @@ declare module DevExpress.ui { /** * [descr:_ui_map_ClickEvent] */ - export type ClickEvent = DevExpress.events.NativeEventInfo< + export type ClickEvent = DevExpress.common.core.events.NativeEventInfo< dxMap, MouseEvent | PointerEvent >; /** * [descr:_ui_map_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = DevExpress.common.core.events.EventInfo; /** * [descr:_ui_map_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; export type MapProvider = 'azure' | 'bing' | 'google' | 'googleStatic'; export type MapType = 'hybrid' | 'roadmap' | 'satellite'; /** * [descr:_ui_map_MarkerAddedEvent] */ - export type MarkerAddedEvent = DevExpress.events.EventInfo & { - /** - * [descr:_ui_map_MarkerAddedEvent.options] - */ - readonly options: any; - /** - * [descr:_ui_map_MarkerAddedEvent.originalMarker] - */ - originalMarker: any; - }; + export type MarkerAddedEvent = + DevExpress.common.core.events.EventInfo & { + /** + * [descr:_ui_map_MarkerAddedEvent.options] + */ + readonly options: any; + /** + * [descr:_ui_map_MarkerAddedEvent.originalMarker] + */ + originalMarker: any; + }; /** * [descr:_ui_map_MarkerRemovedEvent] */ - export type MarkerRemovedEvent = DevExpress.events.EventInfo & { - /** - * [descr:_ui_map_MarkerRemovedEvent.options] - */ - readonly options?: any; - }; + export type MarkerRemovedEvent = + DevExpress.common.core.events.EventInfo & { + /** + * [descr:_ui_map_MarkerRemovedEvent.options] + */ + readonly options?: any; + }; /** * [descr:_ui_map_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxMapOptions; /** * [descr:_ui_map_ReadyEvent] */ - export type ReadyEvent = DevExpress.events.EventInfo & { + export type ReadyEvent = DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_map_ReadyEvent.originalMap] */ @@ -20785,26 +20993,28 @@ declare module DevExpress.ui { /** * [descr:_ui_map_RouteAddedEvent] */ - export type RouteAddedEvent = DevExpress.events.EventInfo & { - /** - * [descr:_ui_map_RouteAddedEvent.options] - */ - readonly options: any; - /** - * [descr:_ui_map_RouteAddedEvent.originalRoute] - */ - originalRoute: any; - }; + export type RouteAddedEvent = + DevExpress.common.core.events.EventInfo & { + /** + * [descr:_ui_map_RouteAddedEvent.options] + */ + readonly options: any; + /** + * [descr:_ui_map_RouteAddedEvent.originalRoute] + */ + originalRoute: any; + }; export type RouteMode = 'driving' | 'walking'; /** * [descr:_ui_map_RouteRemovedEvent] */ - export type RouteRemovedEvent = DevExpress.events.EventInfo & { - /** - * [descr:_ui_map_RouteRemovedEvent.options] - */ - readonly options?: any; - }; + export type RouteRemovedEvent = + DevExpress.common.core.events.EventInfo & { + /** + * [descr:_ui_map_RouteRemovedEvent.options] + */ + readonly options?: any; + }; } /** * [descr:dxMapOptions] @@ -20984,15 +21194,13 @@ declare module DevExpress.ui { /** * [descr:_ui_menu_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo< - dxMenu - >; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo>; /** * [descr:_ui_menu_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo< - dxMenu - >; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -21012,31 +21220,31 @@ declare module DevExpress.ui { * [descr:_ui_menu_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo>; + DevExpress.common.core.events.InitializedEventInfo>; /** * [descr:_ui_menu_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo< - dxMenu, - KeyboardEvent | MouseEvent | PointerEvent - > & - DevExpress.events.ItemInfo; + export type ItemClickEvent = + DevExpress.common.core.events.NativeEventInfo< + dxMenu, + KeyboardEvent | MouseEvent | PointerEvent + > & + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_menu_ItemContextMenuEvent] */ export type ItemContextMenuEvent = - DevExpress.events.NativeEventInfo< + DevExpress.common.core.events.NativeEventInfo< dxMenu, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_menu_ItemRenderedEvent] */ - export type ItemRenderedEvent = DevExpress.events.EventInfo< - dxMenu - > & - DevExpress.events.ItemInfo; + export type ItemRenderedEvent = + DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ItemInfo; /** * @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. */ @@ -21077,94 +21285,90 @@ declare module DevExpress.ui { /** * [descr:_ui_menu_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo< - dxMenu - > & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxMenuOptions; /** * [descr:_ui_menu_SelectionChangedEvent] */ - export type SelectionChangedEvent = DevExpress.events.EventInfo< - dxMenu - > & - DevExpress.ui.CollectionWidget.SelectionChangeInfo; + export type SelectionChangedEvent = + DevExpress.common.core.events.EventInfo> & + DevExpress.ui.CollectionWidget.SelectionChangeInfo; export type SubmenuDirection = 'auto' | 'leftOrTop' | 'rightOrBottom'; /** * [descr:_ui_menu_SubmenuHiddenEvent] */ - export type SubmenuHiddenEvent = DevExpress.events.EventInfo< - dxMenu - > & { - /** - * [descr:_ui_menu_SubmenuHiddenEvent.itemData] - */ - readonly itemData?: Item; - /** - * [descr:_ui_menu_SubmenuHiddenEvent.rootItem] - */ - readonly rootItem?: DevExpress.core.DxElement; - /** - * [descr:_ui_menu_SubmenuHiddenEvent.submenuContainer] - */ - readonly submenuContainer?: DevExpress.core.DxElement; - }; - /** - * [descr:_ui_menu_SubmenuHidingEvent] - */ - export type SubmenuHidingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & { + export type SubmenuHiddenEvent = + DevExpress.common.core.events.EventInfo> & { /** - * [descr:_ui_menu_SubmenuHidingEvent.itemData] + * [descr:_ui_menu_SubmenuHiddenEvent.itemData] */ readonly itemData?: Item; /** - * [descr:_ui_menu_SubmenuHidingEvent.rootItem] + * [descr:_ui_menu_SubmenuHiddenEvent.rootItem] */ readonly rootItem?: DevExpress.core.DxElement; /** - * [descr:_ui_menu_SubmenuHidingEvent.submenuContainer] + * [descr:_ui_menu_SubmenuHiddenEvent.submenuContainer] */ readonly submenuContainer?: DevExpress.core.DxElement; }; + /** + * [descr:_ui_menu_SubmenuHidingEvent] + */ + export type SubmenuHidingEvent = + DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo> & { + /** + * [descr:_ui_menu_SubmenuHidingEvent.itemData] + */ + readonly itemData?: Item; + /** + * [descr:_ui_menu_SubmenuHidingEvent.rootItem] + */ + readonly rootItem?: DevExpress.core.DxElement; + /** + * [descr:_ui_menu_SubmenuHidingEvent.submenuContainer] + */ + readonly submenuContainer?: DevExpress.core.DxElement; + }; /** * [descr:_ui_menu_SubmenuShowingEvent] */ - export type SubmenuShowingEvent = DevExpress.events.EventInfo< - dxMenu - > & { - /** - * [descr:_ui_menu_SubmenuShowingEvent.itemData] - */ - readonly itemData?: Item; - /** - * [descr:_ui_menu_SubmenuShowingEvent.rootItem] - */ - readonly rootItem?: DevExpress.core.DxElement; - /** - * [descr:_ui_menu_SubmenuShowingEvent.submenuContainer] - */ - readonly submenuContainer?: DevExpress.core.DxElement; - }; + export type SubmenuShowingEvent = + DevExpress.common.core.events.EventInfo> & { + /** + * [descr:_ui_menu_SubmenuShowingEvent.itemData] + */ + readonly itemData?: Item; + /** + * [descr:_ui_menu_SubmenuShowingEvent.rootItem] + */ + readonly rootItem?: DevExpress.core.DxElement; + /** + * [descr:_ui_menu_SubmenuShowingEvent.submenuContainer] + */ + readonly submenuContainer?: DevExpress.core.DxElement; + }; /** * [descr:_ui_menu_SubmenuShownEvent] */ - export type SubmenuShownEvent = DevExpress.events.EventInfo< - dxMenu - > & { - /** - * [descr:_ui_menu_SubmenuShownEvent.itemData] - */ - readonly itemData?: Item; - /** - * [descr:_ui_menu_SubmenuShownEvent.rootItem] - */ - readonly rootItem?: DevExpress.core.DxElement; - /** - * [descr:_ui_menu_SubmenuShownEvent.submenuContainer] - */ - readonly submenuContainer?: DevExpress.core.DxElement; - }; + export type SubmenuShownEvent = + DevExpress.common.core.events.EventInfo> & { + /** + * [descr:_ui_menu_SubmenuShownEvent.itemData] + */ + readonly itemData?: Item; + /** + * [descr:_ui_menu_SubmenuShownEvent.rootItem] + */ + readonly rootItem?: DevExpress.core.DxElement; + /** + * [descr:_ui_menu_SubmenuShownEvent.submenuContainer] + */ + readonly submenuContainer?: DevExpress.core.DxElement; + }; } /** * [descr:dxMenuBase] @@ -21218,11 +21422,11 @@ declare module DevExpress.ui { /** * [descr:dxMenuBaseOptions.animation.hide] */ - hide?: AnimationConfig; + hide?: DevExpress.common.core.animation.AnimationConfig; /** * [descr:dxMenuBaseOptions.animation.show] */ - show?: AnimationConfig; + show?: DevExpress.common.core.animation.AnimationConfig; }; /** * [descr:dxMenuBaseOptions.cssClass] @@ -21231,7 +21435,7 @@ declare module DevExpress.ui { /** * [descr:dxMenuBaseOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxMenuBaseOptions.items] */ @@ -21302,7 +21506,7 @@ declare module DevExpress.ui { /** * [descr:dxMenuOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike< + dataSource?: DevExpress.data.DataSourceLike< DevExpress.ui.dxMenu.Item, TKey > | null; @@ -21389,14 +21593,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; /** * [descr:_ui_multi_view_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -21415,40 +21619,42 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.core.events.InitializedEventInfo< + dxMultiView + >; /** * [descr:_ui_multi_view_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxMultiView, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_multi_view_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxMultiView, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_multi_view_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxMultiView, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * @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. */ @@ -21459,16 +21665,16 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_multi_view_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -21479,7 +21685,7 @@ declare module DevExpress.ui { export type SelectionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.ui.CollectionWidget.SelectionChangeInfo; } /** @@ -21499,7 +21705,7 @@ declare module DevExpress.ui { /** * [descr:dxMultiViewOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxMultiViewOptions.deferRendering] */ @@ -21551,50 +21757,52 @@ declare module DevExpress.ui { /** * [descr:_ui_number_box_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo< + export type ChangeEvent = DevExpress.common.core.events.NativeEventInfo< dxNumberBox, Event >; /** * [descr:_ui_number_box_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_number_box_CopyEvent] */ - export type CopyEvent = DevExpress.events.NativeEventInfo< + export type CopyEvent = DevExpress.common.core.events.NativeEventInfo< dxNumberBox, ClipboardEvent >; /** * [descr:_ui_number_box_CutEvent] */ - export type CutEvent = DevExpress.events.NativeEventInfo< + export type CutEvent = DevExpress.common.core.events.NativeEventInfo< dxNumberBox, ClipboardEvent >; /** * [descr:_ui_number_box_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_number_box_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.core.events.NativeEventInfo< dxNumberBox, KeyboardEvent >; /** * [descr:_ui_number_box_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.core.events.NativeEventInfo< dxNumberBox, FocusEvent >; /** * [descr:_ui_number_box_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.core.events.NativeEventInfo< dxNumberBox, FocusEvent >; @@ -21602,29 +21810,29 @@ declare module DevExpress.ui { * [descr:_ui_number_box_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_number_box_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.core.events.NativeEventInfo< dxNumberBox, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_number_box_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.core.events.NativeEventInfo< dxNumberBox, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.core.events.NativeEventInfo< dxNumberBox, KeyboardEvent >; /** * [descr:_ui_number_box_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.core.events.NativeEventInfo< dxNumberBox, KeyboardEvent >; @@ -21633,12 +21841,13 @@ declare module DevExpress.ui { /** * [descr:_ui_number_box_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; /** * [descr:_ui_number_box_PasteEvent] */ - export type PasteEvent = DevExpress.events.NativeEventInfo< + export type PasteEvent = DevExpress.common.core.events.NativeEventInfo< dxNumberBox, ClipboardEvent >; @@ -21646,11 +21855,12 @@ declare module DevExpress.ui { /** * [descr:_ui_number_box_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< - dxNumberBox, - KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | Event - > & - DevExpress.ui.Editor.ValueChangedInfo; + export type ValueChangedEvent = + DevExpress.common.core.events.NativeEventInfo< + dxNumberBox, + KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | Event + > & + DevExpress.ui.Editor.ValueChangedInfo; } /** * [descr:dxNumberBoxOptions] @@ -21668,7 +21878,7 @@ declare module DevExpress.ui { /** * [descr:dxNumberBoxOptions.format] */ - format?: Format; + format?: DevExpress.common.core.localization.Format; /** * [descr:dxNumberBoxOptions.invalidValueMessage] */ @@ -21736,11 +21946,11 @@ declare module DevExpress.ui { /** * [descr:dxOverlayOptions.animation.hide] */ - hide?: AnimationConfig; + hide?: DevExpress.common.core.animation.AnimationConfig; /** * [descr:dxOverlayOptions.animation.show] */ - show?: AnimationConfig; + show?: DevExpress.common.core.animation.AnimationConfig; } /** * [descr:dxOverlayOptions] @@ -21767,7 +21977,7 @@ declare module DevExpress.ui { * [descr:dxOverlayOptions.contentTemplate] */ contentTemplate?: - | DevExpress.core.template + | template | (( contentElement: DevExpress.core.DxElement ) => string | DevExpress.core.UserDefinedElement); @@ -21817,23 +22027,25 @@ declare module DevExpress.ui { /** * [descr:dxOverlayOptions.onHidden] */ - onHidden?: (e: DevExpress.events.EventInfo) => void; + onHidden?: (e: DevExpress.common.core.events.EventInfo) => void; /** * [descr:dxOverlayOptions.onHiding] */ onHiding?: ( - e: DevExpress.events.Cancelable & DevExpress.events.EventInfo + e: DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo ) => void; /** * [descr:dxOverlayOptions.onShowing] */ onShowing?: ( - e: DevExpress.events.Cancelable & DevExpress.events.EventInfo + e: DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo ) => void; /** * [descr:dxOverlayOptions.onShown] */ - onShown?: (e: DevExpress.events.EventInfo) => void; + onShown?: (e: DevExpress.common.core.events.EventInfo) => void; /** * [descr:dxOverlayOptions.position] */ @@ -21935,8 +22147,8 @@ declare module DevExpress.ui { /** * [descr:_ui_pivot_grid_CellClickEvent] */ - export type CellClickEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type CellClickEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.NativeEventInfo< dxPivotGrid, MouseEvent | PointerEvent > & { @@ -21976,37 +22188,39 @@ declare module DevExpress.ui { /** * [descr:_ui_pivot_grid_CellPreparedEvent] */ - export type CellPreparedEvent = DevExpress.events.EventInfo & { - /** - * [descr:_ui_pivot_grid_CellPreparedEvent.area] - */ - readonly area?: string; - /** - * [descr:_ui_pivot_grid_CellPreparedEvent.cellElement] - */ - readonly cellElement?: DevExpress.core.DxElement; - /** - * [descr:_ui_pivot_grid_CellPreparedEvent.cell] - */ - readonly cell?: Cell; - /** - * [descr:_ui_pivot_grid_CellPreparedEvent.rowIndex] - */ - readonly rowIndex?: number; - /** - * [descr:_ui_pivot_grid_CellPreparedEvent.columnIndex] - */ - readonly columnIndex?: number; - }; + export type CellPreparedEvent = + DevExpress.common.core.events.EventInfo & { + /** + * [descr:_ui_pivot_grid_CellPreparedEvent.area] + */ + readonly area?: string; + /** + * [descr:_ui_pivot_grid_CellPreparedEvent.cellElement] + */ + readonly cellElement?: DevExpress.core.DxElement; + /** + * [descr:_ui_pivot_grid_CellPreparedEvent.cell] + */ + readonly cell?: Cell; + /** + * [descr:_ui_pivot_grid_CellPreparedEvent.rowIndex] + */ + readonly rowIndex?: number; + /** + * [descr:_ui_pivot_grid_CellPreparedEvent.columnIndex] + */ + readonly columnIndex?: number; + }; /** * [descr:_ui_pivot_grid_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_pivot_grid_ContextMenuPreparingEvent] */ export type ContextMenuPreparingEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_pivot_grid_ContextMenuPreparingEvent.area] */ @@ -22051,12 +22265,13 @@ declare module DevExpress.ui { /** * [descr:_ui_pivot_grid_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_pivot_grid_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { + export type ExportingEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_pivot_grid_ExportingEvent.fileName] */ @@ -22066,12 +22281,13 @@ declare module DevExpress.ui { * [descr:_ui_pivot_grid_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_pivot_grid_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type PivotGridDataFieldArea = 'column' | 'row'; export type PivotGridRowHeaderLayout = 'standard' | 'tree'; export type PivotGridTotalDisplayMode = @@ -22107,12 +22323,12 @@ declare module DevExpress.ui { * [descr:_ui_pivot_grid_field_chooser_ContentReadyEvent] */ export type ContentReadyEvent = - DevExpress.events.EventInfo; + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_pivot_grid_field_chooser_ContextMenuPreparingEvent] */ export type ContextMenuPreparingEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_pivot_grid_field_chooser_ContextMenuPreparingEvent.area] */ @@ -22134,18 +22350,18 @@ declare module DevExpress.ui { * [descr:_ui_pivot_grid_field_chooser_DisposingEvent] */ export type DisposingEvent = - DevExpress.events.EventInfo; + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_pivot_grid_field_chooser_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_pivot_grid_field_chooser_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxPivotGridFieldChooserOptions; } /** @@ -22814,30 +23030,34 @@ declare module DevExpress.ui { /** * [descr:_ui_popover_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_popover_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_popover_HiddenEvent] */ - export type HiddenEvent = DevExpress.events.EventInfo; + export type HiddenEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_popover_HidingEvent] */ - export type HidingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; + export type HidingEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_popover_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_popover_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; /** * @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. */ @@ -22846,17 +23066,18 @@ declare module DevExpress.ui { /** * [descr:_ui_popover_ShowingEvent] */ - export type ShowingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; + export type ShowingEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_popover_ShownEvent] */ - export type ShownEvent = DevExpress.events.EventInfo; + export type ShownEvent = DevExpress.common.core.events.EventInfo; /** * [descr:_ui_popover_TitleRenderedEvent] */ - export type TitleRenderedEvent = DevExpress.events.EventInfo & - DevExpress.ui.dxPopup.TitleRenderedInfo; + export type TitleRenderedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.ui.dxPopup.TitleRenderedInfo; } /** * [descr:dxPopoverAnimation] @@ -22866,11 +23087,11 @@ declare module DevExpress.ui { /** * [descr:dxPopoverOptions.animation.hide] */ - hide?: AnimationConfig; + hide?: DevExpress.common.core.animation.AnimationConfig; /** * [descr:dxPopoverOptions.animation.show] */ - show?: AnimationConfig; + show?: DevExpress.common.core.animation.AnimationConfig; } /** * [descr:dxPopoverOptions] @@ -22931,7 +23152,9 @@ declare module DevExpress.ui { /** * [descr:dxPopoverOptions.position] */ - position?: DevExpress.common.Position | PositionConfig; + position?: + | DevExpress.common.Position + | DevExpress.common.core.animation.PositionConfig; /** * [descr:dxPopoverOptions.shading] */ @@ -22972,40 +23195,44 @@ declare module DevExpress.ui { TProperties = DevExpress.ui.dxPopup.Properties > extends dxOverlay {} module dxPopup { - export type ContentReadyEvent = DevExpress.events.EventInfo; - export type DisposingEvent = DevExpress.events.EventInfo; - export type HiddenEvent = DevExpress.events.EventInfo; - export type HidingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; + export type HiddenEvent = DevExpress.common.core.events.EventInfo; + export type HidingEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo; export type InitializedEvent = - DevExpress.events.InitializedEventInfo; - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.core.events.InitializedEventInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; /** * @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. */ interface PopupInstance extends dxPopup {} export type Properties = dxPopupOptions; - export type ResizeEndEvent = DevExpress.events.NativeEventInfo< - dxPopup, - MouseEvent | TouchEvent - > & - DevExpress.ui.dxResizable.ResizeInfo; - export type ResizeEvent = DevExpress.events.NativeEventInfo< + export type ResizeEndEvent = DevExpress.common.core.events.NativeEventInfo< dxPopup, MouseEvent | TouchEvent > & DevExpress.ui.dxResizable.ResizeInfo; - export type ResizeStartEvent = DevExpress.events.NativeEventInfo< + export type ResizeEvent = DevExpress.common.core.events.NativeEventInfo< dxPopup, MouseEvent | TouchEvent > & DevExpress.ui.dxResizable.ResizeInfo; - export type ShowingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; - export type ShownEvent = DevExpress.events.EventInfo; - export type TitleRenderedEvent = DevExpress.events.EventInfo & - TitleRenderedInfo; + export type ResizeStartEvent = + DevExpress.common.core.events.NativeEventInfo< + dxPopup, + MouseEvent | TouchEvent + > & + DevExpress.ui.dxResizable.ResizeInfo; + export type ShowingEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo; + export type ShownEvent = DevExpress.common.core.events.EventInfo; + export type TitleRenderedEvent = + DevExpress.common.core.events.EventInfo & TitleRenderedInfo; /** * [descr:TitleRenderedInfo] * @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. @@ -23023,11 +23250,11 @@ declare module DevExpress.ui { /** * [descr:dxPopupOptions.animation.hide] */ - hide?: AnimationConfig; + hide?: DevExpress.common.core.animation.AnimationConfig; /** * [descr:dxPopupOptions.animation.show] */ - show?: AnimationConfig; + show?: DevExpress.common.core.animation.AnimationConfig; } /** * [descr:dxPopupOptions] @@ -23084,13 +23311,16 @@ declare module DevExpress.ui { * [descr:dxPopupOptions.onTitleRendered] */ onTitleRendered?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.core.events.EventInfo & DevExpress.ui.dxPopup.TitleRenderedInfo ) => void; /** * [descr:dxPopupOptions.position] */ - position?: DevExpress.common.PositionAlignment | PositionConfig | Function; + position?: + | DevExpress.common.PositionAlignment + | DevExpress.common.core.animation.PositionConfig + | Function; /** * [descr:dxPopupOptions.enableBodyScroll] */ @@ -23119,7 +23349,7 @@ declare module DevExpress.ui { * [descr:dxPopupOptions.titleTemplate] */ titleTemplate?: - | DevExpress.core.template + | template | (( titleElement: DevExpress.core.DxElement ) => string | DevExpress.core.UserDefinedElement); @@ -23146,32 +23376,34 @@ declare module DevExpress.ui { * [descr:_ui_progress_bar_CompleteEvent] */ export type CompleteEvent = - DevExpress.events.NativeEventInfo; + DevExpress.common.core.events.NativeEventInfo; /** * [descr:_ui_progress_bar_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_progress_bar_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_progress_bar_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_progress_bar_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxProgressBarOptions; /** * [descr:_ui_progress_bar_ValueChangedEvent] */ export type ValueChangedEvent = - DevExpress.events.NativeEventInfo & + DevExpress.common.core.events.NativeEventInfo & DevExpress.ui.Editor.ValueChangedInfo; } /** @@ -23202,36 +23434,40 @@ declare module DevExpress.ui { * [descr:dxRadioGroup] */ export class dxRadioGroup extends Editor { - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.data.DataSource; } module dxRadioGroup { /** * [descr:_ui_radio_group_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_radio_group_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_radio_group_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_radio_group_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxRadioGroupOptions; /** * [descr:_ui_radio_group_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< - dxRadioGroup, - KeyboardEvent | MouseEvent | PointerEvent | Event - > & - DevExpress.ui.Editor.ValueChangedInfo; + export type ValueChangedEvent = + DevExpress.common.core.events.NativeEventInfo< + dxRadioGroup, + KeyboardEvent | MouseEvent | PointerEvent | Event + > & + DevExpress.ui.Editor.ValueChangedInfo; } /** * [descr:dxRadioGroupOptions] @@ -23279,44 +23515,47 @@ declare module DevExpress.ui { /** * [descr:_ui_range_slider_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_range_slider_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_range_slider_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_range_slider_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxRangeSliderOptions; /** * [descr:_ui_range_slider_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< - dxRangeSlider, - KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | UIEvent | Event - > & - DevExpress.ui.Editor.ValueChangedInfo & { - /** - * [descr:_ui_range_slider_ValueChangedEvent.start] - */ - readonly start?: number; - /** - * [descr:_ui_range_slider_ValueChangedEvent.end] - */ - readonly end?: number; - /** - * [descr:_ui_range_slider_ValueChangedEvent.value] - */ - readonly value?: Array; - }; + export type ValueChangedEvent = + DevExpress.common.core.events.NativeEventInfo< + dxRangeSlider, + KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | UIEvent | Event + > & + DevExpress.ui.Editor.ValueChangedInfo & { + /** + * [descr:_ui_range_slider_ValueChangedEvent.start] + */ + readonly start?: number; + /** + * [descr:_ui_range_slider_ValueChangedEvent.end] + */ + readonly end?: number; + /** + * [descr:_ui_range_slider_ValueChangedEvent.value] + */ + readonly value?: Array; + }; } /** * [descr:dxRangeSliderOptions] @@ -23359,23 +23598,23 @@ declare module DevExpress.ui { * [descr:_ui_recurrence_editor_ContentReadyEvent] */ export type ContentReadyEvent = - DevExpress.events.EventInfo; + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_recurrence_editor_DisposingEvent] */ export type DisposingEvent = - DevExpress.events.EventInfo; + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_recurrence_editor_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_recurrence_editor_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; /** * @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. */ @@ -23383,11 +23622,9 @@ declare module DevExpress.ui { /** * [descr:_ui_recurrence_editor_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< - dxRecurrenceEditor, - Event - > & - DevExpress.ui.Editor.ValueChangedInfo; + export type ValueChangedEvent = + DevExpress.common.core.events.NativeEventInfo & + DevExpress.ui.Editor.ValueChangedInfo; } /** * [descr:dxRecurrenceEditorOptions] @@ -23408,22 +23645,24 @@ declare module DevExpress.ui { /** * [descr:_ui_resizable_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_resizable_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_resizable_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxResizableOptions; /** * [descr:_ui_resizable_ResizeEndEvent] */ - export type ResizeEndEvent = DevExpress.events.NativeEventInfo< + export type ResizeEndEvent = DevExpress.common.core.events.NativeEventInfo< dxResizable, MouseEvent | TouchEvent > & @@ -23431,7 +23670,7 @@ declare module DevExpress.ui { /** * [descr:_ui_resizable_ResizeEvent] */ - export type ResizeEvent = DevExpress.events.NativeEventInfo< + export type ResizeEvent = DevExpress.common.core.events.NativeEventInfo< dxResizable, MouseEvent | TouchEvent > & @@ -23454,11 +23693,12 @@ declare module DevExpress.ui { /** * [descr:_ui_resizable_ResizeStartEvent] */ - export type ResizeStartEvent = DevExpress.events.NativeEventInfo< - dxResizable, - MouseEvent | TouchEvent - > & - ResizeInfo; + export type ResizeStartEvent = + DevExpress.common.core.events.NativeEventInfo< + dxResizable, + MouseEvent | TouchEvent + > & + ResizeInfo; } /** * [descr:dxResizableOptions] @@ -23533,14 +23773,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; /** * [descr:_ui_responsive_box_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -23558,40 +23798,42 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.core.events.InitializedEventInfo< + dxResponsiveBox + >; /** * [descr:_ui_responsive_box_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxResponsiveBox, MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_responsive_box_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxResponsiveBox, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_responsive_box_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxResponsiveBox, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * @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. */ @@ -23602,16 +23844,16 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_responsive_box_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -23688,7 +23930,7 @@ declare module DevExpress.ui { /** * [descr:dxResponsiveBoxOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxResponsiveBoxOptions.height] */ @@ -23751,7 +23993,7 @@ declare module DevExpress.ui { date: Date | string, recurrenceEditMode: DevExpress.ui.dxScheduler.RecurrenceEditMode ): void; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.data.DataSource; /** * [descr:dxScheduler.getEndViewDate()] */ @@ -23804,7 +24046,7 @@ declare module DevExpress.ui { * [descr:_ui_scheduler_AppointmentAddedEvent] */ export type AppointmentAddedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_scheduler_AppointmentAddedEvent.appointmentData] */ @@ -23818,7 +24060,7 @@ declare module DevExpress.ui { * [descr:_ui_scheduler_AppointmentAddingEvent] */ export type AppointmentAddingEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_scheduler_AppointmentAddingEvent.appointmentData] */ @@ -23831,17 +24073,18 @@ declare module DevExpress.ui { /** * [descr:_ui_scheduler_AppointmentClickEvent] */ - export type AppointmentClickEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< - dxScheduler, - KeyboardEvent | MouseEvent | PointerEvent - > & - TargetedAppointmentInfo & { - /** - * [descr:_ui_scheduler_AppointmentClickEvent.appointmentElement] - */ - readonly appointmentElement: DevExpress.core.DxElement; - }; + export type AppointmentClickEvent = + DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.NativeEventInfo< + dxScheduler, + KeyboardEvent | MouseEvent | PointerEvent + > & + TargetedAppointmentInfo & { + /** + * [descr:_ui_scheduler_AppointmentClickEvent.appointmentElement] + */ + readonly appointmentElement: DevExpress.core.DxElement; + }; export type AppointmentCollectorTemplateData = { readonly appointmentCount: number; readonly isCompact: boolean; @@ -23849,35 +24092,37 @@ declare module DevExpress.ui { /** * [descr:_ui_scheduler_AppointmentContextMenuEvent] */ - export type AppointmentContextMenuEvent = DevExpress.events.NativeEventInfo< - dxScheduler, - MouseEvent | PointerEvent | TouchEvent - > & - TargetedAppointmentInfo & { - /** - * [descr:_ui_scheduler_AppointmentContextMenuEvent.appointmentElement] - */ - readonly appointmentElement: DevExpress.core.DxElement; - }; + export type AppointmentContextMenuEvent = + DevExpress.common.core.events.NativeEventInfo< + dxScheduler, + MouseEvent | PointerEvent | TouchEvent + > & + TargetedAppointmentInfo & { + /** + * [descr:_ui_scheduler_AppointmentContextMenuEvent.appointmentElement] + */ + readonly appointmentElement: DevExpress.core.DxElement; + }; /** * [descr:_ui_scheduler_AppointmentDblClickEvent] */ - export type AppointmentDblClickEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< - dxScheduler, - MouseEvent | PointerEvent - > & - TargetedAppointmentInfo & { - /** - * [descr:_ui_scheduler_AppointmentDblClickEvent.appointmentElement] - */ - readonly appointmentElement: DevExpress.core.DxElement; - }; + export type AppointmentDblClickEvent = + DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.NativeEventInfo< + dxScheduler, + MouseEvent | PointerEvent + > & + TargetedAppointmentInfo & { + /** + * [descr:_ui_scheduler_AppointmentDblClickEvent.appointmentElement] + */ + readonly appointmentElement: DevExpress.core.DxElement; + }; /** * [descr:_ui_scheduler_AppointmentDeletedEvent] */ export type AppointmentDeletedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_scheduler_AppointmentDeletedEvent.appointmentData] */ @@ -23891,7 +24136,7 @@ declare module DevExpress.ui { * [descr:_ui_scheduler_AppointmentDeletingEvent] */ export type AppointmentDeletingEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_scheduler_AppointmentDeletingEvent.appointmentData] */ @@ -23906,13 +24151,14 @@ declare module DevExpress.ui { readonly toComponent?: dxSortable | dxDraggable; readonly toData?: any; }; - export type AppointmentDraggingEndEvent = DevExpress.events.Cancelable & - AppointmentDraggingEvent & { - readonly fromComponent?: dxSortable | dxDraggable; - readonly toComponent?: dxSortable | dxDraggable; - readonly toData?: any; - readonly toItemData?: any; - }; + export type AppointmentDraggingEndEvent = + DevExpress.common.core.events.Cancelable & + AppointmentDraggingEvent & { + readonly fromComponent?: dxSortable | dxDraggable; + readonly toComponent?: dxSortable | dxDraggable; + readonly toData?: any; + readonly toItemData?: any; + }; /** * @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. */ @@ -23923,43 +24169,46 @@ declare module DevExpress.ui { readonly itemElement?: DevExpress.core.DxElement; readonly fromData?: any; } - export type AppointmentDraggingMoveEvent = DevExpress.events.Cancelable & - AppointmentDraggingEvent & { - readonly fromComponent?: dxSortable | dxDraggable; - readonly toComponent?: dxSortable | dxDraggable; - readonly toData?: any; - }; + export type AppointmentDraggingMoveEvent = + DevExpress.common.core.events.Cancelable & + AppointmentDraggingEvent & { + readonly fromComponent?: dxSortable | dxDraggable; + readonly toComponent?: dxSortable | dxDraggable; + readonly toData?: any; + }; export type AppointmentDraggingRemoveEvent = AppointmentDraggingEvent & { readonly fromComponent?: dxSortable | dxDraggable; readonly toComponent?: dxSortable | dxDraggable; }; - export type AppointmentDraggingStartEvent = DevExpress.events.Cancelable & - Omit & { - itemData?: any; - }; + export type AppointmentDraggingStartEvent = + DevExpress.common.core.events.Cancelable & + Omit & { + itemData?: any; + }; /** * [descr:_ui_scheduler_AppointmentFormOpeningEvent] */ - export type AppointmentFormOpeningEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { - /** - * [descr:_ui_scheduler_AppointmentFormOpeningEvent.appointmentData] - */ - readonly appointmentData?: Appointment; - /** - * [descr:_ui_scheduler_AppointmentFormOpeningEvent.form] - */ - readonly form: dxForm; - /** - * [descr:_ui_scheduler_AppointmentFormOpeningEvent.popup] - */ - readonly popup: dxPopup; - }; + export type AppointmentFormOpeningEvent = + DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo & { + /** + * [descr:_ui_scheduler_AppointmentFormOpeningEvent.appointmentData] + */ + readonly appointmentData?: Appointment; + /** + * [descr:_ui_scheduler_AppointmentFormOpeningEvent.form] + */ + readonly form: dxForm; + /** + * [descr:_ui_scheduler_AppointmentFormOpeningEvent.popup] + */ + readonly popup: dxPopup; + }; /** * [descr:_ui_scheduler_AppointmentRenderedEvent] */ export type AppointmentRenderedEvent = - DevExpress.events.EventInfo & + DevExpress.common.core.events.EventInfo & TargetedAppointmentInfo & { /** * [descr:_ui_scheduler_AppointmentRenderedEvent.appointmentElement] @@ -23981,17 +24230,18 @@ declare module DevExpress.ui { /** * [descr:_ui_scheduler_AppointmentTooltipShowingEvent] */ - export type AppointmentTooltipShowingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { - /** - * [descr:_ui_scheduler_AppointmentTooltipShowingEvent.targetElement] - */ - readonly targetElement: DevExpress.core.DxElement; - /** - * [descr:_ui_scheduler_AppointmentTooltipShowingEvent.appointments] - */ - readonly appointments: AppointmentTooltipShowingAppointmentInfo[]; - }; + export type AppointmentTooltipShowingEvent = + DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo & { + /** + * [descr:_ui_scheduler_AppointmentTooltipShowingEvent.targetElement] + */ + readonly targetElement: DevExpress.core.DxElement; + /** + * [descr:_ui_scheduler_AppointmentTooltipShowingEvent.appointments] + */ + readonly appointments: AppointmentTooltipShowingAppointmentInfo[]; + }; /** * [descr:AppointmentTooltipTemplateData] */ @@ -24005,7 +24255,7 @@ declare module DevExpress.ui { * [descr:_ui_scheduler_AppointmentUpdatedEvent] */ export type AppointmentUpdatedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_scheduler_AppointmentUpdatedEvent.appointmentData] */ @@ -24019,7 +24269,7 @@ declare module DevExpress.ui { * [descr:_ui_scheduler_AppointmentUpdatingEvent] */ export type AppointmentUpdatingEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_scheduler_AppointmentUpdatingEvent.oldData] */ @@ -24037,8 +24287,8 @@ declare module DevExpress.ui { /** * [descr:_ui_scheduler_CellClickEvent] */ - export type CellClickEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type CellClickEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.NativeEventInfo< dxScheduler, KeyboardEvent | MouseEvent | PointerEvent > & { @@ -24054,23 +24304,25 @@ declare module DevExpress.ui { /** * [descr:_ui_scheduler_CellContextMenuEvent] */ - export type CellContextMenuEvent = DevExpress.events.NativeEventInfo< - dxScheduler, - MouseEvent | PointerEvent | TouchEvent - > & { - /** - * [descr:_ui_scheduler_CellContextMenuEvent.cellData] - */ - readonly cellData: any; - /** - * [descr:_ui_scheduler_CellContextMenuEvent.cellElement] - */ - readonly cellElement: DevExpress.core.DxElement; - }; + export type CellContextMenuEvent = + DevExpress.common.core.events.NativeEventInfo< + dxScheduler, + MouseEvent | PointerEvent | TouchEvent + > & { + /** + * [descr:_ui_scheduler_CellContextMenuEvent.cellData] + */ + readonly cellData: any; + /** + * [descr:_ui_scheduler_CellContextMenuEvent.cellElement] + */ + readonly cellElement: DevExpress.core.DxElement; + }; /** * [descr:_ui_scheduler_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; export type DateNavigatorTextInfo = { readonly startDate: Date; readonly endDate: Date; @@ -24079,17 +24331,19 @@ declare module DevExpress.ui { /** * [descr:_ui_scheduler_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_scheduler_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_scheduler_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxSchedulerOptions; export type RecurrenceEditMode = 'dialog' | 'occurrence' | 'series'; /** @@ -24165,7 +24419,7 @@ declare module DevExpress.ui { /** * [descr:dxSchedulerAppointment.template] */ - template?: DevExpress.core.template; + template?: template; /** * [descr:dxSchedulerAppointment.text] */ @@ -24193,7 +24447,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.appointmentCollectorTemplate] */ appointmentCollectorTemplate?: - | DevExpress.core.template + | template | (( data: DevExpress.ui.dxScheduler.AppointmentCollectorTemplateData, collectorElement: DevExpress.core.DxElement @@ -24257,7 +24511,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.appointmentTemplate] */ appointmentTemplate?: - | DevExpress.core.template + | template | (( model: DevExpress.ui.dxScheduler.AppointmentTemplateData, itemIndex: number, @@ -24267,7 +24521,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.appointmentTooltipTemplate] */ appointmentTooltipTemplate?: - | DevExpress.core.template + | template | (( model: DevExpress.ui.dxScheduler.AppointmentTooltipTemplateData, itemIndex: number, @@ -24299,7 +24553,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.dataCellTemplate] */ dataCellTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -24308,12 +24562,12 @@ declare module DevExpress.ui { /** * [descr:dxSchedulerOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxSchedulerOptions.dateCellTemplate] */ dateCellTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -24332,7 +24586,7 @@ declare module DevExpress.ui { * @deprecated [depNote:dxSchedulerOptions.dropDownAppointmentTemplate] */ dropDownAppointmentTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -24524,7 +24778,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.resourceCellTemplate] */ resourceCellTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -24545,7 +24799,7 @@ declare module DevExpress.ui { /** * [descr:dxSchedulerOptions.resources.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxSchedulerOptions.resources.displayExpr] */ @@ -24607,7 +24861,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.timeCellTemplate] */ timeCellTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -24651,7 +24905,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.views.appointmentCollectorTemplate] */ appointmentCollectorTemplate?: - | DevExpress.core.template + | template | (( data: DevExpress.ui.dxScheduler.AppointmentCollectorTemplateData, collectorElement: DevExpress.core.DxElement @@ -24660,7 +24914,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.views.appointmentTemplate] */ appointmentTemplate?: - | DevExpress.core.template + | template | (( model: DevExpress.ui.dxScheduler.AppointmentTemplateData, itemIndex: number, @@ -24670,7 +24924,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.views.appointmentTooltipTemplate] */ appointmentTooltipTemplate?: - | DevExpress.core.template + | template | (( model: DevExpress.ui.dxScheduler.AppointmentTooltipTemplateData, itemIndex: number, @@ -24681,7 +24935,7 @@ declare module DevExpress.ui { * @deprecated [depNote:dxSchedulerOptions.views.dropDownAppointmentTemplate] */ dropDownAppointmentTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -24695,7 +24949,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.views.dataCellTemplate] */ dataCellTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -24705,7 +24959,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.views.dateCellTemplate] */ dateCellTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -24749,7 +25003,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.views.resourceCellTemplate] */ resourceCellTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -24767,7 +25021,7 @@ declare module DevExpress.ui { * [descr:dxSchedulerOptions.views.timeCellTemplate] */ timeCellTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemIndex: number, @@ -24871,7 +25125,7 @@ declare module DevExpress.ui { * @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 ScrollEventInfo - extends DevExpress.events.NativeEventInfo< + extends DevExpress.common.core.events.NativeEventInfo< T, WheelEvent | MouseEvent | Event > { @@ -24963,26 +25217,30 @@ declare module DevExpress.ui { /** * [descr:_ui_scroll_view_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_scroll_view_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_scroll_view_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxScrollViewOptions; /** * [descr:_ui_scroll_view_PullDownEvent] */ - export type PullDownEvent = DevExpress.events.EventInfo; + export type PullDownEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_scroll_view_ReachBottomEvent] */ - export type ReachBottomEvent = DevExpress.events.EventInfo; + export type ReachBottomEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_scroll_view_ScrollEvent] */ @@ -25036,22 +25294,24 @@ declare module DevExpress.ui { /** * [descr:_ui_select_box_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo< + export type ChangeEvent = DevExpress.common.core.events.NativeEventInfo< dxSelectBox, Event >; /** * [descr:_ui_select_box_ClosedEvent] */ - export type ClosedEvent = DevExpress.events.EventInfo; + export type ClosedEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_select_box_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_select_box_CopyEvent] */ - export type CopyEvent = DevExpress.events.NativeEventInfo< + export type CopyEvent = DevExpress.common.core.events.NativeEventInfo< dxSelectBox, ClipboardEvent >; @@ -25059,7 +25319,8 @@ declare module DevExpress.ui { * [descr:_ui_select_box_CustomItemCreatingEvent] */ export type CustomItemCreatingEvent = - DevExpress.events.EventInfo & CustomItemCreatingInfo; + DevExpress.common.core.events.EventInfo & + CustomItemCreatingInfo; /** * [descr:CustomItemCreatingInfo] * @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. @@ -25077,34 +25338,35 @@ declare module DevExpress.ui { /** * [descr:_ui_select_box_CutEvent] */ - export type CutEvent = DevExpress.events.NativeEventInfo< + export type CutEvent = DevExpress.common.core.events.NativeEventInfo< dxSelectBox, ClipboardEvent >; /** * [descr:_ui_select_box_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; export type DropDownButtonTemplateData = DevExpress.ui.dxDropDownEditor.DropDownButtonTemplateDataModel; /** * [descr:_ui_select_box_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.core.events.NativeEventInfo< dxSelectBox, KeyboardEvent >; /** * [descr:_ui_select_box_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.core.events.NativeEventInfo< dxSelectBox, FocusEvent >; /** * [descr:_ui_select_box_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.core.events.NativeEventInfo< dxSelectBox, FocusEvent >; @@ -25112,53 +25374,55 @@ declare module DevExpress.ui { * [descr:_ui_select_box_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_select_box_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.core.events.NativeEventInfo< dxSelectBox, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_select_box_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo< + export type ItemClickEvent = DevExpress.common.core.events.NativeEventInfo< dxSelectBox, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_select_box_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.core.events.NativeEventInfo< dxSelectBox, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.core.events.NativeEventInfo< dxSelectBox, KeyboardEvent >; /** * [descr:_ui_select_box_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.core.events.NativeEventInfo< dxSelectBox, KeyboardEvent >; /** * [descr:_ui_select_box_OpenedEvent] */ - export type OpenedEvent = DevExpress.events.EventInfo; + export type OpenedEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_select_box_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; /** * [descr:_ui_select_box_PasteEvent] */ - export type PasteEvent = DevExpress.events.NativeEventInfo< + export type PasteEvent = DevExpress.common.core.events.NativeEventInfo< dxSelectBox, ClipboardEvent >; @@ -25171,16 +25435,17 @@ declare module DevExpress.ui { * [descr:_ui_select_box_SelectionChangedEvent] */ export type SelectionChangedEvent = - DevExpress.events.EventInfo & + DevExpress.common.core.events.EventInfo & DevExpress.ui.dxDropDownList.SelectionChangedInfo; /** * [descr:_ui_select_box_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< - dxSelectBox, - KeyboardEvent | MouseEvent | Event - > & - DevExpress.ui.Editor.ValueChangedInfo; + export type ValueChangedEvent = + DevExpress.common.core.events.NativeEventInfo< + dxSelectBox, + KeyboardEvent | MouseEvent | Event + > & + DevExpress.ui.Editor.ValueChangedInfo; } /** * [descr:dxSelectBoxOptions] @@ -25197,7 +25462,7 @@ declare module DevExpress.ui { * [descr:dxSelectBoxOptions.fieldTemplate] */ fieldTemplate?: - | DevExpress.core.template + | template | (( selectedItem: any, fieldElement: DevExpress.core.DxElement @@ -25206,7 +25471,7 @@ declare module DevExpress.ui { * [descr:dxSelectBoxOptions.onCustomItemCreating] */ onCustomItemCreating?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.core.events.EventInfo & DevExpress.ui.dxSelectBox.CustomItemCreatingInfo ) => void; /** @@ -25254,30 +25519,34 @@ declare module DevExpress.ui { /** * [descr:_ui_slider_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_slider_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_slider_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_slider_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxSliderOptions; /** * [descr:_ui_slider_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< - dxSlider, - KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | UIEvent | Event - > & - DevExpress.ui.Editor.ValueChangedInfo; + export type ValueChangedEvent = + DevExpress.common.core.events.NativeEventInfo< + dxSlider, + KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | UIEvent | Event + > & + DevExpress.ui.Editor.ValueChangedInfo; } /** * [descr:dxSliderBase] @@ -25313,7 +25582,7 @@ declare module DevExpress.ui { /** * [descr:dxSliderBaseOptions.label.format] */ - format?: Format; + format?: DevExpress.common.core.localization.Format; /** * [descr:dxSliderBaseOptions.label.position] */ @@ -25346,7 +25615,7 @@ declare module DevExpress.ui { /** * [descr:dxSliderBaseOptions.tooltip.format] */ - format?: Format; + format?: DevExpress.common.core.localization.Format; /** * [descr:dxSliderBaseOptions.tooltip.position] */ @@ -25447,12 +25716,13 @@ declare module DevExpress.ui { /** * [descr:_ui_sortable_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_sortable_DragChangeEvent] */ - export type DragChangeEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type DragChangeEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.NativeEventInfo< dxSortable, PointerEvent | MouseEvent | TouchEvent > & { @@ -25496,8 +25766,8 @@ declare module DevExpress.ui { /** * [descr:_ui_sortable_DragEndEvent] */ - export type DragEndEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type DragEndEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.NativeEventInfo< dxSortable, PointerEvent | MouseEvent | TouchEvent > & { @@ -25541,8 +25811,8 @@ declare module DevExpress.ui { /** * [descr:_ui_sortable_DragMoveEvent] */ - export type DragMoveEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type DragMoveEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.NativeEventInfo< dxSortable, PointerEvent | MouseEvent | TouchEvent > & { @@ -25586,8 +25856,8 @@ declare module DevExpress.ui { /** * [descr:_ui_sortable_DragStartEvent] */ - export type DragStartEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type DragStartEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.NativeEventInfo< dxSortable, PointerEvent | MouseEvent | TouchEvent > & { @@ -25617,17 +25887,18 @@ declare module DevExpress.ui { * [descr:_ui_sortable_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_sortable_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxSortableOptions; /** * [descr:_ui_sortable_RemoveEvent] */ - export type RemoveEvent = DevExpress.events.NativeEventInfo< + export type RemoveEvent = DevExpress.common.core.events.NativeEventInfo< dxSortable, PointerEvent | MouseEvent | TouchEvent > & { @@ -25667,7 +25938,7 @@ declare module DevExpress.ui { /** * [descr:_ui_sortable_ReorderEvent] */ - export type ReorderEvent = DevExpress.events.NativeEventInfo< + export type ReorderEvent = DevExpress.common.core.events.NativeEventInfo< dxSortable, PointerEvent | MouseEvent | TouchEvent > & { @@ -25731,7 +26002,7 @@ declare module DevExpress.ui { * [descr:dxSortableOptions.dragTemplate] */ dragTemplate?: - | DevExpress.core.template + | template | (( dragInfo: DevExpress.ui.dxSortable.DragTemplateData, containerElement: DevExpress.core.DxElement @@ -25790,7 +26061,7 @@ declare module DevExpress.ui { /** * [descr:_ui_speed_dial_action_ClickEvent] */ - export type ClickEvent = DevExpress.events.NativeEventInfo< + export type ClickEvent = DevExpress.common.core.events.NativeEventInfo< dxSpeedDialAction, MouseEvent | PointerEvent > & { @@ -25803,7 +26074,7 @@ declare module DevExpress.ui { * [descr:_ui_speed_dial_action_ContentReadyEvent] */ export type ContentReadyEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_speed_dial_action_ContentReadyEvent.actionElement] */ @@ -25812,18 +26083,19 @@ declare module DevExpress.ui { /** * [descr:_ui_speed_dial_action_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_speed_dial_action_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_speed_dial_action_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxSpeedDialActionOptions; } /** @@ -25878,14 +26150,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; /** * [descr:_ui_splitter_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; export type ExplicitTypes, TKey> = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -25902,51 +26174,53 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.core.events.InitializedEventInfo< + dxSplitter + >; /** * [descr:_ui_splitter_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxSplitter, MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_splitter_ItemCollapsedEvent] */ export type ItemCollapsedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxSplitter, KeyboardEvent | PointerEvent | MouseEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_splitter_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxSplitter, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_splitter_ItemExpandedEvent] */ export type ItemExpandedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxSplitter, KeyboardEvent | PointerEvent | MouseEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * @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. */ @@ -25957,16 +26231,16 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_splitter_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -25974,20 +26248,22 @@ declare module DevExpress.ui { /** * [descr:_ui_splitter_ResizeEndEvent] */ - export type ResizeEndEvent = DevExpress.events.NativeEventInfo< - dxSplitter, - KeyboardEvent | PointerEvent | MouseEvent | TouchEvent - > & - ResizeInfo; - /** - * [descr:_ui_splitter_ResizeEvent] - */ - export type ResizeEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type ResizeEndEvent = + DevExpress.common.core.events.NativeEventInfo< dxSplitter, KeyboardEvent | PointerEvent | MouseEvent | TouchEvent > & - ResizeInfo; + ResizeInfo; + /** + * [descr:_ui_splitter_ResizeEvent] + */ + export type ResizeEvent = + DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.NativeEventInfo< + dxSplitter, + KeyboardEvent | PointerEvent | MouseEvent | TouchEvent + > & + ResizeInfo; /** * [descr:_ui_splitter_ResizeInfo] * @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. @@ -26001,12 +26277,13 @@ declare module DevExpress.ui { /** * [descr:_ui_splitter_ResizeStartEvent] */ - export type ResizeStartEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< - dxSplitter, - KeyboardEvent | PointerEvent | MouseEvent | TouchEvent - > & - ResizeInfo; + export type ResizeStartEvent = + DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.NativeEventInfo< + dxSplitter, + KeyboardEvent | PointerEvent | MouseEvent | TouchEvent + > & + ResizeInfo; } /** * @deprecated Use Item instead @@ -26057,7 +26334,7 @@ declare module DevExpress.ui { /** * [descr:dxSplitterOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxSplitterOptions.orientation] */ @@ -26108,30 +26385,34 @@ declare module DevExpress.ui { /** * [descr:_ui_switch_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_switch_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_switch_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_switch_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxSwitchOptions; /** * [descr:_ui_switch_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< - dxSwitch, - KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | UIEvent | Event - > & - DevExpress.ui.Editor.ValueChangedInfo; + export type ValueChangedEvent = + DevExpress.common.core.events.NativeEventInfo< + dxSwitch, + KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | UIEvent | Event + > & + DevExpress.ui.Editor.ValueChangedInfo; } /** * [descr:dxSwitchOptions] @@ -26186,14 +26467,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; /** * [descr:_ui_tab_panel_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -26216,40 +26497,42 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.core.events.InitializedEventInfo< + dxTabPanel + >; /** * [descr:_ui_tab_panel_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxTabPanel, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_tab_panel_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxTabPanel, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_tab_panel_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxTabPanel, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * @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. */ @@ -26260,16 +26543,16 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_tab_panel_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -26280,7 +26563,7 @@ declare module DevExpress.ui { export type SelectionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.ui.CollectionWidget.SelectionChangeInfo; /** * [descr:_ui_tab_panel_SelectionChangingEvent] @@ -26311,7 +26594,7 @@ declare module DevExpress.ui { export type TitleClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxTabPanel, KeyboardEvent | MouseEvent | PointerEvent > & @@ -26322,7 +26605,7 @@ declare module DevExpress.ui { export type TitleHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxTabPanel, MouseEvent | PointerEvent | TouchEvent > & @@ -26333,7 +26616,7 @@ declare module DevExpress.ui { export type TitleRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & TabPanelItemInfo; } /** @@ -26353,7 +26636,7 @@ declare module DevExpress.ui { * [descr:dxTabPanelItem.tabTemplate] */ tabTemplate?: - | DevExpress.core.template + | template | (() => string | DevExpress.core.UserDefinedElement); /** * [descr:dxTabPanelItem.title] @@ -26375,7 +26658,7 @@ declare module DevExpress.ui { /** * [descr:dxTabPanelOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxTabPanelOptions.hoverStateEnabled] */ @@ -26384,7 +26667,7 @@ declare module DevExpress.ui { * [descr:dxTabPanelOptions.itemTitleTemplate] */ itemTitleTemplate?: - | DevExpress.core.template + | template | (( itemData: TItem, itemIndex: number, @@ -26463,14 +26746,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; /** * [descr:_ui_tabs_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -26490,40 +26773,40 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.core.events.InitializedEventInfo>; /** * [descr:_ui_tabs_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxTabs, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_tabs_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxTabs, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_tabs_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxTabs, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * @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. */ @@ -26534,16 +26817,16 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_tabs_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -26554,7 +26837,7 @@ declare module DevExpress.ui { export type SelectionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.ui.CollectionWidget.SelectionChangeInfo; /** * [descr:_ui_tabs_SelectionChangingEvent] @@ -26579,7 +26862,7 @@ declare module DevExpress.ui { /** * [descr:dxTabsOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxTabsOptions.focusStateEnabled] */ @@ -26655,48 +26938,50 @@ declare module DevExpress.ui { /** * [descr:_ui_tag_box_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo< + export type ChangeEvent = DevExpress.common.core.events.NativeEventInfo< dxTagBox, Event >; /** * [descr:_ui_tag_box_ClosedEvent] */ - export type ClosedEvent = DevExpress.events.EventInfo; + export type ClosedEvent = DevExpress.common.core.events.EventInfo; /** * [descr:_ui_tag_box_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_tag_box_CustomItemCreatingEvent] */ export type CustomItemCreatingEvent = - DevExpress.events.EventInfo & + DevExpress.common.core.events.EventInfo & DevExpress.ui.dxSelectBox.CustomItemCreatingInfo; /** * [descr:_ui_tag_box_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; export type DropDownButtonTemplateData = DevExpress.ui.dxDropDownEditor.DropDownButtonTemplateDataModel; /** * [descr:_ui_tag_box_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.core.events.NativeEventInfo< dxTagBox, KeyboardEvent >; /** * [descr:_ui_tag_box_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.core.events.NativeEventInfo< dxTagBox, FocusEvent >; /** * [descr:_ui_tag_box_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.core.events.NativeEventInfo< dxTagBox, FocusEvent >; @@ -26704,70 +26989,73 @@ declare module DevExpress.ui { * [descr:_ui_tag_box_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_tag_box_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.core.events.NativeEventInfo< dxTagBox, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_tag_box_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo & - DevExpress.events.ItemInfo; + export type ItemClickEvent = + DevExpress.common.core.events.NativeEventInfo & + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_tag_box_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.core.events.NativeEventInfo< dxTagBox, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.core.events.NativeEventInfo< dxTagBox, KeyboardEvent >; /** * [descr:_ui_tag_box_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.core.events.NativeEventInfo< dxTagBox, KeyboardEvent >; /** * [descr:_ui_tag_box_MultiTagPreparingEvent] */ - export type MultiTagPreparingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo & { - /** - * [descr:_ui_tag_box_MultiTagPreparingEvent.multiTagElement] - */ - readonly multiTagElement: DevExpress.core.DxElement; - /** - * [descr:_ui_tag_box_MultiTagPreparingEvent.selectedItems] - */ - readonly selectedItems?: Array; - /** - * [descr:_ui_tag_box_MultiTagPreparingEvent.text] - */ - text?: string; - }; + export type MultiTagPreparingEvent = + DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo & { + /** + * [descr:_ui_tag_box_MultiTagPreparingEvent.multiTagElement] + */ + readonly multiTagElement: DevExpress.core.DxElement; + /** + * [descr:_ui_tag_box_MultiTagPreparingEvent.selectedItems] + */ + readonly selectedItems?: Array; + /** + * [descr:_ui_tag_box_MultiTagPreparingEvent.text] + */ + text?: string; + }; /** * [descr:_ui_tag_box_OpenedEvent] */ - export type OpenedEvent = DevExpress.events.EventInfo; + export type OpenedEvent = DevExpress.common.core.events.EventInfo; /** * [descr:_ui_tag_box_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxTagBoxOptions; /** * [descr:_ui_tag_box_SelectAllValueChangedEvent] */ export type SelectAllValueChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_ui_tag_box_SelectAllValueChangedEvent.value] */ @@ -26776,16 +27064,20 @@ declare module DevExpress.ui { /** * [descr:_ui_tag_box_SelectionChangedEvent] */ - export type SelectionChangedEvent = DevExpress.events.EventInfo & - DevExpress.ui.CollectionWidget.SelectionChangeInfo; + export type SelectionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.ui.CollectionWidget.SelectionChangeInfo< + string | number | any + >; /** * [descr:_ui_tag_box_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< - dxTagBox, - KeyboardEvent | MouseEvent | PointerEvent | Event - > & - DevExpress.ui.Editor.ValueChangedInfo; + export type ValueChangedEvent = + DevExpress.common.core.events.NativeEventInfo< + dxTagBox, + KeyboardEvent | MouseEvent | PointerEvent | Event + > & + DevExpress.ui.Editor.ValueChangedInfo; } /** * [descr:dxTagBoxOptions] @@ -26859,7 +27151,7 @@ declare module DevExpress.ui { * [descr:dxTagBoxOptions.tagTemplate] */ tagTemplate?: - | DevExpress.core.template + | template | (( itemData: any, itemElement: DevExpress.core.DxElement @@ -26877,50 +27169,52 @@ declare module DevExpress.ui { /** * [descr:_ui_text_area_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo< + export type ChangeEvent = DevExpress.common.core.events.NativeEventInfo< dxTextArea, Event >; /** * [descr:_ui_text_area_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_text_area_CopyEvent] */ - export type CopyEvent = DevExpress.events.NativeEventInfo< + export type CopyEvent = DevExpress.common.core.events.NativeEventInfo< dxTextArea, ClipboardEvent >; /** * [descr:_ui_text_area_CutEvent] */ - export type CutEvent = DevExpress.events.NativeEventInfo< + export type CutEvent = DevExpress.common.core.events.NativeEventInfo< dxTextArea, ClipboardEvent >; /** * [descr:_ui_text_area_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_text_area_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.core.events.NativeEventInfo< dxTextArea, KeyboardEvent >; /** * [descr:_ui_text_area_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.core.events.NativeEventInfo< dxTextArea, FocusEvent >; /** * [descr:_ui_text_area_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.core.events.NativeEventInfo< dxTextArea, FocusEvent >; @@ -26928,41 +27222,42 @@ declare module DevExpress.ui { * [descr:_ui_text_area_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_text_area_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.core.events.NativeEventInfo< dxTextArea, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_text_area_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.core.events.NativeEventInfo< dxTextArea, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.core.events.NativeEventInfo< dxTextArea, KeyboardEvent >; /** * [descr:_ui_text_area_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.core.events.NativeEventInfo< dxTextArea, KeyboardEvent >; /** * [descr:_ui_text_area_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; /** * [descr:_ui_text_area_PasteEvent] */ - export type PasteEvent = DevExpress.events.NativeEventInfo< + export type PasteEvent = DevExpress.common.core.events.NativeEventInfo< dxTextArea, ClipboardEvent >; @@ -26970,11 +27265,12 @@ declare module DevExpress.ui { /** * [descr:_ui_text_area_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< - dxTextArea, - KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | Event - > & - DevExpress.ui.Editor.ValueChangedInfo; + export type ValueChangedEvent = + DevExpress.common.core.events.NativeEventInfo< + dxTextArea, + KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | Event + > & + DevExpress.ui.Editor.ValueChangedInfo; } /** * [descr:dxTextAreaOptions] @@ -27014,50 +27310,52 @@ declare module DevExpress.ui { /** * [descr:_ui_text_box_ChangeEvent] */ - export type ChangeEvent = DevExpress.events.NativeEventInfo< + export type ChangeEvent = DevExpress.common.core.events.NativeEventInfo< dxTextBox, Event >; /** * [descr:_ui_text_box_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_text_box_CopyEvent] */ - export type CopyEvent = DevExpress.events.NativeEventInfo< + export type CopyEvent = DevExpress.common.core.events.NativeEventInfo< dxTextBox, ClipboardEvent >; /** * [descr:_ui_text_box_CutEvent] */ - export type CutEvent = DevExpress.events.NativeEventInfo< + export type CutEvent = DevExpress.common.core.events.NativeEventInfo< dxTextBox, ClipboardEvent >; /** * [descr:_ui_text_box_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_text_box_EnterKeyEvent] */ - export type EnterKeyEvent = DevExpress.events.NativeEventInfo< + export type EnterKeyEvent = DevExpress.common.core.events.NativeEventInfo< dxTextBox, KeyboardEvent >; /** * [descr:_ui_text_box_FocusInEvent] */ - export type FocusInEvent = DevExpress.events.NativeEventInfo< + export type FocusInEvent = DevExpress.common.core.events.NativeEventInfo< dxTextBox, FocusEvent >; /** * [descr:_ui_text_box_FocusOutEvent] */ - export type FocusOutEvent = DevExpress.events.NativeEventInfo< + export type FocusOutEvent = DevExpress.common.core.events.NativeEventInfo< dxTextBox, FocusEvent >; @@ -27065,41 +27363,42 @@ declare module DevExpress.ui { * [descr:_ui_text_box_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_text_box_InputEvent] */ - export type InputEvent = DevExpress.events.NativeEventInfo< + export type InputEvent = DevExpress.common.core.events.NativeEventInfo< dxTextBox, UIEvent & { target: HTMLInputElement } >; /** * [descr:_ui_text_box_KeyDownEvent] */ - export type KeyDownEvent = DevExpress.events.NativeEventInfo< + export type KeyDownEvent = DevExpress.common.core.events.NativeEventInfo< dxTextBox, KeyboardEvent >; - export type KeyPressEvent = DevExpress.events.NativeEventInfo< + export type KeyPressEvent = DevExpress.common.core.events.NativeEventInfo< dxTextBox, KeyboardEvent >; /** * [descr:_ui_text_box_KeyUpEvent] */ - export type KeyUpEvent = DevExpress.events.NativeEventInfo< + export type KeyUpEvent = DevExpress.common.core.events.NativeEventInfo< dxTextBox, KeyboardEvent >; /** * [descr:_ui_text_box_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; /** * [descr:_ui_text_box_PasteEvent] */ - export type PasteEvent = DevExpress.events.NativeEventInfo< + export type PasteEvent = DevExpress.common.core.events.NativeEventInfo< dxTextBox, ClipboardEvent >; @@ -27118,11 +27417,12 @@ declare module DevExpress.ui { /** * [descr:_ui_text_box_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< - dxTextBox, - KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | Event - > & - DevExpress.ui.Editor.ValueChangedInfo; + export type ValueChangedEvent = + DevExpress.common.core.events.NativeEventInfo< + dxTextBox, + KeyboardEvent | MouseEvent | PointerEvent | TouchEvent | Event + > & + DevExpress.ui.Editor.ValueChangedInfo; } /** * [descr:dxTextBoxOptions] @@ -27232,61 +27532,79 @@ declare module DevExpress.ui { * [descr:dxTextEditorOptions.onChange] */ onChange?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.core.events.NativeEventInfo ) => void; /** * [descr:dxTextEditorOptions.onCopy] */ onCopy?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.core.events.NativeEventInfo< + TComponent, + ClipboardEvent + > ) => void; /** * [descr:dxTextEditorOptions.onCut] */ onCut?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.core.events.NativeEventInfo< + TComponent, + ClipboardEvent + > ) => void; /** * [descr:dxTextEditorOptions.onEnterKey] */ onEnterKey?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.core.events.NativeEventInfo< + TComponent, + KeyboardEvent + > ) => void; /** * [descr:dxTextEditorOptions.onFocusIn] */ onFocusIn?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.core.events.NativeEventInfo ) => void; /** * [descr:dxTextEditorOptions.onFocusOut] */ onFocusOut?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.core.events.NativeEventInfo ) => void; /** * [descr:dxTextEditorOptions.onInput] */ onInput?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.core.events.NativeEventInfo ) => void; /** * [descr:dxTextEditorOptions.onKeyDown] */ onKeyDown?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.core.events.NativeEventInfo< + TComponent, + KeyboardEvent + > ) => void; /** * [descr:dxTextEditorOptions.onKeyUp] */ onKeyUp?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.core.events.NativeEventInfo< + TComponent, + KeyboardEvent + > ) => void; /** * [descr:dxTextEditorOptions.onPaste] */ onPaste?: ( - e: DevExpress.events.NativeEventInfo + e: DevExpress.common.core.events.NativeEventInfo< + TComponent, + ClipboardEvent + > ) => void; /** * [descr:dxTextEditorOptions.placeholder] @@ -27344,14 +27662,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; /** * [descr:_ui_tile_view_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -27369,40 +27687,42 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.core.events.InitializedEventInfo< + dxTileView + >; /** * [descr:_ui_tile_view_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxTileView, KeyboardEvent | MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_tile_view_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxTileView, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_tile_view_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxTileView, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * @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. */ @@ -27413,16 +27733,16 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_tile_view_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -27465,7 +27785,7 @@ declare module DevExpress.ui { /** * [descr:dxTileViewOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxTileViewOptions.direction] */ @@ -27503,40 +27823,43 @@ declare module DevExpress.ui { /** * [descr:_ui_toast_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_toast_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_toast_HiddenEvent] */ - export type HiddenEvent = DevExpress.events.EventInfo; + export type HiddenEvent = DevExpress.common.core.events.EventInfo; /** * [descr:_ui_toast_HidingEvent] */ - export type HidingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; + export type HidingEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_toast_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_toast_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxToastOptions; /** * [descr:_ui_toast_ShowingEvent] */ - export type ShowingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; + export type ShowingEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_toast_ShownEvent] */ - export type ShownEvent = DevExpress.events.EventInfo; + export type ShownEvent = DevExpress.common.core.events.EventInfo; export type ToastType = 'custom' | 'error' | 'info' | 'success' | 'warning'; } /** @@ -27547,11 +27870,11 @@ declare module DevExpress.ui { /** * [descr:dxToastOptions.animation.hide] */ - hide?: AnimationConfig; + hide?: DevExpress.common.core.animation.AnimationConfig; /** * [descr:dxToastOptions.animation.show] */ - show?: AnimationConfig; + show?: DevExpress.common.core.animation.AnimationConfig; } /** * [descr:dxToastOptions] @@ -27615,7 +27938,7 @@ declare module DevExpress.ui { /** * [descr:dxToastOptions.position] */ - position?: PositionConfig | string; + position?: DevExpress.common.core.animation.PositionConfig | string; /** * [descr:dxToastOptions.shading] */ @@ -27643,14 +27966,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; /** * [descr:_ui_toolbar_DisposingEvent] */ export type DisposingEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; export type ExplicitTypes = { Properties: Properties; ContentReadyEvent: ContentReadyEvent; @@ -27668,40 +27991,42 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.core.events.InitializedEventInfo< + dxToolbar + >; /** * [descr:_ui_toolbar_ItemClickEvent] */ export type ItemClickEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxToolbar, MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_toolbar_ItemContextMenuEvent] */ export type ItemContextMenuEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxToolbar, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_toolbar_ItemHoldEvent] */ export type ItemHoldEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxToolbar, MouseEvent | PointerEvent | TouchEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * @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. */ @@ -27712,8 +28037,8 @@ declare module DevExpress.ui { export type ItemRenderedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ItemInfo; + > = DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ItemInfo; export type LocateInMenuMode = 'always' | 'auto' | 'never'; /** * [descr:_ui_toolbar_OptionChangedEvent] @@ -27721,8 +28046,8 @@ declare module DevExpress.ui { export type OptionChangedEvent< TItem extends ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties< TItem extends ItemLike = any, TKey = any @@ -27750,7 +28075,7 @@ declare module DevExpress.ui { * [descr:dxToolbarItem.menuItemTemplate] */ menuItemTemplate?: - | DevExpress.core.template + | template | (() => string | DevExpress.core.UserDefinedElement); /** * [descr:dxToolbarItem.options] @@ -27776,7 +28101,7 @@ declare module DevExpress.ui { /** * [descr:dxToolbarOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxToolbarOptions.items] */ @@ -27789,7 +28114,7 @@ declare module DevExpress.ui { * [descr:dxToolbarOptions.menuItemTemplate] */ menuItemTemplate?: - | DevExpress.core.template + | template | (( itemData: TItem, itemIndex: number, @@ -27804,40 +28129,44 @@ declare module DevExpress.ui { /** * [descr:_ui_tooltip_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_tooltip_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_tooltip_HiddenEvent] */ - export type HiddenEvent = DevExpress.events.EventInfo; + export type HiddenEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_tooltip_HidingEvent] */ - export type HidingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; + export type HidingEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_tooltip_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_tooltip_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxTooltipOptions; /** * [descr:_ui_tooltip_ShowingEvent] */ - export type ShowingEvent = DevExpress.events.Cancelable & - DevExpress.events.EventInfo; + export type ShowingEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_tooltip_ShownEvent] */ - export type ShownEvent = DevExpress.events.EventInfo; + export type ShownEvent = DevExpress.common.core.events.EventInfo; } /** * [descr:dxTooltipOptions] @@ -28010,7 +28339,7 @@ declare module DevExpress.ui { ): DevExpress.core.DxElement | undefined; getCombinedFilter(): any; getCombinedFilter(returnDataField: boolean): any; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.data.DataSource; getKeyByRowIndex(rowIndex: number): TKey | undefined; getRowElement( rowIndex: number @@ -28056,7 +28385,7 @@ declare module DevExpress.ui { export type AdaptiveDetailRowPreparingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.AdaptiveDetailRowPreparingInfo; /** * [descr:_ui_tree_list_CellClickEvent] @@ -28064,7 +28393,7 @@ declare module DevExpress.ui { export type CellClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxTreeList, PointerEvent | MouseEvent > & @@ -28075,7 +28404,7 @@ declare module DevExpress.ui { export type CellDblClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxTreeList, PointerEvent | MouseEvent > & @@ -28086,7 +28415,7 @@ declare module DevExpress.ui { export type CellHoverChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & CellInfo & { /** * [descr:_ui_tree_list_CellHoverChangedEvent.eventType] @@ -28149,7 +28478,7 @@ declare module DevExpress.ui { export type CellPreparedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & CellInfo & { /** * [descr:_ui_tree_list_CellPreparedEvent.isSelected] @@ -28183,7 +28512,7 @@ declare module DevExpress.ui { export type ColumnButtonClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxTreeList, PointerEvent | MouseEvent > & { @@ -28242,14 +28571,14 @@ declare module DevExpress.ui { export type ContentReadyEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; /** * [descr:_ui_tree_list_ContextMenuPreparingEvent] */ export type ContextMenuPreparingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.core.events.EventInfo> & { /** * [descr:_ui_tree_list_ContextMenuPreparingEvent.items] */ @@ -28285,7 +28614,7 @@ declare module DevExpress.ui { export type DataErrorOccurredEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.DataErrorOccurredInfo; /** * [descr:_ui_tree_list_DisposingEvent] @@ -28293,7 +28622,7 @@ declare module DevExpress.ui { export type DisposingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo>; /** * @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. */ @@ -28308,7 +28637,7 @@ declare module DevExpress.ui { export type EditCanceledEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.DataChangeInfo; /** * [descr:_ui_tree_list_EditCancelingEvent] @@ -28316,8 +28645,8 @@ declare module DevExpress.ui { export type EditCancelingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.DataChangeInfo; /** * [descr:dxTreeListEditing] @@ -28362,8 +28691,8 @@ declare module DevExpress.ui { export type EditingStartEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & { + > = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo> & { /** * [descr:_ui_tree_list_EditingStartEvent.data] */ @@ -28392,7 +28721,7 @@ declare module DevExpress.ui { export type EditorPreparedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.core.events.EventInfo> & { /** * [descr:_ui_tree_list_EditorPreparedEvent.parentType] */ @@ -28444,8 +28773,8 @@ declare module DevExpress.ui { export type EditorPreparingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & { + > = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo> & { /** * [descr:_ui_tree_list_EditorPreparingEvent.parentType] */ @@ -28569,7 +28898,7 @@ declare module DevExpress.ui { export type FocusedCellChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.core.events.EventInfo> & { /** * [descr:_ui_tree_list_FocusedCellChangedEvent.cellElement] */ @@ -28597,8 +28926,8 @@ declare module DevExpress.ui { export type FocusedCellChangingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.NativeEventInfo< dxTreeList, KeyboardEvent | PointerEvent | MouseEvent | TouchEvent > & { @@ -28641,7 +28970,7 @@ declare module DevExpress.ui { export type FocusedRowChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.core.events.EventInfo> & { /** * [descr:_ui_tree_list_FocusedRowChangedEvent.rowElement] */ @@ -28661,8 +28990,8 @@ declare module DevExpress.ui { export type FocusedRowChangingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.NativeEventInfo< dxTreeList, KeyboardEvent | PointerEvent | MouseEvent | TouchEvent > & { @@ -28689,14 +29018,16 @@ declare module DevExpress.ui { export type InitializedEvent< TRowData = any, TKey = any - > = DevExpress.events.InitializedEventInfo>; + > = DevExpress.common.core.events.InitializedEventInfo< + dxTreeList + >; /** * [descr:_ui_tree_list_InitNewRowEvent] */ export type InitNewRowEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.NewRowInfo; /** * [descr:_ui_tree_list_KeyDownEvent] @@ -28704,7 +29035,7 @@ declare module DevExpress.ui { export type KeyDownEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxTreeList, KeyboardEvent > & @@ -28748,7 +29079,7 @@ declare module DevExpress.ui { export type NodesInitializedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.core.events.EventInfo> & { /** * [descr:_ui_tree_list_NodesInitializedEvent.root] */ @@ -28760,8 +29091,8 @@ declare module DevExpress.ui { export type OptionChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ChangedOptionInfo; /** * @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. */ @@ -28868,7 +29199,7 @@ declare module DevExpress.ui { export type RowClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxTreeList, PointerEvent | MouseEvent > & { @@ -28931,7 +29262,7 @@ declare module DevExpress.ui { export type RowCollapsedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.RowKeyInfo; /** * [descr:_ui_tree_list_RowCollapsingEvent] @@ -28939,8 +29270,8 @@ declare module DevExpress.ui { export type RowCollapsingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.RowKeyInfo; /** * [descr:_ui_tree_list_RowDblClickEvent] @@ -28948,7 +29279,7 @@ declare module DevExpress.ui { export type RowDblClickEvent< TRowData = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxTreeList, PointerEvent | MouseEvent > & { @@ -29002,21 +29333,21 @@ declare module DevExpress.ui { export type RowDraggingChangeEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & + > = DevExpress.common.core.events.Cancelable & DevExpress.common.ReducedNativeEventInfo> & DevExpress.common.grids.RowDraggingEventInfo & DevExpress.common.grids.DragDropInfo; export type RowDraggingEndEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & + > = DevExpress.common.core.events.Cancelable & DevExpress.common.ReducedNativeEventInfo> & DevExpress.common.grids.RowDraggingEventInfo & DevExpress.common.grids.DragDropInfo; export type RowDraggingMoveEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & + > = DevExpress.common.core.events.Cancelable & DevExpress.common.ReducedNativeEventInfo> & DevExpress.common.grids.RowDraggingEventInfo & DevExpress.common.grids.DragDropInfo; @@ -29034,7 +29365,7 @@ declare module DevExpress.ui { export type RowDraggingStartEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & + > = DevExpress.common.core.events.Cancelable & DevExpress.common.ReducedNativeEventInfo> & DevExpress.common.grids.DragStartEventInfo; /** @@ -29043,7 +29374,7 @@ declare module DevExpress.ui { export type RowExpandedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.RowKeyInfo; /** * [descr:_ui_tree_list_RowExpandingEvent] @@ -29051,8 +29382,8 @@ declare module DevExpress.ui { export type RowExpandingEvent< TRowData = any, TKey = any - > = DevExpress.events.Cancelable & - DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.RowKeyInfo; /** * [descr:_ui_tree_list_RowInsertedEvent] @@ -29060,7 +29391,7 @@ declare module DevExpress.ui { export type RowInsertedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.RowInsertedInfo; /** * [descr:_ui_tree_list_RowInsertingEvent] @@ -29068,7 +29399,7 @@ declare module DevExpress.ui { export type RowInsertingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.RowInsertingInfo; /** * [descr:_ui_tree_list_RowPreparedEvent] @@ -29076,7 +29407,7 @@ declare module DevExpress.ui { export type RowPreparedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & { + > = DevExpress.common.core.events.EventInfo> & { /** * [descr:_ui_tree_list_RowPreparedEvent.data] */ @@ -29132,7 +29463,7 @@ declare module DevExpress.ui { export type RowRemovedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.RowRemovedInfo; /** * [descr:_ui_tree_list_RowRemovingEvent] @@ -29140,7 +29471,7 @@ declare module DevExpress.ui { export type RowRemovingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.RowRemovingInfo; /** * [descr:_ui_tree_list_RowUpdatedEvent] @@ -29148,7 +29479,7 @@ declare module DevExpress.ui { export type RowUpdatedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.RowUpdatedInfo; /** * [descr:_ui_tree_list_RowUpdatingEvent] @@ -29156,7 +29487,7 @@ declare module DevExpress.ui { export type RowUpdatingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.RowUpdatingInfo; /** * [descr:_ui_tree_list_RowValidatingEvent] @@ -29164,7 +29495,7 @@ declare module DevExpress.ui { export type RowValidatingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.RowValidatingInfo; /** * [descr:_ui_tree_list_SavedEvent] @@ -29172,7 +29503,7 @@ declare module DevExpress.ui { export type SavedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.DataChangeInfo; /** * [descr:_ui_tree_list_SavingEvent] @@ -29180,7 +29511,7 @@ declare module DevExpress.ui { export type SavingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.SavingInfo; export type Scrollable = Omit< dxScrollable, @@ -29216,7 +29547,7 @@ declare module DevExpress.ui { export type SelectionChangedEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.SelectionChangedInfo; /** * [descr:_ui_tree_list_ToolbarPreparingEvent] @@ -29224,7 +29555,7 @@ declare module DevExpress.ui { export type ToolbarPreparingEvent< TRowData = any, TKey = any - > = DevExpress.events.EventInfo> & + > = DevExpress.common.core.events.EventInfo> & DevExpress.common.grids.ToolbarPreparingInfo; export type TreeListCommandColumnType = 'adaptive' | 'buttons' | 'drag'; export type TreeListFilterMode = @@ -29263,7 +29594,7 @@ declare module DevExpress.ui { * [descr:dxTreeListColumn.cellTemplate] */ cellTemplate?: - | DevExpress.core.template + | template | (( cellElement: DevExpress.core.DxElement, cellInfo: DevExpress.ui.dxTreeList.ColumnCellTemplateData< @@ -29281,7 +29612,7 @@ declare module DevExpress.ui { * [descr:dxTreeListColumn.editCellTemplate] */ editCellTemplate?: - | DevExpress.core.template + | template | (( cellElement: DevExpress.core.DxElement, cellInfo: DevExpress.ui.dxTreeList.ColumnEditCellTemplateData< @@ -29293,7 +29624,7 @@ declare module DevExpress.ui { * [descr:dxTreeListColumn.headerCellTemplate] */ headerCellTemplate?: - | DevExpress.core.template + | template | (( columnHeader: DevExpress.core.DxElement, headerInfo: DevExpress.ui.dxTreeList.ColumnHeaderCellTemplateData< @@ -29326,7 +29657,7 @@ declare module DevExpress.ui { * [descr:dxTreeListColumnButton.template] */ template?: - | DevExpress.core.template + | template | (( cellElement: DevExpress.core.DxElement, cellInfo: DevExpress.ui.dxTreeList.ColumnButtonTemplateData< @@ -29686,15 +30017,13 @@ declare module DevExpress.ui { /** * [descr:_ui_tree_view_ContentReadyEvent] */ - export type ContentReadyEvent = DevExpress.events.EventInfo< - dxTreeView - >; + export type ContentReadyEvent = + DevExpress.common.core.events.EventInfo>; /** * [descr:_ui_tree_view_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo< - dxTreeView - >; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo>; export type ExplicitTypes = { Properties: Properties; Node: Node; @@ -29716,20 +30045,21 @@ declare module DevExpress.ui { * [descr:_ui_tree_view_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo>; + DevExpress.common.core.events.InitializedEventInfo>; /** * [descr:_ui_tree_view_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo< - dxTreeView, - KeyboardEvent | MouseEvent | PointerEvent - > & - ItemInfo; + export type ItemClickEvent = + DevExpress.common.core.events.NativeEventInfo< + dxTreeView, + KeyboardEvent | MouseEvent | PointerEvent + > & + ItemInfo; /** * [descr:_ui_tree_view_ItemCollapsedEvent] */ export type ItemCollapsedEvent = - DevExpress.events.NativeEventInfo< + DevExpress.common.core.events.NativeEventInfo< dxTreeView, MouseEvent | PointerEvent > & @@ -29738,7 +30068,7 @@ declare module DevExpress.ui { * [descr:_ui_tree_view_ItemContextMenuEvent] */ export type ItemContextMenuEvent = - DevExpress.events.NativeEventInfo< + DevExpress.common.core.events.NativeEventInfo< dxTreeView, MouseEvent | PointerEvent | TouchEvent > & @@ -29747,7 +30077,7 @@ declare module DevExpress.ui { * [descr:_ui_tree_view_ItemExpandedEvent] */ export type ItemExpandedEvent = - DevExpress.events.NativeEventInfo< + DevExpress.common.core.events.NativeEventInfo< dxTreeView, MouseEvent | PointerEvent > & @@ -29755,11 +30085,12 @@ declare module DevExpress.ui { /** * [descr:_ui_tree_view_ItemHoldEvent] */ - export type ItemHoldEvent = DevExpress.events.NativeEventInfo< - dxTreeView, - MouseEvent | PointerEvent | TouchEvent - > & - ItemInfo; + export type ItemHoldEvent = + DevExpress.common.core.events.NativeEventInfo< + dxTreeView, + MouseEvent | PointerEvent | TouchEvent + > & + ItemInfo; /** * [descr:_ui_tree_view_ItemInfo] * @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. @@ -29785,15 +30116,15 @@ declare module DevExpress.ui { /** * [descr:_ui_tree_view_ItemRenderedEvent] */ - export type ItemRenderedEvent = DevExpress.events.EventInfo< - dxTreeView - > & - ItemInfo; + export type ItemRenderedEvent = + DevExpress.common.core.events.EventInfo> & + ItemInfo; /** * [descr:_ui_tree_view_ItemSelectionChangedEvent] */ export type ItemSelectionChangedEvent = - DevExpress.events.EventInfo> & ItemInfo; + DevExpress.common.core.events.EventInfo> & + ItemInfo; /** * [descr:dxTreeViewNode] */ @@ -29801,10 +30132,9 @@ declare module DevExpress.ui { /** * [descr:_ui_tree_view_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo< - dxTreeView - > & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo> & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxTreeViewOptions; export type Scrollable = Omit< dxScrollable, @@ -29820,7 +30150,7 @@ declare module DevExpress.ui { * [descr:_ui_tree_view_SelectAllValueChangedEvent] */ export type SelectAllValueChangedEvent = - DevExpress.events.EventInfo> & { + DevExpress.common.core.events.EventInfo> & { /** * [descr:_ui_tree_view_SelectAllValueChangedEvent.value] */ @@ -29829,9 +30159,8 @@ declare module DevExpress.ui { /** * [descr:_ui_tree_view_SelectionChangedEvent] */ - export type SelectionChangedEvent = DevExpress.events.EventInfo< - dxTreeView - >; + export type SelectionChangedEvent = + DevExpress.common.core.events.EventInfo>; export type TreeViewCheckBoxMode = 'none' | 'normal' | 'selectAll'; export type TreeViewExpandEvent = 'dblclick' | 'click'; } @@ -29937,7 +30266,7 @@ declare module DevExpress.ui { /** * [descr:dxTreeViewOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike< + dataSource?: DevExpress.data.DataSourceLike< DevExpress.ui.dxTreeView.Item, TKey > | null; @@ -30085,18 +30414,19 @@ declare module DevExpress.ui { /** * [descr:_ui_validation_group_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_ui_validation_group_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_ui_validation_group_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxValidationGroupOptions; export type ValidationResult = dxValidationGroupResult; } @@ -30189,14 +30519,18 @@ declare module DevExpress.ui { export type ContentReadyEvent< TItem extends DevExpress.ui.CollectionWidget.ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo< + dxValidationSummary + >; /** * [descr:_ui_validation_summary_DisposingEvent] */ export type DisposingEvent< TItem extends DevExpress.ui.CollectionWidget.ItemLike = any, TKey = any - > = DevExpress.events.EventInfo>; + > = DevExpress.common.core.events.EventInfo< + dxValidationSummary + >; export type ExplicitTypes< TItem extends DevExpress.ui.CollectionWidget.ItemLike, TKey @@ -30214,7 +30548,7 @@ declare module DevExpress.ui { export type InitializedEvent< TItem extends DevExpress.ui.CollectionWidget.ItemLike = any, TKey = any - > = DevExpress.events.InitializedEventInfo< + > = DevExpress.common.core.events.InitializedEventInfo< dxValidationSummary >; /** @@ -30223,19 +30557,21 @@ declare module DevExpress.ui { export type ItemClickEvent< TItem extends DevExpress.ui.CollectionWidget.ItemLike = any, TKey = any - > = DevExpress.events.NativeEventInfo< + > = DevExpress.common.core.events.NativeEventInfo< dxValidationSummary, MouseEvent | PointerEvent > & - DevExpress.events.ItemInfo; + DevExpress.common.core.events.ItemInfo; /** * [descr:_ui_validation_summary_OptionChangedEvent] */ export type OptionChangedEvent< TItem extends DevExpress.ui.CollectionWidget.ItemLike = any, TKey = any - > = DevExpress.events.EventInfo> & - DevExpress.events.ChangedOptionInfo; + > = DevExpress.common.core.events.EventInfo< + dxValidationSummary + > & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties< TItem extends DevExpress.ui.CollectionWidget.ItemLike = any, TKey = any @@ -30276,11 +30612,13 @@ declare module DevExpress.ui { validate(): DevExpress.ui.dxValidator.ValidationResult; } module dxValidator { - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; export type InitializedEvent = - DevExpress.events.InitializedEventInfo; - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.core.events.InitializedEventInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxValidatorOptions; export type ValidatedEvent = { name?: string; @@ -30440,7 +30778,7 @@ declare module DevExpress.ui { * [descr:EditorOptions.onValueChanged] */ onValueChanged?: ( - e: DevExpress.events.NativeEventInfo & + e: DevExpress.common.core.events.NativeEventInfo & DevExpress.ui.Editor.ValueChangedInfo ) => void; /** @@ -30485,18 +30823,6 @@ declare module DevExpress.ui { * [descr:dxFilterBuilderField] */ export type Field = dxFilterBuilderField; - /** - * [descr:Format] - */ - export type Format = - | FormatObject - | DevExpress.common.Format - | string - | ((value: number | Date) => string) - | ((value: Date) => string) - | ((value: number) => string) - | ExternalFormat - | undefined; /** * [descr:ui.hideToasts()] */ @@ -30672,7 +30998,7 @@ declare module DevExpress.ui { * [descr:ui.template] * @deprecated [depNote:ui.template] */ - export type Template = DevExpress.core.template; + export type Template = template; /** * [descr:ui.themes] */ @@ -30718,7 +31044,7 @@ declare module DevExpress.ui { * @deprecated [depNote:format] * @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 type format = Format; + export type format = DevExpress.common.core.localization.Format; } /** * [descr:WidgetOptions] @@ -30753,7 +31079,9 @@ declare module DevExpress.ui { /** * [descr:WidgetOptions.onContentReady] */ - onContentReady?: (e: DevExpress.events.EventInfo) => void; + onContentReady?: ( + e: DevExpress.common.core.events.EventInfo + ) => void; /** * [descr:WidgetOptions.tabIndex] */ @@ -31211,28 +31539,6 @@ declare module DevExpress.ui.dxTreeList { declare module DevExpress.ui.dxTreeView { export type Item = dxTreeViewItem; } -declare module DevExpress.utils { - /** - * [descr:utils.cancelAnimationFrame(requestID)] - */ - export function cancelAnimationFrame(requestID: number): void; - /** - * [descr:utils.getTimeZones(date)] - */ - export function getTimeZones(date?: Date): Array; - /** - * [descr:utils.initMobileViewport(options)] - */ - export function initMobileViewport(options: { - allowZoom?: boolean; - allowPan?: boolean; - allowSelection?: boolean; - }): void; - /** - * [descr:utils.requestAnimationFrame(callback)] - */ - export function requestAnimationFrame(callback: Function): number; -} declare module DevExpress.viz { /** * [descr:BarGaugeBarInfo] @@ -31276,7 +31582,7 @@ declare module DevExpress.viz { * [descr:BaseChart.getAllSeries()] */ getAllSeries(): Array; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.data.DataSource; /** * [descr:BaseChart.getSeriesByName(seriesName)] */ @@ -31373,7 +31679,7 @@ declare module DevExpress.viz { * [descr:BaseChartOptions.legend.markerTemplate] */ markerTemplate?: - | DevExpress.core.template + | template | (( legendItem: DevExpress.common.charts.LegendItem, element: SVGGElement @@ -31424,7 +31730,7 @@ declare module DevExpress.viz { /** * [descr:BaseChartOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:BaseChartOptions.legend] */ @@ -31432,13 +31738,13 @@ declare module DevExpress.viz { /** * [descr:BaseChartOptions.onDone] */ - onDone?: (e: DevExpress.events.EventInfo) => void; + onDone?: (e: DevExpress.common.core.events.EventInfo) => void; /** * [descr:BaseChartOptions.onPointClick] */ onPointClick?: | (( - e: DevExpress.events.NativeEventInfo< + e: DevExpress.common.core.events.NativeEventInfo< TComponent, MouseEvent | PointerEvent > & @@ -31449,28 +31755,28 @@ declare module DevExpress.viz { * [descr:BaseChartOptions.onPointHoverChanged] */ onPointHoverChanged?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.core.events.EventInfo & DevExpress.viz.BaseChart.PointInteractionInfo ) => void; /** * [descr:BaseChartOptions.onPointSelectionChanged] */ onPointSelectionChanged?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.core.events.EventInfo & DevExpress.viz.BaseChart.PointInteractionInfo ) => void; /** * [descr:BaseChartOptions.onTooltipHidden] */ onTooltipHidden?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.core.events.EventInfo & DevExpress.viz.BaseChart.TooltipInfo ) => void; /** * [descr:BaseChartOptions.onTooltipShown] */ onTooltipShown?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.core.events.EventInfo & DevExpress.viz.BaseChart.TooltipInfo ) => void; /** @@ -31502,12 +31808,12 @@ declare module DevExpress.viz { /** * [descr:BaseChartOptions.tooltip.argumentFormat] */ - argumentFormat?: DevExpress.ui.Format | undefined; + argumentFormat?: DevExpress.common.core.localization.Format | undefined; /** * [descr:BaseChartOptions.tooltip.contentTemplate] */ contentTemplate?: - | DevExpress.core.template + | template | (( pointInfo: any, element: DevExpress.core.DxElement @@ -31621,14 +31927,14 @@ declare module DevExpress.viz { * [descr:BaseGaugeOptions.onTooltipHidden] */ onTooltipHidden?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.core.events.EventInfo & DevExpress.viz.BaseGauge.TooltipInfo ) => void; /** * [descr:BaseGaugeOptions.onTooltipShown] */ onTooltipShown?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.core.events.EventInfo & DevExpress.viz.BaseGauge.TooltipInfo ) => void; /** @@ -31802,7 +32108,7 @@ declare module DevExpress.viz { /** * [descr:BaseGaugeOptions.scale.label.format] */ - format?: DevExpress.ui.Format | undefined; + format?: DevExpress.common.core.localization.Format | undefined; /** * [descr:BaseGaugeOptions.scale.label.overlappingBehavior] */ @@ -31825,7 +32131,7 @@ declare module DevExpress.viz { * [descr:BaseGaugeOptions.tooltip.contentTemplate] */ contentTemplate?: - | DevExpress.core.template + | template | (( scaleValue: { value?: number; valueText?: string }, element: DevExpress.core.DxElement @@ -32063,11 +32369,15 @@ declare module DevExpress.viz { /** * [descr:BaseSparklineOptions.onTooltipHidden] */ - onTooltipHidden?: (e: DevExpress.events.EventInfo) => void; + onTooltipHidden?: ( + e: DevExpress.common.core.events.EventInfo + ) => void; /** * [descr:BaseSparklineOptions.onTooltipShown] */ - onTooltipShown?: (e: DevExpress.events.EventInfo) => void; + onTooltipShown?: ( + e: DevExpress.common.core.events.EventInfo + ) => void; /** * [descr:BaseSparklineOptions.redrawOnResize] */ @@ -32090,7 +32400,7 @@ declare module DevExpress.viz { * [descr:BaseSparklineOptions.tooltip.contentTemplate] */ contentTemplate?: - | DevExpress.core.template + | template | (( pointsInfo: any, element: DevExpress.core.DxElement @@ -32119,7 +32429,7 @@ declare module DevExpress.viz { * @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. */ static defaultOptions( - rule: DevExpress.core.DefaultOptionsRule + rule: DefaultOptionsRule ): void; /** * [descr:BaseWidget.exportTo(fileName, format)] @@ -32169,28 +32479,29 @@ declare module DevExpress.viz { * [descr:FileSavingEventInfo] * @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 type FileSavingEventInfo = DevExpress.events.Cancelable & { - /** - * [descr:FileSavingEventInfo.component] - */ - readonly component: T; - /** - * [descr:FileSavingEventInfo.element] - */ - readonly element: DevExpress.core.DxElement; - /** - * [descr:FileSavingEventInfo.fileName] - */ - readonly fileName: string; - /** - * [descr:FileSavingEventInfo.format] - */ - readonly format: string; - /** - * [descr:FileSavingEventInfo.data] - */ - readonly data: Blob; - }; + export type FileSavingEventInfo = + DevExpress.common.core.events.Cancelable & { + /** + * [descr:FileSavingEventInfo.component] + */ + readonly component: T; + /** + * [descr:FileSavingEventInfo.element] + */ + readonly element: DevExpress.core.DxElement; + /** + * [descr:FileSavingEventInfo.fileName] + */ + readonly fileName: string; + /** + * [descr:FileSavingEventInfo.format] + */ + readonly format: string; + /** + * [descr:FileSavingEventInfo.data] + */ + readonly data: Blob; + }; /** * [descr:IncidentInfo] * @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. @@ -32478,16 +32789,18 @@ declare module DevExpress.viz { /** * [descr:BaseWidgetOptions.onDrawn] */ - onDrawn?: (e: DevExpress.events.EventInfo) => void; + onDrawn?: (e: DevExpress.common.core.events.EventInfo) => void; /** * [descr:BaseWidgetOptions.onExported] */ - onExported?: (e: DevExpress.events.EventInfo) => void; + onExported?: ( + e: DevExpress.common.core.events.EventInfo + ) => void; /** * [descr:BaseWidgetOptions.onExporting] */ onExporting?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.core.events.EventInfo & DevExpress.viz.BaseWidget.ExportInfo ) => void; /** @@ -32500,7 +32813,7 @@ declare module DevExpress.viz { * [descr:BaseWidgetOptions.onIncidentOccurred] */ onIncidentOccurred?: ( - e: DevExpress.events.EventInfo & + e: DevExpress.common.core.events.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo ) => void; /** @@ -32691,7 +33004,7 @@ declare module DevExpress.viz { /** * [descr:BaseWidgetOptions.tooltip.format] */ - format?: DevExpress.ui.Format | undefined; + format?: DevExpress.common.core.localization.Format | undefined; /** * [descr:BaseWidgetOptions.tooltip.opacity] */ @@ -32942,7 +33255,7 @@ declare module DevExpress.viz { /** * [descr:CommonIndicator.text.format] */ - format?: DevExpress.ui.Format | undefined; + format?: DevExpress.common.core.localization.Format | undefined; /** * [descr:CommonIndicator.text.indent] */ @@ -32994,20 +33307,24 @@ declare module DevExpress.viz { /** * [descr:_viz_bar_gauge_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_bar_gauge_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_bar_gauge_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_bar_gauge_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & - DevExpress.viz.BaseWidget.ExportInfo; + export type ExportingEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_bar_gauge_FileSavingEvent] */ @@ -33017,13 +33334,13 @@ declare module DevExpress.viz { * [descr:_viz_bar_gauge_IncidentOccurredEvent] */ export type IncidentOccurredEvent = - DevExpress.events.EventInfo & + DevExpress.common.core.events.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_bar_gauge_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:dxBarGaugeLegend] */ @@ -33049,12 +33366,12 @@ declare module DevExpress.viz { /** * [descr:dxBarGaugeOptions.legend.itemTextFormat] */ - itemTextFormat?: DevExpress.ui.Format | undefined; + itemTextFormat?: DevExpress.common.core.localization.Format | undefined; /** * [descr:dxBarGaugeOptions.legend.markerTemplate] */ markerTemplate?: - | DevExpress.core.template + | template | (( legendItem: LegendItem, element: SVGGElement @@ -33077,8 +33394,9 @@ declare module DevExpress.viz { /** * [descr:_viz_bar_gauge_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxBarGaugeOptions; /** * [descr:dxBarGaugeTooltip] @@ -33088,7 +33406,7 @@ declare module DevExpress.viz { * [descr:dxBarGaugeOptions.tooltip.contentTemplate] */ contentTemplate?: - | DevExpress.core.template + | template | (( scaleValue: { value?: number; valueText?: string; index?: number }, element: DevExpress.core.DxElement @@ -33112,8 +33430,8 @@ declare module DevExpress.viz { /** * [descr:_viz_bar_gauge_TooltipHiddenEvent] */ - export type TooltipHiddenEvent = DevExpress.events.EventInfo & - TooltipInfo; + export type TooltipHiddenEvent = + DevExpress.common.core.events.EventInfo & TooltipInfo; /** * [descr:_viz_bar_gauge_TooltipInfo] * @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. @@ -33127,8 +33445,8 @@ declare module DevExpress.viz { /** * [descr:_viz_bar_gauge_TooltipShownEvent] */ - export type TooltipShownEvent = DevExpress.events.EventInfo & - TooltipInfo; + export type TooltipShownEvent = + DevExpress.common.core.events.EventInfo & TooltipInfo; } /** * [descr:dxBarGaugeOptions] @@ -33173,7 +33491,7 @@ declare module DevExpress.viz { * [descr:dxBarGaugeOptions.centerTemplate] */ centerTemplate?: - | DevExpress.core.template + | template | (( component: dxBarGauge, element: SVGGElement @@ -33205,7 +33523,7 @@ declare module DevExpress.viz { /** * [descr:dxBarGaugeOptions.label.format] */ - format?: DevExpress.ui.Format | undefined; + format?: DevExpress.common.core.localization.Format | undefined; /** * [descr:dxBarGaugeOptions.label.indent] */ @@ -33268,20 +33586,23 @@ declare module DevExpress.viz { /** * [descr:_viz_bullet_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_bullet_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.core.events.EventInfo; /** * [descr:_viz_bullet_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_bullet_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & - DevExpress.viz.BaseWidget.ExportInfo; + export type ExportingEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_bullet_FileSavingEvent] */ @@ -33290,27 +33611,31 @@ declare module DevExpress.viz { /** * [descr:_viz_bullet_IncidentOccurredEvent] */ - export type IncidentOccurredEvent = DevExpress.events.EventInfo & - DevExpress.viz.BaseWidget.IncidentInfo; + export type IncidentOccurredEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_bullet_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_viz_bullet_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxBulletOptions; /** * [descr:_viz_bullet_TooltipHiddenEvent] */ - export type TooltipHiddenEvent = DevExpress.events.EventInfo; + export type TooltipHiddenEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_bullet_TooltipShownEvent] */ - export type TooltipShownEvent = DevExpress.events.EventInfo; + export type TooltipShownEvent = + DevExpress.common.core.events.EventInfo; } /** * [descr:dxBulletOptions] @@ -33527,15 +33852,16 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_ArgumentAxisClickEvent] */ - export type ArgumentAxisClickEvent = DevExpress.events.NativeEventInfo< - dxChart, - MouseEvent | PointerEvent - > & { - /** - * [descr:_viz_chart_ArgumentAxisClickEvent.argument] - */ - readonly argument: Date | number | string; - }; + export type ArgumentAxisClickEvent = + DevExpress.common.core.events.NativeEventInfo< + dxChart, + MouseEvent | PointerEvent + > & { + /** + * [descr:_viz_chart_ArgumentAxisClickEvent.argument] + */ + readonly argument: Date | number | string; + }; /** * [descr:dxChartArgumentAxisConstantLines] */ @@ -33621,7 +33947,7 @@ declare module DevExpress.viz { /** * [descr:dxChartOptions.argumentAxis.label.format] */ - format?: DevExpress.ui.Format | undefined; + format?: DevExpress.common.core.localization.Format | undefined; }; /** * [descr:dxChartArgumentAxisStrips] @@ -33928,7 +34254,7 @@ declare module DevExpress.viz { * [descr:dxChartOptions.commonAxisSettings.label.template] */ template?: - | DevExpress.core.template + | template | (( data: object, element: SVGGElement @@ -34194,15 +34520,16 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_chart_DoneEvent] */ - export type DoneEvent = DevExpress.events.EventInfo; + export type DoneEvent = DevExpress.common.core.events.EventInfo; /** * [descr:_viz_chart_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.core.events.EventInfo; /** * @deprecated Use CommonSeriesSettings 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. @@ -34212,12 +34539,14 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_chart_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & - DevExpress.viz.BaseWidget.ExportInfo; + export type ExportingEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_chart_FileSavingEvent] */ @@ -34231,13 +34560,14 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_IncidentOccurredEvent] */ - export type IncidentOccurredEvent = DevExpress.events.EventInfo & - DevExpress.viz.BaseWidget.IncidentInfo; + export type IncidentOccurredEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_chart_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:dxChartLegend] */ @@ -34270,8 +34600,11 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_LegendClickEvent] */ - export type LegendClickEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo & { + export type LegendClickEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.NativeEventInfo< + dxChart, + MouseEvent | PointerEvent + > & { /** * [descr:_viz_chart_LegendClickEvent.target] */ @@ -34280,8 +34613,9 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; /** * [descr:dxChartPanes] */ @@ -34298,38 +34632,43 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_PointClickEvent] */ - export type PointClickEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo & + export type PointClickEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.NativeEventInfo< + dxChart, + MouseEvent | PointerEvent + > & DevExpress.viz.BaseChart.PointInteractionInfo; /** * [descr:_viz_chart_PointHoverChangedEvent] */ - export type PointHoverChangedEvent = DevExpress.events.EventInfo & - DevExpress.viz.BaseChart.PointInteractionInfo; + export type PointHoverChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.viz.BaseChart.PointInteractionInfo; /** * [descr:_viz_chart_PointSelectionChangedEvent] */ export type PointSelectionChangedEvent = - DevExpress.events.EventInfo & + DevExpress.common.core.events.EventInfo & DevExpress.viz.BaseChart.PointInteractionInfo; export type Properties = dxChartOptions; /** * [descr:_viz_chart_SeriesClickEvent] */ - export type SeriesClickEvent = DevExpress.events.NativeEventInfo< - dxChart, - MouseEvent | PointerEvent - > & { - /** - * [descr:_viz_chart_SeriesClickEvent.target] - */ - readonly target: chartSeriesObject; - }; + export type SeriesClickEvent = + DevExpress.common.core.events.NativeEventInfo< + dxChart, + MouseEvent | PointerEvent + > & { + /** + * [descr:_viz_chart_SeriesClickEvent.target] + */ + readonly target: chartSeriesObject; + }; /** * [descr:_viz_chart_SeriesHoverChangedEvent] */ - export type SeriesHoverChangedEvent = DevExpress.events.EventInfo & - SeriesInteractionInfo; + export type SeriesHoverChangedEvent = + DevExpress.common.core.events.EventInfo & SeriesInteractionInfo; /** * [descr:_viz_chart_SeriesInteractionInfo] * @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. @@ -34344,7 +34683,7 @@ declare module DevExpress.viz { * [descr:_viz_chart_SeriesSelectionChangedEvent] */ export type SeriesSelectionChangedEvent = - DevExpress.events.EventInfo & SeriesInteractionInfo; + DevExpress.common.core.events.EventInfo & SeriesInteractionInfo; /** * [descr:dxChartTooltip] * @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. @@ -34358,13 +34697,15 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_TooltipHiddenEvent] */ - export type TooltipHiddenEvent = DevExpress.events.EventInfo & - DevExpress.viz.BaseChart.TooltipInfo; + export type TooltipHiddenEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.viz.BaseChart.TooltipInfo; /** * [descr:_viz_chart_TooltipShownEvent] */ - export type TooltipShownEvent = DevExpress.events.EventInfo & - DevExpress.viz.BaseChart.TooltipInfo; + export type TooltipShownEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.viz.BaseChart.TooltipInfo; /** * [descr:dxChartValueAxis] */ @@ -34579,7 +34920,7 @@ declare module DevExpress.viz { /** * [descr:dxChartOptions.valueAxis.label.format] */ - format?: DevExpress.ui.Format | undefined; + format?: DevExpress.common.core.localization.Format | undefined; }; /** * [descr:dxChartValueAxisStrips] @@ -34623,8 +34964,11 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_ZoomEndEvent] */ - export type ZoomEndEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo & { + export type ZoomEndEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.NativeEventInfo< + dxChart, + MouseEvent | TouchEvent + > & { /** * [descr:_viz_chart_ZoomEndEvent.rangeStart] */ @@ -34661,8 +35005,11 @@ declare module DevExpress.viz { /** * [descr:_viz_chart_ZoomStartEvent] */ - export type ZoomStartEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo & { + export type ZoomStartEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.NativeEventInfo< + dxChart, + MouseEvent | TouchEvent + > & { /** * [descr:_viz_chart_ZoomStartEvent.axis] */ @@ -34708,7 +35055,7 @@ declare module DevExpress.viz { * [descr:dxChartCommonAnnotationConfig.template] */ template?: - | DevExpress.core.template + | template | (( annotation: dxChartAnnotationConfig | any, element: SVGGElement @@ -34718,7 +35065,7 @@ declare module DevExpress.viz { * [descr:dxChartCommonAnnotationConfig.tooltipTemplate] */ tooltipTemplate?: - | DevExpress.core.template + | template | (( annotation: dxChartAnnotationConfig | any, element: DevExpress.core.DxElement @@ -34827,7 +35174,7 @@ declare module DevExpress.viz { /** * [descr:dxChartOptions.crosshair.horizontalLine.label.format] */ - format?: DevExpress.ui.Format | undefined; + format?: DevExpress.common.core.localization.Format | undefined; /** * [descr:dxChartOptions.crosshair.horizontalLine.label.visible] */ @@ -34870,7 +35217,7 @@ declare module DevExpress.viz { /** * [descr:dxChartOptions.crosshair.label.format] */ - format?: DevExpress.ui.Format | undefined; + format?: DevExpress.common.core.localization.Format | undefined; /** * [descr:dxChartOptions.crosshair.label.visible] */ @@ -34916,7 +35263,7 @@ declare module DevExpress.viz { /** * [descr:dxChartOptions.crosshair.verticalLine.label.format] */ - format?: DevExpress.ui.Format | undefined; + format?: DevExpress.common.core.localization.Format | undefined; /** * [descr:dxChartOptions.crosshair.verticalLine.label.visible] */ @@ -36872,20 +37219,24 @@ declare module DevExpress.viz { /** * [descr:_viz_circular_gauge_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_circular_gauge_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_circular_gauge_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_circular_gauge_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & - DevExpress.viz.BaseWidget.ExportInfo; + export type ExportingEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_circular_gauge_FileSavingEvent] */ @@ -36895,19 +37246,19 @@ declare module DevExpress.viz { * [descr:_viz_circular_gauge_IncidentOccurredEvent] */ export type IncidentOccurredEvent = - DevExpress.events.EventInfo & + DevExpress.common.core.events.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_circular_gauge_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_viz_circular_gauge_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxCircularGaugeOptions; /** * [descr:dxCircularGaugeRangeContainer] @@ -36952,13 +37303,13 @@ declare module DevExpress.viz { * [descr:_viz_circular_gauge_TooltipHiddenEvent] */ export type TooltipHiddenEvent = - DevExpress.events.EventInfo & + DevExpress.common.core.events.EventInfo & DevExpress.viz.BaseGauge.TooltipInfo; /** * [descr:_viz_circular_gauge_TooltipShownEvent] */ export type TooltipShownEvent = - DevExpress.events.EventInfo & + DevExpress.common.core.events.EventInfo & DevExpress.viz.BaseGauge.TooltipInfo; } /** @@ -36985,7 +37336,7 @@ declare module DevExpress.viz { * [descr:dxCircularGaugeOptions.centerTemplate] */ centerTemplate?: - | DevExpress.core.template + | template | (( component: dxCircularGauge, element: SVGGElement @@ -37020,7 +37371,7 @@ declare module DevExpress.viz { * [descr:dxFunnel.getAllItems()] */ getAllItems(): Array; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.data.DataSource; /** * [descr:dxFunnel.hideTooltip()] */ @@ -37030,20 +37381,23 @@ declare module DevExpress.viz { /** * [descr:_viz_funnel_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_funnel_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.core.events.EventInfo; /** * [descr:_viz_funnel_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_funnel_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & - DevExpress.viz.BaseWidget.ExportInfo; + export type ExportingEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_funnel_FileSavingEvent] */ @@ -37063,22 +37417,23 @@ declare module DevExpress.viz { /** * [descr:_viz_funnel_HoverChangedEvent] */ - export type HoverChangedEvent = DevExpress.events.EventInfo & - FunnelItemInfo; + export type HoverChangedEvent = + DevExpress.common.core.events.EventInfo & FunnelItemInfo; /** * [descr:_viz_funnel_IncidentOccurredEvent] */ - export type IncidentOccurredEvent = DevExpress.events.EventInfo & - DevExpress.viz.BaseWidget.IncidentInfo; + export type IncidentOccurredEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_funnel_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_viz_funnel_ItemClickEvent] */ - export type ItemClickEvent = DevExpress.events.NativeEventInfo< + export type ItemClickEvent = DevExpress.common.core.events.NativeEventInfo< dxFunnel, MouseEvent | PointerEvent > & @@ -37103,7 +37458,7 @@ declare module DevExpress.viz { * [descr:dxFunnelOptions.legend.markerTemplate] */ markerTemplate?: - | DevExpress.core.template + | template | (( legendItem: LegendItem, element: SVGGElement @@ -37117,22 +37472,24 @@ declare module DevExpress.viz { /** * [descr:_viz_funnel_LegendClickEvent] */ - export type LegendClickEvent = DevExpress.events.NativeEventInfo< - dxFunnel, - MouseEvent | PointerEvent - > & - FunnelItemInfo; + export type LegendClickEvent = + DevExpress.common.core.events.NativeEventInfo< + dxFunnel, + MouseEvent | PointerEvent + > & + FunnelItemInfo; /** * [descr:_viz_funnel_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxFunnelOptions; /** * [descr:_viz_funnel_SelectionChangedEvent] */ - export type SelectionChangedEvent = DevExpress.events.EventInfo & - FunnelItemInfo; + export type SelectionChangedEvent = + DevExpress.common.core.events.EventInfo & FunnelItemInfo; /** * [descr:dxFunnelTooltip] */ @@ -37141,7 +37498,7 @@ declare module DevExpress.viz { * [descr:dxFunnelOptions.tooltip.contentTemplate] */ contentTemplate?: - | DevExpress.core.template + | template | (( info: { item?: Item; @@ -37251,7 +37608,7 @@ declare module DevExpress.viz { /** * [descr:dxFunnelOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxFunnelOptions.hoverEnabled] */ @@ -37435,7 +37792,7 @@ declare module DevExpress.viz { /** * [descr:dxFunnelOptions.label.format] */ - format?: DevExpress.ui.Format | undefined; + format?: DevExpress.common.core.localization.Format | undefined; /** * [descr:dxFunnelOptions.label.horizontalAlignment] */ @@ -37536,20 +37893,24 @@ declare module DevExpress.viz { /** * [descr:_viz_linear_gauge_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_linear_gauge_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_linear_gauge_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_linear_gauge_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & - DevExpress.viz.BaseWidget.ExportInfo; + export type ExportingEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_linear_gauge_FileSavingEvent] */ @@ -37559,19 +37920,19 @@ declare module DevExpress.viz { * [descr:_viz_linear_gauge_IncidentOccurredEvent] */ export type IncidentOccurredEvent = - DevExpress.events.EventInfo & + DevExpress.common.core.events.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_linear_gauge_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_viz_linear_gauge_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxLinearGaugeOptions; /** * [descr:dxLinearGaugeRangeContainer] @@ -37635,13 +37996,14 @@ declare module DevExpress.viz { * [descr:_viz_linear_gauge_TooltipHiddenEvent] */ export type TooltipHiddenEvent = - DevExpress.events.EventInfo & + DevExpress.common.core.events.EventInfo & DevExpress.viz.BaseGauge.TooltipInfo; /** * [descr:_viz_linear_gauge_TooltipShownEvent] */ - export type TooltipShownEvent = DevExpress.events.EventInfo & - DevExpress.viz.BaseGauge.TooltipInfo; + export type TooltipShownEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.viz.BaseGauge.TooltipInfo; } /** * [descr:dxLinearGaugeOptions] @@ -37698,24 +38060,28 @@ declare module DevExpress.viz { /** * [descr:_viz_pie_chart_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_pie_chart_DoneEvent] */ - export type DoneEvent = DevExpress.events.EventInfo; + export type DoneEvent = DevExpress.common.core.events.EventInfo; /** * [descr:_viz_pie_chart_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_pie_chart_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_pie_chart_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & - DevExpress.viz.BaseWidget.ExportInfo; + export type ExportingEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_pie_chart_FileSavingEvent] */ @@ -37725,13 +38091,13 @@ declare module DevExpress.viz { * [descr:_viz_pie_chart_IncidentOccurredEvent] */ export type IncidentOccurredEvent = - DevExpress.events.EventInfo & + DevExpress.common.core.events.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_pie_chart_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:dxPieChartLegend] */ @@ -37764,7 +38130,7 @@ declare module DevExpress.viz { * [descr:dxPieChartOptions.legend.markerTemplate] */ markerTemplate?: - | DevExpress.core.template + | template | (( legendItem: LegendItem, element: SVGGElement @@ -37774,24 +38140,26 @@ declare module DevExpress.viz { /** * [descr:_viz_pie_chart_LegendClickEvent] */ - export type LegendClickEvent = DevExpress.events.NativeEventInfo< - dxPieChart, - MouseEvent | PointerEvent - > & { - /** - * [descr:_viz_pie_chart_LegendClickEvent.target] - */ - readonly target: string | number; - /** - * [descr:_viz_pie_chart_LegendClickEvent.points] - */ - readonly points: Array; - }; + export type LegendClickEvent = + DevExpress.common.core.events.NativeEventInfo< + dxPieChart, + MouseEvent | PointerEvent + > & { + /** + * [descr:_viz_pie_chart_LegendClickEvent.target] + */ + readonly target: string | number; + /** + * [descr:_viz_pie_chart_LegendClickEvent.points] + */ + readonly points: Array; + }; /** * [descr:_viz_pie_chart_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type PieChartAnnotationLocation = 'center' | 'edge'; export type PieChartLegendHoverMode = 'none' | 'allArgumentPoints'; export type PieChartSegmentDirection = 'anticlockwise' | 'clockwise'; @@ -37800,7 +38168,7 @@ declare module DevExpress.viz { /** * [descr:_viz_pie_chart_PointClickEvent] */ - export type PointClickEvent = DevExpress.events.NativeEventInfo< + export type PointClickEvent = DevExpress.common.core.events.NativeEventInfo< dxPieChart, MouseEvent | PointerEvent > & @@ -37809,13 +38177,13 @@ declare module DevExpress.viz { * [descr:_viz_pie_chart_PointHoverChangedEvent] */ export type PointHoverChangedEvent = - DevExpress.events.EventInfo & + DevExpress.common.core.events.EventInfo & DevExpress.viz.BaseChart.PointInteractionInfo; /** * [descr:_viz_pie_chart_PointSelectionChangedEvent] */ export type PointSelectionChangedEvent = - DevExpress.events.EventInfo & + DevExpress.common.core.events.EventInfo & DevExpress.viz.BaseChart.PointInteractionInfo; export type Properties = dxPieChartOptions; export type SmallValuesGroupingMode = @@ -37825,13 +38193,15 @@ declare module DevExpress.viz { /** * [descr:_viz_pie_chart_TooltipHiddenEvent] */ - export type TooltipHiddenEvent = DevExpress.events.EventInfo & - DevExpress.viz.BaseChart.TooltipInfo; + export type TooltipHiddenEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.viz.BaseChart.TooltipInfo; /** * [descr:_viz_pie_chart_TooltipShownEvent] */ - export type TooltipShownEvent = DevExpress.events.EventInfo & - DevExpress.viz.BaseChart.TooltipInfo; + export type TooltipShownEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.viz.BaseChart.TooltipInfo; } /** * [descr:dxPieChartAnnotationConfig] @@ -37872,7 +38242,7 @@ declare module DevExpress.viz { * [descr:dxPieChartCommonAnnotationConfig.template] */ template?: - | DevExpress.core.template + | template | (( annotation: dxPieChartAnnotationConfig | any, element: SVGGElement @@ -37882,7 +38252,7 @@ declare module DevExpress.viz { * [descr:dxPieChartCommonAnnotationConfig.tooltipTemplate] */ tooltipTemplate?: - | DevExpress.core.template + | template | (( annotation: dxPieChartAnnotationConfig | any, element: DevExpress.core.DxElement @@ -37903,7 +38273,7 @@ declare module DevExpress.viz { * [descr:dxPieChartOptions.centerTemplate] */ centerTemplate?: - | DevExpress.core.template + | template | (( component: dxPieChart, element: SVGGElement @@ -38114,7 +38484,7 @@ declare module DevExpress.viz { /** * [descr:dxPieChartSeriesTypes.CommonPieChartSeries.label.argumentFormat] */ - argumentFormat?: DevExpress.ui.Format | undefined; + argumentFormat?: DevExpress.common.core.localization.Format | undefined; /** * [descr:dxPieChartSeriesTypes.CommonPieChartSeries.label.backgroundColor] */ @@ -38168,7 +38538,7 @@ declare module DevExpress.viz { /** * [descr:dxPieChartSeriesTypes.CommonPieChartSeries.label.format] */ - format?: DevExpress.ui.Format | undefined; + format?: DevExpress.common.core.localization.Format | undefined; /** * [descr:dxPieChartSeriesTypes.CommonPieChartSeries.label.position] */ @@ -38406,15 +38776,16 @@ declare module DevExpress.viz { /** * [descr:_viz_polar_chart_ArgumentAxisClickEvent] */ - export type ArgumentAxisClickEvent = DevExpress.events.NativeEventInfo< - dxPolarChart, - MouseEvent | PointerEvent - > & { - /** - * [descr:_viz_polar_chart_ArgumentAxisClickEvent.argument] - */ - readonly argument: Date | number | string; - }; + export type ArgumentAxisClickEvent = + DevExpress.common.core.events.NativeEventInfo< + dxPolarChart, + MouseEvent | PointerEvent + > & { + /** + * [descr:_viz_polar_chart_ArgumentAxisClickEvent.argument] + */ + readonly argument: Date | number | string; + }; /** * [descr:dxPolarChartArgumentAxisConstantLines] */ @@ -38468,7 +38839,7 @@ declare module DevExpress.viz { /** * [descr:dxPolarChartOptions.argumentAxis.label.format] */ - format?: DevExpress.ui.Format | undefined; + format?: DevExpress.common.core.localization.Format | undefined; }; /** * [descr:dxPolarChartArgumentAxisMinorTick] @@ -38773,24 +39144,29 @@ declare module DevExpress.viz { /** * [descr:_viz_polar_chart_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_polar_chart_DoneEvent] */ - export type DoneEvent = DevExpress.events.EventInfo; + export type DoneEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_polar_chart_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_polar_chart_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_polar_chart_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & - DevExpress.viz.BaseWidget.ExportInfo; + export type ExportingEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_polar_chart_FileSavingEvent] */ @@ -38800,13 +39176,13 @@ declare module DevExpress.viz { * [descr:_viz_polar_chart_IncidentOccurredEvent] */ export type IncidentOccurredEvent = - DevExpress.events.EventInfo & + DevExpress.common.core.events.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_polar_chart_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:dxPolarChartLegend] */ @@ -38835,8 +39211,8 @@ declare module DevExpress.viz { /** * [descr:_viz_polar_chart_LegendClickEvent] */ - export type LegendClickEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type LegendClickEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.NativeEventInfo< dxPolarChart, MouseEvent | PointerEvent > & { @@ -38848,13 +39224,14 @@ declare module DevExpress.viz { /** * [descr:_viz_polar_chart_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; /** * [descr:_viz_polar_chart_PointClickEvent] */ - export type PointClickEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type PointClickEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.NativeEventInfo< dxPolarChart, MouseEvent | PointerEvent > & @@ -38863,13 +39240,13 @@ declare module DevExpress.viz { * [descr:_viz_polar_chart_PointHoverChangedEvent] */ export type PointHoverChangedEvent = - DevExpress.events.EventInfo & + DevExpress.common.core.events.EventInfo & DevExpress.viz.BaseChart.PointInteractionInfo; /** * [descr:_viz_polar_chart_PointSelectionChangedEvent] */ export type PointSelectionChangedEvent = - DevExpress.events.EventInfo & + DevExpress.common.core.events.EventInfo & DevExpress.viz.BaseChart.PointInteractionInfo; export type PolarChartSeriesType = | 'area' @@ -38881,20 +39258,22 @@ declare module DevExpress.viz { /** * [descr:_viz_polar_chart_SeriesClickEvent] */ - export type SeriesClickEvent = DevExpress.events.NativeEventInfo< - dxPolarChart, - MouseEvent | PointerEvent - > & { - /** - * [descr:_viz_polar_chart_SeriesClickEvent.target] - */ - readonly target: polarChartSeriesObject; - }; + export type SeriesClickEvent = + DevExpress.common.core.events.NativeEventInfo< + dxPolarChart, + MouseEvent | PointerEvent + > & { + /** + * [descr:_viz_polar_chart_SeriesClickEvent.target] + */ + readonly target: polarChartSeriesObject; + }; /** * [descr:_viz_polar_chart_SeriesHoverChangedEvent] */ export type SeriesHoverChangedEvent = - DevExpress.events.EventInfo & SeriesInteractionInfo; + DevExpress.common.core.events.EventInfo & + SeriesInteractionInfo; /** * [descr:_viz_polar_chart_SeriesInteractionInfo] * @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. @@ -38909,7 +39288,8 @@ declare module DevExpress.viz { * [descr:_viz_polar_chart_SeriesSelectionChangedEvent] */ export type SeriesSelectionChangedEvent = - DevExpress.events.EventInfo & SeriesInteractionInfo; + DevExpress.common.core.events.EventInfo & + SeriesInteractionInfo; /** * [descr:dxPolarChartTooltip] */ @@ -38922,13 +39302,15 @@ declare module DevExpress.viz { /** * [descr:_viz_polar_chart_TooltipHiddenEvent] */ - export type TooltipHiddenEvent = DevExpress.events.EventInfo & - DevExpress.viz.BaseChart.TooltipInfo; + export type TooltipHiddenEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.viz.BaseChart.TooltipInfo; /** * [descr:_viz_polar_chart_TooltipShownEvent] */ - export type TooltipShownEvent = DevExpress.events.EventInfo & - DevExpress.viz.BaseChart.TooltipInfo; + export type TooltipShownEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.viz.BaseChart.TooltipInfo; /** * [descr:dxPolarChartValueAxis] */ @@ -39079,7 +39461,7 @@ declare module DevExpress.viz { /** * [descr:dxPolarChartOptions.valueAxis.label.format] */ - format?: DevExpress.ui.Format | undefined; + format?: DevExpress.common.core.localization.Format | undefined; }; /** * [descr:dxPolarChartValueAxisStrips] @@ -39124,8 +39506,8 @@ declare module DevExpress.viz { /** * [descr:_viz_polar_chart_ZoomEndEvent] */ - export type ZoomEndEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type ZoomEndEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.NativeEventInfo< dxPolarChart, MouseEvent | TouchEvent > & { @@ -39157,8 +39539,8 @@ declare module DevExpress.viz { /** * [descr:_viz_polar_chart_ZoomStartEvent] */ - export type ZoomStartEvent = DevExpress.events.Cancelable & - DevExpress.events.NativeEventInfo< + export type ZoomStartEvent = DevExpress.common.core.events.Cancelable & + DevExpress.common.core.events.NativeEventInfo< dxPolarChart, MouseEvent | TouchEvent > & { @@ -39211,7 +39593,7 @@ declare module DevExpress.viz { * [descr:dxPolarChartCommonAnnotationConfig.template] */ template?: - | DevExpress.core.template + | template | (( annotation: dxPolarChartAnnotationConfig | any, element: SVGGElement @@ -39221,7 +39603,7 @@ declare module DevExpress.viz { * [descr:dxPolarChartCommonAnnotationConfig.tooltipTemplate] */ tooltipTemplate?: - | DevExpress.core.template + | template | (( annotation: dxPolarChartAnnotationConfig | any, element: DevExpress.core.DxElement @@ -39740,7 +40122,7 @@ declare module DevExpress.viz { /** * [descr:dxPolarChartSeriesTypes.CommonPolarChartSeries.label.argumentFormat] */ - argumentFormat?: DevExpress.ui.Format | undefined; + argumentFormat?: DevExpress.common.core.localization.Format | undefined; /** * [descr:dxPolarChartSeriesTypes.CommonPolarChartSeries.label.backgroundColor] */ @@ -39794,7 +40176,7 @@ declare module DevExpress.viz { /** * [descr:dxPolarChartSeriesTypes.CommonPolarChartSeries.label.format] */ - format?: DevExpress.ui.Format | undefined; + format?: DevExpress.common.core.localization.Format | undefined; /** * [descr:dxPolarChartSeriesTypes.CommonPolarChartSeries.label.position] */ @@ -39992,7 +40374,7 @@ declare module DevExpress.viz { * [descr:dxRangeSelector] */ export class dxRangeSelector extends BaseWidget { - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.data.DataSource; /** * [descr:dxRangeSelector.getValue()] */ @@ -40032,20 +40414,24 @@ declare module DevExpress.viz { /** * [descr:_viz_range_selector_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_range_selector_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_range_selector_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_range_selector_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & - DevExpress.viz.BaseWidget.ExportInfo; + export type ExportingEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_range_selector_FileSavingEvent] */ @@ -40055,37 +40441,38 @@ declare module DevExpress.viz { * [descr:_viz_range_selector_IncidentOccurredEvent] */ export type IncidentOccurredEvent = - DevExpress.events.EventInfo & + DevExpress.common.core.events.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_range_selector_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_viz_range_selector_OptionChangedEvent] */ export type OptionChangedEvent = - DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxRangeSelectorOptions; export type ValueChangedCallMode = 'onMoving' | 'onMovingComplete'; /** * [descr:_viz_range_selector_ValueChangedEvent] */ - export type ValueChangedEvent = DevExpress.events.NativeEventInfo< - dxRangeSelector, - MouseEvent | TouchEvent - > & { - /** - * [descr:_viz_range_selector_ValueChangedEvent.value] - */ - readonly value: Array; - /** - * [descr:_viz_range_selector_ValueChangedEvent.previousValue] - */ - readonly previousValue: Array; - }; + export type ValueChangedEvent = + DevExpress.common.core.events.NativeEventInfo< + dxRangeSelector, + MouseEvent | TouchEvent + > & { + /** + * [descr:_viz_range_selector_ValueChangedEvent.value] + */ + readonly value: Array; + /** + * [descr:_viz_range_selector_ValueChangedEvent.previousValue] + */ + readonly previousValue: Array; + }; } /** * [descr:dxRangeSelectorOptions] @@ -40274,7 +40661,7 @@ declare module DevExpress.viz { /** * [descr:dxRangeSelectorOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxRangeSelectorOptions.dataSourceField] */ @@ -40378,7 +40765,7 @@ declare module DevExpress.viz { /** * [descr:dxRangeSelectorOptions.scale.label.format] */ - format?: DevExpress.ui.Format | undefined; + format?: DevExpress.common.core.localization.Format | undefined; /** * [descr:dxRangeSelectorOptions.scale.label.overlappingBehavior] */ @@ -40418,7 +40805,7 @@ declare module DevExpress.viz { /** * [descr:dxRangeSelectorOptions.scale.marker.label.format] */ - format?: DevExpress.ui.Format | undefined; + format?: DevExpress.common.core.localization.Format | undefined; }; /** * [descr:dxRangeSelectorOptions.scale.marker.separatorHeight] @@ -40592,7 +40979,7 @@ declare module DevExpress.viz { /** * [descr:dxRangeSelectorOptions.sliderMarker.format] */ - format?: DevExpress.ui.Format | undefined; + format?: DevExpress.common.core.localization.Format | undefined; /** * [descr:dxRangeSelectorOptions.sliderMarker.invalidRangeColor] */ @@ -40637,7 +41024,7 @@ declare module DevExpress.viz { * [descr:dxSankey.getAllNodes()] */ getAllNodes(): Array; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.data.DataSource; /** * [descr:dxSankey.hideTooltip()] */ @@ -40647,20 +41034,23 @@ declare module DevExpress.viz { /** * [descr:_viz_sankey_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_sankey_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.core.events.EventInfo; /** * [descr:_viz_sankey_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_sankey_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & - DevExpress.viz.BaseWidget.ExportInfo; + export type ExportingEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_sankey_FileSavingEvent] */ @@ -40669,17 +41059,18 @@ declare module DevExpress.viz { /** * [descr:_viz_sankey_IncidentOccurredEvent] */ - export type IncidentOccurredEvent = DevExpress.events.EventInfo & - DevExpress.viz.BaseWidget.IncidentInfo; + export type IncidentOccurredEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_sankey_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_viz_sankey_LinkClickEvent] */ - export type LinkClickEvent = DevExpress.events.NativeEventInfo< + export type LinkClickEvent = DevExpress.common.core.events.NativeEventInfo< dxSankey, MouseEvent | PointerEvent > & { @@ -40691,16 +41082,17 @@ declare module DevExpress.viz { /** * [descr:_viz_sankey_LinkHoverEvent] */ - export type LinkHoverEvent = DevExpress.events.EventInfo & { - /** - * [descr:_viz_sankey_LinkHoverEvent.target] - */ - readonly target: dxSankeyLink; - }; + export type LinkHoverEvent = + DevExpress.common.core.events.EventInfo & { + /** + * [descr:_viz_sankey_LinkHoverEvent.target] + */ + readonly target: dxSankeyLink; + }; /** * [descr:_viz_sankey_NodeClickEvent] */ - export type NodeClickEvent = DevExpress.events.NativeEventInfo< + export type NodeClickEvent = DevExpress.common.core.events.NativeEventInfo< dxSankey, MouseEvent | PointerEvent > & { @@ -40712,17 +41104,19 @@ declare module DevExpress.viz { /** * [descr:_viz_sankey_NodeHoverEvent] */ - export type NodeHoverEvent = DevExpress.events.EventInfo & { - /** - * [descr:_viz_sankey_NodeHoverEvent.target] - */ - readonly target: dxSankeyNode; - }; + export type NodeHoverEvent = + DevExpress.common.core.events.EventInfo & { + /** + * [descr:_viz_sankey_NodeHoverEvent.target] + */ + readonly target: dxSankeyNode; + }; /** * [descr:_viz_sankey_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxSankeyOptions; export type SankeyColorMode = 'none' | 'source' | 'target' | 'gradient'; /** @@ -40754,7 +41148,7 @@ declare module DevExpress.viz { * [descr:dxSankeyOptions.tooltip.linkTooltipTemplate] */ linkTooltipTemplate?: - | DevExpress.core.template + | template | (( info: { source?: string; target?: string; weight?: number }, element: DevExpress.core.DxElement @@ -40764,7 +41158,7 @@ declare module DevExpress.viz { * [descr:dxSankeyOptions.tooltip.nodeTooltipTemplate] */ nodeTooltipTemplate?: - | DevExpress.core.template + | template | (( info: { label?: string; weightIn?: number; weightOut?: number }, element: DevExpress.core.DxElement @@ -40887,7 +41281,7 @@ declare module DevExpress.viz { /** * [descr:dxSankeyOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxSankeyOptions.hoverEnabled] */ @@ -41194,26 +41588,30 @@ declare module DevExpress.viz { * [descr:dxSparkline] */ export class dxSparkline extends BaseSparkline { - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.data.DataSource; } module dxSparkline { /** * [descr:_viz_sparkline_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_sparkline_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_sparkline_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_sparkline_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & - DevExpress.viz.BaseWidget.ExportInfo; + export type ExportingEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_sparkline_FileSavingEvent] */ @@ -41223,18 +41621,19 @@ declare module DevExpress.viz { * [descr:_viz_sparkline_IncidentOccurredEvent] */ export type IncidentOccurredEvent = - DevExpress.events.EventInfo & + DevExpress.common.core.events.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_sparkline_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:_viz_sparkline_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxSparklineOptions; export type SparklineType = | 'area' @@ -41248,11 +41647,13 @@ declare module DevExpress.viz { /** * [descr:_viz_sparkline_TooltipHiddenEvent] */ - export type TooltipHiddenEvent = DevExpress.events.EventInfo; + export type TooltipHiddenEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_sparkline_TooltipShownEvent] */ - export type TooltipShownEvent = DevExpress.events.EventInfo; + export type TooltipShownEvent = + DevExpress.common.core.events.EventInfo; } /** * [descr:dxSparklineOptions] @@ -41276,7 +41677,7 @@ declare module DevExpress.viz { /** * [descr:dxSparklineOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxSparklineOptions.firstLastColor] */ @@ -41366,7 +41767,7 @@ declare module DevExpress.viz { * [descr:dxTreeMap.getCurrentNode()] */ getCurrentNode(): dxTreeMapNode; - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.data.DataSource; /** * [descr:dxTreeMap.getRootNode()] */ @@ -41384,7 +41785,7 @@ declare module DevExpress.viz { /** * [descr:_viz_tree_map_ClickEvent] */ - export type ClickEvent = DevExpress.events.NativeEventInfo< + export type ClickEvent = DevExpress.common.core.events.NativeEventInfo< dxTreeMap, MouseEvent | PointerEvent > & { @@ -41396,29 +41797,33 @@ declare module DevExpress.viz { /** * [descr:_viz_tree_map_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_tree_map_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = DevExpress.common.core.events.EventInfo; /** * [descr:_viz_tree_map_DrillEvent] */ - export type DrillEvent = DevExpress.events.EventInfo & { - /** - * [descr:_viz_tree_map_DrillEvent.node] - */ - readonly node: dxTreeMapNode; - }; + export type DrillEvent = + DevExpress.common.core.events.EventInfo & { + /** + * [descr:_viz_tree_map_DrillEvent.node] + */ + readonly node: dxTreeMapNode; + }; /** * [descr:_viz_tree_map_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_tree_map_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & - DevExpress.viz.BaseWidget.ExportInfo; + export type ExportingEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_tree_map_FileSavingEvent] */ @@ -41427,18 +41832,19 @@ declare module DevExpress.viz { /** * [descr:_viz_tree_map_HoverChangedEvent] */ - export type HoverChangedEvent = DevExpress.events.EventInfo & - InteractionInfo; + export type HoverChangedEvent = + DevExpress.common.core.events.EventInfo & InteractionInfo; /** * [descr:_viz_tree_map_IncidentOccurredEvent] */ - export type IncidentOccurredEvent = DevExpress.events.EventInfo & - DevExpress.viz.BaseWidget.IncidentInfo; + export type IncidentOccurredEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_tree_map_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:InteractionInfo] * @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. @@ -41453,7 +41859,7 @@ declare module DevExpress.viz { * [descr:_viz_tree_map_NodesInitializedEvent] */ export type NodesInitializedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_viz_tree_map_NodesInitializedEvent.root] */ @@ -41462,23 +41868,25 @@ declare module DevExpress.viz { /** * [descr:_viz_tree_map_NodesRenderingEvent] */ - export type NodesRenderingEvent = DevExpress.events.EventInfo & { - /** - * [descr:_viz_tree_map_NodesRenderingEvent.node] - */ - readonly node: dxTreeMapNode; - }; + export type NodesRenderingEvent = + DevExpress.common.core.events.EventInfo & { + /** + * [descr:_viz_tree_map_NodesRenderingEvent.node] + */ + readonly node: dxTreeMapNode; + }; /** * [descr:_viz_tree_map_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxTreeMapOptions; /** * [descr:_viz_tree_map_SelectionChangedEvent] */ - export type SelectionChangedEvent = DevExpress.events.EventInfo & - InteractionInfo; + export type SelectionChangedEvent = + DevExpress.common.core.events.EventInfo & InteractionInfo; /** * [descr:dxTreeMapTooltip] */ @@ -41487,7 +41895,7 @@ declare module DevExpress.viz { * [descr:dxTreeMapOptions.tooltip.contentTemplate] */ contentTemplate?: - | DevExpress.core.template + | template | (( info: { value?: number; valueText?: string; node?: dxTreeMapNode }, element: DevExpress.core.DxElement @@ -41651,7 +42059,7 @@ declare module DevExpress.viz { /** * [descr:dxTreeMapOptions.dataSource] */ - dataSource?: DevExpress.data.DataSource.DataSourceLike | null; + dataSource?: DevExpress.data.DataSourceLike | null; /** * [descr:dxTreeMapOptions.group] */ @@ -41982,7 +42390,7 @@ declare module DevExpress.viz { * [descr:_viz_vector_map_CenterChangedEvent] */ export type CenterChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_viz_vector_map_CenterChangedEvent.center] */ @@ -41991,7 +42399,7 @@ declare module DevExpress.viz { /** * [descr:_viz_vector_map_ClickEvent] */ - export type ClickEvent = DevExpress.events.NativeEventInfo< + export type ClickEvent = DevExpress.common.core.events.NativeEventInfo< dxVectorMap, MouseEvent | PointerEvent > & { @@ -42003,20 +42411,24 @@ declare module DevExpress.viz { /** * [descr:_viz_vector_map_DisposingEvent] */ - export type DisposingEvent = DevExpress.events.EventInfo; + export type DisposingEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_vector_map_DrawnEvent] */ - export type DrawnEvent = DevExpress.events.EventInfo; + export type DrawnEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_vector_map_ExportedEvent] */ - export type ExportedEvent = DevExpress.events.EventInfo; + export type ExportedEvent = + DevExpress.common.core.events.EventInfo; /** * [descr:_viz_vector_map_ExportingEvent] */ - export type ExportingEvent = DevExpress.events.EventInfo & - DevExpress.viz.BaseWidget.ExportInfo; + export type ExportingEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.viz.BaseWidget.ExportInfo; /** * [descr:_viz_vector_map_FileSavingEvent] */ @@ -42026,13 +42438,13 @@ declare module DevExpress.viz { * [descr:_viz_vector_map_IncidentOccurredEvent] */ export type IncidentOccurredEvent = - DevExpress.events.EventInfo & + DevExpress.common.core.events.EventInfo & DevExpress.viz.BaseWidget.IncidentInfo; /** * [descr:_viz_vector_map_InitializedEvent] */ export type InitializedEvent = - DevExpress.events.InitializedEventInfo; + DevExpress.common.core.events.InitializedEventInfo; /** * [descr:dxVectorMapLegends] */ @@ -42081,7 +42493,7 @@ declare module DevExpress.viz { * [descr:dxVectorMapOptions.legends.markerTemplate] */ markerTemplate?: - | DevExpress.core.template + | template | (( legendItem: LegendItem, element: SVGGElement @@ -42104,14 +42516,15 @@ declare module DevExpress.viz { /** * [descr:_viz_vector_map_OptionChangedEvent] */ - export type OptionChangedEvent = DevExpress.events.EventInfo & - DevExpress.events.ChangedOptionInfo; + export type OptionChangedEvent = + DevExpress.common.core.events.EventInfo & + DevExpress.common.core.events.ChangedOptionInfo; export type Properties = dxVectorMapOptions; /** * [descr:_viz_vector_map_SelectionChangedEvent] */ export type SelectionChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_viz_vector_map_SelectionChangedEvent.target] */ @@ -42125,7 +42538,7 @@ declare module DevExpress.viz { * [descr:dxVectorMapOptions.tooltip.contentTemplate] */ contentTemplate?: - | DevExpress.core.template + | template | (( info: MapLayerElement, element: DevExpress.core.DxElement @@ -42138,13 +42551,13 @@ declare module DevExpress.viz { /** * [descr:dxVectorMapOptions.tooltip.format] */ - format?: DevExpress.ui.Format; + format?: DevExpress.common.core.localization.Format; }; /** * [descr:_viz_vector_map_TooltipHiddenEvent] */ - export type TooltipHiddenEvent = DevExpress.events.EventInfo & - TooltipInfo; + export type TooltipHiddenEvent = + DevExpress.common.core.events.EventInfo & TooltipInfo; /** * [descr:_viz_vector_map_TooltipInfo] * @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. @@ -42158,8 +42571,8 @@ declare module DevExpress.viz { /** * [descr:_viz_vector_map_TooltipShownEvent] */ - export type TooltipShownEvent = DevExpress.events.EventInfo & - TooltipInfo; + export type TooltipShownEvent = + DevExpress.common.core.events.EventInfo & TooltipInfo; export type VectorMapLayerType = 'area' | 'line' | 'marker'; export type VectorMapMarkerShape = 'circle' | 'square'; export type VectorMapMarkerType = 'bubble' | 'dot' | 'image' | 'pie'; @@ -42167,7 +42580,7 @@ declare module DevExpress.viz { * [descr:_viz_vector_map_ZoomFactorChangedEvent] */ export type ZoomFactorChangedEvent = - DevExpress.events.EventInfo & { + DevExpress.common.core.events.EventInfo & { /** * [descr:_viz_vector_map_ZoomFactorChangedEvent.zoomFactor] */ @@ -42205,7 +42618,7 @@ declare module DevExpress.viz { * [descr:dxVectorMapCommonAnnotationConfig.template] */ template?: - | DevExpress.core.template + | template | (( annotation: dxVectorMapAnnotationConfig | any, element: SVGGElement @@ -42215,7 +42628,7 @@ declare module DevExpress.viz { * [descr:dxVectorMapCommonAnnotationConfig.tooltipTemplate] */ tooltipTemplate?: - | DevExpress.core.template + | template | (( annotation: dxVectorMapAnnotationConfig | any, element: DevExpress.core.DxElement @@ -42326,10 +42739,7 @@ declare module DevExpress.viz { /** * [descr:dxVectorMapOptions.layers.dataSource] */ - dataSource?: - | object - | DevExpress.data.DataSource.DataSourceLike - | null; + dataSource?: object | DevExpress.data.DataSourceLike | null; /** * [descr:dxVectorMapOptions.layers.elementType] */ @@ -42436,10 +42846,7 @@ declare module DevExpress.viz { colorGroups?: Array; customize?: (elements: Array) => any; dataField?: string; - dataSource?: - | object - | DevExpress.data.DataSource.DataSourceLike - | null; + dataSource?: object | DevExpress.data.DataSourceLike | null; elementType?: 'bubble' | 'dot' | 'image' | 'pie'; hoverEnabled?: boolean; hoveredBorderColor?: string; @@ -42665,7 +43072,7 @@ declare module DevExpress.viz { /** * [descr:MapLayer.getDataSource()] */ - getDataSource(): DevExpress.data.DataSource; + getDataSource(): DevExpress.common.data.DataSource; /** * [descr:MapLayer.getElements()] */ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1f6714dc88e5..5890858142ce 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -57,8 +57,8 @@ importers: specifier: 6.0.2 version: 6.0.2(@angular/compiler@17.3.12(@angular/core@17.3.12(rxjs@7.8.1)(zone.js@0.14.10)))(@angular/core@17.3.12(rxjs@7.8.1)(zone.js@0.14.10))(tslint@6.1.3(typescript@5.4.5)) devextreme-internal-tools: - specifier: 16.0.0-beta.18 - version: 16.0.0-beta.18 + specifier: 16.0.0 + version: 16.0.0 devextreme-nx-plugin: specifier: workspace:* version: link:packages/devextreme-nx-plugin @@ -157,8 +157,8 @@ importers: version: 0.14.10 devDependencies: '@angular-devkit/build-angular': - specifier: 17.3.8 - version: 17.3.8(4hvbwfa2ekh5q3ewv27yze77ae) + specifier: 17.3.11 + version: 17.3.11(2kxef454jh4nsgrnm43zg7pmii) '@angular/cli': specifier: 17.3.11 version: 17.3.11(chokidar@3.6.0) @@ -485,8 +485,8 @@ importers: specifier: 3.3.2 version: 3.3.2(eslint@8.56.0) express: - specifier: 4.20.0 - version: 4.20.0 + specifier: 4.21.1 + version: 4.21.1 glob: specifier: 10.4.5 version: 10.4.5 @@ -533,8 +533,8 @@ importers: specifier: 1.9.1 version: 1.9.1 serve-static: - specifier: 1.16.0 - version: 1.16.0 + specifier: 1.16.2 + version: 1.16.2 stylelint: specifier: 16.5.0 version: 16.5.0(typescript@5.4.5) @@ -586,7 +586,7 @@ importers: version: 3.3.4(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))) webpack: specifier: 5.94.0 - version: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11)) + version: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) apps/react: dependencies: @@ -1337,7 +1337,7 @@ importers: version: 1.1.0 webpack: specifier: 5.94.0 - version: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11)) + version: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) webpack-stream: specifier: 7.0.0 version: 7.0.0(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))) @@ -1352,8 +1352,8 @@ importers: packages/devextreme-angular: dependencies: '@angular-devkit/schematics': - specifier: 17.3.8 - version: 17.3.8(chokidar@3.6.0) + specifier: 17.3.11 + version: 17.3.11(chokidar@3.6.0) devextreme: specifier: workspace:~ version: link:../devextreme/artifacts/npm/devextreme @@ -1365,8 +1365,8 @@ importers: version: 8.2.3 devDependencies: '@angular-devkit/architect': - specifier: 0.1703.11 - version: 0.1703.11(chokidar@3.6.0) + specifier: 0.1900.2 + version: 0.1900.2 '@angular/animations': specifier: 17.3.12 version: 17.3.12(@angular/core@17.3.12(rxjs@7.8.1)(zone.js@0.14.10)) @@ -1477,7 +1477,7 @@ importers: version: 5.4.5 webpack: specifier: 5.94.0 - version: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11)) + version: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) yargs: specifier: 17.7.2 version: 17.7.2 @@ -1663,8 +1663,8 @@ importers: specifier: 1.1.5 version: 1.1.5(rzk5rjmmui3bnih6n3f6jxxxzq) express: - specifier: 4.20.0 - version: 4.20.0 + specifier: 4.21.1 + version: 4.21.1 filing-cabinet: specifier: 4.1.6 version: 4.1.6 @@ -1785,12 +1785,12 @@ packages: resolution: {integrity: sha512-YNasVZk4rYdcM6M+KRH8PUBhVyJfqzUYLpO98GgRokW+taIDgifckSlmfDZzQRbw45qiwei1IKCLqcpC8nM5Tw==} engines: {node: ^18.13.0 || >=20.9.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} - '@angular-devkit/architect@0.1703.8': - resolution: {integrity: sha512-lKxwG4/QABXZvJpqeSIn/kAwnY6MM9HdHZUV+o5o3UiTi+vO8rZApG4CCaITH3Bxebm7Nam7Xbk8RuukC5rq6g==} - engines: {node: ^18.13.0 || >=20.9.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} + '@angular-devkit/architect@0.1900.2': + resolution: {integrity: sha512-rGUgOgN/jb3Pyx3E1JsUbwQQZp4C0M/t0lwyWIFjUpndl27aBDjO2y5hzeG0B1+FgOuSNg8BPOYaEIO5vSCspw==} + engines: {node: ^18.19.1 || ^20.11.1 || >=22.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} - '@angular-devkit/build-angular@17.3.8': - resolution: {integrity: sha512-ixsdXggWaFRP7Jvxd0AMukImnePuGflT9Yy7NJ9/y0cL/k//S/3RnkQv5i411KzN+7D4RIbNkRGGTYeqH24zlg==} + '@angular-devkit/build-angular@17.3.11': + resolution: {integrity: sha512-lHX5V2dSts328yvo/9E2u9QMGcvJhbEKKDDp9dBecwvIG9s+4lTOJgi9DPUE7W+AtmPcmbbhwC2JRQ/SLQhAoA==} engines: {node: ^18.13.0 || >=20.9.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} peerDependencies: '@angular/compiler-cli': ^17.0.0 @@ -1830,8 +1830,8 @@ packages: tailwindcss: optional: true - '@angular-devkit/build-webpack@0.1703.8': - resolution: {integrity: sha512-9u6fl8VVOxcLOEMzrUeaybSvi9hSLSRucHnybneYrabsgreDo32tuy/4G8p6YAHQjpWEj9jvF9Um13ertdni5Q==} + '@angular-devkit/build-webpack@0.1703.11': + resolution: {integrity: sha512-qbCiiHuoVkD7CtLyWoRi/Vzz6nrEztpF5XIyWUcQu67An1VlxbMTE4yoSQiURjCQMnB/JvS1GPVed7wOq3SJ/w==} engines: {node: ^18.13.0 || >=20.9.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} peerDependencies: webpack: ^5.30.0 @@ -1850,11 +1850,11 @@ packages: chokidar: optional: true - '@angular-devkit/core@17.3.8': - resolution: {integrity: sha512-Q8q0voCGudbdCgJ7lXdnyaxKHbNQBARH68zPQV72WT8NWy+Gw/tys870i6L58NWbBaCJEUcIj/kb6KoakSRu+Q==} - engines: {node: ^18.13.0 || >=20.9.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} + '@angular-devkit/core@19.0.2': + resolution: {integrity: sha512-p5pTx9rAtJUfoa7BP6R5U7dGFWHrrgpYpVyF3jwqYIu0h1C0rJIyY8q/HlkvzFxgfWag1qRf15oANq3G9fqdwg==} + engines: {node: ^18.19.1 || ^20.11.1 || >=22.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} peerDependencies: - chokidar: ^3.5.2 + chokidar: ^4.0.0 peerDependenciesMeta: chokidar: optional: true @@ -1867,10 +1867,6 @@ packages: resolution: {integrity: sha512-I5wviiIqiFwar9Pdk30Lujk8FczEEc18i22A5c6Z9lbmhPQdTroDnEQdsfXjy404wPe8H62s0I15o4pmMGfTYQ==} engines: {node: ^18.13.0 || >=20.9.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} - '@angular-devkit/schematics@17.3.8': - resolution: {integrity: sha512-QRVEYpIfgkprNHc916JlPuNbLzOgrm9DZalHasnLUz4P6g7pR21olb8YCyM2OTJjombNhya9ZpckcADU5Qyvlg==} - engines: {node: ^18.13.0 || >=20.9.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} - '@angular/animations@17.3.12': resolution: {integrity: sha512-9hsdWF4gRRcVJtPcCcYLaX1CIyM9wUu6r+xRl6zU5hq8qhl35hig6ounz7CXFAzLf0WDBdM16bPHouVGaG76lg==} engines: {node: ^18.13.0 || >=20.9.0} @@ -3938,8 +3934,8 @@ packages: '@ndelangen/get-tarball@3.0.9': resolution: {integrity: sha512-9JKTEik4vq+yGosHYhZ1tiH/3WpUS0Nh0kej4Agndhox8pAdWhEx5knFVRcb/ya9knCRCs1rPxNrSXTDdfVqpA==} - '@ngtools/webpack@17.3.8': - resolution: {integrity: sha512-CjSVVa/9fzMpEDQP01SC4colKCbZwj7vUq0H2bivp8jVsmd21x9Fu0gDBH0Y9NdfAIm4eGZvmiZKMII3vIOaYQ==} + '@ngtools/webpack@17.3.11': + resolution: {integrity: sha512-SfTCbplt4y6ak5cf2IfqdoVOsnoNdh/j6Vu+wb8WWABKwZ5yfr2S/Gk6ithSKcdIZhAF8DNBOoyk1EJuf8Xkfg==} engines: {node: ^18.13.0 || >=20.9.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} peerDependencies: '@angular/compiler-cli': ^17.0.0 @@ -5426,9 +5422,6 @@ packages: '@types/escodegen@0.0.6': resolution: {integrity: sha512-AjwI4MvWx3HAOaZqYsjKWyEObT9lcVV0Y0V8nXo6cXzN8ZiMxVhf6F3d/UNvXVGKrEzL/Dluc5p+y9GkzlTWig==} - '@types/eslint-scope@3.7.7': - resolution: {integrity: sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==} - '@types/eslint-visitor-keys@1.0.0': resolution: {integrity: sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==} @@ -6146,12 +6139,6 @@ packages: acorn-hammerhead@0.6.2: resolution: {integrity: sha512-JZklfs1VVyjA1hf1y5qSzKSmK3K1UUUI7fQTuM/Zhv3rz4kFhdx4QwVnmU6tBEC8g/Ov6B+opfNFPeSZrlQfqA==} - acorn-import-assertions@1.9.0: - resolution: {integrity: sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==} - deprecated: package has been renamed to acorn-import-attributes - peerDependencies: - acorn: ^8 - acorn-import-attributes@1.9.5: resolution: {integrity: sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==} peerDependencies: @@ -6243,6 +6230,14 @@ packages: ajv: optional: true + ajv-formats@3.0.1: + resolution: {integrity: sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==} + peerDependencies: + ajv: ^8.0.0 + peerDependenciesMeta: + ajv: + optional: true + ajv-keywords@3.5.2: resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==} peerDependencies: @@ -6262,6 +6257,9 @@ packages: ajv@8.13.0: resolution: {integrity: sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==} + ajv@8.17.1: + resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==} + ajv@8.6.2: resolution: {integrity: sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==} @@ -7603,6 +7601,10 @@ packages: resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==} engines: {node: '>= 0.6'} + cookie@0.7.1: + resolution: {integrity: sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==} + engines: {node: '>= 0.6'} + copy-anything@2.0.6: resolution: {integrity: sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==} @@ -8172,8 +8174,8 @@ packages: devextreme-cldr-data@1.0.3: resolution: {integrity: sha512-xd+uWv1KzEhr+ZH/MOWfDei3GFz+NAYyKUR9HgjM9BBwPel7PpMElYp4whM+PtAjziBaTssQnA//ob5c3BovTA==} - devextreme-internal-tools@16.0.0-beta.18: - resolution: {integrity: sha512-5JYaE3LGZnO/vFyDWiQzHRAH5gWUO9EplS2ScKn5UwrytJiFcP9+F9LyMuapsw7METKjyJPcYI4gTZDOSdCmhg==} + devextreme-internal-tools@16.0.0: + resolution: {integrity: sha512-XB0uld/b6R+71YK1mrkS0vWXj/qLyz7EC8r0j3eNSvZ+A0uxw3qAX1ohZtRtUSoeYSa70w2EAXo6nlCnrPOY5g==} engines: {node: '>=12.0.0'} hasBin: true @@ -9139,6 +9141,10 @@ packages: resolution: {integrity: sha512-pLdae7I6QqShF5PnNTCVn4hI91Dx0Grkn2+IAsMTgMIKuQVte2dN9PeGSSAME2FR8anOhVA62QDIUaWVfEXVLw==} engines: {node: '>= 0.10.0'} + express@4.21.1: + resolution: {integrity: sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==} + engines: {node: '>= 0.10.0'} + ext@1.7.0: resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==} @@ -9230,6 +9236,9 @@ packages: fast-safe-stringify@2.1.1: resolution: {integrity: sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==} + fast-uri@3.0.3: + resolution: {integrity: sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==} + fastest-levenshtein@1.0.16: resolution: {integrity: sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==} engines: {node: '>= 4.9.1'} @@ -9319,6 +9328,10 @@ packages: resolution: {integrity: sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==} engines: {node: '>= 0.8'} + finalhandler@1.3.1: + resolution: {integrity: sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==} + engines: {node: '>= 0.8'} + find-babel-config@2.1.1: resolution: {integrity: sha512-5Ji+EAysHGe1OipH7GN4qDjok5Z1uw5KAwDCbicU/4wyTZY7CqOCzcWbG7J5ad9mazq67k89fXlbc1MuIfl9uA==} @@ -10250,6 +10263,15 @@ packages: '@types/express': optional: true + http-proxy-middleware@2.0.7: + resolution: {integrity: sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==} + engines: {node: '>=12.0.0'} + peerDependencies: + '@types/express': ^4.17.13 + peerDependenciesMeta: + '@types/express': + optional: true + http-proxy@1.18.1: resolution: {integrity: sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==} engines: {node: '>=8.0.0'} @@ -11273,6 +11295,9 @@ packages: jsonc-parser@3.2.1: resolution: {integrity: sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==} + jsonc-parser@3.3.1: + resolution: {integrity: sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==} + jsonfile@4.0.0: resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==} @@ -13014,6 +13039,10 @@ packages: resolution: {integrity: sha512-xUXwsxNjwTQ8K3GnT4pCJm+xq3RUPQbmkYJTP5aFIfNIvbcc/4MUxgBaaRSZJ6yGJZiGSyYlM6MzwTsRk8SYCg==} engines: {node: '>=12'} + picomatch@4.0.2: + resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==} + engines: {node: '>=12'} + pidtree@0.3.1: resolution: {integrity: sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA==} engines: {node: '>=0.10'} @@ -14331,6 +14360,10 @@ packages: resolution: {integrity: sha512-pDLK8zwl2eKaYrs8mrPZBJua4hMplRWJ1tIFksVC3FtBEBnl8dxgeHtsaMS8DhS9i4fLObaon6ABoc4/hQGdPA==} engines: {node: '>= 0.8.0'} + serve-static@1.16.2: + resolution: {integrity: sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==} + engines: {node: '>= 0.8.0'} + set-blocking@2.0.0: resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==} @@ -15991,8 +16024,8 @@ packages: resolution: {integrity: sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==} engines: {node: '>=10.13.0'} - vite@5.1.7: - resolution: {integrity: sha512-sgnEEFTZYMui/sTlH1/XEnVNHMujOahPLGMxn1+5sIT45Xjng1Ec1K78jRP15dSmVgg5WBin9yO81j3o9OxofA==} + vite@5.1.8: + resolution: {integrity: sha512-mB8ToUuSmzODSpENgvpFk2fTiU/YQ1tmcVJJ4WZbq4fPdGJkFNVcmVL5k7iDug6xzWjjuGDKAuSievIsD6H7Xw==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -16264,16 +16297,6 @@ packages: webpack-virtual-modules@0.6.1: resolution: {integrity: sha512-poXpCylU7ExuvZK8z+On3kX+S8o/2dQ/SVYueKA0D4WEMXROXgY8Ez50/bQEUmvoSMMrWcrJqCHuhAbsiwg7Dg==} - webpack@5.90.3: - resolution: {integrity: sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==} - engines: {node: '>=10.13.0'} - hasBin: true - peerDependencies: - webpack-cli: '*' - peerDependenciesMeta: - webpack-cli: - optional: true - webpack@5.94.0: resolution: {integrity: sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==} engines: {node: '>=10.13.0'} @@ -16585,19 +16608,19 @@ snapshots: transitivePeerDependencies: - chokidar - '@angular-devkit/architect@0.1703.8(chokidar@3.6.0)': + '@angular-devkit/architect@0.1900.2': dependencies: - '@angular-devkit/core': 17.3.8(chokidar@3.6.0) + '@angular-devkit/core': 19.0.2 rxjs: 7.8.1 transitivePeerDependencies: - chokidar - '@angular-devkit/build-angular@17.3.8(4hvbwfa2ekh5q3ewv27yze77ae)': + '@angular-devkit/build-angular@17.3.11(2kxef454jh4nsgrnm43zg7pmii)': dependencies: '@ampproject/remapping': 2.3.0 - '@angular-devkit/architect': 0.1703.8(chokidar@3.6.0) - '@angular-devkit/build-webpack': 0.1703.8(chokidar@3.6.0)(webpack-dev-server@4.15.1(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)))(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) - '@angular-devkit/core': 17.3.8(chokidar@3.6.0) + '@angular-devkit/architect': 0.1703.11(chokidar@3.6.0) + '@angular-devkit/build-webpack': 0.1703.11(chokidar@3.6.0)(webpack-dev-server@4.15.1(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)))(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) + '@angular-devkit/core': 17.3.11(chokidar@3.6.0) '@angular/compiler-cli': 17.3.12(@angular/compiler@17.3.12(@angular/core@17.3.12(rxjs@7.8.1)(zone.js@0.14.10)))(typescript@5.4.5) '@babel/core': 7.24.0 '@babel/generator': 7.23.6 @@ -16609,29 +16632,29 @@ snapshots: '@babel/preset-env': 7.24.0(@babel/core@7.24.0) '@babel/runtime': 7.24.0 '@discoveryjs/json-ext': 0.5.7 - '@ngtools/webpack': 17.3.8(@angular/compiler-cli@17.3.12(@angular/compiler@17.3.12(@angular/core@17.3.12(rxjs@7.8.1)(zone.js@0.14.10)))(typescript@5.4.5))(typescript@5.4.5)(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) - '@vitejs/plugin-basic-ssl': 1.1.0(vite@5.1.7(@types/node@20.11.17)(less@4.2.0)(lightningcss@1.25.1)(sass@1.71.1)(sugarss@2.0.0)(terser@5.29.1)) + '@ngtools/webpack': 17.3.11(@angular/compiler-cli@17.3.12(@angular/compiler@17.3.12(@angular/core@17.3.12(rxjs@7.8.1)(zone.js@0.14.10)))(typescript@5.4.5))(typescript@5.4.5)(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) + '@vitejs/plugin-basic-ssl': 1.1.0(vite@5.1.8(@types/node@20.11.17)(less@4.2.0)(lightningcss@1.25.1)(sass@1.71.1)(sugarss@2.0.0)(terser@5.29.1)) ansi-colors: 4.1.3 autoprefixer: 10.4.18(postcss@8.4.35) - babel-loader: 9.1.3(@babel/core@7.24.0)(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) + babel-loader: 9.1.3(@babel/core@7.24.0)(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) babel-plugin-istanbul: 6.1.1 browserslist: 4.23.0 - copy-webpack-plugin: 11.0.0(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) + copy-webpack-plugin: 11.0.0(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) critters: 0.0.22 - css-loader: 6.10.0(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) + css-loader: 6.10.0(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))) esbuild-wasm: 0.20.1 fast-glob: 3.3.2 - http-proxy-middleware: 2.0.6(@types/express@4.17.21) + http-proxy-middleware: 2.0.7(@types/express@4.17.21) https-proxy-agent: 7.0.4 inquirer: 9.2.15 jsonc-parser: 3.2.1 karma-source-map-support: 1.4.0 less: 4.2.0 - less-loader: 11.1.0(less@4.2.0)(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) - license-webpack-plugin: 4.0.2(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) + less-loader: 11.1.0(less@4.2.0)(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) + license-webpack-plugin: 4.0.2(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) loader-utils: 3.2.1 magic-string: 0.30.8 - mini-css-extract-plugin: 2.8.1(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) + mini-css-extract-plugin: 2.8.1(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) mrmime: 2.0.0 open: 8.4.2 ora: 5.4.1 @@ -16639,26 +16662,26 @@ snapshots: picomatch: 4.0.1 piscina: 4.4.0 postcss: 8.4.35 - postcss-loader: 8.1.1(postcss@8.4.35)(typescript@5.4.5)(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) + postcss-loader: 8.1.1(postcss@8.4.35)(typescript@5.4.5)(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) resolve-url-loader: 5.0.0 rxjs: 7.8.1 sass: 1.71.1 - sass-loader: 14.1.1(sass-embedded@1.66.0)(sass@1.71.1)(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) + sass-loader: 14.1.1(sass-embedded@1.66.0)(sass@1.71.1)(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) semver: 7.6.0 - source-map-loader: 5.0.0(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) + source-map-loader: 5.0.0(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) source-map-support: 0.5.21 terser: 5.29.1 tree-kill: 1.2.2 tslib: 2.6.2 typescript: 5.4.5 undici: 6.11.1 - vite: 5.1.7(@types/node@20.11.17)(less@4.2.0)(lightningcss@1.25.1)(sass@1.71.1)(sugarss@2.0.0)(terser@5.29.1) + vite: 5.1.8(@types/node@20.11.17)(less@4.2.0)(lightningcss@1.25.1)(sass@1.71.1)(sugarss@2.0.0)(terser@5.29.1) watchpack: 2.4.0 - webpack: 5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) - webpack-dev-middleware: 6.1.2(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) - webpack-dev-server: 4.15.1(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) + webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) + webpack-dev-middleware: 6.1.2(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) + webpack-dev-server: 4.15.1(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) webpack-merge: 5.10.0 - webpack-subresource-integrity: 5.1.0(html-webpack-plugin@5.6.3(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)))(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) + webpack-subresource-integrity: 5.1.0(html-webpack-plugin@5.6.3(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)))(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) optionalDependencies: '@angular/platform-server': 17.3.12(@angular/animations@17.3.12(@angular/core@17.3.12(rxjs@7.8.1)(zone.js@0.14.10)))(@angular/common@17.3.12(@angular/core@17.3.12(rxjs@7.8.1)(zone.js@0.14.10))(rxjs@7.8.1))(@angular/compiler@17.3.12(@angular/core@17.3.12(rxjs@7.8.1)(zone.js@0.14.10)))(@angular/core@17.3.12(rxjs@7.8.1)(zone.js@0.14.10))(@angular/platform-browser@17.3.12(@angular/animations@17.3.12(@angular/core@17.3.12(rxjs@7.8.1)(zone.js@0.14.10)))(@angular/common@17.3.12(@angular/core@17.3.12(rxjs@7.8.1)(zone.js@0.14.10))(rxjs@7.8.1))(@angular/core@17.3.12(rxjs@7.8.1)(zone.js@0.14.10))) esbuild: 0.20.1 @@ -16685,12 +16708,12 @@ snapshots: - utf-8-validate - webpack-cli - '@angular-devkit/build-webpack@0.1703.8(chokidar@3.6.0)(webpack-dev-server@4.15.1(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)))(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1))': + '@angular-devkit/build-webpack@0.1703.11(chokidar@3.6.0)(webpack-dev-server@4.15.1(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)))(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1))': dependencies: - '@angular-devkit/architect': 0.1703.8(chokidar@3.6.0) + '@angular-devkit/architect': 0.1703.11(chokidar@3.6.0) rxjs: 7.8.1 - webpack: 5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) - webpack-dev-server: 4.15.1(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) + webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) + webpack-dev-server: 4.15.1(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) transitivePeerDependencies: - chokidar @@ -16714,16 +16737,14 @@ snapshots: optionalDependencies: chokidar: 3.6.0 - '@angular-devkit/core@17.3.8(chokidar@3.6.0)': + '@angular-devkit/core@19.0.2': dependencies: - ajv: 8.12.0 - ajv-formats: 2.1.1(ajv@8.12.0) - jsonc-parser: 3.2.1 - picomatch: 4.0.1 + ajv: 8.17.1 + ajv-formats: 3.0.1(ajv@8.17.1) + jsonc-parser: 3.3.1 + picomatch: 4.0.2 rxjs: 7.8.1 source-map: 0.7.4 - optionalDependencies: - chokidar: 3.6.0 '@angular-devkit/schematics@12.2.18': dependencies: @@ -16741,16 +16762,6 @@ snapshots: transitivePeerDependencies: - chokidar - '@angular-devkit/schematics@17.3.8(chokidar@3.6.0)': - dependencies: - '@angular-devkit/core': 17.3.8(chokidar@3.6.0) - jsonc-parser: 3.2.1 - magic-string: 0.30.8 - ora: 5.4.1 - rxjs: 7.8.1 - transitivePeerDependencies: - - chokidar - '@angular/animations@17.3.12(@angular/core@17.3.12(rxjs@7.8.1)(zone.js@0.14.10))': dependencies: '@angular/core': 17.3.12(rxjs@7.8.1)(zone.js@0.14.10) @@ -16909,17 +16920,17 @@ snapshots: '@babel/core@7.24.0': dependencies: '@ampproject/remapping': 2.3.0 - '@babel/code-frame': 7.24.2 - '@babel/generator': 7.24.5 + '@babel/code-frame': 7.24.7 + '@babel/generator': 7.25.6 '@babel/helper-compilation-targets': 7.23.6 - '@babel/helper-module-transforms': 7.24.5(@babel/core@7.24.0) + '@babel/helper-module-transforms': 7.25.2(@babel/core@7.24.0) '@babel/helpers': 7.24.5 - '@babel/parser': 7.24.5 - '@babel/template': 7.24.0 - '@babel/traverse': 7.24.5 - '@babel/types': 7.24.5 + '@babel/parser': 7.25.6 + '@babel/template': 7.25.0 + '@babel/traverse': 7.25.6 + '@babel/types': 7.25.6 convert-source-map: 2.0.0 - debug: 4.3.4 + debug: 4.3.7 gensync: 1.0.0-beta.2 json5: 2.2.3 semver: 6.3.1 @@ -16956,7 +16967,7 @@ snapshots: '@babel/generator@7.23.6': dependencies: - '@babel/types': 7.24.5 + '@babel/types': 7.25.6 '@jridgewell/gen-mapping': 0.3.5 '@jridgewell/trace-mapping': 0.3.25 jsesc: 2.5.2 @@ -16977,7 +16988,7 @@ snapshots: '@babel/helper-annotate-as-pure@7.22.5': dependencies: - '@babel/types': 7.24.5 + '@babel/types': 7.25.6 '@babel/helper-annotate-as-pure@7.24.7': dependencies: @@ -17188,6 +17199,16 @@ snapshots: transitivePeerDependencies: - supports-color + '@babel/helper-module-transforms@7.25.2(@babel/core@7.24.0)': + dependencies: + '@babel/core': 7.24.0 + '@babel/helper-module-imports': 7.24.7 + '@babel/helper-simple-access': 7.24.7 + '@babel/helper-validator-identifier': 7.24.7 + '@babel/traverse': 7.25.6 + transitivePeerDependencies: + - supports-color + '@babel/helper-module-transforms@7.25.2(@babel/core@7.24.5)': dependencies: '@babel/core': 7.24.5 @@ -17271,7 +17292,7 @@ snapshots: '@babel/helper-split-export-declaration@7.22.6': dependencies: - '@babel/types': 7.24.5 + '@babel/types': 7.25.6 '@babel/helper-split-export-declaration@7.24.5': dependencies: @@ -17712,7 +17733,7 @@ snapshots: dependencies: '@babel/core': 7.24.0 '@babel/helper-environment-visitor': 7.22.20 - '@babel/helper-plugin-utils': 7.24.5 + '@babel/helper-plugin-utils': 7.24.8 '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.24.0) '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.24.0) @@ -17735,9 +17756,11 @@ snapshots: '@babel/plugin-transform-async-to-generator@7.23.3(@babel/core@7.24.0)': dependencies: '@babel/core': 7.24.0 - '@babel/helper-module-imports': 7.24.3 - '@babel/helper-plugin-utils': 7.24.5 + '@babel/helper-module-imports': 7.24.7 + '@babel/helper-plugin-utils': 7.24.8 '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.24.0) + transitivePeerDependencies: + - supports-color '@babel/plugin-transform-async-to-generator@7.24.1(@babel/core@7.23.9)': dependencies: @@ -18205,7 +18228,7 @@ snapshots: '@babel/plugin-transform-react-jsx@7.23.4(@babel/core@7.23.9)': dependencies: '@babel/core': 7.23.9 - '@babel/helper-annotate-as-pure': 7.22.5 + '@babel/helper-annotate-as-pure': 7.24.7 '@babel/helper-module-imports': 7.24.7 '@babel/helper-plugin-utils': 7.24.8 '@babel/plugin-syntax-jsx': 7.24.7(@babel/core@7.23.9) @@ -18216,7 +18239,7 @@ snapshots: '@babel/plugin-transform-react-pure-annotations@7.24.1(@babel/core@7.23.9)': dependencies: '@babel/core': 7.23.9 - '@babel/helper-annotate-as-pure': 7.22.5 + '@babel/helper-annotate-as-pure': 7.24.7 '@babel/helper-plugin-utils': 7.24.8 '@babel/plugin-transform-regenerator@7.24.1(@babel/core@7.23.9)': @@ -18280,8 +18303,8 @@ snapshots: '@babel/plugin-transform-runtime@7.24.0(@babel/core@7.24.0)': dependencies: '@babel/core': 7.24.0 - '@babel/helper-module-imports': 7.24.3 - '@babel/helper-plugin-utils': 7.24.5 + '@babel/helper-module-imports': 7.24.7 + '@babel/helper-plugin-utils': 7.24.8 babel-plugin-polyfill-corejs2: 0.4.11(@babel/core@7.24.0) babel-plugin-polyfill-corejs3: 0.9.0(@babel/core@7.24.0) babel-plugin-polyfill-regenerator: 0.5.5(@babel/core@7.24.0) @@ -18489,8 +18512,8 @@ snapshots: '@babel/compat-data': 7.24.4 '@babel/core': 7.24.0 '@babel/helper-compilation-targets': 7.23.6 - '@babel/helper-plugin-utils': 7.24.5 - '@babel/helper-validator-option': 7.23.5 + '@babel/helper-plugin-utils': 7.24.8 + '@babel/helper-validator-option': 7.24.8 '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.24.1(@babel/core@7.24.0) '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.24.1(@babel/core@7.24.0) '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.24.1(@babel/core@7.24.0) @@ -18775,7 +18798,7 @@ snapshots: loader-utils: 2.0.4 typescript: 4.3.5 vinyl: 2.2.1 - webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11)) + webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) transitivePeerDependencies: - '@swc/core' - '@typescript-eslint/eslint-plugin' @@ -19271,7 +19294,7 @@ snapshots: '@eslint/eslintrc@0.4.3': dependencies: ajv: 6.12.6 - debug: 4.3.6 + debug: 4.3.7 espree: 7.3.1 globals: 13.24.0 ignore: 4.0.6 @@ -19364,7 +19387,7 @@ snapshots: '@humanwhocodes/config-array@0.5.0': dependencies: '@humanwhocodes/object-schema': 1.2.1 - debug: 4.3.6 + debug: 4.3.7 minimatch: 3.1.2 transitivePeerDependencies: - supports-color @@ -19740,11 +19763,11 @@ snapshots: pump: 3.0.0 tar-fs: 2.1.1 - '@ngtools/webpack@17.3.8(@angular/compiler-cli@17.3.12(@angular/compiler@17.3.12(@angular/core@17.3.12(rxjs@7.8.1)(zone.js@0.14.10)))(typescript@5.4.5))(typescript@5.4.5)(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1))': + '@ngtools/webpack@17.3.11(@angular/compiler-cli@17.3.12(@angular/compiler@17.3.12(@angular/core@17.3.12(rxjs@7.8.1)(zone.js@0.14.10)))(typescript@5.4.5))(typescript@5.4.5)(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1))': dependencies: '@angular/compiler-cli': 17.3.12(@angular/compiler@17.3.12(@angular/core@17.3.12(rxjs@7.8.1)(zone.js@0.14.10)))(typescript@5.4.5) typescript: 5.4.5 - webpack: 5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) + webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) '@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1': dependencies: @@ -20050,15 +20073,13 @@ snapshots: transitivePeerDependencies: - '@parcel/core' - '@parcel/cache@2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))(@swc/helpers@0.5.11)': + '@parcel/cache@2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))': dependencies: '@parcel/core': 2.12.0(@swc/helpers@0.5.11) '@parcel/fs': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))(@swc/helpers@0.5.11) '@parcel/logger': 2.12.0 '@parcel/utils': 2.12.0 lmdb: 2.8.5 - transitivePeerDependencies: - - '@swc/helpers' '@parcel/codeframe@2.12.0': dependencies: @@ -20118,7 +20139,7 @@ snapshots: '@parcel/core@2.12.0(@swc/helpers@0.5.11)': dependencies: '@mischnic/json-sourcemap': 0.1.1 - '@parcel/cache': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))(@swc/helpers@0.5.11) + '@parcel/cache': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11)) '@parcel/diagnostic': 2.12.0 '@parcel/events': 2.12.0 '@parcel/fs': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))(@swc/helpers@0.5.11) @@ -20533,7 +20554,7 @@ snapshots: '@parcel/types@2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))(@swc/helpers@0.5.11)': dependencies: - '@parcel/cache': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))(@swc/helpers@0.5.11) + '@parcel/cache': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11)) '@parcel/diagnostic': 2.12.0 '@parcel/fs': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))(@swc/helpers@0.5.11) '@parcel/package-manager': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))(@swc/helpers@0.5.11) @@ -21361,7 +21382,7 @@ snapshots: ejs: 3.1.10 esbuild: 0.18.20 esbuild-plugin-alias: 0.2.1 - express: 4.20.0 + express: 4.21.1 find-cache-dir: 3.3.2 fs-extra: 11.2.0 process: 0.11.10 @@ -21391,7 +21412,7 @@ snapshots: constants-browserify: 1.0.0 css-loader: 6.10.0(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.18.20)) es-module-lexer: 1.5.2 - express: 4.20.0 + express: 4.21.1 fork-ts-checker-webpack-plugin: 8.0.0(typescript@4.9.5)(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.18.20)) fs-extra: 11.2.0 html-webpack-plugin: 5.6.0(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.18.20)) @@ -21453,7 +21474,7 @@ snapshots: detect-indent: 6.1.0 envinfo: 7.13.0 execa: 5.1.1 - express: 4.20.0 + express: 4.21.1 find-up: 5.0.0 fs-extra: 11.2.0 get-npm-tarball-url: 2.1.0 @@ -21583,7 +21604,7 @@ snapshots: cli-table3: 0.6.4 compression: 1.7.4 detect-port: 1.5.1 - express: 4.20.0 + express: 4.21.1 fs-extra: 11.2.0 globby: 11.1.0 ip: 2.0.1 @@ -22117,11 +22138,6 @@ snapshots: '@types/escodegen@0.0.6': {} - '@types/eslint-scope@3.7.7': - dependencies: - '@types/eslint': 8.56.2 - '@types/estree': 1.0.5 - '@types/eslint-visitor-keys@1.0.0': {} '@types/eslint@8.56.2': @@ -22725,9 +22741,9 @@ snapshots: '@ungap/structured-clone@1.2.0': {} - '@vitejs/plugin-basic-ssl@1.1.0(vite@5.1.7(@types/node@20.11.17)(less@4.2.0)(lightningcss@1.25.1)(sass@1.71.1)(sugarss@2.0.0)(terser@5.29.1))': + '@vitejs/plugin-basic-ssl@1.1.0(vite@5.1.8(@types/node@20.11.17)(less@4.2.0)(lightningcss@1.25.1)(sass@1.71.1)(sugarss@2.0.0)(terser@5.29.1))': dependencies: - vite: 5.1.7(@types/node@20.11.17)(less@4.2.0)(lightningcss@1.25.1)(sass@1.71.1)(sugarss@2.0.0)(terser@5.29.1) + vite: 5.1.8(@types/node@20.11.17)(less@4.2.0)(lightningcss@1.25.1)(sass@1.71.1)(sugarss@2.0.0)(terser@5.29.1) '@vitest/expect@0.34.7': dependencies: @@ -23144,10 +23160,6 @@ snapshots: dependencies: '@types/estree': 0.0.46 - acorn-import-assertions@1.9.0(acorn@8.11.3): - dependencies: - acorn: 8.11.3 - acorn-import-attributes@1.9.5(acorn@8.11.3): dependencies: acorn: 8.11.3 @@ -23193,7 +23205,7 @@ snapshots: agent-base@7.1.1: dependencies: - debug: 4.3.6 + debug: 4.3.7 transitivePeerDependencies: - supports-color @@ -23235,6 +23247,10 @@ snapshots: optionalDependencies: ajv: 8.13.0 + ajv-formats@3.0.1(ajv@8.17.1): + optionalDependencies: + ajv: 8.17.1 + ajv-keywords@3.5.2(ajv@6.12.6): dependencies: ajv: 6.12.6 @@ -23265,6 +23281,13 @@ snapshots: require-from-string: 2.0.2 uri-js: 4.4.1 + ajv@8.17.1: + dependencies: + fast-deep-equal: 3.1.3 + fast-uri: 3.0.3 + json-schema-traverse: 1.0.0 + require-from-string: 2.0.2 + ajv@8.6.2: dependencies: fast-deep-equal: 3.1.3 @@ -23653,7 +23676,7 @@ snapshots: caniuse-lite: 1.0.30001615 fraction.js: 4.3.7 normalize-range: 0.1.2 - picocolors: 1.0.0 + picocolors: 1.1.1 postcss: 8.4.35 postcss-value-parser: 4.2.0 @@ -23791,14 +23814,14 @@ snapshots: '@babel/core': 7.23.9 find-cache-dir: 4.0.0 schema-utils: 4.2.0 - webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11)) + webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) - babel-loader@9.1.3(@babel/core@7.24.0)(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): + babel-loader@9.1.3(@babel/core@7.24.0)(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): dependencies: '@babel/core': 7.24.0 find-cache-dir: 4.0.0 schema-utils: 4.2.0 - webpack: 5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) + webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) babel-messages@6.23.0: dependencies: @@ -23826,7 +23849,7 @@ snapshots: babel-plugin-istanbul@6.1.1: dependencies: - '@babel/helper-plugin-utils': 7.24.5 + '@babel/helper-plugin-utils': 7.24.8 '@istanbuljs/load-nyc-config': 1.1.0 '@istanbuljs/schema': 0.1.3 istanbul-lib-instrument: 5.2.1 @@ -25050,6 +25073,8 @@ snapshots: cookie@0.6.0: {} + cookie@0.7.1: {} + copy-anything@2.0.6: dependencies: is-what: 3.14.1 @@ -25061,7 +25086,7 @@ snapshots: each-props: 1.3.2 is-plain-object: 5.0.0 - copy-webpack-plugin@11.0.0(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): + copy-webpack-plugin@11.0.0(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): dependencies: fast-glob: 3.3.2 glob-parent: 6.0.2 @@ -25069,7 +25094,7 @@ snapshots: normalize-path: 3.0.0 schema-utils: 4.2.0 serialize-javascript: 6.0.2 - webpack: 5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) + webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) core-js-compat@3.37.0: dependencies: @@ -25274,19 +25299,6 @@ snapshots: utrie: 1.0.2 optional: true - css-loader@6.10.0(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): - dependencies: - icss-utils: 5.1.0(postcss@8.4.38) - postcss: 8.4.38 - postcss-modules-extract-imports: 3.1.0(postcss@8.4.38) - postcss-modules-local-by-default: 4.0.5(postcss@8.4.38) - postcss-modules-scope: 3.2.0(postcss@8.4.38) - postcss-modules-values: 4.0.0(postcss@8.4.38) - postcss-value-parser: 4.2.0 - semver: 7.6.3 - optionalDependencies: - webpack: 5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) - css-loader@6.10.0(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.18.20)): dependencies: icss-utils: 5.1.0(postcss@8.4.38) @@ -25311,7 +25323,7 @@ snapshots: postcss-value-parser: 4.2.0 semver: 7.6.3 optionalDependencies: - webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11)) + webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) css-loader@6.10.0(webpack@5.94.0): dependencies: @@ -25762,7 +25774,7 @@ snapshots: devextreme-cldr-data@1.0.3: {} - devextreme-internal-tools@16.0.0-beta.18: + devextreme-internal-tools@16.0.0: dependencies: dasherize: 2.0.0 deepmerge: 4.3.1 @@ -27250,6 +27262,42 @@ snapshots: transitivePeerDependencies: - supports-color + express@4.21.1: + dependencies: + accepts: 1.3.8 + array-flatten: 1.1.1 + body-parser: 1.20.3 + content-disposition: 0.5.4 + content-type: 1.0.5 + cookie: 0.7.1 + cookie-signature: 1.0.6 + debug: 2.6.9 + depd: 2.0.0 + encodeurl: 2.0.0 + escape-html: 1.0.3 + etag: 1.8.1 + finalhandler: 1.3.1 + fresh: 0.5.2 + http-errors: 2.0.0 + merge-descriptors: 1.0.3 + methods: 1.1.2 + on-finished: 2.4.1 + parseurl: 1.3.3 + path-to-regexp: 0.1.10 + proxy-addr: 2.0.7 + qs: 6.13.0 + range-parser: 1.2.1 + safe-buffer: 5.2.1 + send: 0.19.0 + serve-static: 1.16.2 + setprototypeof: 1.2.0 + statuses: 2.0.1 + type-is: 1.6.18 + utils-merge: 1.0.1 + vary: 1.1.2 + transitivePeerDependencies: + - supports-color + ext@1.7.0: dependencies: type: 2.7.2 @@ -27367,6 +27415,8 @@ snapshots: fast-safe-stringify@2.1.1: {} + fast-uri@3.0.3: {} + fastest-levenshtein@1.0.16: {} fastparse@1.1.2: {} @@ -27485,6 +27535,18 @@ snapshots: transitivePeerDependencies: - supports-color + finalhandler@1.3.1: + dependencies: + debug: 2.6.9 + encodeurl: 2.0.0 + escape-html: 1.0.3 + on-finished: 2.4.1 + parseurl: 1.3.3 + statuses: 2.0.1 + unpipe: 1.0.0 + transitivePeerDependencies: + - supports-color + find-babel-config@2.1.1: dependencies: json5: 2.2.3 @@ -27805,7 +27867,7 @@ snapshots: dependencies: basic-ftp: 5.0.5 data-uri-to-buffer: 6.0.2 - debug: 4.3.6 + debug: 4.3.7 fs-extra: 11.2.0 transitivePeerDependencies: - supports-color @@ -28654,7 +28716,7 @@ snapshots: optionalDependencies: webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.18.20) - html-webpack-plugin@5.6.3(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): + html-webpack-plugin@5.6.3(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): dependencies: '@types/html-minifier-terser': 6.1.0 html-minifier-terser: 6.1.0 @@ -28662,7 +28724,7 @@ snapshots: pretty-error: 4.0.0 tapable: 2.2.1 optionalDependencies: - webpack: 5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) + webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) optional: true html2canvas@1.4.1: @@ -28748,7 +28810,7 @@ snapshots: http-proxy-agent@7.0.2: dependencies: agent-base: 7.1.1 - debug: 4.3.6 + debug: 4.3.7 transitivePeerDependencies: - supports-color @@ -28764,6 +28826,18 @@ snapshots: transitivePeerDependencies: - debug + http-proxy-middleware@2.0.7(@types/express@4.17.21): + dependencies: + '@types/http-proxy': 1.17.14 + http-proxy: 1.18.1 + is-glob: 4.0.3 + is-plain-obj: 3.0.0 + micromatch: 4.0.5 + optionalDependencies: + '@types/express': 4.17.21 + transitivePeerDependencies: + - debug + http-proxy@1.18.1: dependencies: eventemitter3: 4.0.7 @@ -28813,7 +28887,7 @@ snapshots: https-proxy-agent@4.0.0: dependencies: agent-base: 5.1.1 - debug: 4.3.6 + debug: 4.3.7 transitivePeerDependencies: - supports-color @@ -28827,14 +28901,14 @@ snapshots: https-proxy-agent@7.0.4: dependencies: agent-base: 7.1.1 - debug: 4.3.4 + debug: 4.3.7 transitivePeerDependencies: - supports-color https-proxy-agent@7.0.5: dependencies: agent-base: 7.1.1 - debug: 4.3.6 + debug: 4.3.7 transitivePeerDependencies: - supports-color @@ -30128,6 +30202,8 @@ snapshots: jsonc-parser@3.2.1: {} + jsonc-parser@3.3.1: {} + jsonfile@4.0.0: optionalDependencies: graceful-fs: 4.2.11 @@ -30228,7 +30304,7 @@ snapshots: dependencies: glob: 7.2.3 minimatch: 9.0.5 - webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11)) + webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) webpack-merge: 4.2.2 karma@6.4.4: @@ -30338,11 +30414,11 @@ snapshots: lead@4.0.0: {} - less-loader@11.1.0(less@4.2.0)(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): + less-loader@11.1.0(less@4.2.0)(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): dependencies: klona: 2.0.6 less: 4.2.0 - webpack: 5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) + webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) less@4.2.0: dependencies: @@ -30365,11 +30441,11 @@ snapshots: prelude-ls: 1.2.1 type-check: 0.4.0 - license-webpack-plugin@4.0.2(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): + license-webpack-plugin@4.0.2(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): dependencies: webpack-sources: 3.2.3 optionalDependencies: - webpack: 5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) + webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) lie@3.3.0: dependencies: @@ -31130,11 +31206,11 @@ snapshots: min-indent@1.0.1: {} - mini-css-extract-plugin@2.8.1(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): + mini-css-extract-plugin@2.8.1(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): dependencies: schema-utils: 4.2.0 tapable: 2.2.1 - webpack: 5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) + webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) minimalistic-assert@1.0.1: {} @@ -32023,7 +32099,7 @@ snapshots: dependencies: '@tootallnate/quickjs-emscripten': 0.23.0 agent-base: 7.1.1 - debug: 4.3.6 + debug: 4.3.7 get-uri: 6.0.3 http-proxy-agent: 7.0.2 https-proxy-agent: 7.0.5 @@ -32285,6 +32361,8 @@ snapshots: picomatch@4.0.1: {} + picomatch@4.0.2: {} + pidtree@0.3.1: {} pidtree@0.6.0: {} @@ -32386,14 +32464,14 @@ snapshots: postcss: 8.4.38 postcss-syntax: 0.36.2(postcss-html@0.36.0)(postcss@8.4.38) - postcss-loader@8.1.1(postcss@8.4.35)(typescript@5.4.5)(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): + postcss-loader@8.1.1(postcss@8.4.35)(typescript@5.4.5)(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): dependencies: cosmiconfig: 9.0.0(typescript@5.4.5) jiti: 1.21.0 postcss: 8.4.35 - semver: 7.6.2 + semver: 7.6.3 optionalDependencies: - webpack: 5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) + webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) transitivePeerDependencies: - typescript @@ -32463,8 +32541,8 @@ snapshots: postcss@8.4.35: dependencies: nanoid: 3.3.7 - picocolors: 1.0.0 - source-map-js: 1.2.0 + picocolors: 1.1.1 + source-map-js: 1.2.1 postcss@8.4.38: dependencies: @@ -33556,13 +33634,13 @@ snapshots: sass-embedded-win32-ia32: 1.66.0 sass-embedded-win32-x64: 1.66.0 - sass-loader@14.1.1(sass-embedded@1.66.0)(sass@1.71.1)(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): + sass-loader@14.1.1(sass-embedded@1.66.0)(sass@1.71.1)(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): dependencies: neo-async: 2.6.2 optionalDependencies: sass: 1.71.1 sass-embedded: 1.66.0 - webpack: 5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) + webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) sass-lookup@5.0.1: dependencies: @@ -33572,7 +33650,7 @@ snapshots: dependencies: chokidar: 3.6.0 immutable: 4.3.5 - source-map-js: 1.2.0 + source-map-js: 1.2.1 sass@1.76.0: dependencies: @@ -33724,6 +33802,15 @@ snapshots: transitivePeerDependencies: - supports-color + serve-static@1.16.2: + dependencies: + encodeurl: 2.0.0 + escape-html: 1.0.3 + parseurl: 1.3.3 + send: 0.19.0 + transitivePeerDependencies: + - supports-color + set-blocking@2.0.0: {} set-cookie-parser@2.6.0: {} @@ -33930,7 +34017,7 @@ snapshots: socks-proxy-agent@8.0.4: dependencies: agent-base: 7.1.1 - debug: 4.3.6 + debug: 4.3.7 socks: 2.8.3 transitivePeerDependencies: - supports-color @@ -33950,11 +34037,11 @@ snapshots: source-map-js: 1.2.1 webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(webpack-cli@5.1.4) - source-map-loader@5.0.0(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): + source-map-loader@5.0.0(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): dependencies: iconv-lite: 0.6.3 source-map-js: 1.2.1 - webpack: 5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) + webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) source-map-resolve@0.5.3: dependencies: @@ -34192,7 +34279,7 @@ snapshots: dependencies: loader-utils: 2.0.4 schema-utils: 3.3.0 - webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11)) + webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) string-width@1.0.2: dependencies: @@ -34331,7 +34418,7 @@ snapshots: style-loader@3.3.4(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))): dependencies: - webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11)) + webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) style-loader@3.3.4(webpack@5.94.0): dependencies: @@ -34817,29 +34904,18 @@ snapshots: '@swc/core': 1.4.17(@swc/helpers@0.5.11) esbuild: 0.18.20 - terser-webpack-plugin@5.3.10(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): + terser-webpack-plugin@5.3.10(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): dependencies: '@jridgewell/trace-mapping': 0.3.25 jest-worker: 27.5.1 schema-utils: 3.3.0 serialize-javascript: 6.0.2 terser: 5.31.0 - webpack: 5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) + webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) optionalDependencies: '@swc/core': 1.4.17(@swc/helpers@0.5.11) esbuild: 0.20.1 - terser-webpack-plugin@5.3.10(@swc/core@1.4.17(@swc/helpers@0.5.11))(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))): - dependencies: - '@jridgewell/trace-mapping': 0.3.25 - jest-worker: 27.5.1 - schema-utils: 3.3.0 - serialize-javascript: 6.0.2 - terser: 5.31.0 - webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11)) - optionalDependencies: - '@swc/core': 1.4.17(@swc/helpers@0.5.11) - terser-webpack-plugin@5.3.10(@swc/core@1.4.17(@swc/helpers@0.5.11))(webpack@5.94.0): dependencies: '@jridgewell/trace-mapping': 0.3.25 @@ -34870,7 +34946,7 @@ snapshots: schema-utils: 3.3.0 serialize-javascript: 6.0.2 terser: 5.31.0 - webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11)) + webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) optionalDependencies: '@swc/core': 1.4.17(@swc/helpers@0.5.11) @@ -36448,7 +36524,7 @@ snapshots: replace-ext: 2.0.0 teex: 1.0.1 - vite@5.1.7(@types/node@20.11.17)(less@4.2.0)(lightningcss@1.25.1)(sass@1.71.1)(sugarss@2.0.0)(terser@5.29.1): + vite@5.1.8(@types/node@20.11.17)(less@4.2.0)(lightningcss@1.25.1)(sass@1.71.1)(sugarss@2.0.0)(terser@5.29.1): dependencies: esbuild: 0.19.3 postcss: 8.4.38 @@ -36637,24 +36713,24 @@ snapshots: optionalDependencies: webpack-dev-server: 4.15.1(webpack-cli@5.1.4)(webpack@5.94.0) - webpack-dev-middleware@5.3.4(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): + webpack-dev-middleware@5.3.4(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.18.20)): dependencies: colorette: 2.0.20 memfs: 3.5.3 mime-types: 2.1.35 range-parser: 1.2.1 schema-utils: 4.2.0 - webpack: 5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) + webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.18.20) + optional: true - webpack-dev-middleware@5.3.4(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.18.20)): + webpack-dev-middleware@5.3.4(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): dependencies: colorette: 2.0.20 memfs: 3.5.3 mime-types: 2.1.35 range-parser: 1.2.1 schema-utils: 4.2.0 - webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.18.20) - optional: true + webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) webpack-dev-middleware@5.3.4(webpack@5.94.0): dependencies: @@ -36665,7 +36741,7 @@ snapshots: schema-utils: 4.2.0 webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(webpack-cli@5.1.4) - webpack-dev-middleware@6.1.2(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): + webpack-dev-middleware@6.1.2(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): dependencies: colorette: 2.0.20 memfs: 3.5.3 @@ -36673,7 +36749,7 @@ snapshots: range-parser: 1.2.1 schema-utils: 4.2.0 optionalDependencies: - webpack: 5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) + webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) webpack-dev-middleware@6.1.3(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.18.20)): dependencies: @@ -36726,7 +36802,7 @@ snapshots: - supports-color - utf-8-validate - webpack-dev-server@4.15.1(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): + webpack-dev-server@4.15.1(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.18.20)): dependencies: '@types/bonjour': 3.5.13 '@types/connect-history-api-fallback': 1.5.4 @@ -36756,17 +36832,18 @@ snapshots: serve-index: 1.9.1 sockjs: 0.3.24 spdy: 4.0.2 - webpack-dev-middleware: 5.3.4(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) + webpack-dev-middleware: 5.3.4(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.18.20)) ws: 8.18.0 optionalDependencies: - webpack: 5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) + webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.18.20) transitivePeerDependencies: - bufferutil - debug - supports-color - utf-8-validate + optional: true - webpack-dev-server@4.15.1(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.18.20)): + webpack-dev-server@4.15.1(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): dependencies: '@types/bonjour': 3.5.13 '@types/connect-history-api-fallback': 1.5.4 @@ -36796,16 +36873,15 @@ snapshots: serve-index: 1.9.1 sockjs: 0.3.24 spdy: 4.0.2 - webpack-dev-middleware: 5.3.4(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.18.20)) + webpack-dev-middleware: 5.3.4(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) ws: 8.18.0 optionalDependencies: - webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.18.20) + webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) transitivePeerDependencies: - bufferutil - debug - supports-color - utf-8-validate - optional: true webpack-hot-middleware@2.26.1: dependencies: @@ -36835,51 +36911,20 @@ snapshots: supports-color: 8.1.1 through: 2.3.8 vinyl: 2.2.1 - webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11)) + webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) - webpack-subresource-integrity@5.1.0(html-webpack-plugin@5.6.3(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)))(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): + webpack-subresource-integrity@5.1.0(html-webpack-plugin@5.6.3(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)))(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)): dependencies: typed-assert: 1.0.9 - webpack: 5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) + webpack: 5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1) optionalDependencies: - html-webpack-plugin: 5.6.3(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) + html-webpack-plugin: 5.6.3(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) webpack-virtual-modules@0.5.0: {} webpack-virtual-modules@0.6.1: {} - webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1): - dependencies: - '@types/eslint-scope': 3.7.7 - '@types/estree': 1.0.5 - '@webassemblyjs/ast': 1.12.1 - '@webassemblyjs/wasm-edit': 1.12.1 - '@webassemblyjs/wasm-parser': 1.12.1 - acorn: 8.11.3 - acorn-import-assertions: 1.9.0(acorn@8.11.3) - browserslist: 4.23.0 - chrome-trace-event: 1.0.3 - enhanced-resolve: 5.16.0 - es-module-lexer: 1.5.2 - eslint-scope: 5.1.1 - events: 3.3.0 - glob-to-regexp: 0.4.1 - graceful-fs: 4.2.11 - json-parse-even-better-errors: 2.3.1 - loader-runner: 4.3.0 - mime-types: 2.1.35 - neo-async: 2.6.2 - schema-utils: 3.3.0 - tapable: 2.2.1 - terser-webpack-plugin: 5.3.10(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)(webpack@5.90.3(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) - watchpack: 2.4.0 - webpack-sources: 3.2.3 - transitivePeerDependencies: - - '@swc/core' - - esbuild - - uglify-js - - webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11)): + webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.18.20): dependencies: '@types/estree': 1.0.5 '@webassemblyjs/ast': 1.12.1 @@ -36901,7 +36946,7 @@ snapshots: neo-async: 2.6.2 schema-utils: 3.3.0 tapable: 2.2.1 - terser-webpack-plugin: 5.3.10(@swc/core@1.4.17(@swc/helpers@0.5.11))(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))) + terser-webpack-plugin: 5.3.10(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.18.20)(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.18.20)) watchpack: 2.4.1 webpack-sources: 3.2.3 transitivePeerDependencies: @@ -36909,7 +36954,7 @@ snapshots: - esbuild - uglify-js - webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.18.20): + webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1): dependencies: '@types/estree': 1.0.5 '@webassemblyjs/ast': 1.12.1 @@ -36931,7 +36976,7 @@ snapshots: neo-async: 2.6.2 schema-utils: 3.3.0 tapable: 2.2.1 - terser-webpack-plugin: 5.3.10(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.18.20)(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.18.20)) + terser-webpack-plugin: 5.3.10(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)(webpack@5.94.0(@swc/core@1.4.17(@swc/helpers@0.5.11))(esbuild@0.20.1)) watchpack: 2.4.1 webpack-sources: 3.2.3 transitivePeerDependencies: diff --git a/tools/scripts/build-all.ts b/tools/scripts/build-all.ts index 2a1f7770beed..578f395c7766 100644 --- a/tools/scripts/build-all.ts +++ b/tools/scripts/build-all.ts @@ -16,7 +16,7 @@ const DEVEXTREME_NPM_DIR = path.join(ROOT_DIR, 'packages/devextreme/artifacts/np const injectDescriptions = () => { sh.pushd(ROOT_DIR); - // Inject descriptions + const DOCUMENTATION_TEMP_DIR = path.join(ARTIFACTS_DIR, 'doc_tmp'); sh.exec(`git clone -b ${MAJOR_VERSION} --depth 1 --config core.longpaths=true https://github.com/DevExpress/devextreme-documentation.git ${DOCUMENTATION_TEMP_DIR}`); @@ -43,12 +43,13 @@ const packAndCopy = (outputDir: string) => { const monorepoVersion = sh.exec('pnpm pkg get version', { silent: true }).stdout.replaceAll('"', ''); const MAJOR_VERSION = monorepoVersion.split('.').slice(0, 2).join('_'); -// Prepare metadata sh.cd(ROOT_DIR); -sh.exec('pnpm run tools:discover-declarations'); -sh.exec(`pnpm run tools make-aspnet-metadata --version ${MAJOR_VERSION}`); if (!devMode) { + sh.exec('pnpm run tools:discover-declarations'); + // aspnet metadata will be used in Build custom-tasks to inject aspnet descriptions + sh.exec(`pnpm run tools make-aspnet-metadata --version ${MAJOR_VERSION}`); + injectDescriptions(); }