devextreme-react 23.2.6 → 24.1.2-beta

package/cjs/filter-builder.d.ts

@@ -1,7 +1,7 @@
 /*!
  * devextreme-react
- * Version: 23.2.6
- * Build date: Wed May 01 2024
+ * Version: 24.1.2-beta
+ * Build date: Mon May 13 2024
  *
  * Copyright (c) 2012 - 2024 Developer Express Inc. ALL RIGHTS RESERVED
  *
@@ -11,19 +11,19 @@
  * https://github.com/DevExpress/devextreme-react
  */
 
-/// <reference types="react" />
+import * as React from "react";
+import { Ref, ReactElement } from "react";
 import dxFilterBuilder, { Properties } from "devextreme/ui/filter_builder";
-import { Component as BaseComponent, IHtmlOptions } from "./core/component";
-import NestedOption from "./core/nested-option";
+import { IHtmlOptions, IElementDescriptor } from "./core/component";
 import type { ContentReadyEvent, DisposingEvent, EditorPreparedEvent, EditorPreparingEvent, InitializedEvent, ValueChangedEvent, dxFilterBuilderField } from "devextreme/ui/filter_builder";
 import type { template } from "devextreme/core/templates/template";
 import type { DataSourceOptions } from "devextreme/data/data_source";
 import type { Store } from "devextreme/data/store";
 import type * as LocalizationTypes from "devextreme/localization";
