Merge pull request #2545 from plotly/fix/ts-object-of

Fix typescript objectOf prop generation.

Author: T4rk1n

@plotly/dash-generator-test-component-typescript/generator.test.ts

@@ -106,7 +106,15 @@ describe('Test Typescript component metadata generation', () => {
         test(
             `${componentName} tuple tuple`,
             testTypeFactory('a_tuple', 'tuple')
-        )
+        );
+        test(
+            `${componentName} object of string`,
+            testTypeFactory('object_of_string', 'objectOf')
+        );
+        test(
+            `${componentName} object of components`,
+            testTypeFactory('object_of_components', 'objectOf')
+        );
     });
 
     describe('Test prop attributes', () => {
@@ -252,6 +260,17 @@ describe('Test Typescript component metadata generation', () => {
                     R.path(tuplePath.concat(1, 'name'), metadata)
                 ).toBe('string');
             }
+        );
+
+        test(
+            'objectOf node', () => {
+                const objectOfComponents = R.path(
+                    propPath("TypeScriptComponent", "object_of_components")
+                        .concat(["type", "value", "name"]),
+                    metadata
+                );
+                expect(objectOfComponents).toBe("node");
+            }
         )
     });
 

@plotly/dash-generator-test-component-typescript/src/props.ts

@@ -43,6 +43,9 @@ export type TypescriptComponentProps = {
     nested?: Nested;
 
     a_tuple?: [number, string];
+
+    object_of_string?: {[k: string]: string};
+    object_of_components?: {[k: string]: JSX.Element};
 };
 
 export type WrappedHTMLProps = {

CHANGELOG.md

@@ -2,6 +2,12 @@
 All notable changes to `dash` will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/).
 
+## [UNRELEASED]
+
+## Fixed
+
+- [#2545](https://github.com/plotly/dash/pull/2545) Fix typescript objectOf generation.
+
 ## [2.10.0] - 2023-05-25
 
 ## Changed
@@ -71,6 +77,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - [#2260](https://github.com/plotly/dash/pull/2260) Experimental support for React 18. The default is still React v16.14.0, but to use React 18 you can either set the environment variable `REACT_VERSION=18.2.0` before running your app, or inside the app call `dash._dash_renderer._set_react_version("18.2.0")`. THIS FEATURE IS EXPERIMENTAL. It has not been tested with component suites outside the Dash core, and we may add or remove available React versions in any future release.
 - [#2414](https://github.com/plotly/dash/pull/2414) Add `dash.Patch`for partial update Output props without transferring the previous value in a State.
 - [#2414](https://github.com/plotly/dash/pull/2414) Add `allow_duplicate` to `Output` arguments allowing duplicate callbacks to target the same prop.
+- [#2349](https://github.com/plotly/dash/pull/2349) Added new `dcc.Geolocation` component
 
 ## Fixed
 
@@ -143,7 +150,6 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 ### Added
 
-- [#2349](https://github.com/plotly/dash/pull/2349) Added new `dcc.Geolocation` component
 - [#2261](https://github.com/plotly/dash/pull/2261) Added new `placeholder_text` property to `filterOptions` for DataTable which allows overriding the default filter field placeholder.
 
 ### Updated

dash/extract-meta.js

@@ -361,16 +361,20 @@ function gatherComponents(sources, components = {}) {
                         ...getUnion(propType, propObj, newParentType),
                         raw
                     };
+                } else if (propType.indexInfos && propType.indexInfos.length) {
+                    const {type} = propType.indexInfos[0];
+                    name = 'objectOf';
+                    value = getPropType(type, propObj, newParentType);
+                } else {
+                    value = getProps(
+                        checker.getPropertiesOfType(propType),
+                        propObj,
+                        [],
+                        {},
+                        true,
+                        newParentType,
+                    );
                 }
-
-                value = getProps(
-                    checker.getPropertiesOfType(propType),
-                    propObj,
-                    [],
-                    {},
-                    true,
-                    newParentType,
-                );
             }
         }
 

tests/integration/callbacks/test_prevent_initial.py

@@ -1,5 +1,6 @@
 import json
 import pytest
+from flaky import flaky
 
 from dash import Dash, Input, Output, MATCH, html
 from dash.exceptions import PreventUpdate
@@ -174,6 +175,7 @@ def d(_):
     dash_duo.wait_for_text_to_equal("#a", "Click")
 
 
+@flaky(max_runs=3)
 @pytest.mark.parametrize("flavor", flavors)
 def test_cbpi002_pattern_matching(flavor, dash_duo):
     # a clone of cbpi001 just throwing it through the pattern-matching machinery