Merge branch 'dev' into master-2.10.1

T4rk1n · T4rk1n · commit fe43975ef312 · 2023-05-30T12:59:53.000-04:00
diff --git a/@plotly/dash-generator-test-component-typescript/generator.test.ts b/@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");
+            }
         )
     });
 
diff --git a/@plotly/dash-generator-test-component-typescript/src/props.ts b/@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 = {
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 All notable changes to `dash` will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/).
 
+## [2.10.1] - 2023-05-30
+
+## Fixed
+
+- [#2545](https://github.com/plotly/dash/pull/2545) Fix typescript objectOf generation.
+- [#2548](https://github.com/plotly/dash/pull/2548) Fix component as props callback triggering other callbacks not in response, fix [#2487](https://github.com/plotly/dash/issues/2487).
+
 ## [2.10.0] - 2023-05-25
 
 ## Changed
@@ -71,6 +78,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 +151,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
diff --git a/dash/_dash_renderer.py b/dash/_dash_renderer.py
@@ -1,6 +1,6 @@
 import os
 
-__version__ = "1.15.2"
+__version__ = "1.15.3"
 
 _available_react_versions = {"16.14.0", "18.2.0"}
 _available_reactdom_versions = {"16.14.0", "18.2.0"}
@@ -64,7 +64,7 @@ def _set_react_version(v_react, v_reactdom=None):
     {
         "relative_package_path": "dash-renderer/build/dash_renderer.min.js",
         "dev_package_path": "dash-renderer/build/dash_renderer.dev.js",
-        "external_url": "https://unpkg.com/dash-renderer@1.15.2"
+        "external_url": "https://unpkg.com/dash-renderer@1.15.3"
         "/build/dash_renderer.min.js",
         "namespace": "dash",
     },
diff --git a/dash/dash-renderer/package-lock.json b/dash/dash-renderer/package-lock.json
diff --git a/dash/dash-renderer/package.json b/dash/dash-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dash-renderer",
-  "version": "1.15.2",
+  "version": "1.15.3",
   "description": "render dash components in react",
   "main": "build/dash_renderer.min.js",
   "scripts": {
diff --git a/dash/dash-renderer/src/actions/dependencies_ts.ts b/dash/dash-renderer/src/actions/dependencies_ts.ts
@@ -1,12 +1,10 @@
 import {
     all,
-    any,
     assoc,
     concat,
     difference,
     filter,
     flatten,
-    includes,
     isEmpty,
     keys,
     map,
@@ -312,13 +310,12 @@ export const getLayoutCallbacks = (
             rootId = stringifyId(rootId);
             // Filter inputs that are not present in the response
             callbacks = callbacks.filter(cb =>
-                any(
-                    (inp: any) =>
-                        !(
-                            stringifyId(inp.id) === rootId &&
-                            !includes(inp.property, options.filterRoot)
-                        ),
-                    cb.callback.inputs
+                cb.callback.inputs.reduce(
+                    (previous: any, input: any) =>
+                        previous ||
+                        (stringifyId(input.id) == rootId &&
+                            options.filterRoot.includes(input.property)),
+                    false
                 )
             );
         }
diff --git a/dash/extract-meta.js b/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,
-                );
             }
         }
 
diff --git a/dash/version.py b/dash/version.py
@@ -1 +1 @@
-__version__ = "2.10.0"
+__version__ = "2.10.1"
diff --git a/tests/integration/callbacks/test_prevent_initial.py b/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
diff --git a/tests/integration/renderer/test_component_as_prop.py b/tests/integration/renderer/test_component_as_prop.py
@@ -4,7 +4,7 @@
 
 from dash_test_components import ComponentAsProp
 
-from dash.dcc import Checklist
+from dash.dcc import Checklist, Dropdown
 from dash.html import Button, Div, Span
 
 
@@ -379,3 +379,65 @@ def opts(n):
 
     dash_duo.find_elements("#b label > input")[0].click()
     dash_duo.wait_for_text_to_equal("#counter", "1")
+
+
+def test_rdcap004_side_effect_same_component(dash_duo):
+    options = [
+        {"label": "aa1", "value": "aa1"},
+        {"label": "aa2", "value": "aa2"},
+        {"label": "aa3", "value": "aa3"},
+        {"label": "best value", "value": "bb1"},
+        {"label": "better value", "value": "bb2"},
+        {"label": "bye", "value": "bb3"},
+    ]
+
+    app = Dash(__name__)
+
+    app.layout = Div(
+        [
+            Div(
+                ["Single dynamic Dropdown", Dropdown(id="my-dynamic-dropdown")],
+                style={"width": 200, "marginLeft": 20, "marginTop": 20},
+            ),
+            Button(
+                "Reset",
+                id="button",
+                n_clicks=0,
+            ),
+            Div(0, id="counter"),
+        ]
+    )
+    app.clientside_callback(
+        "function(_, prev) {return parseInt(prev) + 1}",
+        Output("counter", "children"),
+        Input("my-dynamic-dropdown", "value"),
+        State("counter", "children"),
+        prevent_initial_call=True,
+    )
+
+    @app.callback(
+        Output("my-dynamic-dropdown", "options"),
+        Input("my-dynamic-dropdown", "search_value"),
+    )
+    def update_options(search_value):
+        if search_value is None:
+            return options
+        return [o for o in options if search_value in o["label"]]
+
+    @app.callback(
+        Output("my-dynamic-dropdown", "value"),
+        Input("button", "n_clicks"),
+    )
+    def on_button(n_clicks):
+        return None
+
+    dash_duo.start_server(app)
+
+    # Initial callback
+    dash_duo.wait_for_text_to_equal("#counter", "1")
+
+    search = dash_duo.wait_for_element("#my-dynamic-dropdown input")
+
+    search.send_keys("a")
+
+    dash_duo.wait_for_text_to_equal("#counter", "1")

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "dash-renderer",`
`3`		`- "version": "1.15.2",`
	`3`	`+ "version": "1.15.3",`
`4`	`4`	`"description": "render dash components in react",`
`5`	`5`	`"main": "build/dash_renderer.min.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = "2.10.0"`
	`1`	`+__version__ = "2.10.1"`