-declare type ReplaceFieldTypes<TSource, TReplacement> = {
+type ReplaceFieldTypes<TSource, TReplacement> = {
     [P in keyof TSource]: P extends keyof TReplacement ? TReplacement[P] : TSource[P];
 };
-declare type IFilterBuilderOptionsNarrowedEvents = {
+type IFilterBuilderOptionsNarrowedEvents = {
     onContentReady?: ((e: ContentReadyEvent) => void);
     onDisposing?: ((e: DisposingEvent) => void);
     onEditorPrepared?: ((e: EditorPreparedEvent) => void);
@@ -31,39 +31,17 @@ declare type IFilterBuilderOptionsNarrowedEvents = {
     onInitialized?: ((e: InitializedEvent) => void);
     onValueChanged?: ((e: ValueChangedEvent) => void);
 };
-declare type IFilterBuilderOptions = React.PropsWithChildren<ReplaceFieldTypes<Properties, IFilterBuilderOptionsNarrowedEvents> & IHtmlOptions & {
+type IFilterBuilderOptions = React.PropsWithChildren<ReplaceFieldTypes<Properties, IFilterBuilderOptionsNarrowedEvents> & IHtmlOptions & {
     defaultValue?: Array<any> | (() => any) | string;
     onValueChange?: (value: Array<any> | (() => any) | string) => void;
 }>;
-declare class FilterBuilder extends BaseComponent<React.PropsWithChildren<IFilterBuilderOptions>> {
-    get instance(): dxFilterBuilder;
-    protected _WidgetClass: typeof dxFilterBuilder;
-    protected useRequestAnimationFrameFlag: boolean;
-    protected subscribableOptions: string[];
-    protected independentEvents: string[];
-    protected _defaults: {
-        defaultValue: string;
-    };
-    protected _expectedChildren: {
-        customOperation: {
-            optionName: string;
-            isCollectionItem: boolean;
-        };
-        field: {
-            optionName: string;
-            isCollectionItem: boolean;
-        };
-        filterOperationDescriptions: {
-            optionName: string;
-            isCollectionItem: boolean;
-        };
-        groupOperationDescriptions: {
-            optionName: string;
-            isCollectionItem: boolean;
-        };
-    };
+interface FilterBuilderRef {
+    instance: () => dxFilterBuilder;
 }
-declare type ICustomOperationProps = React.PropsWithChildren<{
+declare const FilterBuilder: (props: React.PropsWithChildren<IFilterBuilderOptions> & {
+    ref?: Ref<FilterBuilderRef>;
+}) => ReactElement | null;
+type ICustomOperationProps = React.PropsWithChildren<{
     calculateFilterExpression?: ((filterValue: any, field: dxFilterBuilderField) => string | (() => any) | Array<any>);
     caption?: string;
     customizeText?: ((fieldInfo: {
@@ -82,19 +60,10 @@ declare type ICustomOperationProps = React.PropsWithChildren<{
     name?: string;
     editorRender?: (...params: any) => React.ReactNode;
     editorComponent?: React.ComponentType<any>;
-    editorKeyFn?: (data: any) => string;
 }>;
-declare class CustomOperation extends NestedOption<ICustomOperationProps> {
-    static OptionName: string;
-    static IsCollectionItem: boolean;
-    static TemplateProps: {
-        tmplOption: string;
-        render: string;
-        component: string;
-        keyFn: string;
-    }[];
-}
-declare type IFieldProps = React.PropsWithChildren<{
+declare const _componentCustomOperation: React.MemoExoticComponent<(props: ICustomOperationProps) => React.FunctionComponentElement<ICustomOperationProps>>;
+declare const CustomOperation: typeof _componentCustomOperation & IElementDescriptor;
+type IFieldProps = React.PropsWithChildren<{
     calculateFilterExpression?: ((filterValue: any, selectedFilterOperation: string) => string | (() => any) | Array<any>);
     caption?: string;
     customizeText?: ((fieldInfo: {
@@ -123,29 +92,10 @@ declare type IFieldProps = React.PropsWithChildren<{
     trueText?: string;
     editorRender?: (...params: any) => React.ReactNode;
     editorComponent?: React.ComponentType<any>;
-    editorKeyFn?: (data: any) => string;
 }>;
-declare class Field extends NestedOption<IFieldProps> {
-    static OptionName: string;
-    static IsCollectionItem: boolean;
-    static ExpectedChildren: {
-        format: {
-            optionName: string;
-            isCollectionItem: boolean;
-        };
-        lookup: {
-            optionName: string;
-            isCollectionItem: boolean;
-        };
-    };
-    static TemplateProps: {
-        tmplOption: string;
-        render: string;
-        component: string;
-        keyFn: string;
-    }[];
-}
-declare type IFilterOperationDescriptionsProps = React.PropsWithChildren<{
+declare const _componentField: React.MemoExoticComponent<(props: IFieldProps) => React.FunctionComponentElement<IFieldProps>>;
+declare const Field: typeof _componentField & IElementDescriptor;
+type IFilterOperationDescriptionsProps = React.PropsWithChildren<{
     between?: string;
     contains?: string;
     endsWith?: string;
@@ -160,10 +110,9 @@ declare type IFilterOperationDescriptionsProps = React.PropsWithChildren<{
     notEqual?: string;
     startsWith?: string;
 }>;
-declare class FilterOperationDescriptions extends NestedOption<IFilterOperationDescriptionsProps> {
-    static OptionName: string;
-}
-declare type IFormatProps = React.PropsWithChildren<{
+declare const _componentFilterOperationDescriptions: React.MemoExoticComponent<(props: IFilterOperationDescriptionsProps) => React.FunctionComponentElement<IFilterOperationDescriptionsProps>>;
+declare const FilterOperationDescriptions: typeof _componentFilterOperationDescriptions & IElementDescriptor;
+type IFormatProps = React.PropsWithChildren<{
     currency?: string;
     formatter?: ((value: number | Date) => string);
     parser?: ((value: string) => number | Date);
@@ -171,28 +120,25 @@ declare type IFormatProps = React.PropsWithChildren<{
     type?: "billions" | "currency" | "day" | "decimal" | "exponential" | "fixedPoint" | "largeNumber" | "longDate" | "longTime" | "millions" | "millisecond" | "month" | "monthAndDay" | "monthAndYear" | "percent" | "quarter" | "quarterAndYear" | "shortDate" | "shortTime" | "thousands" | "trillions" | "year" | "dayOfWeek" | "hour" | "longDateLongTime" | "minute" | "second" | "shortDateShortTime";
     useCurrencyAccountingStyle?: boolean;
 }>;
-declare class Format extends NestedOption<IFormatProps> {
-    static OptionName: string;
-}
-declare type IGroupOperationDescriptionsProps = React.PropsWithChildren<{
+declare const _componentFormat: React.MemoExoticComponent<(props: IFormatProps) => React.FunctionComponentElement<IFormatProps>>;
+declare const Format: typeof _componentFormat & IElementDescriptor;
+type IGroupOperationDescriptionsProps = React.PropsWithChildren<{
     and?: string;
     notAnd?: string;
     notOr?: string;
     or?: string;
 }>;
-declare class GroupOperationDescriptions extends NestedOption<IGroupOperationDescriptionsProps> {
-    static OptionName: string;
-}
-declare type ILookupProps = React.PropsWithChildren<{
+declare const _componentGroupOperationDescriptions: React.MemoExoticComponent<(props: IGroupOperationDescriptionsProps) => React.FunctionComponentElement<IGroupOperationDescriptionsProps>>;
+declare const GroupOperationDescriptions: typeof _componentGroupOperationDescriptions & IElementDescriptor;
+type ILookupProps = React.PropsWithChildren<{
     allowClearing?: boolean;
     dataSource?: Array<any> | DataSourceOptions | Store;
     displayExpr?: ((data: any) => string) | string;
     valueExpr?: ((data: any) => string | number | boolean) | string;
 }>;
-declare class Lookup extends NestedOption<ILookupProps> {
-    static OptionName: string;
-}
+declare const _componentLookup: React.MemoExoticComponent<(props: ILookupProps) => React.FunctionComponentElement<ILookupProps>>;
+declare const Lookup: typeof _componentLookup & IElementDescriptor;
 export default FilterBuilder;
-export { FilterBuilder, IFilterBuilderOptions, CustomOperation, ICustomOperationProps, Field, IFieldProps, FilterOperationDescriptions, IFilterOperationDescriptionsProps, Format, IFormatProps, GroupOperationDescriptions, IGroupOperationDescriptionsProps, Lookup, ILookupProps };
+export { FilterBuilder, IFilterBuilderOptions, FilterBuilderRef, CustomOperation, ICustomOperationProps, Field, IFieldProps, FilterOperationDescriptions, IFilterOperationDescriptionsProps, Format, IFormatProps, GroupOperationDescriptions, IGroupOperationDescriptionsProps, Lookup, ILookupProps };
 import type * as FilterBuilderTypes from 'devextreme/ui/filter_builder_types';
 export { FilterBuilderTypes };

package/cjs/filter-builder.js

@@ -1,7 +1,7 @@
 /*!
  * devextreme-react
- * Version: 23.2.6
- * Build date: Wed May 01 2024
+ * Version: 24.1.2-beta
+ * Build date: Mon May 13 2024
  *
  * Copyright (c) 2012 - 2024 Developer Express Inc. ALL RIGHTS RESERVED
  *
@@ -13,24 +13,24 @@
 
 "use client";
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
     };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
+    return __assign.apply(this, arguments);
+};
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -52,150 +52,89 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Lookup = exports.GroupOperationDescriptions = exports.Format = exports.FilterOperationDescriptions = exports.Field = exports.CustomOperation = exports.FilterBuilder = void 0;
+var React = __importStar(require("react"));
+var react_1 = require("react");
 var filter_builder_1 = __importDefault(require("devextreme/ui/filter_builder"));
-var PropTypes = __importStar(require("prop-types"));
 var component_1 = require("./core/component");
 var nested_option_1 = __importDefault(require("./core/nested-option"));
-var FilterBuilder = /** @class */ (function (_super) {
-    __extends(FilterBuilder, _super);
-    function FilterBuilder() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
-        _this._WidgetClass = filter_builder_1.default;
-        _this.useRequestAnimationFrameFlag = true;
-        _this.subscribableOptions = ["value"];
-        _this.independentEvents = ["onContentReady", "onDisposing", "onEditorPrepared", "onEditorPreparing", "onInitialized", "onValueChanged"];
-        _this._defaults = {
-            defaultValue: "value"
-        };
-        _this._expectedChildren = {
-            customOperation: { optionName: "customOperations", isCollectionItem: true },
-            field: { optionName: "fields", isCollectionItem: true },
-            filterOperationDescriptions: { optionName: "filterOperationDescriptions", isCollectionItem: false },
-            groupOperationDescriptions: { optionName: "groupOperationDescriptions", isCollectionItem: false }
-        };
-        return _this;
-    }
-    Object.defineProperty(FilterBuilder.prototype, "instance", {
-        get: function () {
-            return this._instance;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    return FilterBuilder;
-}(component_1.Component));
+var FilterBuilder = (0, react_1.memo)((0, react_1.forwardRef)(function (props, ref) {
+    var baseRef = (0, react_1.useRef)(null);
+    (0, react_1.useImperativeHandle)(ref, function () { return ({
+        instance: function () {
+            var _a;
+            return (_a = baseRef.current) === null || _a === void 0 ? void 0 : _a.getInstance();
+        }
+    }); }, [baseRef.current]);
+    var subscribableOptions = (0, react_1.useMemo)(function () { return (["value"]); }, []);
+    var independentEvents = (0, react_1.useMemo)(function () { return (["onContentReady", "onDisposing", "onEditorPrepared", "onEditorPreparing", "onInitialized", "onValueChanged"]); }, []);
+    var defaults = (0, react_1.useMemo)(function () { return ({
+        defaultValue: "value",
+    }); }, []);
+    var expectedChildren = (0, react_1.useMemo)(function () { return ({
+        customOperation: { optionName: "customOperations", isCollectionItem: true },
+        field: { optionName: "fields", isCollectionItem: true },
+        filterOperationDescriptions: { optionName: "filterOperationDescriptions", isCollectionItem: false },
+        groupOperationDescriptions: { optionName: "groupOperationDescriptions", isCollectionItem: false }
+    }); }, []);
+    return (React.createElement((component_1.Component), __assign({ WidgetClass: filter_builder_1.default, ref: baseRef, useRequestAnimationFrameFlag: true, subscribableOptions: subscribableOptions, independentEvents: independentEvents, defaults: defaults, expectedChildren: expectedChildren }, props)));
+}));
 exports.FilterBuilder = FilterBuilder;
-FilterBuilder.propTypes = {
-    accessKey: PropTypes.string,
-    activeStateEnabled: PropTypes.bool,
-    allowHierarchicalFields: PropTypes.bool,
-    customOperations: PropTypes.array,
-    disabled: PropTypes.bool,
-    elementAttr: PropTypes.object,
-    fields: PropTypes.array,
-    filterOperationDescriptions: PropTypes.object,
-    focusStateEnabled: PropTypes.bool,
-    groupOperationDescriptions: PropTypes.object,
-    groupOperations: PropTypes.array,
-    height: PropTypes.oneOfType([
-        PropTypes.func,
-        PropTypes.number,
-        PropTypes.string
-    ]),
-    hint: PropTypes.string,
-    hoverStateEnabled: PropTypes.bool,
-    maxGroupLevel: PropTypes.number,
-    onContentReady: PropTypes.func,
-    onDisposing: PropTypes.func,
-    onEditorPrepared: PropTypes.func,
-    onEditorPreparing: PropTypes.func,
-    onInitialized: PropTypes.func,
-    onOptionChanged: PropTypes.func,
-    onValueChanged: PropTypes.func,
-    rtlEnabled: PropTypes.bool,
-    tabIndex: PropTypes.number,
-    value: PropTypes.oneOfType([
-        PropTypes.array,
-        PropTypes.func,
-        PropTypes.string
-    ]),
-    visible: PropTypes.bool,
-    width: PropTypes.oneOfType([
-        PropTypes.func,
-        PropTypes.number,
-        PropTypes.string
-    ])
-};
-var CustomOperation = /** @class */ (function (_super) {
-    __extends(CustomOperation, _super);
-    function CustomOperation() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    CustomOperation.OptionName = "customOperations";
-    CustomOperation.IsCollectionItem = true;
-    CustomOperation.TemplateProps = [{
+var _componentCustomOperation = (0, react_1.memo)(function (props) {
+    return React.createElement((nested_option_1.default), __assign({}, props));
+});
+var CustomOperation = Object.assign(_componentCustomOperation, {
+    OptionName: "customOperations",
+    IsCollectionItem: true,
+    TemplateProps: [{
             tmplOption: "editorTemplate",
             render: "editorRender",
-            component: "editorComponent",
-            keyFn: "editorKeyFn"
-        }];
-    return CustomOperation;
-}(nested_option_1.default));
+            component: "editorComponent"
+        }],
+});
 exports.CustomOperation = CustomOperation;
-var Field = /** @class */ (function (_super) {
-    __extends(Field, _super);
-    function Field() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    Field.OptionName = "fields";
-    Field.IsCollectionItem = true;
-    Field.ExpectedChildren = {
+var _componentField = (0, react_1.memo)(function (props) {
+    return React.createElement((nested_option_1.default), __assign({}, props));
+});
+var Field = Object.assign(_componentField, {
+    OptionName: "fields",
+    IsCollectionItem: true,
+    ExpectedChildren: {
         format: { optionName: "format", isCollectionItem: false },
         lookup: { optionName: "lookup", isCollectionItem: false }
-    };
-    Field.TemplateProps = [{
+    },
+    TemplateProps: [{
             tmplOption: "editorTemplate",
             render: "editorRender",
-            component: "editorComponent",
-            keyFn: "editorKeyFn"
-        }];
-    return Field;
-}(nested_option_1.default));
+            component: "editorComponent"
+        }],
+});
 exports.Field = Field;
-var FilterOperationDescriptions = /** @class */ (function (_super) {
-    __extends(FilterOperationDescriptions, _super);
-    function FilterOperationDescriptions() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    FilterOperationDescriptions.OptionName = "filterOperationDescriptions";
-    return FilterOperationDescriptions;
-}(nested_option_1.default));
+var _componentFilterOperationDescriptions = (0, react_1.memo)(function (props) {
+    return React.createElement((nested_option_1.default), __assign({}, props));
+});
+var FilterOperationDescriptions = Object.assign(_componentFilterOperationDescriptions, {
+    OptionName: "filterOperationDescriptions",
+});
 exports.FilterOperationDescriptions = FilterOperationDescriptions;
-var Format = /** @class */ (function (_super) {
-    __extends(Format, _super);
-    function Format() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    Format.OptionName = "format";
-    return Format;
-}(nested_option_1.default));
+var _componentFormat = (0, react_1.memo)(function (props) {
+    return React.createElement((nested_option_1.default), __assign({}, props));
+});
+var Format = Object.assign(_componentFormat, {
+    OptionName: "format",
+});
 exports.Format = Format;
-var GroupOperationDescriptions = /** @class */ (function (_super) {
-    __extends(GroupOperationDescriptions, _super);
-    function GroupOperationDescriptions() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    GroupOperationDescriptions.OptionName = "groupOperationDescriptions";
-    return GroupOperationDescriptions;
-}(nested_option_1.default));
+var _componentGroupOperationDescriptions = (0, react_1.memo)(function (props) {
+    return React.createElement((nested_option_1.default), __assign({}, props));
+});
+var GroupOperationDescriptions = Object.assign(_componentGroupOperationDescriptions, {
+    OptionName: "groupOperationDescriptions",
+});
 exports.GroupOperationDescriptions = GroupOperationDescriptions;
-var Lookup = /** @class */ (function (_super) {
-    __extends(Lookup, _super);
-    function Lookup() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    Lookup.OptionName = "lookup";
-    return Lookup;
-}(nested_option_1.default));
+var _componentLookup = (0, react_1.memo)(function (props) {
+    return React.createElement((nested_option_1.default), __assign({}, props));
+});
+var Lookup = Object.assign(_componentLookup, {
+    OptionName: "lookup",
+});
 exports.Lookup = Lookup;
 exports.default = FilterBuilder;