Merge branch 'master' of https://github.com/DevExpress/devextreme-react

Author: dxvladislavvolkov

.github/workflows/generator-version-guard.yml

@@ -17,7 +17,7 @@ jobs:
       with:
         fetch-depth: 2
 
-    - name: Run generator version guard
-      uses: DevExpress/github-actions/generator-version-guard@main
+    - name: Run check for version update
+      uses: DevExpress/github-actions/check-for-version-update@main
       with:
-        generator_path: packages/devextreme-react-generator
+        path: packages/devextreme-react-generator

packages/devextreme-react-generator/package.json

@@ -1,7 +1,7 @@
 {
   "author": "Developer Express Inc.",
   "name": "devextreme-react-generator",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "DevExtreme React UI and Visualization Components",
   "repository": {
     "type": "git",

packages/devextreme-react-generator/src/component-generator.test.ts

@@ -1004,6 +1004,61 @@ export {
     ).toBe(EXPECTED);
   });
 
+  it('adds check for acceptable values with common type', () => {
+    // #region EXPECTED
+    const EXPECTED = `
+import dxCLASS_NAME, {
+    Properties
+} from "DX/WIDGET/PATH";
+
+import * as PropTypes from "prop-types";
+import { Component as BaseComponent, IHtmlOptions } from "BASE_COMPONENT_PATH";
+
+type ICLASS_NAMEOptions = React.PropsWithChildren<Properties & IHtmlOptions & {
+}>
+
+class CLASS_NAME extends BaseComponent<React.PropsWithChildren<ICLASS_NAMEOptions>> {
+
+  public get instance(): dxCLASS_NAME {
+    return this._instance;
+  }
+
+  protected _WidgetClass = dxCLASS_NAME;
+}
+(CLASS_NAME as any).propTypes = {
+  PROP1: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.oneOf([
+      "VALUE_1",
+      "VALUE_2"])
+  ])
+};
+export default CLASS_NAME;
+export {
+  CLASS_NAME,
+  ICLASS_NAMEOptions
+};
+`.trimLeft();
+    // #endregion
+
+    expect(
+      generate({
+        name: 'CLASS_NAME',
+        baseComponentPath: 'BASE_COMPONENT_PATH',
+        extensionComponentPath: 'EXTENSION_COMPONENT_PATH',
+        dxExportPath: 'DX/WIDGET/PATH',
+        propTypings: [
+          {
+            propName: 'PROP1',
+            types: [],
+            acceptableType: 'string',
+            acceptableValues: ['"VALUE_1"', '"VALUE_2"'],
+          },
+        ],
+      }),
+    ).toBe(EXPECTED);
+  });
+
   it('adds check for acceptable values', () => {
     // #region EXPECTED
     const EXPECTED = `
@@ -1028,8 +1083,7 @@ class CLASS_NAME extends BaseComponent<React.PropsWithChildren<ICLASS_NAMEOption
 (CLASS_NAME as any).propTypes = {
   PROP1: PropTypes.oneOf([
     "VALUE_1",
-    "VALUE_2"
-  ])
+    "VALUE_2"])
 };
 export default CLASS_NAME;
 export {

packages/devextreme-react-generator/src/component-generator.ts

@@ -1,4 +1,6 @@
-import { createTempate, L1, L2 } from './template';
+import {
+  createTempate, L1, L2, L3,
+} from './template';
 
 import {
   createKeyComparator,
@@ -61,6 +63,7 @@ type IOption = {
 interface IPropTyping {
   propName: string;
   types: string[];
+  acceptableType?: string;
   acceptableValues?: string[];
 }
 
@@ -428,10 +431,19 @@ function buildPropsTypeName(className: string) {
   return `I${className}Props`;
 }
 
+function acceptableTypes(acceptableType: string | undefined, acceptableValues: string[]): string {
+  const indent = acceptableType ? L3 : L2;
+  const acceptableTemplate = `PropTypes.oneOf([${indent}${acceptableValues.join(`,${indent}`)}])`;
+  return acceptableType ? `PropTypes.oneOfType([
+    PropTypes.${acceptableType},
+    ${acceptableTemplate}
+  ])` : acceptableTemplate;
+}
+
 function createPropTypingModel(typing: IPropTyping): IRenderedPropTyping {
   const types = typing.types.map((t) => `PropTypes.${t}`);
   if (typing.acceptableValues && isNotEmptyArray(typing.acceptableValues)) {
-    types.push(`PropTypes.oneOf([\n    ${typing.acceptableValues.join(',\n    ')}\n  ])`);
+    types.push(acceptableTypes(typing.acceptableType, typing.acceptableValues));
   }
   return {
     propName: typing.propName,

packages/devextreme-react-generator/src/generator.ts

@@ -129,6 +129,7 @@ export function createPropTyping(
     return {
       propName: option.name,
       types: types || [],
+      acceptableType: restrictedTypes[0].type.toLowerCase(),
       acceptableValues: restrictedTypes[0].acceptableValues,
     };
   }