Resolve conflicts

js/core/utils/icon.js

@@ -3,7 +3,7 @@ import $ from '../../core/renderer';
 const ICON_CLASS = 'dx-icon';
 const SVG_ICON_CLASS = 'dx-svg-icon';
 
-const getImageSourceType = (source) => {
+export const getImageSourceType = (source) => {
     if(!source || typeof source !== 'string') {
         return false;
     }
@@ -27,7 +27,7 @@ const getImageSourceType = (source) => {
     return false;
 };
 
-const getImageContainer = (source) => {
+export const getImageContainer = (source) => {
     switch(getImageSourceType(source)) {
         case 'image':
             return $('<img>').attr('src', source).addClass(ICON_CLASS);
@@ -41,6 +41,3 @@ const getImageContainer = (source) => {
             return null;
     }
 };
-
-exports.getImageSourceType = getImageSourceType;
-exports.getImageContainer = getImageContainer;

js/renovation/button.tsx

@@ -117,7 +117,10 @@ export class ButtonProps extends BaseWidgetProps {
     @OneWay() hoverStateEnabled?: boolean = true;
     @OneWay() icon?: string = '';
     @OneWay() iconPosition?: string = 'left';
-    @Event() onClick?: (e: any) => any = noop;
+    @Event({
+        actionConfig: { excludeValidators: ['readOnly'] },
+    })
+    onClick?: (e: any) => any = noop;
     @Event() onSubmit?: (e: any) => any = noop;
     @OneWay() pressed?: boolean;
     @OneWay() stylingMode?: 'outlined' | 'text' | 'contained';

js/renovation/dist/button.j.jsx

@@ -2,12 +2,6 @@ import registerComponent from '../../core/component_registrator';
 import ValidationEngine from '../../ui/validation_engine';
 import Component from '../preact-wrapper/component';
 import ButtonComponent from '../button.p';
-import { getInnerActionName } from '../preact-wrapper/utils';
-
-const actions = {
-    onClick: { excludeValidators: ['readOnly'] },
-    onContentReady: { excludeValidators: ['disabled', 'readOnly'] },
-};
 
 export default class Button extends Component {
     get _viewComponent() {
@@ -18,12 +12,6 @@ export default class Button extends Component {
         props.render = this._createTemplateComponent(props, props.template, true);
         props.onKeyDown = this._wrapKeyDownHandler(props.onKeyDown);
 
-        props.pressedChange = (pressed) => this.option('pressed', pressed);
-
-        Object.keys(actions).forEach((name) => {
-            props[name] = this.option(getInnerActionName(name));
-        });
-
         props.validationGroup = ValidationEngine.getGroupConfig(this._findGroup());
 
         return props;
@@ -47,28 +35,26 @@ export default class Button extends Component {
         if(this.option('useSubmitBehavior')) {
             this.option('onSubmit', this._getSubmitAction());
         }
+    }
 
-        Object.keys(actions).forEach((name) => {
-            this._addAction(name, actions[name]);
-        });
+    _getActionsMap() {
+        return {
+            onClick: { excludeValidators: ['readOnly'] },
+            onContentReady: { excludeValidators: ['disabled', 'readOnly'] },
+        };
     }
 
     _optionChanged(option) {
         const { name, value } = option;
-        if(actions[name]) {
-            this._addAction(name, actions[name]);
-        }
 
         switch(name) {
             case 'useSubmitBehavior':
                 value === true && this.option('onSubmit', this._getSubmitAction());
-                break;
-            case 'onOptionChanged':
-                super._optionChanged(option);
+                option = undefined;
                 break;
         }
 
-        super._optionChanged();
+        super._optionChanged(option);
     }
 
     _getSubmitAction() {

js/renovation/preact-wrapper/component.d.ts

@@ -0,0 +1,36 @@
+import DOMComponent from '../../core/dom_component';
+
+export default class PreactWrapper extends DOMComponent {
+    viewRef: any;
+
+    getInstance(): this;
+
+    _initMarkup(): void;
+
+    _render(): void;
+
+    getAllProps(isFirstRender: boolean): any;
+
+    _getActionsMap(): any;
+
+    _init(): any;
+
+    _createViewRef(): any;
+
+    _optionChanged(option: any): any;
+
+    _addAction(name: string, config:any): any;
+
+    _stateChange(name: string): (value: any) => void;
+
+    _createTemplateComponent(props: any, templateOption: any, canBeAnonymous: boolean): any;
+
+    _wrapKeyDownHandler(handler: (event: any, options: any) => any): any;
+
+    // Public API
+    repaint(): any;
+
+    registerKeyHandler(key: string, handler: (e: any) => any): void;
+
+    setAria(): any;
+}

js/renovation/preact-wrapper/component.js

@@ -72,11 +72,22 @@ export default class PreactWrapper extends DOMComponent {
             options.ref = this.viewRef;
         }
 
+        Object.keys(this._getActionsMap()).forEach((name) => {
+            options[name] = this.option(getInnerActionName(name));
+        });
+
         return this.getProps && this.getProps(options) || options;
     }
 
+    _getActionsMap() { return {}; }
+
     _init() {
         super._init();
+
+        Object.keys(this._getActionsMap()).forEach((name) => {
+            this._addAction(name, this._getActionsMap()[name]);
+        });
+
         this._initWidget && this._initWidget();
         this._supportedKeys = () => ({});
     }
@@ -86,6 +97,16 @@ export default class PreactWrapper extends DOMComponent {
     }
 
     _optionChanged(option) {
+        const { name } = option || {};
+        if(name) {
+            if(this._getActionsMap()[name]) {
+                this._addAction(name, this._getActionsMap()[name]);
+                option = undefined;
+            } else if(Object.keys(this._getActionsMap()).some(event => getInnerActionName(event) === name)) {
+                option = undefined;
+            }
+        }
+
         if(option) {
             super._optionChanged(option);
         }

js/renovation/utils/base-props.tsx

@@ -13,8 +13,10 @@ export class BaseWidgetProps {
     @OneWay() height?: string | number | null = null;
     @OneWay() hint?: string;
     @OneWay() hoverStateEnabled?: boolean = false;
-    @Event() onClick?: (e: any) => any;
-    @Event() onContentReady?: (e: any) => any = (() => {});
+    @Event() onClick?: (e: any) => void;
+    @Event({
+        actionConfig: { excludeValidators: ['disabled', 'readOnly'] },
+    }) onContentReady?: (e: any) => any = (() => {});
     @Event() onKeyDown?: (e: any, options: any) => any;
     @OneWay() rtlEnabled?: boolean = config().rtlEnabled;
     @OneWay() tabIndex?: number = 0;

js/ui/grid_core/ui.grid_core.editing.js

@@ -22,7 +22,7 @@ import Form from '../form';
 import holdEvent from '../../events/hold';
 import { when, Deferred, fromPromise } from '../../core/utils/deferred';
 import commonUtils from '../../core/utils/common';
-import iconUtils from '../../core/utils/icon';
+import * as iconUtils from '../../core/utils/icon';
 import Scrollable from '../scroll_view/ui.scrollable';
 import deferredUtils from '../../core/utils/deferred';
 

js/ui/hierarchical_collection/ui.hierarchical_collection_widget.js

@@ -3,7 +3,7 @@ import { compileGetter, compileSetter } from '../../core/utils/data';
 import { extend } from '../../core/utils/extend';
 import { each } from '../../core/utils/iterator';
 import devices from '../../core/devices';
-import iconUtils from '../../core/utils/icon';
+import { getImageContainer } from '../../core/utils/icon';
 import HierarchicalDataAdapter from './ui.data_adapter';
 import CollectionWidget from '../collection/ui.collection_widget.edit';
 import { BindableTemplate } from '../../core/templates/bindable_template';
@@ -93,7 +93,7 @@ const HierarchicalCollectionWidget = CollectionWidget.inherit({
     },
 
     _getIconContainer: function(itemData) {
-        return itemData.icon ? iconUtils.getImageContainer(itemData.icon) : undefined;
+        return itemData.icon ? getImageContainer(itemData.icon) : undefined;
     },
 
     _getTextContainer: function(itemData) {