Skip to content

Commit 4862374

Browse files
marker-daomarker dao ®
andauthored
Popups: Remove m_ (#33927)
Co-authored-by: marker dao ® <youdontknow@marker-dao.eth>
1 parent aa72721 commit 4862374

53 files changed

Lines changed: 65 additions & 71 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1011,7 +1011,7 @@
10111011
/packages/devextreme/js/ui/tooltip_types.d.ts @DevExpress/devextreme-editors
10121012

10131013
/packages/devextreme/js/__internal/ui/tooltip/** @DevExpress/devextreme-editors
1014-
/packages/devextreme/js/__internal/ui/m_tooltip.ts @DevExpress/devextreme-editors
1014+
/packages/devextreme/js/__internal/ui/tooltip.ts @DevExpress/devextreme-editors
10151015

10161016
/packages/devextreme-scss/scss/widgets/base/_tooltip.scss @DevExpress/devextreme-editors
10171017
/packages/devextreme-scss/scss/widgets/**/tooltip/** @DevExpress/devextreme-editors

packages/devextreme/eslint-scheduler-allowlist.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ const schedulerLegacyMembers = [
8484
// workspaces/m_virtual_scrolling.ts
8585
'_renderGrid',
8686

87-
// appointment_popup/m_popup.ts
87+
// appointment_popup/popup.ts
8888
'_popup',
8989

9090
// appointment_popup/m_legacy_popup.ts

packages/devextreme/js/__internal/scheduler/appointment_popup/form.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import type { Properties as TextAreaProperties } from '@js/ui/text_area';
2525
import { current, isFluent } from '@js/ui/themes';
2626
import { dateSerialization } from '@ts/core/utils/m_date_serialization';
2727
import DropDownEditor from '@ts/ui/drop_down_editor/drop_down_editor';
28-
import type Popup from '@ts/ui/popup/m_popup';
28+
import type Popup from '@ts/ui/popup/popup';
2929

3030
import type { TimeZoneCalculator } from '../r1/timezone_calculator/calculator';
3131
import type { CreateComponentFn, SafeAppointment } from '../types';

packages/devextreme/js/__internal/scheduler/appointments/appointment/m_appointment.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import type { dxElementWrapper } from '@js/core/renderer';
99
import $ from '@js/core/renderer';
1010
import { extend } from '@js/core/utils/extend';
1111
import Resizable from '@js/ui/resizable';
12-
import { hide, show } from '@ts/ui/tooltip/m_tooltip';
12+
import { hide, show } from '@ts/ui/tooltip/tooltip';
1313

1414
import {
1515
ALL_DAY_APPOINTMENT_CLASS,

packages/devextreme/js/__internal/scheduler/tooltip_strategies/desktop_tooltip_strategy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import type {
44
ContentReadyEvent, InitializedEvent, ItemContextMenuEvent, Properties as ListProperties,
55
} from '@js/ui/list';
66
import supportUtils from '@ts/core/utils/m_support';
7-
import Tooltip from '@ts/ui/m_tooltip';
7+
import Tooltip from '@ts/ui/tooltip';
88

99
import type { AppointmentTooltipItem } from '../types';
1010
import { TooltipStrategyBase } from './tooltip_strategy_base';

packages/devextreme/js/__internal/scheduler/tooltip_strategies/tooltip_strategy_base.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import type { Properties as OverlayProperties } from '@js/ui/overlay';
1717
import type { Appointment, AppointmentClickEvent, Properties as SchedulerProperties } from '@js/ui/scheduler';
1818
import { createPromise } from '@ts/core/utils/promise';
1919
import List from '@ts/ui/list/list.edit';
20-
import type Tooltip from '@ts/ui/m_tooltip';
20+
import type Tooltip from '@ts/ui/tooltip';
2121

2222
import type { AppointmentTooltipItem, TargetedAppointment } from '../types';
2323

packages/devextreme/js/__internal/ui/action_sheet.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import type { Properties as ButtonProperties } from '@js/ui/button';
1414
import type { OptionChanged } from '@ts/core/widget/types';
1515
import Button from '@ts/ui/button/wrapper';
1616
import CollectionWidget from '@ts/ui/collection/collection_widget.edit';
17-
import type { PopoverProperties } from '@ts/ui/popover/m_popover';
18-
import Popover from '@ts/ui/popover/m_popover';
19-
import type { PopupProperties } from '@ts/ui/popup/m_popup';
20-
import Popup from '@ts/ui/popup/m_popup';
17+
import type { PopoverProperties } from '@ts/ui/popover/popover';
18+
import Popover from '@ts/ui/popover/popover';
19+
import type { PopupProperties } from '@ts/ui/popup/popup';
20+
import Popup from '@ts/ui/popup/popup';
2121

2222
// STYLE actionSheet
2323

packages/devextreme/js/__internal/ui/color_box/color_box.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import type { OptionChanged } from '@ts/core/widget/types';
77
import Color from '@ts/m_color';
88
import DropDownEditor from '@ts/ui/drop_down_editor/drop_down_editor';
99
import type { ValueChangedEvent } from '@ts/ui/editor/editor';
10+
import type { PopupProperties } from '@ts/ui/popup/popup';
11+
import type Popup from '@ts/ui/popup/popup';
1012

11-
import type { PopupProperties } from '../popup/m_popup';
12-
import type Popup from '../popup/m_popup';
1313
import type { ColorViewProperties } from './color_view';
1414
import ColorView from './color_view';
1515

packages/devextreme/js/__internal/ui/date_box/date_box.base.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import type { ToolbarItem } from '@js/ui/popup';
2323
import type { OptionChanged } from '@ts/core/widget/types';
2424
import DropDownEditor from '@ts/ui/drop_down_editor/drop_down_editor';
2525
import type { ValueChangedEvent } from '@ts/ui/editor/editor';
26+
import type { PopupProperties } from '@ts/ui/popup/popup';
2627

27-
import type { PopupProperties } from '../popup/m_popup';
2828
import uiDateUtils from './date_utils';
2929
import Calendar from './m_date_box.strategy.calendar';
3030
import CalendarWithTime from './m_date_box.strategy.calendar_with_time';
@@ -410,6 +410,7 @@ class DateBox extends DropDownEditor<DateBoxBaseProperties> {
410410

411411
_popupConfig(): PopupProperties {
412412
const popupConfig = super._popupConfig();
413+
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
413414
return {
414415
...this._strategy.popupConfig(popupConfig),
415416
title: this._getPopupTitle(),

packages/devextreme/js/__internal/ui/date_box/m_date_box.strategy.calendar.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import type { ToolbarItem } from '@js/ui/popup';
88
import { isMaterial } from '@js/ui/themes';
99
import { splitPair } from '@ts/core/utils/m_common';
1010

11-
import type { PopupProperties } from '../popup/m_popup';
11+
import type { PopupProperties } from '../popup/popup';
1212
import DateBoxStrategy from './m_date_box.strategy';
1313

1414
const TODAY_BUTTON_CLASS = 'dx-button-today';

0 commit comments

Comments
 (0)